From owner-p4-projects@FreeBSD.ORG Sun May 31 02:18:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A47701065673; Sun, 31 May 2009 02:18:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61FA61065674 for ; Sun, 31 May 2009 02:18:01 +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 4599C8FC18 for ; Sun, 31 May 2009 02:18:01 +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 n4V2I1lr076071 for ; Sun, 31 May 2009 02:18:01 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4V2I1Ma076069 for perforce@freebsd.org; Sun, 31 May 2009 02:18:01 GMT (envelope-from gabor@freebsd.org) Date: Sun, 31 May 2009 02:18:01 GMT Message-Id: <200905310218.n4V2I1Ma076069@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 163138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 02:18:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=163138 Change 163138 by gabor@gabor_server on 2009/05/31 02:17:48 - Add some GNU compatibility features - Document changes Affected files ... .. //depot/projects/soc2008/gabor_textproc/bc/bc.1#2 edit .. //depot/projects/soc2008/gabor_textproc/bc/bc.y#2 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/bc/bc.1#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" .\" @(#)bc.1 6.8 (Berkeley) 8/8/91 .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: May 31 2009 $ .Dt BC 1 .Sh NAME .Nm bc @@ -54,6 +54,8 @@ Options available: .Bl -tag -width Ds .It Fl c +.It Fl d +.It Fl Fl debug .Nm is actually a preprocessor for .Xr dc 1 , @@ -67,17 +69,25 @@ instead of being interpreted by a running .Xr dc 1 process. -.It Fl e Ar expression +.It Fl e Ar exp +.It Fl Fl expression Ar exp Evaluate .Ar expression . If multiple .Fl e options are specified, they are processed in the order given, separated by newlines. +.It Fl h +.It Fl Fl help +Prints usage information. .It Fl l +.It Fl Fl mathlib Allow specification of an arbitrary precision math library. The definitions in the library are available to command line expressions. +.It Fl v +.It Fl Fl version +Prints version information. .El .Pp The syntax for ==== //depot/projects/soc2008/gabor_textproc/bc/bc.y#2 (text+ko) ==== @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -51,6 +52,7 @@ #include "extern.h" #include "pathnames.h" +#define BC_VER "1.0-FreeBSD" #define END_NODE ((ssize_t) -1) #define CONST_STRING ((ssize_t) -2) #define ALLOC_STRING ((ssize_t) -3) @@ -121,6 +123,18 @@ #define VAR_BASE (256-4) #define MAX_VARIABLES (VAR_BASE * VAR_BASE) +const struct option long_options[] = +{ + {"debug", no_argument, NULL, 'd'}, + {"expression", required_argument, NULL, 'e'}, + {"help", no_argument, NULL, 'h'}, + {"mathlib", no_argument, NULL, 'l'}, + /* compatibility option */ + {"quiet", no_argument, NULL, 'q'}, + {"version", no_argument, NULL, 'v'}, + {NULL, no_argument, NULL, 0} +}; + %} %start program @@ -996,7 +1010,7 @@ static void usage(void) { - fprintf(stderr, "usage: %s [-cl] [-e expression] [file ...]\n", + fprintf(stderr, "usage: %s [-cdhlqv] [-e expression] [file ...]\n", __progname); exit(1); } @@ -1094,7 +1108,8 @@ if ((cmdexpr = strdup("")) == NULL) err(1, NULL); /* The d debug option is 4.4 BSD bc(1) compatible */ - while ((ch = getopt(argc, argv, "cde:l")) != -1) { + while ((ch = getopt_long(argc, argv, "cde:hlqv", + long_options, NULL)) != -1) { switch (ch) { case 'c': case 'd': @@ -1106,9 +1121,19 @@ err(1, NULL); free(q); break; + case 'h': + usage(); + break; case 'l': sargv[sargc++] = _PATH_LIBB; break; + case 'q': + /* compatibility option */ + break; + case 'v': + fprintf(stderr, "%s (BSD bc) %s\n", __progname, BC_VER); + exit(0); + break; default: usage(); } From owner-p4-projects@FreeBSD.ORG Sun May 31 04:30:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 57B871065674; Sun, 31 May 2009 04:30:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00CB91065672 for ; Sun, 31 May 2009 04:30:16 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C92A68FC08 for ; Sun, 31 May 2009 04:30:15 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4V4UFNL088614 for ; Sun, 31 May 2009 04:30:15 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4V4UFpk088612 for perforce@freebsd.org; Sun, 31 May 2009 04:30:15 GMT (envelope-from nikron@FreeBSD.org) Date: Sun, 31 May 2009 04:30:15 GMT Message-Id: <200905310430.n4V4UFpk088612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 04:30:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=163140 Change 163140 by nikron@nmfreebsd on 2009/05/31 04:29:39 Removed temp file. Affected files ... .. //depot/projects/soc2009/nm-port/NetworkManager/temp#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 31 06:36:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B20191065670; Sun, 31 May 2009 06:36: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 71899106566C for ; Sun, 31 May 2009 06:36:23 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5E2A18FC12 for ; Sun, 31 May 2009 06:36:23 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4V6aNve014083 for ; Sun, 31 May 2009 06:36:23 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4V6aNHP014081 for perforce@freebsd.org; Sun, 31 May 2009 06:36:23 GMT (envelope-from nikron@FreeBSD.org) Date: Sun, 31 May 2009 06:36:23 GMT Message-Id: <200905310636.n4V6aNHP014081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 06:36:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=163141 Change 163141 by nikron@nmfreebsd on 2009/05/31 06:36:06 Intial import of NetworkManager. Affected files ... .. //depot/projects/soc2009/nm-port/NetworkManager/AUTHORS#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/COPYING#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/ChangeLog#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-avahi-autoipd.conf#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/org.freedesktop.nm_dispatcher.service.in#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib-docs.sgml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib.types#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/include/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/include/nm-glib-compat.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/include/wireless-helper.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Arch/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Debian/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/networkmanager.in#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/NetworkManager.in#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/all.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/errors.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-access-point.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-active-connection.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-bt.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-cdma.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-ethernet.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-gsm.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-serial.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-wifi.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-manager-client.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-vpn-plugin.xml#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm-glib-test.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.ver#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-settings-system.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-private.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-types-private.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto_nss.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.pc.in#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.ver#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-wireless.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/certs/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/m4/compiler_warnings.m4#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/man/nm-tool.1.in#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal-main.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal.list#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/POTFILES.skip#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/ar.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/bs.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/ca.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/cs.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/de.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/dz.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/en_CA.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/en_GB.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/et.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/eu.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/hr.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/it.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/pl.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/rw.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/sl.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/sv.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/uk.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/wa.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/zh_CN.po#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/policy/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/policy/org.freedesktop.network-manager-settings.system.policy.in#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/NetworkManagerSystem.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerArch.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGentoo.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerMandriva.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerSlackware.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-dhclient.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-manager.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/named-manager/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-private.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-manager.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/tests/test-supplicant-config.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/tests/test-dhcp-options.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-connection.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/common.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/plugin.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/shvar.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifupdown/interface_parser.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/io/writer.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/main.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.h#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/test/nm-dhcp-opt-test.c#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/tools/doc-generator.xsl#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 31 06:45:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BE291065687; Sun, 31 May 2009 06:45: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 1C6571065680 for ; Sun, 31 May 2009 06:45:37 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E4FC78FC18 for ; Sun, 31 May 2009 06:45:36 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4V6jaGb015783 for ; Sun, 31 May 2009 06:45:36 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4V6jam4015781 for perforce@freebsd.org; Sun, 31 May 2009 06:45:36 GMT (envelope-from nikron@FreeBSD.org) Date: Sun, 31 May 2009 06:45:36 GMT Message-Id: <200905310645.n4V6jam4015781@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 06:45:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=163143 Change 163143 by nikron@nmfreebsd on 2009/05/31 06:44:38 File from Networkmanager accidently left out. Affected files ... .. //depot/projects/soc2009/nm-port/NetworkManager/po/sv.po#2 edit Differences ... ==== //depot/projects/soc2009/nm-port/NetworkManager/po/sv.po#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun May 31 06:56:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF8A01065676; Sun, 31 May 2009 06:56:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C3C71065674 for ; Sun, 31 May 2009 06:56:48 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5ADC28FC12 for ; Sun, 31 May 2009 06:56:48 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4V6umQ7016606 for ; Sun, 31 May 2009 06:56:48 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4V6umCD016604 for perforce@freebsd.org; Sun, 31 May 2009 06:56:48 GMT (envelope-from nikron@FreeBSD.org) Date: Sun, 31 May 2009 06:56:48 GMT Message-Id: <200905310656.n4V6umCD016604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163144 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 06:56:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=163144 Change 163144 by nikron@nmfreebsd on 2009/05/31 06:56:31 Additional NetworkManager files. Affected files ... .. //depot/projects/soc2009/nm-port/NetworkManager/CONTRIBUTING#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/MAINTAINERS#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/Makefile.am#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/NEWS#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/NetworkManager.pc.in#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/README#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/TODO#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/autogen.sh#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/configure.ac#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/patch.txt#1 add .. //depot/projects/soc2009/nm-port/NetworkManager/po/sv.po#3 edit Differences ... ==== //depot/projects/soc2009/nm-port/NetworkManager/po/sv.po#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun May 31 06:58:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 033C610656B2; Sun, 31 May 2009 06:58: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 B542810656AE for ; Sun, 31 May 2009 06:58:50 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89AE38FC0A for ; Sun, 31 May 2009 06:58:50 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4V6wo8N016780 for ; Sun, 31 May 2009 06:58:50 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4V6woxd016778 for perforce@freebsd.org; Sun, 31 May 2009 06:58:50 GMT (envelope-from nikron@FreeBSD.org) Date: Sun, 31 May 2009 06:58:50 GMT Message-Id: <200905310658.n4V6woxd016778@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 06:58:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=163145 Change 163145 by nikron@nmfreebsd on 2009/05/31 06:58:48 Accidently added file. Affected files ... .. //depot/projects/soc2009/nm-port/NetworkManager/patch.txt#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 31 07:57:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4029A1065670; Sun, 31 May 2009 07:57: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 DBAA7106566B for ; Sun, 31 May 2009 07:57:50 +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 C90858FC08 for ; Sun, 31 May 2009 07:57:50 +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 n4V7vo6A023477 for ; Sun, 31 May 2009 07:57:50 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4V7vo5l023475 for perforce@freebsd.org; Sun, 31 May 2009 07:57:50 GMT (envelope-from dforsyth@FreeBSD.org) Date: Sun, 31 May 2009 07:57:50 GMT Message-Id: <200905310757.n4V7vo5l023475@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 163149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 07:57:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=163149 Change 163149 by dforsyth@squirrel on 2009/05/31 07:57:47 Moved alot of things around. Last submit before restructure. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/pkg.c#6 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg.h#5 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info.c#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#6 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.h#3 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/pkg.c#6 (text+ko) ==== @@ -5,8 +5,10 @@ #include #include "pkg_util.h" +#include "pkgdb.h" #include "pkg.h" + /* Create a new pkg. */ struct pkg * @@ -26,7 +28,19 @@ return (NULL); } p->ident = new_ident; + p->comment = NULL; + p->contents = NULL; + + return (p); +} +struct pkg * +pkg_set_path(struct pkg *p, const char *path) +{ + if (p == NULL || path == NULL) + return (p); + + p->path = strdup(path); return (p); } ==== //depot/projects/soc2009/dforsyth_libpkg/pkg.h#5 (text+ko) ==== @@ -1,38 +1,15 @@ #ifndef __PKG_H__ #define __PKG_H__ -struct pkg_file { - char *name; - char *path; - char *md5; -}; +#include +#include -struct pkg_contents { - int rev; - char *name; - char **file_list; /* place holder */ - char *cwd; - char **conflict; -}; +/* pkg */ -struct pkg { - TAILQ_ENTRY(pkg) next; /* Hide meh */ +struct pkg; - char *ident; /* User given name for this pkg. */ - char *path; - - char *comment; - struct pkg_contents *contents; - - int has_comment; - int has_contents; - int has_display; - int has_mtree_dirs; - int has_desc; - int has_required_by; -}; - struct pkg *pkg_new(const char *ident); +struct pkg *pkg_set_path(struct pkg *p, const char *path); int set_pkg_contents(struct pkg *p, char *contents); int set_pkg_comment(struct pkg *p, char *comment); @@ -43,4 +20,30 @@ void pkg_free(struct pkg *p); +/* pkgdb */ + +struct pkgdb; + +struct pkgdb *pkgdb_new_hierdb(const char *db_root); + +int pkgdb_init_hierdb(struct pkgdb *db); +struct pkg *pkgdb_read_pkg_hierdb(struct pkgdb *db, const char *ident); +struct pkg *pkgdb_next_pkg(struct pkgdb *db); + +struct pkg *pkgdb_query_pkg(struct pkgdb *db, const char *ident); + +char *pkgdb_pkg_path(struct pkgdb *db, struct pkg *p); + +void pkgdb_pkg_list_init(struct pkgdb *db); +struct pkg *pkgdb_pkg_list_first(struct pkgdb *db); +void pkgdb_pkg_list_append(struct pkgdb *db, struct pkg *p); + +void pkgdb_free_hierdb(struct pkgdb *db); +void pkgdb_free_pkg_list(struct pkgdb *db); + +/* pkg_info */ +struct pkg_info; + +int pkg_info_read_comment_file(struct pkg *p, const char *filename); + #endif ==== //depot/projects/soc2009/dforsyth_libpkg/pkg_info.c#2 (text+ko) ==== @@ -1,9 +1,15 @@ #include #include +#include #include #include #include +#include + +#include "pkg_info.h" +#include "pkgdb.h" +#include "pkg.h" struct pkg_file { char *name; @@ -16,7 +22,21 @@ char *name; char *orgin; char *cwd; + char *conflicts; int f_count; struct pkg_file *files; }; + +struct pkg * +pkg_info_read_comment_file(struct pkg *p, const char *filename:) { + + if (p == NULL || filename == NULL) + return (NULL); + + + return (p); +} + + + ==== //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#6 (text+ko) ==== @@ -8,6 +8,7 @@ #include #include "pkg_util.h" +#include "pkg_info.h" #include "pkgdb.h" #include "pkg.h" @@ -64,11 +65,11 @@ if (db == NULL) return (-1); - TAILQ_INIT(&db->p_head); + pkgdb_pkg_list_init(db); if (db->dirty == 0) { /* No changes since the last init, don't bother walking the * database again. */ - db->p_curr = TAILQ_FIRST(&db->p_head); + db->p_curr = pkgdb_pkg_list_first(db);; return (db->p_count); } @@ -86,12 +87,12 @@ free(ents); return (-1); } - TAILQ_INSERT_TAIL(&db->p_head, p, next); + pkgdb_pkg_list_append(db, p); free(ents[i]); } free(ents); - db->p_curr = TAILQ_FIRST(&db->p_head); + db->p_curr = pkgdb_pkg_list_first(db); db->p_count = p_count; db->dirty = 0; @@ -109,11 +110,10 @@ char *path; struct stat sb; struct pkg *p; - struct dirent *e; - struct dirent **ents; p = pkg_new(ident); path = pkgdb_pkg_path(db, p); + pkg_set_path(p, path); if (p == NULL || path == NULL) { pkg_free(p); free(path); @@ -126,32 +126,6 @@ return (NULL); } - c = scandir(path, &ents, subdir_sel, alphasort); - for (i = 0; i < c; ++i) { - s = 0; /* Reset s */ - /* Go through all the files in this package, grab the information - * that we need. */ - e = ents + i; - s = pkg_info_identify_file(e); - switch (s) { - case IS_COMMENTS: - /* Read the comments file into the comments field of this - * package. */ - break; - case IS_CONTENTS: - /* Do contents parsing stuff. Like... - p->contents = pkg_info_parse_contents_file(p, - CONTENTS_FILE); */ - break; - case IS_MTREE_DIRS: - break; - default: - /* This is an irrelevant file. */ - } - free(e); - } - - free(ents); free(path); return (p); } @@ -170,18 +144,21 @@ char * pkgdb_pkg_path(struct pkgdb *db, struct pkg *p) { + char *p_ident; char *new_path; if (db == NULL || p == NULL) { return (NULL); } - new_path = malloc(strlen(db->db_root) + strlen(p->ident) + 1); + new_path = malloc(strlen(db->db_root) + strlen(pkg_ident(p)) + 1); if (new_path == NULL) return (NULL); + + p_ident = pkg_ident(p); strcpy(new_path, db->db_root); - strcat(new_path, p->ident); + strcat(new_path, p_ident); return (new_path); } @@ -204,6 +181,32 @@ return (p); } +/* Giving myself a level of abstraction between queue and pkgdb incase I + * decide to change how the package list is done. */ + +void +pkgdb_pkg_list_init(struct pkgdb *db) { + if (db == NULL) + return; + TAILQ_INIT(&db->p_head); +} + +struct pkg * +pkgdb_pkg_list_first(struct pkgdb *db) { + if (db == NULL) + return (NULL); + + return (TAILQ_FIRST(&db->p_head)); +} + +void +pkgdb_pkg_list_append(struct pkgdb *db, struct pkg *p) { + if (db == NULL || p == NULL) + return; + + TAILQ_INSERT_TAIL(&db->p_head, p, next); +} + /* Free a hierdb. */ void ==== //depot/projects/soc2009/dforsyth_libpkg/pkgdb.h#3 (text+ko) ==== @@ -1,14 +1,18 @@ #ifndef __PKGDB_H__ #define __PKGDB_H__ -#define COMMENT_FILE "+COMMENT" -#define CONTENTS_FILE "+CONTENTS" -#define DESC_FILE "+DESC" -#define DISPLAY_FILE "+DISPLAY" -#define MTREE_DIRS_FILE "+MTREE_DIRS" -#define REQUIRED_BY_FILE "+REQUIRED_BY" +#include "pkg_info.h" +#include + +struct pkg { + TAILQ_ENTRY(pkg) next; -#include + char *ident; /* User given name for this pkg. */ + char *path; + + char *comment; /* Mmmmm, should be 70 or less, right? */ + struct pkg_contents *contents; +}; struct pkgdb { int dirty; /* changes have been made to this database. */ @@ -17,24 +21,17 @@ int p_count; struct pkg *p_curr; - TAILQ_HEAD(pkg_head, next) p_head; + TAILQ_HEAD(pkg_head, pkg) p_head; /* Callbacks */ /* tuuuummmmbbbllleeewwwweeeedddddd*/ }; -// struct pkg_head; -struct pkgdb *pkgdb_new_hierdb(const char *db_root); - -int pkgdb_init_hierdb(struct pkgdb *db); -struct pkg *pkgdb_read_pkg_hierdb(struct pkgdb *db, const char *ident); -struct pkg *pkgdb_next_pkg(struct pkgdb *db); - -struct pkg *pkgdb_query_pkg(struct pkgdb *db, const char *ident); - -char *pkgdb_pkg_path(struct pkgdb *db, struct pkg *p); - -void pkgdb_free_hierdb(struct pkgdb *db); -void pkgdb_free_pkg_list(struct pkgdb *db); +#define COMMENT_FILE "+COMMENT" +#define CONTENTS_FILE "+CONTENTS" +#define DESC_FILE "+DESC" +#define DISPLAY_FILE "+DISPLAY" +#define MTREE_DIRS_FILE "+MTREE_DIRS" +#define REQUIRED_BY_FILE "+REQUIRED_BY" #endif From owner-p4-projects@FreeBSD.ORG Sun May 31 09:30:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A05E41065674; Sun, 31 May 2009 09: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 5FC1E106564A for ; Sun, 31 May 2009 09:30:25 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3375F8FC15 for ; Sun, 31 May 2009 09:30:25 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4V9UPNS043903 for ; Sun, 31 May 2009 09:30:25 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4V9UPES043901 for perforce@freebsd.org; Sun, 31 May 2009 09:30:25 GMT (envelope-from trasz@freebsd.org) Date: Sun, 31 May 2009 09:30:25 GMT Message-Id: <200905310930.n4V9UPES043901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163154 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 09:30:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=163154 Change 163154 by trasz@trasz_victim on 2009/05/31 09:29:42 Fix build, ad 'per' parameter and cosmetical fixes. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#2 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/Makefile#2 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#2 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#2 (text+ko) ==== @@ -49,15 +49,13 @@ #define HRL_SUBJECT_PROCESS 0x0001 #define HRL_SUBJECT_USER 0x0002 #define HRL_SUBJECT_GROUP 0x0003 -#define HRL_SUBJECT_JAIL 0x0004 +#define HRL_SUBJECT_LOGINCLASS 0x0004 +#define HRL_SUBJECT_JAIL 0x0005 #define HRL_SUBJECT_MAX HRL_SUBJECT_JAIL -#define HRL_PER_UNDEFINED 0x0000 -#define HRL_PER_PROCESS 0x0001 -#define HRL_PER_USER 0x0002 -#define HRL_PER_GROUP 0x0003 -#define HRL_PER_JAIL 0x0004 -#define HRL_PER_MAX HRL_PER_JAIL +/* + * 'hl_per' takes the same flags as 'hl_subject'. + */ #define HRL_OBJECT_UNDEFINED 0x0000 #define HRL_OBJECT_CPUTIME 0x0001 ==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/Makefile#2 (text+ko) ==== @@ -1,6 +1,7 @@ # $FreeBSD$ PROG= hrl +MAN= WARNS?= 6 ==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#2 (text+ko) ==== @@ -46,6 +46,9 @@ case HRL_SUBJECT_GROUP: printf("group:%u", (unsigned int)id); break; + case HRL_SUBJECT_LOGINCLASS: + printf("class:%u", (unsigned int)id); + break; case HRL_SUBJECT_JAIL: printf("jail:%u", (unsigned int)id); break; @@ -135,6 +138,32 @@ } } +static void +print_per(int per) +{ + + switch (per) { + case HRL_SUBJECT_PROCESS: + printf("process"); + break; + case HRL_SUBJECT_USER: + printf("user"); + break; + case HRL_SUBJECT_GROUP: + printf("group"); + break; + case HRL_SUBJECT_LOGINCLASS: + printf("class"); + break; + case HRL_SUBJECT_JAIL: + printf("jail"); + break; + default: + printf("undefined<0x%x>", per); + break; + } +} + int main(int argc __unused, char **argv __unused) { @@ -145,6 +174,11 @@ if (error) err(1, "hrl_get"); + if (nentries == 0) { + printf("No resource limits defined.\n"); + return (0); + } + limits = malloc(sizeof(struct hrl_limit) * nentries); if (limits == NULL) err(1, "malloc"); @@ -153,6 +187,8 @@ if (error) err(1, "hrl_get"); + printf("Defined resource limits:\n"); + for (i = 0; i < nentries; i++) { print_subject(limits[i]->hl_subject, limits[i]->hl_subject_id); printf(":"); @@ -160,7 +196,12 @@ printf(":"); print_action(limits[i]->hl_action); printf(":"); - printf("%jd\n", limits[i]->hl_amount); + printf("%jd", limits[i]->hl_amount); + if (limits[i]->hl_subject != limits[i]->hl_per) { + printf("/"); + print_per(limits[i]->hl_per); + } + printf("\n"); } return (0); From owner-p4-projects@FreeBSD.ORG Sun May 31 13:03:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E65F31065670; Sun, 31 May 2009 13:03:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A409A106564A for ; Sun, 31 May 2009 13:03:01 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 781518FC1B for ; Sun, 31 May 2009 13:03:01 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VD315m074296 for ; Sun, 31 May 2009 13:03:01 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VD31vm074278 for perforce@freebsd.org; Sun, 31 May 2009 13:03:01 GMT (envelope-from syl@FreeBSD.org) Date: Sun, 31 May 2009 13:03:01 GMT Message-Id: <200905311303.n4VD31vm074278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163163 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 13:03:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=163163 Change 163163 by syl@syl_rincewind on 2009/05/31 13:02:06 Finish to implement test5 who dump Manufacturer, Product and SerialNumber strings descriptors. Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test5/test5.c#3 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#24 edit Differences ... ==== //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test5/test5.c#3 (text+ko) ==== @@ -9,6 +9,7 @@ main(int ac, const char *av[]) { libusb_device_handle *devh; + libusb_device_descriptor *ddesc; libusb_device **devs_list; char buff[512]; int ret; @@ -18,6 +19,12 @@ printf("This program will print out all the device" " strings descriptors for all the present devices.\n"); + ddesc = malloc(sizeof(libusb_device_descriptor)); + if (ddesc == NULL) { + perror("test5"); + return (EXIT_FAILURE); + } + if (libusb_init(&ctx) != 0) { fprintf(stderr, "libusb_init failed\n"); return (EXIT_FAILURE); @@ -43,12 +50,25 @@ return (EXIT_SUCCESS); } - ret2 = libusb_get_string_descriptor_ascii(devh, 0, buff, 512); - if (ret2 > 0) { - fprintf(stderr, "libusb open error.\n"); - return (EXIT_SUCCESS); + libusb_get_device_descriptor(devs_list[i], ddesc); + + if (ddesc->iManufacturer == 0) { + printf("\tNo Manufacturer string\n"); + } else { + libusb_get_string_descriptor_ascii(devh, ddesc->iManufacturer, buff, 512); + printf("\tManufacturer : %s\n", buff); + } + if (ddesc->iProduct == 0) { + printf("\tNo Product string\n"); + } else { + libusb_get_string_descriptor_ascii(devh, ddesc->iProduct, buff, 512); + printf("\tProduct : %s\n", buff); + } + if (ddesc->iSerialNumber == 0) { + printf("\tNo Serial Number string\n"); } else { - printf("string desc size : %i\n", ret2); + libusb_get_string_descriptor_ascii(devh, ddesc->iSerialNumber, buff, 512); + printf("\tSerialNumber : %s\n", buff); } } return (EXIT_SUCCESS); ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#24 (text+ko) ==== @@ -679,7 +679,7 @@ { pthread_mutex_lock(&libusb20_lock); - switch (libusb20_tr_get_status(usb20_xfer)) { + switch (libusb20_tr_get_status(xfer)) { case LIBUSB20_TRANSFER_COMPLETED: xfer->status = LIBUSB_TRANSFER_COMPLETED; break ; From owner-p4-projects@FreeBSD.ORG Sun May 31 13:12:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3308E1065673; Sun, 31 May 2009 13:12:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E74FC106566C for ; Sun, 31 May 2009 13:12:10 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D4FC68FC0C for ; Sun, 31 May 2009 13:12:10 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VDCAL2075345 for ; Sun, 31 May 2009 13:12:10 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VDCA55075343 for perforce@freebsd.org; Sun, 31 May 2009 13:12:10 GMT (envelope-from syl@FreeBSD.org) Date: Sun, 31 May 2009 13:12:10 GMT Message-Id: <200905311312.n4VDCA55075343@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163164 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 13:12:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=163164 Change 163164 by syl@syl_rincewind on 2009/05/31 13:11:38 Implement last test for libusb-1.0 descriptors. This test dump the config descriptor with bConfigurationValue == 1. The descriptors emulation for libusb-1.0 seems to works fine. Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test4/test4.c#2 edit Differences ... ==== //depot/projects/soc2009/syl_usb/libusb-tests/descriptors/test4/test4.c#2 (text+ko) ==== @@ -3,8 +3,85 @@ #include #include +libusb_context *ctx; + int main(int ac, const char *av[]) { + libusb_device **devs_list; + libusb_config_descriptor *cdesc; + libusb_interface_descriptor *idesc; + libusb_endpoint_descriptor *edesc; + int nb; + int ret; + int i, j, k, l; + + printf("This program will dump the device" + " config descriptor with bConfiguartion == 1 for all the" + " present devices.\n"); + + if (libusb_init(&ctx) != 0) { + fprintf(stderr, "libusb_init failed\n"); + return (EXIT_FAILURE); + } + + if ((nb = libusb_get_device_list(ctx, &devs_list)) < 0) { + fprintf(stderr, "libusb_get_device_list failed with 0x%x error code\n", + nb); + return (EXIT_FAILURE); + } + + if (nb == 0) { + fprintf(stderr, "No device match or lack of permissions.\n"); + return (EXIT_SUCCESS); + } + printf("\nThere are %i devices\n\n", ret); + for (i = 0 ; i < nb ; i++) { + printf("|-- device number = %i\n|\n", i); + ret = libusb_get_config_descriptor_by_value(devs_list[i], 1, &cdesc); + if (ret == LIBUSB_SUCCESS) { + printf("|---- CONFIG :\n"); + printf("|---- bLength : 0x%.2x\n", cdesc->bLength); + printf("|---- bDescriptorType : 0x%.2x\n", cdesc->bDescriptorType); + printf("|---- wTotalLength : 0x%.2x\n", cdesc->wTotalLength); + printf("|---- bNumInterfaces : 0x%.2x\n", cdesc->bNumInterfaces); + printf("|---- bConfigurationValue : 0x%.2x\n", cdesc->bConfigurationValue); + printf("|---- iConfiguration : 0x%.2x\n", cdesc->iConfiguration); + printf("|---- bmAttributes : 0x%.2x\n", cdesc->bmAttributes); + printf("|---- MaxPower : 0x%.2x\n|\n", cdesc->MaxPower); + for (j = 0 ; j < cdesc->bNumInterfaces ; j++) { + for (k = 0 ; k < cdesc->interface[j].num_altsetting ; k++) { + idesc = &cdesc->interface[j].altsetting[k]; + printf("|------ INTERFACE :\n"); + printf("|------ Interface %i%i\n", j, k); + printf("|------ bLength 0x%.2x\n", idesc->bLength); + printf("|------ bDescriptorType 0x%.2x\n", idesc->bDescriptorType); + printf("|------ bInterfaceNumber 0x%.2x\n", idesc->bInterfaceNumber); + printf("|------ bAlternateSetting 0x%.2x\n", idesc->bAlternateSetting); + printf("|------ bNumEndpoints 0x%.2x\n", idesc->bNumEndpoints); + printf("|------ bInterfaceClass 0x%.2x\n", idesc->bInterfaceClass); + printf("|------ bInterfaceSubClass 0x%.2x\n", idesc->bInterfaceSubClass); + printf("|------ bInterfaceProtocol 0x%.2x\n", idesc->bInterfaceProtocol); + printf("|------ iInterface 0x%.2x\n|\n", idesc->iInterface); + for (l = 0 ; l < idesc->bNumEndpoints ; l++) { + edesc = &idesc->endpoint[l]; + printf("|-------- DESCRIPTOR :\n"); + printf("|-------- bLength 0x%.2x\n", edesc->bLength); + printf("|-------- bDescriptorType 0x%.2x\n", edesc->bDescriptorType); + printf("|-------- bEndpointAddress 0x%.2x\n", edesc->bEndpointAddress); + printf("|-------- bmAttributes 0x%.2x\n", edesc->bmAttributes); + printf("|-------- wMaxPacketSize 0x%.4x\n", edesc->wMaxPacketSize); + printf("|-------- bInterval 0x%.2x\n", edesc->bInterval); + printf("|-------- bRefresh 0x%.2x\n", edesc->bRefresh); + printf("|-------- bSynchAddress 0x%.2x\n|\n", edesc->bSynchAddress); + } + } + } + } else { + fprintf(stderr, "libusb_get_config_descriptor_by_value failed\n"); + return (EXIT_FAILURE); + } + libusb_free_config_descriptor(cdesc); + } return (EXIT_SUCCESS); } From owner-p4-projects@FreeBSD.ORG Sun May 31 13:20:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 913E71065674; Sun, 31 May 2009 13:20:19 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D6B3106564A for ; Sun, 31 May 2009 13:20:19 +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 3A7B08FC0C for ; Sun, 31 May 2009 13:20:19 +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 n4VDKJxN076068 for ; Sun, 31 May 2009 13:20:19 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VDKJVU076066 for perforce@freebsd.org; Sun, 31 May 2009 13:20:19 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Sun, 31 May 2009 13:20:19 GMT Message-Id: <200905311320.n4VDKJVU076066@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 163165 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 13:20:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=163165 Change 163165 by zhaoshuai@zhaoshuai on 2009/05/31 13:20:06 new version of subr_pipe.c and sys_pipe.c, tested Affected files ... .. //depot/projects/soc2009/fifo/sys/conf/files#3 edit .. //depot/projects/soc2009/fifo/sys/kern/subr_pipe.c#2 edit .. //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#5 edit .. //depot/projects/soc2009/fifo/sys/sys/pipe.h#4 edit Differences ... ==== //depot/projects/soc2009/fifo/sys/conf/files#3 (text+ko) ==== @@ -1988,6 +1988,7 @@ kern/subr_msgbuf.c standard kern/subr_param.c standard kern/subr_pcpu.c standard +kern/subr_pipe.c standard kern/subr_power.c standard kern/subr_prf.c standard kern/subr_prof.c standard ==== //depot/projects/soc2009/fifo/sys/kern/subr_pipe.c#2 (text+ko) ==== @@ -175,7 +175,6 @@ &piperesizeallowed, 0, "Pipe resizing allowed"); static void pipeinit(void *dummy __unused); -static void pipeclose(struct pipe *cpipe); static void pipe_free_kmem(struct pipe *cpipe); static int pipe_create(struct pipe *pipe, int backing); static __inline int pipelock(struct pipe *cpipe, int catch); @@ -446,7 +445,6 @@ return (error); } -/* ARGSUSED */ int generic_pipe_read(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, struct thread *td) @@ -1261,7 +1259,7 @@ * We shouldn't need locks here as we're doing a read and this should * be a natural race. */ -static int +int generic_pipe_stat(struct file *fp, struct stat *ub, struct ucred *active_cred, struct thread *td) { @@ -1323,8 +1321,7 @@ * shutdown the pipe */ void -pipeclose(cpipe) - struct pipe *cpipe; +pipeclose(struct pipe *cpipe) { struct pipepair *pp; struct pipe *ppipe; @@ -1489,23 +1486,25 @@ } int -generic_pipe_create(struct pipepair **p_pp, struct thread *td) +generic_pipe_create(struct thread *td, struct pipe **p_rpipe, struct pipe **p_wpipe) { struct pipepair *pp; struct pipe *rpipe, *wpipe; + int error; pp = uma_zalloc(pipe_zone, M_WAITOK); - *p_pp = pp; rpipe = &pp->pp_rpipe; wpipe = &pp->pp_wpipe; + *p_rpipe = rpipe; + *p_wpipe = wpipe; knlist_init(&rpipe->pipe_sel.si_note, PIPE_MTX(rpipe), NULL, NULL, NULL); knlist_init(&wpipe->pipe_sel.si_note, PIPE_MTX(wpipe), NULL, NULL, NULL); - if (pipe_create(rpipe, 1) != 0 || - pipe_create(wpipe, 0) != 0) { + if ((error = pipe_create(rpipe, 1)) != 0 || + (error = pipe_create(wpipe, 0)) != 0) { pipeclose(rpipe); pipeclose(wpipe); return (error); ==== //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#5 (text+ko) ==== @@ -74,16 +74,16 @@ { struct filedesc *fdp = td->td_proc->p_fd; struct file *rf, *wf; - struct pipepair *pp; + struct pipe *rpipe, *wpipe; int fd, error; - if ((error = generic_pipe_create(&pp, td)) != 0) + if ((error = generic_pipe_create(td, &rpipe, &wpipe)) != 0) return (error); error = falloc(td, &rf, &fd); if (error) { - pipeclose(&pp->rpipe); - pipeclose(&pp->wpipe); + pipeclose(rpipe); + pipeclose(wpipe); return (error); } /* An extra reference on `rf' has been held for us by falloc(). */ @@ -95,17 +95,17 @@ * to avoid races against processes which manage to dup() the read * side while we are blocked trying to allocate the write side. */ - finit(rf, FREAD | FWRITE, DTYPE_PIPE, &pp->rpipe, &pipeops); + finit(rf, FREAD | FWRITE, DTYPE_PIPE, rpipe, &pipeops); error = falloc(td, &wf, &fd); if (error) { fdclose(fdp, rf, fildes[0], td); fdrop(rf, td); /* rpipe has been closed by fdrop(). */ - pipeclose(&pp->wpipe); + pipeclose(wpipe); return (error); } /* An extra reference on `wf' has been held for us by falloc(). */ - finit(wf, FREAD | FWRITE, DTYPE_PIPE, &pp->wpipe, &pipeops); + finit(wf, FREAD | FWRITE, DTYPE_PIPE, wpipe, &pipeops); fdrop(wf, td); fildes[1] = fd; fdrop(rf, td); @@ -175,6 +175,9 @@ return generic_pipe_stat(fp, ub, active_cred, td); } +/* + * TODO: implement generic_pipe_close() in subr_pipe.c + */ static int pipe_close(struct file *fp, struct thread *td) { ==== //depot/projects/soc2009/fifo/sys/sys/pipe.h#4 (text+ko) ==== @@ -139,13 +139,20 @@ #define PIPE_UNLOCK(pipe) mtx_unlock(PIPE_MTX(pipe)) #define PIPE_LOCK_ASSERT(pipe, type) mtx_assert(PIPE_MTX(pipe), (type)) -/* - * The following functions are used by FIFO, - * see fs/fifo_vnops.c - */ -struct pipepair *pipepair_create(void); -fo_rdwr_t pipe_read; -fo_rdwr_t pipe_write; -void pipeclose(struct pipe *); +void pipeclose(struct pipe *cpipe); +int generic_pipe_read(struct file *fp, struct uio *uio, struct ucred *active_cred, + int flags, struct thread *td); +int generic_pipe_write(struct file *fp, struct uio *uio, struct ucred *active_cred, + int flags, struct thread *td); +int generic_pipe_truncate(struct file *fp, off_t length, struct ucred *active_cred, + struct thread *td); +int generic_pipe_ioctl(struct file *fp, u_long cmd, void *data, struct ucred *active_cred, + struct thread *td); +int generic_pipe_poll(struct file *fp, int events, struct ucred *active_cred, + struct thread *td); +int generic_pipe_stat(struct file *fp, struct stat *ub, struct ucred *active_cred, + struct thread *td); +int generic_pipe_kqfilter(struct file *fp, struct knote *kn); +int generic_pipe_create(struct thread *td, struct pipe **p_rpipe, struct pipe **p_wpipe); #endif /* !_SYS_PIPE_H_ */ From owner-p4-projects@FreeBSD.ORG Sun May 31 14:27:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1097A1065673; Sun, 31 May 2009 14:27:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0A3E106566C for ; Sun, 31 May 2009 14:27:27 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8467D8FC14 for ; Sun, 31 May 2009 14:27:27 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VERRHl085980 for ; Sun, 31 May 2009 14:27:27 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VERRTT085978 for perforce@freebsd.org; Sun, 31 May 2009 14:27:27 GMT (envelope-from syl@FreeBSD.org) Date: Sun, 31 May 2009 14:27:27 GMT Message-Id: <200905311427.n4VERRTT085978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163168 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 14:27:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=163168 Change 163168 by syl@syl_rincewind on 2009/05/31 14:26:27 Import of a test that dumps all the bus numbers and device addresses. Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/basic/test1/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/basic/test1/test1.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 31 15:38:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CBEC1065672; Sun, 31 May 2009 15:38: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 8CAAA106566B for ; Sun, 31 May 2009 15:38:40 +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 799638FC12 for ; Sun, 31 May 2009 15:38:40 +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 n4VFceMp093002 for ; Sun, 31 May 2009 15:38:40 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VFceGk092998 for perforce@freebsd.org; Sun, 31 May 2009 15:38:40 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 31 May 2009 15:38:40 GMT Message-Id: <200905311538.n4VFceGk092998@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 163173 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 15:38:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=163173 Change 163173 by rene@rene_self on 2009/05/31 15:37:43 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#22 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#22 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#30 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#20 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#27 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#20 integrate .. //depot/projects/docproj_nl/share/pgpkeys/avl.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/bcr.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/kmoore.key#1 branch .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#18 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#18 integrate .. //depot/projects/docproj_nl/share/pgpkeys/zml.key#1 branch .. //depot/projects/docproj_nl/www/en/developers.sgml#18 integrate .. //depot/projects/docproj_nl/www/en/gnome/contact.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/develfaq.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/gnome/images/Makefile#3 integrate .. //depot/projects/docproj_nl/www/en/platforms/amd64/motherboards.sgml#5 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#42 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#22 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + &xfree86; project or the X.Org project. This is the same code as Linux uses. BSD does not normally - specify a graphical desktop such as GNOME or KDE, + specify a graphical desktop such as GNOME or KDE, though these are available. @@ -120,7 +120,7 @@ It is true that AT&T &unix; is not open source, and in a copyright sense BSD is very definitely not &unix;, but on the other hand, AT&T has imported sources from other projects, - noticeably the Computer Sciences Research Group of the University of + noticeably the Computer Sciences Research Group (CSRG) of the University of California in Berkeley, CA. Starting in 1976, the CSRG started releasing tapes of their software, calling them Berkeley Software Distribution or BSD. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/config/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -359,67 +359,6 @@ important aspect to consider is that their start up configuration can be handled through simple startup scripts. - Before the advent of rc.d, applications would drop a - simple start up script into the - /usr/local/etc/rc.d - directory which would be read by the system initialization - scripts. These scripts would then be executed during the latter - stages of system start up. - - While many individuals have spent hours trying to merge the - old configuration style into the new system, the fact remains - that some third party utilities still require a script simply - dropped into the aforementioned directory. The subtle differences - in the scripts depend whether or not rc.d is being used. Prior - to &os; 5.1 the old configuration style is used and in - almost all cases a new style script would do just fine. - - While every script must meet some minimal requirements, most - of the time these requirements are &os; version - agnostic. Each script must be executable by the system; this is - typically achieved by using the chmod command and - setting the unique permissions of 555. There should - also be, at minimal, options to start and stop - the application. - - The simplest start up script would probably look a little - bit like this one: - - #!/bin/sh -echo -n ' utility' - -case "$1" in -start) - /usr/local/bin/utility - ;; -stop) - kill -9 `cat /var/run/utility.pid` - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac - -exit 0 - - This script provides for a stop and - start option for - the application hereto referred simply as - utility. - - Could be started manually with: - - &prompt.root; /usr/local/etc/rc.d/utility start - - While not all third party software requires the line in - rc.conf, almost every day a new port will - be modified to accept this configuration. Check the final output - of the installation for more information on a specific - application. Some third party software will provide start up - scripts which permit the application to be used with - rc.d; although, this will be discussed in the next section. - Extended Application Configuration @@ -439,14 +378,6 @@ # REQUIRE: DAEMON # KEYWORD: shutdown -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# SET THEM IN THE /etc/rc.conf FILE -# -utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - . /etc/rc.subr name="utility" @@ -455,15 +386,20 @@ load_rc_config $name +# +# DO NOT CHANGE THESE DEFAULT VALUES HERE +# SET THEM IN THE /etc/rc.conf FILE +# +utility_enable=${utility_enable-"NO"} +utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} + pidfile="${utility_pidfile}" -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" - run_rc_command "$1" This script will ensure that the provided utility will be started after the - daemon service. It also provides a method + DAEMON pseudo-service. It also provides a method for setting and tracking the PID, or process ID file. @@ -484,15 +420,15 @@ Other services, such as POP3 server daemons, IMAP, etc. could be started using - the &man.inetd.8;. This involves installing the service + &man.inetd.8;. This involves installing the service utility from the Ports Collection with a configuration line - appended to the /etc/inetd.conf file, - or uncommenting one of the current configuration lines. Working + added to the /etc/inetd.conf file, + or by uncommenting one of the current configuration lines. Working with inetd and its configuration is described in depth in the inetd section. - In some cases, it may be more plausible to use the + In some cases it may make more sense to use the &man.cron.8; daemon to start system services. This approach has a number of advantages because cron runs these processes as the crontab's file ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#30 (text+ko) ==== @@ -1,7 +1,7 @@ + 702102 + May 28, 2009 + 7.2-STABLE after MFC of the + fdopendir function. + + + 800000 October 11, 2007 8.0-CURRENT. Separating wide and single byte @@ -13113,6 +13120,40 @@ 8.0-CURRENT after adding UDP control block support. + + 800090 + May 23, 2009 + 8.0-CURRENT after virtualizing interface + cloning. + + + 800091 + May 27, 2009 + 8.0-CURRENT after adding hierarchical jails + and removing global securelevel. + + + + 800092 + May 29, 2009 + 8.0-CURRENT after chaning + sx_init_flags() KPI. The + SX_ADAPTIVESPIN is retired and + a new SX_NOADAPTIVE flag is + introduced in order to handle the reversed logic. + + + + 800093 + May 30, 2009 + 8.0-CURRENT after changing the polling KPI. + The polling handlers now return the number of packets + processed. A new + IFCAP_POLLING_NOCOUNT is also + introduced to specify that the return value is + not significant and the counting should be + skipped. + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#20 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.479 2009/05/22 21:46:28 jilles Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.483 2009/05/29 16:10:25 bcr Exp $ --> aaron@FreeBSD.org"> @@ -96,6 +96,8 @@ avg@FreeBSD.org"> +avl@FreeBSD.org"> + awebster@pubnix.net"> az@FreeBSD.org"> @@ -108,6 +110,8 @@ bbraun@FreeBSD.org"> +bcr@FreeBSD.org"> + bde@FreeBSD.org"> bean@FreeBSD.org"> @@ -590,6 +594,8 @@ kmacy@FreeBSD.org"> +kmoore@FreeBSD.org"> + knu@FreeBSD.org"> koitsu@FreeBSD.org"> @@ -1174,5 +1180,7 @@ zec@FreeBSD.org"> +zml@FreeBSD.org"> + znerd@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#27 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -756,6 +756,16 @@ &pgpkey.rene; + + &a.zml; + &pgpkey.zml; + + + + &a.avl; + &pgpkey.avl; + + &a.scottl; &pgpkey.scottl; @@ -846,6 +856,11 @@ &pgpkey.marcel; + + &a.kmoore; + &pgpkey.kmoore; + + &a.marck; &pgpkey.marck; @@ -1026,6 +1041,11 @@ &pgpkey.rees; + + &a.bcr; + &pgpkey.bcr; + + &a.trhodes; &pgpkey.trhodes; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#18 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -23,8 +23,10 @@ + + @@ -146,6 +148,7 @@ + @@ -311,6 +314,7 @@ + ==== //depot/projects/docproj_nl/www/en/developers.sgml#18 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.221 2009/05/22 22:04:35 jilles Exp $ +$FreeBSD: www/en/developers.sgml,v 1.224 2009/05/29 16:12:22 bcr Exp $ --> @@ -51,12 +51,14 @@ + + @@ -296,6 +298,7 @@ + ==== //depot/projects/docproj_nl/www/en/gnome/contact.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -44,16 +44,6 @@ - - jylefort - - - Jean-Yves Lefort - (jylefort@FreeBSD.org)
- IRC (FreeNode): decadix - - - Jeremy Messenger (mezz@FreeBSD.org)
@@ -95,17 +85,6 @@ IRC (FreeNode): ahze - - - Pav Lucistnik - (pav@FreeBSD.org)
- WWW: www.oook.cz
- IRC (FreeNode): Pav - - - pav - - @@ -119,9 +98,11 @@
  • Ade Lovett
  • Dima Ruban
  • Eivind Eklund
    • +
  • Jean-Yves Lefort
  • Jimmy Olgeni
  • Justin M. Seger
  • Maxim Sobolev
    • +
  • Pav Lucistnik
  • Vanilla I. Shu
    • ==== //depot/projects/docproj_nl/www/en/gnome/docs/develfaq.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -158,9 +158,8 @@

  • What is the current state of development GNOME on FreeBSD?

    -

    Because of the long ports tree freeze, we have not yet - started work on GNOME &gnomedevelver;. Stay tuned for more - updates.

    +

    GNOME &gnomedevelver; is underway. We have ported + &gnomedevelver;.2 to FreeBSD. Start testing now!

    • &footer; ==== //depot/projects/docproj_nl/www/en/gnome/images/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/gnome/images/Makefile,v 1.54 2009/01/18 23:52:33 marcus Exp $ +# $FreeBSD: www/en/gnome/images/Makefile,v 1.55 2009/05/30 19:39:32 marcus Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -34,6 +34,5 @@ DATA+= kwm.jpg DATA+= marcus.jpg DATA+= mezz.jpg -DATA+= pav.jpg .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_nl/www/en/platforms/amd64/motherboards.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -1079,6 +1079,14 @@ Supermicro + X7DBE+ + Intel 5000P / 2x LGA 771 + Alexander Lunyov (dmesg, pciconf) + 7.2-RELEASE + Works fine. Onboard RAID untested. + + + Supermicro X7SBA Intel 3210 + ICH9R / LGA 775 Brad Davis ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#42 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.256 2009/05/22 22:08:41 jilles Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.259 2009/05/29 16:18:46 bcr Exp $ @@ -36,6 +36,34 @@ 5 + 28 + + +

    New committer: Alexander + Logvinov + (ports)

    +     +     + + + 27 + + +

    New committer: Kris + Moore (ports)

    +     +     + + + 23 + + +

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

    +     +     + + 22 From owner-p4-projects@FreeBSD.ORG Sun May 31 16:01:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 551B61065676; Sun, 31 May 2009 16:01:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 128F21065672 for ; Sun, 31 May 2009 16:01:03 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 015AC8FC20 for ; Sun, 31 May 2009 16:01:03 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VG12KV094783 for ; Sun, 31 May 2009 16:01:02 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VG12cv094781 for perforce@freebsd.org; Sun, 31 May 2009 16:01:02 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 31 May 2009 16:01:02 GMT Message-Id: <200905311601.n4VG12cv094781@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 163174 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 16:01:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=163174 Change 163174 by rene@rene_self on 2009/05/31 16:00:19 Fix location of my entity name. Submitted by: avl Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#23 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#23 (text+ko) ==== @@ -703,6 +703,10 @@ + &a.rene; + + + &a.clement; @@ -823,10 +827,6 @@ - &a.rene; - - - &a.zml; From owner-p4-projects@FreeBSD.ORG Sun May 31 16:13:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8BDD106566C; Sun, 31 May 2009 16:13: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 842E8106567B for ; Sun, 31 May 2009 16:13:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 726F08FC23 for ; Sun, 31 May 2009 16:13:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VGDF6L096688 for ; Sun, 31 May 2009 16:13:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VGDFwk096686 for perforce@freebsd.org; Sun, 31 May 2009 16:13:15 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 31 May 2009 16:13:15 GMT Message-Id: <200905311613.n4VGDFwk096686@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 163175 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 16:13:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=163175 Change 163175 by rene@rene_self on 2009/05/31 16:12:47 MFen articles/explaining-bsd 1.22 -> 1.23 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#13 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#13 (text+ko) ==== @@ -2,7 +2,7 @@ - + @@ -111,8 +111,9 @@ het X.Org project. Linux gebruikt dezelfde code. BSD specificeert normaliter geen - grafisch bureaublad zoals GNOME of KDE, deze - zijn wel beschikbaar.     + grafisch bureaublad zoals + GNOME of + KDE, deze zijn wel beschikbaar.     @@ -134,7 +135,7 @@ betreft copyright is BSD zeer zeker niet &unix;, maar van de andere kant heeft AT&T bronnen geïmporteerd van andere projecten, nota bene de Computer - Science Research Group van de University of California in + Science Research Group (CSRG) van de University of California in Berkeley, CA. In 1976 is de CSRG begonnen met het uitgeven van tapes van hun software, die ze Berkeley Software Distribution of BSD From owner-p4-projects@FreeBSD.ORG Sun May 31 16:53:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAADC1065670; Sun, 31 May 2009 16:53: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 A9693106566B for ; Sun, 31 May 2009 16:53:58 +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 9540A8FC19 for ; Sun, 31 May 2009 16:53:58 +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 n4VGrwbn009830 for ; Sun, 31 May 2009 16:53:58 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VGrvAx009828 for perforce@freebsd.org; Sun, 31 May 2009 16:53:57 GMT (envelope-from zec@fer.hr) Date: Sun, 31 May 2009 16:53:57 GMT Message-Id: <200905311653.n4VGrvAx009828@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 163177 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 16:53:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=163177 Change 163177 by zec@zec_tpx32 on 2009/05/31 16:53:29 IFC @ 163176 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#26 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#38 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#19 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#13 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#28 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_textdump.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-usb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_console.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/if_fwe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_usb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iwn/if_iwn.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mge.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2560.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/rp/rp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/si/si.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sis/if_sis.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smc/if_smc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudioreg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/daemon/daemon_saver.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci_atmelarm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/uhid.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_aue.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cue.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kue.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_rue.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udav.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uark.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubsa.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubser.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ucycom.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ufoma.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uipaq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umoscom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uslcom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvisor.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvscom.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/urio.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_msc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_ioctl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbhid.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumvar.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uath.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uathvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uralvar.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/vr/if_vr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xl/if_xl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsport.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_io.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/geom/label/g_label.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_drive.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/dump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/minidump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_socksys.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/xen/clock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/mp_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/vimage-commit2/src/sys/i386/xen/xen_rtc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_cpu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mib.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mutex.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_osd.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rmlock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sx.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#48 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_xxx.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#8 integrate .. //depot/projects/vimage-commit2/src/sys/kgssapi/gsstest.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#23 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/geom/geom_part/geom_part_ebr/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#69 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#28 integrate .. //depot/projects/vimage-commit2/src/sys/net/pfil.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_dfs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_superg.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_tdma.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_sysctl.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_uio.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_advlock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/pci/if_rl.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/machdep.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/NOTES#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/cpufreq/dfs.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/ofw/ofw_cpu.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/pmu.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powermac/vcoregpio.c#1 branch .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/cpu.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/authunix_prot.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/xdr.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/hvcons.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/cpu.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/jail.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/kernel.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#12 integrate .. //depot/projects/vimage-commit2/src/sys/sys/namei.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#40 integrate .. //depot/projects/vimage-commit2/src/sys/sys/priv.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sockio.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sx.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/sys/tty.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#69 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_page.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn.c#8 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/dump_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.18 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/minidump_machdep.c#13 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.10 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.7 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.8 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.15 2009/05/23 19:14:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.17 2009/05/30 18:23:55 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -229,7 +229,7 @@ static void npe_txdone(int qid, void *arg); static int npe_rxbuf_init(struct npe_softc *, struct npebuf *, struct mbuf *); -static void npe_rxdone(int qid, void *arg); +static int npe_rxdone(int qid, void *arg); static void npeinit(void *); static void npestart_locked(struct ifnet *); static void npestart(struct ifnet *); @@ -777,7 +777,7 @@ */ sc->rx_qid = npeconfig[sc->sc_npeid].rx_qid; ixpqmgr_qconfig(sc->rx_qid, npe_rxbuf, 0, 1, - IX_QMGR_Q_SOURCE_ID_NOT_E, npe_rxdone, sc); + IX_QMGR_Q_SOURCE_ID_NOT_E, (qconfig_hand_t *)npe_rxdone, sc); sc->rx_freeqid = npeconfig[sc->sc_npeid].rx_freeqid; ixpqmgr_qconfig(sc->rx_freeqid, npe_rxbuf, 0, npe_rxbuf/2, 0, NULL, sc); /* @@ -1091,7 +1091,7 @@ * from the hardware queue and pass the frames up the * stack. Pass the rx buffers to the free list. */ -static void +static int npe_rxdone(int qid, void *arg) { #define P2V(a, dma) \ @@ -1099,6 +1099,7 @@ struct npe_softc *sc = arg; struct npedma *dma = &sc->rxdma; uint32_t entry; + int rx_npkts = 0; while (ixpqmgr_qread(qid, &entry) == 0) { struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry), dma); @@ -1132,6 +1133,7 @@ ifp->if_ipackets++; ifp->if_input(ifp, mrx); + rx_npkts++; } else { /* discard frame and re-use mbuf */ m = npe->ix_m; @@ -1143,19 +1145,22 @@ /* XXX should not happen */ } } + return rx_npkts; #undef P2V } #ifdef DEVICE_POLLING -static void +static int npe_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct npe_softc *sc = ifp->if_softc; + int rx_npkts = 0; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - npe_rxdone(sc->rx_qid, sc); + rx_npkts = npe_rxdone(sc->rx_qid, sc); npe_txdone(sc->tx_doneqid, sc); /* XXX polls both NPE's */ } + return rx_npkts; } #endif /* DEVICE_POLLING */ ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.5 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.6 2009/05/30 15:14:44 attilio Exp $"); /* * Intel XScale Queue Manager support. @@ -338,7 +338,7 @@ int ixpqmgr_qconfig(int qId, int qEntries, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg) + qconfig_hand_t *cb, void *cbarg) { struct ixpqmgr_softc *sc = ixpqmgr_sc; struct qmgrInfo *qi = &sc->qinfo[qId]; ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.1 2006/11/19 23:55:23 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.2 2009/05/30 15:14:44 attilio Exp $ */ /*- @@ -229,8 +229,10 @@ #define IX_QMGR_ENTRY2_OFFSET 1 #define IX_QMGR_ENTRY4_OFFSET 3 +typedef void qconfig_hand_t(int, void *); + int ixpqmgr_qconfig(int qId, int qSizeInWords, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg); + qconfig_hand_t *cb, void *cbarg); int ixpqmgr_qwrite(int qId, uint32_t entry); int ixpqmgr_qread(int qId, uint32_t *entry); int ixpqmgr_qreadm(int qId, uint32_t n, uint32_t *p); ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/net.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.7 2008/11/19 17:34:28 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.8 2009/05/30 19:28:38 marcel Exp $"); #include #include @@ -46,12 +46,6 @@ #include "glue.h" #include "libuboot.h" -#define NETIF_DEBUG -#define NETIF_VERBOSE_DEBUG -#undef NETIF_DEBUG -#undef NETIF_VERBOSE_DEBUG - - static int net_probe(struct netif *, void *); static int net_match(struct netif *, void *); static void net_init(struct iodesc *, void *); @@ -138,7 +132,7 @@ #if defined(NETIF_DEBUG) struct ether_header *eh; - printf("net_put: desc 0x%x, pkt 0x%x, len %d\n", desc, pkt, len); + printf("net_put: desc %p, pkt %p, len %d\n", desc, pkt, len); eh = pkt; printf("dst: %s ", ether_sprintf(eh->ether_dhost)); printf("src: %s ", ether_sprintf(eh->ether_shost)); @@ -175,7 +169,7 @@ int err, rlen; #if defined(NETIF_DEBUG) - printf("net_get: pkt %x, len %d, timeout %d\n", pkt, len, timeout); + printf("net_get: pkt %p, len %d, timeout %d\n", pkt, len, timeout); #endif t = getsecs(); do { ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#4 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.2 2009/05/08 14:11:06 zec Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.3 2009/05/29 21:27:12 jamie Exp $ * */ @@ -31,11 +31,11 @@ #include #include #include +#include #include #include #include #include -#include cpu_core_t cpu_core[MAXCPU]; kmutex_t cpu_lock; @@ -83,7 +83,7 @@ switch (type) { case MOD_LOAD: - utsname.nodename = G_hostname; + utsname.nodename = prison0.pr_host; break; case MOD_UNLOAD: ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#5 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.5 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.6 2009/05/29 21:27:12 jamie Exp $"); #include +#include #include #include #include @@ -57,7 +58,7 @@ { if (str == hw_serial) { - *result = hostid; + *result = prison0.pr_hostid; return (0); } ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mutex.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mutex.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -47,9 +47,9 @@ typedef struct sx kmutex_t; #ifndef DEBUG -#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define MUTEX_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK) #endif #define mutex_init(lock, desc, type, arg) do { \ ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/rwlock.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/rwlock.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -49,9 +49,9 @@ typedef struct sx krwlock_t; #ifndef DEBUG -#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define RW_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK) #endif #define RW_READ_HELD(x) (rw_read_held((x))) ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 (text+ko) ==== @@ -564,8 +564,13 @@ if (fp->gfs_parent == NULL || (vp->v_flag & V_XATTRDIR)) goto found; - dp = fp->gfs_parent->v_data; - + /* + * XXX cope with a FreeBSD-specific race wherein the parent's + * snapshot data can be freed before the parent is + */ + if ((dp = fp->gfs_parent->v_data) == NULL) + return (NULL); + /* * First, see if this vnode is cached in the parent. */ ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 (text+ko) ==== @@ -2392,13 +2392,23 @@ /* * Check the vdev configuration to ensure that it's capable of supporting - * a root pool. Currently, we do not support RAID-Z or partial configuration. - * In addition, only a single top-level vdev is allowed and none of the leaves - * can be wholedisks. + * a root pool. + * + * On Solaris, we do not support RAID-Z or partial configuration. In + * addition, only a single top-level vdev is allowed and none of the + * leaves can be wholedisks. + * + * For FreeBSD, we can boot from any configuration. There is a + * limitation that the boot filesystem must be either uncompressed or + * compresses with lzjb compression but I'm not sure how to enforce + * that here. */ boolean_t vdev_is_bootable(vdev_t *vd) { +#ifdef __FreeBSD_version + return (B_TRUE); +#else int c; if (!vd->vdev_ops->vdev_op_leaf) { @@ -2420,4 +2430,5 @@ return (B_FALSE); } return (B_TRUE); +#endif } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#5 (text+ko) ==== @@ -3121,3 +3121,4 @@ }; DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1); +MODULE_DEPEND(zfsctrl, krpc, 1, 1, 1); ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#19 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.236 2009/05/10 18:43:43 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.237 2009/05/29 21:27:12 jamie Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -64,7 +64,6 @@ #include #include #include -#include #include @@ -715,10 +714,10 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { - INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; + struct prison *pr; char *p; #ifdef DEBUG @@ -741,9 +740,10 @@ } strlcpy(utsname.machine, linux_platform, LINUX_MAX_UTSNAME); - mtx_lock(&hostname_mtx); - strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); - mtx_unlock(&hostname_mtx); + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + strlcpy(utsname.domainname, pr->pr_domain, LINUX_MAX_UTSNAME); + mtx_unlock(&pr->pr_mtx); return (copyout(&utsname, args->buf, sizeof(utsname))); } ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#19 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.92 2009/05/19 09:10:53 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.95 2009/05/31 12:16:31 dchagin Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -445,8 +445,6 @@ return (-1); } - - static int linux_to_bsd_msghdr(struct msghdr *bhdr, const struct l_msghdr *lhdr) { @@ -477,6 +475,24 @@ } static int +linux_set_socket_flags(struct thread *td, int s, int flags) +{ + int error; + + if (flags & LINUX_SOCK_NONBLOCK) { + error = kern_fcntl(td, s, F_SETFL, O_NONBLOCK); + if (error) + return (error); + } + if (flags & LINUX_SOCK_CLOEXEC) { + error = kern_fcntl(td, s, F_SETFD, FD_CLOEXEC); + if (error) + return (error); + } + return (0); +} + +static int linux_sendit(struct thread *td, int s, struct msghdr *mp, int flags, struct mbuf *control, enum uio_seg segflg) { @@ -610,21 +626,11 @@ if (retval_socket) return (retval_socket); - if (socket_flags & LINUX_SOCK_NONBLOCK) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFL, O_NONBLOCK); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } - } - if (socket_flags & LINUX_SOCK_CLOEXEC) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFD, FD_CLOEXEC); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } + retval_socket = linux_set_socket_flags(td, td->td_retval[0], + socket_flags); + if (retval_socket) { + (void)kern_close(td, td->td_retval[0]); + goto out; } if (bsd_args.type == SOCK_RAW @@ -878,12 +884,20 @@ int protocol; int *rsv; } */ bsd_args; + int error, socket_flags; + int sv[2]; bsd_args.domain = linux_to_bsd_domain(args->domain); if (bsd_args.domain != PF_LOCAL) return (EAFNOSUPPORT); - bsd_args.type = args->type; + socket_flags = args->type & ~LINUX_SOCK_TYPE_MASK; + if (socket_flags & ~(LINUX_SOCK_CLOEXEC | LINUX_SOCK_NONBLOCK)) + return (EINVAL); + bsd_args.type = args->type & LINUX_SOCK_TYPE_MASK; + if (bsd_args.type < 0 || bsd_args.type > LINUX_SOCK_MAX) + return (EINVAL); + if (args->protocol != 0 && args->protocol != PF_UNIX) /* @@ -896,7 +910,25 @@ else bsd_args.protocol = 0; bsd_args.rsv = (int *)PTRIN(args->rsv); - return (socketpair(td, &bsd_args)); + error = kern_socketpair(td, bsd_args.domain, bsd_args.type, + bsd_args.protocol, sv); + if (error) + return (error); + error = linux_set_socket_flags(td, sv[0], socket_flags); + if (error) + goto out; + error = linux_set_socket_flags(td, sv[1], socket_flags); + if (error) + goto out; + + error = copyout(sv, bsd_args.rsv, 2 * sizeof(int)); + +out: + if (error) { + (void)kern_close(td, sv[0]); + (void)kern_close(td, sv[1]); + } + return (error); } struct linux_send_args { ==== //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.12 2009/04/05 18:20:38 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.14 2009/05/29 18:46:57 thompsa Exp $"); #include #include @@ -76,18 +76,18 @@ #include static driver_object usbd_driver; -static usb2_callback_t usbd_non_isoc_callback; -static usb2_callback_t usbd_ctrl_callback; +static usb_callback_t usbd_non_isoc_callback; +static usb_callback_t usbd_ctrl_callback; #define USBD_CTRL_READ_PIPE 0 #define USBD_CTRL_WRITE_PIPE 1 #define USBD_CTRL_MAX_PIPE 2 #define USBD_CTRL_READ_BUFFER_SP 256 #define USBD_CTRL_READ_BUFFER_SIZE \ - (sizeof(struct usb2_device_request) + USBD_CTRL_READ_BUFFER_SP) + (sizeof(struct usb_device_request) + USBD_CTRL_READ_BUFFER_SP) #define USBD_CTRL_WRITE_BUFFER_SIZE \ - (sizeof(struct usb2_device_request)) -static struct usb2_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = { + (sizeof(struct usb_device_request)) +static struct usb_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = { [USBD_CTRL_READ_PIPE] = { .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ @@ -114,11 +114,11 @@ static int32_t usbd_func_vendorclass(irp *); static int32_t usbd_func_selconf(irp *); static int32_t usbd_func_abort_pipe(irp *); -static usb2_error_t usbd_setup_endpoint(irp *, uint8_t, - struct usb2_endpoint_descriptor *); -static usb2_error_t usbd_setup_endpoint_default(irp *, uint8_t); -static usb2_error_t usbd_setup_endpoint_one(irp *, uint8_t, - struct ndisusb_ep *, struct usb2_config *); +static usb_error_t usbd_setup_endpoint(irp *, uint8_t, + struct usb_endpoint_descriptor *); +static usb_error_t usbd_setup_endpoint_default(irp *, uint8_t); +static usb_error_t usbd_setup_endpoint_one(irp *, uint8_t, + struct ndisusb_ep *, struct usb_config *); static int32_t usbd_func_getdesc(irp *); static union usbd_urb *usbd_geturb(irp *); static struct ndisusb_ep*usbd_get_ndisep(irp *, usb_endpoint_descriptor_t *); @@ -353,7 +353,7 @@ return (STATUS_FAILURE); } -/* Convert FreeBSD's usb2_error_t to USBD_STATUS */ +/* Convert FreeBSD's usb_error_t to USBD_STATUS */ static int32_t usbd_usb2urb(int status) { @@ -463,7 +463,7 @@ uint32_t len; union usbd_urb *urb; usb_config_descriptor_t *cdp; - usb2_error_t status; + usb_error_t status; urb = usbd_geturb(ip); ctldesc = &urb->uu_ctldesc; @@ -519,15 +519,15 @@ device_t dev = IRP_NDIS_DEV(ip); int i, j; struct ndis_softc *sc = device_get_softc(dev); - struct usb2_device *udev = sc->ndisusb_dev; - struct usb2_pipe *p = NULL; + struct usb_device *udev = sc->ndisusb_dev; + struct usb_pipe *p = NULL; struct usbd_interface_information *intf; struct usbd_pipe_information *pipe; struct usbd_urb_select_configuration *selconf; union usbd_urb *urb; usb_config_descriptor_t *conf; usb_endpoint_descriptor_t *edesc; - usb2_error_t ret; + usb_error_t ret; urb = usbd_geturb(ip); @@ -592,17 +592,17 @@ return USBD_STATUS_SUCCESS; } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_one(ip, ifidx, ne, epconf) irp *ip; uint8_t ifidx; struct ndisusb_ep *ne; - struct usb2_config *epconf; + struct usb_config *epconf; { device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); - struct usb2_xfer *xfer; - usb2_error_t status; + struct usb_xfer *xfer; + usb_error_t status; InitializeListHead(&ne->ne_active); InitializeListHead(&ne->ne_pending); @@ -621,14 +621,14 @@ return (status); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 31 16:56:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1E521065673; Sun, 31 May 2009 16:56: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 AF1C8106566B for ; Sun, 31 May 2009 16:56:00 +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 8539C8FC16 for ; Sun, 31 May 2009 16:56:00 +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 n4VGu0XV010030 for ; Sun, 31 May 2009 16:56:00 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VGu0fW010028 for perforce@freebsd.org; Sun, 31 May 2009 16:56:00 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 31 May 2009 16:56:00 GMT Message-Id: <200905311656.n4VGu0fW010028@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 163178 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 16:56:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=163178 Change 163178 by rene@rene_self on 2009/05/31 16:55:37 MFen handbook/config 1.237 -> 1.238 Add myself as translator Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#13 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#13 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml,v 1.18 2009/05/06 20:50:59 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/config/chapter.sgml - %SRCID% 1.237 + %SRCID% 1.238 --> @@ -36,6 +36,10 @@ Pansters Vertaald door + + René + Ladan + @@ -402,68 +406,6 @@ opstartinstellingen verwerkt kunnen worden door simpele opstartscripts. - Voor de komst van rc.d zetten - applicaties simpelweg een opstartscript in de map /usr/local/etc/rc.d dat dan - uitgelezen werd door de opstartscripts van het systeem. Deze - scripts werden dan uitgevoerd tijdens de laatste stappen van een - systeemstart. - - Terwijl veel individuen bezig waren om de oude stijl van - instellen naar de nieuwe stijl over te zetten, bleef sommige - software nog steeds een script nodig hebben in de genoemde map. - De subtiele verschillen in de scripts hangen af van het wel of - niet gebruiken van rc.d. - - Vóór &os; 5.1 werden scripts oude - stijl gebruikt en in bijna alle gevallen voldoet een - script nieuwe stijl. - - Elk script moet uitvoerbaar zijn door het systeem; dit wordt - meestal bereikt door gebruik te maken van het commando - chmod en het instellen van de unieke - permissies 555. Op zijn minst moeten ook de - start en stop opties - aanwezig zijn om de applicatie te starten en te stoppen. - - Het simpelste opstartscript ziet er waarschijnlijk als volgt - uit: - - #!/bin/sh -echo -n ' utility' - -case "$1" in -start) - /usr/local/bin/utility - ;; -stop) - kill -9 `cat /var/run/utility.pid` - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac - -exit 0 - - Dit script levert de opties stop en - start voor de applicatie met de naam - utility. - - Dit kan handmatig gestart worden met: - - &prompt.root; /usr/local/etc/rc.d/utility start - - Hoewel niet alle software van derden een regel nodig heeft - in /etc/rc.conf, wordt er bijna elke dag - een wel een port veranderd om deze instellingen te ondersteunen. - De meldingen tijdens de installatie van de port bevatten vaak - meer informatie. Sommige software van derden levert - opstartscripts die de applicatie kunnen laten werken met - rc.d. Dit wordt in de volgende paragraaf - behandeld. - Uitgebreide applicatieinstellingen @@ -484,14 +426,6 @@ # REQUIRE: DAEMON # KEYWORD: shutdown -# -# WIJZIG DEZE WAARDEN NIET HIER -# MAAR IN HET BESTAND /etc/rc.conf -# -utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - . /etc/rc.subr name="utility" @@ -500,15 +434,20 @@ load_rc_config $name +# +# VERANDER DE STANDAARDWAARDEN HIER NIET +# STEL ZE IN IN HET BESTAND /etc/rc.conf +# +utility_enable=${utility_enable-"NO"} +utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} + pidfile="${utility_pidfile}" -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" - run_rc_command "$1" Dit script zorgt ervoor dat - utility wordt gestart na de dienst - daemon. Het biedt ook de mogelijkheid voor + utility wordt gestart na de pseudodienst + DAEMON. Het biedt ook de mogelijkheid voor het instellingen en volgen van het PID of het proces-ID bestand. @@ -534,7 +473,7 @@ voorafgegaan dat die dienst uit de Portscollectie is geïstalleerd en dat er een regel met instellingen is toegevoegd aan /etc/inetd.conf of - één van de bestaande niet actieve regels is + één van de bestaande niet-actieve regels is geactiveerd. Werken met inetd en zijn instellingen wordt uitgebreid toegelicht in de paragraaf over inetd. From owner-p4-projects@FreeBSD.ORG Sun May 31 17:08:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0CC91065672; Sun, 31 May 2009 17:08: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 8FA07106564A for ; Sun, 31 May 2009 17:08:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C55C8FC15 for ; Sun, 31 May 2009 17:08:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VH8EA0011893 for ; Sun, 31 May 2009 17:08:14 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VH8D58011891 for perforce@freebsd.org; Sun, 31 May 2009 17:08:13 GMT (envelope-from zec@fer.hr) Date: Sun, 31 May 2009 17:08:13 GMT Message-Id: <200905311708.n4VH8D58011891@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 163180 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 17:08:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163180 Change 163180 by zec@zec_tpx32 on 2009/05/31 17:07:19 IFC @ 163176 Affected files ... .. //depot/projects/vimage/src/share/man/man3/Makefile#2 integrate .. //depot/projects/vimage/src/share/man/man3/queue.3#2 integrate .. //depot/projects/vimage/src/share/man/man4/Makefile#10 integrate .. //depot/projects/vimage/src/share/man/man4/audit.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ksyms.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mld.4#1 branch .. //depot/projects/vimage/src/share/man/man4/msk.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/multicast.4#3 integrate .. //depot/projects/vimage/src/share/man/man9/Makefile#6 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_MOUNT.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_QUOTACTL.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_ROOT.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_STATFS.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VFS_UNMOUNT.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_ACCESS.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/acl.9#3 integrate .. //depot/projects/vimage/src/share/man/man9/fail.9#1 branch .. //depot/projects/vimage/src/share/man/man9/rmlock.9#2 integrate .. //depot/projects/vimage/src/share/man/man9/sx.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/dump_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/minidump_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/arm/arm/dump_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/arm/at91/ohci_atmelarm.c#6 delete .. //depot/projects/vimage/src/sys/arm/conf/AVILA#17 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#9 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#12 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#6 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/vimage/src/sys/boot/common/ufsread.c#4 integrate .. //depot/projects/vimage/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/net.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#5 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#5 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/vimage/src/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#21 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#21 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_mib.c#8 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#32 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#22 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#11 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_usbd.c#8 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_fcntl.c#7 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_misc.c#9 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_stat.c#8 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#51 integrate .. //depot/projects/vimage/src/sys/conf/files#69 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#32 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#23 integrate .. //depot/projects/vimage/src/sys/conf/kern.pre.mk#16 integrate .. //depot/projects/vimage/src/sys/conf/options#50 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#20 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_nat.c#7 integrate .. //depot/projects/vimage/src/sys/crypto/via/padlock_hash.c#3 integrate .. //depot/projects/vimage/src/sys/ddb/db_textdump.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-usb.c#12 integrate .. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#22 integrate .. //depot/projects/vimage/src/sys/dev/bktr/bktr_os.c#4 integrate .. //depot/projects/vimage/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cfe/cfe_console.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#27 integrate .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#13 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#11 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#11 integrate .. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#22 integrate .. //depot/projects/vimage/src/sys/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/vimage/src/sys/dev/firewire/if_fwip.c#8 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_usb.c#8 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#12 integrate .. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.c#11 integrate .. //depot/projects/vimage/src/sys/dev/lmc/if_lmc.h#5 integrate .. //depot/projects/vimage/src/sys/dev/mge/if_mge.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/e1000phy.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mii/e1000phyreg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/miidevs#19 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#18 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#10 integrate .. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#12 integrate .. //depot/projects/vimage/src/sys/dev/nge/if_nge.c#5 integrate .. //depot/projects/vimage/src/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_console.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#19 integrate .. //depot/projects/vimage/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/vimage/src/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#26 integrate .. //depot/projects/vimage/src/sys/dev/rp/rp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/vimage/src/sys/dev/si/si.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sis/if_sis.c#5 integrate .. //depot/projects/vimage/src/sys/dev/smc/if_smc.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/cmi.c#6 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/cs4281.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/vibes.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.h#8 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#13 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudioreg.h#8 integrate .. //depot/projects/vimage/src/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/vimage/src/sys/dev/stge/if_stge.c#7 integrate .. //depot/projects/vimage/src/sys/dev/syscons/daemon/daemon_saver.c#8 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#16 integrate .. //depot/projects/vimage/src/sys/dev/syscons/sysmouse.c#5 integrate .. //depot/projects/vimage/src/sys/dev/tsec/if_tsec.c#4 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_tty.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/TODO.TXT#3 delete .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt_var.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ubtbcmfw.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/ufm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_aue.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_auereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdcereg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cue.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cuereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kue.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kuereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_rue.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_ruereg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_udav.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_udavreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uark.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubsa.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uchcom.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uipaq.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umoscom.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uslcom.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvscom.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_cdce.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_msc.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_mtp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb.h#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_error.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#12 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_ioctl.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_process.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_process.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_util.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#50 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbhid.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uath.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uathvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/vimage/src/sys/dev/vr/if_vr.c#5 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#10 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#12 integrate .. //depot/projects/vimage/src/sys/dev/xl/if_xl.c#5 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#13 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonkrpc.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfsport.h#4 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clnode.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#3 integrate .. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nfsserver/nfs_nfsdsocket.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_subr.c#7 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_status.c#6 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#12 integrate .. //depot/projects/vimage/src/sys/fs/smbfs/smbfs_io.c#9 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#19 integrate .. //depot/projects/vimage/src/sys/geom/geom_subr.c#10 integrate .. //depot/projects/vimage/src/sys/geom/label/g_label.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#10 integrate .. //depot/projects/vimage/src/sys/i386/i386/dump_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/i386/i386/minidump_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_socksys.c#8 integrate .. //depot/projects/vimage/src/sys/i386/include/apicvar.h#10 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/vimage/src/sys/i386/xen/clock.c#7 integrate .. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/vimage/src/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/vimage/src/sys/ia64/ia64/dump_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/mp_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/ssc.c#3 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#27 integrate .. //depot/projects/vimage/src/sys/kern/kern_cpu.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_cpuset.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#26 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#31 integrate .. //depot/projects/vimage/src/sys/kern/kern_fail.c#1 branch .. //depot/projects/vimage/src/sys/kern/kern_fork.c#26 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#28 integrate .. //depot/projects/vimage/src/sys/kern/kern_linker.c#28 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_lockf.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/vimage/src/sys/kern/kern_mib.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_osd.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#24 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_rmlock.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#91 integrate .. //depot/projects/vimage/src/sys/kern/kern_xxx.c#15 integrate .. //depot/projects/vimage/src/sys/kern/link_elf.c#11 integrate .. //depot/projects/vimage/src/sys/kern/link_elf_obj.c#11 integrate .. //depot/projects/vimage/src/sys/kern/linker_if.m#4 integrate .. //depot/projects/vimage/src/sys/kern/sysv_msg.c#6 integrate .. //depot/projects/vimage/src/sys/kern/sysv_sem.c#8 integrate .. //depot/projects/vimage/src/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#36 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#15 integrate .. //depot/projects/vimage/src/sys/kern/uipc_debug.c#7 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#27 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#24 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#26 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#11 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#23 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#33 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#29 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#27 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#13 integrate .. //depot/projects/vimage/src/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/vimage/src/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_pci.c#3 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohci_pci.c#3 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhci_pci.c#3 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/vimage/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/vimage/src/sys/mips/mips/pmap.c#13 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#47 integrate .. //depot/projects/vimage/src/sys/modules/cpufreq/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/dtrace/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/dtrace/dtraceall/dtraceall.c#3 integrate .. //depot/projects/vimage/src/sys/modules/geom/geom_part/geom_part_ebr/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/linux/Makefile#7 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/bluetooth/ubt/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/Makefile#11 integrate .. //depot/projects/vimage/src/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/zfs/Makefile#10 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#36 integrate .. //depot/projects/vimage/src/sys/net/if.c#83 integrate .. //depot/projects/vimage/src/sys/net/if.h#12 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#38 integrate .. //depot/projects/vimage/src/sys/net/pfil.h#5 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#35 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_dfs.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#22 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.c#15 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_monitor.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_phy.h#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_radiotap.c#2 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_superg.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#11 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubt/TODO#3 delete .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#57 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#57 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#39 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#13 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#25 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#39 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#52 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#15 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#55 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#44 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#35 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.h#11 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#39 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_mcast.c#3 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#34 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#56 integrate .. //depot/projects/vimage/src/sys/netinet6/mld6.c#27 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#41 integrate .. //depot/projects/vimage/src/sys/netipx/spx.h#3 integrate .. //depot/projects/vimage/src/sys/netipx/spx_reass.c#1 branch .. //depot/projects/vimage/src/sys/netipx/spx_usrreq.c#6 integrate .. //depot/projects/vimage/src/sys/netipx/spx_var.h#3 integrate .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#17 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#13 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_krpc.c#6 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#28 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvkrpc.c#5 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsock.c#10 integrate .. //depot/projects/vimage/src/sys/nlm/nlm_advlock.c#8 integrate .. //depot/projects/vimage/src/sys/pci/if_rl.c#15 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#13 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#10 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#11 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#22 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/NOTES#13 integrate .. //depot/projects/vimage/src/sys/powerpc/cpufreq/dfs.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/ofw/ofw_cpu.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powermac/pmu.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powermac/vcoregpio.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powerpc/cpu.c#11 integrate .. //depot/projects/vimage/src/sys/rpc/authunix_prot.c#10 integrate .. //depot/projects/vimage/src/sys/rpc/xdr.h#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#11 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#19 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/dump_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/dump_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/sun4v/sun4v/hvcons.c#6 integrate .. //depot/projects/vimage/src/sys/sys/cpu.h#3 integrate .. //depot/projects/vimage/src/sys/sys/cpuset.h#3 integrate .. //depot/projects/vimage/src/sys/sys/eventhandler.h#8 integrate .. //depot/projects/vimage/src/sys/sys/fail.h#1 branch .. //depot/projects/vimage/src/sys/sys/jail.h#14 integrate .. //depot/projects/vimage/src/sys/sys/kernel.h#19 integrate .. //depot/projects/vimage/src/sys/sys/ksyms.h#1 branch .. //depot/projects/vimage/src/sys/sys/lock.h#11 integrate .. //depot/projects/vimage/src/sys/sys/lockf.h#5 integrate .. //depot/projects/vimage/src/sys/sys/lockstat.h#1 branch .. //depot/projects/vimage/src/sys/sys/mount.h#21 integrate .. //depot/projects/vimage/src/sys/sys/mutex.h#11 integrate .. //depot/projects/vimage/src/sys/sys/namei.h#4 integrate .. //depot/projects/vimage/src/sys/sys/param.h#54 integrate .. //depot/projects/vimage/src/sys/sys/priv.h#16 integrate .. //depot/projects/vimage/src/sys/sys/queue.h#4 integrate .. //depot/projects/vimage/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/vimage/src/sys/sys/rwlock.h#10 integrate .. //depot/projects/vimage/src/sys/sys/sockio.h#5 integrate .. //depot/projects/vimage/src/sys/sys/sx.h#10 integrate .. //depot/projects/vimage/src/sys/sys/syscallsubr.h#10 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#21 integrate .. //depot/projects/vimage/src/sys/sys/tty.h#10 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#96 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#22 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#22 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.c#22 integrate .. //depot/projects/vimage/src/sys/vm/vm_page.h#12 integrate .. //depot/projects/vimage/src/sys/vm/vm_pageout.c#17 integrate .. //depot/projects/vimage/src/sys/xdr/xdr_mem.c#3 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#9 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_xs.c#8 integrate .. //depot/projects/vimage/src/usr.bin/kdump/mkioctls#5 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man3/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 12/13/93 -# $FreeBSD: src/share/man/man3/Makefile,v 1.49 2008/09/28 20:15:45 ed Exp $ +# $FreeBSD: src/share/man/man3/Makefile,v 1.50 2009/05/27 19:28:04 ed Exp $ .include @@ -65,8 +65,8 @@ queue.3 SLIST_INSERT_HEAD.3 \ queue.3 SLIST_NEXT.3 \ queue.3 SLIST_REMOVE.3 \ + queue.3 SLIST_REMOVE_AFTER.3 \ queue.3 SLIST_REMOVE_HEAD.3 \ - queue.3 SLIST_REMOVE_NEXT.3 \ queue.3 STAILQ_CONCAT.3 \ queue.3 STAILQ_EMPTY.3 \ queue.3 STAILQ_ENTRY.3 \ @@ -82,8 +82,8 @@ queue.3 STAILQ_LAST.3 \ queue.3 STAILQ_NEXT.3 \ queue.3 STAILQ_REMOVE.3 \ + queue.3 STAILQ_REMOVE_AFTER.3 \ queue.3 STAILQ_REMOVE_HEAD.3 \ - queue.3 STAILQ_REMOVE_NEXT.3 \ queue.3 TAILQ_CONCAT.3 \ queue.3 TAILQ_EMPTY.3 \ queue.3 TAILQ_ENTRY.3 \ ==== //depot/projects/vimage/src/share/man/man3/queue.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)queue.3 8.2 (Berkeley) 1/24/94 -.\" $FreeBSD: src/share/man/man3/queue.3,v 1.42 2008/05/22 14:40:03 ed Exp $ +.\" $FreeBSD: src/share/man/man3/queue.3,v 1.43 2009/05/27 19:28:04 ed Exp $ .\" .Dd March 24, 2006 .Dt QUEUE 3 @@ -47,8 +47,8 @@ .Nm SLIST_INSERT_AFTER , .Nm SLIST_INSERT_HEAD , .Nm SLIST_NEXT , +.Nm SLIST_REMOVE_AFTER , .Nm SLIST_REMOVE_HEAD , -.Nm SLIST_REMOVE_NEXT , .Nm SLIST_REMOVE , .Nm STAILQ_CONCAT , .Nm STAILQ_EMPTY , @@ -64,8 +64,8 @@ .Nm STAILQ_INSERT_TAIL , .Nm STAILQ_LAST , .Nm STAILQ_NEXT , +.Nm STAILQ_REMOVE_AFTER , .Nm STAILQ_REMOVE_HEAD , -.Nm STAILQ_REMOVE_NEXT , .Nm STAILQ_REMOVE , .Nm LIST_EMPTY , .Nm LIST_ENTRY , @@ -115,8 +115,8 @@ .Fn SLIST_INSERT_AFTER "TYPE *listelm" "TYPE *elm" "SLIST_ENTRY NAME" .Fn SLIST_INSERT_HEAD "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME" .Fn SLIST_NEXT "TYPE *elm" "SLIST_ENTRY NAME" +.Fn SLIST_REMOVE_AFTER "TYPE *elm" "SLIST_ENTRY NAME" .Fn SLIST_REMOVE_HEAD "SLIST_HEAD *head" "SLIST_ENTRY NAME" -.Fn SLIST_REMOVE_NEXT "SLIST_HEAD *head" "TYPE *elm" "SLIST_ENTRY NAME" .Fn SLIST_REMOVE "SLIST_HEAD *head" "TYPE *elm" "TYPE" "SLIST_ENTRY NAME" .\" .Fn STAILQ_CONCAT "STAILQ_HEAD *head1" "STAILQ_HEAD *head2" @@ -133,8 +133,8 @@ .Fn STAILQ_INSERT_TAIL "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_LAST "STAILQ_HEAD *head" "TYPE" "STAILQ_ENTRY NAME" .Fn STAILQ_NEXT "TYPE *elm" "STAILQ_ENTRY NAME" +.Fn STAILQ_REMOVE_AFTER "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE_HEAD "STAILQ_HEAD *head" "STAILQ_ENTRY NAME" -.Fn STAILQ_REMOVE_NEXT "STAILQ_HEAD *head" "TYPE *elm" "STAILQ_ENTRY NAME" .Fn STAILQ_REMOVE "STAILQ_HEAD *head" "TYPE *elm" "TYPE" "STAILQ_ENTRY NAME" .\" .Fn LIST_EMPTY "LIST_HEAD *head" @@ -380,6 +380,14 @@ returns the next element in the list. .Pp The macro +.Nm SLIST_REMOVE_AFTER +removes the element after +.Fa elm +from the list. Unlike +.Fa SLIST_REMOVE , +this macro does not traverse the entire list. +.Pp +The macro .Nm SLIST_REMOVE_HEAD removes the element .Fa elm @@ -391,14 +399,6 @@ macro. .Pp The macro -.Nm SLIST_REMOVE_NEXT -removes the element after -.Fa elm -from the list. Unlike -.Fa SLIST_REMOVE , -this macro does not traverse the entire list. -.Pp -The macro .Nm SLIST_REMOVE removes the element .Fa elm @@ -564,6 +564,14 @@ returns the next item on the tail queue, or NULL this item is the last. .Pp The macro +.Nm STAILQ_REMOVE_AFTER +removes the element after +.Fa elm +from the tail queue. Unlike +.Fa STAILQ_REMOVE , +this macro does not traverse the entire tail queue. +.Pp +The macro .Nm STAILQ_REMOVE_HEAD removes the element at the head of the tail queue. For optimum efficiency, @@ -573,14 +581,6 @@ macro. .Pp The macro -.Nm STAILQ_REMOVE_NEXT -removes the element after -.Fa elm -from the tail queue. Unlike -.Fa STAILQ_REMOVE , -this macro does not traverse the entire tail queue. -.Pp -The macro .Nm STAILQ_REMOVE removes the element .Fa elm ==== //depot/projects/vimage/src/share/man/man4/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.449 2009/05/16 10:42:00 brueffer Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.451 2009/05/27 18:57:13 bms Exp $ MAN= aac.4 \ acpi.4 \ @@ -161,6 +161,7 @@ kbdmux.4 \ keyboard.4 \ kld.4 \ + ksyms.4 \ ktr.4 \ kue.4 \ lagg.4 \ @@ -191,6 +192,7 @@ meteor.4 \ mfi.4 \ miibus.4 \ + mld.4 \ mlx.4 \ mly.4 \ mmc.4 \ ==== //depot/projects/vimage/src/share/man/man4/audit.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/audit.4,v 1.10 2006/12/14 16:40:57 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/audit.4,v 1.11 2009/05/31 09:03:14 rwatson Exp $ .\" -.Dd May 5, 2006 +.Dd May 31, 2009 .Os .Dt AUDIT 4 .Sh NAME @@ -125,13 +125,6 @@ .An Robert Watson Aq rwatson@FreeBSD.org . .Sh BUGS The -.Nm -facility in -.Fx -is considered experimental, and production deployment should occur only after -careful consideration of the risks of deploying experimental software. -.Pp -The .Fx kernel does not fully validate that audit records submitted by user applications are syntactically valid BSM; as submission of records is limited ==== //depot/projects/vimage/src/share/man/man4/msk.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/msk.4,v 1.6 2007/12/05 09:41:58 remko Exp $ +.\" $FreeBSD: src/share/man/man4/msk.4,v 1.8 2009/05/25 08:27:52 yongari Exp $ .\" -.Dd December 5, 2007 +.Dd May 25, 2009 .Dt MSK 4 .Os .Sh NAME @@ -176,13 +176,19 @@ .It Marvell Yukon 88E8062 SX/LX Gigabit Ethernet .It -Marvell Yukon 88E8035 Gigabit Ethernet +Marvell Yukon 88E8035 Fast Ethernet +.It +Marvell Yukon 88E8036 Fast Ethernet +.It +Marvell Yukon 88E8038 Fast Ethernet +.It +Marvell Yukon 88E8039 Fast Ethernet .It -Marvell Yukon 88E8036 Gigabit Ethernet +Marvell Yukon 88E8040 Fast Ethernet .It -Marvell Yukon 88E8038 Gigabit Ethernet +Marvell Yukon 88E8040T Fast Ethernet .It -Marvell Yukon 88E8039 Gigabit Ethernet +Marvell Yukon 88E8048 Fast Ethernet .It Marvell Yukon 88E8050 Gigabit Ethernet .It @@ -196,6 +202,8 @@ .It Marvell Yukon 88E8058 Gigabit Ethernet .It +Marvell Yukon 88E8070 Fast Ethernet +.It SysKonnect SK-9Sxx Gigabit Ethernet .It SysKonnect SK-9Exx Gigabit Ethernet ==== //depot/projects/vimage/src/share/man/man4/multicast.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.8 2009/03/09 17:53:05 bms Exp $ +.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.9 2009/05/27 18:57:13 bms Exp $ .\" -.Dd February 13, 2009 +.Dd May 27, 2009 .Dt MULTICAST 4 .Os .\" @@ -962,6 +962,7 @@ .Xr intro 4 , .Xr ip 4 , .Xr ip6 4 , +.Xr mld 4 , .Xr pim 4 .\" .Sh HISTORY @@ -1002,6 +1003,8 @@ in collaboration with .An Chris Brown (NextHop). +The IGMPv3 and MLDv2 multicast support was implemented by +.An Bruce Simpson . .Pp This manual page was written by .An Pavlin Radoslavov ==== //depot/projects/vimage/src/share/man/man9/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.349 2009/04/10 10:59:48 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.351 2009/05/30 13:59:05 trasz Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -99,6 +99,7 @@ DRIVER_MODULE.9 \ EVENTHANDLER.9 \ extattr.9 \ + fail.9 \ fetch.9 \ firmware.9 \ g_access.9 \ @@ -1287,6 +1288,7 @@ MLINKS+=vm_page_wakeup.9 vm_page_busy.9 \ vm_page_wakeup.9 vm_page_flash.9 MLINKS+=vm_page_wire.9 vm_page_unwire.9 +MLINKS+=VOP_ACCESS.9 VOP_ACCESSX.9 MLINKS+=VOP_ATTRIB.9 VOP_GETATTR.9 \ VOP_ATTRIB.9 VOP_SETATTR.9 MLINKS+=VOP_CREATE.9 VOP_MKDIR.9 \ ==== //depot/projects/vimage/src/share/man/man9/VFS_MOUNT.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VFS_MOUNT.9,v 1.14 2005/01/07 10:57:33 keramida Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_MOUNT.9,v 1.15 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_MOUNT 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_MOUNT "struct mount *mp" "struct thread *td" +.Fn VFS_MOUNT "struct mount *mp" .Sh DESCRIPTION The .Fn VFS_MOUNT @@ -50,8 +50,6 @@ .Bl -tag -width data .It Fa mp Structure representing the file system. -.It Fa td -Thread which is mounting the file system. .El .Pp The ==== //depot/projects/vimage/src/share/man/man9/VFS_QUOTACTL.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VFS_QUOTACTL.9,v 1.10 2003/10/23 06:24:55 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_QUOTACTL.9,v 1.11 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd July 24, 1996 +.Dd May 23, 2009 .Os .Dt VFS_QUOTACTL 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_QUOTACTL "struct mount *mp" "int cmds" "uid_t uid" "caddr_t arg" "struct thread *td" +.Fn VFS_QUOTACTL "struct mount *mp" "int cmds" "uid_t uid" "caddr_t arg" .Sh DESCRIPTION Implement file system quotas. See ==== //depot/projects/vimage/src/share/man/man9/VFS_ROOT.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VFS_ROOT.9,v 1.12 2006/09/18 15:24:20 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_ROOT.9,v 1.13 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd August 26, 2006 +.Dd May 23, 2009 .Os .Dt VFS_ROOT 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_ROOT "struct mount *mp" "int flags" "struct vnode **vpp" "struct thread *td" +.Fn VFS_ROOT "struct mount *mp" "int flags" "struct vnode **vpp" .Sh DESCRIPTION Return a locked vnode for the root directory of the file system. .Pp @@ -58,8 +58,6 @@ argument and instead acquire an exclusive lock. .It Fa vpp Return parameter for the root vnode. -.It Fa td -The calling thread. .El .Sh SEE ALSO .Xr VFS 9 , ==== //depot/projects/vimage/src/share/man/man9/VFS_STATFS.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VFS_STATFS.9,v 1.12 2005/01/13 09:33:06 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_STATFS.9,v 1.13 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_STATFS 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_STATFS "struct mount *mp" "struct statfs *sbp" "struct thread *td" +.Fn VFS_STATFS "struct mount *mp" "struct statfs *sbp" .Sh DESCRIPTION The .Fn VFS_STATFS @@ -56,8 +56,6 @@ structure, as defined by .In sys/mount.h , into which information is placed about the file system. -.It Fa td -The thread which is querying the file system. .El .Pp The fields of ==== //depot/projects/vimage/src/share/man/man9/VFS_SYNC.9#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.16 2007/05/12 13:10:55 pav Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.17 2009/05/24 18:34:54 tmclaugh Exp $ .\" -.Dd January 7, 2005 +.Dd May 23, 2009 .Os .Dt VFS_SYNC 9 .Sh NAME @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_SYNC "struct mount *mp" "int waitfor" "struct thread *td" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 31 17:13:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 400841065677; Sun, 31 May 2009 17:13: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 EF5171065672 for ; Sun, 31 May 2009 17:13:19 +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 C3A848FC0A for ; Sun, 31 May 2009 17:13:19 +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 n4VHDJkN012409 for ; Sun, 31 May 2009 17:13:19 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VHDJQP012407 for perforce@freebsd.org; Sun, 31 May 2009 17:13:19 GMT (envelope-from zec@fer.hr) Date: Sun, 31 May 2009 17:13:19 GMT Message-Id: <200905311713.n4VHDJQP012407@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 163181 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 17:13:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=163181 Change 163181 by zec@zec_tpx32 on 2009/05/31 17:12:56 Branch a missing file. Affected files ... .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/acl.h#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 31 18:01:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 301901065673; Sun, 31 May 2009 18:01: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 CAEC4106566C for ; Sun, 31 May 2009 18:01:13 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B7A578FC13 for ; Sun, 31 May 2009 18:01:13 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VI1Dbl016111 for ; Sun, 31 May 2009 18:01:13 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VI1DKm016109 for perforce@freebsd.org; Sun, 31 May 2009 18:01:13 GMT (envelope-from trasz@freebsd.org) Date: Sun, 31 May 2009 18:01:13 GMT Message-Id: <200905311801.n4VI1DKm016109@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163184 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 18:01:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163184 Change 163184 by trasz@trasz_victim on 2009/05/31 18:01:07 Put limits set via rlimit(2) into hrl. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#2 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#2 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#3 edit .. //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#3 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#2 (text+ko) ==== @@ -32,22 +32,85 @@ #include #include #include +#include #include #include #include #include +#include +#include +#include MALLOC_DEFINE(M_HRL, "hrl", "Hierarchical Resource Limits"); /* - * XXX: Locking. + * XXX: Need a better way to store stuff; rbtree? */ -static struct hrl_limit **limits = NULL; +static struct hrl_limit *limits = NULL; static int nlimits = 0; +static struct mtx hrllock; + +static void hrl_init(void); +SYSINIT(hrl, SI_SUB_RUN_SCHEDULER, SI_ORDER_SECOND, hrl_init, NULL); + +int +hrl_alloc(int object, uint64_t amount) +{ + + KASSERT(amount > 0, ("invalid amount")); + + return (0); +} + +void +hrl_free(int object, uint64_t amount) +{ + + KASSERT(amount > 0, ("invalid amount")); +} + +void +hrl_adjust(int subject, id_t subject_id, int per, int object, int action, int64_t amount) +{ + mtx_lock(&hrllock); + + nlimits++; + /* + * XXX: Make it possible to remove and overwrite limits, not just add them. + */ + limits = realloc(limits, sizeof(struct hrl_limit) * nlimits, M_HRL, M_WAITOK); + + limits[nlimits - 1].hl_subject = subject; + limits[nlimits - 1].hl_subject_id = subject_id; + limits[nlimits - 1].hl_per = per; + limits[nlimits - 1].hl_object = object; + limits[nlimits - 1].hl_action = action; + limits[nlimits - 1].hl_amount = amount; + + mtx_unlock(&hrllock); +} + +/* + * System calls. + */ static int -hrl_check(struct hrl_limit **limits, int nlimits) +hrl_check(struct hrl_limit *limits, int nlimits) { + int i; + + for (i = 0; i < nlimits; i++) { + if (limits[i].hl_subject <= 0 || limits[i].hl_subject > HRL_SUBJECT_MAX) + return (EINVAL); + if (limits[i].hl_per <= 0 || limits[i].hl_per > HRL_SUBJECT_MAX) + return (EINVAL); + if (limits[i].hl_object <= 0 || limits[i].hl_object > HRL_OBJECT_MAX) + return (EINVAL); + if (limits[i].hl_action <= 0 || limits[i].hl_action > HRL_ACTION_MAX) + return (EINVAL); + if (limits[i].hl_amount <= 0) + return (EINVAL); + } return (0); } @@ -57,7 +120,7 @@ { int error; size_t buflen; - struct hrl_limit **newlimits; + struct hrl_limit *newlimits; error = priv_check(td, PRIV_HRL_GET); if (error) @@ -74,9 +137,11 @@ * Removing all the limits? */ if (uap->nentries == 0) { + mtx_lock(&hrllock); free(limits, M_HRL); limits = NULL; nlimits = 0; + mtx_unlock(&hrllock); return (0); } @@ -92,12 +157,16 @@ if (error) goto out; + mtx_lock(&hrllock); + if (limits != NULL) free(limits, M_HRL); limits = newlimits; nlimits = uap->nentries; + mtx_unlock(&hrllock); + return (0); out: @@ -119,17 +188,48 @@ * XXX: Check for being in jail? */ - if (suword(uap->required, nlimits) != 0) - return (EINVAL); + mtx_lock(&hrllock); + + if (suword(uap->required, nlimits) != 0) { + error = EINVAL; + goto out; + } + + if (uap->nentries == 0 && uap->bufp == NULL) { + error = 0; + goto out; + } - if (uap->nentries == 0 && uap->bufp == NULL) - return (0); + if (uap->nentries < nlimits) { + error = EFBIG; + goto out; + } - if (uap->nentries < nlimits) - return (EFBIG); + if (nlimits == 0) { + error = 0; + goto out; + } buflen = sizeof(struct hrl_limit) * nlimits; error = copyout(limits, uap->bufp, buflen); +out: + mtx_unlock(&hrllock); + return (error); } + +static void +hrl_proc_exit(void *arg __unused, struct proc *p) +{ + /* + * XXX: Remove per-process limits here. + */ +} + +static void +hrl_init(void) +{ + mtx_init(&hrllock, "hrl lock", NULL, MTX_DEF); + EVENTHANDLER_REGISTER(process_exit, hrl_proc_exit, NULL, EVENTHANDLER_PRI_ANY); +} ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#2 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -642,6 +643,82 @@ callout_reset(&p->p_limco, hz, lim_cb, p); } +static void +hrl_handle_setrlimit(u_int which, struct rlimit *lim, struct thread *td) +{ + int object, subject, soft_action, hard_action; + id_t id; + + /* + * XXX: Locking. + */ + subject = HRL_SUBJECT_PROCESS; + id = td->td_proc->p_pid; + soft_action = HRL_ACTION_LOG; + hard_action = HRL_ACTION_DENY; + + switch (which) { + case RLIMIT_CPU: + object = HRL_OBJECT_CPUTIME; + soft_action = HRL_ACTION_SIGXCPU; + break; + case RLIMIT_FSIZE: + object = HRL_OBJECT_FILESIZE; + break; + case RLIMIT_DATA: + object = HRL_OBJECT_DATASIZE; + break; + case RLIMIT_STACK: + object = HRL_OBJECT_STACKSIZE; + soft_action = HRL_ACTION_SIGSEGV; + break; + case RLIMIT_CORE: + object = HRL_OBJECT_COREDUMPSIZE; + break; + case RLIMIT_RSS: + object = HRL_OBJECT_MEMORYUSE; + break; + case RLIMIT_MEMLOCK: + object = HRL_OBJECT_MEMORYLOCKED; + break; + case RLIMIT_NPROC: + object = HRL_OBJECT_MAXPROCESSES; + subject = HRL_SUBJECT_USER; + id = td->td_ucred->cr_uid; + break; + case RLIMIT_NOFILE: + object = HRL_OBJECT_OPENFILES; + soft_action = HRL_ACTION_SIGXFSZ; + break; + case RLIMIT_SBSIZE: + object = HRL_OBJECT_SBSIZE; + subject = HRL_SUBJECT_USER; + id = td->td_ucred->cr_uid; + break; + case RLIMIT_VMEM: + object = HRL_OBJECT_VMEMORYUSE; + break; + case RLIMIT_NPTS: + object = HRL_OBJECT_PTY; + subject = HRL_SUBJECT_USER; + id = td->td_ucred->cr_uid; + break; + default: + panic("hrl_handle_setrlimit: unknown limit"); + } + + if (lim->rlim_cur != RLIM_INFINITY) + hrl_adjust(subject, id, subject, object, soft_action, + lim->rlim_cur); + else + hrl_adjust(subject, id, subject, object, soft_action, 0); + if (lim->rlim_max != RLIM_INFINITY) + hrl_adjust(subject, id, subject, object, hard_action, + lim->rlim_max); + else + hrl_adjust(subject, id, subject, object, hard_action, 0); +} + int kern_setrlimit(td, which, limp) struct thread *td; @@ -763,6 +840,8 @@ } } + hrl_handle_setrlimit(which, alimp, td); + return (0); } ==== //depot/projects/soc2009/trasz_limits/sys/sys/hrl.h#3 (text+ko) ==== @@ -45,7 +45,6 @@ int64_t hl_amount; }; -#define HRL_SUBJECT_UNDEFINED 0x0000 #define HRL_SUBJECT_PROCESS 0x0001 #define HRL_SUBJECT_USER 0x0002 #define HRL_SUBJECT_GROUP 0x0003 @@ -57,7 +56,6 @@ * 'hl_per' takes the same flags as 'hl_subject'. */ -#define HRL_OBJECT_UNDEFINED 0x0000 #define HRL_OBJECT_CPUTIME 0x0001 #define HRL_OBJECT_FILESIZE 0x0002 #define HRL_OBJECT_DATASIZE 0x0003 @@ -72,27 +70,31 @@ #define HRL_OBJECT_PTY 0x000c #define HRL_OBJECT_MAX HRL_OBJECT_PTY -#define HRL_ACTION_UNDEFINED 0x0000 #define HRL_ACTION_DENY 0x0001 #define HRL_ACTION_DELAY 0x0002 #define HRL_ACTION_LOG 0x0003 #define HRL_ACTION_SIGHUP 0x0004 #define HRL_ACTION_SIGINT 0x0005 #define HRL_ACTION_SIGKILL 0x0006 -#define HRL_ACTION_SIGXCPU 0x0007 -#define HRL_ACTION_SIGXFSZ 0x0008 +#define HRL_ACTION_SIGSEGV 0x0007 +#define HRL_ACTION_SIGXCPU 0x0008 +#define HRL_ACTION_SIGXFSZ 0x0009 #define HRL_ACTION_MAX HRL_ACTION_SIGXFSZ #define HRL_MAX_LIMITS 128 -int hrl_alloc(int tag, int amount); -void hrl_free(int tag, int amount); +#ifdef _KERNEL + +int hrl_alloc(int object, uint64_t amount); +void hrl_free(int object, uint64_t amount); + +void hrl_adjust(int subject, id_t subject_id, int per, int object, int action, int64_t amount); -#ifndef _KERNEL +#else /* !_KERNEL */ __BEGIN_DECLS -int hrl_get(struct hrl_limit **bufp, int nentries, int *count); -int hrl_set(struct hrl_limit **bufp, int nentries); +int hrl_get(struct hrl_limit *bufp, int nentries, int *count); +int hrl_set(struct hrl_limit *bufp, int nentries); __END_DECLS #endif /* !_KERNEL */ ==== //depot/projects/soc2009/trasz_limits/usr.sbin/hrl/hrl.c#3 (text+ko) ==== @@ -30,21 +30,33 @@ #include #include #include +#include +#include #include static void print_subject(int subject, id_t id) { + struct passwd *pwd; + struct group *grp; switch (subject) { case HRL_SUBJECT_PROCESS: printf("process:%u", (unsigned int)id); break; case HRL_SUBJECT_USER: - printf("user:%u", (unsigned int)id); + pwd = getpwuid(id); + if (pwd != NULL) + printf("user:%s", pwd->pw_name); + else + printf("user:%u", (unsigned int)id); break; case HRL_SUBJECT_GROUP: - printf("group:%u", (unsigned int)id); + grp = getgrgid(id); + if (grp != NULL) + printf("group:%s", grp->gr_name); + else + printf("group:%u", (unsigned int)id); break; case HRL_SUBJECT_LOGINCLASS: printf("class:%u", (unsigned int)id); @@ -127,6 +139,9 @@ case HRL_ACTION_SIGKILL: printf("sigkill"); break; + case HRL_ACTION_SIGSEGV: + printf("sigsegv"); + break; case HRL_ACTION_SIGXCPU: printf("sigxcpu"); break; @@ -168,7 +183,7 @@ main(int argc __unused, char **argv __unused) { int error, nentries, i; - struct hrl_limit **limits; + struct hrl_limit *limits; error = hrl_get(NULL, 0, &nentries); if (error) @@ -190,16 +205,16 @@ printf("Defined resource limits:\n"); for (i = 0; i < nentries; i++) { - print_subject(limits[i]->hl_subject, limits[i]->hl_subject_id); + print_subject(limits[i].hl_subject, limits[i].hl_subject_id); printf(":"); - print_object(limits[i]->hl_object); + print_object(limits[i].hl_object); printf(":"); - print_action(limits[i]->hl_action); + print_action(limits[i].hl_action); printf(":"); - printf("%jd", limits[i]->hl_amount); - if (limits[i]->hl_subject != limits[i]->hl_per) { + printf("%jd", limits[i].hl_amount); + if (limits[i].hl_subject != limits[i].hl_per) { printf("/"); - print_per(limits[i]->hl_per); + print_per(limits[i].hl_per); } printf("\n"); } From owner-p4-projects@FreeBSD.ORG Sun May 31 18:14:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 887071065674; Sun, 31 May 2009 18:14:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 474FC1065670 for ; Sun, 31 May 2009 18:14:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B2398FC14 for ; Sun, 31 May 2009 18:14:29 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VIESDn018166 for ; Sun, 31 May 2009 18:14:28 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VIERL1018163 for perforce@freebsd.org; Sun, 31 May 2009 18:14:27 GMT (envelope-from trasz@freebsd.org) Date: Sun, 31 May 2009 18:14:27 GMT Message-Id: <200905311814.n4VIERL1018163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163186 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 18:14:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=163186 Change 163186 by trasz@trasz_victim on 2009/05/31 18:13:53 Don't store 0 limits. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#3 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#3 (text+ko) ==== @@ -72,6 +72,12 @@ void hrl_adjust(int subject, id_t subject_id, int per, int object, int action, int64_t amount) { + /* + * Limit removal? + */ + if (amount == 0) + return; + mtx_lock(&hrllock); nlimits++; From owner-p4-projects@FreeBSD.ORG Sun May 31 18:23:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9309D1065672; Sun, 31 May 2009 18:23:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4ED0D106566C for ; Sun, 31 May 2009 18:23:45 +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 3AEE78FC15 for ; Sun, 31 May 2009 18:23:45 +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 n4VINj9N018963 for ; Sun, 31 May 2009 18:23:45 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VINiv9018959 for perforce@freebsd.org; Sun, 31 May 2009 18:23:44 GMT (envelope-from zec@fer.hr) Date: Sun, 31 May 2009 18:23:44 GMT Message-Id: <200905311823.n4VINiv9018959@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 163187 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 18:23:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=163187 Change 163187 by zec@zec_tpx32 on 2009/05/31 18:23:03 IFC @ 163176 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#12 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#11 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npe.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#8 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/mutex.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/rwlock.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#14 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_usbd.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_fcntl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_ioctl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_resource.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_signal.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_socket.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stat.c#10 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stream.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sysconfig.h#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#20 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#28 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#15 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.powerpc#10 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#17 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_textdump.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-usb.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/dc/if_dc.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#12 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#12 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/if_fwe.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis_usb.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndisvar.h#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/lmc/if_lmc.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/lmc/if_lmc.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/mge/if_mge.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/nfe/if_nfe.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_console.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2560.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/re/if_re.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/rp/rp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sf/if_sf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/si/si.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/sis/if_sis.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/smc/if_smc.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudioreg.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/ste/if_ste.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/daemon/daemon_saver.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/syscons.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/sysmouse.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/tsec/if_tsec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_tty.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/usb_controller.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/uhid.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/misc/udbp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_aue.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_axe.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cdce.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cue.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_kue.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_rue.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_udav.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/u3g.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubser.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ucycom.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ufoma.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uftdi.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ugensa.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ulpt.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umct.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uplcom.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvisor.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/umass.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/urio.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/ustorage_fs.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_bus.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_controller.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_core.h#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_debug.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.h#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dynamic.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_generic.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_handle_request.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_util.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#16 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbhid.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rum.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rumvar.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uath.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uathvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_ural.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uralvar.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_zyd.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_zydreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/vr/if_vr.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/console/console.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/xl/if_xl.c#6 integrate .. //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_rrip.c#11 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsport.h#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clbio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvnops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/nullfs/null_subr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/vimage-commit/src/sys/fs/pseudofs/pseudofs_vnops.c#7 integrate .. //depot/projects/vimage-commit/src/sys/fs/smbfs/smbfs_io.c#6 integrate .. //depot/projects/vimage-commit/src/sys/geom/label/g_label.c#4 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/vimage-commit/src/sys/geom/vinum/geom_vinum_drive.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/minidump_machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/i386/ibcs2/ibcs2_socksys.c#9 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/apicvar.h#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/xen/clock.c#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/mp_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/vimage-commit/src/sys/i386/xen/xen_rtc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/ssc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_cpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#17 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_mib.c#15 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_osd.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_prot.c#12 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_rmlock.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_shutdown.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_sx.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#19 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_xxx.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty.c#16 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_pts.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#13 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_default.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_lookup.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/vnode_if.src#6 integrate .. //depot/projects/vimage-commit/src/sys/kgssapi/gsstest.c#3 integrate .. //depot/projects/vimage-commit/src/sys/modules/Makefile#19 integrate .. //depot/projects/vimage-commit/src/sys/modules/cpufreq/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/geom/geom_part/geom_part_ebr/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/modules/zfs/Makefile#6 integrate .. //depot/projects/vimage-commit/src/sys/net/if.c#25 integrate .. //depot/projects/vimage-commit/src/sys/net/if.h#7 integrate .. //depot/projects/vimage-commit/src/sys/net/if_var.h#17 integrate .. //depot/projects/vimage-commit/src/sys/net/pfil.h#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_dfs.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#13 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ht.c#8 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_phy.h#3 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_superg.c#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_tdma.c#5 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#7 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#8 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_sysctl.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_sysctl.h#7 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_uio.h#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctputil.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/icmp6.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_ifattach.c#15 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/bootp_subr.c#8 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_bio.c#7 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vfsops.c#15 integrate .. //depot/projects/vimage-commit/src/sys/nfsserver/nfs_srvkrpc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nlm/nlm_advlock.c#9 integrate .. //depot/projects/vimage-commit/src/sys/pci/if_rl.c#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/machdep.c#8 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/conf/GENERIC#11 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/conf/NOTES#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/cpufreq/dfs.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/ofw/ofw_cpu.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/powermac/pmu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powermac/vcoregpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/cpu.c#6 integrate .. //depot/projects/vimage-commit/src/sys/rpc/authunix_prot.c#11 integrate .. //depot/projects/vimage-commit/src/sys/rpc/xdr.h#5 integrate .. //depot/projects/vimage-commit/src/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/hvcons.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/cpu.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/jail.h#11 integrate .. //depot/projects/vimage-commit/src/sys/sys/kernel.h#11 integrate .. //depot/projects/vimage-commit/src/sys/sys/mount.h#7 integrate .. //depot/projects/vimage-commit/src/sys/sys/namei.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#24 integrate .. //depot/projects/vimage-commit/src/sys/sys/priv.h#9 integrate .. //depot/projects/vimage-commit/src/sys/sys/rmlock.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/sockio.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/sx.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/vimage-commit/src/sys/sys/tty.h#6 integrate .. //depot/projects/vimage-commit/src/sys/sys/vimage.h#29 integrate .. //depot/projects/vimage-commit/src/sys/sys/vnode.h#8 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_page.c#8 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_page.h#6 integrate .. //depot/projects/vimage-commit/src/sys/xen/evtchn/evtchn.c#6 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.18 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#12 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.10 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.7 2009/02/02 20:09:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/dump_machdep.c,v 1.8 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npe.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.15 2009/05/23 19:14:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.17 2009/05/30 18:23:55 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -229,7 +229,7 @@ static void npe_txdone(int qid, void *arg); static int npe_rxbuf_init(struct npe_softc *, struct npebuf *, struct mbuf *); -static void npe_rxdone(int qid, void *arg); +static int npe_rxdone(int qid, void *arg); static void npeinit(void *); static void npestart_locked(struct ifnet *); static void npestart(struct ifnet *); @@ -777,7 +777,7 @@ */ sc->rx_qid = npeconfig[sc->sc_npeid].rx_qid; ixpqmgr_qconfig(sc->rx_qid, npe_rxbuf, 0, 1, - IX_QMGR_Q_SOURCE_ID_NOT_E, npe_rxdone, sc); + IX_QMGR_Q_SOURCE_ID_NOT_E, (qconfig_hand_t *)npe_rxdone, sc); sc->rx_freeqid = npeconfig[sc->sc_npeid].rx_freeqid; ixpqmgr_qconfig(sc->rx_freeqid, npe_rxbuf, 0, npe_rxbuf/2, 0, NULL, sc); /* @@ -1091,7 +1091,7 @@ * from the hardware queue and pass the frames up the * stack. Pass the rx buffers to the free list. */ -static void +static int npe_rxdone(int qid, void *arg) { #define P2V(a, dma) \ @@ -1099,6 +1099,7 @@ struct npe_softc *sc = arg; struct npedma *dma = &sc->rxdma; uint32_t entry; + int rx_npkts = 0; while (ixpqmgr_qread(qid, &entry) == 0) { struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry), dma); @@ -1132,6 +1133,7 @@ ifp->if_ipackets++; ifp->if_input(ifp, mrx); + rx_npkts++; } else { /* discard frame and re-use mbuf */ m = npe->ix_m; @@ -1143,19 +1145,22 @@ /* XXX should not happen */ } } + return rx_npkts; #undef P2V } #ifdef DEVICE_POLLING -static void +static int npe_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct npe_softc *sc = ifp->if_softc; + int rx_npkts = 0; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - npe_rxdone(sc->rx_qid, sc); + rx_npkts = npe_rxdone(sc->rx_qid, sc); npe_txdone(sc->tx_doneqid, sc); /* XXX polls both NPE's */ } + return rx_npkts; } #endif /* DEVICE_POLLING */ ==== //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#5 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.5 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.6 2009/05/30 15:14:44 attilio Exp $"); /* * Intel XScale Queue Manager support. @@ -338,7 +338,7 @@ int ixpqmgr_qconfig(int qId, int qEntries, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg) + qconfig_hand_t *cb, void *cbarg) { struct ixpqmgr_softc *sc = ixpqmgr_sc; struct qmgrInfo *qi = &sc->qinfo[qId]; ==== //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.1 2006/11/19 23:55:23 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.2 2009/05/30 15:14:44 attilio Exp $ */ /*- @@ -229,8 +229,10 @@ #define IX_QMGR_ENTRY2_OFFSET 1 #define IX_QMGR_ENTRY4_OFFSET 3 +typedef void qconfig_hand_t(int, void *); + int ixpqmgr_qconfig(int qId, int qSizeInWords, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg); + qconfig_hand_t *cb, void *cbarg); int ixpqmgr_qwrite(int qId, uint32_t entry); int ixpqmgr_qread(int qId, uint32_t *entry); int ixpqmgr_qreadm(int qId, uint32_t n, uint32_t *p); ==== //depot/projects/vimage-commit/src/sys/boot/uboot/lib/net.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.7 2008/11/19 17:34:28 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.8 2009/05/30 19:28:38 marcel Exp $"); #include #include @@ -46,12 +46,6 @@ #include "glue.h" #include "libuboot.h" -#define NETIF_DEBUG -#define NETIF_VERBOSE_DEBUG -#undef NETIF_DEBUG -#undef NETIF_VERBOSE_DEBUG - - static int net_probe(struct netif *, void *); static int net_match(struct netif *, void *); static void net_init(struct iodesc *, void *); @@ -138,7 +132,7 @@ #if defined(NETIF_DEBUG) struct ether_header *eh; - printf("net_put: desc 0x%x, pkt 0x%x, len %d\n", desc, pkt, len); + printf("net_put: desc %p, pkt %p, len %d\n", desc, pkt, len); eh = pkt; printf("dst: %s ", ether_sprintf(eh->ether_dhost)); printf("src: %s ", ether_sprintf(eh->ether_shost)); @@ -175,7 +169,7 @@ int err, rlen; #if defined(NETIF_DEBUG) - printf("net_get: pkt %x, len %d, timeout %d\n", pkt, len, timeout); + printf("net_get: pkt %p, len %d, timeout %d\n", pkt, len, timeout); #endif t = getsecs(); do { ==== //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#5 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.2 2009/05/08 14:11:06 zec Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris.c,v 1.3 2009/05/29 21:27:12 jamie Exp $ * */ @@ -31,11 +31,11 @@ #include #include #include +#include #include #include #include #include -#include cpu_core_t cpu_core[MAXCPU]; kmutex_t cpu_lock; @@ -83,7 +83,7 @@ switch (type) { case MOD_LOAD: - utsname.nodename = G_hostname; + utsname.nodename = prison0.pr_host; break; case MOD_UNLOAD: ==== //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#8 (text+ko) ==== @@ -25,9 +25,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.5 2009/05/08 14:11:06 zec Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c,v 1.6 2009/05/29 21:27:12 jamie Exp $"); #include +#include #include #include #include @@ -57,7 +58,7 @@ { if (str == hw_serial) { - *result = hostid; + *result = prison0.pr_hostid; return (0); } ==== //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/mutex.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mutex.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mutex.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_MUTEX_H_ @@ -47,9 +47,9 @@ typedef struct sx kmutex_t; #ifndef DEBUG -#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define MUTEX_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define MUTEX_FLAGS (SX_DUPOK) #endif #define mutex_init(lock, desc, type, arg) do { \ ==== //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/rwlock.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/rwlock.h,v 1.6 2009/05/16 23:56:45 kmacy Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/rwlock.h,v 1.7 2009/05/29 01:49:27 attilio Exp $ */ #ifndef _OPENSOLARIS_SYS_RWLOCK_H_ @@ -49,9 +49,9 @@ typedef struct sx krwlock_t; #ifndef DEBUG -#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK | SX_NOWITNESS) #else -#define RW_FLAGS (SX_DUPOK | SX_ADAPTIVESPIN) +#define RW_FLAGS (SX_DUPOK) #endif #define RW_READ_HELD(x) (rw_read_held((x))) ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 (text+ko) ==== @@ -564,8 +564,13 @@ if (fp->gfs_parent == NULL || (vp->v_flag & V_XATTRDIR)) goto found; - dp = fp->gfs_parent->v_data; - + /* + * XXX cope with a FreeBSD-specific race wherein the parent's + * snapshot data can be freed before the parent is + */ + if ((dp = fp->gfs_parent->v_data) == NULL) + return (NULL); + /* * First, see if this vnode is cached in the parent. */ ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#4 (text+ko) ==== @@ -2392,13 +2392,23 @@ /* * Check the vdev configuration to ensure that it's capable of supporting - * a root pool. Currently, we do not support RAID-Z or partial configuration. - * In addition, only a single top-level vdev is allowed and none of the leaves - * can be wholedisks. + * a root pool. + * + * On Solaris, we do not support RAID-Z or partial configuration. In + * addition, only a single top-level vdev is allowed and none of the + * leaves can be wholedisks. + * + * For FreeBSD, we can boot from any configuration. There is a + * limitation that the boot filesystem must be either uncompressed or + * compresses with lzjb compression but I'm not sure how to enforce + * that here. */ boolean_t vdev_is_bootable(vdev_t *vd) { +#ifdef __FreeBSD_version + return (B_TRUE); +#else int c; if (!vd->vdev_ops->vdev_op_leaf) { @@ -2420,4 +2430,5 @@ return (B_FALSE); } return (B_TRUE); +#endif } ==== //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 (text+ko) ==== @@ -3121,3 +3121,4 @@ }; DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1); +MODULE_DEPEND(zfsctrl, krpc, 1, 1, 1); ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#15 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.236 2009/05/10 18:43:43 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.237 2009/05/29 21:27:12 jamie Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -64,7 +64,6 @@ #include #include #include -#include #include @@ -715,10 +714,10 @@ int linux_newuname(struct thread *td, struct linux_newuname_args *args) { - INIT_VPROCG(TD_TO_VPROCG(td)); struct l_new_utsname utsname; char osname[LINUX_MAX_UTSNAME]; char osrelease[LINUX_MAX_UTSNAME]; + struct prison *pr; char *p; #ifdef DEBUG @@ -741,9 +740,10 @@ } strlcpy(utsname.machine, linux_platform, LINUX_MAX_UTSNAME); - mtx_lock(&hostname_mtx); - strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); - mtx_unlock(&hostname_mtx); + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + strlcpy(utsname.domainname, pr->pr_domain, LINUX_MAX_UTSNAME); + mtx_unlock(&pr->pr_mtx); return (copyout(&utsname, args->buf, sizeof(utsname))); } ==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#14 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.92 2009/05/19 09:10:53 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.95 2009/05/31 12:16:31 dchagin Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -445,8 +445,6 @@ return (-1); } - - static int linux_to_bsd_msghdr(struct msghdr *bhdr, const struct l_msghdr *lhdr) { @@ -477,6 +475,24 @@ } static int +linux_set_socket_flags(struct thread *td, int s, int flags) +{ + int error; + + if (flags & LINUX_SOCK_NONBLOCK) { + error = kern_fcntl(td, s, F_SETFL, O_NONBLOCK); + if (error) + return (error); + } + if (flags & LINUX_SOCK_CLOEXEC) { + error = kern_fcntl(td, s, F_SETFD, FD_CLOEXEC); + if (error) + return (error); + } + return (0); +} + +static int linux_sendit(struct thread *td, int s, struct msghdr *mp, int flags, struct mbuf *control, enum uio_seg segflg) { @@ -610,21 +626,11 @@ if (retval_socket) return (retval_socket); - if (socket_flags & LINUX_SOCK_NONBLOCK) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFL, O_NONBLOCK); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } - } - if (socket_flags & LINUX_SOCK_CLOEXEC) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFD, FD_CLOEXEC); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } + retval_socket = linux_set_socket_flags(td, td->td_retval[0], + socket_flags); + if (retval_socket) { + (void)kern_close(td, td->td_retval[0]); + goto out; } if (bsd_args.type == SOCK_RAW @@ -878,12 +884,20 @@ int protocol; int *rsv; } */ bsd_args; + int error, socket_flags; + int sv[2]; bsd_args.domain = linux_to_bsd_domain(args->domain); if (bsd_args.domain != PF_LOCAL) return (EAFNOSUPPORT); - bsd_args.type = args->type; + socket_flags = args->type & ~LINUX_SOCK_TYPE_MASK; + if (socket_flags & ~(LINUX_SOCK_CLOEXEC | LINUX_SOCK_NONBLOCK)) + return (EINVAL); + bsd_args.type = args->type & LINUX_SOCK_TYPE_MASK; + if (bsd_args.type < 0 || bsd_args.type > LINUX_SOCK_MAX) + return (EINVAL); + if (args->protocol != 0 && args->protocol != PF_UNIX) /* @@ -896,7 +910,25 @@ else bsd_args.protocol = 0; bsd_args.rsv = (int *)PTRIN(args->rsv); - return (socketpair(td, &bsd_args)); + error = kern_socketpair(td, bsd_args.domain, bsd_args.type, + bsd_args.protocol, sv); + if (error) + return (error); + error = linux_set_socket_flags(td, sv[0], socket_flags); + if (error) + goto out; + error = linux_set_socket_flags(td, sv[1], socket_flags); + if (error) + goto out; + + error = copyout(sv, bsd_args.rsv, 2 * sizeof(int)); + +out: + if (error) { + (void)kern_close(td, sv[0]); + (void)kern_close(td, sv[1]); + } + return (error); } struct linux_send_args { ==== //depot/projects/vimage-commit/src/sys/compat/ndis/subr_usbd.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.12 2009/04/05 18:20:38 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.14 2009/05/29 18:46:57 thompsa Exp $"); #include #include @@ -76,18 +76,18 @@ #include static driver_object usbd_driver; -static usb2_callback_t usbd_non_isoc_callback; -static usb2_callback_t usbd_ctrl_callback; +static usb_callback_t usbd_non_isoc_callback; +static usb_callback_t usbd_ctrl_callback; #define USBD_CTRL_READ_PIPE 0 #define USBD_CTRL_WRITE_PIPE 1 #define USBD_CTRL_MAX_PIPE 2 #define USBD_CTRL_READ_BUFFER_SP 256 #define USBD_CTRL_READ_BUFFER_SIZE \ - (sizeof(struct usb2_device_request) + USBD_CTRL_READ_BUFFER_SP) + (sizeof(struct usb_device_request) + USBD_CTRL_READ_BUFFER_SP) #define USBD_CTRL_WRITE_BUFFER_SIZE \ - (sizeof(struct usb2_device_request)) -static struct usb2_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = { + (sizeof(struct usb_device_request)) +static struct usb_config usbd_default_epconfig[USBD_CTRL_MAX_PIPE] = { [USBD_CTRL_READ_PIPE] = { .type = UE_CONTROL, .endpoint = 0x00, /* control pipe */ @@ -114,11 +114,11 @@ static int32_t usbd_func_vendorclass(irp *); static int32_t usbd_func_selconf(irp *); static int32_t usbd_func_abort_pipe(irp *); -static usb2_error_t usbd_setup_endpoint(irp *, uint8_t, - struct usb2_endpoint_descriptor *); -static usb2_error_t usbd_setup_endpoint_default(irp *, uint8_t); -static usb2_error_t usbd_setup_endpoint_one(irp *, uint8_t, - struct ndisusb_ep *, struct usb2_config *); +static usb_error_t usbd_setup_endpoint(irp *, uint8_t, + struct usb_endpoint_descriptor *); +static usb_error_t usbd_setup_endpoint_default(irp *, uint8_t); +static usb_error_t usbd_setup_endpoint_one(irp *, uint8_t, + struct ndisusb_ep *, struct usb_config *); static int32_t usbd_func_getdesc(irp *); static union usbd_urb *usbd_geturb(irp *); static struct ndisusb_ep*usbd_get_ndisep(irp *, usb_endpoint_descriptor_t *); @@ -353,7 +353,7 @@ return (STATUS_FAILURE); } -/* Convert FreeBSD's usb2_error_t to USBD_STATUS */ +/* Convert FreeBSD's usb_error_t to USBD_STATUS */ static int32_t usbd_usb2urb(int status) { @@ -463,7 +463,7 @@ uint32_t len; union usbd_urb *urb; usb_config_descriptor_t *cdp; - usb2_error_t status; + usb_error_t status; urb = usbd_geturb(ip); ctldesc = &urb->uu_ctldesc; @@ -519,15 +519,15 @@ device_t dev = IRP_NDIS_DEV(ip); int i, j; struct ndis_softc *sc = device_get_softc(dev); - struct usb2_device *udev = sc->ndisusb_dev; - struct usb2_pipe *p = NULL; + struct usb_device *udev = sc->ndisusb_dev; + struct usb_pipe *p = NULL; struct usbd_interface_information *intf; struct usbd_pipe_information *pipe; struct usbd_urb_select_configuration *selconf; union usbd_urb *urb; usb_config_descriptor_t *conf; usb_endpoint_descriptor_t *edesc; - usb2_error_t ret; + usb_error_t ret; urb = usbd_geturb(ip); @@ -592,17 +592,17 @@ return USBD_STATUS_SUCCESS; } -static usb2_error_t +static usb_error_t usbd_setup_endpoint_one(ip, ifidx, ne, epconf) irp *ip; uint8_t ifidx; struct ndisusb_ep *ne; - struct usb2_config *epconf; + struct usb_config *epconf; { device_t dev = IRP_NDIS_DEV(ip); struct ndis_softc *sc = device_get_softc(dev); - struct usb2_xfer *xfer; - usb2_error_t status; + struct usb_xfer *xfer; + usb_error_t status; InitializeListHead(&ne->ne_active); InitializeListHead(&ne->ne_pending); @@ -621,14 +621,14 @@ return (status); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 31 18:28:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3CC71065678; Sun, 31 May 2009 18:28:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3046106566B for ; Sun, 31 May 2009 18:28:50 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F9A88FC12 for ; Sun, 31 May 2009 18:28:50 +0000 (UTC) (envelope-from marinosi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VISoG2019429 for ; Sun, 31 May 2009 18:28:50 GMT (envelope-from marinosi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VISorE019427 for perforce@freebsd.org; Sun, 31 May 2009 18:28:50 GMT (envelope-from marinosi@FreeBSD.org) Date: Sun, 31 May 2009 18:28:50 GMT Message-Id: <200905311828.n4VISorE019427@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marinosi@FreeBSD.org using -f From: Ilias Marinos To: Perforce Change Reviews Cc: Subject: PERFORCE change 163188 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 18:28:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=163188 Change 163188 by marinosi@marinosi_redrum on 2009/05/31 18:27:53 -Towards a slice based audit system. The standard audit system is the base slice. -Slice's device skeleton moved in //sys/security/audit as rwatson suggested. NOT tested. Affected files ... .. //depot/projects/soc2009/marinosi_appaudit/src/sys/bsm/audit.h#2 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/appaudit/audit_slice_dev.c#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/appaudit/audit_slice_private.h#2 delete .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit.c#2 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit.h#2 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_arg.c#2 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_private.h#2 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_slice.c#1 add .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_slice.h#1 add .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_syscalls.c#2 edit .. //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_worker.c#2 edit Differences ... ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/bsm/audit.h#2 (text) ==== @@ -126,6 +126,9 @@ #define A_SETQCTRL 36 #define A_GETCOND 37 #define A_SETCOND 38 +#define A_CREATESLICE 39 +#define A_UPDATESLICE 40 +#define A_REMOVESLICE 41 /* * Audit policy controls. ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit.c#2 (text) ==== @@ -70,6 +70,8 @@ #include #include +#include + #include static uma_zone_t audit_record_zone; @@ -81,83 +83,10 @@ SYSCTL_NODE(_security, OID_AUTO, audit, CTLFLAG_RW, 0, "TrustedBSD audit controls"); -/* - * Audit control settings that are set/read by system calls and are hence - * non-static. - * - * Define the audit control flags. - */ -int audit_enabled; -int audit_suspended; -/* - * Flags controlling behavior in low storage situations. Should we panic if - * a write fails? Should we fail stop if we're out of disk space? - */ -int audit_panic_on_write_fail; -int audit_fail_stop; -int audit_argv; -int audit_arge; - -/* - * Are we currently "failing stop" due to out of disk space? - */ -int audit_in_failure; - -/* - * Global audit statistics. - */ -struct audit_fstat audit_fstat; - -/* - * Preselection mask for non-attributable events. - */ -struct au_mask audit_nae_mask; - +struct audit_slice base_slice; +struct audit_slice *audit_base_slice = &base_slice; /* - * Mutex to protect global variables shared between various threads and - * processes. - */ -struct mtx audit_mtx; - -/* - * Queue of audit records ready for delivery to disk. We insert new records - * at the tail, and remove records from the head. Also, a count of the - * number of records used for checking queue depth. In addition, a counter - * of records that we have allocated but are not yet in the queue, which is - * needed to estimate the total size of the combined set of records - * outstanding in the system. - */ -struct kaudit_queue audit_q; -int audit_q_len; -int audit_pre_q_len; - -/* - * Audit queue control settings (minimum free, low/high water marks, etc.) - */ -struct au_qctrl audit_qctrl; - -/* - * Condition variable to signal to the worker that it has work to do: either - * new records are in the queue, or a log replacement is taking place. - */ -struct cv audit_worker_cv; - -/* - * Condition variable to flag when crossing the low watermark, meaning that - * threads blocked due to hitting the high watermark can wake up and continue - * to commit records. - */ -struct cv audit_watermark_cv; - -/* - * Condition variable for auditing threads wait on when in fail-stop mode. - * Threads wait on this CV forever (and ever), never seeing the light of day - * again. - */ -static struct cv audit_fail_cv; - -/* * Kernel audit information. This will store the current audit address * or host information that the kernel will use when it's generating * audit records. This data is modified by the A_GET{SET}KAUDIT auditon(2) @@ -261,38 +190,42 @@ * call into the BSM assembly code to initialize it. */ static void -audit_init(void) +audit_init(void *arg) { - audit_enabled = 0; - audit_suspended = 0; - audit_panic_on_write_fail = 0; - audit_fail_stop = 0; - audit_in_failure = 0; - audit_argv = 0; - audit_arge = 0; + struct audit_slice *as = (struct audit_slice *) arg; + + as->audit_enabled = 0; + as->audit_suspended = 0; + as->audit_panic_on_write_fail = 0; + as->audit_fail_stop = 0; + as->audit_in_failure = 0; + as->audit_argv = 0; + as->audit_arge = 0; + + - audit_fstat.af_filesz = 0; /* '0' means unset, unbounded. */ - audit_fstat.af_currsz = 0; - audit_nae_mask.am_success = 0; - audit_nae_mask.am_failure = 0; + as->audit_fstat.af_filesz = 0; /* '0' means unset, unbounded. */ + as->audit_fstat.af_currsz = 0; + as->audit_nae_mask.am_success = 0; + as->audit_nae_mask.am_failure = 0; - TAILQ_INIT(&audit_q); - audit_q_len = 0; - audit_pre_q_len = 0; - audit_qctrl.aq_hiwater = AQ_HIWATER; - audit_qctrl.aq_lowater = AQ_LOWATER; - audit_qctrl.aq_bufsz = AQ_BUFSZ; - audit_qctrl.aq_minfree = AU_FS_MINFREE; + TAILQ_INIT(&(as->audit_q)); + as->audit_q_len = 0; + as->audit_pre_q_len = 0; + as->audit_qctrl.aq_hiwater = AQ_HIWATER; + as->audit_qctrl.aq_lowater = AQ_LOWATER; + as->audit_qctrl.aq_bufsz = AQ_BUFSZ; + as->audit_qctrl.aq_minfree = AU_FS_MINFREE; audit_kinfo.ai_termid.at_type = AU_IPv4; audit_kinfo.ai_termid.at_addr[0] = INADDR_ANY; - mtx_init(&audit_mtx, "audit_mtx", NULL, MTX_DEF); + mtx_init(&(as->audit_mtx), "audit_mtx", NULL, MTX_DEF); KINFO_LOCK_INIT(); - cv_init(&audit_worker_cv, "audit_worker_cv"); - cv_init(&audit_watermark_cv, "audit_watermark_cv"); - cv_init(&audit_fail_cv, "audit_fail_cv"); + cv_init(&(as->audit_worker_cv), "audit_worker_cv"); + cv_init(&(as->audit_watermark_cv), "audit_watermark_cv"); + cv_init(&(as->audit_fail_cv), "audit_fail_cv"); audit_record_zone = uma_zcreate("audit_record", sizeof(struct kaudit_record), audit_record_ctor, @@ -308,10 +241,11 @@ SHUTDOWN_PRI_FIRST); /* Start audit worker thread. */ - audit_worker_init(); + audit_worker_init(as); } -SYSINIT(audit_init, SI_SUB_AUDIT, SI_ORDER_FIRST, audit_init, NULL); +/* Init the base slice */ +SYSINIT(audit_init, SI_SUB_AUDIT, SI_ORDER_FIRST, audit_init, &audit_base_slice); /* * Drain the audit queue and close the log at shutdown. Note that this can @@ -352,9 +286,10 @@ struct kaudit_record *ar; int no_record; - mtx_lock(&audit_mtx); - no_record = (audit_suspended || !audit_enabled); - mtx_unlock(&audit_mtx); + mtx_lock(&(audit_base_slice->audit_mtx)); + no_record = (&(audit_base_slice->audit_suspended) || + !(audit_base_slice->audit_enabled)); + mtx_unlock(&(audit_base_slice->audit_mtx)); if (no_record) return (NULL); @@ -366,9 +301,9 @@ ar = uma_zalloc_arg(audit_record_zone, td, M_WAITOK); ar->k_ar.ar_event = event; - mtx_lock(&audit_mtx); - audit_pre_q_len++; - mtx_unlock(&audit_mtx); + mtx_lock(&(audit_base_slice->audit_mtx)); + audit_base_slice->audit_pre_q_len++; + mtx_unlock(&(audit_base_slice->audit_mtx)); return (ar); } @@ -397,7 +332,7 @@ * value from the system call and using the appropriate audit mask. */ if (ar->k_ar.ar_subj_auid == AU_DEFAUDITID) - aumask = &audit_nae_mask; + aumask = &(audit_base_slice->audit_nae_mask); else aumask = &ar->k_ar.ar_subj_amask; @@ -440,9 +375,9 @@ ar->k_ar_commit |= AR_PRESELECT_PIPE; if ((ar->k_ar_commit & (AR_PRESELECT_TRAIL | AR_PRESELECT_PIPE | AR_PRESELECT_USER_TRAIL | AR_PRESELECT_USER_PIPE)) == 0) { - mtx_lock(&audit_mtx); - audit_pre_q_len--; - mtx_unlock(&audit_mtx); + mtx_lock(&(audit_base_slice->audit_mtx)); + audit_base_slice->audit_pre_q_len--; + mtx_unlock(&(audit_base_slice->audit_mtx)); audit_free(ar); return; } @@ -455,10 +390,11 @@ * Note: it could be that some records initiated while audit was * enabled should still be committed? */ - mtx_lock(&audit_mtx); - if (audit_suspended || !audit_enabled) { - audit_pre_q_len--; - mtx_unlock(&audit_mtx); + mtx_lock(&(audit_base_slice->audit_mtx)); + if (audit_base_slice->audit_suspended + || !audit_base_slice->audit_enabled) { + audit_base_slice->audit_pre_q_len--; + mtx_unlock(&(audit_base_slice->audit_mtx)); audit_free(ar); return; } @@ -467,14 +403,16 @@ * Constrain the number of committed audit records based on the * configurable parameter. */ - while (audit_q_len >= audit_qctrl.aq_hiwater) - cv_wait(&audit_watermark_cv, &audit_mtx); + while (audit_base_slice->audit_q_len >= + audit_base_slice->audit_qctrl.aq_hiwater) + cv_wait(&(audit_base_slice->audit_watermark_cv), + &(audit_base_slice->audit_mtx)); - TAILQ_INSERT_TAIL(&audit_q, ar, k_q); - audit_q_len++; - audit_pre_q_len--; - cv_signal(&audit_worker_cv); - mtx_unlock(&audit_mtx); + TAILQ_INSERT_TAIL(&(audit_base_slice->audit_q), ar, k_q); + audit_base_slice->audit_q_len++; + audit_base_slice->audit_pre_q_len--; + cv_signal(&(audit_base_slice->audit_worker_cv)); + mtx_unlock(&(audit_base_slice->audit_mtx)); } /* @@ -516,7 +454,7 @@ */ auid = td->td_ucred->cr_audit.ai_auid; if (auid == AU_DEFAUDITID) - aumask = &audit_nae_mask; + aumask = &(audit_base_slice->audit_nae_mask); else aumask = &td->td_ucred->cr_audit.ai_mask; @@ -538,9 +476,10 @@ * audit record is still required for this event by * re-calling au_preselect(). */ - if (audit_in_failure && + if (audit_base_slice->audit_in_failure && priv_check(td, PRIV_AUDIT_FAILSTOP) != 0) { - cv_wait(&audit_fail_cv, &audit_mtx); + cv_wait(&(audit_base_slice->audit_fail_cv), + &(audit_base_slice->audit_mtx)); panic("audit_failing_stop: thread continued"); } td->td_ar = audit_new(event, td); @@ -656,7 +595,7 @@ cred = td->td_ucred; auid = cred->cr_audit.ai_auid; if (auid == AU_DEFAUDITID) - aumask = &audit_nae_mask; + aumask = &(audit_base_slice->audit_nae_mask); else aumask = &cred->cr_audit.ai_mask; /* ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit.h#2 (text) ==== @@ -191,7 +191,7 @@ } while (0) #define AUDIT_SYSCALL_ENTER(code, td) do { \ - if (audit_enabled) { \ + if (audit_base_slice->audit_enabled) { \ audit_syscall_enter(code, td); \ } \ } while (0) ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_arg.c#2 (text) ==== @@ -50,6 +50,8 @@ #include #include +#include + /* * Calls to manipulate elements of the audit record structure from system * call code. Macro wrappers will prevent this functions from being entered @@ -791,7 +793,7 @@ { struct kaudit_record *ar; - if (audit_argv == 0) + if (audit_base_slice->audit_argv == 0) return; ar = currecord(); @@ -812,7 +814,7 @@ { struct kaudit_record *ar; - if (audit_arge == 0) + if (audit_base_slice->audit_arge == 0) return; ar = currecord(); ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_private.h#2 (text) ==== @@ -346,9 +346,6 @@ struct kaudit_record *currecord(void); void audit_free(struct kaudit_record *ar); void audit_shutdown(void *arg, int howto); -void audit_rotate_vnode(struct ucred *cred, - struct vnode *vp); -void audit_worker_init(void); /* * Audit pipe functions. ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_syscalls.c#2 (text) ==== @@ -49,6 +49,8 @@ #include #include +#include + #ifdef AUDIT /* @@ -74,7 +76,8 @@ if (error) return (error); - if ((uap->length <= 0) || (uap->length > audit_qctrl.aq_bufsz)) + if ((uap->length <= 0) || (uap->length > + audit_base_slice->audit_qctrl.aq_bufsz)) return (EINVAL); ar = currecord(); @@ -218,25 +221,25 @@ case A_OLDGETPOLICY: case A_GETPOLICY: if (uap->length == sizeof(udata.au_policy64)) { - if (!audit_fail_stop) + if (!audit_base_slice->audit_fail_stop) udata.au_policy64 |= AUDIT_CNT; - if (audit_panic_on_write_fail) + if (audit_base_slice->audit_panic_on_write_fail) udata.au_policy64 |= AUDIT_AHLT; - if (audit_argv) + if (audit_base_slice->audit_argv) udata.au_policy64 |= AUDIT_ARGV; - if (audit_arge) + if (audit_base_slice->audit_arge) udata.au_policy64 |= AUDIT_ARGE; break; } if (uap->length != sizeof(udata.au_policy)) return (EINVAL); - if (!audit_fail_stop) + if (!audit_base_slice->audit_fail_stop) udata.au_policy |= AUDIT_CNT; - if (audit_panic_on_write_fail) + if (audit_base_slice->audit_panic_on_write_fail) udata.au_policy |= AUDIT_AHLT; - if (audit_argv) + if (audit_base_slice->audit_argv) udata.au_policy |= AUDIT_ARGV; - if (audit_arge) + if (audit_base_slice->audit_arge) udata.au_policy |= AUDIT_ARGE; break; @@ -246,12 +249,14 @@ if (udata.au_policy & (~AUDIT_CNT|AUDIT_AHLT| AUDIT_ARGV|AUDIT_ARGE)) return (EINVAL); - audit_fail_stop = ((udata.au_policy64 & AUDIT_CNT) == - 0); - audit_panic_on_write_fail = (udata.au_policy64 & - AUDIT_AHLT); - audit_argv = (udata.au_policy64 & AUDIT_ARGV); - audit_arge = (udata.au_policy64 & AUDIT_ARGE); + audit_base_slice->audit_fail_stop = ((udata.au_policy64 + & AUDIT_CNT) == 0); + audit_base_slice->audit_panic_on_write_fail = + (udata.au_policy64 & AUDIT_AHLT); + audit_base_slice->audit_argv = (udata.au_policy64 + & AUDIT_ARGV); + audit_base_slice->audit_arge = (udata.au_policy64 + & AUDIT_ARGE); break; } if (uap->length != sizeof(udata.au_policy)) @@ -262,40 +267,44 @@ /* * XXX - Need to wake up waiters if the policy relaxes? */ - audit_fail_stop = ((udata.au_policy & AUDIT_CNT) == 0); - audit_panic_on_write_fail = (udata.au_policy & AUDIT_AHLT); - audit_argv = (udata.au_policy & AUDIT_ARGV); - audit_arge = (udata.au_policy & AUDIT_ARGE); + audit_base_slice->audit_fail_stop = + ((udata.au_policy & AUDIT_CNT) == 0); + audit_base_slice->audit_panic_on_write_fail = + (udata.au_policy & AUDIT_AHLT); + audit_base_slice->audit_argv = + (udata.au_policy & AUDIT_ARGV); + audit_base_slice->audit_arge = + (udata.au_policy & AUDIT_ARGE); break; case A_GETKMASK: if (uap->length != sizeof(udata.au_mask)) return (EINVAL); - udata.au_mask = audit_nae_mask; + udata.au_mask = audit_base_slice->audit_nae_mask; break; case A_SETKMASK: if (uap->length != sizeof(udata.au_mask)) return (EINVAL); - audit_nae_mask = udata.au_mask; + audit_base_slice->audit_nae_mask = udata.au_mask; break; case A_OLDGETQCTRL: case A_GETQCTRL: if (uap->length == sizeof(udata.au_qctrl64)) { udata.au_qctrl64.aq64_hiwater = - (u_int64_t)audit_qctrl.aq_hiwater; + (u_int64_t)audit_base_slice->audit_qctrl.aq_hiwater; udata.au_qctrl64.aq64_lowater = - (u_int64_t)audit_qctrl.aq_lowater; + (u_int64_t)audit_base_slice->audit_qctrl.aq_lowater; udata.au_qctrl64.aq64_bufsz = - (u_int64_t)audit_qctrl.aq_bufsz; + (u_int64_t)audit_base_slice->audit_qctrl.aq_bufsz; udata.au_qctrl64.aq64_minfree = - (u_int64_t)audit_qctrl.aq_minfree; + (u_int64_t)audit_base_slice->audit_qctrl.aq_minfree; break; } if (uap->length != sizeof(udata.au_qctrl)) return (EINVAL); - udata.au_qctrl = audit_qctrl; + udata.au_qctrl = audit_base_slice->audit_qctrl; break; case A_OLDSETQCTRL: @@ -308,15 +317,16 @@ (udata.au_qctrl64.aq64_minfree < 0) || (udata.au_qctrl64.aq64_minfree > 100)) return (EINVAL); - audit_qctrl.aq_hiwater = + audit_base_slice->audit_qctrl.aq_hiwater = (int)udata.au_qctrl64.aq64_hiwater; - audit_qctrl.aq_lowater = + audit_base_slice->audit_qctrl.aq_lowater = (int)udata.au_qctrl64.aq64_lowater; - audit_qctrl.aq_bufsz = + audit_base_slice->audit_qctrl.aq_bufsz = (int)udata.au_qctrl64.aq64_bufsz; - audit_qctrl.aq_minfree = + audit_base_slice->audit_qctrl.aq_minfree = (int)udata.au_qctrl64.aq64_minfree; - audit_qctrl.aq_delay = -1; /* Not used. */ + /* Not used. */ + audit_base_slice->audit_qctrl.aq_delay = -1; break; } if (uap->length != sizeof(udata.au_qctrl)) @@ -328,9 +338,9 @@ (udata.au_qctrl.aq_minfree > 100)) return (EINVAL); - audit_qctrl = udata.au_qctrl; + audit_base_slice->audit_qctrl = udata.au_qctrl; /* XXX The queue delay value isn't used with the kernel. */ - audit_qctrl.aq_delay = -1; + audit_base_slice->audit_qctrl.aq_delay = -1; break; case A_GETCWD: @@ -360,7 +370,8 @@ case A_OLDGETCOND: case A_GETCOND: if (uap->length == sizeof(udata.au_cond64)) { - if (audit_enabled && !audit_suspended) + if (audit_base_slice->audit_enabled + && !audit_base_slice->audit_suspended) udata.au_cond64 = AUC_AUDITING; else udata.au_cond64 = AUC_NOAUDIT; @@ -368,7 +379,8 @@ } if (uap->length != sizeof(udata.au_cond)) return (EINVAL); - if (audit_enabled && !audit_suspended) + if (audit_base_slice->audit_enabled + && !audit_base_slice->audit_suspended) udata.au_cond = AUC_AUDITING; else udata.au_cond = AUC_NOAUDIT; @@ -378,11 +390,11 @@ case A_SETCOND: if (uap->length == sizeof(udata.au_cond64)) { if (udata.au_cond64 == AUC_NOAUDIT) - audit_suspended = 1; + audit_base_slice->audit_suspended = 1; if (udata.au_cond64 == AUC_AUDITING) - audit_suspended = 0; + audit_base_slice->audit_suspended = 0; if (udata.au_cond64 == AUC_DISABLED) { - audit_suspended = 1; + audit_base_slice->audit_suspended = 1; audit_shutdown(NULL, 0); } break; @@ -390,11 +402,11 @@ if (uap->length != sizeof(udata.au_cond)) return (EINVAL); if (udata.au_cond == AUC_NOAUDIT) - audit_suspended = 1; + audit_base_slice->audit_suspended = 1; if (udata.au_cond == AUC_AUDITING) - audit_suspended = 0; + audit_base_slice->audit_suspended = 0; if (udata.au_cond == AUC_DISABLED) { - audit_suspended = 1; + audit_base_slice->audit_suspended = 1; audit_shutdown(NULL, 0); } break; @@ -474,14 +486,17 @@ if ((udata.au_fstat.af_filesz != 0) && (udata.au_fstat.af_filesz < MIN_AUDIT_FILE_SIZE)) return (EINVAL); - audit_fstat.af_filesz = udata.au_fstat.af_filesz; + audit_base_slice->audit_fstat.af_filesz + = udata.au_fstat.af_filesz; break; case A_GETFSIZE: if (uap->length != sizeof(udata.au_fstat)) return (EINVAL); - udata.au_fstat.af_filesz = audit_fstat.af_filesz; - udata.au_fstat.af_currsz = audit_fstat.af_currsz; + udata.au_fstat.af_filesz + = audit_base_slice->audit_fstat.af_filesz; + udata.au_fstat.af_currsz + = audit_base_slice->audit_fstat.af_currsz; break; case A_GETPINFO_ADDR: @@ -525,6 +540,21 @@ return (EINVAL); return (audit_send_trigger(udata.au_trigger)); + case A_CREATESLICE: + //if (uap->length != sizeof(udata.au_slice)) + // return (EINVAL); + return (0); + + case A_UPDATESLICE: + //if (uap->length != sizeof(udata.au_slice)) + // return (EINVAL); + return (0); + + case A_REMOVESLICE: + //if (uap->length != sizeof(udata.au_slice)) + // return (EINVAL); + return (0); + default: return (EINVAL); } @@ -805,7 +835,7 @@ * XXXAUDIT: Should audit_suspended actually be cleared by * audit_worker? */ - audit_suspended = 0; + audit_base_slice->audit_suspended = 0; audit_rotate_vnode(cred, vp); ==== //depot/projects/soc2009/marinosi_appaudit/src/sys/security/audit/audit_worker.c#2 (text) ==== @@ -69,33 +69,20 @@ #include #include +#include + #include -/* - * Worker thread that will schedule disk I/O, etc. - */ -static struct proc *audit_thread; /* - * audit_cred and audit_vp are the stored credential and vnode to use for - * active audit trail. They are protected by the audit worker lock, which - * will be held across all I/O and all rotation to prevent them from being - * replaced (rotated) while in use. The audit_file_rotate_wait flag is set - * when the kernel has delivered a trigger to auditd to rotate the trail, and - * is cleared when the next rotation takes place. It is also protected by - * the audit worker lock. + * Slice-worker private mtx handling macros */ -static int audit_file_rotate_wait; -static struct ucred *audit_cred; -static struct vnode *audit_vp; -static struct sx audit_worker_lock; - -#define AUDIT_WORKER_LOCK_INIT() sx_init(&audit_worker_lock, \ +#define AUDIT_WORKER_LOCK_INIT() sx_init(&(as->audit_worker_lock), \ "audit_worker_lock"); -#define AUDIT_WORKER_LOCK_ASSERT() sx_assert(&audit_worker_lock, \ +#define AUDIT_WORKER_LOCK_ASSERT() sx_assert(&(as->audit_worker_lock), \ SA_XLOCKED) -#define AUDIT_WORKER_LOCK() sx_xlock(&audit_worker_lock) -#define AUDIT_WORKER_UNLOCK() sx_xunlock(&audit_worker_lock) +#define AUDIT_WORKER_LOCK() sx_xlock(&(as->audit_worker_lock)) +#define AUDIT_WORKER_UNLOCK() sx_xunlock(&(as->audit_worker_lock)) /* * Write an audit record to a file, performed as the last stage after both @@ -106,7 +93,7 @@ * the audit daemon, since the message is asynchronous anyway. */ static void -audit_record_write(struct vnode *vp, struct ucred *cred, void *data, +audit_record_write(struct audit_slice *as, void *data, size_t len) { static struct timeval last_lowspace_trigger; @@ -120,26 +107,26 @@ AUDIT_WORKER_LOCK_ASSERT(); - if (vp == NULL) + if (as->audit_vp == NULL) return; - mnt_stat = &vp->v_mount->mnt_stat; - vfslocked = VFS_LOCK_GIANT(vp->v_mount); + mnt_stat = &as->audit_vp->v_mount->mnt_stat; + vfslocked = VFS_LOCK_GIANT(as->audit_vp->v_mount); /* * First, gather statistics on the audit log file and file system so * that we know how we're doing on space. Consider failure of these * operations to indicate a future inability to write to the file. */ - error = VFS_STATFS(vp->v_mount, mnt_stat, curthread); + error = VFS_STATFS(as->audit_vp->v_mount, mnt_stat, curthread); if (error) goto fail; - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - error = VOP_GETATTR(vp, &vattr, cred); - VOP_UNLOCK(vp, 0); + vn_lock(as->audit_vp, LK_EXCLUSIVE | LK_RETRY); + error = VOP_GETATTR(as->audit_vp, &vattr, as->audit_cred); + VOP_UNLOCK(as->audit_vp, 0); if (error) goto fail; - audit_fstat.af_currsz = vattr.va_size; + as->audit_fstat.af_currsz = vattr.va_size; /* * We handle four different space-related limits: @@ -177,16 +164,16 @@ * the daemon a trigger and continue processing the record. Triggers * are limited to 1/sec. */ - if (audit_qctrl.aq_minfree != 0) { - temp = mnt_stat->f_blocks / (100 / audit_qctrl.aq_minfree); + if (as->audit_qctrl.aq_minfree != 0) { + temp = mnt_stat->f_blocks / (100 / as->audit_qctrl.aq_minfree); if (mnt_stat->f_bfree < temp) { if (ppsratecheck(&last_lowspace_trigger, &cur_lowspace_trigger, 1)) { (void)audit_send_trigger( AUDIT_TRIGGER_LOW_SPACE); printf("Warning: disk space low (< %d%% free) " - "on audit log file-system\n", - audit_qctrl.aq_minfree); + "on audit log file-system for %s slice.\n", + as->audit_qctrl.aq_minfree, as->as_name); } } } @@ -196,11 +183,11 @@ * to the daemon. This is only approximate, which is fine as more * records may be generated before the daemon rotates the file. */ - if ((audit_fstat.af_filesz != 0) && (audit_file_rotate_wait == 0) && - (vattr.va_size >= audit_fstat.af_filesz)) { + if ((as->audit_fstat.af_filesz != 0) && (as->audit_file_rotate_wait == 0) && + (vattr.va_size >= as->audit_fstat.af_filesz)) { AUDIT_WORKER_LOCK_ASSERT(); - audit_file_rotate_wait = 1; + as->audit_file_rotate_wait = 1; (void)audit_send_trigger(AUDIT_TRIGGER_ROTATE_KERNEL); } @@ -215,16 +202,16 @@ * allow operation to continue, but this behavior is sufficient to * meet fail stop requirements in CAPP. */ - if (audit_fail_stop) { - if ((unsigned long)((audit_q_len + audit_pre_q_len + 1) * + if (as->audit_fail_stop) { + if ((unsigned long)((as->audit_q_len + as->audit_pre_q_len + 1) * MAX_AUDIT_RECORD_SIZE) / mnt_stat->f_bsize >= (unsigned long)(mnt_stat->f_bfree)) { if (ppsratecheck(&last_fail, &cur_fail, 1)) printf("audit_record_write: free space " - "below size of audit queue, failing " - "stop\n"); - audit_in_failure = 1; - } else if (audit_in_failure) { + "below size of audit queue, %s slice failing " + "stop\n", as->as_name); + as->audit_in_failure = 1; + } else if (as->audit_in_failure) { /* * Note: if we want to handle recovery, this is the * spot to do it: unset audit_in_failure, and issue a @@ -233,8 +220,8 @@ } } - error = vn_rdwr(UIO_WRITE, vp, data, len, (off_t)0, UIO_SYSSPACE, - IO_APPEND|IO_UNIT, cred, NULL, NULL, curthread); + error = vn_rdwr(UIO_WRITE, as->audit_vp, data, len, (off_t)0, UIO_SYSSPACE, + IO_APPEND|IO_UNIT, as->audit_cred, NULL, NULL, curthread); if (error == ENOSPC) goto fail_enospc; else if (error) @@ -249,11 +236,11 @@ * Note: if we handle recovery from audit_in_failure, then we need to * make panic here conditional. */ - if (audit_in_failure) { - if (audit_q_len == 0 && audit_pre_q_len == 0) { - VOP_LOCK(vp, LK_EXCLUSIVE | LK_RETRY); - (void)VOP_FSYNC(vp, MNT_WAIT, curthread); - VOP_UNLOCK(vp, 0); + if (as->audit_in_failure) { + if (as->audit_q_len == 0 && as->audit_pre_q_len == 0) { + VOP_LOCK(as->audit_vp, LK_EXCLUSIVE | LK_RETRY); + (void)VOP_FSYNC(as->audit_vp, MNT_WAIT, curthread); + VOP_UNLOCK(as->audit_vp, 0); panic("Audit store overflow; record queue drained."); } } @@ -267,14 +254,14 @@ * this can reflect either our preemptive detection of insufficient * space, or ENOSPC returned by the vnode write call. */ - if (audit_fail_stop) { - VOP_LOCK(vp, LK_EXCLUSIVE | LK_RETRY); - (void)VOP_FSYNC(vp, MNT_WAIT, curthread); - VOP_UNLOCK(vp, 0); + if (as->audit_fail_stop) { + VOP_LOCK(as->audit_vp, LK_EXCLUSIVE | LK_RETRY); + (void)VOP_FSYNC(as->audit_vp, MNT_WAIT, curthread); + VOP_UNLOCK(as->audit_vp, 0); panic("Audit log space exhausted and fail-stop set."); } (void)audit_send_trigger(AUDIT_TRIGGER_NO_SPACE); - audit_suspended = 1; + as->audit_suspended = 1; /* FALLTHROUGH */ fail: @@ -282,10 +269,10 @@ * We have failed to write to the file, so the current record is * lost, which may require an immediate system halt. */ - if (audit_panic_on_write_fail) { - VOP_LOCK(vp, LK_EXCLUSIVE | LK_RETRY); - (void)VOP_FSYNC(vp, MNT_WAIT, curthread); - VOP_UNLOCK(vp, 0); + if (as->audit_panic_on_write_fail) { + VOP_LOCK(as->audit_vp, LK_EXCLUSIVE | LK_RETRY); + (void)VOP_FSYNC(as->audit_vp, MNT_WAIT, curthread); + VOP_UNLOCK(as->audit_vp, 0); panic("audit_worker: write error %d\n", error); } else if (ppsratecheck(&last_fail, &cur_fail, 1)) printf("audit_worker: write error %d\n", error); @@ -300,7 +287,7 @@ * written to disk, and audit pipes. */ static void -audit_worker_process_record(struct kaudit_record *ar) +audit_worker_process_record(struct kaudit_record *ar, struct audit_slice *as) { struct au_record *bsm; au_class_t class; @@ -329,7 +316,7 @@ if ((ar->k_ar_commit & AR_COMMIT_USER) && (ar->k_ar_commit & AR_PRESELECT_USER_TRAIL)) { AUDIT_WORKER_LOCK_ASSERT(); - audit_record_write(audit_vp, audit_cred, ar->k_udata, + audit_record_write(as, ar->k_udata, ar->k_ulen); } @@ -368,7 +355,7 @@ if (ar->k_ar_commit & AR_PRESELECT_TRAIL) { AUDIT_WORKER_LOCK_ASSERT(); - audit_record_write(audit_vp, audit_cred, bsm->data, bsm->len); + audit_record_write(as, bsm->data, bsm->len); } if (ar->k_ar_commit & AR_PRESELECT_PIPE) @@ -398,16 +385,18 @@ struct kaudit_record *ar; int lowater_signal; + struct audit_slice *as = (struct audit_slice * ) arg; + TAILQ_INIT(&ar_worklist); - mtx_lock(&audit_mtx); + mtx_lock(&(as->audit_mtx)); while (1) { - mtx_assert(&audit_mtx, MA_OWNED); + mtx_assert(&(as->audit_mtx), MA_OWNED); /* * Wait for a record. */ - while (TAILQ_EMPTY(&audit_q)) - cv_wait(&audit_worker_cv, &audit_mtx); + while (TAILQ_EMPTY(&(as->audit_q))) + cv_wait(&(as->audit_worker_cv), &(as->audit_mtx)); /* * If there are records in the global audit record queue, @@ -417,23 +406,23 @@ * continue generating records. */ lowater_signal = 0; - while ((ar = TAILQ_FIRST(&audit_q))) { - TAILQ_REMOVE(&audit_q, ar, k_q); - audit_q_len--; - if (audit_q_len == audit_qctrl.aq_lowater) + while ((ar = TAILQ_FIRST(&(as->audit_q)))) { + TAILQ_REMOVE(&(as->audit_q), ar, k_q); + as->audit_q_len--; + if (as->audit_q_len == as->audit_qctrl.aq_lowater) lowater_signal++; TAILQ_INSERT_TAIL(&ar_worklist, ar, k_q); } if (lowater_signal) - cv_broadcast(&audit_watermark_cv); + cv_broadcast(&(as->audit_watermark_cv)); - mtx_unlock(&audit_mtx); + mtx_unlock(&(as->audit_mtx)); while ((ar = TAILQ_FIRST(&ar_worklist))) { TAILQ_REMOVE(&ar_worklist, ar, k_q); - audit_worker_process_record(ar); + audit_worker_process_record(ar, as); audit_free(ar); } - mtx_lock(&audit_mtx); + mtx_lock(&(as->audit_mtx)); } } @@ -451,8 +440,11 @@ { struct ucred *old_audit_cred; struct vnode *old_audit_vp; + struct audit_slice *as; int vfslocked; + as = audit_base_slice; + KASSERT((cred != NULL && vp != NULL) || (cred == NULL && vp == NULL), ("audit_rotate_vnode: cred %p vp %p", cred, vp)); @@ -461,12 +453,12 @@ * send a rotate trigger if the new file fills. */ AUDIT_WORKER_LOCK(); - old_audit_cred = audit_cred; - old_audit_vp = audit_vp; - audit_cred = cred; - audit_vp = vp; - audit_file_rotate_wait = 0; - audit_enabled = (audit_vp != NULL); + old_audit_cred = as->audit_cred; + old_audit_vp = as->audit_vp; + as->audit_cred = cred; + as->audit_vp = vp; + as->audit_file_rotate_wait = 0; + as->audit_enabled = (as->audit_vp != NULL); AUDIT_WORKER_UNLOCK(); /* @@ -482,13 +474,14 @@ } void -audit_worker_init(void) +audit_worker_init(void *arg) { int error; + struct audit_slice *as = (struct audit_slice * ) arg; AUDIT_WORKER_LOCK_INIT(); - error = kproc_create(audit_worker, NULL, &audit_thread, RFHIGHPID, - 0, "audit"); + error = kproc_create(audit_worker,(void *) as, &(as->audit_thread), RFHIGHPID, + 0, as->as_name); if (error) panic("audit_worker_init: kproc_create returned %d", error); } From owner-p4-projects@FreeBSD.ORG Sun May 31 18:43:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 97BC81065670; Sun, 31 May 2009 18:43: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 57262106564A for ; Sun, 31 May 2009 18:43:05 +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 43CCA8FC14 for ; Sun, 31 May 2009 18:43:05 +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 n4VIh5vo020831 for ; Sun, 31 May 2009 18:43:05 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VIh5ne020829 for perforce@freebsd.org; Sun, 31 May 2009 18:43:05 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 31 May 2009 18:43:05 GMT Message-Id: <200905311843.n4VIh5ne020829@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 163190 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 18:43:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=163190 Change 163190 by thompsa@thompsa_burger on 2009/05/31 18:42:57 Rename usb pipes to endpoints as it better represents what they are. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb.h#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.h#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_controller.h#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.h#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.h#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.h#5 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#6 (text+ko) ==== @@ -687,7 +687,7 @@ done: sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - temp = (xfer->endpoint & UE_ADDR); + temp = (xfer->endpointno & UE_ADDR); /* update FIFO bank flag and multi buffer */ if (td->fifo_bank) { @@ -864,7 +864,7 @@ uint8_t need_sync; DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", - xfer->address, UE_GET_ADDR(xfer->endpoint), + xfer->address, UE_GET_ADDR(xfer->endpointno), xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -882,7 +882,7 @@ temp.did_stall = !xfer->flags_int.control_stall; sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - ep_no = (xfer->endpoint & UE_ADDR); + ep_no = (xfer->endpointno & UE_ADDR); /* check if we should prepend a setup message */ @@ -908,7 +908,7 @@ } if (x != xfer->nframes) { - if (xfer->endpoint & UE_DIR_IN) { + if (xfer->endpointno & UE_DIR_IN) { temp.func = &at91dci_data_tx; need_sync = 1; } else { @@ -984,7 +984,7 @@ * Send a DATA1 message and invert the current * endpoint direction. */ - if (xfer->endpoint & UE_DIR_IN) { + if (xfer->endpointno & UE_DIR_IN) { temp.func = &at91dci_data_rx; need_sync = 0; } else { @@ -1034,7 +1034,7 @@ if (at91dci_xfer_do_fifo(xfer)) { struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus); - uint8_t ep_no = xfer->endpoint & UE_ADDR; + uint8_t ep_no = xfer->endpointno & UE_ADDR; /* * Only enable the endpoint interrupt when we are actually @@ -1139,8 +1139,8 @@ { usb_error_t err = 0; - DPRINTFN(13, "xfer=%p pipe=%p transfer done\n", - xfer, xfer->pipe); + DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", + xfer, xfer->endpoint); /* reset scanner */ @@ -1191,11 +1191,11 @@ USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n", - xfer, xfer->pipe, error); + DPRINTFN(2, "xfer=%p, endpoint=%p, error=%d\n", + xfer, xfer->endpoint, error); if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { - ep_no = (xfer->endpoint & UE_ADDR); + ep_no = (xfer->endpointno & UE_ADDR); /* disable endpoint interrupt */ AT91_UDP_WRITE_4(sc, AT91_UDP_IDR, AT91_UDP_INT_EP(ep_no)); @@ -1208,7 +1208,7 @@ static void at91dci_set_stall(struct usb_device *udev, struct usb_xfer *xfer, - struct usb_pipe *pipe) + struct usb_endpoint *ep) { struct at91dci_softc *sc; uint32_t csr_val; @@ -1216,7 +1216,7 @@ USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); - DPRINTFN(5, "pipe=%p\n", pipe); + DPRINTFN(5, "endpoint=%p\n", ep); if (xfer) { /* cancel any ongoing transfers */ @@ -1224,7 +1224,7 @@ } /* set FORCESTALL */ sc = AT9100_DCI_BUS2SC(udev->bus); - csr_reg = (pipe->edesc->bEndpointAddress & UE_ADDR); + csr_reg = (ep->edesc->bEndpointAddress & UE_ADDR); csr_reg = AT91_UDP_CSR(csr_reg); csr_val = AT91_UDP_READ_4(sc, csr_reg); AT91_CSR_ACK(csr_val, AT91_UDP_CSR_FORCESTALL); @@ -1328,12 +1328,12 @@ } static void -at91dci_clear_stall(struct usb_device *udev, struct usb_pipe *pipe) +at91dci_clear_stall(struct usb_device *udev, struct usb_endpoint *ep) { struct at91dci_softc *sc; struct usb_endpoint_descriptor *ed; - DPRINTFN(5, "pipe=%p\n", pipe); + DPRINTFN(5, "endpoint=%p\n", ep); USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); @@ -1346,7 +1346,7 @@ sc = AT9100_DCI_BUS2SC(udev->bus); /* get endpoint descriptor */ - ed = pipe->edesc; + ed = ep->edesc; /* reset endpoint */ at91dci_clear_stall_sub(sc, @@ -1598,7 +1598,7 @@ uint32_t nframes; DPRINTFN(6, "xfer=%p next=%d nframes=%d\n", - xfer, xfer->pipe->isoc_next, xfer->nframes); + xfer, xfer->endpoint->isoc_next, xfer->nframes); /* get the current frame index */ @@ -1608,25 +1608,25 @@ * check if the frame index is within the window where the frames * will be inserted */ - temp = (nframes - xfer->pipe->isoc_next) & AT91_UDP_FRM_MASK; + temp = (nframes - xfer->endpoint->isoc_next) & AT91_UDP_FRM_MASK; - if ((xfer->pipe->is_synced == 0) || + if ((xfer->endpoint->is_synced == 0) || (temp < xfer->nframes)) { /* - * If there is data underflow or the pipe queue is + * If there is data underflow or the endpoint queue is * empty we schedule the transfer a few frames ahead * of the current frame position. Else two isochronous * transfers might overlap. */ - xfer->pipe->isoc_next = (nframes + 3) & AT91_UDP_FRM_MASK; - xfer->pipe->is_synced = 1; - DPRINTFN(3, "start next=%d\n", xfer->pipe->isoc_next); + xfer->endpoint->isoc_next = (nframes + 3) & AT91_UDP_FRM_MASK; + xfer->endpoint->is_synced = 1; + DPRINTFN(3, "start next=%d\n", xfer->endpoint->isoc_next); } /* * compute how many milliseconds the insertion is ahead of the * current frame position: */ - temp = (xfer->pipe->isoc_next - nframes) & AT91_UDP_FRM_MASK; + temp = (xfer->endpoint->isoc_next - nframes) & AT91_UDP_FRM_MASK; /* * pre-compute when the isochronous transfer will be finished: @@ -1636,7 +1636,7 @@ xfer->nframes; /* compute frame number for next insertion */ - xfer->pipe->isoc_next += xfer->nframes; + xfer->endpoint->isoc_next += xfer->nframes; /* setup TDs */ at91dci_setup_standard_chain(xfer); @@ -2208,7 +2208,7 @@ */ if (ntd) { - ep_no = xfer->endpoint & UE_ADDR; + ep_no = xfer->endpointno & UE_ADDR; at91dci_get_hw_ep_profile(parm->udev, &pf, ep_no); if (pf == NULL) { @@ -2259,12 +2259,12 @@ static void at91dci_pipe_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, - struct usb_pipe *pipe) + struct usb_endpoint *ep) { struct at91dci_softc *sc = AT9100_DCI_BUS2SC(udev->bus); - DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", - pipe, udev->address, + DPRINTFN(2, "endpoint=%p, addr=%d, endpt=%d, mode=%d (%d)\n", + ep, udev->address, edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_rt_addr); @@ -2280,16 +2280,16 @@ } switch (edesc->bmAttributes & UE_XFERTYPE) { case UE_CONTROL: - pipe->methods = &at91dci_device_ctrl_methods; + ep->methods = &at91dci_device_ctrl_methods; break; case UE_INTERRUPT: - pipe->methods = &at91dci_device_intr_methods; + ep->methods = &at91dci_device_intr_methods; break; case UE_ISOCHRONOUS: - pipe->methods = &at91dci_device_isoc_fs_methods; + ep->methods = &at91dci_device_isoc_fs_methods; break; case UE_BULK: - pipe->methods = &at91dci_device_bulk_methods; + ep->methods = &at91dci_device_bulk_methods; break; default: /* do nothing */ ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#6 (text+ko) ==== @@ -767,7 +767,7 @@ uint8_t need_sync; DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", - xfer->address, UE_GET_ADDR(xfer->endpoint), + xfer->address, UE_GET_ADDR(xfer->endpointno), xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -785,7 +785,7 @@ temp.did_stall = !xfer->flags_int.control_stall; sc = ATMEGA_BUS2SC(xfer->xroot->bus); - ep_no = (xfer->endpoint & UE_ADDR); + ep_no = (xfer->endpointno & UE_ADDR); /* check if we should prepend a setup message */ @@ -811,7 +811,7 @@ } if (x != xfer->nframes) { - if (xfer->endpoint & UE_DIR_IN) { + if (xfer->endpointno & UE_DIR_IN) { temp.func = &atmegadci_data_tx; need_sync = 1; } else { @@ -886,7 +886,7 @@ * Send a DATA1 message and invert the current * endpoint direction. */ - if (xfer->endpoint & UE_DIR_IN) { + if (xfer->endpointno & UE_DIR_IN) { temp.func = &atmegadci_data_rx; need_sync = 0; } else { @@ -1022,8 +1022,8 @@ { usb_error_t err = 0; - DPRINTFN(13, "xfer=%p pipe=%p transfer done\n", - xfer, xfer->pipe); + DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", + xfer, xfer->endpoint); /* reset scanner */ @@ -1074,11 +1074,11 @@ USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - DPRINTFN(9, "xfer=%p, pipe=%p, error=%d\n", - xfer, xfer->pipe, error); + DPRINTFN(9, "xfer=%p, endpoint=%p, error=%d\n", + xfer, xfer->endpoint, error); if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { - ep_no = (xfer->endpoint & UE_ADDR); + ep_no = (xfer->endpointno & UE_ADDR); /* select endpoint number */ ATMEGA_WRITE_1(sc, ATMEGA_UENUM, ep_no); @@ -1094,14 +1094,14 @@ static void atmegadci_set_stall(struct usb_device *udev, struct usb_xfer *xfer, - struct usb_pipe *pipe) + struct usb_endpoint *ep) { struct atmegadci_softc *sc; uint8_t ep_no; USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); - DPRINTFN(5, "pipe=%p\n", pipe); + DPRINTFN(5, "endpoint=%p\n", ep); if (xfer) { /* cancel any ongoing transfers */ @@ -1109,7 +1109,7 @@ } sc = ATMEGA_BUS2SC(udev->bus); /* get endpoint number */ - ep_no = (pipe->edesc->bEndpointAddress & UE_ADDR); + ep_no = (ep->edesc->bEndpointAddress & UE_ADDR); /* select endpoint number */ ATMEGA_WRITE_1(sc, ATMEGA_UENUM, ep_no); /* set stall */ @@ -1178,12 +1178,12 @@ } static void -atmegadci_clear_stall(struct usb_device *udev, struct usb_pipe *pipe) +atmegadci_clear_stall(struct usb_device *udev, struct usb_endpoint *ep) { struct atmegadci_softc *sc; struct usb_endpoint_descriptor *ed; - DPRINTFN(5, "pipe=%p\n", pipe); + DPRINTFN(5, "endpoint=%p\n", ep); USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); @@ -1196,7 +1196,7 @@ sc = ATMEGA_BUS2SC(udev->bus); /* get endpoint descriptor */ - ed = pipe->edesc; + ed = ep->edesc; /* reset endpoint */ atmegadci_clear_stall_sub(sc, @@ -1415,7 +1415,7 @@ uint32_t nframes; DPRINTFN(6, "xfer=%p next=%d nframes=%d\n", - xfer, xfer->pipe->isoc_next, xfer->nframes); + xfer, xfer->endpoint->isoc_next, xfer->nframes); /* get the current frame index */ @@ -1429,9 +1429,9 @@ * check if the frame index is within the window where the frames * will be inserted */ - temp = (nframes - xfer->pipe->isoc_next) & ATMEGA_FRAME_MASK; + temp = (nframes - xfer->endpoint->isoc_next) & ATMEGA_FRAME_MASK; - if ((xfer->pipe->is_synced == 0) || + if ((xfer->endpoint->is_synced == 0) || (temp < xfer->nframes)) { /* * If there is data underflow or the pipe queue is @@ -1439,15 +1439,15 @@ * of the current frame position. Else two isochronous * transfers might overlap. */ - xfer->pipe->isoc_next = (nframes + 3) & ATMEGA_FRAME_MASK; - xfer->pipe->is_synced = 1; - DPRINTFN(3, "start next=%d\n", xfer->pipe->isoc_next); + xfer->endpoint->isoc_next = (nframes + 3) & ATMEGA_FRAME_MASK; + xfer->endpoint->is_synced = 1; + DPRINTFN(3, "start next=%d\n", xfer->endpoint->isoc_next); } /* * compute how many milliseconds the insertion is ahead of the * current frame position: */ - temp = (xfer->pipe->isoc_next - nframes) & ATMEGA_FRAME_MASK; + temp = (xfer->endpoint->isoc_next - nframes) & ATMEGA_FRAME_MASK; /* * pre-compute when the isochronous transfer will be finished: @@ -1457,7 +1457,7 @@ xfer->nframes; /* compute frame number for next insertion */ - xfer->pipe->isoc_next += xfer->nframes; + xfer->endpoint->isoc_next += xfer->nframes; /* setup TDs */ atmegadci_setup_standard_chain(xfer); @@ -2022,7 +2022,7 @@ /* * compute maximum number of TDs */ - if ((xfer->pipe->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL) { + if ((xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE) == UE_CONTROL) { ntd = xfer->nframes + 1 /* STATUS */ + 1 /* SYNC 1 */ + 1 /* SYNC 2 */ ; @@ -2045,7 +2045,7 @@ /* * get profile stuff */ - ep_no = xfer->endpoint & UE_ADDR; + ep_no = xfer->endpointno & UE_ADDR; atmegadci_get_hw_ep_profile(parm->udev, &pf, ep_no); if (pf == NULL) { @@ -2089,12 +2089,12 @@ static void atmegadci_pipe_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, - struct usb_pipe *pipe) + struct usb_endpoint *ep) { struct atmegadci_softc *sc = ATMEGA_BUS2SC(udev->bus); - DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d,%d)\n", - pipe, udev->address, + DPRINTFN(2, "endpoint=%p, addr=%d, endpt=%d, mode=%d (%d,%d)\n", + ep, udev->address, edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_rt_addr, udev->device_index); @@ -2109,9 +2109,9 @@ return; } if ((edesc->bmAttributes & UE_XFERTYPE) == UE_ISOCHRONOUS) - pipe->methods = &atmegadci_device_isoc_fs_methods; + ep->methods = &atmegadci_device_isoc_fs_methods; else - pipe->methods = &atmegadci_device_non_isoc_methods; + ep->methods = &atmegadci_device_non_isoc_methods; } } ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#5 (text+ko) ==== @@ -1062,7 +1062,7 @@ static void avr32dci_set_stall(struct usb_device *udev, struct usb_xfer *xfer, - struct usb_pipe *pipe) + struct usb_endpoint *ep) { struct avr32dci_softc *sc; uint8_t ep_no; @@ -1148,7 +1148,7 @@ } static void -avr32dci_clear_stall(struct usb_device *udev, struct usb_pipe *pipe) +avr32dci_clear_stall(struct usb_device *udev, struct usb_endpoint *ep) { struct avr32dci_softc *sc; struct usb_endpoint_descriptor *ed; @@ -2026,7 +2026,7 @@ static void avr32dci_pipe_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, - struct usb_pipe *pipe) + struct usb_endpoint *ep) { struct avr32dci_softc *sc = AVR32_BUS2SC(udev->bus); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#6 (text+ko) ==== @@ -1190,14 +1190,14 @@ /* update data toggle */ - xfer->pipe->toggle_next = + xfer->endpoint->toggle_next = (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0; #if USB_DEBUG if (status & EHCI_QTD_STATERRS) { DPRINTFN(11, "error, addr=%d, endpt=0x%02x, frame=0x%02x" "status=%s%s%s%s%s%s%s%s\n", - xfer->address, xfer->endpoint, xfer->aframes, + xfer->address, xfer->endpointno, xfer->aframes, (status & EHCI_QTD_ACTIVE) ? "[ACTIVE]" : "[NOT_ACTIVE]", (status & EHCI_QTD_HALTED) ? "[HALTED]" : "", (status & EHCI_QTD_BUFERR) ? "[BUFERR]" : "", @@ -1218,8 +1218,8 @@ { usb_error_t err = 0; - DPRINTFN(13, "xfer=%p pipe=%p transfer done\n", - xfer, xfer->pipe); + DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", + xfer, xfer->endpoint); #if USB_DEBUG if (ehcidebug > 10) { @@ -1274,7 +1274,7 @@ static uint8_t ehci_check_transfer(struct usb_xfer *xfer) { - struct usb_pipe_methods *methods = xfer->pipe->methods; + struct usb_pipe_methods *methods = xfer->endpoint->methods; ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); uint32_t status; @@ -1716,7 +1716,7 @@ uint32_t x; DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", - xfer->address, UE_GET_ADDR(xfer->endpoint), + xfer->address, UE_GET_ADDR(xfer->endpointno), xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.average = xfer->max_hc_frame_size; @@ -1739,7 +1739,7 @@ temp.setup_alt_next = xfer->flags_int.short_frames_ok; if (xfer->flags_int.control_xfr) { - if (xfer->pipe->toggle_next) { + if (xfer->endpoint->toggle_next) { /* DATA1 is next */ temp.qtd_status |= htohc32(temp.sc, EHCI_QTD_SET_TOGGLE(1)); @@ -1827,7 +1827,7 @@ /* set endpoint direction */ temp.qtd_status |= - (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN) ? + (UE_GET_DIR(xfer->endpointno) == UE_DIR_IN) ? htohc32(temp.sc, EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(EHCI_QTD_PID_IN)) : htohc32(temp.sc, EHCI_QTD_ACTIVE | @@ -1849,7 +1849,7 @@ temp.qtd_status &= htohc32(temp.sc, EHCI_QTD_SET_CERR(3) | EHCI_QTD_SET_TOGGLE(1)); temp.qtd_status |= - (UE_GET_DIR(xfer->endpoint) == UE_DIR_OUT) ? + (UE_GET_DIR(xfer->endpointno) == UE_DIR_OUT) ? htohc32(temp.sc, EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(EHCI_QTD_PID_IN) | EHCI_QTD_SET_TOGGLE(1)) : @@ -1881,13 +1881,13 @@ #if USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", - xfer->pipe->toggle_next); + xfer->endpoint->toggle_next); ehci_dump_sqtds(temp.sc, xfer->td_transfer_first); } #endif - methods = xfer->pipe->methods; + methods = xfer->endpoint->methods; qh = xfer->qh_start[xfer->flags_int.curr_dma_set]; @@ -1895,7 +1895,7 @@ qh_endp = (EHCI_QH_SET_ADDR(xfer->address) | - EHCI_QH_SET_ENDPT(UE_GET_ADDR(xfer->endpoint)) | + EHCI_QH_SET_ENDPT(UE_GET_ADDR(xfer->endpointno)) | EHCI_QH_SET_MPL(xfer->max_packet_size)); if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { @@ -1943,7 +1943,7 @@ qh->qh_endp &= htohc32(temp.sc, ~EHCI_QH_DTC); - if (xfer->pipe->toggle_next) { + if (xfer->endpoint->toggle_next) { /* DATA1 is next */ qh->qh_qtd.qtd_status |= htohc32(temp.sc, EHCI_QTD_SET_TOGGLE(1)); @@ -1999,8 +1999,8 @@ ehci_sitd_t *td = xfer->td_transfer_first; ehci_sitd_t **pp_last = &sc->sc_isoc_fs_p_last[xfer->qh_pos]; - DPRINTFN(13, "xfer=%p pipe=%p transfer done\n", - xfer, xfer->pipe); + DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", + xfer, xfer->endpoint); while (nframes--) { if (td == NULL) { @@ -2053,8 +2053,8 @@ ehci_itd_t *td = xfer->td_transfer_first; ehci_itd_t **pp_last = &sc->sc_isoc_hs_p_last[xfer->qh_pos]; - DPRINTFN(13, "xfer=%p pipe=%p transfer done\n", - xfer, xfer->pipe); + DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", + xfer, xfer->endpoint); while (nframes--) { if (td == NULL) { @@ -2113,20 +2113,20 @@ static void ehci_device_done(struct usb_xfer *xfer, usb_error_t error) { - struct usb_pipe_methods *methods = xfer->pipe->methods; + struct usb_pipe_methods *methods = xfer->endpoint->methods; ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n", - xfer, xfer->pipe, error); + DPRINTFN(2, "xfer=%p, endpoint=%p, error=%d\n", + xfer, xfer->endpoint, error); if ((methods == &ehci_device_bulk_methods) || (methods == &ehci_device_ctrl_methods)) { #if USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data after transfer:\n", - xfer->pipe->toggle_next); + xfer->endpoint->toggle_next); ehci_dump_sqtds(sc, xfer->td_transfer_first); } @@ -2358,11 +2358,11 @@ sitd_portaddr = EHCI_SITD_SET_ADDR(xfer->address) | - EHCI_SITD_SET_ENDPT(UE_GET_ADDR(xfer->endpoint)) | + EHCI_SITD_SET_ENDPT(UE_GET_ADDR(xfer->endpointno)) | EHCI_SITD_SET_HUBA(xfer->xroot->udev->hs_hub_addr) | EHCI_SITD_SET_PORT(xfer->xroot->udev->hs_port_no); - if (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN) { + if (UE_GET_DIR(xfer->endpointno) == UE_DIR_IN) { sitd_portaddr |= EHCI_SITD_SET_DIR_IN; } sitd_portaddr = htohc32(sc, sitd_portaddr); @@ -2422,7 +2422,7 @@ #endif DPRINTFN(6, "xfer=%p next=%d nframes=%d\n", - xfer, xfer->pipe->isoc_next, xfer->nframes); + xfer, xfer->endpoint->isoc_next, xfer->nframes); /* get the current frame index */ @@ -2432,10 +2432,10 @@ * check if the frame index is within the window where the frames * will be inserted */ - buf_offset = (nframes - xfer->pipe->isoc_next) & + buf_offset = (nframes - xfer->endpoint->isoc_next) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); - if ((xfer->pipe->is_synced == 0) || + if ((xfer->endpoint->is_synced == 0) || (buf_offset < xfer->nframes)) { /* * If there is data underflow or the pipe queue is empty we @@ -2443,16 +2443,16 @@ * frame position. Else two isochronous transfers might * overlap. */ - xfer->pipe->isoc_next = (nframes + 3) & + xfer->endpoint->isoc_next = (nframes + 3) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); - xfer->pipe->is_synced = 1; - DPRINTFN(3, "start next=%d\n", xfer->pipe->isoc_next); + xfer->endpoint->is_synced = 1; + DPRINTFN(3, "start next=%d\n", xfer->endpoint->isoc_next); } /* * compute how many milliseconds the insertion is ahead of the * current frame position: */ - buf_offset = (xfer->pipe->isoc_next - nframes) & + buf_offset = (xfer->endpoint->isoc_next - nframes) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); /* @@ -2478,11 +2478,11 @@ td = xfer->td_start[xfer->flags_int.curr_dma_set]; xfer->td_transfer_first = td; - pp_last = &sc->sc_isoc_fs_p_last[xfer->pipe->isoc_next]; + pp_last = &sc->sc_isoc_fs_p_last[xfer->endpoint->isoc_next]; /* store starting position */ - xfer->qh_pos = xfer->pipe->isoc_next; + xfer->qh_pos = xfer->endpoint->isoc_next; fss = fss_start + (xfer->qh_pos % USB_ISOC_TIME_MAX); @@ -2543,7 +2543,7 @@ temp = 0; } - if (UE_GET_DIR(xfer->endpoint) == UE_DIR_OUT) { + if (UE_GET_DIR(xfer->endpointno) == UE_DIR_OUT) { tlen = *plen; if (tlen <= 188) { temp |= 1; /* T-count = 1, TP = ALL */ @@ -2609,7 +2609,7 @@ xfer->td_transfer_last = td_last; /* update isoc_next */ - xfer->pipe->isoc_next = (pp_last - &sc->sc_isoc_fs_p_last[0]) & + xfer->endpoint->isoc_next = (pp_last - &sc->sc_isoc_fs_p_last[0]) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); } @@ -2658,13 +2658,13 @@ /* set endpoint and address */ td->itd_bp[0] = htohc32(sc, EHCI_ITD_SET_ADDR(xfer->address) | - EHCI_ITD_SET_ENDPT(UE_GET_ADDR(xfer->endpoint))); + EHCI_ITD_SET_ENDPT(UE_GET_ADDR(xfer->endpointno))); temp = EHCI_ITD_SET_MPL(xfer->max_packet_size & 0x7FF); /* set direction */ - if (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN) { + if (UE_GET_DIR(xfer->endpointno) == UE_DIR_IN) { temp |= EHCI_ITD_SET_DIR_IN; } /* set maximum packet size */ @@ -2708,7 +2708,7 @@ #endif DPRINTFN(6, "xfer=%p next=%d nframes=%d\n", - xfer, xfer->pipe->isoc_next, xfer->nframes); + xfer, xfer->endpoint->isoc_next, xfer->nframes); /* get the current frame index */ @@ -2718,10 +2718,10 @@ * check if the frame index is within the window where the frames * will be inserted */ - buf_offset = (nframes - xfer->pipe->isoc_next) & + buf_offset = (nframes - xfer->endpoint->isoc_next) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); - if ((xfer->pipe->is_synced == 0) || + if ((xfer->endpoint->is_synced == 0) || (buf_offset < ((xfer->nframes + 7) / 8))) { /* * If there is data underflow or the pipe queue is empty we @@ -2729,16 +2729,16 @@ * frame position. Else two isochronous transfers might * overlap. */ - xfer->pipe->isoc_next = (nframes + 3) & + xfer->endpoint->isoc_next = (nframes + 3) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); - xfer->pipe->is_synced = 1; - DPRINTFN(3, "start next=%d\n", xfer->pipe->isoc_next); + xfer->endpoint->is_synced = 1; + DPRINTFN(3, "start next=%d\n", xfer->endpoint->isoc_next); } /* * compute how many milliseconds the insertion is ahead of the * current frame position: */ - buf_offset = (xfer->pipe->isoc_next - nframes) & + buf_offset = (xfer->endpoint->isoc_next - nframes) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); /* @@ -2764,11 +2764,11 @@ td = xfer->td_start[xfer->flags_int.curr_dma_set]; xfer->td_transfer_first = td; - pp_last = &sc->sc_isoc_hs_p_last[xfer->pipe->isoc_next]; + pp_last = &sc->sc_isoc_hs_p_last[xfer->endpoint->isoc_next]; /* store starting position */ - xfer->qh_pos = xfer->pipe->isoc_next; + xfer->qh_pos = xfer->endpoint->isoc_next; while (nframes--) { if (td == NULL) { @@ -2875,7 +2875,7 @@ xfer->td_transfer_last = td_last; /* update isoc_next */ - xfer->pipe->isoc_next = (pp_last - &sc->sc_isoc_hs_p_last[0]) & + xfer->endpoint->isoc_next = (pp_last - &sc->sc_isoc_hs_p_last[0]) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); } @@ -3636,12 +3636,12 @@ static void ehci_pipe_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, - struct usb_pipe *pipe) + struct usb_endpoint *ep) { ehci_softc_t *sc = EHCI_BUS2SC(udev->bus); - DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", - pipe, udev->address, + DPRINTFN(2, "endpoint=%p, addr=%d, endpt=%d, mode=%d (%d)\n", + ep, udev->address, edesc->bEndpointAddress, udev->flags.usb_mode, sc->sc_addr); @@ -3661,21 +3661,21 @@ } switch (edesc->bmAttributes & UE_XFERTYPE) { case UE_CONTROL: - pipe->methods = &ehci_device_ctrl_methods; + ep->methods = &ehci_device_ctrl_methods; break; case UE_INTERRUPT: - pipe->methods = &ehci_device_intr_methods; + ep->methods = &ehci_device_intr_methods; break; case UE_ISOCHRONOUS: if (udev->speed == USB_SPEED_HIGH) { - pipe->methods = &ehci_device_isoc_hs_methods; + ep->methods = &ehci_device_isoc_hs_methods; } else if (udev->speed == USB_SPEED_FULL) { - pipe->methods = &ehci_device_isoc_fs_methods; + ep->methods = &ehci_device_isoc_fs_methods; } break; case UE_BULK: if (udev->speed != USB_SPEED_LOW) { - pipe->methods = &ehci_device_bulk_methods; + ep->methods = &ehci_device_bulk_methods; } break; default: @@ -3712,7 +3712,7 @@ if (xfer->xroot->udev == udev) { - methods = xfer->pipe->methods; + methods = xfer->endpoint->methods; if ((methods == &ehci_device_bulk_methods) || (methods == &ehci_device_ctrl_methods)) { @@ -3746,7 +3746,7 @@ if (xfer->xroot->udev == udev) { - methods = xfer->pipe->methods; + methods = xfer->endpoint->methods; if ((methods == &ehci_device_bulk_methods) || (methods == &ehci_device_ctrl_methods)) { ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#6 (text+ko) ==== @@ -1114,7 +1114,7 @@ uint8_t ep_no; DPRINTFN(8, "addr=%d endpt=%d sumlen=%d speed=%d\n", - xfer->address, UE_GET_ADDR(xfer->endpoint), + xfer->address, UE_GET_ADDR(xfer->endpointno), xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -1132,7 +1132,7 @@ temp.did_stall = !xfer->flags_int.control_stall; sc = MUSBOTG_BUS2SC(xfer->xroot->bus); - ep_no = (xfer->endpoint & UE_ADDR); + ep_no = (xfer->endpointno & UE_ADDR); /* check if we should prepend a setup message */ @@ -1152,7 +1152,7 @@ } if (x != xfer->nframes) { - if (xfer->endpoint & UE_DIR_IN) { + if (xfer->endpointno & UE_DIR_IN) { if (xfer->flags_int.control_xfr) temp.func = &musbotg_setup_data_tx; else @@ -1249,7 +1249,7 @@ { struct musbotg_softc *sc = MUSBOTG_BUS2SC(xfer->xroot->bus); uint16_t temp; - uint8_t ep_no = xfer->endpoint & UE_ADDR; + uint8_t ep_no = xfer->endpointno & UE_ADDR; /* * Only enable the endpoint interrupt when we are @@ -1390,8 +1390,8 @@ { usb_error_t err = 0; - DPRINTFN(12, "xfer=%p pipe=%p transfer done\n", - xfer, xfer->pipe); + DPRINTFN(12, "xfer=%p endpoint=%p transfer done\n", + xfer, xfer->endpoint); /* reset scanner */ @@ -1439,8 +1439,8 @@ { USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); - DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n", - xfer, xfer->pipe, error); + DPRINTFN(2, "xfer=%p, endpoint=%p, error=%d\n", + xfer, xfer->endpoint, error); if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { @@ -1454,14 +1454,14 @@ static void musbotg_set_stall(struct usb_device *udev, struct usb_xfer *xfer, - struct usb_pipe *pipe) + struct usb_endpoint *ep) { struct musbotg_softc *sc; uint8_t ep_no; USB_BUS_LOCK_ASSERT(udev->bus, MA_OWNED); - DPRINTFN(4, "pipe=%p\n", pipe); + DPRINTFN(4, "endpoint=%p\n", ep); if (xfer) { /* cancel any ongoing transfers */ @@ -1470,12 +1470,12 @@ /* set FORCESTALL */ sc = MUSBOTG_BUS2SC(udev->bus); - ep_no = (pipe->edesc->bEndpointAddress & UE_ADDR); + ep_no = (ep->edesc->bEndpointAddress & UE_ADDR); /* select endpoint */ MUSB2_WRITE_1(sc, MUSB2_REG_EPINDEX, ep_no); - if (pipe->edesc->bEndpointAddress & UE_DIR_IN) { + if (ep->edesc->bEndpointAddress & UE_DIR_IN) { MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRL, MUSB2_MASK_CSRL_TXSENDSTALL); } else { @@ -1636,12 +1636,12 @@ } static void -musbotg_clear_stall(struct usb_device *udev, struct usb_pipe *pipe) +musbotg_clear_stall(struct usb_device *udev, struct usb_endpoint *ep) { struct musbotg_softc *sc; struct usb_endpoint_descriptor *ed; - DPRINTFN(4, "pipe=%p\n", pipe); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 31 18:51:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F131E1065675; Sun, 31 May 2009 18:51: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 B1677106566C for ; Sun, 31 May 2009 18:51:13 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A8CE8FC0C for ; Sun, 31 May 2009 18:51:13 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VIpDro021433 for ; Sun, 31 May 2009 18:51:13 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VIpDUs021431 for perforce@freebsd.org; Sun, 31 May 2009 18:51:13 GMT (envelope-from trasz@freebsd.org) Date: Sun, 31 May 2009 18:51:13 GMT Message-Id: <200905311851.n4VIpDUs021431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 18:51:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=163191 Change 163191 by trasz@trasz_victim on 2009/05/31 18:50:40 Revise the milestones. Affected files ... .. //depot/projects/soc2009/trasz_limits/MILESTONES#2 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/MILESTONES#2 (text+ko) ==== @@ -1,15 +1,17 @@ 0. Figure a good name. "Resources" is not a good name, as it's already being used for newbus. -1. Add nmount(2)-like API to get and set limits. +1. Add some API to communicate between kernel and the userland. + + <--- WE ARE HERE ---> -2. Add macros/routines to allocate and free resources. +2. Userland tools - either modify limits(1) or implement something new. -3. Userland tools - either modify limits(1) or implement something new. +3. Add macros/routines to allocate and free resources. 4. Add calls to resource allocation and free routines all over the place. -5. Make resources hierarchical. +5. Revise the API to be extensible, e.g. nmount(2)-like. 6. Make things fast. From owner-p4-projects@FreeBSD.ORG Sun May 31 18:54:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E2271065672; Sun, 31 May 2009 18:54: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 E1F7A106564A for ; Sun, 31 May 2009 18:54:16 +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 CFE2A8FC12 for ; Sun, 31 May 2009 18:54:16 +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 n4VIsGIr021621 for ; Sun, 31 May 2009 18:54:16 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VIsG92021619 for perforce@freebsd.org; Sun, 31 May 2009 18:54:16 GMT (envelope-from thompsa@freebsd.org) Date: Sun, 31 May 2009 18:54:16 GMT Message-Id: <200905311854.n4VIsG92021619@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 163192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 18:54:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=163192 Change 163192 by thompsa@thompsa_burger on 2009/05/31 18:54:06 Fix mismerge from the lat submit. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#7 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#7 (text+ko) ==== @@ -94,51 +94,51 @@ { struct usb_device_request req; struct usb_device *udev; - struct usb_pipe *pipe; - struct usb_pipe *pipe_end; - struct usb_pipe *pipe_first; + struct usb_endpoint *ep; + struct usb_endpoint *ep_end; + struct usb_endpoint *ep_first; uint8_t to; udev = xfer->xroot->udev; USB_BUS_LOCK(udev->bus); - /* round robin pipe clear stall */ + /* round robin endpoint clear stall */ - pipe = udev->pipe_curr; - pipe_end = udev->pipes + udev->pipes_max; - pipe_first = udev->pipes; - to = udev->pipes_max; + ep = udev->ep_curr; + ep_end = udev->endpoints + udev->endpoints_max; + ep_first = udev->endpoints; + to = udev->endpoints_max; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (pipe == NULL) + if (ep == NULL) goto tr_setup; /* device was unconfigured */ - if (pipe->edesc && - pipe->is_stalled) { - pipe->toggle_next = 0; - pipe->is_stalled = 0; + if (ep->edesc && + ep->is_stalled) { + ep->toggle_next = 0; + ep->is_stalled = 0; /* start up the current or next transfer, if any */ - usb2_command_wrapper(&pipe->pipe_q, - pipe->pipe_q.curr); + usb2_command_wrapper(&ep->endpoint_q, + ep->endpoint_q.curr); } - pipe++; + ep++; case USB_ST_SETUP: tr_setup: if (to == 0) - break; /* no pipes - nothing to do */ - if ((pipe < pipe_first) || (pipe >= pipe_end)) - pipe = pipe_first; /* pipe wrapped around */ - if (pipe->edesc && - pipe->is_stalled) { + break; /* no endpoints - nothing to do */ + if ((ep < ep_first) || (ep >= ep_end)) + ep = ep_first; /* endpoint wrapped around */ + if (ep->edesc && + ep->is_stalled) { /* setup a clear-stall packet */ req.bmRequestType = UT_WRITE_ENDPOINT; req.bRequest = UR_CLEAR_FEATURE; USETW(req.wValue, UF_ENDPOINT_HALT); - req.wIndex[0] = pipe->edesc->bEndpointAddress; + req.wIndex[0] = ep->edesc->bEndpointAddress; req.wIndex[1] = 0; USETW(req.wLength, 0); @@ -156,7 +156,7 @@ USB_BUS_LOCK(udev->bus); break; } - pipe++; + ep++; to--; goto tr_setup; From owner-p4-projects@FreeBSD.ORG Sun May 31 19:28:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EA1B106566B; Sun, 31 May 2009 19:28: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 D20841065675 for ; Sun, 31 May 2009 19:28:57 +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 BF8E18FC08 for ; Sun, 31 May 2009 19:28:57 +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 n4VJSvnh025142 for ; Sun, 31 May 2009 19:28:57 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VJSvoL025140 for perforce@freebsd.org; Sun, 31 May 2009 19:28:57 GMT (envelope-from zec@fer.hr) Date: Sun, 31 May 2009 19:28:57 GMT Message-Id: <200905311928.n4VJSvoL025140@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 163194 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 19:28:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=163194 Change 163194 by zec@zec_tpx32 on 2009/05/31 19:28:20 Fix misintegrations and hopefully unbreak kernel build. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#92 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#92 (text+ko) ==== @@ -38,14 +38,12 @@ #include #include #include -#include #include #include #include #include #include #include - #ifdef DDB #include #endif @@ -54,34 +52,19 @@ #include #include -#include -#include -#include +#ifndef VIMAGE_GLOBALS -struct vnet_modlink; - MALLOC_DEFINE(M_VIMAGE, "vimage", "vimage resource container"); MALLOC_DEFINE(M_VNET, "vnet", "network stack control block"); MALLOC_DEFINE(M_VPROCG, "vprocg", "process group control block"); -#ifdef VIMAGE -static struct vimage *vi_alloc(struct vimage *, char *); -static int vi_destroy(struct vimage *); -#endif - -#ifndef VIMAGE -#ifndef VIMAGE_GLOBALS -struct vprocg vprocg_0; -#endif -#endif - -#ifndef VIMAGE_GLOBALS static TAILQ_HEAD(vnet_modlink_head, vnet_modlink) vnet_modlink_head; static TAILQ_HEAD(vnet_modpending_head, vnet_modlink) vnet_modpending_head; static void vnet_mod_complete_registration(struct vnet_modlink *); static int vnet_mod_constructor(struct vnet_modlink *); static int vnet_mod_destructor(struct vnet_modlink *); +#ifdef VIMAGE static struct vimage *vimage_by_name(struct vimage *, char *); static struct vimage *vi_alloc(struct vimage *, char *); static struct vimage *vimage_get_next(struct vimage *, struct vimage *, int); @@ -625,400 +608,16 @@ } return (ENOENT); } -#endif /* !VIMAGE_GLOBALS */ #ifdef VIMAGE -struct vimage_list_head vimage_head; -struct vnet_list_head vnet_head; -struct vprocg_list_head vprocg_head; - -struct cv vnet_list_condvar; -struct mtx vnet_list_refc_mtx; -int vnet_list_refc = 0; - -#define VNET_LIST_LOCK() \ - mtx_lock(&vnet_list_refc_mtx); \ - while (vnet_list_refc != 0) \ - cv_wait(&vnet_list_condvar, &vnet_list_refc_mtx); - -#define VNET_LIST_UNLOCK() \ - mtx_unlock(&vnet_list_refc_mtx); - -static u_int last_vi_id = 0; -static u_int last_vnet_id = 0; -static u_int last_vprocg_id = 0; - -struct vimage * -vnet2vimage(struct vnet *vnet) -{ - struct vimage *vip; - - LIST_FOREACH(vip, &vimage_head, vi_le) - if (vip->v_net == vnet) - return(vip); - - panic("vnet2vimage"); /* must never happen */ -} - -char * -vnet_name(struct vnet *vnet) -{ - return(vnet2vimage(vnet)->vi_name); -} - - -int -vi_child_of(struct vimage *parent, struct vimage *child) -{ - if (child == parent) - return (0); - for (; child; child = child->vi_parent) - if (child == parent) - return (1); - return (0); -} - -/* - * if_reassign_common() should be called by all device specific - * ifnet reassignment routines after the interface is detached from - * current vnet and before the interface gets attached to the target - * vnet. This routine attempts to shrink if_index in current vnet, - * find an unused if_index in target vnet and calls if_grow() if - * necessary, and finally finds an unused if_xname for the target - * vnet. - * - * XXX this routine should hold a lock over if_index and return with - * such a lock held, and the caller should release that lock - * after ifattach completes! - */ -void -if_reassign_common(struct ifnet *ifp, struct vnet *new_vnet, const char *dname) -{ - /* do/while construct needed to confine scope of INIT_VNET_NET() */ - do { - INIT_VNET_NET(curvnet); - - IFNET_WLOCK(); - ifnet_setbyindex(ifp->if_index, NULL); - while (V_if_index > 0 && - ifnet_byindex_locked(V_if_index) == NULL) - V_if_index--; - IFNET_WUNLOCK(); - } while (0); - - CURVNET_SET_QUIET(new_vnet); - INIT_VNET_NET(new_vnet); - /* - * Try to find an empty slot below if_index. If we fail, take - * the next slot. - */ - IFNET_WLOCK(); - for (ifp->if_index = 1; ifp->if_index <= V_if_index; ifp->if_index++) { - if (ifnet_byindex_locked(ifp->if_index) == NULL) - break; - } - /* Catch if_index overflow. */ - if (ifp->if_index < 1) - panic("vi_if_move: if_index overflow"); - - if (ifp->if_index > V_if_index) - V_if_index = ifp->if_index; - if (V_if_index >= V_if_indexlim) - if_grow(); - ifnet_setbyindex(ifp->if_index, ifp); - IFNET_WUNLOCK(); - - /* Rename the ifnet */ - if (new_vnet == ifp->if_home_vnet) { - /* always restore the original name on return to home vnet */ - if_initname(ifp, ifp->if_dname, ifp->if_dunit); - } else { - int unit = 0; - struct ifnet *iter; - - do { - snprintf(ifp->if_xname, IFNAMSIZ, "%s%d", dname, unit); - TAILQ_FOREACH(iter, &V_ifnet, if_link) - if (strcmp(ifp->if_xname, iter->if_xname) == 0) - break; - unit++; - } while (iter); - } - CURVNET_RESTORE(); -} - -/* - * Move the interface to another vnet. The interface can be specified either - * by ifp argument, or by name contained in vi_req->vi_chroot if NULL is - * passed as ifp. The interface will be renamed to vi_req->vi_parent_name - * if vi_req->vi_parent_name is not an empty string (uff ugly ugly)... - * Similary, the target vnet can be specified either by vnet argument or - * by name. If vnet name equals to ".." or vi_req is set to NULL the - * interface is moved to the parent vnet. - */ -int -vi_if_move(struct vi_req *vi_req, struct ifnet *ifp, struct vimage *vip) -{ - struct vimage *new_vip; - struct vnet *new_vnet = NULL; - - if (vi_req == NULL || strcmp(vi_req->vi_name, "..") == 0) { - if (IS_DEFAULT_VIMAGE(vip)) - return (ENXIO); - new_vnet = vip->vi_parent->v_net; - } else { - new_vip = vimage_by_name(vip, vi_req->vi_name); - if (new_vip == NULL) - return (ENXIO); - new_vnet = new_vip->v_net; - } - - if (ifp == NULL) - ifp = ifunit(vi_req->vi_chroot); - if (ifp == NULL) - return (ENXIO); - - /* Abort if driver did not provide a if_reassign() method */ - if (ifp->if_reassign == NULL) - return (ENODEV); - - if (vi_req != NULL) { - struct ifnet *t_ifp; - - CURVNET_SET_QUIET(new_vnet); - t_ifp = ifunit(vi_req->vi_if_xname); - CURVNET_RESTORE(); - if (t_ifp != NULL) - return (EEXIST); - } - - if (vi_req && strlen(vi_req->vi_if_xname) > 0) - ifp->if_reassign(ifp, new_vnet, vi_req->vi_if_xname); - else - ifp->if_reassign(ifp, new_vnet, NULL); - getmicrotime(&ifp->if_lastchange); - - /* Report the new if_xname back to the userland */ - if (vi_req != NULL) - sprintf(vi_req->vi_chroot, "%s", ifp->if_xname); - - return (0); -} - - -struct vimage * -vimage_by_name(struct vimage *top, char *name) -{ - struct vimage *vip; - char *next_name; - int namelen; - - next_name = strchr(name, '.'); - if (next_name != NULL) { - namelen = next_name - name; - next_name++; - if (namelen == 0) { - if (strlen(next_name) == 0) - return(top); /* '.' == this vimage */ - else - return(NULL); - } - } else - namelen = strlen(name); - if (namelen == 0) - return(NULL); - LIST_FOREACH(vip, &top->vi_child_head, vi_sibling) - if (strlen(vip->vi_name) == namelen && - strncmp(name, vip->vi_name, namelen) == 0) { - if (next_name != NULL) - return(vimage_by_name(vip, next_name)); - else - return(vip); - } - return(NULL); -} - - -vimage_relative_name(struct vimage *top, struct vimage *where, - char *buffer, int bufflen) -{ - int used = 1; - - if (where == top) { - sprintf(buffer, "."); - return; - } else - *buffer = 0; - - do { - int namelen = strlen(where->vi_name); - - if (namelen + used + 1 >= bufflen) - panic("buffer overflow"); - - if (used > 1) { - bcopy(buffer, &buffer[namelen + 1], used); - buffer[namelen] = '.'; - used++; - } else - bcopy(buffer, &buffer[namelen], used); - bcopy(where->vi_name, buffer, namelen); - used += namelen; - where = where->vi_parent; - } while (where != top); -} - - static struct vimage * -vimage_get_next(struct vimage *top, struct vimage *where, int recurse) -{ - struct vimage *next; - - if (recurse) { - /* Try to go deeper in the hierarchy */ - next = LIST_FIRST(&where->vi_child_head); - if (next != NULL) - return(next); - } - - do { - /* Try to find next sibling */ - next = LIST_NEXT(where, vi_sibling); - if (!recurse || next != NULL) - return(next); - - /* Nothing left on this level, go one level up */ - where = where->vi_parent; - } while (where != top->vi_parent); - - /* Nothing left to be visited, we are done */ - return(NULL); -} - - -int -vi_td_ioctl(u_long cmd, struct vi_req *vi_req, struct thread *td) -{ - int error; - struct vimage *vip = TD_TO_VIMAGE(td); - struct vimage *vip_r = NULL; - - error = priv_check(td, PRIV_REBOOT); /* XXX fixme MARKO */ - if (error) - return (error); - - vip_r = vimage_by_name(vip, vi_req->vi_name); - if (vip_r == NULL && !(vi_req->req_action & VI_CREATE)) - return (ESRCH); - if (vip_r != NULL && vi_req->req_action & VI_CREATE) - return (EADDRINUSE); - if (vi_req->req_action == VI_GETNEXT) { - vip_r = vimage_get_next(vip, vip_r, 0); - if (vip_r == NULL) - return (ESRCH); - } - if (vi_req->req_action == VI_GETNEXT_RECURSE) { - vip_r = vimage_get_next(vip, vip_r, 1); - if (vip_r == NULL) - return (ESRCH); - } - - if (vip_r && !vi_child_of(vip, vip_r) && /* XXX delete the rest? */ - vi_req->req_action != VI_GET && vi_req->req_action != VI_GETNEXT) - return (EPERM); - - switch (cmd) { - - case SIOCGPVIMAGE: - vimage_relative_name(vip, vip_r, vi_req->vi_name, - sizeof (vi_req->vi_name)); - vi_req->vi_proc_count = vip_r->v_procg->nprocs; - vi_req->vi_if_count = vip_r->v_net->ifccnt; - vi_req->vi_sock_count = vip_r->v_net->sockcnt; - break; - - case SIOCSPVIMAGE: - if (vi_req->req_action == VI_DESTROY) { - error = vi_destroy(vip_r); - break; - } - - if (vi_req->req_action == VI_SWITCHTO) { - struct proc *p = td->td_proc; - struct ucred *oldcred, *newcred; - - /* - * XXX priv_check()? - * XXX allow only a single td per proc here? - */ - newcred = crget(); - PROC_LOCK(p); - oldcred = p->p_ucred; - setsugid(p); - crcopy(newcred, oldcred); - refcount_release(&newcred->cr_vimage->vi_ucredrefc); - newcred->cr_vimage = vip_r; - refcount_acquire(&newcred->cr_vimage->vi_ucredrefc); - p->p_ucred = newcred; - PROC_UNLOCK(p); - sx_xlock(&allproc_lock); - oldcred->cr_vimage->v_procg->nprocs--; - refcount_release(&oldcred->cr_vimage->vi_ucredrefc); - P_TO_VPROCG(p)->nprocs++; -#if 0 - sched_load_reassign(oldcred->cr_vimage->v_procg, - newcred->cr_vimage->v_procg); -#endif - sx_xunlock(&allproc_lock); - crfree(oldcred); - break; - } - - if (vi_req->req_action & VI_CREATE) { - char *dotpos; - - dotpos = strrchr(vi_req->vi_name, '.'); - if (dotpos != NULL) { - *dotpos = 0; - vip = vimage_by_name(vip, vi_req->vi_name); - if (vip == NULL) - return (ESRCH); - dotpos++; - vip_r = vi_alloc(vip, dotpos); - } else - vip_r = vi_alloc(vip, vi_req->vi_name); - if (vip_r == NULL) - return (ENOMEM); - } - - /* XXX What the hell is this doing here? */ - if (vip == vip_r && !IS_DEFAULT_VIMAGE(vip)) - return (EPERM); - } - - return (error); -} - - -struct vimage * vi_alloc(struct vimage *parent, char *name) { struct vimage *vip; struct vprocg *vprocg; struct vnet *vnet; - struct vprocg *vprocg; struct vnet_modlink *vml; - /* - * XXX don't forget the locking - */ - - /* A brute force check whether there's enough mem for a new vimage */ - vip = malloc(512*1024, M_VIMAGE, M_NOWAIT); /* XXX aaaargh... */ - if (vip == NULL) - goto vi_alloc_done; - free(vip, M_VIMAGE); - vip = malloc(sizeof(struct vimage), M_VIMAGE, M_NOWAIT | M_ZERO); if (vip == NULL) panic("vi_alloc: malloc failed for vimage \"%s\"\n", name); @@ -1061,11 +660,9 @@ /* XXX locking */ LIST_INSERT_HEAD(&vprocg_head, vprocg, vprocg_le); -vi_alloc_done: return (vip); } - /* * Destroy a vnet - unlink all linked lists, free all the memory, stop all * the timers... How can one ever be sure to have done *all* the necessary @@ -1124,10 +721,6 @@ vnet_modlink_head, vml_mod_le) vnet_mod_destructor(vml); -#if 0 - free((caddr_t)vnet->ifnet_addrs, M_IFADDR); - free((caddr_t)vnet->ifindex2ifnet, M_IFADDR); - CURVNET_RESTORE(); /* hopefully, we are finally OK to free the vnet container itself! */ @@ -1140,7 +733,6 @@ } #endif /* VIMAGE */ -#ifndef VIMAGE_GLOBALS static void vi_init(void *unused) { From owner-p4-projects@FreeBSD.ORG Sun May 31 19:37:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA91E10656AD; Sun, 31 May 2009 19:37:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D872106567B for ; Sun, 31 May 2009 19:37:08 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 364F88FC28 for ; Sun, 31 May 2009 19:37:06 +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 n4VJb6E7025850 for ; Sun, 31 May 2009 19:37:06 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VJb6oD025848 for perforce@freebsd.org; Sun, 31 May 2009 19:37:06 GMT (envelope-from zec@fer.hr) Date: Sun, 31 May 2009 19:37:06 GMT Message-Id: <200905311937.n4VJb6oD025848@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 163195 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 19:37:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=163195 Change 163195 by zec@zec_tpx32 on 2009/05/31 19:36:12 Unbreak GENERIC build. Affected files ... .. //depot/projects/vimage/src/sys/net/if_loop.c#47 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_loop.c#47 (text+ko) ==== @@ -118,7 +118,6 @@ #ifdef VIMAGE_GLOBALS struct ifnet *loif; /* Used externally */ -static LIST_HEAD(lo_list, lo_softc) lo_list; #endif #ifdef VIMAGE @@ -193,7 +192,6 @@ if_attach(ifp); bpfattach(ifp, DLT_NULL, sizeof(u_int32_t)); mtx_lock(&lo_mtx); - LIST_INSERT_HEAD(&V_lo_list, sc, sc_next); mtx_unlock(&lo_mtx); return (0); From owner-p4-projects@FreeBSD.ORG Sun May 31 19:42:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BBEFA1065676; Sun, 31 May 2009 19:42: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 79A69106564A for ; Sun, 31 May 2009 19:42: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 4B4DD8FC12 for ; Sun, 31 May 2009 19:42: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 n4VJgIps026261 for ; Sun, 31 May 2009 19:42:18 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VJgIDv026259 for perforce@freebsd.org; Sun, 31 May 2009 19:42:18 GMT (envelope-from zec@fer.hr) Date: Sun, 31 May 2009 19:42:18 GMT Message-Id: <200905311942.n4VJgIDv026259@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 163197 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 19:42:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=163197 Change 163197 by zec@zec_tpx32 on 2009/05/31 19:41:25 Fix more breakagage... Affected files ... .. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#29 edit Differences ... ==== //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#29 (text+ko) ==== @@ -57,6 +57,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Sun May 31 19:47:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E5F021065677; Sun, 31 May 2009 19:47: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 A1FC41065675 for ; Sun, 31 May 2009 19:47:23 +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 8EE878FC0A for ; Sun, 31 May 2009 19:47:23 +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 n4VJlNhM026636 for ; Sun, 31 May 2009 19:47:23 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VJlNbc026634 for perforce@freebsd.org; Sun, 31 May 2009 19:47:23 GMT (envelope-from zec@fer.hr) Date: Sun, 31 May 2009 19:47:23 GMT Message-Id: <200905311947.n4VJlNbc026634@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 163198 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 19:47:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=163198 Change 163198 by zec@zec_tpx32 on 2009/05/31 19:46:39 Backport vimage(8) simplifications from vc2. Affected files ... .. //depot/projects/vimage/src/usr.sbin/vimage/Makefile#3 edit .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.8#3 edit .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#10 edit Differences ... ==== //depot/projects/vimage/src/usr.sbin/vimage/Makefile#3 (text+ko) ==== ==== //depot/projects/vimage/src/usr.sbin/vimage/vimage.8#3 (text+ko) ==== @@ -38,7 +38,7 @@ .Ar vi_name .Op command .Nm -.Brq Fl c | m +.Brq Fl c .Ar vi_name .Op options .Nm @@ -50,39 +50,36 @@ .Nm .Fl i .Ar vi_name interface -.Op target_interface .Sh DESCRIPTION .Nm command is the user interface for controlling the virtual image facility in FreeBSD. .Ss Overview Each virtual image presents an isolated operating environment with its own -private view of vital system resources, most notably user processes, -CPU time share and an independent network stack instance. -Accordingly, every process and every network interface present -in the system is always assigned +independent network stack instance. Accordingly, every process, socket +and every network interface present in the system is always assigned to a single and unique virtual image. During the system bootup sequence -the +a .So default .Sc virtual image is created to which all the configured interfaces and user processes are initially assigned. -Assuming that enough system resources -and per virtual image privileges are provided, the super-user can create and -manage a hierarchy of subordinated virtual images. The +Assuming that enough system resources and per virtual image privileges +are provided, the super-user can create and manage a hierarchy of +subordinated virtual images. The .Nm -command allows -creation, deletion, modification and monitoring of virtual images, as well as -execution of arbitrary processes in the target virtual image. +command allows for creation, deletion and monitoring of virtual images, +as well as for execution of arbitrary processes in a targeted virtual +image. .Ss Invocation With no arguments provided, the .Nm command returns the name of the current virtual image -on the standard output and exits. +on the standard output and exits. /* XXX this is pointles - current +name is always "." */ .Pp If invoked with no modifiers, the .Nm -command spawns a new process in virtual -image +command spawns a new process in virtual image .Ar vi_name . If provided, the optional arguments following the virtual image name .Ar vi_name @@ -99,25 +96,21 @@ If additional arguments are present following the .Ar vi_name parameter, they are interpreted as custom options (see below). -.It Fl m -Modify the custom options of the existing virtual image -.Ar vi_name , -in accordance with the additional arguments following the -.Ar vi_name -parameter (see below). .It Fl d Delete the virtual image .Ar vi_name . -No processes should exist in the target virtual image, in order for -deletion to succeed. Non-loopback interfaces residing in the target -virtual image will be reassigned to the virtual image's parent. +No processes and/or sockets should exist in the target virtual image +in order for the delete request to succeed. Non-loopback interfaces +residing in the target virtual image will be reassigned to the virtual +image's parent. .It Fl l -List the properties, custom parameters and statistics for virtual +List the properties and statistics for virtual images below the current one in the hierarchy. If an optional argument .Ar vi_name is provided, only the information regarding the target virtual image .Ar vi_name is displayed. +/* XXX mention -r modifier */ .It Fl i Move the interface .Ar interface @@ -133,68 +126,14 @@ .Pp The following options to .Fl c -and -.Fl m -modifiers are available: -.Bl -tag -width indent -.It Cm cpumin -Set the minimum guaranteed average CPU share for the target virtual image. -The parameter is specified as percentage in range between 0 and 90. -The guaranteed CPU share for the -.So default -.Sc virtual image cannot be set below 10%. -Note that the system does not enforce strict global budgeting on guaranteed -CPU time shares. Therefore it is in the sole responsibility of the system -administrator whether he/she will allow for guaranteed CPU shares to be -oversubscribed or not. By default no virtual image is granted a guaranteed -CPU share, except the -.So default -.Sc virtual image, which normally runs with -.Cm cpumin -level of 10%. -.It Cm cpumax -Set the upper limit to average total CPU usage for the target virtual image. -The limit is specified as a percentage (1-100%). However, the limit cannot -be raised above the current upper CPU limit of the parent virtual image. -By default there is no CPU usage limit (100%). -.It Cm cpuweight -If the current average CPU usage of a virtual image is above the -.Cm cpumin -level, but below the -.Cm cpumax, -the virtual image becomes subject to a proportional share CPU scheduler. -The -.Cm cpuweight -parameter determines how will the virtual image compete for the available -CPU time. The higher the -.Cm cpuweight, -the less often will the virtual image be allocated a CPU time slice. -Valid parameter values range from 1 (default) to 10. -.It Cm proc -Set the maximum number of processes that are allowed to exist simultaneously -in the target virtual image. The default is 0, which means no process limit. -.It Cm chroot -Set the chroot directory for the virtual image. All new processes spawned -into the target virtual image using the -.Nm -command will be initially chrooted to that directory. This parameter can -be changed only when no processes are running within the target virtual -image. Note that it is not required to have a chrooted environment for -a virtual image operate, which is also the default behavior. -.It Cm child -Limit the number of children the target virtual image is allowed to create. -The limit cannot be raised above the lowest child limit of all the ancestors -of the target virtual image. By default all created virtual images are -prohibited from creating new virtual images, except the -.So default -.Sc virtual image. +modifier are available: .El .Sh EXAMPLES Create a new virtual image named .So v1 -.Sc with average CPU usage limited to 20%: +.Sc : .Pp -.Dl vimage -c v1 cpumax 20% +.Dl vimage -c v1 .Pp Execute the .So ifconfig @@ -236,9 +175,6 @@ naming has to be extended to reflect virtual image association of netgraph nodes and interfaces. .Pp -No testing has been performed on SMP systems. There is absolutely no guarantee -that the kernel will even compile with SMP options enabled. -.Pp At the time of writing this document the code is still in highly experimental phase, so one should expect to encounter numerous undocumented problems. The author will welcome and appreciate all (decently documented) bugreports. @@ -249,4 +185,4 @@ .Sh HISTORY The .Nm -facility first appeared as a FreeBSD 4.7-RELEASE patch. +facility first appeared as a FreeBSD 4.7-RELEASE patch in 2002. ==== //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#10 (text+ko) ==== @@ -1,6 +1,7 @@ /* - * Copyright (c) 2002, 2003, 2004 Marko Zec - * All rights reserved. + * Copyright (c) 2002-2004 Marko Zec + * Copyright (c) 2009 University of Zagreb + * Copyright (c) 2009 FreeBSD Foundation * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -62,41 +63,10 @@ void vi_print(struct vi_req *vi_req) { - double lf = 1.0/vi_req->averunnable.fscale; printf("\"%s\":\n", vi_req->vi_name); - printf(" Processes (cur/max): %d/%d;", - vi_req->vi_proc_count, vi_req->vi_proc_limit); - printf(" load averages: %3.2f, %3.2f, %3.2f\n", - lf * vi_req->averunnable.ldavg[0], - lf * vi_req->averunnable.ldavg[1], - lf * vi_req->averunnable.ldavg[2]); - - printf(" CPU usage: %3.2f%%\n", vi_req->cp_time_avg / 655.04); - - printf(" Sockets (cur/max): %d/%d;", vi_req->vi_sock_count, - vi_req->vi_maxsockets); - printf(" %d network interfaces\n", vi_req->vi_if_count); - -#if 0 - printf(" CPU limits: min %3.2f%%, ", 0.0001 * vi_req->vi_cpu_min); - if (vi_req->vi_cpu_max == 0) - vi_req->vi_cpu_max = 1000000; - printf("max %3.2f%%, ", 0.0001 * vi_req->vi_cpu_max); - printf("weight %d, ", vi_req->vi_cpu_weight); - if (vi_req->vi_intr_limit) - printf("intr limit: %3.2f%%\n", - 0.0001 * vi_req->vi_intr_limit); - else - printf("no intr limit\n"); - - if (vi_req->vi_child_limit) - printf(" child limit: %d\n", vi_req->vi_child_limit); - if (vi_req->vi_child_count) - printf(" %d child vimages\n", vi_req->vi_child_count); - if (vi_req->vi_chroot[0]) - printf(" Chroot dir: %s\n", vi_req->vi_chroot); -#endif + printf(" %d sockets, %d ifnets\n", vi_req->vi_sock_count, + vi_req->vi_if_count); } @@ -111,7 +81,7 @@ int argc; char *argv[]; { - int s, i; + int s; char *shell; int cmd = VI_SWITCHTO; struct vi_req vi_req; @@ -150,13 +120,12 @@ strcpy(vi_req.vi_name, argv[2]); if (strcmp(argv[1], "-c") == 0) cmd = VI_CREATE; - if (strcmp(argv[1], "-m") == 0) - cmd = VI_MODIFY; if (strcmp(argv[1], "-i") == 0) cmd = VI_IFACE; } - vi_req.req_action = cmd; + vi_req.vi_api_cookie = VI_API_COOKIE; + vi_req.vi_req_action = cmd; switch (cmd) { case VI_GET: @@ -170,89 +139,26 @@ case VI_GETNEXT: case VI_GETNEXT_RECURSE: - vi_req.req_action = VI_GET; + vi_req.vi_req_action = VI_GET; if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; vi_print(&vi_req); - vi_req.req_action = VI_GETNEXT_RECURSE; + vi_req.vi_req_action = VI_GETNEXT_RECURSE; while (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) == 0) { vi_print(&vi_req); - vi_req.req_action = cmd; + vi_req.vi_req_action = cmd; } exit(0); case VI_IFACE: - /* here vi_chroot stores the current ifc name */ - strncpy(vi_req.vi_chroot, argv[3], sizeof(vi_req.vi_chroot)); - if (argc >= 5) - strncpy(vi_req.vi_if_xname, argv[4], + strncpy(vi_req.vi_if_xname, argv[3], sizeof(vi_req.vi_if_xname)); - else - vi_req.vi_if_xname[0] = 0; if (ioctl(s, SIOCSIFVIMAGE, (caddr_t)&vi_req) < 0) goto abort; - printf("%s@%s\n", vi_req.vi_chroot, vi_req.vi_name); + printf("%s@%s\n", vi_req.vi_if_xname, vi_req.vi_name); exit(0); case VI_CREATE: - case VI_MODIFY: - for (i = 3; i < argc-1; i += 2) { - if (strcmp(argv[i], "maxsockets") == 0) { - vi_req.req_action |= VI_SET_SOCK_LIMIT; - vi_req.vi_maxsockets = strtod(argv[i+1], NULL); - } - if (strcmp(argv[i], "cpumin") == 0) { - vi_req.req_action |= VI_SET_CPU_MIN; - vi_req.vi_cpu_min = - strtod(argv[i+1], NULL) * 10000; - if (vi_req.vi_cpu_min > 900000) { - fprintf(stderr, "error: cpumin must be between 0 and 90\n"); - exit(1); - } - } - if (strcmp(argv[i], "cpumax") == 0) { - vi_req.req_action |= VI_SET_CPU_MAX; - vi_req.vi_cpu_max = - strtod(argv[i+1], NULL) * 10000; - if (vi_req.vi_cpu_max < 10000 || - vi_req.vi_cpu_max > 1000000) { - fprintf(stderr, "error: cpumax must be between 1 and 100\n"); - exit(1); - } - } - if (strcmp(argv[i], "cpuweight") == 0) { - vi_req.req_action |= VI_SET_CPU_WEIGHT; - vi_req.vi_cpu_weight = strtod(argv[i+1], NULL); - if (vi_req.vi_cpu_weight < 1 || - vi_req.vi_cpu_weight > 10) { - fprintf(stderr, "error: cpuweight must be between 1 and 10\n"); - exit(1); - } - } - if (strcmp(argv[i], "intr") == 0) { - vi_req.req_action |= VI_SET_INTR_LIMIT; - vi_req.vi_intr_limit = - strtod(argv[i+1], NULL) * 10000; - if (vi_req.vi_intr_limit < 10000 || - vi_req.vi_intr_limit > 1000000) { - fprintf(stderr, "error: intr limit must be between 1 and 100\n"); - exit(1); - } - } - if (strcmp(argv[i], "child") == 0) { - vi_req.req_action |= VI_SET_CHILD_LIMIT; - vi_req.vi_child_limit = atoi(argv[i+1]); - } - if (strcmp(argv[i], "proc") == 0) { - vi_req.req_action |= VI_SET_PROC_LIMIT; - vi_req.vi_proc_limit = atoi(argv[i+1]); - } - if (strcmp(argv[i], "chroot") == 0) { - vi_req.req_action |= VI_SET_CHROOT; - strncpy(vi_req.vi_chroot, argv[i+1], - sizeof(vi_req.vi_chroot)); - } - } if (ioctl(s, SIOCSPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; exit(0); @@ -262,16 +168,12 @@ if (ioctl(s, SIOCSPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; - vi_req.req_action = VI_GET; + vi_req.vi_req_action = VI_GET; strcpy(vi_req.vi_name, "."); if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) { printf("XXX this should have not happened!\n"); goto abort; } - - if (strlen(vi_req.vi_chroot) && (chdir(vi_req.vi_chroot) || - chroot(vi_req.vi_chroot))) - goto abort; close(s); if (argc == 2) { From owner-p4-projects@FreeBSD.ORG Sun May 31 19:58:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5795E1065674; Sun, 31 May 2009 19:58: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 1746D106566B for ; Sun, 31 May 2009 19:58:35 +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 0542E8FC16 for ; Sun, 31 May 2009 19:58:35 +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 n4VJwYk0027480 for ; Sun, 31 May 2009 19:58:34 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VJwYlv027478 for perforce@freebsd.org; Sun, 31 May 2009 19:58:34 GMT (envelope-from dforsyth@FreeBSD.org) Date: Sun, 31 May 2009 19:58:34 GMT Message-Id: <200905311958.n4VJwYlv027478@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 163199 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 19:58:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=163199 Change 163199 by dforsyth@squirrel on 2009/05/31 19:57:52 Moved files into subdirectories. Lets see if I did this right. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/info/main.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.h#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_util.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_util.h#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#1 add .. //depot/projects/soc2009/dforsyth_libpkg/pkg.c#7 delete .. //depot/projects/soc2009/dforsyth_libpkg/pkg.h#6 delete .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info.c#3 delete .. //depot/projects/soc2009/dforsyth_libpkg/pkg_util.c#2 delete .. //depot/projects/soc2009/dforsyth_libpkg/pkg_util.h#2 delete .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.c#7 delete .. //depot/projects/soc2009/dforsyth_libpkg/pkgdb.h#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 31 20:24:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 202CC1065670; Sun, 31 May 2009 20:24: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 BC41A106564A for ; Sun, 31 May 2009 20:24:01 +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 A98B28FC0A for ; Sun, 31 May 2009 20:24:01 +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 n4VKO18F030743 for ; Sun, 31 May 2009 20:24:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VKO1bC030741 for perforce@freebsd.org; Sun, 31 May 2009 20:24:01 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 31 May 2009 20:24:01 GMT Message-Id: <200905312024.n4VKO1bC030741@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 163203 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 20:24:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=163203 Change 163203 by pgj@petymeg on 2009/05/31 20:23:23 IFC Affected files ... .. //depot/projects/docproj_hu/www/en/gnome/contact.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/gnome/images/Makefile#3 integrate .. //depot/projects/docproj_hu/www/en/gnome/images/pav.jpg#2 delete .. //depot/projects/docproj_hu/www/en/platforms/amd64/motherboards.sgml#6 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#33 integrate Differences ... ==== //depot/projects/docproj_hu/www/en/gnome/contact.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -44,16 +44,6 @@ - - jylefort - - - Jean-Yves Lefort - (jylefort@FreeBSD.org)
    - IRC (FreeNode): decadix - - - Jeremy Messenger (mezz@FreeBSD.org)
    @@ -95,17 +85,6 @@ IRC (FreeNode): ahze - - - Pav Lucistnik - (pav@FreeBSD.org)
    - WWW: www.oook.cz
    - IRC (FreeNode): Pav - - - pav - - @@ -119,9 +98,11 @@
  • Ade Lovett
  • Dima Ruban
  • Eivind Eklund
    • +
  • Jean-Yves Lefort
  • Jimmy Olgeni
  • Justin M. Seger
  • Maxim Sobolev
    • +
  • Pav Lucistnik
  • Vanilla I. Shu
    • ==== //depot/projects/docproj_hu/www/en/gnome/docs/develfaq.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -158,9 +158,8 @@

  • What is the current state of development GNOME on FreeBSD?

    -

    Because of the long ports tree freeze, we have not yet - started work on GNOME &gnomedevelver;. Stay tuned for more - updates.

    +

    GNOME &gnomedevelver; is underway. We have ported + &gnomedevelver;.2 to FreeBSD. Start testing now!

    • &footer; ==== //depot/projects/docproj_hu/www/en/gnome/images/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/gnome/images/Makefile,v 1.54 2009/01/18 23:52:33 marcus Exp $ +# $FreeBSD: www/en/gnome/images/Makefile,v 1.55 2009/05/30 19:39:32 marcus Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -34,6 +34,5 @@ DATA+= kwm.jpg DATA+= marcus.jpg DATA+= mezz.jpg -DATA+= pav.jpg .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_hu/www/en/platforms/amd64/motherboards.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -1079,6 +1079,14 @@ Supermicro + X7DBE+ + Intel 5000P / 2x LGA 771 + Alexander Lunyov (dmesg, pciconf) + 7.2-RELEASE + Works fine. Onboard RAID untested. + + + Supermicro X7SBA Intel 3210 + ICH9R / LGA 775 Brad Davis ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#33 (text+ko) ==== @@ -11,7 +11,7 @@ - $FreeBSD: www/hu/share/sgml/news.xml,v 1.11 2009/05/29 05:00:42 pgj Exp $ + $FreeBSD: www/hu/share/sgml/news.xml,v 1.12 2009/05/30 07:42:16 pgj Exp $ From owner-p4-projects@FreeBSD.ORG Sun May 31 20:26:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 67407106567C; Sun, 31 May 2009 20:26: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 10A3410656A3 for ; Sun, 31 May 2009 20:26:04 +0000 (UTC) (envelope-from tatsianka@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D841C8FC32 for ; Sun, 31 May 2009 20:26:03 +0000 (UTC) (envelope-from tatsianka@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VKQ39G031086 for ; Sun, 31 May 2009 20:26:03 GMT (envelope-from tatsianka@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VKQ39L031084 for perforce@freebsd.org; Sun, 31 May 2009 20:26:03 GMT (envelope-from tatsianka@FreeBSD.org) Date: Sun, 31 May 2009 20:26:03 GMT Message-Id: <200905312026.n4VKQ39L031084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tatsianka@FreeBSD.org using -f From: Tatsiana Severyna To: Perforce Change Reviews Cc: Subject: PERFORCE change 163204 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 20:26:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=163204 Change 163204 by tatsianka@tatsianka_zonder on 2009/05/31 20:25:30 Add port of putter (pass-to-userspace transporter) device driver from NetBSD Affected files ... .. //depot/projects/soc2009/tatsianka_puffs/putter/Makefile#1 add .. //depot/projects/soc2009/tatsianka_puffs/putter/putter.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/putter/putter.h#1 add .. //depot/projects/soc2009/tatsianka_puffs/putter/putter_sys.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 31 20:31:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66CC01065687; Sun, 31 May 2009 20:31:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 136AE106567E for ; Sun, 31 May 2009 20:31:10 +0000 (UTC) (envelope-from tatsianka@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 277FF8FC18 for ; Sun, 31 May 2009 20:31:09 +0000 (UTC) (envelope-from tatsianka@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n4VKV9WS032398 for ; Sun, 31 May 2009 20:31:09 GMT (envelope-from tatsianka@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VKV9Sj032396 for perforce@freebsd.org; Sun, 31 May 2009 20:31:09 GMT (envelope-from tatsianka@FreeBSD.org) Date: Sun, 31 May 2009 20:31:09 GMT Message-Id: <200905312031.n4VKV9Sj032396@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tatsianka@FreeBSD.org using -f From: Tatsiana Severyna To: Perforce Change Reviews Cc: Subject: PERFORCE change 163205 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 20:31:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=163205 Change 163205 by tatsianka@tatsianka_zonder on 2009/05/31 20:30:56 Add port of puffs (pass-to-userspace framework file system) kernel-level part from NetBSD Porting is at early stage. Most of functinality is disable with ifdef's and it's not functional Affected files ... .. //depot/projects/soc2009/tatsianka_puffs/puffs/Makefile#1 add .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_msgif.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_msgif.h#1 add .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_node.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_subr.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_sys.h#1 add .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_vfsops.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_vnops.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 31 20:55:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79CFF1065704; Sun, 31 May 2009 20:55: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 361681065701 for ; Sun, 31 May 2009 20:55: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 23A638FC15 for ; Sun, 31 May 2009 20:55: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 n4VKtY9l044094 for ; Sun, 31 May 2009 20:55:34 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VKtXrB044092 for perforce@freebsd.org; Sun, 31 May 2009 20:55:33 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 31 May 2009 20:55:33 GMT Message-Id: <200905312055.n4VKtXrB044092@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 163207 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 20:55:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=163207 Change 163207 by pgj@petymeg on 2009/05/31 20:54:36 MFen (doc): 1.237 -> 1.238 hu_HU.ISO8859-2/books/handbook/config/chapter.sgml 1.463 -> 1.464 hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#24 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#30 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#24 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -527,92 +527,6 @@ beállítások egyszerû indítószkriptekkel adhatóak meg.     - Az rc.d eljövetele elõtt az - alkalmazások indításához be kellett - másolni egy egyszerû indítószkriptet a - /usr/local/etc/rc.d - könyvtárba, melyet aztán a rendszer - indításához használt szkriptek - olvastak be. Ezek a szkriptek aztán késõbb a - rendszer indítása során - végrehajtódtak. - - Miközben rengetegen próbálták - beolvasztani ezt a megszokott konfigurációs - stílust egy új rendszerbe, a külsõ - alkalmazások mûködtetéséhez - továbbra is az elõbb említett - könyvtárban elhelyezett szkriptekre van - szükség. A szkriptek közötti apró - eltérések leginkább abban nyilvánulnak - meg, hogy az rc.d könyvtárat - használják-e vagy sem. A &os; 5.1-es - verziója elõtt a régebbi - konfigurációs megoldást - használták, de az új szkriptek szinte az - összes esetben megfelelõnek bizonyultak. - - Jóllehet minden szkriptnek teljesítenie kell - minimális elvárásokat, ezek a legtöbb - esetben függetlenek a &os; konkrét - verziójától. Minden szkriptnek a rendszer - által végrehajthatónak kell lennie. Ezt - úgy érhetjük el, ha a chmod - parancs felhasználásával - beállítjuk a 555 - kódú engedélyeket. Ezen felül a - szkriptnek még tudnia kell kezelnie a - start és stop - paramétereket. - - A legegyszerûbb indítószkript valahogy - így nézhet ki: - - #!/bin/sh -echo -n ' utility' - -case "$1" in -start) - /usr/local/bin/utility - ;; -stop) - kill -9 `cat /var/run/utility.pid` - ;; -*) - echo "Usage: `basename $0` {start|stop}" >&2 - exit 64 - ;; -esac - -exit 0 - - Ez a szkript képes értelmezni a - start és stop - parancsokat az alkalmazás számára, ami itt - egyszerûen csak a utility nevet - kapta. - - Manuálisan így tudjuk elindítani: - - &prompt.root; /usr/local/etc/rc.d/utility start - - Habár nem mindegyik külsõ szoftvert kell - külön megadni az rc.conf - állományban, majdnem minden nap - módosítani kell egy portot a - beállítások elfogadásához. Az - egyes alkalmazásokra vonatkozó - kiegészítõ információkhoz - nézzük meg a telepítés után - keletkezõ üzeneteket. Egyes külsõ - szoftverekhez mellékelnek olyan - indítószkripteket, amelyek lehetõvé - teszik az alkalmazás meghívását az - rc.d - könyvtárból. Ezekrõl a - következõ szakaszban még szólni - fogunk. - Az alkalmazások részletesebb beállítása @@ -641,14 +555,6 @@ # REQUIRE: DAEMON # KEYWORD: shutdown -# -# NE VÁLTOZTASSUK MEG AZ ITT LÉVÕ ALAPÉRTELMEZÉSEKET, -# INKÁBB AZ /etc/rc.conf ÁLLOMÁNYBAN ÁLLÍTSUK BE EZEKET -# -utility_enable=${utility_enable-"NO"} -utility_flags=${utility_flags-""} -utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} - . /etc/rc.subr name="utility" @@ -657,15 +563,20 @@ load_rc_config $name +# +# NE VÁLTOZTASSUK MEG AZ ITT LÉVÕ ALAPÉRTELMEZÉSEKET, +# INKÁBB AZ /etc/rc.conf ÁLLOMÁNYBAN ÁLLÍTSUK BE EZEKET +# +utility_enable=${utility_enable-"NO"} +utility_pidfile=${utility_pidfile-"/var/run/utility.pid"} + pidfile="${utility_pidfile}" -start_cmd="echo \"Starting ${name}.\"; /usr/bin/nice -5 ${command} ${utility_flags} ${command_args}" - run_rc_command "$1" Ez a szkript gondoskodik arról, hogy a utility nevû alkalmazás a - daemon szolgáltatás után + DAEMON szolgáltatás után induljon el. Emellett még felkínál egy módszert a PID avagy futó programok azonosítójának @@ -688,7 +599,6 @@ segédprogrammal szembeni kompatibilitást és az rc.conf állomány könnyebb beállítását. - ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#30 (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.463 + %SRCID% 1.464 --> @@ -193,6 +193,17 @@
    + LinuxCenter.Kz + Uszty-Kamenogorszk + Kazahsztán + Telefon: +7-705-501-6001 + e-mail: info@linuxcenter.kz + WWW: +
    +     + + +
    LinuxCenter.Ru Galernaya utca, 55 Szentpétervár From owner-p4-projects@FreeBSD.ORG Sun May 31 21:59:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DF311065711; Sun, 31 May 2009 21:59: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 AD5D11065706 for ; Sun, 31 May 2009 21:59:45 +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 839BA8FC13 for ; Sun, 31 May 2009 21:59:44 +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 n4VLxijI050059 for ; Sun, 31 May 2009 21:59:44 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VLxiBW050057 for perforce@freebsd.org; Sun, 31 May 2009 21:59:44 GMT (envelope-from gk@FreeBSD.org) Date: Sun, 31 May 2009 21:59:44 GMT Message-Id: <200905312159.n4VLxiBW050057@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 163210 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 21:59:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=163210 Change 163210 by gk@gk_h1 on 2009/05/31 21:59:22 create branch Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/mount/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sbin/mount/extern.h#1 branch .. //depot/projects/soc2009/gk_pefs/sbin/mount/getmntopts.3#1 branch .. //depot/projects/soc2009/gk_pefs/sbin/mount/getmntopts.c#1 branch .. //depot/projects/soc2009/gk_pefs/sbin/mount/mntopts.h#1 branch .. //depot/projects/soc2009/gk_pefs/sbin/mount/mount.8#1 branch .. //depot/projects/soc2009/gk_pefs/sbin/mount/mount.c#1 branch .. //depot/projects/soc2009/gk_pefs/sbin/mount/mount_fs.c#1 branch .. //depot/projects/soc2009/gk_pefs/sbin/mount/pathnames.h#1 branch .. //depot/projects/soc2009/gk_pefs/sbin/mount/vfslist.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/io.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/mca.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/support.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/conf/MAC#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/conf/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/conf/NOTES#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/_bus.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/_limits.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/_types.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/asm.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/atomic.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/bus.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/clock.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/cpu.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/elf.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/endian.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/exec.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/float.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/fpu.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/frame.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/iodev.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/kdb.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/limits.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/mca.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/md_var.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/memdev.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/metadata.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/minidump.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/mptable.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/mutex.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/param.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/pcb.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/pmap.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/proc.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/profile.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/psl.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/reloc.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/resource.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/runq.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/segments.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/signal.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/smp.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/stack.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/trap.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/tss.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/varargs.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/isa/clock.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/isa/icu.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/isa/isa.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/isa/isa.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/blockio.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/copystr.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/disassem.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/exception.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/fiq.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/fusu.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/genassym.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/inckern.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/intr.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/locore.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/mem.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/minidump_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/nexus.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/pmap.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/setstack.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/support.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/swtch.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/trap.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/undefined.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/vectors.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_cfata.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91board.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/at91var.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/files.at91#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/std.at91#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/std.bwct#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/std.hl200#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/AVILA#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/BWCT#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/CRB#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/DB-78XXX#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/DEFAULTS#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/EP80219#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/GUMSTIX#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/GUMSTIX.hints#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/HL200#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/IQ31244#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/KB920X#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/NSLU#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/SIMICS#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/_bus.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/_limits.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/_stdint.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/_types.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/armreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/asm.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/asmacros.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/atomic.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/blockio.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/bootinfo.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/bus.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/clock.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/cpu.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/disassem.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/elf.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/endian.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/exec.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/fiq.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/float.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/fp.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/frame.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/ieee.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/intr.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/katelib.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/kdb.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/limits.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/machdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/md_var.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/memdev.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/metadata.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/minidump.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/mutex.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/param.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/pcb.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/pcpu.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/pmap.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/proc.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/profile.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/psl.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/pte.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/ptrace.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/reloc.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/resource.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/runq.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/setjmp.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/sigframe.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/signal.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/smp.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/stack.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/stdarg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/swi.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/sysarch.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/trap.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/ucontext.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/undefined.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/utrap.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/include/vmparam.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/common.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/files.mv#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/gpio.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/ic.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/obio.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/rtc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/std.mv#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/timer.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/mv/twsi.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/files.pxa#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/if_smc_smi.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/pxa_gpio.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/pxa_icu.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/pxa_machdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/pxa_obio.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/pxa_smi.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/pxa_space.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/pxa_timer.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/pxareg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/pxavar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/std.pxa#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/uart_bus_pxa.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/pxa/uart_cpu_pxa.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/README#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/uboot/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/uboot/conf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/uboot/start.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/arm/uboot/version#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/bcache.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/boot.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/commands.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/console.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/dev_net.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/dev_net.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/devopen.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/help.common#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/interp.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/isapnp.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/isapnp.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/load_elf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/loader.8#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/ls.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/misc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/module.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/newvers.sh#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/panic.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/pnp.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/common/ufsread.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/README#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/dict.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/float.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/loader.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/math64.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/math64.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/mips/sysdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/mips/sysdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/search.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/stack.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/tools.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/unix.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/vm.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ficl/words.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/frames.4th#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/loader.4th#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/loader.conf#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/loader.rc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/screen.4th#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/forth/support.4th#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/loader/version#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/zfsboot/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/zfsboot/zfsboot.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/i386/zfsboot/zfsldr.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/efi/version#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ia64/ski/version#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/zfs/Makefile#1 branch .. //depot/projects/soc2009/gk_pefs/sys/boot/zfs/zfs.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 31 22:05:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CE7310656A7; Sun, 31 May 2009 22:05: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 1258A1065688 for ; Sun, 31 May 2009 22:05:51 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F3AD48FC1D for ; Sun, 31 May 2009 22:05:50 +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 n4VM5oRt051539 for ; Sun, 31 May 2009 22:05:50 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VM5opZ051537 for perforce@freebsd.org; Sun, 31 May 2009 22:05:50 GMT (envelope-from dforsyth@FreeBSD.org) Date: Sun, 31 May 2009 22:05:50 GMT Message-Id: <200905312205.n4VM5opZ051537@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 163212 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 22:05:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=163212 Change 163212 by dforsyth@squirrel on 2009/05/31 22:05:41 Added some action to pkg_info. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/Makefile#1 add .. //depot/projects/soc2009/dforsyth_libpkg/info/Makefile#1 add .. //depot/projects/soc2009/dforsyth_libpkg/info/main.c#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/Makefile#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.c#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.h#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_util.c#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_util.h#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#2 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/info/main.c#2 (text+ko) ==== @@ -4,38 +4,99 @@ #include "pkg.h" +#define PKG_DBDIR_DEFAULT "/var/db/pkg" /* Move this. */ + short opt_all = 0; +short opt_glob = 0; +short opt_show_all_info = 0; +short opt_show_index = 0; short opt_show_comment = 0; +char *info_targets; static char opts[] = "a"; static struct option lopts[] = { {"all", no_argument, NULL, 'a'}, + {NULL, 0, NULL, 0}, // <-- something that pkg_add in 7.2 forgot... }; /* Mock pkg_info for testing, */ +void perform_on_db(struct pkgdb *db); +void print_pkg_information(struct pkg *p); +void parse_opts(int argc, char **argv); +void usage(int exit_val); + int main (int argc, char **argv) { - int s; const char *db_root; struct pkgdb *db; if (argc == 1) { opt_all = 1; - opt_show_comment = 1; } - db_root = getenv("PKG_DBDIR"); - if (db_root == NULL) { - printf("..."); - db_root = "/var/db/pkg"; -} + parse_opts(argc, argv); + + db_root = getenv("PKG_DBDIR"); /* User set it */ + if (db_root == NULL) + db_root = PKG_DBDIR_DEFAULT; /* Default */ + db = pkgdb_new_hierdb(db_root); if (db == NULL) { - fprintf(stderr, "Could not attach to database \"%s\"\n"); + fprintf(stderr, "Could not attach to database \"%s\"\n", db_root); } + + perform_on_db(db); pkgdb_free_hierdb(db); return (0); } + +void +usage(int exit_val) +{ + printf("If you don't know how to use me, then you shouldn't be...\n"); + exit(exit_val); +} + +void +parse_opts(int argc, char **argv) +{ + /* Ehh... Worthless to write this at this point. */ + opt_all = 1; +} + +void +perform_on_db(struct pkgdb *db) +{ + int count; + char *target; + struct pkg *p; + + /* There will be cases where an init is useless, but since I haven't + * written that much yet, init regardless. */ + + count = pkgdb_init_hierdb(db); + if (count < 0) + exit(1); + + while ((p = pkgdb_next_pkg(db)) != NULL) { + if (!opt_all) { /* Wont happen at this point. */ + /* Do some matching magic that I haven't written yet. */ + print_pkg_information(p); + } else { + print_pkg_information(p); + } + } +} + +void +print_pkg_information(struct pkg *p) +{ + /* Just print the basic PKGNAME COMMENT scheme right now. Other + * information isn't collected by the library yet. */ + if (!opt_show_all_info) + printf("%s %s\n", pkg_ident(p), pkg_comment(p)); +} + ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#2 (text+ko) ==== @@ -2,8 +2,6 @@ #include #include -#include - #include "pkg_util.h" #include "pkgdb.h" #include "pkg.h" @@ -64,14 +62,9 @@ /* Something bad happened... I should probably let people know * about it... */ } - return (p); } - - - -/* Read in contents of comment file. */ char * pkg_ident(struct pkg *p) { @@ -90,6 +83,11 @@ return (p->comment); } + +/* TODO: Make an explicit note in the manual for libpkg that pkg_free + * should NOT be called called on pkgs that are not explicitly created by + * the user. */ + void pkg_free(struct pkg *p) { ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#2 (text+ko) ==== @@ -1,18 +1,13 @@ #ifndef __PKG_H__ #define __PKG_H__ -#include -#include - /* pkg */ struct pkg; struct pkg *pkg_new(const char *ident); struct pkg *pkg_set_path(struct pkg *p, const char *path); - -int set_pkg_contents(struct pkg *p, char *contents); -int set_pkg_comment(struct pkg *p, char *comment); +struct pkg *pkg_set_comment(struct pkg *p, const char *comment); char *pkg_ident(struct pkg *p); char *pkg_name(struct pkg *p); ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.c#2 (text+ko) ==== @@ -28,3 +28,8 @@ struct pkg_file *files; }; +char * +pkg_info_read_file_to_string(const char *path, const char *filename) +{ + return (NULL); +} ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.h#2 (text+ko) ==== @@ -1,4 +1,11 @@ #ifndef __PKG_INFO_H__ #define __PKG_INFO_H__ +#define COMMENT_FILE "+COMMENT" +#define CONTENTS_FILE "+CONTENTS" +#define DESC_FILE "+DESC" +#define DISPLAY_FILE "+DISPLAY" +#define MTREE_DIRS_FILE "+MTREE_DIRS" +#define REQUIRED_BY_FILE "+REQUIRED_BY" + #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_util.c#2 (text+ko) ==== @@ -5,6 +5,8 @@ #include #include +#include "pkg_util.h" + int subdir_sel(struct dirent *ent) { ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_util.h#2 (text+ko) ==== ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#2 (text+ko) ==== @@ -15,6 +15,9 @@ /* Everything in here is written with the current database setup in mind. * I'll add some stuff for flat databases later. */ +/* TODO: Move _hierdb functions into a seperate file, add callback + * functionality to pkgdb. */ + /* Allocate and create a new hierdb. */ struct pkgdb * @@ -135,10 +138,16 @@ struct pkg * pkgdb_query_pkg(struct pkgdb *db, const char *ident) { - Need to add callbacks before do this. + Need to add callbacks before I do this. } */ +struct pkg * +pkgdb_query_pkg_hierdb(struct pkgdb *db, const char *ident) +{ + return (NULL); +} + char * pkgdb_pkg_path(struct pkgdb *db, struct pkg *p) { ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#2 (text+ko) ==== @@ -23,15 +23,8 @@ struct pkg *p_curr; TAILQ_HEAD(pkg_head, pkg) p_head; + /* Callbacks */ - /* tuuuummmmbbbllleeewwwweeeedddddd*/ }; -#define COMMENT_FILE "+COMMENT" -#define CONTENTS_FILE "+CONTENTS" -#define DESC_FILE "+DESC" -#define DISPLAY_FILE "+DISPLAY" -#define MTREE_DIRS_FILE "+MTREE_DIRS" -#define REQUIRED_BY_FILE "+REQUIRED_BY" - #endif From owner-p4-projects@FreeBSD.ORG Sun May 31 22:16:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B62981065670; Sun, 31 May 2009 22:16:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 75EFE106566B for ; Sun, 31 May 2009 22:16:01 +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 643738FC31 for ; Sun, 31 May 2009 22:16:01 +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 n4VMG1N5052309 for ; Sun, 31 May 2009 22:16:01 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n4VMG1sp052307 for perforce@freebsd.org; Sun, 31 May 2009 22:16:01 GMT (envelope-from gk@FreeBSD.org) Date: Sun, 31 May 2009 22:16:01 GMT Message-Id: <200905312216.n4VMG1sp052307@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 163213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 May 2009 22:16:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=163213 Change 163213 by gk@gk_h1 on 2009/05/31 22:15:11 initial version. equivalent to nullfs for now. no encryption support Affected files ... .. //depot/projects/soc2009/gk_pefs/sbin/mount_pefs/Makefile#1 add .. //depot/projects/soc2009/gk_pefs/sbin/mount_pefs/mount_pefs.c#1 add .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#1 add .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#1 add .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#1 add .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#1 add .. //depot/projects/soc2009/gk_pefs/sys/modules/pefs/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jun 1 01:07:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1066B1065676; Mon, 1 Jun 2009 01:07:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C411B1065673 for ; Mon, 1 Jun 2009 01:07:55 +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 978A38FC12 for ; Mon, 1 Jun 2009 01:07:55 +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 n5117tek079598 for ; Mon, 1 Jun 2009 01:07:55 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5117tRd079596 for perforce@freebsd.org; Mon, 1 Jun 2009 01:07:55 GMT (envelope-from gabor@freebsd.org) Date: Mon, 1 Jun 2009 01:07:55 GMT Message-Id: <200906010107.n5117tRd079596@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 163218 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 01:07:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=163218 Change 163218 by gabor@gabor_server on 2009/06/01 01:07:35 - Move NLS knobs to a separate Makefile Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#20 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/Makefile.inc#1 add Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#20 (text+ko) ==== @@ -27,9 +27,7 @@ .endif .if !defined(WITHOUT_NLS) -NLS= es_ES.ISO8859-1 -NLS+= hu_HU.ISO8859-2 -NLS+= pt_BR.ISO8859-1 +.include "${.CURDIR}/nls/Makefile.inc" .else CFLAGS+= -DWITHOUT_NLS .endif From owner-p4-projects@FreeBSD.ORG Mon Jun 1 01:19:07 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6184B1065677; Mon, 1 Jun 2009 01:19:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F9211065673 for ; Mon, 1 Jun 2009 01:19:07 +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 0D1E28FC15 for ; Mon, 1 Jun 2009 01:19:07 +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 n511J64e080406 for ; Mon, 1 Jun 2009 01:19:06 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n511J6JC080404 for perforce@freebsd.org; Mon, 1 Jun 2009 01:19:06 GMT (envelope-from gabor@freebsd.org) Date: Mon, 1 Jun 2009 01:19:06 GMT Message-Id: <200906010119.n511J6JC080404@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 163219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 01:19:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=163219 Change 163219 by gabor@gabor_server on 2009/06/01 01:18:31 - Remove a leftover - Little changes towards WARNS=6 Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#13 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#49 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#82 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#13 (text+ko) ==== @@ -53,20 +53,20 @@ static void grep_revstr(unsigned char *, int); void -fgrepcomp(fastgrep_t *fg, const char *pattern) +fgrepcomp(fastgrep_t *fg, const char *pat) { int i; /* Initialize. */ - fg->len = strlen(pattern); + fg->len = strlen(pat); fg->bol = 0; fg->eol = 0; fg->reversed = 0; - fg->pattern = (unsigned char *)pattern; /* really const */ + fg->pattern = (unsigned char *)pat; /* really const */ /* Preprocess pattern. */ - for (i = 0; i <= UCHAR_MAX; i++) + for (i = 0; i <= (signed)UCHAR_MAX; i++) fg->qsBc[i] = fg->len; for (i = 1; i < fg->len; i++) fg->qsBc[fg->pattern[i]] = fg->len - i; @@ -76,7 +76,7 @@ * Returns: -1 on failure, 0 on success */ int -fastcomp(fastgrep_t *fg, const char *pattern) +fastcomp(fastgrep_t *fg, const char *pat) { int i; int bol = 0; @@ -88,28 +88,28 @@ int lastHalfDot = 0; /* Initialize. */ - fg->len = strlen(pattern); + fg->len = strlen(pat); fg->bol = 0; fg->eol = 0; fg->reversed = 0; /* Remove end-of-line character ('$'). */ - if (pattern[fg->len - 1] == '$') { + if (pat[fg->len - 1] == '$') { eol++; fg->eol = 1; fg->len--; } /* Remove beginning-of-line character ('^'). */ - if (pattern[0] == '^') { + if (pat[0] == '^') { bol++; fg->bol = 1; fg->len--; } if (fg->len >= 14 && - strncmp(pattern + fg->bol, "[[:<:]]", 7) == 0 && - strncmp(pattern + fg->bol + fg->len - 7, "[[:>:]]", 7) == 0) { + strncmp(pat + fg->bol, "[[:<:]]", 7) == 0 && + strncmp(pat + fg->bol + fg->len - 7, "[[:>:]]", 7) == 0) { fg->len -= 14; /* Word boundary is handled separately in util.c */ wflag = true; @@ -121,7 +121,7 @@ * string respectively. */ fg->pattern = grep_malloc(fg->len + 1); - memcpy(fg->pattern, pattern + bol + wflag, fg->len); + memcpy(fg->pattern, pat + bol + wflag, fg->len); fg->pattern[fg->len] = '\0'; /* Look for ways to cheat...er...avoid the full regex engine. */ @@ -280,7 +280,7 @@ * -1 on success */ static int -grep_cmp(const unsigned char *pattern, const unsigned char *data, size_t len) +grep_cmp(const unsigned char *pat, const unsigned char *data, size_t len) { int i; size_t size; @@ -295,12 +295,12 @@ if (mbstowcs(wdata, (const char *)data, size) == -1) return (-1); - if ((size = mbstowcs(NULL, (const char *)pattern, 0)) == -1) + if ((size = mbstowcs(NULL, (const char *)pat, 0)) == -1) return (-1); wpat = grep_malloc(size * sizeof(wint_t)); - if (mbstowcs(wpat, (const char *)pattern, size) == -1) + if (mbstowcs(wpat, (const char *)pat, size) == -1) return (-1); for (i = 0; i < len; i++) { if ((towlower(wpat[i]) == towlower(wdata[i])) || ((grepbehave != GREP_FIXED) && wpat[i] == L'.')) @@ -311,7 +311,7 @@ } } else { for (i = 0; i < len; i++) { - if ((pattern[i] == data[i]) || ((grepbehave != GREP_FIXED) && pattern[i] == '.')) + if ((pat[i] == data[i]) || ((grepbehave != GREP_FIXED) && pat[i] == '.')) continue; return (i); } ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#49 (text+ko) ==== @@ -146,8 +146,6 @@ void clearqueue(void); /* file.c */ -unsigned char *binbufptr; - void grep_close(struct file *f); struct file *grep_stdin_open(void); struct file *grep_open(char *path); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#82 (text+ko) ==== @@ -66,7 +66,7 @@ FTS *fts; FTSENT *p; int i, c, ok, fts_flags; - char *d, *dirname; + char *d, *dir; c = fts_flags = 0; @@ -101,8 +101,8 @@ ok = 1; if (exclflag) { d = strrchr(p->fts_path, '/'); - dirname = grep_malloc(sizeof(char) * (d - p->fts_path + 2)); - strlcpy(dirname, p->fts_path, (d - p->fts_path + 1)); + dir = grep_malloc(sizeof(char) * (d - p->fts_path + 2)); + strlcpy(dir, p->fts_path, (d - p->fts_path + 1)); for (i = 0; i < epatterns; ++i) { switch(epattern[i].type) { case FILE_PAT: @@ -114,7 +114,7 @@ } break; case DIR_PAT: - if (strstr(dirname, epattern[i].pat) != NULL) { + if (strstr(dir, epattern[i].pat) != NULL) { if (epattern[i].mode == EXCL_PAT) ok = 0; else @@ -123,7 +123,7 @@ break; } } - free(dirname); + free(dir); } if (ok) @@ -253,9 +253,6 @@ regmatch_t matches[MAX_LINE_MATCHES]; regoff_t st = 0; int c = 0, i, r = 0, m = 0; -#ifdef WITH_PCRE - int ovector[3]; -#endif if (!matchall) { /* Loop to process the whole line */ From owner-p4-projects@FreeBSD.ORG Mon Jun 1 03:16:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D24F106566C; Mon, 1 Jun 2009 03:16: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 3254F106564A for ; Mon, 1 Jun 2009 03:16:14 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1DC498FC0A for ; Mon, 1 Jun 2009 03:16:14 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n513GEFx091983 for ; Mon, 1 Jun 2009 03:16:14 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n513G9oM091977 for perforce@freebsd.org; Mon, 1 Jun 2009 03:16:09 GMT (envelope-from yohanes@FreeBSD.org) Date: Mon, 1 Jun 2009 03:16:09 GMT Message-Id: <200906010316.n513G9oM091977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Cc: Subject: PERFORCE change 163225 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 03:16:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163225 Change 163225 by yohanes@econa on 2009/06/01 03:15:43 many small changes Affected files ... .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/ja_JP.eucJP/books/handbook/multimedia/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/mn_MN.UTF-8/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#2 integrate .. //depot/projects/str91xx/doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/bcr.key#1 branch .. //depot/projects/str91xx/ports/UPDATING#2 integrate .. //depot/projects/str91xx/src/bin/cp/utils.c#2 integrate .. //depot/projects/str91xx/src/bin/rm/rm.c#2 integrate .. //depot/projects/str91xx/src/bin/sh/eval.c#2 integrate .. //depot/projects/str91xx/src/bin/sh/eval.h#2 integrate .. //depot/projects/str91xx/src/bin/sh/histedit.c#2 integrate .. //depot/projects/str91xx/src/bin/sh/main.c#2 integrate .. //depot/projects/str91xx/src/bin/sh/miscbltin.c#2 integrate .. //depot/projects/str91xx/src/bin/sh/sh.1#2 integrate .. //depot/projects/str91xx/src/bin/sh/trap.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/CHANGES#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/FAQ#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/NSEC3-NOTES#1 branch .. //depot/projects/str91xx/src/contrib/bind9/README#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/README.idnkit#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/README.pkcs11#1 branch .. //depot/projects/str91xx/src/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/bind9.xsl#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/named/bind9.xsl.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/convertxsl.pl#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/statschannel.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/statschannel.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/nsupdate/nsupdate.1#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/config.guess#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/config.h.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/configure.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#1 branch .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#1 branch .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.nsupdate.html#1 branch .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/draft/update#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/misc/sort-options.pl#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/index#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1032.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1033.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1034.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1035.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1101.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1122.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1123.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1183.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1348.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1535.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1536.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1537.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1591.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1611.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1612.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1706.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1712.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1750.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1876.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1886.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1982.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1995.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc1996.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2052.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2104.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2119.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2133.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2136.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2137.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2163.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2168.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2181.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2230.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2308.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2317.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2373.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2374.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2375.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2418.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2535.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2536.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2537.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2538.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2539.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2540.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2541.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2553.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2671.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2672.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2673.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2782.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2825.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2826.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2845.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2874.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2915.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2929.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2930.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc2931.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3007.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3008.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3071.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3090.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3110.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3123.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3152.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3197.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3225.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3226.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3258.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3363.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3364.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3425.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3445.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3467.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3490.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3491.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3492.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3493.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3513.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3596.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3597.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3645.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3655.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3658.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3757.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3833.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3845.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc3901.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4025.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4033.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4034.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4035.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4074.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4159.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4193.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4255.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4343.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4367.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4398.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4408.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4431.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4470.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4634.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4641.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4648.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc4701.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc5155.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/doc/rfc/rfc952.txt#2 delete .. //depot/projects/str91xx/src/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/README#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/aclocal.m4#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/api#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/daemon.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/ftruncate.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/mktemp.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/putenv.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/readv.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/setenv.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/setitimer.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/strdup.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/strerror.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/strpbrk.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/strsep.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/strtoul.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/utimes.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/bsd/writev.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/config.h.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/configure.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/dst/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/dst/dst_api.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/dst/dst_internal.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/dst/hmac_link.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/dst/md5.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/dst/md5_dgst.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/dst/md5_locl.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/dst/support.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/arpa/inet.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/arpa/nameser.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/fd_setsize.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/hesiod.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/irp.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/irs.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/assertions.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/ctl.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/dst.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/eventlib.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/heap.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/list.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/logging.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/misc.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/platform.h.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/isc/tree.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/netdb.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/netgroup.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/res_update.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/resolv.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/include/resolv_mt.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_addr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_data.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_neta.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_netof.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_network.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_ntop.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/inet_pton.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/inet/nsap_addr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/dns.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/dns_gr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/dns_ho.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/dns_nw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/dns_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/dns_pr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/dns_pw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/dns_sv.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gai_strerror.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gen.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gen_gr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gen_ho.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gen_ng.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gen_nw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gen_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gen_pr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gen_pw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gen_sv.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getgrent.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getgrent_r.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gethostent.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/gethostent_r.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getnameinfo.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getnetent.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getnetent_r.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getnetgrent.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getprotoent.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getpwent.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getpwent_r.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getservent.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/getservent_r.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/hesiod.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/hesiod_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irp.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irp_gr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irp_ho.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irp_ng.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irp_nw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irp_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irp_pr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irp_pw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irp_sv.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irpmarshall.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irs_data.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irs_data.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/irs_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/lcl.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/lcl_gr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/lcl_ho.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/lcl_ng.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/lcl_nw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/lcl_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/lcl_pr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/lcl_pw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/lcl_sv.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nis.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nis_gr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nis_ho.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nis_ng.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nis_nw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nis_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nis_pr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nis_pw.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nis_sv.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/nul_ng.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/pathnames.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/irs/util.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/assertions.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/assertions.mdoc#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/base64.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/bitncmp.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/ctl_p.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/ctl_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/ev_connects.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/ev_files.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/ev_streams.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/ev_timers.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/ev_waits.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/eventlib.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/eventlib_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/heap.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/heap.mdoc#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/hex.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/logging.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/logging.mdoc#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/logging_p.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/memcluster.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/movefile.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/tree.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/isc/tree.mdoc#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/make/includes.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/make/mkdep.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/make/rules.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/mkinstalldirs#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/ns_date.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/ns_name.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/ns_netint.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/ns_parse.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/ns_print.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/ns_sign.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/nameser/ns_verify.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/port/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/port/freebsd/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/port_after.h.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/port_before.h.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/Makefile.in#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/herror.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/mtctxres.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_comp.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_data.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_debug.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_debug.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_init.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_private.h#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_query.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_send.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind/resolv/res_update.c#2 delete .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dlz.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/acache.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/dlz.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/iptable.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/nsec3.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/sdlz.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/iptable.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/nsec3.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/spf_99.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/spf_99.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/spnego.asn1#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/spnego.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/spnego.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/spnego_asn1.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/spnego_asn1.pl#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/alpha/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/base32.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/httpd.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/ia64/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/base32.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/hmacsha.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/httpd.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/iterated_hash.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/portset.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/radix.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/sha2.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/stats.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/include/isc/xml.h#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/iterated_hash.c#1 branch .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/mips/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/mips/include/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/mips/include/isc/atomic.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/noatomic/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/noatomic/include/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/str91xx/src/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 1 03:58:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 009541065672; Mon, 1 Jun 2009 03:58: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 B306C106566C for ; Mon, 1 Jun 2009 03:58:58 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9ED788FC14 for ; Mon, 1 Jun 2009 03:58:58 +0000 (UTC) (envelope-from yohanes@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n513wwMU095277 for ; Mon, 1 Jun 2009 03:58:58 GMT (envelope-from yohanes@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n513wvB3095275 for perforce@freebsd.org; Mon, 1 Jun 2009 03:58:57 GMT (envelope-from yohanes@FreeBSD.org) Date: Mon, 1 Jun 2009 03:58:57 GMT Message-Id: <200906010358.n513wvB3095275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to yohanes@FreeBSD.org using -f From: Yohanes Nugroho To: Perforce Change Reviews Cc: Subject: PERFORCE change 163226 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 03:59:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=163226 Change 163226 by yohanes@econa on 2009/06/01 03:58:52 many small updates Affected files ... .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#2 integrate .. //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/authors.ent#2 integrate .. //depot/projects/str91xx/doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml#2 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/avl.key#1 branch .. //depot/projects/str91xx/doc/share/pgpkeys/kmoore.key#1 branch .. //depot/projects/str91xx/doc/share/pgpkeys/pgpkeys-developers.sgml#2 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/pgpkeys.ent#2 integrate .. //depot/projects/str91xx/doc/share/pgpkeys/zml.key#1 branch .. //depot/projects/str91xx/ports/MOVED#2 integrate .. //depot/projects/str91xx/ports/Tools/scripts/tindex#2 integrate .. //depot/projects/str91xx/src/ObsoleteFiles.inc#2 integrate .. //depot/projects/str91xx/src/UPDATING#2 integrate .. //depot/projects/str91xx/src/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c#2 integrate .. //depot/projects/str91xx/src/contrib/ee/Artistic#2 delete .. //depot/projects/str91xx/src/contrib/ee/Changes#1 branch .. //depot/projects/str91xx/src/contrib/ee/README.ee#2 integrate .. //depot/projects/str91xx/src/contrib/ee/create.make#2 integrate .. //depot/projects/str91xx/src/contrib/ee/ee.1#2 integrate .. //depot/projects/str91xx/src/contrib/ee/ee.c#2 integrate .. //depot/projects/str91xx/src/contrib/ee/ee.msg#2 integrate .. //depot/projects/str91xx/src/contrib/ee/ee_version.h#1 branch .. //depot/projects/str91xx/src/contrib/ee/new_curse.c#2 integrate .. //depot/projects/str91xx/src/contrib/netcat/nc.1#2 integrate .. //depot/projects/str91xx/src/contrib/netcat/netcat.c#2 integrate .. //depot/projects/str91xx/src/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/str91xx/src/etc/periodic/daily/460.status-mail-rejects#2 integrate .. //depot/projects/str91xx/src/include/Makefile#2 integrate .. //depot/projects/str91xx/src/lib/libc/gen/popen.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/include/nss_tls.h#2 integrate .. //depot/projects/str91xx/src/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/str91xx/src/lib/libc/posix1e/acl_entry.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/rpc/svc_dg.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/rpc/svc_generic.c#2 integrate .. //depot/projects/str91xx/src/lib/libc/sys/jail.2#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb.3#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20.c#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20.h#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20_int.h#2 integrate .. //depot/projects/str91xx/src/lib/libusb/libusb20_ugen20.c#2 integrate .. //depot/projects/str91xx/src/lib/libusbhid/descr.c#2 integrate .. //depot/projects/str91xx/src/libexec/rtld-elf/rtld.h#2 integrate .. //depot/projects/str91xx/src/sbin/dump/optr.c#2 integrate .. //depot/projects/str91xx/src/sbin/mount/mount.c#2 integrate .. //depot/projects/str91xx/src/sbin/mount_nfs/Makefile#2 integrate .. //depot/projects/str91xx/src/sbin/mount_nfs/mount_nfs.8#2 integrate .. //depot/projects/str91xx/src/sbin/mount_nfs/mount_nfs.c#2 integrate .. //depot/projects/str91xx/src/share/man/man3/Makefile#2 integrate .. //depot/projects/str91xx/src/share/man/man3/queue.3#2 integrate .. //depot/projects/str91xx/src/share/man/man4/Makefile#2 integrate .. //depot/projects/str91xx/src/share/man/man4/mld.4#1 branch .. //depot/projects/str91xx/src/share/man/man4/multicast.4#2 integrate .. //depot/projects/str91xx/src/share/man/man9/Makefile#2 integrate .. //depot/projects/str91xx/src/share/man/man9/fail.9#1 branch .. //depot/projects/str91xx/src/share/man/man9/rmlock.9#2 integrate .. //depot/projects/str91xx/src/share/man/man9/sx.9#2 integrate .. //depot/projects/str91xx/src/sys/arm/arm/busdma_machdep.c#2 edit .. //depot/projects/str91xx/src/sys/arm/arm/cpufunc_asm_fa526.S#2 edit .. //depot/projects/str91xx/src/sys/arm/arm/pmap.c#2 edit .. //depot/projects/str91xx/src/sys/arm/arm/vm_machdep.c#2 edit .. //depot/projects/str91xx/src/sys/arm/at91/ohci_atmelarm.c#2 delete .. //depot/projects/str91xx/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/str91xx/src/sys/arm/conf/CNS11XXNAS#2 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.c#2 edit .. //depot/projects/str91xx/src/sys/arm/econa/if_ece.h#2 edit .. //depot/projects/str91xx/src/sys/arm/econa/timer.c#2 edit .. //depot/projects/str91xx/src/sys/arm/include/pmap.h#2 edit .. //depot/projects/str91xx/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/str91xx/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/str91xx/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/str91xx/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/str91xx/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/str91xx/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/str91xx/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/str91xx/src/sys/conf/NOTES#2 integrate .. //depot/projects/str91xx/src/sys/conf/files#2 integrate .. //depot/projects/str91xx/src/sys/conf/files.i386#2 integrate .. //depot/projects/str91xx/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/str91xx/src/sys/conf/options#2 integrate .. //depot/projects/str91xx/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/str91xx/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/ksyms/ksyms.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/si/si.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/str91xx/src/sys/dev/usb/bluetooth/ng_ubt.c#2 delete .. //depot/projects/str91xx/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/str91xx/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 delete .. //depot/projects/str91xx/src/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ehci_ebus.c#2 edit .. //depot/projects/str91xx/src/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_busdma.c#3 edit .. //depot/projects/str91xx/src/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/str91xx/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/str91xx/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/nfs/nfsport.h#2 integrate .. //depot/projects/str91xx/src/sys/fs/nfsclient/nfs_clbio.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/nfsclient/nfs_clnode.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/str91xx/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/str91xx/src/sys/i386/xen/clock.c#2 integrate .. //depot/projects/str91xx/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/str91xx/src/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/str91xx/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/str91xx/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/init_main.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_fail.c#1 branch .. //depot/projects/str91xx/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_osd.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/tty.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/str91xx/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/str91xx/src/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ehci_pci.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ohci_pci.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uhci_pci.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/str91xx/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/str91xx/src/sys/modules/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/str91xx/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/str91xx/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/str91xx/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/str91xx/src/sys/net/pfil.h#2 integrate .. //depot/projects/str91xx/src/sys/net/rtsock.c#2 integrate .. //depot/projects/str91xx/src/sys/netgraph/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/str91xx/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/str91xx/src/sys/netinet6/mld6.c#2 integrate .. //depot/projects/str91xx/src/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/str91xx/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/str91xx/src/sys/rpc/xdr.h#2 integrate .. //depot/projects/str91xx/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/str91xx/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/str91xx/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/str91xx/src/sys/sys/cpuset.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/fail.h#1 branch .. //depot/projects/str91xx/src/sys/sys/jail.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/mount.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/namei.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/param.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/queue.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/sx.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/systm.h#2 integrate .. //depot/projects/str91xx/src/sys/sys/tty.h#2 integrate .. //depot/projects/str91xx/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/str91xx/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/str91xx/src/sys/vm/vm_page.c#2 edit .. //depot/projects/str91xx/src/sys/vm/vm_page.h#2 edit .. //depot/projects/str91xx/src/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/str91xx/src/sys/xdr/xdr_mem.c#2 integrate .. //depot/projects/str91xx/src/sys/xen/xenbus/xenbus_xs.c#2 integrate .. //depot/projects/str91xx/src/tools/regression/file/flock/Makefile#2 integrate .. //depot/projects/str91xx/src/tools/regression/file/flock/flock.c#2 integrate .. //depot/projects/str91xx/src/tools/regression/vfs/trailing_slash.t#2 integrate .. //depot/projects/str91xx/src/usr.bin/ee/Makefile#2 integrate .. //depot/projects/str91xx/src/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg#2 integrate .. //depot/projects/str91xx/src/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg#2 integrate .. //depot/projects/str91xx/src/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg#2 integrate .. //depot/projects/str91xx/src/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg#2 integrate .. //depot/projects/str91xx/src/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg#2 integrate .. //depot/projects/str91xx/src/usr.bin/kdump/mkioctls#2 integrate .. //depot/projects/str91xx/src/usr.bin/killall/killall.1#2 integrate .. //depot/projects/str91xx/src/usr.bin/killall/killall.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/perror/perror.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/truss/amd64-fbsd.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/truss/amd64-fbsd32.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/truss/amd64-linux32.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/truss/i386-fbsd.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/truss/i386-linux.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/truss/ia64-fbsd.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/truss/mips-fbsd.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/truss/powerpc-fbsd.c#2 integrate .. //depot/projects/str91xx/src/usr.bin/truss/sparc64-fbsd.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/ifmcstat/ifmcstat.8#2 integrate .. //depot/projects/str91xx/src/usr.sbin/ifmcstat/ifmcstat.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/jail/jail.8#2 integrate .. //depot/projects/str91xx/src/usr.sbin/jail/jail.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/jexec/Makefile#2 integrate .. //depot/projects/str91xx/src/usr.sbin/jexec/jexec.8#2 integrate .. //depot/projects/str91xx/src/usr.sbin/jexec/jexec.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/jls/Makefile#2 integrate .. //depot/projects/str91xx/src/usr.sbin/jls/jls.8#2 integrate .. //depot/projects/str91xx/src/usr.sbin/jls/jls.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/mountd/exports.5#2 integrate .. //depot/projects/str91xx/src/usr.sbin/mountd/mountd.8#2 integrate .. //depot/projects/str91xx/src/usr.sbin/mountd/mountd.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/nfsd/nfsd.8#2 integrate .. //depot/projects/str91xx/src/usr.sbin/nfsd/nfsd.c#2 integrate .. //depot/projects/str91xx/src/usr.sbin/usbconfig/usbconfig.8#2 integrate .. //depot/projects/str91xx/www/en/developers.sgml#2 integrate .. //depot/projects/str91xx/www/hu/share/sgml/news.xml#2 integrate .. //depot/projects/str91xx/www/share/sgml/news.xml#2 integrate Differences ... ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + 702102 + May 28, 2009 + 7.2-STABLE after MFC of the + fdopendir function. + + + 800000 October 11, 2007 8.0-CURRENT. Separating wide and single byte @@ -13113,6 +13120,40 @@ 8.0-CURRENT after adding UDP control block support. + + 800090 + May 23, 2009 + 8.0-CURRENT after virtualizing interface + cloning. + + + 800091 + May 27, 2009 + 8.0-CURRENT after adding hierarchical jails + and removing global securelevel. + + + + 800092 + May 29, 2009 + 8.0-CURRENT after chaning + sx_init_flags() KPI. The + SX_ADAPTIVESPIN is retired and + a new SX_NOADAPTIVE flag is + introduced in order to handle the reversed logic. + + + + 800093 + May 30, 2009 + 8.0-CURRENT after changing the polling KPI. + The polling handlers now return the number of packets + processed. A new + IFCAP_POLLING_NOCOUNT is also + introduced to specify that the return value is + not significant and the counting should be + skipped. + ==== //depot/projects/str91xx/doc/en_US.ISO8859-1/share/sgml/authors.ent#2 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.480 2009/05/27 12:53:08 kmoore Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.483 2009/05/29 16:10:25 bcr Exp $ --> aaron@FreeBSD.org"> @@ -96,6 +96,8 @@ avg@FreeBSD.org"> +avl@FreeBSD.org"> + awebster@pubnix.net"> az@FreeBSD.org"> @@ -108,6 +110,8 @@ bbraun@FreeBSD.org"> +bcr@FreeBSD.org"> + bde@FreeBSD.org"> bean@FreeBSD.org"> @@ -1176,5 +1180,7 @@ zec@FreeBSD.org"> +zml@FreeBSD.org"> + znerd@FreeBSD.org"> ==== //depot/projects/str91xx/doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD Japanese Documentation Project - Original revision: 1.448 - $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.70 2009/04/11 15:43:29 hrs Exp $ + Original revision: 1.464 + $FreeBSD: doc/ja_JP.eucJP/books/handbook/mirrors/chapter.sgml,v 1.72 2009/05/30 03:19:12 hrs Exp $ --> @@ -44,22 +44,9 @@
    - BSD Mall (Daemon News ±¿±Ä) - PO Box 161 - Nauvoo, IL 62354 - USA - ÅÅÏÃ: +1 866 273-6255 - Fax: +1 217 453-9956 - Email: sales@bsdmall.com - WWW: -
    -     - - -
    FreeBSD Mall, Inc. - 3623 Sanford Street - Concord, CA 94520-1405 + 700 Harvest Park Ste F + Brentwood, CA 94513 USA ÅÅÏÃ: +1 925 240-6652 Fax: +1 925 674-0821 @@ -139,6 +126,17 @@
    + LinuxCenter.Kz + Ust-Kamenogorsk + Kazakhstan + ÅÅÏÃ: +7-705-501-6001 + Email: info@linuxcenter.kz + WWW: +
    +     + + +
    LinuxCenter.Ru Galernaya Street, 55 Saint-Petersburg @@ -262,19 +260,40 @@ &chap.mirrors.ftp.inc; + + BitTorrent + + + BitTorrent + + + BitTorrent ¤ò»È¤Ã¤Æ¡¢¥ê¥ê¡¼¥¹ CD ¤Î ISO ¥¤¥á¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤¹¡£ + ISO ¥¤¥á¡¼¥¸¤ò¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤¿¤á¤Î torrent ¥Õ¥¡¥¤¥ë¤Ï http://torrents.freebsd.org:8080 + ¤Ë¤ÆÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ + + BitTorrent ¥¯¥é¥¤¥¢¥ó¥È¥½¥Õ¥È¤Ï¡¢ + net-p2p/py-bittorrent port + ¤Þ¤¿¤Ï¥³¥ó¥Ñ¥¤¥ëºÑ¤ß¤Î package ¤È¤·¤ÆÆþ¼ê¤Ç¤­¤Þ¤¹¡£ + + BitTorrent ¤òÍѤ¤¤Æ¥À¥¦¥ó¥í¡¼¥É¤·¤¿ ISO ¥¤¥á¡¼¥¸¤ò¡¢ + ¤ÇÀâÌÀ¤µ¤ì¤Æ¤¤¤ë burncd ¤ò»È¤Ã¤Æ + CD ¤ä DVD ¥á¥Ç¥£¥¢¤Ë½ñ¤­¹þ¤á¤Þ¤¹¡£ + + Anonymous CVS - - CVS - anonymous - - Ìõ: &a.jp.sugimura;¡¢1998 ǯ 7 ·î 19 Æü <anchor id="anoncvs-intro">ƳÆþ + + CVS + anonymous + + Anonymous CVS (¤â¤·¤¯¤Ï¡¢anoncvs ¤È¤·¤ÆÃΤé¤ì¤Æ¤¤¤Þ¤¹) ¤ÏÎ¥¤ì¤¿¤È¤³¤í¤Ë¤¢¤ë CVS ¥ê¥Ý¥¸¥È¥ê¤ÈƱ´ü¤ò¼è¤ë¤¿¤á¤Ë FreeBSD ¤ËÉÕ°¤·¤Æ¤¤¤ë CVS @@ -468,6 +487,7 @@ &prompt.user; setenv CVSROOT :pserver:anoncvs@anoncvs.tw.FreeBSD.org:/home/ncvs &prompt.user; cvs login ¥×¥í¥ó¥×¥È¤¬É½¼¨¤µ¤ì¤¿¤é¡¢password ¤ËǤ°Õ¤Îñ¸ì¤òÆþÎϤ·¤Þ¤¹¡£ +&prompt.user; cvs co modules &prompt.user; more modules/modules @@ -2395,188 +2415,6 @@ - - Portsnap ¤ò»È¤¦ - - - ¤Ï¤¸¤á¤Ë - - Portsnap ¤Ï &os; port - ¥Ä¥ê¡¼¤ò°ÂÁ´¤ËÇÛÉÛ¤¹¤ë¥·¥¹¥Æ¥à¤Ç¤¹¡£ - Ìó°ì»þ´ÖËè¤Ë port ¥Ä¥ê¡¼¤Î ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È ¤¬ºîÀ®¤µ¤ì¡¢ - °µ½Ì¤µ¤ì¡¢ÅŻҽð̾¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - ºîÀ®¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¤Ï HTTP ·Ðͳ¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£ - - CVSup ƱÍÍ¡¢ - Portsnap ¤Ï¡¢¹¹¿·¤Ë - pull ¥â¥Ç¥ë¤òºÎÍѤ·¤Æ¤¤¤Þ¤¹¡£ - °µ½Ì¤µ¤ì¡¢ÅŻҽð̾¤µ¤ì¤¿ ports ¥Ä¥ê¡¼¤Ï web ¥µ¡¼¥Ð¤ËÃÖ¤«¤ì¡¢ - ¥µ¡¼¥Ð¤Ï¥¯¥é¥¤¥¢¥ó¥È¤«¤é¤Î¹¹¿·¤ÎÍ×µá¤ò¼õ¤±¿È¤Î¾õÂÖ¤ÇÂÔ¤Á¤Þ¤¹¡£ - ¥æ¡¼¥¶¤Ï¡¢&man.portsnap.8; - ¤ò¼êÆ°¤Ç¼Â¹Ô¤·¤Æ¹¹¿·¤ò¤ª¤³¤Ê¤¦¤«¡¢&man.cron.8; - ¥¸¥ç¥Ö¤òÀßÄꤷ¤ÆÄê´üŪ¤Ë¼«Æ°¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ - - µ»½ÑŪ¤ÊÍýͳ¤«¤é¡¢Portsnap ¤Ï - live port ¥Ä¥ê¡¼ (/usr/ports/) - ¤òľÀܹ¹¿·¤·¤Þ¤»¤ó¡£ - ¤½¤Î¤«¤ï¤ê°µ½Ì¤µ¤ì¤¿ port ¥Ä¥ê¡¼¤Î¥³¥Ô¡¼¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤Ç - /var/db/portsnap/ ¤ËÊݸ¤µ¤ì¤Þ¤¹¡£ - ¤³¤Î°µ½Ì¤µ¤ì¤¿¥³¥Ô¡¼¤Ï live port ¥Ä¥ê¡¼¤Î¹¹¿·¤Ë»È¤ï¤ì¤Þ¤¹¡£ - - - Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ - Portsnap ¤Ç¤Ï¡¢ - °µ½Ì¤µ¤ì¤¿¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Ï /var/db/portsnap/ - ¤Ç¤Ï¤Ê¤¯ /usr/local/portsnap/ ¤ËÊݸ¤µ¤ì¤Þ¤¹¡£ - - - - - ¥¤¥ó¥¹¥È¡¼¥ë - - &os; 6.0 °Ê¹ß¤Ç¤Ï¡¢ - Portsnap ¤Ï¡¢&os; ¤Î¥Ù¡¼¥¹¥·¥¹¥Æ¥à¤Ë¤¢¤ê¤Þ¤¹¡£ - ¸Å¤¤¥·¥¹¥Æ¥à¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï¡¢ - ports-mgmt/portsnap - package ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ - - - - Portsnap ¤ÎÀßÄê - - Portsnap ¤ÎÆ°ºî¤Ï¡¢ - /etc/portsnap.conf ¤ÇÀßÄê¤Ç¤­¤Þ¤¹¡£ - ¤Û¤È¤ó¤É¤Î¥æ¡¼¥¶¤Ë¤È¤Ã¤Æ¤Ï¡¢¥Ç¥Õ¥©¥ë¥È¤ÎÀßÄê¤Ç½½Ê¬¤Ç¤·¤ç¤¦¡£ - ¾ÜºÙ¤Ï &man.portsnap.conf.5; ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£ - - - Ports Collection ¤«¤é¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ - Portsnap ¤Ç¤Ï¡¢ÀßÄê¥Õ¥¡¥¤¥ë¤Ï - /etc/portsnap.conf ¤Ç¤Ï¤Ê¤¯¡¢ - /usr/local/etc/portsnap.conf ¤È¤Ê¤ê¤Þ¤¹¡£ - ¤³¤ÎÀßÄê¥Õ¥¡¥¤¥ë¤Ï¡¢port ¤Î¥¤¥ó¥¹¥È¡¼¥ë»þ¤Ë¤ÏºîÀ®¤µ¤ì¤Þ¤»¤ó¡£ - ÀßÄê¥Õ¥¡¥¤¥ë¤Î¥µ¥ó¥×¥ë¤¬ÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤Î¤Ç¡¢ - °Ê²¼¤Î¥³¥Þ¥ó¥É¤Ç¥³¥Ô¡¼¤·¤Æ¤¯¤À¤µ¤¤¡£ - - &prompt.root; cd /usr/local/etc && cp portsnap.conf.sample portsnap.conf - - - - - ½é¤á¤Æ <application>Portsnap</application> ¤ò»È¤¦ - - ½é¤á¤Æ &man.portsnap.8; ¤ò»È¤¦»þ¤Ï¡¢ - ¤Þ¤º¡¢°µ½Ì¤µ¤ì¤¿Á´ ports ¥Ä¥ê¡¼¤Î¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È - (2006 ǯ¤Î½é¤á¤Î»þÅÀ¤ÇÌó 41 MB) ¤ò - /var/db/portsnap/ - (Ports Collection ¤«¤é Portsnap - ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¾ì¹ç¤Ï¡¢/usr/local/portsnap/) - ¤Ë¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¤¯¤À¤µ¤¤¡£ - - &prompt.root; portsnap fetch - - °µ½Ì¤µ¤ì¤¿¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤¿¤é¡¢ - ports ¥Ä¥ê¡¼¤Î¥³¥Ô¡¼¤ò /usr/ports/ ¤ËŸ³«¤·¤Þ¤¹¡£ - ¤â¤·¡¢¤¹¤Ç¤Ë¾¤ÎÊýË¡ (Î㤨¤Ð¡¢CVSup ¤Ê¤É) - ¤Ë¤è¤Ã¤Æ ports ¥Ä¥ê¡¼¤¬¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËºîÀ®¤µ¤ì¤Æ¤¤¤¿¤È¤·¤Æ¤â¡¢ - ¤³¤Îºî¶È¤ò¹Ô¤Ê¤Ã¤Æ¤¯¤À¤µ¤¤¡£ - portsnap ¤¬ ports - ¥Ä¥ê¡¼¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ëºÝ¤Ë¡¢ - ¤É¤ÎÉôʬ¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤Ù¤­¤«¤òȽÃǤǤ­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Ç¤¹¡£ - - &prompt.root; portsnap extract - - - ¥Ç¥Õ¥©¥ë¥È¤Î¥¤¥ó¥¹¥È¡¼¥ë¾õÂ֤Ǥϡ¢ - /usr/ports - ¤ÏºîÀ®¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£ - &os; 6.0-RELEASE ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢ - portsnap ¤ò¼Â¹Ô¤¹¤ëÁ°¤ËºîÀ®¤·¤Æ¤ª¤¤¤Æ¤¯¤À¤µ¤¤¡£ - ºÇ¶á¤Î &os; ¤ä Portsnap - ¤ò»È¤Ã¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢ - ½é¤á¤Æ portsnap - ¥³¥Þ¥ó¥É¤ò»È¤Ã¤¿»þ¤Ë¼«Æ°Åª¤ËºîÀ®¤µ¤ì¤ë¤Ç¤·¤ç¤¦¡£ - - - - - ports ¥Ä¥ê¡¼¤Î¥¢¥Ã¥×¥Ç¡¼¥È - - °µ½Ì¤µ¤ì¤¿ ports ¥Ä¥ê¡¼¤Î¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò¥À¥¦¥ó¥í¡¼¥É¤·¡¢ - /usr/ports/ ¤ËŸ³«¤·¤¿¸å¤Ï¡¢ - Æó¤Ä¤Îºî¶È¤Ç ports ¥Ä¥ê¡¼¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£ - ¤Þ¤º¡¢ºÇ¿·¤Î°µ½Ì¤µ¤ì¤¿¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò - ¥À¥¦¥ó¥í¡¼¥É ¤·¤Þ¤¹¡£ - ¤½¤Î¸å¡¢¥À¥¦¥ó¥í¡¼¥É¤·¤¿¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤òÍѤ¤¤Æ - ports ¥Ä¥ê¡¼¤ò ¥¢¥Ã¥×¥Ç¡¼¥È ¤·¤Þ¤¹¡£ - ¤³¤ÎÆó¤Ä¤Îºî¶È¤Ï¡¢portsnap - ¤Î°ì¤Ä¤Î¥³¥Þ¥ó¥É¤Ç¼Â¹Ô¤Ç¤­¤Þ¤¹¡£ - - &prompt.root; portsnap fetch update - - - ¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î portsnap - ¤Ç¤Ï¤³¤Î¹½Ê¸¤Ï»È¤¨¤Þ¤»¤ó¡£ - ¼ºÇÔ¤·¤¿¾ì¹ç¤Ï¡¢°Ê²¼¤ò»î¤·¤Æ¤¯¤À¤µ¤¤¡£ - - &prompt.root; portsnap fetch -&prompt.root; portsnap update - - - - - cron ¤Ç Portsnap ¤òÆ°¤«¤¹ - - Portsnap ¥µ¡¼¥Ð¤Ë¥¢¥¯¥»¥¹¤¬½¸Ã椹¤ë - flash crowds ¤òÈò¤±¤ë¤¿¤á¡¢ - &man.cron.8; ¥¸¥ç¥Ö¤Ç portsnap fetch - ¤ÏÆ°¤«¤Ê¤¤¤Ç¤·¤ç¤¦¡£ - ¤½¤ÎÂå¤ï¤ê¡¢portsnap cron - ¤È¤¤¤¦ÆÃÊ̤ʥ³¥Þ¥ó¥É¤¬¤¢¤ê¤Þ¤¹¡£ - ¤³¤Î¥³¥Þ¥ó¥É¤Ï¡¢3600 Éäδ֤Υé¥ó¥À¥à¤Ê»þ´Ö¤Î¸å¤Ë - ¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤Î¥À¥¦¥ó¥í¡¼¥É¤ò³«»Ï¤·¤Þ¤¹¡£ - - ¤Þ¤¿¡¢cron ¥¸¥ç¥Ö¤Ç - portsnap update ¤ò¼Â¹Ô¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£ - port ¤Î¹½Ãۤ⤷¤¯¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤ÈƱ»þ¤Ë¼Â¹Ô¤·¤Æ¤·¤Þ¤¦¤È¡¢ - ½ÅÂç¤ÊÌäÂê¤ò°ú¤­µ¯¤³¤¹¸¶°ø¤È¤Ê¤ë¤«¤é¤Ç¤¹¡£ - ¤·¤«¤·¡¢ ¥Õ¥é¥°¤ò¤Ä¤±¤Æ - portsnap ¤ò¼Â¹Ô¤¹¤ë¤³¤È¤Ç¡¢ - ports ¤Î INDEX - ¥Õ¥¡¥¤¥ë¤ò°ÂÁ´¤Ë¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤­¤Þ¤¹¡£ - (cron ¥¸¥ç¥Ö¤Ç - portsnap -I update ¤ò¼Â¹Ô¤·¤¿¾ì¹ç¤Ï¡¢ - ¤¢¤È¤Ç¥Ä¥ê¡¼¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤¹¤ë¤¿¤á¤Ë¡¢ - portsnap update ¤ò - ¥Õ¥é¥°¤ò³°¤·¤Æ¼Â¹Ô¤¹¤ëɬÍפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡£) - - °Ê²¼¤Î¹Ô¤ò /etc/crontab ¤Ë²Ã¤¨¤ë¤È¡¢ - portsnap ¤Ï°µ½Ì¤µ¤ì¤¿¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ä - /usr/ports/ ¤Î INDEX - ¥Õ¥¡¥¤¥ë¤ò¥¢¥Ã¥×¥Ç¡¼¥È¤·¤Þ¤¹¡£ - ¤â¤·¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿ ports ¤ÎÃæ¤Ç¸Å¤¯¤Ê¤Ã¤¿¤â¤Î¤¬¤¢¤ì¤Ð¡¢ - ¥á¡¼¥ë¤ÇÃΤ餻¤Æ¤¯¤ì¤Þ¤¹¡£ - - 0 3 * * * root portsnap -I cron update && pkg_version -vIL= - - - ¥·¥¹¥Æ¥à¤Î»þ¹ï¤¬¥í¡¼¥«¥ë»þ´Ö¤ËÀßÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¢ - Portsnap ¥µ¡¼¥Ð¤Ø¤ÎÉé²Ù¤òʬ»¶¤µ¤»¤ë¤¿¤á¡¢ - ¾å¤Î¹Ô¤Î 3 ¤ò - 0 ¤«¤é 23 ¤Î´Ö¤Î¥é¥ó¥À¥à¤ÊÃͤËÃÖ¤­¤«¤¨¤Æ¤¯¤À¤µ¤¤¡£ - - - ¸Å¤¤ÈǤΠportsnap ¤Ç¤Ï¡¢ - (cron update ¤Î¤è¤¦¤Ë) - Æó¤Ä¤Î¥³¥Þ¥ó¥É¤òʤ٤ƻȤ¦¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó¡£ - Äɲä·¤¿¹Ô¤¬¤¦¤Þ¤¯¤¤¤«¤Ê¤±¤ì¤Ð¡¢ - portsnap -I cron update ¤ò - portsnap cron && portsnap -I update - ¤ËÃÖ¤­¤«¤¨¤Æ¤¯¤À¤µ¤¤¡£ - - - - CVS ¥¿¥° @@ -2631,6 +2469,24 @@ + RELENG_7_2 + + + FreeBSD-7.2 ÍѤΥê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¡£¥»¥­¥å¥ê¥Æ¥£´«¹ð¤ä + ¤½¤Î¾¤Î¿¼¹ï¤Ê¥»¥­¥å¥ê¥Æ¥£¾å¤Î½¤Àµ¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¤Î¤ß»È¤ï¤ì¤Þ¤¹¡£ + + + + + RELENG_7_1 + + + FreeBSD-7.1 ÍѤΥê¥ê¡¼¥¹¥Ö¥é¥ó¥Á¡£¥»¥­¥å¥ê¥Æ¥£´«¹ð¤ä + ¤½¤Î¾¤Î¿¼¹ï¤Ê¥»¥­¥å¥ê¥Æ¥£¾å¤Î½¤Àµ¤¬¤¢¤Ã¤¿¾ì¹ç¤Ë¤Î¤ß»È¤ï¤ì¤Þ¤¹¡£ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 1 04:32:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F383D1065677; Mon, 1 Jun 2009 04:32: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 925071065672 for ; Mon, 1 Jun 2009 04:32:32 +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 800CA8FC17 for ; Mon, 1 Jun 2009 04:32:32 +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 n514WWX4098874 for ; Mon, 1 Jun 2009 04:32:32 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n514WWQB098872 for perforce@freebsd.org; Mon, 1 Jun 2009 04:32:32 GMT (envelope-from dforsyth@FreeBSD.org) Date: Mon, 1 Jun 2009 04:32:32 GMT Message-Id: <200906010432.n514WWQB098872@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 163227 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 04:32:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=163227 Change 163227 by dforsyth@squirrel on 2009/06/01 04:31:32 Started to add things to read files. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.c#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#3 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#3 (text+ko) ==== @@ -32,16 +32,6 @@ return (p); } -struct pkg * -pkg_set_path(struct pkg *p, const char *path) -{ - if (p == NULL || path == NULL) - return (p); - - p->path = strdup(path); - return (p); -} - /* Set the short comment for this package */ struct pkg * pkg_set_comment(struct pkg *p, const char *comment) @@ -65,6 +55,13 @@ return (p); } +struct pkg * +pkg_set_pkg_info(struct pkg *p, struct pkg_info *pi) +{ + return (p); +} + + char * pkg_ident(struct pkg *p) { @@ -83,7 +80,6 @@ return (p->comment); } - /* TODO: Make an explicit note in the manual for libpkg that pkg_free * should NOT be called called on pkgs that are not explicitly created by * the user. */ ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#3 (text+ko) ==== @@ -33,12 +33,16 @@ struct pkg *pkgdb_pkg_list_first(struct pkgdb *db); void pkgdb_pkg_list_append(struct pkgdb *db, struct pkg *p); +char *pkgdb_read_file_to_text(struct pkgdb *db, struct pkg *p, + const char *filename); + void pkgdb_free_hierdb(struct pkgdb *db); void pkgdb_free_pkg_list(struct pkgdb *db); /* pkg_info */ + struct pkg_info; -struct pkg *pkg_info_read_comment_file(struct pkg *p, const char *filename); +struct pkg_info *pkg_info_digest_info_from_text(const char *text); #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.c#3 (text+ko) ==== @@ -28,8 +28,13 @@ struct pkg_file *files; }; -char * -pkg_info_read_file_to_string(const char *path, const char *filename) +struct pkg_info * +pkg_info_digest_info_from_text(const char *text) { + struct pkg_info *pi; + + /* This function will parse text and create a pkg_info */ + if (text == NULL) + return (NULL); return (NULL); } ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#3 (text+ko) ==== @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -109,25 +110,28 @@ { int s; char *path; + char *text; struct stat sb; struct pkg *p; p = pkg_new(ident); path = pkgdb_pkg_path(db, p); - pkg_set_path(p, path); if (p == NULL || path == NULL) { pkg_free(p); free(path); + return (NULL); } - + s = lstat(path, &sb); if (s < 0 || S_ISLNK(sb.st_mode) || !S_ISDIR(sb.st_mode)) { pkg_free(p); - free(path); return (NULL); } + + text = pkgdb_read_read_pkg_file_to_text(db, p, COMMENT_FILE); + pkg_set_comment(p, text); - free(path); + free(text); return (p); } @@ -188,6 +192,46 @@ return (p); } +char * +pkgdb_read_file_to_text(struct pkgdb *db, struct pkg *p, + const char *filename) +{ + int s; + int fd; + char *dir; + char *path; + char *text; + struct stat sb; + + if (p == NULL || filename == NULL) + return (NULL); + + /* +2 because dir will not have a trailing '/' */ + dir = pkgdb_pkg_path(db, p); + path = malloc(strlen(dir) + strlen(filename) + 2); + if (path == NULL) + return (NULL); + strcpy(path, dir); + strcat(path, '/'); + strcat(path, filename); + + s = stat(path, &sb); + if (s < 0 || !S_ISREG(st.st_mode)) { + free(path); + return (NULL); + } + + fd = open(path, O_READONLY); + if (fd < 0) { + free(path); + return (NULL); + } + + + + return (text); +} + /* Giving myself a level of abstraction between queue and pkgdb incase I * decide to change how the package list is done. */ ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#3 (text+ko) ==== @@ -8,7 +8,6 @@ TAILQ_ENTRY(pkg) next; char *ident; /* User given name for this pkg. */ - char *path; char *comment; /* Mmmmm, should be 70 or less, right? */ struct pkg_contents *contents; From owner-p4-projects@FreeBSD.ORG Mon Jun 1 09:43:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1ABFC1065673; Mon, 1 Jun 2009 09:43:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF27F106566C for ; Mon, 1 Jun 2009 09:43:48 +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 BD1F38FC08 for ; Mon, 1 Jun 2009 09:43:48 +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 n519hmRu050023 for ; Mon, 1 Jun 2009 09:43:48 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n519hmZK050021 for perforce@freebsd.org; Mon, 1 Jun 2009 09:43:48 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 1 Jun 2009 09:43:48 GMT Message-Id: <200906010943.n519hmZK050021@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 163238 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 09:43:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=163238 Change 163238 by rene@rene_self on 2009/06/01 09:42:49 Move my pgpkey to the correct location. Submitted by: avl Affected files ... .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#19 edit Differences ... ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#19 (text+ko) ==== @@ -626,6 +626,11 @@ &pgpkey.kuriyama; + + &a.rene; + &pgpkey.rene; + + &a.clement; &pgpkey.clement; @@ -751,11 +756,6 @@ &pgpkey.remko; - - &a.rene; - &pgpkey.rene; - - &a.zml; &pgpkey.zml; From owner-p4-projects@FreeBSD.ORG Mon Jun 1 09:48:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B49011065670; Mon, 1 Jun 2009 09:48: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 63878106566C for ; Mon, 1 Jun 2009 09:48:54 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4EFAF8FC0C for ; Mon, 1 Jun 2009 09:48:54 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n519msQ5050381 for ; Mon, 1 Jun 2009 09:48:54 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n519msWI050379 for perforce@freebsd.org; Mon, 1 Jun 2009 09:48:54 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 1 Jun 2009 09:48:54 GMT Message-Id: <200906010948.n519msWI050379@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163239 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 09:48:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=163239 Change 163239 by anchie@anchie_malimis on 2009/06/01 09:48:10 Initial import of src/sys tree. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_switch.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_wakecode.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/genwakecode.sh#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/genwakedata.sh#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/io.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mca.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/support.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/MAC#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/NOTES#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/ia32/ia32_misc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/_bus.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/_limits.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/_types.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/asm.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/atomic.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/bus.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/clock.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/cpu.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/elf.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/endian.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/exec.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/float.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/fpu.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/frame.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/iodev.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/kdb.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/limits.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/mca.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/md_var.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/memdev.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/metadata.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/minidump.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/mptable.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/mutex.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/nexusvar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/param.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pcb.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pmap.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/proc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/profile.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/psl.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/reloc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/resource.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/runq.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/segments.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/signal.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/smp.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/trap.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/tss.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/varargs.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/clock.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/icu.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/isa.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/isa.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/blockio.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/bus_space_generic.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/copystr.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_arm11.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_armv5.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/disassem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/exception.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/fiq.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/fusu.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/genassym.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/inckern.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/intr.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/locore.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/mem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/minidump_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/nexus.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/pmap.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/setstack.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/support.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/swtch.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/trap.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/undefined.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/vectors.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_cfata.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91board.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/at91var.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/files.at91#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/std.at91#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/std.bwct#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/std.hl200#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/AVILA#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/BWCT#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/CRB#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/DB-78XXX#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/DEFAULTS#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/EP80219#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/GUMSTIX#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/GUMSTIX.hints#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/HL200#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/IQ31244#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/KB920X#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/NSLU#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/NSLU.hints#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/SIMICS#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/_bus.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/_limits.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/_stdint.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/_types.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/armreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/asm.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/asmacros.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/atomic.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/blockio.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/bootinfo.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/bus.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/clock.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/cpu.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/disassem.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/elf.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/endian.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/exec.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/fiq.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/float.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/fp.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/frame.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/ieee.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/intr.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/katelib.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/kdb.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/limits.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/machdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/md_var.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/memdev.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/metadata.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/minidump.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/mutex.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/param.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/pcb.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/pcpu.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/pmap.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/proc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/profile.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/psl.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/pte.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/ptrace.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/reloc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/resource.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/runq.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/setjmp.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/sigframe.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/signal.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/smp.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/stack.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/stdarg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/swi.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/sysarch.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/trap.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/ucontext.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/undefined.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/utrap.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/include/vmparam.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/common.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/files.mv#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/gpio.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/ic.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/obio.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/rtc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/std.mv#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/timer.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/mv/twsi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/crb_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/files.crb#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/files.i81342#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/i81342.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/i81342_pci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/i81342_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/i81342reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/i81342var.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/iq81342reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/iq81342var.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/obio.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/obio_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/obiovar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/std.crb#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/std.i81342#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/files.pxa#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/if_smc_smi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/pxa_gpio.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/pxa_icu.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/pxa_machdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/pxa_obio.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/pxa_smi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/pxa_space.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/pxa_timer.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/pxareg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/pxavar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/std.pxa#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/uart_bus_pxa.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/pxa/uart_cpu_pxa.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/README#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot2/bwct_board.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot2/centipad_board.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/uboot/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/uboot/conf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/uboot/start.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/arm/uboot/version#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/bcache.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/boot.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/commands.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/console.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/dev_net.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/dev_net.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/devopen.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/help.common#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/interp.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/isapnp.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/isapnp.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/load_elf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/loader.8#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/ls.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/misc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/module.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/newvers.sh#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/panic.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/pnp.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/common/ufsread.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/README#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/dict.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/float.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/loader.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/math64.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/math64.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/mips/sysdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/mips/sysdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/search.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/stack.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/tools.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/unix.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/vm.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ficl/words.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/frames.4th#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.4th#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.conf#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/loader.rc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/screen.4th#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/forth/support.4th#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/gptboot/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/gptboot/gptboot.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/gptboot/gptldr.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/loader/version#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/pmbr/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/pmbr/pmbr.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/zfsboot/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/zfsboot/zfsboot.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/i386/zfsboot/zfsldr.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/efi/version#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ia64/ski/version#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/uboot/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/uboot/conf.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/uboot/help.uboot#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/uboot/start.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/powerpc/uboot/version#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/common/Makefile.inc#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/common/main.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/common/metadata.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/api_public.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/console.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/copy.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/devicename.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/disk.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/elf_freebsd.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/glue.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/glue.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/libuboot.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/module.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/net.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/reboot.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/uboot/lib/time.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/zfs/Makefile#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/zfs/zfs.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/boot/zfs/zfsimpl.c#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/bsm/audit.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/bsm/audit_domain.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/bsm/audit_errno.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/bsm/audit_fcntl.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/bsm/audit_internal.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/bsm/audit_record.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/soc2009/anchie_send/src/sys/cam/README.quirks#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 1 10:18:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F3A41065674; Mon, 1 Jun 2009 10:18:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2582F106566C for ; Mon, 1 Jun 2009 10:18:24 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 113418FC1B for ; Mon, 1 Jun 2009 10:18:24 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51AIO3X053638 for ; Mon, 1 Jun 2009 10:18:24 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51AIO2I053636 for perforce@freebsd.org; Mon, 1 Jun 2009 10:18:24 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 1 Jun 2009 10:18:24 GMT Message-Id: <200906011018.n51AIO2I053636@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163241 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 10:18:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=163241 Change 163241 by anchie@anchie_malimis on 2009/06/01 10:18:15 Initial import of DoCoMo's SeND implementation. Affected files ... .. //depot/projects/soc2009/anchie_send/send_0.2/CHANGELOG#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/LICENSE#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/Makefile.config#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/Makefile.install#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/README#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/cgatool/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/cgatool/cgatool.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/docs/UserGuide.pdf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/README#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/cgatool/README#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/cgatool/rfc_example.params#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/README.ipext.sample.pdf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar1/cert.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar1/cert_ipext.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar1/ipext.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar1/ipext_add.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar1/key.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar1/params.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar2/cert.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar2/cert_ipext.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar2/ipext.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar2/ipext_add.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar2/key.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar3/cert.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar3/cert_ipext.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar3/ipext.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar3/ipext_add.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ar3/key.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ca/cert.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ca/cert_ipext.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ca/ipext.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ca/ipext_add.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ca/key.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ar1/cacert.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ar1/index.txt#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ar1/private/cakey.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ar1/serial#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ca/cacert.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ca/careq.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ca/index.txt#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ca/index.txt.attr#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ca/newcerts/8F27AC9DF6B66C45.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ca/newcerts/8F27AC9DF6B66C46.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ca/private/cakey.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.ca/serial#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.lvl1/cacert.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.lvl1/index.txt#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.lvl1/index.txt.attr#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.lvl1/newcerts/00.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.lvl1/newcerts/01.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.lvl1/newcerts/02.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.lvl1/private/cakey.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/demoCA.lvl1/serial#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/gen_ipext#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/ipext_verify.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/lvl1/cert.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/lvl1/cert_ipext.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/lvl1/ipext.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/lvl1/ipext_add.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/lvl1/key.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/newreq.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/ipext/sendd.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/README.no_rdisc.pdf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/README.txt#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/mn1.cga.params#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/mn1.key.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/mn1.params.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/mn2.cga.params#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/mn2.key.pem#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/mn2.params.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/sendd.conf.mn1#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/no_rdisc/sendd.conf.mn2#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/params.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/examples/sendd.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/include/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/include/cga.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/include/cga_keyutils.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/include/libinit.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/include/list.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/include/pkixip_ext.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/include/pkixip_ext_asn.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/include/sbuff.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/include/thrpool.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/ipexttool/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/ipexttool/ipexttool.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/Makefile.ar#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/Makefile.lib.common#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/Makefile.so#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libappconsole/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libappconsole/appconsole.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libappconsole/appconsole.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libappconsole/test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libappconsole/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libcga/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libcga/cga.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libcga/cga_dbg.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libcga/cga_keyutils.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libcga/cga_local.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libcga/cga_mt.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libcga/cmp.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libcga/mpadd.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libcga/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libconfig/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libconfig/config.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libconfig/libconfig.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libconfig/test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libconfig/test.conf#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libconfig/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libhashtbl/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libhashtbl/hashfuncs.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libhashtbl/hashtbl.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libhashtbl/hashtbl.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libhashtbl/test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libhashtbl/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libincksum/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libincksum/in_cksum.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libincksum/in_cksum.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libincksum/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/liblog/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/liblog/README#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/liblog/applog.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/liblog/log.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/liblog/log_example.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/liblog/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/asn1.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/config.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/pkixip_ext.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/pkixip_ext_gram.y#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/pkixip_ext_lex.l#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/pkixip_local.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/util.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/ver.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libpkixipext/x509.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libprioq/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libprioq/prioq.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libprioq/prioq.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libprioq/test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libprioq/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libsenddctl/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libsenddctl/senddctl.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libsenddctl/senddctl.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libsenddctl/senddctl_proto.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/excl_test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/intr_test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/prio_test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/tcli.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/thrpool.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/thrspec_test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/tsrv.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libthrpool/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libtimer/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libtimer/test.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libtimer/timer.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libtimer/timer.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/libs/libtimer/vers#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/addr.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/cert.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/cga.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/config.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/console.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/cpa.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/cps.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/ctl.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/dbg.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/dbg.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/net.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/openssl.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/opt.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/addr.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/netgraph.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/os_defines.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/sendd#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/snd_freebsd.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/snd_freebsd.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/addr.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/find_ip6tables.sh#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/ipq.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/os_defines.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/rand.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/sendd.in#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/snd_fw_functions.sh.in2#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/snd_linux.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/snd_linux.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-linux/snd_upd_fw.in#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-macosx/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-macosx/README#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-macosx/os_defines.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-macosx/pkt.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-macosx/snd_macosx.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-macosx/snd_macosx.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-unsupported/Makefile#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-unsupported/README#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-unsupported/os_defines.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-unsupported/stubs.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os_specific.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/params.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/params_gram.y#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/params_lex.l#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/proto.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/proto_nonce.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/proto_sig.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/proto_timestamp.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/ra.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/sendd.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/sendd_local.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/sig_rfc3971.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/sigmeth.c#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/snd_config.h#1 add .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/snd_proto.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jun 1 10:22:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02AE71065674; Mon, 1 Jun 2009 10:22:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B6F681065670 for ; Mon, 1 Jun 2009 10:22:28 +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 A54438FC13 for ; Mon, 1 Jun 2009 10:22:28 +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 n51AMS2N053958 for ; Mon, 1 Jun 2009 10:22:28 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51AMS8s053956 for perforce@freebsd.org; Mon, 1 Jun 2009 10:22:28 GMT (envelope-from zec@fer.hr) Date: Mon, 1 Jun 2009 10:22:28 GMT Message-Id: <200906011022.n51AMS8s053956@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 163242 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 10:22:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=163242 Change 163242 by zec@zec_amdx4 on 2009/06/01 10:22:27 Fix non-critical misintegration. Affected files ... .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#19 edit Differences ... ==== //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#19 (text+ko) ==== @@ -468,11 +468,11 @@ #endif #if defined(__FreeBSD__) && (__FreeBSD_version >= 500000) IFNET_RLOCK(); -#endif VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); INIT_VNET_NET(vnet_iter); +#endif for (ifp = TAILQ_FIRST(&V_ifnet); ifp; ifp = TAILQ_NEXT(ifp, if_list)) { /* read from if_snd unlocked */ From owner-p4-projects@FreeBSD.ORG Mon Jun 1 10:42:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D90D61065675; Mon, 1 Jun 2009 10:42:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 960111065674 for ; Mon, 1 Jun 2009 10:42:49 +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 83B438FC14 for ; Mon, 1 Jun 2009 10:42:49 +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 n51AgnDc055605 for ; Mon, 1 Jun 2009 10:42:49 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51Agnnw055603 for perforce@freebsd.org; Mon, 1 Jun 2009 10:42:49 GMT (envelope-from zec@fer.hr) Date: Mon, 1 Jun 2009 10:42:49 GMT Message-Id: <200906011042.n51Agnnw055603@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 163244 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 10:42:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=163244 Change 163244 by zec@zec_amdx4 on 2009/06/01 10:42:40 Fix misintegrations and reduce diff against head. Affected files ... .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#35 edit .. //depot/projects/vimage/src/sys/net/if_clone.c#16 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/uipc_socket.c#35 (text+ko) ==== @@ -288,7 +288,6 @@ #ifdef VIMAGE ++vnet->sockcnt; /* Locked with so_global_mtx. */ so->so_vnet = vnet; - vnet->sockcnt++; #endif mtx_unlock(&so_global_mtx); return (so); @@ -361,11 +360,7 @@ if (prp->pr_type != type) return (EPROTOTYPE); -#ifdef VIMAGE so = soalloc(TD_TO_VNET(td)); -#else - so = soalloc(NULL); -#endif if (so == NULL) return (ENOBUFS); @@ -435,12 +430,8 @@ if (over) #endif return (NULL); -#ifdef VIMAGE VNET_ASSERT(head->so_vnet); so = soalloc(head->so_vnet); -#else - so = soalloc(NULL); -#endif if (so == NULL) return (NULL); if ((head->so_options & SO_ACCEPTFILTER) != 0) @@ -2065,7 +2056,7 @@ soshutdown(struct socket *so, int how) { struct protosw *pr = so->so_proto; - int error = 0; + int error; if (!(how == SHUT_RD || how == SHUT_WR || how == SHUT_RDWR)) return (EINVAL); @@ -2078,8 +2069,9 @@ CURVNET_SET(so->so_vnet); error = (*pr->pr_usrreqs->pru_shutdown)(so); CURVNET_RESTORE(); + return (error); } - return (error); + return (0); } void ==== //depot/projects/vimage/src/sys/net/if_clone.c#16 (text+ko) ==== @@ -459,24 +459,6 @@ * Find a free unit if none was given. */ if (wildcard) { -#ifdef VIMAGE - INIT_VNET_NET(curvnet); - char name[IFNAMSIZ]; - struct ifnet *ifp; - int i = 0; - - IFNET_RLOCK(); -again: - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - sprintf(name, "%s%d", ifc->ifc_name, i); - if (strcmp(name, ifp->if_xname) == 0) { - i++; - goto again; - } - } - IFNET_RUNLOCK(); - *unit = i; -#else while ((bytoff < ifc->ifc_bmlen) && (ifc->ifc_units[bytoff] == 0xff)) bytoff++; @@ -487,7 +469,6 @@ while ((ifc->ifc_units[bytoff] & (1 << bitoff)) != 0) bitoff++; *unit = (bytoff << 3) + bitoff; -#endif } if (*unit > ifc->ifc_maxunit) { @@ -495,7 +476,6 @@ goto done; } -#ifndef VIMAGE if (!wildcard) { bytoff = *unit >> 3; bitoff = *unit - (bytoff << 3); @@ -511,7 +491,6 @@ KASSERT((ifc->ifc_units[bytoff] & (1 << bitoff)) == 0, ("%s: bit is already set", __func__)); ifc->ifc_units[bytoff] |= (1 << bitoff); -#endif IF_CLONE_ADDREF_LOCKED(ifc); done: @@ -522,7 +501,6 @@ void ifc_free_unit(struct if_clone *ifc, int unit) { -#ifndef VIMAGE int bytoff, bitoff; @@ -537,7 +515,6 @@ ("%s: bit is already cleared", __func__)); ifc->ifc_units[bytoff] &= ~(1 << bitoff); IF_CLONE_REMREF_LOCKED(ifc); /* releases lock */ -#endif } void From owner-p4-projects@FreeBSD.ORG Mon Jun 1 10:49:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8255106567A; Mon, 1 Jun 2009 10:49:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7713D1065677 for ; Mon, 1 Jun 2009 10:49:57 +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 654708FC16 for ; Mon, 1 Jun 2009 10:49:57 +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 n51AnukD056272 for ; Mon, 1 Jun 2009 10:49:56 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51Anud9056270 for perforce@freebsd.org; Mon, 1 Jun 2009 10:49:56 GMT (envelope-from zec@fer.hr) Date: Mon, 1 Jun 2009 10:49:56 GMT Message-Id: <200906011049.n51Anud9056270@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 163247 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 10:49:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=163247 Change 163247 by zec@zec_amdx4 on 2009/06/01 10:49:53 Allow for vi_destroy() to be called on vimage -d invocation. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#93 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#93 (text+ko) ==== @@ -67,6 +67,7 @@ #ifdef VIMAGE static struct vimage *vimage_by_name(struct vimage *, char *); static struct vimage *vi_alloc(struct vimage *, char *); +static int vi_destroy(struct vimage *); static struct vimage *vimage_get_next(struct vimage *, struct vimage *, int); static void vimage_relative_name(struct vimage *, struct vimage *, char *, int); @@ -216,11 +217,7 @@ case SIOCSPVIMAGE: if (vi_req->vi_req_action == VI_DESTROY) { -#ifdef NOTYET error = vi_destroy(vip_r); -#else - error = EOPNOTSUPP; -#endif break; } @@ -698,9 +695,9 @@ /* XXX locking */ LIST_REMOVE(vprocg, vprocg_le); - VNET_LIST_LOCK(); + VNET_LIST_WLOCK(); LIST_REMOVE(vnet, vnet_le); - VNET_LIST_UNLOCK(); + VNET_LIST_WUNLOCK(); CURVNET_SET_QUIET(vnet); INIT_VNET_NET(vnet); @@ -712,8 +709,10 @@ TAILQ_FOREACH_SAFE(ifp, &V_ifnet, if_link, nifp) { if (ifp->if_home_vnet != ifp->if_vnet) vi_if_move(NULL, ifp, vip); +#ifdef NOTYET else if_clone_destroy(ifp->if_xname); +#endif } /* Detach / free per-module state instances. */ From owner-p4-projects@FreeBSD.ORG Mon Jun 1 11:00:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EBB201065676; Mon, 1 Jun 2009 11:00: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 A8E94106566C for ; Mon, 1 Jun 2009 11:00:07 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 96C998FC14 for ; Mon, 1 Jun 2009 11:00:07 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51B07bs057145 for ; Mon, 1 Jun 2009 11:00:07 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51B074l057143 for perforce@freebsd.org; Mon, 1 Jun 2009 11:00:07 GMT (envelope-from zec@fer.hr) Date: Mon, 1 Jun 2009 11:00:07 GMT Message-Id: <200906011100.n51B074l057143@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 163248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 11:00:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=163248 Change 163248 by zec@zec_amdx4 on 2009/06/01 10:59:26 De-staticize vimage_by_name() as in vimage branch this is needed by various #ifdef IMUNES_HACK things. Also resurrect V_morphing_symlinks which IMUNES needs badly. Fix misintegrations / relicts from old times in if_ethersubr.c Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#94 edit .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#41 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#97 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#94 (text+ko) ==== @@ -65,7 +65,6 @@ static int vnet_mod_destructor(struct vnet_modlink *); #ifdef VIMAGE -static struct vimage *vimage_by_name(struct vimage *, char *); static struct vimage *vi_alloc(struct vimage *, char *); static int vi_destroy(struct vimage *); static struct vimage *vimage_get_next(struct vimage *, struct vimage *, int); @@ -280,7 +279,7 @@ return (0); } -static struct vimage * +struct vimage * vimage_by_name(struct vimage *top, char *name) { struct vimage *vip; ==== //depot/projects/vimage/src/sys/net/if_ethersubr.c#41 (text+ko) ==== @@ -924,25 +924,6 @@ return (etherbuf); } -#ifdef VIMAGE -static void -ether_reassign(struct ifnet *ifp, struct vnet *vnet, char *dname) -{ - u_char eaddr[6]; - - bcopy(IF_LLADDR(ifp), eaddr, 6); - ether_ifdetach(ifp); - ifp->if_bpf = NULL; - if_reassign_common(ifp, vnet, "eth"); - if (dname) - snprintf(ifp->if_xname, IFNAMSIZ, "%s", dname); - - CURVNET_SET_QUIET(vnet); - ether_ifattach(ifp, eaddr); - CURVNET_RESTORE(); -} -#endif - /* * Perform common duties while attaching to interface list */ @@ -952,9 +933,6 @@ int i; struct ifaddr *ifa; struct sockaddr_dl *sdl; -#ifdef VIMAGE - struct vnet *home_vnet_0 = ifp->if_home_vnet; -#endif ifp->if_addrlen = ETHER_ADDR_LEN; ifp->if_hdrlen = ETHER_HDR_LEN; @@ -963,9 +941,6 @@ ifp->if_output = ether_output; ifp->if_input = ether_input; ifp->if_resolvemulti = ether_resolvemulti; -#ifdef VIMAGE - ifp->if_reassign = ether_reassign; -#endif if (ifp->if_baudrate == 0) ifp->if_baudrate = IF_Mbps(10); /* just a default */ ifp->if_broadcastaddr = etherbroadcastaddr; @@ -985,11 +960,7 @@ for (i = 0; i < ifp->if_addrlen; i++) if (lla[i] != 0) break; -#ifdef VIMAGE - if (i != ifp->if_addrlen && home_vnet_0 != ifp->if_home_vnet) -#else if (i != ifp->if_addrlen) -#endif if_printf(ifp, "Ethernet address: %6D\n", lla, ":"); } ==== //depot/projects/vimage/src/sys/sys/vimage.h#97 (text+ko) ==== @@ -159,6 +159,7 @@ int vi_td_ioctl(u_long, struct vi_req *, struct thread *); int vi_if_move(struct vi_req *, struct ifnet *, struct vimage *); int vi_child_of(struct vimage *, struct vimage *); +struct vimage *vimage_by_name(struct vimage *, 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 *); @@ -217,6 +218,7 @@ LIST_ENTRY(vprocg) vprocg_le; u_int vprocg_id; /* ID num */ u_int nprocs; + int _morphing_symlinks; }; #ifdef VIMAGE @@ -352,6 +354,8 @@ /* XXX those defines bellow should probably go into vprocg.h and vcpu.h */ #define VPROCG(sym) VSYM(vprocg, sym) +#define V_morphing_symlinks VPROCG(morphing_symlinks) + /* * Size-guards for the vimage structures. * If you need to update the values you MUST increment __FreeBSD_version. From owner-p4-projects@FreeBSD.ORG Mon Jun 1 11:05:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 529761065675; Mon, 1 Jun 2009 11:05: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 13A2F1065673 for ; Mon, 1 Jun 2009 11:05:13 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DB0738FC1C for ; Mon, 1 Jun 2009 11:05:12 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51B5C9F058493 for ; Mon, 1 Jun 2009 11:05:12 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51B5COA058491 for perforce@freebsd.org; Mon, 1 Jun 2009 11:05:12 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 1 Jun 2009 11:05:12 GMT Message-Id: <200906011105.n51B5COA058491@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 11:05:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=163249 Change 163249 by anchie@anchie_malimis on 2009/06/01 11:04:48 Patched, ready for compiling. Affected files ... .. //depot/projects/soc2009/anchie_send/send_0.2/Makefile.config#2 edit .. //depot/projects/soc2009/anchie_send/send_0.2/include/pkixip_ext_asn.h#2 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/Makefile#2 edit .. //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/sendd#2 edit Differences ... ==== //depot/projects/soc2009/anchie_send/send_0.2/Makefile.config#2 (text+ko) ==== @@ -4,8 +4,8 @@ # # Uncomment the line for your OS -OS=linux -#OS=freebsd +#OS=linux +OS=freebsd # Linux only: Where is your linux kernel source? # Ignored for non-Linux @@ -19,7 +19,7 @@ #CC=gcc-4.0 # Where to install -prefix=/usr +prefix=/usr/local # Set to "y" to build MT versions of sendd and cgatool USE_THREADS=n @@ -40,8 +40,8 @@ USE_CONSOLE=y # Enable for debugging -#DEBUG_POLICY= DEBUG -DEBUG_POLICY= NO_DEBUG +DEBUG_POLICY= DEBUG +#DEBUG_POLICY= NO_DEBUG # enable for timestamp output on some crypto operations LOG_TIMESTAMP=n ==== //depot/projects/soc2009/anchie_send/send_0.2/include/pkixip_ext_asn.h#2 (text+ko) ==== @@ -45,6 +45,7 @@ #define IANA_SAFI_BOTH 3 #define IANA_SAFI_MPLS 4 +/* typedef struct IPAddressRange_st { ASN1_BIT_STRING *min; ASN1_BIT_STRING *max; @@ -78,6 +79,12 @@ ASN1_OCTET_STRING *addressFamily; IPAddressChoice *ipAddressChoice; } IPAddressFamily; +*/ + +#define IP_AOR_PREFIX 0 +#define IP_AOR_RANGE 1 +#define IPA_CHOICE_INHERIT 0 +#define IPA_CHOICE_AOR 1 typedef STACK_OF(IPAddressFamily) IPAddrBlocks; ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/Makefile#2 (text+ko) ==== @@ -1,7 +1,8 @@ OBJS += os/addr.o os/snd_freebsd.o os/netgraph.o os-linux/rand.o +CPPFLAGS += -I/usr/local/include -OSLIBS= -lnetgraph -l$(DNET) +OSLIBS= -lnetgraph -L/usr/local/lib -l$(DNET) OSEXTRA= os/sendd EXTRAINSTALL= /etc/rc.d/sendd ==== //depot/projects/soc2009/anchie_send/send_0.2/sendd/os-freebsd/sendd#2 (text+ko) ==== @@ -37,8 +37,8 @@ name="sendd" rcvar=`set_rcvar` -command="/usr/sbin/${name}" -required_files="/etc/${name}.conf" +command="/usr/local/sbin/${name}" +required_files="/usr/local/etc/${name}.conf" load_rc_config $name run_rc_command "$1" From owner-p4-projects@FreeBSD.ORG Mon Jun 1 11:33:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76CF01065718; Mon, 1 Jun 2009 11:33:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29AF5106570E for ; Mon, 1 Jun 2009 11:33:42 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 164EB8FC0A for ; Mon, 1 Jun 2009 11:33:42 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51BXf9e060756 for ; Mon, 1 Jun 2009 11:33:41 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51BXfQs060754 for perforce@freebsd.org; Mon, 1 Jun 2009 11:33:41 GMT (envelope-from anchie@FreeBSD.org) Date: Mon, 1 Jun 2009 11:33:41 GMT Message-Id: <200906011133.n51BXfQs060754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163251 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 11:33:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=163251 Change 163251 by anchie@anchie_malimis on 2009/06/01 11:33:21 Added comments about placing hooks for SeND in the ND code. Added two new, SeND-related, ICMP6 types, for Certification Path Solicitation and Certification Path Advertisement. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#2 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#2 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#2 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_rtr.c#2 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#2 (text+ko) ==== @@ -117,6 +117,9 @@ #define ND_NEIGHBOR_ADVERT 136 /* neighbor advertisement */ #define ND_REDIRECT 137 /* redirect */ +#define SEND_CERT_PATH_SOLICIT 148 /* cert path solicitation */ +#define SEND_CERT_PATH_ADVERT 149 /* cert_path advertisement */ + #define ICMP6_ROUTER_RENUMBERING 138 /* router renumbering */ #define ICMP6_WRUREQUEST 139 /* who are you request */ ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#2 (text+ko) ==== @@ -761,6 +761,9 @@ goto badlen; if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { /* give up local */ + + /* send incoming SeND-protected/ND packet to sendd */ + nd6_rs_input(m, off, icmp6len); m = NULL; goto freeit; @@ -776,6 +779,9 @@ if (icmp6len < sizeof(struct nd_router_advert)) goto badlen; if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { + + /* send incoming SeND-protected/ND packet to sendd */ + /* give up local */ nd6_ra_input(m, off, icmp6len); m = NULL; @@ -792,6 +798,9 @@ if (icmp6len < sizeof(struct nd_neighbor_solicit)) goto badlen; if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { + + /* send incoming SeND-protected/ND packet to sendd */ + /* give up local */ nd6_ns_input(m, off, icmp6len); m = NULL; @@ -808,6 +817,9 @@ if (icmp6len < sizeof(struct nd_neighbor_advert)) goto badlen; if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { + + /* send incoming SeND-protected/ND packet to sendd */ + /* give up local */ nd6_na_input(m, off, icmp6len); m = NULL; @@ -824,6 +836,9 @@ if (icmp6len < sizeof(struct nd_redirect)) goto badlen; if ((n = m_copym(m, 0, M_COPYALL, M_DONTWAIT)) == NULL) { + + /* send incoming SeND-protected/ND packet to sendd */ + /* give up local */ icmp6_redirect_input(m, off); m = NULL; @@ -833,6 +848,18 @@ /* m stays. */ break; +#ifndef + case SEND_CERT_PATH_SOLICIT: + /* send CPS packet to sendd */ + send6_cps_input(); + break; + + case SEND_CERT_PATH_ADVERT: + /* send CPA packet to sendd */ + send6_cpa_input(); + break; +#endif + case ICMP6_ROUTER_RENUMBERING: if (code != ICMP6_ROUTER_RENUMBERING_COMMAND && code != ICMP6_ROUTER_RENUMBERING_RESULT) ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6.c#2 (text+ko) ==== @@ -1922,6 +1922,15 @@ } return (error); } + + /* send outgoing SeND/ND packet to sendd. */ + + /* + * In case of NS and NA, we end-up here after calling nd6_ns_output() + * or nd6_na_output(). RS, RA, and Redirect do not have such output + * routines. They are handler instead by rtadvd and rtsol daemons. + */ + if ((ifp->if_flags & IFF_LOOPBACK) != 0) { return ((*ifp->if_output)(origifp, m, (struct sockaddr *)dst, NULL)); ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/nd6_rtr.c#2 (text+ko) ==== @@ -426,6 +426,27 @@ m_freem(m); } +#ifndef +/* + * Receive Certification Path Solicitation [rfc3971]. + */ +void +send6_cps_input(struct mbuf *m, int off, int icmp6len) +{ +} + +/* + * Receive Certification Path Advertisement [rfc3971]. + */ +void +send6_cpa_input(struct mbuf *m, int off, int icmp6len) +{ +} + +/* send6_cps/cpa_output() should be places here as well.. */ +#endif + + /* * default router list proccessing sub routines */ From owner-p4-projects@FreeBSD.ORG Mon Jun 1 12:02:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5E4441065695; Mon, 1 Jun 2009 12:02:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C90B106568F for ; Mon, 1 Jun 2009 12:02:11 +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 417938FC3D for ; Mon, 1 Jun 2009 12:02:11 +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 n51C2BLb062878 for ; Mon, 1 Jun 2009 12:02:11 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51C2Bpt062876 for perforce@freebsd.org; Mon, 1 Jun 2009 12:02:11 GMT (envelope-from gabor@freebsd.org) Date: Mon, 1 Jun 2009 12:02:11 GMT Message-Id: <200906011202.n51C2Bpt062876@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 163253 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 12:02:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=163253 Change 163253 by gabor@gabor_server on 2009/06/01 12:01:51 - Add extracted sources. They build and work but building and running is a bit inconvenient lacking FreeBSD Makefiles and integration but it will do for the development stage. Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/build.sh#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/_strtol.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/_strtoul.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_aliasname_local.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_bcs.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_bcs.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_bcs_strtol.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_bcs_strtoul.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_csmapper.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_csmapper.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_ctype.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_ctype.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_ctype_fallback.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_ctype_fallback.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_ctype_local.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_ctype_template.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_db.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_db.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_db_factory.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_db_factory.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_db_file.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_db_hash.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_db_hash.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_esdb.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_esdb.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_esdb_file.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_fix_grouping.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_hash.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_hash.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_iconv.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_iconv.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_iconv_local.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_lookup.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_lookup.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_lookup_factory.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_lookup_factory.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_lookup_file.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_mapper.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_mapper.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_mapper_local.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_memstream.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_memstream.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_mmap.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_mmap.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_module.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_module.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_namespace.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_none.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_none.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_pivot_factory.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_pivot_factory.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_pivot_file.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_prop.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_prop.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_region.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_stdenc.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_stdenc.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_stdenc_local.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_stdenc_template.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/citrus_types.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/iconv.3#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/iconv.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/iconv.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/build.sh#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_big5.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_big5.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_dechanyu.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_dechanyu.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_euc.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_euc.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_euctw.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_euctw.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_gbk2k.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_gbk2k.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_hz.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_hz.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_iconv_none.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_iconv_none.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_iconv_std.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_iconv_std.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_iconv_std_local.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_iso2022.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_iso2022.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_johab.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_johab.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_646.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_646.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_none.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_none.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_serial.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_serial.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_std.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_std.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_std_file.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_std_local.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_zone.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mapper_zone.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mskanji.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_mskanji.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_ues.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_ues.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_utf1632.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_utf1632.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_utf7.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_utf7.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_utf8.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_utf8.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_viqr.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_viqr.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_zw.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/citrus_zw.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/netbsdism.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/iconv/Makefile#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/iconv/iconv.1#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/iconv/iconv.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/Makefile#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/build.sh#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/ldef.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/lex.l#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/yacc.y#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/Makefile#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/build.sh#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/ldef.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/lex.l#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/yacc.y#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Jun 1 12:31:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9E2E2106567B; Mon, 1 Jun 2009 12:31: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 5E93F1065670 for ; Mon, 1 Jun 2009 12:31:41 +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 31C168FC0A for ; Mon, 1 Jun 2009 12:31:41 +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 n51CVfwG066022 for ; Mon, 1 Jun 2009 12:31:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51CVf7C066020 for perforce@freebsd.org; Mon, 1 Jun 2009 12:31:41 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 1 Jun 2009 12:31:41 GMT Message-Id: <200906011231.n51CVf7C066020@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 163254 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 12:31:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=163254 Change 163254 by hselasky@hselasky_laptop001 on 2009/06/01 12:30:53 USB CORE: Fix multithread issue where the is_uref variable was not set and cleared properly in the CDEV private data. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#25 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#25 (text+ko) ==== @@ -169,21 +169,23 @@ cpd->bus = devclass_get_softc(usb2_devclass_ptr, cpd->bus_index); if (cpd->bus == NULL) { DPRINTFN(2, "no bus at %u\n", cpd->bus_index); + need_uref = 0; goto error; } cpd->udev = cpd->bus->devices[cpd->dev_index]; if (cpd->udev == NULL) { DPRINTFN(2, "no device at %u\n", cpd->dev_index); + need_uref = 0; goto error; } if (cpd->udev->refcount == USB_DEV_REF_MAX) { DPRINTFN(2, "no dev ref\n"); + need_uref = 0; goto error; } if (need_uref) { DPRINTFN(2, "ref udev - needed\n"); cpd->udev->refcount++; - cpd->is_uref = 1; mtx_unlock(&usb2_ref_lock); @@ -194,6 +196,11 @@ sx_xlock(cpd->udev->default_sx + 1); mtx_lock(&usb2_ref_lock); + + /* + * Set "is_uref" after grabbing the default SX lock + */ + cpd->is_uref = 1; } /* check if we are doing an open */ @@ -258,18 +265,18 @@ } mtx_unlock(&usb2_ref_lock); - if (cpd->is_uref) { + if (need_uref) { mtx_lock(&Giant); /* XXX */ } return (0); error: - if (cpd->is_uref) { + if (need_uref) { + cpd->is_uref = 0; sx_unlock(cpd->udev->default_sx + 1); if (--(cpd->udev->refcount) == 0) { usb2_cv_signal(cpd->udev->default_cv + 1); } - cpd->is_uref = 0; } mtx_unlock(&usb2_ref_lock); DPRINTFN(2, "fail\n"); @@ -289,10 +296,14 @@ static usb_error_t usb2_usb_ref_device(struct usb_cdev_privdata *cpd) { + uint8_t is_uref; + + is_uref = cpd->is_uref && sx_xlocked(cpd->udev->default_sx + 1); + /* * Check if we already got an USB reference on this location: */ - if (cpd->is_uref) + if (is_uref) return (0); /* success */ /* @@ -313,7 +324,12 @@ void usb2_unref_device(struct usb_cdev_privdata *cpd) { - if (cpd->is_uref) { + uint8_t is_uref; + + is_uref = cpd->is_uref && sx_xlocked(cpd->udev->default_sx + 1); + + if (is_uref) { + cpd->is_uref = 0; mtx_unlock(&Giant); /* XXX */ sx_unlock(cpd->udev->default_sx + 1); } @@ -330,11 +346,10 @@ } cpd->is_write = 0; } - if (cpd->is_uref) { + if (is_uref) { if (--(cpd->udev->refcount) == 0) { usb2_cv_signal(cpd->udev->default_cv + 1); } - cpd->is_uref = 0; } mtx_unlock(&usb2_ref_lock); } From owner-p4-projects@FreeBSD.ORG Mon Jun 1 12:35:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 771471065676; Mon, 1 Jun 2009 12:35: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 35753106564A for ; Mon, 1 Jun 2009 12:35: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 207298FC21 for ; Mon, 1 Jun 2009 12:35:45 +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 n51CZjPA066440 for ; Mon, 1 Jun 2009 12:35:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51CZjpZ066438 for perforce@freebsd.org; Mon, 1 Jun 2009 12:35:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 1 Jun 2009 12:35:45 GMT Message-Id: <200906011235.n51CZjpZ066438@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 163255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 12:35:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=163255 Change 163255 by hselasky@hselasky_laptop001 on 2009/06/01 12:34:50 IFC @163252 Affected files ... .. //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#10 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#6 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/usb/src/sys/boot/common/boot.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#13 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#7 integrate .. //depot/projects/usb/src/sys/conf/NOTES#38 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#24 integrate .. //depot/projects/usb/src/sys/conf/options#30 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#5 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#18 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#11 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#7 integrate .. //depot/projects/usb/src/sys/dev/firewire/if_fwe.c#6 integrate .. //depot/projects/usb/src/sys/dev/firewire/if_fwip.c#8 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#11 integrate .. //depot/projects/usb/src/sys/dev/ixgb/if_ixgb.c#6 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.c#12 integrate .. //depot/projects/usb/src/sys/dev/lmc/if_lmc.h#7 integrate .. //depot/projects/usb/src/sys/dev/mge/if_mge.c#4 integrate .. //depot/projects/usb/src/sys/dev/nfe/if_nfe.c#10 integrate .. //depot/projects/usb/src/sys/dev/nge/if_nge.c#8 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#19 integrate .. //depot/projects/usb/src/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#5 integrate .. //depot/projects/usb/src/sys/dev/smc/if_smc.c#3 integrate .. //depot/projects/usb/src/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/usb/src/sys/dev/stge/if_stge.c#7 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#5 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/sequences#3 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#7 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.h#6 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken_subr_compat.h#3 integrate .. //depot/projects/usb/src/sys/dev/tsec/if_tsec.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#62 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#16 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#9 integrate .. //depot/projects/usb/src/sys/dev/vr/if_vr.c#5 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#4 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_subr.c#6 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#14 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#14 integrate .. //depot/projects/usb/src/sys/geom/label/g_label.c#4 integrate .. //depot/projects/usb/src/sys/i386/include/apicvar.h#9 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#10 integrate .. //depot/projects/usb/src/sys/kern/kern_cpu.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_poll.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_vimage.c#6 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#23 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#23 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#12 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#24 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#22 integrate .. //depot/projects/usb/src/sys/kern/vnode_if.src#14 integrate .. //depot/projects/usb/src/sys/modules/Makefile#34 integrate .. //depot/projects/usb/src/sys/modules/cpufreq/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/geom/geom_part/geom_part_ebr/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#19 integrate .. //depot/projects/usb/src/sys/modules/zfs/Makefile#10 integrate .. //depot/projects/usb/src/sys/net/if.c#26 integrate .. //depot/projects/usb/src/sys/net/if.h#11 integrate .. //depot/projects/usb/src/sys/net/if_var.h#18 integrate .. //depot/projects/usb/src/sys/net/netisr.c#8 integrate .. //depot/projects/usb/src/sys/net/netisr.h#6 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#23 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_dfs.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#17 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_superg.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.c#10 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_usrreq.c#7 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#20 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#16 integrate .. //depot/projects/usb/src/sys/netinet/in.h#12 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#24 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#20 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#16 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#22 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#19 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#22 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#17 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.h#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#17 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#20 integrate .. //depot/projects/usb/src/sys/netinet6/in6.h#9 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#21 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#15 integrate .. //depot/projects/usb/src/sys/netinet6/vinet6.h#8 integrate .. //depot/projects/usb/src/sys/netipsec/ipsec_input.c#10 integrate .. //depot/projects/usb/src/sys/netipx/ipx_input.c#6 integrate .. //depot/projects/usb/src/sys/netnatm/natm_proto.c#4 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#15 integrate .. //depot/projects/usb/src/sys/pci/if_rl.c#11 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#11 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#12 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#19 integrate .. //depot/projects/usb/src/sys/powerpc/conf/NOTES#13 integrate .. //depot/projects/usb/src/sys/powerpc/cpufreq/dfs.c#1 branch .. //depot/projects/usb/src/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_cpu.c#1 branch .. //depot/projects/usb/src/sys/powerpc/powermac/pmu.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/vcoregpio.c#1 branch .. //depot/projects/usb/src/sys/powerpc/powerpc/cpu.c#9 integrate .. //depot/projects/usb/src/sys/rpc/xdr.h#4 integrate .. //depot/projects/usb/src/sys/sys/buf.h#8 integrate .. //depot/projects/usb/src/sys/sys/cpu.h#3 integrate .. //depot/projects/usb/src/sys/sys/mount.h#19 integrate .. //depot/projects/usb/src/sys/sys/param.h#33 integrate .. //depot/projects/usb/src/sys/sys/pcpu.h#10 integrate .. //depot/projects/usb/src/sys/sys/priv.h#15 integrate .. //depot/projects/usb/src/sys/sys/sockio.h#4 integrate .. //depot/projects/usb/src/sys/sys/syscallsubr.h#11 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#13 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#20 integrate .. //depot/projects/usb/src/sys/vm/vm_page.c#15 integrate .. //depot/projects/usb/src/sys/vm/vm_page.h#12 integrate .. //depot/projects/usb/src/sys/xen/evtchn/evtchn.c#7 integrate Differences ... ==== //depot/projects/usb/src/sys/arm/xscale/ixp425/if_npe.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.15 2009/05/23 19:14:20 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.17 2009/05/30 18:23:55 sam Exp $"); /* * Intel XScale NPE Ethernet driver. @@ -229,7 +229,7 @@ static void npe_txdone(int qid, void *arg); static int npe_rxbuf_init(struct npe_softc *, struct npebuf *, struct mbuf *); -static void npe_rxdone(int qid, void *arg); +static int npe_rxdone(int qid, void *arg); static void npeinit(void *); static void npestart_locked(struct ifnet *); static void npestart(struct ifnet *); @@ -777,7 +777,7 @@ */ sc->rx_qid = npeconfig[sc->sc_npeid].rx_qid; ixpqmgr_qconfig(sc->rx_qid, npe_rxbuf, 0, 1, - IX_QMGR_Q_SOURCE_ID_NOT_E, npe_rxdone, sc); + IX_QMGR_Q_SOURCE_ID_NOT_E, (qconfig_hand_t *)npe_rxdone, sc); sc->rx_freeqid = npeconfig[sc->sc_npeid].rx_freeqid; ixpqmgr_qconfig(sc->rx_freeqid, npe_rxbuf, 0, npe_rxbuf/2, 0, NULL, sc); /* @@ -1091,7 +1091,7 @@ * from the hardware queue and pass the frames up the * stack. Pass the rx buffers to the free list. */ -static void +static int npe_rxdone(int qid, void *arg) { #define P2V(a, dma) \ @@ -1099,6 +1099,7 @@ struct npe_softc *sc = arg; struct npedma *dma = &sc->rxdma; uint32_t entry; + int rx_npkts = 0; while (ixpqmgr_qread(qid, &entry) == 0) { struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry), dma); @@ -1132,6 +1133,7 @@ ifp->if_ipackets++; ifp->if_input(ifp, mrx); + rx_npkts++; } else { /* discard frame and re-use mbuf */ m = npe->ix_m; @@ -1143,19 +1145,22 @@ /* XXX should not happen */ } } + return rx_npkts; #undef P2V } #ifdef DEVICE_POLLING -static void +static int npe_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct npe_softc *sc = ifp->if_softc; + int rx_npkts = 0; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - npe_rxdone(sc->rx_qid, sc); + rx_npkts = npe_rxdone(sc->rx_qid, sc); npe_txdone(sc->tx_doneqid, sc); /* XXX polls both NPE's */ } + return rx_npkts; } #endif /* DEVICE_POLLING */ ==== //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#6 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.5 2008/12/20 03:26:09 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.6 2009/05/30 15:14:44 attilio Exp $"); /* * Intel XScale Queue Manager support. @@ -338,7 +338,7 @@ int ixpqmgr_qconfig(int qId, int qEntries, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg) + qconfig_hand_t *cb, void *cbarg) { struct ixpqmgr_softc *sc = ixpqmgr_sc; struct qmgrInfo *qi = &sc->qinfo[qId]; ==== //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.1 2006/11/19 23:55:23 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.h,v 1.2 2009/05/30 15:14:44 attilio Exp $ */ /*- @@ -229,8 +229,10 @@ #define IX_QMGR_ENTRY2_OFFSET 1 #define IX_QMGR_ENTRY4_OFFSET 3 +typedef void qconfig_hand_t(int, void *); + int ixpqmgr_qconfig(int qId, int qSizeInWords, int ne, int nf, int srcSel, - void (*cb)(int, void *), void *cbarg); + qconfig_hand_t *cb, void *cbarg); int ixpqmgr_qwrite(int qId, uint32_t entry); int ixpqmgr_qread(int qId, uint32_t *entry); int ixpqmgr_qreadm(int qId, uint32_t n, uint32_t *p); ==== //depot/projects/usb/src/sys/boot/common/boot.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/boot.c,v 1.31 2005/05/19 23:03:01 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/boot.c,v 1.32 2009/06/01 01:02:30 rodrigc Exp $"); /* * Loading modules, booting the system @@ -287,7 +287,7 @@ int getrootmount(char *rootdev) { - char lbuf[128], *cp, *ep, *dev, *fstyp; + char lbuf[128], *cp, *ep, *dev, *fstyp, *options; int fd, error; if (getenv("vfs.root.mountfrom") != NULL) @@ -331,11 +331,30 @@ *cp = 0; fstyp = strdup(ep); - /* build the final result and save it */ + /* skip whitespace up to mount options */ + cp += 1; + while ((*cp != 0) && isspace(*cp)) + cp++; + if (*cp == 0) /* misformatted */ + continue; + /* skip text to end of mount options and delimit */ + ep = cp; + while ((*cp != 0) && !isspace(*cp)) + cp++; + *cp = 0; + options = strdup(ep); + /* Build the : and save it in vfs.root.mountfrom */ sprintf(lbuf, "%s:%s", fstyp, dev); free(dev); free(fstyp); setenv("vfs.root.mountfrom", lbuf, 0); + + /* Don't override vfs.root.mountfrom.options if it is already set */ + if (getenv("vfs.root.mountfrom.options") == NULL) { + /* save mount options */ + setenv("vfs.root.mountfrom.options", options, 0); + } + free(options); error = 0; break; } ==== //depot/projects/usb/src/sys/boot/uboot/lib/net.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.7 2008/11/19 17:34:28 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/net.c,v 1.8 2009/05/30 19:28:38 marcel Exp $"); #include #include @@ -46,12 +46,6 @@ #include "glue.h" #include "libuboot.h" -#define NETIF_DEBUG -#define NETIF_VERBOSE_DEBUG -#undef NETIF_DEBUG -#undef NETIF_VERBOSE_DEBUG - - static int net_probe(struct netif *, void *); static int net_match(struct netif *, void *); static void net_init(struct iodesc *, void *); @@ -138,7 +132,7 @@ #if defined(NETIF_DEBUG) struct ether_header *eh; - printf("net_put: desc 0x%x, pkt 0x%x, len %d\n", desc, pkt, len); + printf("net_put: desc %p, pkt %p, len %d\n", desc, pkt, len); eh = pkt; printf("dst: %s ", ether_sprintf(eh->ether_dhost)); printf("src: %s ", ether_sprintf(eh->ether_shost)); @@ -175,7 +169,7 @@ int err, rlen; #if defined(NETIF_DEBUG) - printf("net_get: pkt %x, len %d, timeout %d\n", pkt, len, timeout); + printf("net_get: pkt %p, len %d, timeout %d\n", pkt, len, timeout); #endif t = getsecs(); do { ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 (text+ko) ==== @@ -564,8 +564,13 @@ if (fp->gfs_parent == NULL || (vp->v_flag & V_XATTRDIR)) goto found; - dp = fp->gfs_parent->v_data; - + /* + * XXX cope with a FreeBSD-specific race wherein the parent's + * snapshot data can be freed before the parent is + */ + if ((dp = fp->gfs_parent->v_data) == NULL) + return (NULL); + /* * First, see if this vnode is cached in the parent. */ ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 (text+ko) ==== @@ -2392,13 +2392,23 @@ /* * Check the vdev configuration to ensure that it's capable of supporting - * a root pool. Currently, we do not support RAID-Z or partial configuration. - * In addition, only a single top-level vdev is allowed and none of the leaves - * can be wholedisks. + * a root pool. + * + * On Solaris, we do not support RAID-Z or partial configuration. In + * addition, only a single top-level vdev is allowed and none of the + * leaves can be wholedisks. + * + * For FreeBSD, we can boot from any configuration. There is a + * limitation that the boot filesystem must be either uncompressed or + * compresses with lzjb compression but I'm not sure how to enforce + * that here. */ boolean_t vdev_is_bootable(vdev_t *vd) { +#ifdef __FreeBSD_version + return (B_TRUE); +#else int c; if (!vd->vdev_ops->vdev_op_leaf) { @@ -2420,4 +2430,5 @@ return (B_FALSE); } return (B_TRUE); +#endif } ==== //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 (text+ko) ==== @@ -3121,3 +3121,4 @@ }; DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1); +MODULE_DEPEND(zfsctrl, krpc, 1, 1, 1); ==== //depot/projects/usb/src/sys/compat/linux/linux_socket.c#13 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.92 2009/05/19 09:10:53 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_socket.c,v 1.95 2009/05/31 12:16:31 dchagin Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" @@ -445,8 +445,6 @@ return (-1); } - - static int linux_to_bsd_msghdr(struct msghdr *bhdr, const struct l_msghdr *lhdr) { @@ -477,6 +475,24 @@ } static int +linux_set_socket_flags(struct thread *td, int s, int flags) +{ + int error; + + if (flags & LINUX_SOCK_NONBLOCK) { + error = kern_fcntl(td, s, F_SETFL, O_NONBLOCK); + if (error) + return (error); + } + if (flags & LINUX_SOCK_CLOEXEC) { + error = kern_fcntl(td, s, F_SETFD, FD_CLOEXEC); + if (error) + return (error); + } + return (0); +} + +static int linux_sendit(struct thread *td, int s, struct msghdr *mp, int flags, struct mbuf *control, enum uio_seg segflg) { @@ -610,21 +626,11 @@ if (retval_socket) return (retval_socket); - if (socket_flags & LINUX_SOCK_NONBLOCK) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFL, O_NONBLOCK); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } - } - if (socket_flags & LINUX_SOCK_CLOEXEC) { - retval_socket = kern_fcntl(td, td->td_retval[0], - F_SETFD, FD_CLOEXEC); - if (retval_socket) { - (void)kern_close(td, td->td_retval[0]); - goto out; - } + retval_socket = linux_set_socket_flags(td, td->td_retval[0], + socket_flags); + if (retval_socket) { + (void)kern_close(td, td->td_retval[0]); + goto out; } if (bsd_args.type == SOCK_RAW @@ -878,12 +884,20 @@ int protocol; int *rsv; } */ bsd_args; + int error, socket_flags; + int sv[2]; bsd_args.domain = linux_to_bsd_domain(args->domain); if (bsd_args.domain != PF_LOCAL) return (EAFNOSUPPORT); - bsd_args.type = args->type; + socket_flags = args->type & ~LINUX_SOCK_TYPE_MASK; + if (socket_flags & ~(LINUX_SOCK_CLOEXEC | LINUX_SOCK_NONBLOCK)) + return (EINVAL); + bsd_args.type = args->type & LINUX_SOCK_TYPE_MASK; + if (bsd_args.type < 0 || bsd_args.type > LINUX_SOCK_MAX) + return (EINVAL); + if (args->protocol != 0 && args->protocol != PF_UNIX) /* @@ -896,7 +910,25 @@ else bsd_args.protocol = 0; bsd_args.rsv = (int *)PTRIN(args->rsv); - return (socketpair(td, &bsd_args)); + error = kern_socketpair(td, bsd_args.domain, bsd_args.type, + bsd_args.protocol, sv); + if (error) + return (error); + error = linux_set_socket_flags(td, sv[0], socket_flags); + if (error) + goto out; + error = linux_set_socket_flags(td, sv[1], socket_flags); + if (error) + goto out; + + error = copyout(sv, bsd_args.rsv, 2 * sizeof(int)); + +out: + if (error) { + (void)kern_close(td, sv[0]); + (void)kern_close(td, sv[1]); + } + return (error); } struct linux_send_args { ==== //depot/projects/usb/src/sys/compat/svr4/svr4_stat.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.30 2009/05/29 21:27:12 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.31 2009/05/30 07:33:32 delphij Exp $"); #include #include @@ -458,7 +458,10 @@ break; case SVR4_SI_HW_SERIAL: - snprintf(buf, sizeof(buf), "%lu", hostid); + pr = td->td_ucred->cr_prison; + mtx_lock(&pr->pr_mtx); + snprintf(buf, sizeof(buf), "%lu", pr->pr_hostid); + mtx_unlock(&pr->pr_mtx); str = buf; break; ==== //depot/projects/usb/src/sys/conf/NOTES#38 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1542 2009/05/29 01:49:27 attilio Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1543 2009/06/01 10:30:00 pjd Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -639,14 +639,6 @@ options ALTQ_NOPCC # Required if the TSC is unusable options ALTQ_DEBUG -# IP optional behaviour. -# IP_NONLOCALBIND disables the check that bind() usually makes that the -# address is one that is assigned to an interface on this machine. -# It allows transparent proxies to pretend to be other machines. -# How the packet GET to that machine is a problem solved elsewhere, -# smart routers, ipfw fwd, etc. -options IP_NONLOCALBIND # Allow impersonation for proxies. - # netgraph(4). Enable the base netgraph code with the NETGRAPH option. # Individual node types can be enabled with the corresponding option # listed below; however, this is not strictly necessary as netgraph ==== //depot/projects/usb/src/sys/conf/files.powerpc#24 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.101 2009/05/21 11:43:37 raj Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.102 2009/05/31 09:01:23 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -97,6 +97,7 @@ powerpc/booke/swtch.S optional e500 powerpc/booke/trap.c optional e500 powerpc/booke/vm_machdep.c optional e500 +powerpc/cpufreq/dfs.c optional cpufreq powerpc/fpu/fpu_add.c optional fpu_emu powerpc/fpu/fpu_compare.c optional fpu_emu powerpc/fpu/fpu_div.c optional fpu_emu @@ -114,6 +115,7 @@ powerpc/mpc85xx/ocpbus.c optional mpc85xx powerpc/mpc85xx/opic.c optional mpc85xx powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx +powerpc/ofw/ofw_cpu.c optional aim powerpc/ofw/ofw_pcibus.c optional pci aim powerpc/ofw/ofw_pcib_pci.c optional pci aim powerpc/ofw/ofw_real.c optional aim @@ -133,6 +135,7 @@ powerpc/powermac/pmu.c optional powermac pmu powerpc/powermac/macgpio.c optional powermac pci powerpc/powermac/cpcht.c optional powermac pci +powerpc/powermac/vcoregpio.c optional powermac powerpc/powerpc/altivec.c optional aim powerpc/powerpc/atomic.S standard powerpc/powerpc/autoconf.c standard ==== //depot/projects/usb/src/sys/conf/options#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.671 2009/05/29 01:49:27 attilio Exp $ +# $FreeBSD: src/sys/conf/options,v 1.672 2009/06/01 10:30:00 pjd Exp $ # # On the handling of kernel options # @@ -400,7 +400,6 @@ IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h IPSEC opt_ipsec.h IPSEC_DEBUG opt_ipsec.h -IP_NONLOCALBIND opt_inet.h IPSEC_FILTERTUNNEL opt_ipsec.h IPSTEALTH IPX ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.5 2009/03/30 22:18:38 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.6 2009/06/01 07:05:52 delphij Exp $"); #include "opt_ata.h" #include @@ -104,9 +104,9 @@ { ATA_I82801GB_S1, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7" }, { ATA_I82801GB_R1, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7" }, { ATA_I82801GB_AH, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7" }, - { ATA_I82801GBM_S1, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_R1, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7M" }, - { ATA_I82801GBM_AH, 0, INTEL_AHCI, 0, ATA_SA300, "ICH7M" }, + { ATA_I82801GBM_S1, 0, INTEL_AHCI, 0, ATA_SA150, "ICH7M" }, + { ATA_I82801GBM_R1, 0, INTEL_AHCI, 0, ATA_SA150, "ICH7M" }, + { ATA_I82801GBM_AH, 0, INTEL_AHCI, 0, ATA_SA150, "ICH7M" }, { ATA_I63XXESB2, 0, 0, 1, ATA_UDMA5, "63XXESB2" }, { ATA_I63XXESB2_S1, 0, INTEL_AHCI, 0, ATA_SA300, "63XXESB2" }, { ATA_I63XXESB2_S2, 0, INTEL_AHCI, 0, ATA_SA300, "63XXESB2" }, ==== //depot/projects/usb/src/sys/dev/bge/if_bge.c#18 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.222 2009/05/14 22:36:56 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.225 2009/05/30 17:56:19 attilio Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -332,7 +332,7 @@ static int bge_get_eaddr(struct bge_softc *, uint8_t[]); static void bge_txeof(struct bge_softc *); -static void bge_rxeof(struct bge_softc *); +static int bge_rxeof(struct bge_softc *); static void bge_asf_driver_up (struct bge_softc *); static void bge_tick(void *); @@ -390,7 +390,7 @@ static int bge_miibus_writereg(device_t, int, int, int); static void bge_miibus_statchg(device_t); #ifdef DEVICE_POLLING -static void bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count); +static int bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count); #endif #define BGE_RESET_START 1 @@ -3050,18 +3050,18 @@ * 2) the frame is from the standard receive ring */ -static void +static int bge_rxeof(struct bge_softc *sc) { struct ifnet *ifp; - int stdcnt = 0, jumbocnt = 0; + int rx_npkts = 0, stdcnt = 0, jumbocnt = 0; BGE_LOCK_ASSERT(sc); /* Nothing to do. */ if (sc->bge_rx_saved_considx == sc->bge_ldata.bge_status_block->bge_idx[0].bge_rx_prod_idx) - return; + return (rx_npkts); ifp = sc->bge_ifp; @@ -3193,9 +3193,10 @@ BGE_UNLOCK(sc); (*ifp->if_input)(ifp, m); BGE_LOCK(sc); + rx_npkts++; if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) - return; + return (rx_npkts); } if (stdcnt > 0) @@ -3219,6 +3220,7 @@ if (BGE_IS_5705_PLUS(sc)) ifp->if_ierrors += CSR_READ_4(sc, BGE_RXLP_LOCSTAT_IFIN_DROPS); #endif + return (rx_npkts); } static void @@ -3271,16 +3273,17 @@ } #ifdef DEVICE_POLLING -static void +static int bge_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct bge_softc *sc = ifp->if_softc; uint32_t statusword; - + int rx_npkts = 0; + BGE_LOCK(sc); if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { BGE_UNLOCK(sc); - return; + return (rx_npkts); } bus_dmamap_sync(sc->bge_cdata.bge_status_tag, @@ -3303,16 +3306,17 @@ bge_link_upd(sc); sc->rxcycles = count; - bge_rxeof(sc); + rx_npkts = bge_rxeof(sc); if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { BGE_UNLOCK(sc); - return; + return (rx_npkts); } bge_txeof(sc); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) bge_start_locked(ifp); BGE_UNLOCK(sc); + return (rx_npkts); } #endif /* DEVICE_POLLING */ ==== //depot/projects/usb/src/sys/dev/dc/if_dc.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.199 2009/03/09 13:23:54 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.200 2009/05/30 15:14:44 attilio Exp $"); /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 @@ -236,7 +236,7 @@ static int dc_encap(struct dc_softc *, struct mbuf **); static void dc_pnic_rx_bug_war(struct dc_softc *, int); static int dc_rx_resync(struct dc_softc *); -static void dc_rxeof(struct dc_softc *); +static int dc_rxeof(struct dc_softc *); static void dc_txeof(struct dc_softc *); static void dc_tick(void *); static void dc_tx_underrun(struct dc_softc *); @@ -2640,19 +2640,21 @@ * A frame has been uploaded: pass the resulting mbuf chain up to * the higher level protocols. */ -static void +static int dc_rxeof(struct dc_softc *sc) { struct mbuf *m, *m0; struct ifnet *ifp; struct dc_desc *cur_rx; - int i, total_len = 0; + int i, total_len, rx_npkts; u_int32_t rxstat; DC_LOCK_ASSERT(sc); ifp = sc->dc_ifp; i = sc->dc_cdata.dc_rx_prod; + total_len = 0; + rx_npkts = 0; bus_dmamap_sync(sc->dc_ltag, sc->dc_lmap, BUS_DMASYNC_POSTREAD); while (!(le32toh(sc->dc_ldata->dc_rx_list[i].dc_status) & @@ -2706,7 +2708,7 @@ continue; } else { dc_init_locked(sc); - return; + return (rx_npkts); } } } @@ -2745,9 +2747,11 @@ DC_UNLOCK(sc); (*ifp->if_input)(ifp, m); DC_LOCK(sc); + rx_npkts++; } sc->dc_cdata.dc_rx_prod = i; + return (rx_npkts); } /* @@ -2989,20 +2993,21 @@ #ifdef DEVICE_POLLING static poll_handler_t dc_poll; -static void +static int dc_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { struct dc_softc *sc = ifp->if_softc; + int rx_npkts = 0; DC_LOCK(sc); if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) { DC_UNLOCK(sc); - return; + return (rx_npkts); } sc->rxcycles = count; - dc_rxeof(sc); + rx_npkts = dc_rxeof(sc); dc_txeof(sc); if (!IFQ_IS_EMPTY(&ifp->if_snd) && !(ifp->if_drv_flags & IFF_DRV_OACTIVE)) @@ -3017,7 +3022,7 @@ DC_ISR_BUS_ERR); if (!status) { DC_UNLOCK(sc); - return; + return (rx_npkts); } /* ack what we have */ CSR_WRITE_4(sc, DC_ISR, status); @@ -3043,6 +3048,7 @@ } } DC_UNLOCK(sc); + return (rx_npkts); } #endif /* DEVICE_POLLING */ ==== //depot/projects/usb/src/sys/dev/e1000/if_em.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.15 2009/05/14 03:33:04 kmacy Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/if_em.c,v 1.16 2009/05/30 15:14:44 attilio Exp $*/ #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -261,7 +261,7 @@ static void em_tx_purge(struct adapter *); static int em_allocate_receive_structures(struct adapter *); static int em_allocate_transmit_structures(struct adapter *); -static int em_rxeof(struct adapter *, int); +static int em_rxeof(struct adapter *, int, int *); #ifndef __NO_STRICT_ALIGNMENT static int em_fixup_rx(struct adapter *); #endif @@ -1653,16 +1653,20 @@ * Legacy polling routine * *********************************************************************/ -static void +static int em_poll(struct ifnet *ifp, enum poll_cmd cmd, int count) { - struct adapter *adapter = ifp->if_softc; + struct adapter *adapter; u32 reg_icr; + int rx_npkts; + adapter = ifp->if_softc; + rx_npkts = 0; + EM_CORE_LOCK(adapter); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { EM_CORE_UNLOCK(adapter); - return; + return (rx_npkts); } if (cmd == POLL_AND_CHECK_STATUS) { @@ -1677,7 +1681,7 @@ } EM_CORE_UNLOCK(adapter); - em_rxeof(adapter, count); + em_rxeof(adapter, count, &rx_npkts); EM_TX_LOCK(adapter); em_txeof(adapter); @@ -1685,6 +1689,7 @@ if (!ADAPTER_RING_EMPTY(adapter)) em_start_locked(ifp); EM_TX_UNLOCK(adapter); + return (rx_npkts); } #endif /* DEVICE_POLLING */ @@ -1718,7 +1723,7 @@ EM_TX_LOCK(adapter); em_txeof(adapter); - em_rxeof(adapter, -1); + em_rxeof(adapter, -1, NULL); em_txeof(adapter); EM_TX_UNLOCK(adapter); @@ -1771,7 +1776,7 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - if (em_rxeof(adapter, adapter->rx_process_limit) != 0) + if (em_rxeof(adapter, adapter->rx_process_limit, NULL) != 0) taskqueue_enqueue(adapter->tq, &adapter->rxtx_task); EM_TX_LOCK(adapter); em_txeof(adapter); @@ -1882,7 +1887,7 @@ ++adapter->rx_irq; if ((ifp->if_drv_flags & IFF_DRV_RUNNING) && - (em_rxeof(adapter, adapter->rx_process_limit) != 0)) + (em_rxeof(adapter, adapter->rx_process_limit, NULL) != 0)) taskqueue_enqueue(adapter->tq, &adapter->rx_task); /* Reenable this interrupt */ E1000_WRITE_REG(&adapter->hw, E1000_IMS, EM_MSIX_RX); @@ -1920,7 +1925,7 @@ struct ifnet *ifp = adapter->ifp; if ((ifp->if_drv_flags & IFF_DRV_RUNNING) && - (em_rxeof(adapter, adapter->rx_process_limit) != 0)) + (em_rxeof(adapter, adapter->rx_process_limit, NULL) != 0)) taskqueue_enqueue(adapter->tq, &adapter->rx_task); } @@ -4461,23 +4466,26 @@ * *********************************************************************/ static int -em_rxeof(struct adapter *adapter, int count) +em_rxeof(struct adapter *adapter, int count, int *rx_npktsp) { struct ifnet *ifp = adapter->ifp;; struct mbuf *mp; u8 status, accept_frame = 0, eop = 0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 1 12:54:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38334106566C; Mon, 1 Jun 2009 12:54: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 E65731065674 for ; Mon, 1 Jun 2009 12:54:04 +0000 (UTC) (envelope-from sathya@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D39108FC13 for ; Mon, 1 Jun 2009 12:54:04 +0000 (UTC) (envelope-from sathya@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51Cs4gL077748 for ; Mon, 1 Jun 2009 12:54:04 GMT (envelope-from sathya@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51Cs4jL077746 for perforce@freebsd.org; Mon, 1 Jun 2009 12:54:04 GMT (envelope-from sathya@FreeBSD.org) Date: Mon, 1 Jun 2009 12:54:04 GMT Message-Id: <200906011254.n51Cs4jL077746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sathya@FreeBSD.org using -f From: Satish Srinivasan To: Perforce Change Reviews Cc: Subject: PERFORCE change 163257 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 12:54:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=163257 Change 163257 by sathya@sathya-fbsd on 2009/06/01 12:53:43 Parse praudit's XML output to write as BSM records. Affected files ... .. //depot/projects/soc2009/trailconv/Makefile#2 edit .. //depot/projects/soc2009/trailconv/sample-log.xml#1 add .. //depot/projects/soc2009/trailconv/xml2bsm.c#1 add .. //depot/projects/soc2009/trailconv/xml2bsm.h#1 add Differences ... ==== //depot/projects/soc2009/trailconv/Makefile#2 (text+ko) ==== @@ -1,5 +1,8 @@ -all: log2bsm.c +log2bsm: log2bsm.c cc -o log2bsm log2bsm.c -clean: log2bsm - rm log2bsm+xml2bsm: xml2bsm.c xml2bsm.h + cc -o xml2bsm xml2bsm.c -I/usr/local/include/ /usr/local/lib/libparsifal.so + +clean: xml2bsm + rm xml2bsm log2bsm From owner-p4-projects@FreeBSD.ORG Mon Jun 1 13:03:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F8B7106566B; Mon, 1 Jun 2009 13:03: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 1CD731065674 for ; Mon, 1 Jun 2009 13:03:14 +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 09ED98FC0C for ; Mon, 1 Jun 2009 13:03:14 +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 n51D3DYV079408 for ; Mon, 1 Jun 2009 13:03:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51D3DLp079406 for perforce@freebsd.org; Mon, 1 Jun 2009 13:03:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 1 Jun 2009 13:03:13 GMT Message-Id: <200906011303.n51D3DLp079406@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 163258 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 13:03:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163258 Change 163258 by hselasky@hselasky_laptop001 on 2009/06/01 13:02:33 IFC (more) Affected files ... .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#32 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#14 integrate Differences ... ==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#32 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ - * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c 192984 2009-05-28 17:36:36Z thompsa $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.41 2009/05/29 18:46:57 thompsa Exp $ */ /* @@ -238,12 +238,12 @@ ****************************************************************************/ /* USB methods */ -static usb2_callback_t ubt_ctrl_write_callback; -static usb2_callback_t ubt_intr_read_callback; -static usb2_callback_t ubt_bulk_read_callback; -static usb2_callback_t ubt_bulk_write_callback; -static usb2_callback_t ubt_isoc_read_callback; -static usb2_callback_t ubt_isoc_write_callback; +static usb_callback_t ubt_ctrl_write_callback; +static usb_callback_t ubt_intr_read_callback; +static usb_callback_t ubt_bulk_read_callback; +static usb_callback_t ubt_bulk_write_callback; +static usb_callback_t ubt_isoc_read_callback; +static usb_callback_t ubt_isoc_write_callback; static int ubt_fwd_mbuf_up(ubt_softc_p, struct mbuf **); static int ubt_isoc_read_one_frame(struct usb_xfer *, int); ==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#14 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt_var.h,v 1.2 2003/03/22 23:44:36 max Exp $ - * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h 192984 2009-05-28 17:36:36Z thompsa $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h,v 1.11 2009/05/28 17:36:36 thompsa Exp $ */ #ifndef _NG_UBT_VAR_H_ From owner-p4-projects@FreeBSD.ORG Mon Jun 1 13:17:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 180061065676; Mon, 1 Jun 2009 13:17:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C887B1065674 for ; Mon, 1 Jun 2009 13:17:28 +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 B60F28FC13 for ; Mon, 1 Jun 2009 13:17:28 +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 n51DHSs1080683 for ; Mon, 1 Jun 2009 13:17:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51DHSF1080681 for perforce@freebsd.org; Mon, 1 Jun 2009 13:17:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 1 Jun 2009 13:17:28 GMT Message-Id: <200906011317.n51DHSF1080681@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 163260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 13:17:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=163260 Change 163260 by hselasky@hselasky_laptop001 on 2009/06/01 13:16:45 IFC (more) Affected files ... .. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#27 integrate Differences ... ==== //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#27 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c 192984 2009-05-28 17:36:36Z thompsa $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.24 2009/05/29 18:46:57 thompsa Exp $ */ #include "usbdevs.h" @@ -79,16 +79,16 @@ static device_attach_t ubtbcmfw_attach; static device_detach_t ubtbcmfw_detach; -static usb2_callback_t ubtbcmfw_write_callback; -static usb2_callback_t ubtbcmfw_read_callback; +static usb_callback_t ubtbcmfw_write_callback; +static usb_callback_t ubtbcmfw_read_callback; -static usb2_fifo_close_t ubtbcmfw_close; -static usb2_fifo_cmd_t ubtbcmfw_start_read; -static usb2_fifo_cmd_t ubtbcmfw_start_write; -static usb2_fifo_cmd_t ubtbcmfw_stop_read; -static usb2_fifo_cmd_t ubtbcmfw_stop_write; -static usb2_fifo_ioctl_t ubtbcmfw_ioctl; -static usb2_fifo_open_t ubtbcmfw_open; +static usb_fifo_close_t ubtbcmfw_close; +static usb_fifo_cmd_t ubtbcmfw_start_read; +static usb_fifo_cmd_t ubtbcmfw_start_write; +static usb_fifo_cmd_t ubtbcmfw_stop_read; +static usb_fifo_cmd_t ubtbcmfw_stop_write; +static usb_fifo_ioctl_t ubtbcmfw_ioctl; +static usb_fifo_open_t ubtbcmfw_open; static struct usb_fifo_methods ubtbcmfw_fifo_methods = { From owner-p4-projects@FreeBSD.ORG Mon Jun 1 13:33:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B4301065670; Mon, 1 Jun 2009 13:33: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 EF78E106564A for ; Mon, 1 Jun 2009 13:33:45 +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 DC7088FC12 for ; Mon, 1 Jun 2009 13:33:45 +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 n51DXjia081948 for ; Mon, 1 Jun 2009 13:33:45 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51DXjc5081946 for perforce@freebsd.org; Mon, 1 Jun 2009 13:33:45 GMT (envelope-from zec@fer.hr) Date: Mon, 1 Jun 2009 13:33:45 GMT Message-Id: <200906011333.n51DXjc5081946@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 163261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 13:33:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=163261 Change 163261 by zec@zec_amdx4 on 2009/06/01 13:33:33 Garbage collect diffs against head while working towards unbreaking options VIMAGE build. Affected files ... .. //depot/projects/vimage/src/sys/net/if_loop.c#48 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#34 edit .. //depot/projects/vimage/src/sys/netinet/if_ether.c#44 edit .. //depot/projects/vimage/src/sys/netinet/in_var.h#20 edit .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#46 edit .. //depot/projects/vimage/src/sys/netinet/sctp_crc32.c#14 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#38 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#84 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#53 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#33 edit .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#34 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#56 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#59 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#35 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_loop.c#48 (text+ko) ==== @@ -98,13 +98,7 @@ #define LO_CSUM_SET (CSUM_DATA_VALID | CSUM_PSEUDO_HDR | \ CSUM_IP_CHECKED | CSUM_IP_VALID | \ CSUM_SCTP_VALID) -#define LONAME "lo" -struct lo_softc { - struct ifnet *sc_ifp; - LIST_ENTRY(lo_softc) sc_next; -}; - int loioctl(struct ifnet *, u_long, caddr_t); static void lortrequest(int, struct rtentry *, struct rt_addrinfo *); int looutput(struct ifnet *ifp, struct mbuf *m, @@ -136,32 +130,21 @@ }; #endif /* !VIMAGE_GLOBALS */ -static MALLOC_DEFINE(M_LO, LONAME, "Loopback Interface"); - -static struct mtx lo_mtx; - IFC_SIMPLE_DECLARE(lo, 1); static void lo_clone_destroy(struct ifnet *ifp) { - struct lo_softc *sc; #ifdef INVARIANTS INIT_VNET_NET(ifp->if_vnet); #endif - sc = ifp->if_softc; - /* XXX: destroying lo0 will lead to panics. */ KASSERT(V_loif != ifp, ("%s: destroying lo0", __func__)); - mtx_lock(&lo_mtx); - LIST_REMOVE(sc, sc_next); - mtx_unlock(&lo_mtx); bpfdetach(ifp); if_detach(ifp); if_free(ifp); - free(sc, M_LO); } static int @@ -169,16 +152,10 @@ { INIT_VNET_NET(curvnet); struct ifnet *ifp; - struct lo_softc *sc; - MALLOC(sc, struct lo_softc *, sizeof(*sc), M_LO, M_WAITOK | M_ZERO); - ifp = sc->sc_ifp = if_alloc(IFT_LOOP); - if (ifp == NULL) { - free(sc, M_LO); + ifp = if_alloc(IFT_LOOP); + if (ifp == NULL) return (ENOSPC); - } - if (V_loif == NULL) - V_loif = ifp; if_initname(ifp, ifc->ifc_name, unit); ifp->if_mtu = LOMTU; @@ -188,11 +165,10 @@ ifp->if_snd.ifq_maxlen = ifqmaxlen; ifp->if_capabilities = ifp->if_capenable = IFCAP_HWCSUM; ifp->if_hwassist = LO_CSUM_FEATURES; - ifp->if_softc = sc; if_attach(ifp); bpfattach(ifp, DLT_NULL, sizeof(u_int32_t)); - mtx_lock(&lo_mtx); - mtx_unlock(&lo_mtx); + if (V_loif == NULL) + V_loif = ifp; return (0); } @@ -218,27 +194,10 @@ static int vnet_loif_idetach(unused) const void *unused; { - INIT_VNET_NET(curvnet); - struct lo_softc *sc, *nsc; - LIST_FOREACH_SAFE(sc, &V_lo_list, sc_next, nsc) { - struct ifnet *ifp = sc->sc_ifp; + /* XXX nothing done here - revisit! */ - if (ifp == V_loif) { - /* - * A hack to allow lo0 to be detached: - * bump if_unit number from 0 to 1. By - * setting V_loif to NULL we prevent queuing - * of routing messages that would have - * m_pkthdr.rcvif pointing to a nonexisting - * ifnet, i.e. the lo0 we just destroyed. - */ - ifp->if_dunit = 1; - V_loif = NULL; - } - if_clone_destroy(ifp->if_xname); - } - return 0; + return (0); } #endif @@ -248,7 +207,6 @@ switch (type) { case MOD_LOAD: - mtx_init(&lo_mtx, "lo_mtx", NULL, MTX_DEF); #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_loif_modinfo); #else ==== //depot/projects/vimage/src/sys/net80211/ieee80211.c#34 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include -#include #include #include @@ -249,9 +248,6 @@ struct ifaddr *ifa; KASSERT(ifp->if_type == IFT_IEEE80211, ("if_type %d", ifp->if_type)); -#ifdef VIMAGE - ifp->if_reassign = NULL; /* Override ether_reassign() */ -#endif IEEE80211_LOCK_INIT(ic, ifp->if_xname); TAILQ_INIT(&ic->ic_vaps); @@ -742,30 +738,6 @@ IEEE80211_UNLOCK(ic); } -#ifdef VIMAGE -void -ieee80211_reassign( struct ieee80211vap *vap, struct vnet *vnet, char *dname) -{ - struct ifnet *ifp = vap->iv_ifp; - u_char eaddr[6]; - - bcopy(IF_LLADDR(ifp), eaddr, 6); - bpfdetach(ifp); - ether_ifdetach(ifp); - ifp->if_bpf = NULL; - vap->iv_rawbpf = NULL; - if_reassign_common(ifp, vnet, ifp->if_dname); - if (dname) - snprintf(ifp->if_xname, IFNAMSIZ, "%s", dname); - - CURVNET_SET_QUIET(vnet); - ether_ifattach(ifp, eaddr); - bpfattach2(ifp, DLT_IEEE802_11, - sizeof(struct ieee80211_frame_addr4), &vap->iv_rawbpf); - CURVNET_RESTORE(); -} -#endif - static __inline int mapgsm(u_int freq, u_int flags) { ==== //depot/projects/vimage/src/sys/netinet/if_ether.c#44 (text+ko) ==== @@ -822,9 +822,9 @@ #else arp_iattach(NULL); #endif + arpintrq.ifq_maxlen = 50; mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); netisr_register(NETISR_ARP, arpintr, &arpintrq, 0); } - SYSINIT(arp, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, arp_init, 0); ==== //depot/projects/vimage/src/sys/netinet/in_var.h#20 (text+ko) ==== @@ -108,15 +108,6 @@ extern u_long in_ifaddrhmask; /* mask for hash table */ #endif -/* - * IP datagram reassembly. - */ -#define IPREASS_NHASH_LOG2 6 -#define IPREASS_NHASH (1 << IPREASS_NHASH_LOG2) -#define IPREASS_HMASK (IPREASS_NHASH - 1) -#define IPREASS_HASH(x,y) \ - (((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK) - #define INADDR_NHASH_LOG2 9 #define INADDR_NHASH (1 << INADDR_NHASH_LOG2) #define INADDR_HASHVAL(x) fnv_32_buf((&(x)), sizeof(x), FNV1_32_INIT) ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#46 (text+ko) ==== @@ -197,7 +197,6 @@ hashinit(1, M_PCB, &V_ripcbinfo.ipi_porthashmask); V_ripcbinfo.ipi_zone = uma_zcreate("ripcb", sizeof(struct inpcb), NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - V_ripcbinfo.ipi_vnet = curvnet; uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets); EVENTHANDLER_REGISTER(maxsockets_change, rip_zone_change, NULL, EVENTHANDLER_PRI_ANY); ==== //depot/projects/vimage/src/sys/netinet/sctp_crc32.c#14 (text+ko) ==== @@ -30,6 +30,7 @@ /* $KAME: sctp_crc32.c,v 1.12 2005/03/06 16:04:17 itojun Exp $ */ + #include __FBSDID("$FreeBSD: src/sys/netinet/sctp_crc32.c,v 1.17 2009/05/07 16:43:49 rrs Exp $"); ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#38 (text+ko) ==== @@ -216,8 +216,6 @@ /* * Allocate the hostcache entries. - * - * XXX don't need a separate zone for each hc instance - revisit!!! */ V_tcp_hostcache.zone = uma_zcreate("hostcache", sizeof(struct hc_metrics), ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#84 (text+ko) ==== @@ -290,6 +290,7 @@ { INIT_VNET_INET(curvnet); + uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); uma_zone_set_max(V_tcpcb_zone, maxsockets); tcp_tw_zone_change(); } @@ -345,17 +346,6 @@ V_tcp_autosndbuf_inc = 8*1024; V_tcp_autosndbuf_max = 256*1024; - /* - * These have to be type stable for the benefit of the timers. - */ - V_tcpcb_zone = uma_zcreate("tcpcb", sizeof(struct tcpcb_mem), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(V_tcpcb_zone, maxsockets); - V_sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - - tcp_tw_init(); - V_tcp_do_sack = 1; V_tcp_sack_maxholes = 128; V_tcp_sack_globalmaxholes = 65536; @@ -367,10 +357,10 @@ INP_INFO_LOCK_INIT(&V_tcbinfo, "tcp"); LIST_INIT(&V_tcb); - V_tcbinfo.ipi_listhead = &V_tcb; #ifdef VIMAGE V_tcbinfo.ipi_vnet = curvnet; #endif + V_tcbinfo.ipi_listhead = &V_tcb; hashsize = TCBHASHSIZE; TUNABLE_INT_FETCH("net.inet.tcp.tcbhashsize", &hashsize); if (!powerof2(hashsize)) { @@ -426,10 +416,6 @@ panic("tcp_init"); #undef TCP_MINPROTOHDR - - if (!IS_DEFAULT_VNET(curvnet)) - return; - ISN_LOCK_INIT(); callout_init(&isn_callout, CALLOUT_MPSAFE); callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); @@ -737,10 +723,10 @@ if (tm == NULL) return (NULL); tp = &tm->tcb; - tp->t_timers = &tm->tt; #ifdef VIMAGE tp->t_vnet = inp->inp_vnet; #endif + tp->t_timers = &tm->tt; /* LIST_INIT(&tp->t_segq); */ /* XXX covered by M_ZERO */ tp->t_maxseg = tp->t_maxopd = #ifdef INET6 ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#53 (text+ko) ==== @@ -271,7 +271,6 @@ } /* Create the syncache entry zone. */ - /* XXX one zone for all vnets should do fine - revisit!!! */ V_tcp_syncache.zone = uma_zcreate("syncache", sizeof(struct syncache), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_set_max(V_tcp_syncache.zone, V_tcp_syncache.cache_limit); ==== //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#33 (text+ko) ==== @@ -170,8 +170,6 @@ { INIT_VNET_INET(curvnet); - TAILQ_INIT(&V_twq_2msl); - V_tcptw_zone = uma_zcreate("tcptw", sizeof(struct tcptw), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); TUNABLE_INT_FETCH("net.inet.tcp.maxtcptw", &maxtcptw); @@ -179,6 +177,7 @@ uma_zone_set_max(V_tcptw_zone, tcptw_auto_size()); else uma_zone_set_max(V_tcptw_zone, maxtcptw); + TAILQ_INIT(&V_twq_2msl); } #ifdef VIMAGE ==== //depot/projects/vimage/src/sys/netinet/tcp_var.h#34 (text+ko) ==== @@ -541,7 +541,6 @@ extern int ss_fltsz; extern int ss_fltsz_local; -extern int tcp_autorcvbuf; extern int blackhole; extern int drop_synfin; extern int tcp_do_rfc3042; ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#56 (text+ko) ==== @@ -179,9 +179,6 @@ V_udp_blackhole = 0; - EVENTHANDLER_REGISTER(maxsockets_change, udp_zone_change, NULL, - EVENTHANDLER_PRI_ANY); - INP_INFO_LOCK_INIT(&V_udbinfo, "udp"); LIST_INIT(&V_udb); #ifdef VIMAGE @@ -194,13 +191,14 @@ &V_udbinfo.ipi_porthashmask); V_udbinfo.ipi_zone = uma_zcreate("udp_inpcb", sizeof(struct inpcb), NULL, NULL, udp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - V_udbinfo.ipi_vnet = curvnet; uma_zone_set_max(V_udbinfo.ipi_zone, maxsockets); V_udpcb_zone = uma_zcreate("udpcb", sizeof(struct udpcb), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); uma_zone_set_max(V_udpcb_zone, maxsockets); + EVENTHANDLER_REGISTER(maxsockets_change, udp_zone_change, NULL, + EVENTHANDLER_PRI_ANY); } int ==== //depot/projects/vimage/src/sys/netinet/vinet.h#59 (text+ko) ==== @@ -313,7 +313,7 @@ #define V_reply_src VNET_INET(reply_src) #define V_ripcb VNET_INET(ripcb) #define V_ripcbinfo VNET_INET(ripcbinfo) -/* #define V_router_info_head VNET_INET(router_info_head) */ +#define V_router_info_head VNET_INET(router_info_head) #define V_rsvp_on VNET_INET(rsvp_on) #define V_rtq_minreallyold VNET_INET(rtq_minreallyold) #define V_rtq_reallyold VNET_INET(rtq_reallyold) @@ -370,8 +370,6 @@ #define V_tcp_syncookies VNET_INET(tcp_syncookies) #define V_tcp_syncookiesonly VNET_INET(tcp_syncookiesonly) #define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt) -#define V_tcpcb_zone VNET_INET(tcpcb_zone) -#define V_tcptw_zone VNET_INET(tcptw_zone) #define V_tcpstat VNET_INET(tcpstat) #define V_twq_2msl VNET_INET(twq_2msl) #define V_udb VNET_INET(udb) ==== //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#35 (text+ko) ==== @@ -1520,11 +1520,7 @@ if (v3) { tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED); if (fmode & O_EXCL) { -#ifdef NFS_LEGACYRPC - CURVNET_SET(VFSTONFS(dvp->v_mount)->nm_so->so_vnet); -#else - CURVNET_SET(VFSTONFS(dvp->v_mount)->nm_rpcclnt.rc_so->so_vnet); -#endif + CURVNET_SET(P_TO_VNET(&proc0)); /* XXX revisit! */ *tl = txdr_unsigned(NFSV3CREATE_EXCLUSIVE); tl = nfsm_build(u_int32_t *, NFSX_V3CREATEVERF); #ifdef INET From owner-p4-projects@FreeBSD.ORG Mon Jun 1 14:05:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 957B31065680; Mon, 1 Jun 2009 14:05: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 46221106567D for ; Mon, 1 Jun 2009 14:05:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 190038FC1C for ; Mon, 1 Jun 2009 14:05:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51E5HZ2085357 for ; Mon, 1 Jun 2009 14:05:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51E5Hje085355 for perforce@freebsd.org; Mon, 1 Jun 2009 14:05:17 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 1 Jun 2009 14:05:17 GMT Message-Id: <200906011405.n51E5Hje085355@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 163262 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 14:05:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=163262 Change 163262 by rene@rene_self on 2009/06/01 14:05:05 MFen handbook/firewalls 1.86->1.89 (first diff chunk only -- who is on it?) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#7 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.33 2006/01/05 21:13:21 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml - %SRCID% 1.86 + %SRCID% 1.89 --> @@ -30,6 +30,10 @@ Mazeland Vertaald door + + René + Ladan + @@ -138,12 +142,22 @@ alleen verkeer toe dat past bij de regels en blokkeert al het overige verkeer. - Inclusieve firewalls zijn in het algemeen veiliger dan - exclusieve firewalls omdat ze het risico op het toestaan van - ongewild verkeer door een firewall aanzienlijk reduceren. + Een inclusieve firewall biedt veel betere controle over het + uitgaande verkeer, waardoor het een betere keuze is voor systemen + die diensten op het publieke Internet aanbieden. Het beheert ook + het type vekeer dat van het publieke Internet afkomt en toegang + heeft tot uw privé-netwerk. Al het verkeer dat niet aan + de regels voldoet wordt geblokkeerd en gelogd, dat is zo + ontworpen. Inclusieve firewalls zijn over het algemeen veiliger + dan exclusieve firewalls omdat ze het risico dat ongewenst verkeer + door ze heen gaat aanzienlijk verminderen. + + Tenzij anders aangegeven, creëeren alle configuratie- + en voorbeelden van regelverzamelingen inclusieve firewalls. + De beveiliging kan nog verder vergroot worden met een - stateful firewall. Een stateful firewall houdt + stateful firewall. Dit type firewall houdt bij welke connecties er door de firewall tot stand zijn gekomen en laat alleen verkeer door dat bij een bestaande connectie hoort of onderdeel is van een connectie in opbouw. Het nadeel van een From owner-p4-projects@FreeBSD.ORG Mon Jun 1 15:00:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A9441065676; Mon, 1 Jun 2009 15:00:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D49CA106566C for ; Mon, 1 Jun 2009 15:00:21 +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 C17528FC1B for ; Mon, 1 Jun 2009 15:00:21 +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 n51F0KIU090375 for ; Mon, 1 Jun 2009 15:00:20 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51F0JIG090373 for perforce@freebsd.org; Mon, 1 Jun 2009 15:00:19 GMT (envelope-from gabor@freebsd.org) Date: Mon, 1 Jun 2009 15:00:19 GMT Message-Id: <200906011500.n51F0JIG090373@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 163266 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 15:00:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=163266 Change 163266 by gabor@gabor_server on 2009/06/01 14:59:34 - Make this WARNS=6 clean Affected files ... .. //depot/projects/soc2008/gabor_textproc/dc/Makefile#2 edit .. //depot/projects/soc2008/gabor_textproc/dc/bcode.c#2 edit .. //depot/projects/soc2008/gabor_textproc/dc/bcode.h#2 edit .. //depot/projects/soc2008/gabor_textproc/dc/dc.c#2 edit .. //depot/projects/soc2008/gabor_textproc/dc/inout.c#2 edit .. //depot/projects/soc2008/gabor_textproc/dc/stack.c#2 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/dc/Makefile#2 (text+ko) ==== @@ -2,9 +2,9 @@ PROG= dc SRCS= dc.c bcode.c inout.c mem.c stack.c -COPTS+= -Wall -CFLAGS+= -std=c99 -Wall -pedantic LDADD= -lcrypto DPADD= ${LIBCRYPTO} +WARNS?= 6 + .include ==== //depot/projects/soc2008/gabor_textproc/dc/bcode.c#2 (text+ko) ==== @@ -34,6 +34,8 @@ /* #define DEBUGGING */ +#define __inline + #define MAX_ARRAY_INDEX 2048 #define READSTACK_SIZE 8 @@ -58,26 +60,26 @@ static struct bmachine bmachine; static void sighandler(int); -static inline int readch(void); -static inline void unreadch(void); -static inline char *readline(void); -static inline void src_free(void); +static __inline int readch(void); +static __inline void unreadch(void); +static __inline char *readline(void); +static __inline void src_free(void); -static inline u_int max(u_int, u_int); +static __inline u_int max(u_int, u_int); static u_long get_ulong(struct number *); -static inline void push_number(struct number *); -static inline void push_string(char *); -static inline void push(struct value *); -static inline struct value *tos(void); -static inline struct number *pop_number(void); -static inline char *pop_string(void); -static inline void clear_stack(void); -static inline void print_tos(void); +static __inline void push_number(struct number *); +static __inline void push_string(char *); +static __inline void push(struct value *); +static __inline struct value *tos(void); +static __inline struct number *pop_number(void); +static __inline char *pop_string(void); +static __inline void clear_stack(void); +static __inline void print_tos(void); static void pop_print(void); static void pop_printn(void); -static inline void print_stack(void); -static inline void dup(void); +static __inline void print_stack(void); +static __inline void dup(void); static void swap(void); static void drop(void); @@ -223,18 +225,21 @@ #define JUMP_TABLE_DATA_SIZE \ (sizeof(jump_table_data)/sizeof(jump_table_data[0])) -/* ARGSUSED */ static void sighandler(int ignored) { - bmachine.interrupted = true; + switch (ignored) + { + default: + bmachine.interrupted = true; + } } void init_bmachine(bool extended_registers) { - int i; + unsigned int i; bmachine.extended_regs = extended_registers; bmachine.reg_array_size = bmachine.extended_regs ? @@ -275,7 +280,7 @@ bmachine.readstack[0] = *src; } -static inline int +static __inline int readch(void) { struct source *src = &bmachine.readstack[bmachine.readsp]; @@ -283,7 +288,7 @@ return (src->vtable->readchar(src)); } -static inline void +static __inline void unreadch(void) { struct source *src = &bmachine.readstack[bmachine.readsp]; @@ -291,7 +296,7 @@ src->vtable->unreadchar(src); } -static inline char * +static __inline char * readline(void) { struct source *src = &bmachine.readstack[bmachine.readsp]; @@ -299,7 +304,7 @@ return (src->vtable->readline(src)); } -static inline void +static __inline void src_free(void) { struct source *src = &bmachine.readstack[bmachine.readsp]; @@ -332,7 +337,7 @@ #endif -static inline u_int +static __inline u_int max(u_int a, u_int b) { @@ -347,7 +352,7 @@ void scale_number(BIGNUM *n, int s) { - int abs_scale; + unsigned int abs_scale; if (s == 0) return; @@ -417,7 +422,7 @@ } } -inline void +__inline void normalize(struct number *n, u_int s) { @@ -440,70 +445,70 @@ bn_check(BN_sub(n->number, &zero, n->number)); } -static inline void +static __inline void push_number(struct number *n) { stack_pushnumber(&bmachine.stack, n); } -static inline void +static __inline void push_string(char *string) { stack_pushstring(&bmachine.stack, string); } -static inline void +static __inline void push(struct value *v) { stack_push(&bmachine.stack, v); } -static inline struct value * +static __inline struct value * tos(void) { return (stack_tos(&bmachine.stack)); } -static inline struct value * +static __inline struct value * pop(void) { return (stack_pop(&bmachine.stack)); } -static inline struct number * +static __inline struct number * pop_number(void) { return (stack_popnumber(&bmachine.stack)); } -static inline char * +static __inline char * pop_string(void) { return (stack_popstring(&bmachine.stack)); } -static inline void +static __inline void clear_stack(void) { stack_clear(&bmachine.stack); } -static inline void +static __inline void print_stack(void) { stack_print(stdout, &bmachine.stack, "", bmachine.obase); } -static inline void +static __inline void print_tos(void) { struct value *value = tos(); @@ -550,7 +555,7 @@ } } -static inline void +static __inline void dup(void) { @@ -792,7 +797,7 @@ } else idx = (ch1 << 8) + ch2 + UCHAR_MAX + 1; } - if (idx < 0 || idx >= bmachine.reg_array_size) { + if (idx < 0 || (unsigned)idx >= bmachine.reg_array_size) { warnx("internal error: reg num = %d", idx); idx = -1; } @@ -1762,7 +1767,7 @@ fprintf(stderr, "%zd =>\n", bmachine.readsp); #endif - if (0 <= ch && ch < UCHAR_MAX) + if (0 <= ch && ch < (signed)UCHAR_MAX) (*jump_table[ch])(); else warnx("internal error: opcode %d", ch); ==== //depot/projects/soc2008/gabor_textproc/dc/bcode.h#2 (text+ko) ==== @@ -59,7 +59,7 @@ struct stack { struct value *stack; ssize_t sp; - size_t size; + ssize_t size; }; struct source; ==== //depot/projects/soc2008/gabor_textproc/dc/dc.c#2 (text+ko) ==== @@ -83,7 +83,7 @@ { int ch; bool extended_regs = false; - char *buf, *p; + char *buf; bool preproc_done = false; if ((buf = strdup("")) == NULL) ==== //depot/projects/soc2008/gabor_textproc/dc/inout.c#2 (text+ko) ==== @@ -35,7 +35,6 @@ static int src_getcharstream(struct source *); static void src_ungetcharstream(struct source *); static char *src_getlinestream(struct source *); -static void src_freestream(struct source *); static int src_getcharstring(struct source *); static void src_ungetcharstring(struct source *); static char *src_getlinestring(struct source *); @@ -49,7 +48,7 @@ src_getcharstream, src_ungetcharstream, src_getlinestream, - src_freestream + NULL }; static struct vtable string_vtable = { @@ -86,12 +85,6 @@ ungetc(src->lastchar, src->u.stream); } -/* ARGSUSED */ -static void -src_freestream(struct source *src) -{ -} - static char * src_getlinestream(struct source *src) { @@ -293,7 +286,7 @@ int digits; char buf[11]; size_t sz; - int i; + unsigned int i; struct stack stack; char *p; ==== //depot/projects/soc2008/gabor_textproc/dc/stack.c#2 (text+ko) ==== @@ -26,14 +26,14 @@ #include "extern.h" -static inline bool stack_empty(const struct stack *); +static __inline bool stack_empty(const struct stack *); static void stack_grow(struct stack *); static struct array *array_new(void); -static inline void array_free(struct array *); +static __inline void array_free(struct array *); static struct array * array_dup(const struct array *); -static inline void array_grow(struct array *, size_t); -static inline void array_assign(struct array *, size_t, const struct value *); -static inline struct value *array_retrieve(const struct array *, size_t); +static __inline void array_grow(struct array *, size_t); +static __inline void array_assign(struct array *, size_t, const struct value *); +static __inline struct value *array_retrieve(const struct array *, size_t); void stack_init(struct stack *stack) @@ -43,7 +43,7 @@ stack->stack = NULL; } -static inline bool +static __inline bool stack_empty(const struct stack *stack) { bool empty = stack->sp == -1; @@ -274,7 +274,7 @@ return a; } -static inline void +static __inline void array_free(struct array *a) { size_t i; @@ -302,7 +302,7 @@ return n; } -static inline void +static __inline void array_grow(struct array *array, size_t newsize) { size_t i; @@ -315,25 +315,25 @@ array->size = newsize; } -static inline void -array_assign(struct array *array, size_t index, const struct value *v) +static __inline void +array_assign(struct array *array, size_t i, const struct value *v) { - if (index >= array->size) - array_grow(array, index+1); - stack_free_value(&array->data[index]); - array->data[index] = *v; + if (i >= array->size) + array_grow(array, i + 1); + stack_free_value(&array->data[i]); + array->data[i] = *v; } -static inline struct value * -array_retrieve(const struct array *array, size_t index) +static __inline struct value * +array_retrieve(const struct array *array, size_t i) { - if (index >= array->size) + if (i >= array->size) return NULL; - return &array->data[index]; + return &array->data[i]; } void -frame_assign(struct stack *stack, size_t index, const struct value *v) +frame_assign(struct stack *stack, size_t i, const struct value *v) { struct array *a; struct value n; @@ -347,11 +347,11 @@ a = stack->stack[stack->sp].array; if (a == NULL) a = stack->stack[stack->sp].array = array_new(); - array_assign(a, index, v); + array_assign(a, i, v); } struct value * -frame_retrieve(const struct stack *stack, size_t index) +frame_retrieve(const struct stack *stack, size_t i) { struct array *a; @@ -360,5 +360,5 @@ a = stack->stack[stack->sp].array; if (a == NULL) a = stack->stack[stack->sp].array = array_new(); - return array_retrieve(a, index); + return array_retrieve(a, i); } From owner-p4-projects@FreeBSD.ORG Mon Jun 1 15:54:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E896510656D7; Mon, 1 Jun 2009 15:54: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 9CE9C10656D4 for ; Mon, 1 Jun 2009 15:54:17 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 895458FC28 for ; Mon, 1 Jun 2009 15:54:17 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51FsH63095696 for ; Mon, 1 Jun 2009 15:54:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51FsHiQ095694 for perforce@freebsd.org; Mon, 1 Jun 2009 15:54:17 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 1 Jun 2009 15:54:17 GMT Message-Id: <200906011554.n51FsHiQ095694@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 163272 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 15:54:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=163272 Change 163272 by rene@rene_self on 2009/06/01 15:53:18 [website]: * don't build publish.sgml for now, it is untranslated * add commented out rule for y2kbug.sgml to Makefile * use &enbase; for untranslated web pages and links pointing to the (Dutch) doc/ space Affected files ... .. //depot/projects/docproj_nl/www/nl/Makefile#8 edit .. //depot/projects/docproj_nl/www/nl/about.sgml#5 edit .. //depot/projects/docproj_nl/www/nl/index.xsl#6 edit .. //depot/projects/docproj_nl/www/nl/mailto.sgml#4 edit .. //depot/projects/docproj_nl/www/nl/send-pr.sgml#4 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#4 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#5 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#4 edit .. //depot/projects/docproj_nl/www/nl/support.sgml#4 edit .. //depot/projects/docproj_nl/www/nl/where.sgml#5 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/Makefile#8 (text+ko) ==== @@ -21,11 +21,12 @@ DOCS+= internet.sgml DOCS+= logo.sgml DOCS+= mailto.sgml -DOCS+= publish.sgml +#DOCS+= publish.sgml DOCS+= relnotes.sgml DOCS+= send-pr.sgml DOCS+= support.sgml DOCS+= where.sgml +#DOCS+= y2kbug.sgml XMLDOCS= index:xsl:${XML_NEWS_NEWS}: DEPENDSET.index=transtable mirrors news press events \ ==== //depot/projects/docproj_nl/www/nl/about.sgml#5 (text+ko) ==== @@ -62,7 +62,7 @@

    &os; kan vanaf een verscheidenheid van media geïnstalleerd worden inclusief CD-ROM, DVD of direct over het netwerk door middel van FTP of NFS. Alles wat u nodig heeft zijn + href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/install.html"> deze aanwijzingen.

    &os; is gratis

    @@ -77,7 +77,7 @@ href="&enbase;/copyright/index.html">kostenloos beschikbaar en wordt het met de volledige broncode geleverd. Indien u een kopie wilt kopen of downloaden om het uit te proberen, + href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/mirrors.html"> is meer informatie beschikbaar.

    Bijdragen aan &os;

    @@ -88,7 +88,7 @@ maken en dat terugsturen naar het Project door middel van send-pr of een committer, indien u er een kent. Dit kan variëren van documentatie tot kunst tot broncode. Zie het artikel + href="&enbase;/doc/nl_NL.ISO8859-1/articles/contributing/index.html"> Bijdragen aan &os; voor meer informatie.

    Zelfs als u geen programmeur bent, zijn er andere manieren om aan ==== //depot/projects/docproj_nl/www/nl/index.xsl#6 (text+ko) ==== @@ -84,7 +84,7 @@ geavanceerd netwerken, indrukwekkende beveiligingsmogelijkheden en topprestaties en wordt door sommige van 's werelds drukste + href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/nutshell.html#INTRODUCTION-NUTSHELL-USERS">drukste websites en de meest voorkomende embedded netwerk- en opslagapparaten gebruikt.

    @@ -195,7 +195,7 @@ FAQ
  • - Handboek + Handboek
  • Ports ==== //depot/projects/docproj_nl/www/nl/mailto.sgml#4 (text+ko) ==== @@ -25,7 +25,7 @@

    Vragen over de inhoud van deze webserver...

    Vragen of opmerkingen over onze documentatie (Handboek, + href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/index.html">Handboek, FAQ, Boeken & artikelen) dienen gericht te worden aan de &os; Documentatie Project mailinglijst, aangemeld of vermeld staat in de - FAQ.

    + FAQ.

    Vul het formulier alstublieft zo volledig mogelijk in. Zorg ervoor dat u het veld "Omgeving" als gevraagd invult met de uitvoer van de ==== //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#4 (text+ko) ==== @@ -17,7 +17,7 @@ Wettelijke mededelingen | © 1995-2009 Het FreeBSD Project. Alle rechten voorbehouden.'> -beginpagina   |   contact   |   legaal   |   ©right;'> +beginpagina   |   contact   |   legaal   |   ©right;'> &os; homepage'> @@ -133,7 +133,7 @@

  • Verkrijg &os;
  • Documentatie
  • Gemeenschap
    • -
  • Ontwikkelaars
    • +
  • Ontwikkelaars
  • Ondersteuning
  • Foundation
    • ==== //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#5 (text+ko) ==== @@ -80,14 +80,14 @@ - &os; nieuws

    &os; is een besturingssysteem dat zich snel ontwikkelt. Het bijhouden van de nieuwste ontwikkelingen kan een klus zijn! Zorg ervoor dat u periodiek deze pagina bekijkt om bovenop de dingen te blijven. U kunt zich ook op de freebsd-announce + href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/eresources.html#ERESOURCES-MAIL">freebsd-announce mailinglijst of de RSS-stroom abonneren.

    @@ -112,7 +112,7 @@ - Beginpagina nieuws + Beginpagina nieuws ==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#4 (text+ko) ==== @@ -14,8 +14,8 @@
  • Mogelijkheden
  • Applicaties
  • Internetwerken
    • -
  • Advocacy
    • -
  • Marketing
    • +
  • Advocacy
    • +
  • Marketing
  • Beheer
  • Nieuws
  • Evenementen
    • @@ -63,7 +63,7 @@
  • Uitgavebeheer
  • Platforms
  • Projectideeën
    • -
  • Bijdragen
    • +
  • Bijdragen
    • '> ]]> @@ -77,10 +77,10 @@
    • Documentatie
    • FAQ
      • -
    • Handboek
      • +
    • Handboek
    • Handleidingpagina's
    • Boeken en artikelen online
      • -
    • Publicaties
      • +
    • Publicaties
    • Bronnen op het web
    • Voor nieuwelingen
    • Documentatieproject
      • ==== //depot/projects/docproj_nl/www/nl/support.sgml#4 (text+ko) ==== @@ -16,10 +16,10 @@ deze website staat een gedetailleerd overzicht van de mogelijkheden voor ondersteuning voor gebruikers uit de &os; gemeenschap, inclusief een aantal mailinglijsten.

      + href="&enbase;/community/mailinglists.html">mailinglijsten.

      Commerciële ondersteuning is ook beschikbaar van een van de - vele leveranciers die + vele leveranciers die commerciële producten, diensten en/of advies voor, van of met &os; aanbieden.

      @@ -38,7 +38,7 @@ openstaande probleemrapporten te bekijken.

      Als er nog geen melding is gemaakt, lees dan eerst onze richtlijnen voor + href="&enbase;/support/bugreports.html">richtlijnen voor probleemrapportage en meld het probleem dan via het formulier probleemrapportage.

      ==== //depot/projects/docproj_nl/www/nl/where.sgml#5 (text+ko) ==== @@ -21,12 +21,12 @@ -

      &os; installeren

      +

      &os; installeren

      Er zijn vele opties voor het installeren van &os;, waaronder installatie van CD-ROM, DVD, floppy disk, een MS-DOS® partitie, magnetische tape, anonieme FTP en NFS. Lees de - installatiegids + installatiegids alvorens de hele &os;-distributie te downloaden.

      @@ -36,7 +36,7 @@

      &os; is op een CD-ROM of DVD te koop bij &os; Mall of een van de andere CD-ROM + href="&enbase;/doc/nl_NL.ISO8859-1/books/handbook/mirrors.html">CD-ROM en DVD verkopers.

      &os; downloaden

      @@ -46,7 +46,7 @@ Versie & platform Distributie - ISO + ISO Uitgave
      notities Hardware
      notities Installatie
      notities @@ -59,7 +59,7 @@ [Bekijk] [Bekijk] - [Bekijk] + [Bekijk] [Bekijk] @@ -168,7 +168,7 @@ toepassing.

      Als u &os; via FTP wilt downloaden, kijk dan in de lijst met - mirrorsites + mirrorsites in het handboek of er een site dichtbij is. Als alternatief kunt u &os; downloaden door middel van het BitTorrent-protocol. De .torrent-bestanden kunnen vanaf de Versie & platform Distributie - ISO + ISO Schema + ==== //depot/projects/docproj_nl/www/nl/internet.sgml#4 (text+ko) ==== @@ -1,5 +1,5 @@ + ]> ==== //depot/projects/docproj_nl/www/nl/logo.sgml#4 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; ==== //depot/projects/docproj_nl/www/nl/mailto.sgml#5 (text+ko) ==== @@ -1,5 +1,5 @@ + ]> ==== //depot/projects/docproj_nl/www/nl/relnotes.sgml#4 (text+ko) ==== @@ -1,5 +1,5 @@ + ]> ==== //depot/projects/docproj_nl/www/nl/send-pr.sgml#5 (text+ko) ==== @@ -1,5 +1,5 @@ + ==== //depot/projects/docproj_nl/www/nl/share/sgml/catalog#4 (text+ko) ==== @@ -1,5 +1,5 @@ -- - $FreeBSD: $ + $FreeBSD$ %SOURCE% en/share/sgml/catalog %SRCID% 1.1 -- ==== //depot/projects/docproj_nl/www/nl/share/sgml/catalog.xml#4 (text+ko) ==== @@ -1,7 +1,7 @@ - ==== //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#5 (text+ko) ==== @@ -1,4 +1,4 @@ - ==== //depot/projects/docproj_nl/www/nl/share/sgml/l10n.ent#5 (text+ko) ==== @@ -1,4 +1,4 @@ - ==== //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#6 (text+ko) ==== @@ -1,7 +1,7 @@ - ==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#5 (text+ko) ==== @@ -1,4 +1,4 @@ - ==== //depot/projects/docproj_nl/www/nl/support.sgml#5 (text+ko) ==== @@ -1,5 +1,5 @@ + ]> ==== //depot/projects/docproj_nl/www/nl/where.sgml#6 (text+ko) ==== @@ -1,5 +1,5 @@ + From owner-p4-projects@FreeBSD.ORG Mon Jun 1 18:22:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 038BB1065673; Mon, 1 Jun 2009 18:22:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A70221065693 for ; Mon, 1 Jun 2009 18:22:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 917BB8FC25 for ; Mon, 1 Jun 2009 18:22:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51IMtJ5024595 for ; Mon, 1 Jun 2009 18:22:55 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51IMpHG024589 for perforce@freebsd.org; Mon, 1 Jun 2009 18:22:51 GMT (envelope-from trasz@freebsd.org) Date: Mon, 1 Jun 2009 18:22:51 GMT Message-Id: <200906011822.n51IMpHG024589@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 18:22:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=163287 Change 163287 by trasz@trasz_victim on 2009/06/01 18:22:12 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#4 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/alias.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/eval.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/histedit.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/memalloc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/memalloc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/miscbltin.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/mkinit.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/mksyntax.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/trap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/CHANGES#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/FAQ#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/FAQ.xml#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/NSEC3-NOTES#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/README#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/README.idnkit#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/README.pkcs11#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dig.1#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dig.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dig.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dig.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.1#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/host.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/bind9.xsl#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/bind9.xsl.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/client.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/convertxsl.pl#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/globals.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/statschannel.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwaddr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwdgnba.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwdnoop.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwresd.8#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwresd.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwresd.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.8#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.conf.5#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.conf.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/named.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/query.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/server.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/statschannel.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/unix/include/named/os.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/unix/os.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/update.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.1#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/nsupdate/nsupdate.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc-confgen.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.8#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.docbook#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/rndc.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/config.guess#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/config.h.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/configure.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM-book.xml#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch01.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch02.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch03.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch04.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch05.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch06.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch07.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch08.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch09.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.ch10.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Bv9ARM.pdf#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dig.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-keygen.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.dnssec-signzone.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.host.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named-checkconf.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named-checkzone.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.named.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.nsupdate.html#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.rndc-confgen.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.rndc.conf.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/arm/man.rndc.html#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/draft/update#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/misc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/misc/format-options.pl#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/misc/migration#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/misc/options#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/misc/sort-options.pl#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/index#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1032.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1033.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1034.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1035.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1101.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1122.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1123.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1183.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1348.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1535.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1536.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1537.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1591.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1611.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1612.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1706.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1712.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1750.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1876.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1886.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1982.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1995.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc1996.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2052.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2104.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2119.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2133.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2136.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2137.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2163.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2168.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2181.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2230.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2308.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2317.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2373.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2374.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2375.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2418.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2535.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2536.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2537.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2538.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2539.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2540.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2541.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2553.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2671.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2672.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2673.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2782.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2825.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2826.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2845.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2874.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2915.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2929.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2930.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc2931.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3007.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3008.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3071.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3090.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3110.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3123.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3152.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3197.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3225.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3226.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3258.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3363.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3364.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3425.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3445.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3467.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3490.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3491.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3492.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3493.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3513.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3596.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3597.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3645.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3655.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3658.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3757.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3833.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3845.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc3901.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4025.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4033.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4034.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4035.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4074.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4159.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4193.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4255.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4343.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4367.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4398.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4408.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4431.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4470.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4634.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4641.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4648.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc4701.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc5155.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/doc/rfc/rfc952.txt#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/README#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/aclocal.m4#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/api#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/daemon.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/ftruncate.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/mktemp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/putenv.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/readv.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/setenv.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/setitimer.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/strdup.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/strerror.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/strpbrk.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/strsep.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/strtoul.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/utimes.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/bsd/writev.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/config.h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/configure.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/dst/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/dst/dst_api.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/dst/dst_internal.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/dst/hmac_link.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/dst/md5.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/dst/md5_dgst.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/dst/md5_locl.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/dst/support.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/arpa/inet.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/arpa/nameser.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/fd_setsize.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/hesiod.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/irp.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/irs.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/assertions.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/ctl.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/dst.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/eventlib.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/heap.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/list.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/logging.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/misc.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/platform.h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/isc/tree.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/netdb.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/netgroup.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/res_update.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/resolv.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/include/resolv_mt.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_addr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_data.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_net_pton.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_neta.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_netof.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_network.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_ntop.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/inet_pton.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/inet/nsap_addr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/dns.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/dns_gr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/dns_ho.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/dns_nw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/dns_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/dns_pr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/dns_pw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/dns_sv.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gai_strerror.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gen.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gen_gr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gen_ho.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gen_ng.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gen_nw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gen_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gen_pr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gen_pw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gen_sv.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getgrent.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getgrent_r.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gethostent.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/gethostent_r.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getnameinfo.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getnetent.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getnetent_r.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getnetgrent.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getnetgrent_r.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getprotoent.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getpwent.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getpwent_r.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getservent.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/getservent_r.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/hesiod.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/hesiod_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irp_gr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irp_ho.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irp_ng.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irp_nw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irp_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irp_pr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irp_pw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irp_sv.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irpmarshall.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irs_data.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irs_data.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/irs_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/lcl.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/lcl_gr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/lcl_ho.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/lcl_ng.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/lcl_nw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/lcl_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/lcl_pr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/lcl_pw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/lcl_sv.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nis.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nis_gr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nis_ho.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nis_ng.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nis_nw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nis_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nis_pr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nis_pw.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nis_sv.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/nul_ng.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/pathnames.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/irs/util.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/assertions.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/assertions.mdoc#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/base64.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/bitncmp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/ctl_clnt.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/ctl_p.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/ctl_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/ctl_srvr.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/ev_connects.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/ev_files.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/ev_streams.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/ev_timers.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/ev_waits.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/eventlib.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/eventlib_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/heap.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/heap.mdoc#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/hex.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/logging.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/logging.mdoc#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/logging_p.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/memcluster.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/movefile.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/tree.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/isc/tree.mdoc#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/make/includes.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/make/mkdep.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/make/rules.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/mkinstalldirs#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/ns_date.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/ns_name.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/ns_netint.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/ns_parse.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/ns_print.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/ns_sign.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/nameser/ns_verify.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/port/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/port/freebsd/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/port_after.h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/port_before.h.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/Makefile.in#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/herror.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/mtctxres.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_comp.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_data.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_debug.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_debug.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_init.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_mkquery.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_private.h#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_query.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_send.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind/resolv/res_update.c#2 delete .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/api#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/check.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/acache.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/adb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/api#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/cache.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dispatch.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dlz.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_parse.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_parse.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/acache.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/dispatch.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/dlz.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/iptable.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/nsec3.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/sdlz.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/iptable.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/journal.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/master.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/masterdump.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/message.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/nsec3.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/openssldsa_link.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/opensslrsa_link.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rbt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rbtdb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/spf_99.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/spf_99.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/txt_16.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/resolver.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/rootns.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/sdb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/spnego.asn1#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/spnego.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/spnego.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/spnego_asn1.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/spnego_asn1.pl#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/tkey.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/tsig.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/validator.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/view.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/zone.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/alpha/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/alpha/include/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/assertions.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/base32.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/httpd.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/ia64/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/ia64/include/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/assertions.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/base32.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/hmacsha.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/httpd.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/iterated_hash.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/lex.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/mem.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/msgs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/platform.h.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/portset.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/radix.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/sha2.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/stats.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/types.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/include/isc/xml.h#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/iterated_hash.c#1 branch .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/mem.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/mips/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/mips/include/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/mips/include/isc/atomic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/noatomic/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/noatomic/include/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 1 18:25:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 431F21065689; Mon, 1 Jun 2009 18:25: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 0048D1065687 for ; Mon, 1 Jun 2009 18:25:58 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C83988FC15 for ; Mon, 1 Jun 2009 18:25:58 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51IPwX3024830 for ; Mon, 1 Jun 2009 18:25:58 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51IPwWV024828 for perforce@freebsd.org; Mon, 1 Jun 2009 18:25:58 GMT (envelope-from syl@FreeBSD.org) Date: Mon, 1 Jun 2009 18:25:58 GMT Message-Id: <200906011825.n51IPwWV024828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163288 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 18:26:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=163288 Change 163288 by syl@syl_rincewind on 2009/06/01 18:25:54 - Fix libusb_open and libusb_open_device_with_vid_pid prototypes in libusb.3. - Fix a segfault in libusb_open_device_with_vid_pid(). - Fix a typo in libusb_open_device_with_vid_pid() prototype. - Implement test2 that dump string descriptor for a device opened with libusb_open_device_with_vid_pid(). Affected files ... .. //depot/projects/soc2009/syl_usb/libusb-tests/Makefile#2 edit .. //depot/projects/soc2009/syl_usb/libusb-tests/basic/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/basic/test2/Makefile#1 add .. //depot/projects/soc2009/syl_usb/libusb-tests/basic/test2/test2.c#1 add .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.3#4 edit .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#25 edit Differences ... ==== //depot/projects/soc2009/syl_usb/libusb-tests/Makefile#2 (text+ko) ==== @@ -1,4 +1,5 @@ -SUBDIR=descriptors +SUBDIR= descriptors \ + basic test: .for dir in ${SUBDIR} ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.3#4 (text+ko) ==== @@ -129,7 +129,7 @@ .Pp . .Ft int -.Fn libusb_open "libusb_device *dev" "libusb_device_handle *devh" +.Fn libusb_open "libusb_device *dev" "libusb_device_handle **devh" Open a device and obtain a device_handle. Return 0 on success, LIBUSB_ERROR_NO_MEM on memory allocation problem, LIBUSB_ERROR_ACCESS on permission problem, LIBUSB_ERROR_NO_DEVICE if the device has been @@ -138,7 +138,7 @@ .Pp . .Ft libusb_device_handle * -.Fn libusb_device_open_with_vid_pid "libusb_context *ctx" "uint16_t vid" "uint16_t pid" +.Fn libusb_open_device_with_vid_pid "libusb_context *ctx" "uint16_t vid" "uint16_t pid" Conveniance function to open a device with is .Fa vid and ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10.c#25 (text+ko) ==== @@ -374,7 +374,7 @@ } libusb_device_handle * -lib_usb_open_device_with_vid_pid(libusb_context * ctx, uint16_t vendor_id, +libusb_open_device_with_vid_pid(libusb_context * ctx, uint16_t vendor_id, uint16_t product_id) { struct libusb_device **devs; @@ -383,17 +383,20 @@ struct LIBUSB20_DEVICE_DESC_DECODED *pdesc; int i, j, k; + devh = NULL; + if ((i = libusb_get_device_list(ctx, &devs)) < 0) return (NULL); for (j = 0; j < i; j++) { - pdev = (struct libusb20_device *)devs[i]->os_priv; + pdev = (struct libusb20_device *)devs[j]->os_priv; pdesc = libusb20_dev_get_device_desc(pdev); if (pdesc->idVendor == vendor_id && pdesc->idProduct == product_id) - if ((k = libusb_open(devs[i], &devh)) < 0) + if ((k = libusb_open(devs[j], &devh)) < 0) devh = NULL; } + libusb_free_device_list(devs, 1); return (devh); } From owner-p4-projects@FreeBSD.ORG Mon Jun 1 19:38:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BDAC1065673; Mon, 1 Jun 2009 19:38:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29E4F106566B for ; Mon, 1 Jun 2009 19:38:22 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1873B8FC08 for ; Mon, 1 Jun 2009 19:38:22 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51JcLdi044994 for ; Mon, 1 Jun 2009 19:38:21 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51JcLxV044992 for perforce@freebsd.org; Mon, 1 Jun 2009 19:38:21 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 1 Jun 2009 19:38:21 GMT Message-Id: <200906011938.n51JcLxV044992@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 163296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 19:38:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=163296 Change 163296 by rene@rene_self on 2009/06/01 19:37:31 Build doc/ and relnotes/ directories when requested Affected files ... .. //depot/projects/docproj_nl/www/nl/Makefile#9 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/Makefile#9 (text+ko) ==== @@ -79,13 +79,13 @@ #SUBDIR+= snapshots #SUBDIR+= support #SUBDIR+= tutorials -#.if !defined(WEB_ONLY) || empty(WEB_ONLY) -#SUBDIR+= doc +.if !defined(WEB_ONLY) || empty(WEB_ONLY) +SUBDIR+= doc #SUBDIR+= ports -#.endif -#.if defined(BUILD_RELNOTES) +.endif +.if defined(BUILD_RELNOTES) #SUBDIR+= relnotes -#.endif +.endif WEBDIR?= data/nl From owner-p4-projects@FreeBSD.ORG Mon Jun 1 19:52:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DABC1065670; Mon, 1 Jun 2009 19:52: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 C20DA106566B for ; Mon, 1 Jun 2009 19:52:36 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 960408FC13 for ; Mon, 1 Jun 2009 19:52:36 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51JqaTI046139 for ; Mon, 1 Jun 2009 19:52:36 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51Jqa96046137 for perforce@freebsd.org; Mon, 1 Jun 2009 19:52:36 GMT (envelope-from mav@freebsd.org) Date: Mon, 1 Jun 2009 19:52:36 GMT Message-Id: <200906011952.n51Jqa96046137@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163297 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 19:52:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=163297 Change 163297 by mav@mav_mavbook on 2009/06/01 19:51:40 ATA controller itself is not present on the bus as device. Do not reserve ID for it. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#10 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#8 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#10 (text+ko) ==== @@ -805,7 +805,6 @@ struct cam_path *path; u_int i; u_int max_target; - u_int initiator_id; /* Find out the characteristics of the bus */ work_ccb = xpt_alloc_ccb_nowait(); @@ -849,7 +848,6 @@ /* Cache on our stack so we can work asynchronously */ max_target = scan_info->cpi->max_target; - initiator_id = scan_info->cpi->initiator_id; /* * We can scan all targets in parallel, or do it sequentially. @@ -859,15 +857,10 @@ scan_info->counter = 0; } else { scan_info->counter = scan_info->cpi->max_target + 1; - if (scan_info->cpi->initiator_id < scan_info->counter) { - scan_info->counter--; - } } for (i = 0; i <= max_target; i++) { cam_status status; - if (i == initiator_id) - continue; status = xpt_create_path(&path, xpt_periph, request_ccb->ccb_h.path_id, @@ -922,10 +915,6 @@ done = 0; if (scan_info->cpi->hba_misc & PIM_SEQSCAN) { scan_info->counter++; - if (scan_info->counter == - scan_info->cpi->initiator_id) { - scan_info->counter++; - } if (scan_info->counter >= scan_info->cpi->max_target+1) { done = 1; ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#8 (text+ko) ==== @@ -1722,16 +1722,16 @@ if (ccb->ccb_h.target_id == CAM_TARGET_WILDCARD || (((ATA_ATA_MASTER | ATA_ATAPI_MASTER) << - (ccb->ccb_h.target_id - 1)) & ch->devices)) { + ccb->ccb_h.target_id) & ch->devices)) { cpi->version_num = 1; /* XXX??? */ - cpi->hba_inquiry = PI_SDTR_ABLE; + cpi->hba_inquiry = PI_SDTR_ABLE | PI_TAG_ABLE; cpi->target_sprt = 0; cpi->hba_misc = 0; cpi->hba_eng_cnt = 0; - cpi->max_target = 1; + cpi->max_target = 0; cpi->max_lun = 0; - cpi->initiator_id = 0;//aha->scsi_id; + cpi->initiator_id = 0; cpi->bus_id = cam_sim_bus(sim); cpi->base_transfer_speed = 150000; strncpy(cpi->sim_vid, "FreeBSD", SIM_IDLEN); @@ -1740,7 +1740,7 @@ cpi->unit_number = cam_sim_unit(sim); cpi->transport = XPORT_ATA; cpi->transport_version = 2; - if ((ATA_ATA_MASTER << (ccb->ccb_h.target_id - 1)) & ch->devices) + if ((ATA_ATA_MASTER << ccb->ccb_h.target_id) & ch->devices) cpi->protocol = PROTO_ATA; else cpi->protocol = PROTO_SCSI; From owner-p4-projects@FreeBSD.ORG Mon Jun 1 20:19:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 948F31065674; Mon, 1 Jun 2009 20:19: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 50F3D106564A for ; Mon, 1 Jun 2009 20:19:09 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3F39C8FC0A for ; Mon, 1 Jun 2009 20:19:09 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51KJ9eO049205 for ; Mon, 1 Jun 2009 20:19:09 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51KJ9iD049203 for perforce@freebsd.org; Mon, 1 Jun 2009 20:19:09 GMT (envelope-from mav@freebsd.org) Date: Mon, 1 Jun 2009 20:19:09 GMT Message-Id: <200906012019.n51KJ9iD049203@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163301 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 20:19:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=163301 Change 163301 by mav@mav_mavbook on 2009/06/01 20:18:12 Do not use NCQ if we are not sure that controller supports it. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#6 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#6 (text+ko) ==== @@ -620,12 +620,13 @@ else softc->quirks = DA_Q_NONE; - /* Check if the SIM does not want 6 byte commands */ + /* Check if the SIM does not want queued commands */ xpt_setup_ccb(&cpi.ccb_h, periph->path, /*priority*/1); cpi.ccb_h.func_code = XPT_PATH_INQ; xpt_action((union ccb *)&cpi); - if (cpi.ccb_h.status == CAM_REQ_CMP && (cpi.hba_misc & PIM_NO_6_BYTE)) - softc->quirks |= DA_Q_NO_6_BYTE; + if (cpi.ccb_h.status != CAM_REQ_CMP || + (cpi.hba_inquiry & PI_TAG_ABLE) == 0) + softc->flags &= ~DA_FLAG_CAN_NCQ; TASK_INIT(&softc->sysctl_task, 0, dasysctlinit, periph); From owner-p4-projects@FreeBSD.ORG Mon Jun 1 20:41:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 93D231065670; Mon, 1 Jun 2009 20:41: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 4FF33106564A for ; Mon, 1 Jun 2009 20:41:46 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B5538FC13 for ; Mon, 1 Jun 2009 20:41:46 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51KfkHb051179 for ; Mon, 1 Jun 2009 20:41:46 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51Kfig1051177 for perforce@freebsd.org; Mon, 1 Jun 2009 20:41:44 GMT (envelope-from syl@FreeBSD.org) Date: Mon, 1 Jun 2009 20:41:44 GMT Message-Id: <200906012041.n51Kfig1051177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163306 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 20:41:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=163306 Change 163306 by syl@syl_rincewind on 2009/06/01 20:40:45 MFC Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/bind/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/bind/Makefile#2 delete .. //depot/projects/soc2009/syl_usb/src/lib/bind/bind/config.h#2 delete .. //depot/projects/soc2009/syl_usb/src/lib/bind/bind/port_after.h#2 delete .. //depot/projects/soc2009/syl_usb/src/lib/bind/bind/port_before.h#2 delete .. //depot/projects/soc2009/syl_usb/src/lib/bind/config.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/dns/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/dns/code.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/dns/dns/enumclass.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/dns/dns/enumtype.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/dns/dns/rdatastruct.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/isc/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/isc/isc/platform.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/lwres/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/lwres/lwres/netdb.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/bind/lwres/lwres/platform.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libarchive/Makefile#3 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libarchive/archive_read_support_compression_gzip.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/arm/Makefile.inc#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/arm/gen/_setjmp.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/arm/gen/setjmp.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/gen/popen.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/include/nss_tls.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/net/resolver.3#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/Makefile.inc#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/Symbol.map#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl.3#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_add_perm.3#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_compat.c#1 branch .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_delete.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_entry.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_get.3#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_get.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_init.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_set.3#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_set.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_set_tag_type.3#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_support.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_support.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/acl_valid.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/posix1e/posix1e.3#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/resolv/res_comp.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/rpc/svc_dg.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/rpc/svc_generic.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/stdtime/asctime.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/stdtime/difftime.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/stdtime/private.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/stdtime/strftime.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/stdtime/time2posix.3#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/stdtime/tzfile.5#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/stdtime/tzfile.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/sys/bind.2#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc/sys/jail.2#3 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc_r/arch/amd64/_atomic_lock.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libc_r/arch/i386/_atomic_lock.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libdisk/open_ia64_disk.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libgeom/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libstand/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libstand/bootp.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libstand/i386/_setjmp.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libstand/rpc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libstand/stand.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libstand/tftp.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb.3#4 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb20.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb20.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb20_int.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb20_ugen20.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/libusbhid/descr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/amd64/e_sqrt.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/amd64/e_sqrtf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/amd64/s_lrint.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/amd64/s_lrintf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/amd64/s_remquo.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/amd64/s_remquof.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/amd64/s_scalbn.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/amd64/s_scalbnf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/amd64/s_scalbnl.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/e_exp.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/e_fmod.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/e_log.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/e_log10.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/e_log10f.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/e_remainder.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/e_remainderf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/e_sqrt.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/e_sqrtf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_ceil.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_ceilf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_ceill.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_copysign.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_copysignf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_copysignl.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_cos.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_finite.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_floor.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_floorf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_floorl.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_llrint.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_llrintf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_logb.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_logbf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_lrint.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_lrintf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_remquo.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_remquof.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_rint.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_rintf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_scalbn.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_scalbnf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_scalbnl.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_significand.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_significandf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_sin.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_tan.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_trunc.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_truncf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/i387/s_truncl.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/ia64/s_fma.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/ia64/s_fmaf.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/lib/msun/ia64/s_fmal.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/amd64/amd64/mca.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/arm/at91/ohci_atmelarm.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/arm/conf/AVILA#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/boot/common/boot.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/boot/zfs/zfssubr.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/compat/freebsd32/freebsd32_misc.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/linux/linux_ioctl.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/linux/linux_mib.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/linux/linux_misc.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/linux/linux_socket.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/linux/linux_socket.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_ioctl.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/conf/NOTES#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/conf/files#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/conf/files.i386#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/conf/options#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/contrib/dev/mwl/LICENSE#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/contrib/dev/mwl/Makefile#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/contrib/dev/mwl/mw88W8363.fw.uu#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/contrib/dev/mwl/mwlboot.fw.uu#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/age/if_age.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/bwi/bwiphy.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/bwi/if_bwi.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/bwi/if_bwi_pci.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/bwi/if_bwireg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ipw/if_ipw.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ipw/if_ipwvar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/iwi/if_iwivar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/iwn/if_iwnvar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/malo/if_malo.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/md/md.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mfi/mfi_linux.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mwl/if_mwl.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/mwl/if_mwl_pci.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/mwl/if_mwlioctl.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/mwl/if_mwlvar.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/mwl/mwldiag.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/mwl/mwlhal.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/mwl/mwlhal.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/mwl/mwlreg.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/si/si.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pci/via82c686.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/sbus/cs4231.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/README.TXT#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/bluetooth/ng_ubt.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/avr32dci.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_revision.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_uath.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_uathvar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/usb/wlan/if_zydreg.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/wi/if_wi.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/wpi/if_wpivar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/xen/console/console.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/dev/xl/if_xl.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfs/nfs.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfs/nfs_commonkrpc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfs/nfs_commonport.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfs/nfs_commonsubs.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfs/nfs_var.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfs/nfsport.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsclient/nfs_clbio.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsclient/nfs_clkrpc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsclient/nfs_clnode.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsclient/nfs_clport.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsclient/nfs_clrpcops.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsclient/nfs_clstate.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsclient/nfs_clvfsops.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsclient/nfs_clvnops.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsserver/nfs_nfsdport.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsserver/nfs_nfsdserv.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsserver/nfs_nfsdsocket.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/i386/mca.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/ibcs2/ibcs2_socksys.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/include/param.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/xen/clock.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/init_main.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/init_sysent.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_cpuset.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_descrip.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_exit.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_fail.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_fork.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_jail.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_linker.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_osd.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_vimage.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/tty.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/tty_info.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/vfs_default.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/vfs_lookup.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/vfs_syscalls.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ehci_pci.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ohci_pci.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uhci_pci.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/mips/mips/pmap.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/Makefile#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/geom/geom_part/geom_part_ebr/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/modules/linux/Makefile#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/mwl/Makefile#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/modules/mwlfw/Makefile#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/nfs4client/Makefile#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/modules/usb/Makefile#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/bpf.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/if.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/if.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/if_clone.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/if_llatbl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/if_llatbl.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/if_loop.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/if_var.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/netisr.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/netisr.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/pfil.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/route.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/route.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/rtsock.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net/vnet.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_adhoc.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_freebsd.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_ht.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_monitor.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_node.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_proto.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_radiotap.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_scan.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_scan.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_scan_sta.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_superg.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netgraph/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/if_ether.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/igmp.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/in.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/in.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/in_pcb.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet/vinet.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/in6.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/in6_mcast.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/ip6_ipsec.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/mld6.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/udp6_usrreq.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netinet6/vinet6.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipsec/ipsec6.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipsec/key.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipsec/vipsec.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipx/ipx_input.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipx/spx.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipx/spx_reass.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netipx/spx_var.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netnatm/natm.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/netnatm/natm_proto.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfs/nfs_common.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_dev.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_dev.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_idmap.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_idmap.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_socket.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_subs.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_vfs.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_vfs_subs.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_vfsops.c#3 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_vn.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_vn_subs.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4_vnops.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfs4client/nfs4m_subs.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_krpc.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_lock.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_nfsiod.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfsm_subs.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfsmount.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsserver/nfs_srvkrpc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nfsserver/nfs_srvsock.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nlm/nlm.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nlm/nlm_advlock.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/opencrypto/cryptodev.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/pc98/pc98/machdep.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/booke/locore.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/booke/machdep.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/booke/mp_cpudep.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/booke/platform_bare.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/booke/pmap.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/booke/trap_subr.S#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/booke/vm_machdep.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/conf/GENERIC#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/cpufreq/dfs.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/include/mutex.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/include/pcpu.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/include/spr.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/mpc85xx/ocpbus.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/mpc85xx/ocpbus.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/ofw/ofw_cpu.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/powermac/pmu.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/powermac/vcoregpio.c#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/powerpc/genassym.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/powerpc/mp_machdep.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/powerpc/powerpc/openpic.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/rpc/authunix_prot.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/rpc/rpcclnt.c#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/rpc/rpcclnt.h#2 delete .. //depot/projects/soc2009/syl_usb/src/sys/rpc/xdr.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/security/mac/mac_framework.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sparc64/sparc64/machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sun4v/sun4v/dump_machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/acl.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/buf.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/cpu.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/cpuset.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/eventhandler.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/fail.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/sys/interrupt.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/jail.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/kernel.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/ksyms.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/sys/lock.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/lockf.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/lockstat.h#1 branch .. //depot/projects/soc2009/syl_usb/src/sys/sys/mount.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/mutex.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/namei.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/param.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/priv.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/proc.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/queue.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/rmlock.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/rwlock.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/sockio.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/sx.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/systm.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/tty.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/vimage.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/sys/vnode.h#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ufs/ffs/ffs_alloc.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ufs/ufs/ufs_acl.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/vm/vm_pageout.c#3 integrate .. //depot/projects/soc2009/syl_usb/src/sys/xdr/xdr_mem.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/soc2009/syl_usb/src/sys/xen/xenbus/xenbus_xs.c#2 integrate Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/bind/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ -# $FreeBSD: src/lib/bind/Makefile,v 1.1 2004/09/21 19:01:42 des Exp $ +# $FreeBSD: src/lib/bind/Makefile,v 1.2 2009/05/31 05:42:58 dougb Exp $ -SUBDIR= bind bind9 dns isc isccc isccfg lwres +SUBDIR= bind9 dns isc isccc isccfg lwres .include ==== //depot/projects/soc2009/syl_usb/src/lib/bind/config.h#2 (text+ko) ==== @@ -1,12 +1,12 @@ -/* $FreeBSD: src/lib/bind/config.h,v 1.10 2008/12/23 22:50:39 dougb Exp $ */ +/* $FreeBSD: src/lib/bind/config.h,v 1.11 2009/05/31 05:42:58 dougb Exp $ */ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2009 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above * copyright notice and this permission notice appear in all copies. * @@ -19,7 +19,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: acconfig.h,v 1.44.18.5 2005/04/29 00:15:20 marka Exp $ */ +/* $Id: acconfig.h,v 1.51.334.2 2009/02/16 23:47:15 tbox Exp $ */ /*! \file */ @@ -28,9 +28,6 @@ *** it does not get installed. ***/ -/** define to `int' if doesn't define. */ -/* #undef ssize_t */ - /** define on DEC OSF to enable 4.4BSD style sa_len support */ /* #undef _SOCKADDR_LEN */ @@ -64,9 +61,6 @@ /** define if you have the NET_RT_IFLIST sysctl variable and sys/sysctl.h */ #define HAVE_IFLIST_SYSCTL 1 -/** define if chroot() is available */ -#define HAVE_CHROOT 1 - /** define if tzset() is available */ #define HAVE_TZSET 1 @@ -118,7 +112,7 @@ * The silly continuation line is to keep configure from * commenting out the #undef. */ - + #undef \ va_start #define va_start(ap, last) \ @@ -160,24 +154,36 @@ /* Define if you cannot bind() before connect() for TCP sockets. */ /* #undef BROKEN_TCP_BIND_BEFORE_CONNECT */ +/* Define to enable "rrset-order fixed" syntax. */ +/* #undef DNS_RDATASET_FIXED */ + /* Solaris hack to get select_large_fdset. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 1 21:07:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75FE01065672; Mon, 1 Jun 2009 21:07: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 363BC106566B for ; Mon, 1 Jun 2009 21:07:13 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19DB88FC08 for ; Mon, 1 Jun 2009 21:07:13 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51L7CMH064175 for ; Mon, 1 Jun 2009 21:07:12 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51L7CH4064173 for perforce@freebsd.org; Mon, 1 Jun 2009 21:07:12 GMT (envelope-from mav@freebsd.org) Date: Mon, 1 Jun 2009 21:07:12 GMT Message-Id: <200906012107.n51L7CH4064173@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163314 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 21:07:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=163314 Change 163314 by mav@mav_mavbook on 2009/06/01 21:06:55 Log all controller capabilities. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#9 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#4 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#9 (text+ko) ==== @@ -121,7 +121,7 @@ { struct ahci_controller *ctlr = device_get_softc(dev); device_t child; - int error, unit; + int error, unit, speed; u_int32_t version, caps; ctlr->dev = dev; @@ -165,17 +165,41 @@ /* announce we support the HW */ version = ATA_INL(ctlr->r_mem, AHCI_VS); caps = ATA_INL(ctlr->r_mem, AHCI_CAP); + speed = (caps & AHCI_CAP_ISS) >> AHCI_CAP_ISS_SHIFT; device_printf(dev, - "AHCI Version %x%x.%x%x controller with %d ports PM %s\n", - (version >> 24) & 0xff, (version >> 16) & 0xff, - (version >> 8) & 0xff, version & 0xff, - (caps & AHCI_CAP_NPMASK) + 1, - (caps & AHCI_CAP_SPM) ? - "supported" : "not supported"); - device_printf(dev, - "%d command slots\n", - ((caps & AHCI_CAP_NCS) >> AHCI_CAP_NCS_SHIFT) + 1); - device_printf(dev, "caps: %08x\n", caps); + "AHCI v%x.%02x %sGbps controller with %d ports, PM %s\n", + ((version >> 20) & 0xf0) + ((version >> 16) & 0x0f), + ((version >> 4) & 0xf0) + (version & 0x0f), + ((speed == 1) ? "1.5":((speed == 2) ? "3": + ((speed == 3) ? "6":"?"))), + (caps & AHCI_CAP_NPMASK) + 1, + (caps & AHCI_CAP_SPM) ? + "supported" : "not supported"); + if (bootverbose) { + device_printf(dev, "Caps:%s%s%s%s%s%s%s%s %sGbps", + (caps & AHCI_CAP_64BIT) ? " 64bit":"", + (caps & AHCI_CAP_SNCQ) ? " NCQ":"", + (caps & AHCI_CAP_SSNTF) ? " SNTF":"", + (caps & AHCI_CAP_SMPS) ? " MPS":"", + (caps & AHCI_CAP_SSS) ? " SS":"", + (caps & AHCI_CAP_SALP) ? " ALP":"", + (caps & AHCI_CAP_SAL) ? " AL":"", + (caps & AHCI_CAP_SCLO) ? " CLO":"", + ((speed == 1) ? "1.5":((speed == 2) ? "3": + ((speed == 3) ? "6":"?")))); + printf("%s%s%s%s%s%s %dcmd%s%s%s %dports\n", + (caps & AHCI_CAP_SAM) ? " AM":"", + (caps & AHCI_CAP_SPM) ? " PM":"", + (caps & AHCI_CAP_FBSS) ? " FBS":"", + (caps & AHCI_CAP_PMD) ? " PMD":"", + (caps & AHCI_CAP_SSC) ? " SSC":"", + (caps & AHCI_CAP_PSC) ? " PSC":"", + ((caps & AHCI_CAP_NCS) >> AHCI_CAP_NCS_SHIFT) + 1, + (caps & AHCI_CAP_CCCS) ? " CCC":"", + (caps & AHCI_CAP_EMS) ? " EM":"", + (caps & AHCI_CAP_SXS) ? " eSATA":"", + (caps & AHCI_CAP_NPMASK) + 1); + } /* attach all channels on this controller */ for (unit = 0; unit < ctlr->channels; unit++) { @@ -1120,7 +1144,7 @@ int timeout; /* issue Command List Override if supported */ - if (ATA_INL(ctlr->r_mem, AHCI_CAP) & AHCI_CAP_CLO) { + if (ATA_INL(ctlr->r_mem, AHCI_CAP) & AHCI_CAP_SCLO) { cmd = ATA_INL(ch->r_mem, AHCI_P_CMD); cmd |= AHCI_P_CMD_CLO; ATA_OUTL(ch->r_mem, AHCI_P_CMD, cmd); ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#4 (text+ko) ==== @@ -153,13 +153,26 @@ /* SATA AHCI v1.0 register defines */ #define AHCI_CAP 0x00 #define AHCI_CAP_NPMASK 0x0000001f +#define AHCI_CAP_SXS 0x00000020 +#define AHCI_CAP_EMS 0x00000040 +#define AHCI_CAP_CCCS 0x00000080 #define AHCI_CAP_NCS 0x00001F00 #define AHCI_CAP_NCS_SHIFT 8 #define AHCI_CAP_PSC 0x00002000 #define AHCI_CAP_SSC 0x00004000 +#define AHCI_CAP_PMD 0x00008000 +#define AHCI_CAP_FBSS 0x00010000 #define AHCI_CAP_SPM 0x00020000 -#define AHCI_CAP_CLO 0x01000000 +#define AHCI_CAP_SAM 0x00080000 +#define AHCI_CAP_ISS 0x00F00000 +#define AHCI_CAP_ISS_SHIFT 20 +#define AHCI_CAP_SCLO 0x01000000 +#define AHCI_CAP_SAL 0x02000000 #define AHCI_CAP_SALP 0x04000000 +#define AHCI_CAP_SSS 0x08000000 +#define AHCI_CAP_SMPS 0x10000000 +#define AHCI_CAP_SSNTF 0x20000000 +#define AHCI_CAP_SNCQ 0x40000000 #define AHCI_CAP_64BIT 0x80000000 #define AHCI_GHC 0x04 From owner-p4-projects@FreeBSD.ORG Mon Jun 1 21:31:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C58881065679; Mon, 1 Jun 2009 21:31:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83D76106566B for ; Mon, 1 Jun 2009 21:31:38 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 727B38FC20 for ; Mon, 1 Jun 2009 21:31:38 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51LVcLS066326 for ; Mon, 1 Jun 2009 21:31:38 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51LVc7N066324 for perforce@freebsd.org; Mon, 1 Jun 2009 21:31:38 GMT (envelope-from mav@freebsd.org) Date: Mon, 1 Jun 2009 21:31:38 GMT Message-Id: <200906012131.n51LVc7N066324@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163319 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 21:31:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=163319 Change 163319 by mav@mav_mavbook on 2009/06/01 21:30:55 Minor log tuning. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#10 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#10 (text+ko) ==== @@ -167,12 +167,12 @@ caps = ATA_INL(ctlr->r_mem, AHCI_CAP); speed = (caps & AHCI_CAP_ISS) >> AHCI_CAP_ISS_SHIFT; device_printf(dev, - "AHCI v%x.%02x %sGbps controller with %d ports, PM %s\n", + "AHCI v%x.%02x controller with %d %sGbps ports, PM %s\n", ((version >> 20) & 0xf0) + ((version >> 16) & 0x0f), ((version >> 4) & 0xf0) + (version & 0x0f), + (caps & AHCI_CAP_NPMASK) + 1, ((speed == 1) ? "1.5":((speed == 2) ? "3": ((speed == 3) ? "6":"?"))), - (caps & AHCI_CAP_NPMASK) + 1, (caps & AHCI_CAP_SPM) ? "supported" : "not supported"); if (bootverbose) { From owner-p4-projects@FreeBSD.ORG Mon Jun 1 21:37:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98CFE106571C; Mon, 1 Jun 2009 21:37:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 53B6B106571A for ; Mon, 1 Jun 2009 21:37:45 +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 2A1C28FC25 for ; Mon, 1 Jun 2009 21:37:45 +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 n51Lbj4e066880 for ; Mon, 1 Jun 2009 21:37:45 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51Lbjpm066876 for perforce@freebsd.org; Mon, 1 Jun 2009 21:37:45 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 1 Jun 2009 21:37:45 GMT Message-Id: <200906012137.n51Lbjpm066876@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 163322 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 21:37:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=163322 Change 163322 by rene@rene_self on 2009/06/01 21:36:56 [website] started translation of publish.sgml, 10% Affected files ... .. //depot/projects/docproj_nl/www/nl/publish.sgml#3 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/publish.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + + ]> @@ -9,71 +9,70 @@ -
      FreeBSD Daemon&os; Daemon
      - Here you will find the covers of many FreeBSD related publications. If you - know of any additional FreeBSD publications/CDROMs let us know, at www@FreeBSD.org, so that they may be - added to this site. + Hier vindt u de omslagen van vele aan &os; gerelateerde pubicaties. Als u + nog meer publicaties of CD-ROMs over &os; kent, laat het ons dan weten op + www@FreeBSD.org, zodat ze aan deze + site kunnen worden toegevoegd. -

      The FreeBSD Handbook contains a - considerably longer bibliography.

      - +

      Het &os; + Handbook bevat een aanzienlijk langere bibliografie.

      - Click on any of the graphics to see a larger version. + Klik op een afbeelden om een grotere versie te zien.

      -

      Books

      +

      Boeken

      - + - + - + - + - + - + - + - + @@ -81,7 +80,7 @@ HEIGHT="200" alt="book cover"> @@ -89,10 +88,10 @@ - @@ -100,7 +99,7 @@ - @@ -112,7 +111,7 @@ @@ -120,10 +119,10 @@ - @@ -131,21 +130,21 @@ - + the section 1 of the &os; manual. 2.2.7-RELEASE + &os;(98)2.2.7-Rev01 and PAO in CDROM. 1,040 pages, 3,800yen. - @@ -153,7 +152,7 @@ - @@ -167,7 +166,7 @@ Onno W Purbo, Dodi Maryanto, Syahrial Hubbany, Widjil Widodo: Building Internet Server with - FreeBSD (in Indonesia Language), published + &os; (in Indonesia Language), published by Elex Media Komputindo, 2000. @@ -176,9 +175,9 @@ @@ -187,10 +186,10 @@ @@ -199,9 +198,9 @@ @@ -210,12 +209,12 @@ - - + - - - - @@ -370,10 +369,10 @@ @@ -381,22 +380,22 @@ + alt="The RadioBSD Crier: Issue 2007/01: Managing &os; and NetBSD Firewalls" + height="202" width="150"> + on managing &os; and NetBSD IPFW, IPFW2, and IP6FW firewalls. - - @@ -428,15 +427,15 @@ WIDTH="150" HEIGHT="142" alt="CD cover"> + core technology behind much of &os;. - + @@ -444,15 +443,15 @@ HEIGHT="132" alt="CD cover"> + come in a standard jewel box. Contains &os;-2.1R, NetBSD-1.1, + XFree86-3.1.2 and 3.1.2A, and &os;(98) kernel (2.0.5). - @@ -460,9 +459,9 @@ - + produces the &os;/J (Japanese) CD product. @@ -478,8 +477,8 @@ - @@ -489,9 +488,9 @@ - @@ -513,7 +512,7 @@ - @@ -523,7 +522,7 @@ - @@ -531,7 +530,7 @@ - @@ -539,14 +538,14 @@ - + - + @@ -564,7 +563,7 @@ - @@ -580,7 +579,7 @@ - @@ -588,21 +587,21 @@ - + - + - + @@ -656,8 +655,8 @@ + + &os; 4.5 RELEASE CDROM. + February 2002, &os; Mall Inc. ISBN 1-57176-306-6. +
      book coverboekomslagA publication from Tatsumi Hosokawa and - others. Among computer books, it is a top-seller in Japan and - exceeded the sales of Bill Gates' "The Road Ahead" when published - (it was #2, this book was #1).Een publicatie van Tatsumi Hosokawa en anderen. Onder de + computerboeken is het een top-seller in Japan en het overtrof de + verkoop van "The Road Ahead" van Bill Gates toen het gepubliceerd + werd (het was #2, dit boek was #1).
      book coverboekomslag(Japanese FreeBSD book with 2.0.5, titled "FreeBSD: Fun and easy - Installation")(Japans boek over &os; met 2.0.5, getiteld "&os;: Plezierige en + eenvoudige installatie")
      book coverboekomslag(Japanese FreeBSD book with 2.0.5, titled "FreeBSD Introductory - Kit")(Japans boek over &os; met 2.0.5, getiteld "&os; + Introductiepakket")
      book coverboekomslagThis is BSDi's "The Complete FreeBSD" with installation - guide, manual pages and installation CDs inside.Dit is "The Complete &os;" van BSDi met installatiegids, + handleidingspagina's en ingesloten CD's.
      This book was published (early 1997) in Taiwan. Its title - is "FreeBSD: introduction and applications" and the author is + is "&os;: introduction and applications" and the author is Jian-Da Li (aka. jdli).
      book coverThis is the "Getting Started with FreeBSD" from Fuki-Shuppan. + This is the "Getting Started with &os;" from Fuki-Shuppan. Other than the standard installation guide and Japanese environment, it emphasizes system administration and low-level information (such - as the boot process, etc.) FreeBSD-2.2.2R and XFree86-3.2 on CDROM. + as the boot process, etc.) &os;-2.2.2R and XFree86-3.2 on CDROM. 264 pages, 3,400 yen.
      book coverThe "Personal Unix Starter Kit - FreeBSD" from ASCII. Includes + The "Personal Unix Starter Kit - &os;" from ASCII. Includes history of &unix;, a guide to build a Japanese documentation processing system and how to create ports. 2.1.7.1R and XFree86-3.2 in CDROM. 384 pages, 3,000 yen.BSD mit Methode, M. Schulze, B. Roehrig, M. Hoelzer und andere, C&L Computer und Literatur Verlag, 1998, 850 pages. 2 CDROMs, - FreeBSD 2.2.6, NetBSD 1.2.1 and 1.3.2, OpenBSD 2.2 and 2.3. DM + &os; 2.2.6, NetBSD 1.2.1 and 1.3.2, OpenBSD 2.2 and 2.3. DM 98,-.
      book coverThis is the "FreeBSD Install and utilization manual" from Mainichi - Communications. General introduction to FreeBSD from installation + This is the "&os; Install and utilization manual" from Mainichi + Communications. General introduction to &os; from installation to utilization with troubleshooting under the supervision of the - user group in Japan. 2.2.7-RELEASE FreeBSD(98)2.2.7-Rev01 PAO and + user group in Japan. 2.2.7-RELEASE &os;(98)2.2.7-Rev01 PAO and distfiles in CDROM. 472 pages, 3,600yen.
      book coverThe "FreeBSD User's Reference Manual" from Mainichi + The "&os; User's Reference Manual" from Mainichi Communications, under the supervision of "jpman project", the manual translation project by the user group in Japan. Japanese edition of - the section 1 of the FreeBSD manual. 2.2.7-RELEASE - FreeBSD(98)2.2.7-Rev01 and PAO in CDROM. 1,040 pages, 3,800yen.
      book coverThe "FreeBSD System Administrator's Manual" from Mainichi + The "&os; System Administrator's Manual" from Mainichi Communications, under the supervision of "jpman project", the manual translation project by the user group in Japan. Japanese edition of - the section 5 and 8 of the FreeBSD manual. 756 pages, 3,300yen. + the section 5 and 8 of the &os; manual. 756 pages, 3,300yen.
      book coverThis is "About FreeBSD" from Youngjin.com. It is first FreeBSD + This is "About &os;" from Youngjin.com. It is first &os; book in Korea, and covers several topics from installation to Korean environment. 3.5.1-RELEASE/PAO and 4.1-RELEASE in 3 CDROMs. 788 pages, 26,000 won.
      book cover - The FreeBSD Handbook 1st Edition is a comprehensive FreeBSD + The &os; Handbook 1st Edition is a comprehensive &os; Tutorial and reference. It covers installation, day-to-day use - of FreeBSD, and much more. + of &os;, and much more. April 2000, BSDi. ISBN 1-57176-241-8
      book cover - The Complete FreeBSD with CDs, 3rd Ed, FreeBSD 4.2. + The Complete &os; with CDs, 3rd Ed, &os; 4.2. Everything you ever wanted to know about how to get - your computer up and running FreeBSD. Includes 4 CDs - containing the FreeBSD operating system! + your computer up and running &os;. Includes 4 CDs + containing the &os; operating system! Released: November 2000 ISBN: 1-57176-246-9
      book cover - The FreeBSD Handbook 2nd Edition is a comprehensive FreeBSD + The &os; Handbook 2nd Edition is a comprehensive &os; Tutorial and reference. It covers installation, day-to-day use - of FreeBSD, and much more. + of &os;, and much more. November 2001, Wind River Systems. ISBN 1-57176-303-1
      book cover - "The FreeBSD Corporate Networker's Guide" Mittelstaedt, Ted. + "The &os; Corporate Networker's Guide" Mittelstaedt, Ted. Addison Wesley, 2000.
      - There are two printings: the first has disk 1 of FreeBSD 4.2, the - second has disk 1 of FreeBSD 4.4. 400 pages. The Japanese translation + There are two printings: the first has disk 1 of &os; 4.2, the + second has disk 1 of &os; 4.4. 400 pages. The Japanese translation was published in 2001.
      - The Networker's Guide covers integration of FreeBSD into typical + The Networker's Guide covers integration of &os; into typical corporate networks with special emphasis on interoperation with Windows 95/98/ME/NT/2K.
      @@ -226,9 +225,9 @@
      book cover"FreeBSD, An Open-Source Operating System for Your Personal Computer", + "&os;, An Open-Source Operating System for Your Personal Computer", Annelise Anderson.
      - An introduction to FreeBSD for users new to both FreeBSD and UNIX. + An introduction to &os; for users new to both &os; and UNIX. This book includes a 4.4 installation CD-ROM and covers everything you need to know about installation of the system and third-party software; getting sound, X Window, your network, and printing working; @@ -240,7 +239,7 @@
      Absolute BSD book cover Absolute BSD. This book discusses management of - FreeBSD-based servers in high-performance enterprise + &os;-based servers in high-performance enterprise environments. June 2002, No Starch @@ -248,11 +247,11 @@
      FreeBSD Open Documentation Library&os; Open Documentation Library Fultus presents -FreeBSD Open Documentation Library. This -is the full up-to-date FreeBSD documentation collection available +&os; Open Documentation Library. This +is the full up-to-date &os; documentation collection available online in the Technical Literature section of the Fultus eLibrary @@ -265,18 +264,18 @@
    • Compiled HTML format (chm) (for Windows). Interested? -
      Read about FreeBSD eBooks and download examples on the -FreeBSD Documentation +
      Read about &os; eBooks and download examples on the +&os; Documentation page of the Fultus web site.
      • - + book cover"Building an Internet Server with FreeBSD 6" is a step-by-step - guide for helping new and experienced users to FreeBSD + "Building an Internet Server with &os; 6" is a step-by-step + guide for helping new and experienced users to &os; install and configure the latest Internet server applications in a minimum of time. The guide includes descriptions of many of the Internet's most popular and widely deployed @@ -289,7 +288,7 @@ book cover Written by the professionals of EnderUNIX and Huseyin Yuce - this book is the first Turkish FreeBSD book. The book is + this book is the first Turkish &os; book. The book is published by acikkod publications. Book is available for sale on this page. @@ -298,7 +297,7 @@ ISBN: 975-98990-0-0
      Published: February 2004
      Paperback: 504 pages
      - CD: FreeBSD 4.9 Installation CD
      + CD: &os; 4.9 Installation CD
      Authors: Hüseyin Yüce, İsmail Yenigül, Ömer Faruk Şen, Barış Şimşek and Murat Balaban.
      @@ -329,7 +328,7 @@       		The OpenBSD PF Packet Filter Book covers the PF packet filter - suite, ALTQ, spamd, address translation, and more for FreeBSD, + suite, ALTQ, spamd, address translation, and more for &os;, NetBSD, OpenBSD, and DragonFly. August 2006, Reed Media Services. ISBN 978-0-9790342-0-6. @@ -339,24 +338,24 @@
      FreeBSD 6 Unleashed + alt="&os; 6 Unleashed" width="150" height="150"> FreeBSD 6 Unleashed covers everything you need to know to use - FreeBSD to its fullest potential. + &os; 6 Unleashed covers everything you need to know to use + &os; to its fullest potential. Jun 7, 2006, - Sams. ISBN 0-672-32875-5 + Sams. ISBN 0-672-32875-5
      The FreeBSD 6.0 Book + alt="The &os; 6.0 Book" width="150" height="202"> (Traditional Chinese FreeBSD book with 6.0) + (Traditional Chinese &os; book with 6.0) December 2005, Drmaster. ISBN 9-575-27878-X This Romanian language book is a useful guide for people - taking their first steps with FreeBSD. It covers installation - and day-to-day operation of a FreeBSD system, and contains - practical examples illustrating the use of FreeBSD's utilities. - It has two case studies on configuring FreeBSD as a server + taking their first steps with &os;. It covers installation + and day-to-day operation of a &os; system, and contains + practical examples illustrating the use of &os;'s utilities. + It has two case studies on configuring &os; as a server and a router. 2005, Polirom Publishing House, ISBN 973-681-683-4
      The RadioBSD Crier: Issue 2007/01: Managing FreeBSD and NetBSD Firewalls The “RadioBSD Crier: 2007/01” is a 24-page article - on managing FreeBSD and NetBSD IPFW, IPFW2, and IP6FW firewalls.
      The Best of FreeBSD Basics by Dru Lavigne The Best of FreeBSD Basics by Dru Lavigne provides near 100 - tutorials covering a wide range of FreeBSD and open source Unix + The Best of &os; Basics by Dru Lavigne provides near 100 + tutorials covering a wide range of &os; and open source Unix topics. December 2007. Reed Media Services. ISBN 978-0-9790342-2-0. @@ -409,7 +408,7 @@

      CDROMs

      For more about recent releases go to FreeBSD release information page. + href="releases/index.html">&os; release information page.

      @@ -418,7 +417,7 @@       		CD coverThis is InfoMagic's BSDisc, containing FreeBSD 2.0 and NetBSD 1.0 + This is InfoMagic's BSDisc, containing &os; 2.0 and NetBSD 1.0 on a single CD. This is the only example I have which had cover art.
      This is the original 4.4 BSD Lite2 release from UC Berkeley, the - core technology behind much of FreeBSD.
      CD coverThe first of Laser5's "BSD" series. Contains FreeBSD-2.0.5R, - NetBSD-1.0, XFree86-3.1.1 and FreeBSD(98) kernel.The first of Laser5's "BSD" series. Contains &os;-2.0.5R, + NetBSD-1.0, XFree86-3.1.1 and &os;(98) kernel.
      The second of Laser5's "BSD" series. From this version, the CDs - come in a standard jewel box. Contains FreeBSD-2.1R, NetBSD-1.1, - XFree86-3.1.2 and 3.1.2A, and FreeBSD(98) kernel (2.0.5).
      CD coverThis is the Laser5 Japanese edition of the FreeBSD CDROM. It is a + This is the Laser5 Japanese edition of the &os; CDROM. It is a 4 CD set.
      CD coverThis is the only FreeBSD CD Pacific Hitech produced before merging + This is the only &os; CD Pacific Hitech produced before merging their product line with that of Walnut Creek CDROM. PHT now also - produces the FreeBSD/J (Japanese) CD product.
      This is the cover disc from the Korean magazine. Note the creative cover art! The - CD contains the FreeBSD 2.2.1 release with some local + CD contains the &os; 2.2.1 release with some local additions.
      CD coverThis is it - the very first FreeBSD CD published! Both the - FreeBSD Project and Walnut Creek CDROM were fairly young back then, + This is it - the very first &os; CD published! Both the + &os; Project and Walnut Creek CDROM were fairly young back then, and you'll probably have little difficulty in spotting the differences in production quality between then and now. CD coverThis was the second FreeBSD CD published by Walnut Creek CDROM and + This was the second &os; CD published by Walnut Creek CDROM and also the very last on the 1.x branch (ref USL/Novell lawsuit and - settlement). The next release, FreeBSD 1.1.5, was only available on + settlement). The next release, &os; 1.1.5, was only available on the net.
      CD coverThis is the fixed-up version of the FreeBSD 2.0 CD. Note that the + This is the fixed-up version of the &os; 2.0 CD. Note that the color scheme has even been changed in the corrected version, something unusual for a fixup and perhaps done to distance it from the earlier mistake.CD coverThe FreeBSD 2.0.5 release CD. This was the first CD to feature + The &os; 2.0.5 release CD. This was the first CD to feature Tatsumi Hosokawa's daemon artwork.
      CD coverThe FreeBSD 2.1 release CD. This was the first CD release on the + The &os; 2.1 release CD. This was the first CD release on the 2.1 branch (the last being 2.1.7).
      CD coverThe FreeBSD 2.1.5 release CD.The &os; 2.1.5 release CD.
      CD coverThe FreeBSD 2.1.6 release CD.The &os; 2.1.6 release CD.
      CD coverThe FreeBSD 2.1.7 release CD. Also the last CD released on the + The &os; 2.1.7 release CD. Also the last CD released on the 2.1.x branch. Done primarily as a security fixup for 2.1.6
      CD coverThe FreeBSD 2.2.1 release CD. This was the first CD on the 2.2 + The &os; 2.2.1 release CD. This was the first CD on the 2.2 branch.
      CD coverThe FreeBSD 2.2.2 release CD.The &os; 2.2.2 release CD.
      CD coverThe FreeBSD 3.0 snapshot CD.The &os; 3.0 snapshot CD.
      CD coverThe FreeBSD mailing list and newsgroup archives, turned into HTML + The &os; mailing list and newsgroup archives, turned into HTML and semi-indexed by thread. This product ran for 2 releases and then stopped with a thud once it became obvious that there was simply too much data to deal with on one CD. Perhaps when DVD @@ -612,43 +611,43 @@
      CD cover - FreeBSD Toolkit: Six disc set of resources to make your - FreeBSD experience more enriching. + &os; Toolkit: Six disc set of resources to make your + &os; experience more enriching.
      CD cover - FreeBSD Alpha 4.2 - The full version of the DEC Alpha 64-bit + &os; Alpha 4.2 - The full version of the DEC Alpha 64-bit UNIX operating system.
      CD cover - FreeBSD 4.2: The full version of the PC 32-bit UNIX operating system. + &os; 4.2: The full version of the PC 32-bit UNIX operating system.
      CD cover - FreeBSD 4.2 CD-ROM. Lehmanns CD-ROM Edition. - January 2001, 4 CD-ROMs. Lehmanns Fachbuchhandlung. Germany. + &os; 4.2 CD-ROM. Lehmanns CD-ROM Edition. + January 2001, 4 CD-ROMs. Lehmanns Fachbuchhandlung. Germany. ISBN 3-931253-72-4.
      CD cover - FreeBSD 4.3 RELEASE CDROM. + &os; 4.3 RELEASE CDROM. April 2001, Wind River Systems. ISBN 1-57176-300-7. -
      CD cover - FreeBSD Toolkit: Six disc set of resources to make your - FreeBSD experience more enriching. + &os; Toolkit: Six disc set of resources to make your + &os; experience more enriching. June 2001, Wind River Systems. ISBN 1-57176-301-5.
      CD cover - FreeBSD 4.4 CD-ROM. Lehmanns CD-ROM Edition. - November 2001, 6 CD-ROMs in Jewelcase. + &os; 4.4 CD-ROM. Lehmanns CD-ROM Edition. + November 2001, 6 CD-ROMs in Jewelcase. Lehmanns Fachbuchhandlung. Germany. ISBN 3-931253-84-8. @@ -666,16 +665,16 @@
      CD cover - FreeBSD 4.4 RELEASE CDROM. Wind River Systems. September 2001. + &os; 4.4 RELEASE CDROM. Wind River Systems. September 2001. ISBN 1-57176-304-X. -
      CD cover - FreeBSD 4.5 RELEASE CDROM. - February 2002, FreeBSD Mall Inc. ISBN 1-57176-306-6. -
      @@ -690,14 +689,14 @@ HEIGHT="213" alt="magazine cover"> Cover of Korean UNIX magazine, May 1997 issue. Also included FreeBSD 2.2.1 with cover CDs. + HREf="#221cd">&os; 2.2.1 with cover CDs. magazine cover - UNIX User Magazine November 1996 issue. Also included FreeBSD + UNIX User Magazine November 1996 issue. Also included &os; 2.1.5 on cover CD. @@ -705,9 +704,9 @@ magazine cover - This is the "FreeBSD Full Course" special in April 1997's Software + This is the "&os; Full Course" special in April 1997's Software Design (published by Gijutsu Hyoron Sha). There are 80 pages of - FreeBSD articles covering everything from installation to tracking + &os; articles covering everything from installation to tracking -current. @@ -729,10 +728,10 @@ This is the "BSD magazine" published by ASCII corporation, the world's first publication specialized in BSD. - BSD magazine covers FreeBSD, NetBSD, OpenBSD and BSD/OS. + BSD magazine covers &os;, NetBSD, OpenBSD and BSD/OS. The premiere issue features articles on the history of BSD, installation, and Ports/Packages; it also includes 4 CD-ROMs - containing FreeBSD 3.2-RELEASE, NetBSD 1.4.1 and OpenBSD 2.5. + containing &os; 3.2-RELEASE, NetBSD 1.4.1 and OpenBSD 2.5. From owner-p4-projects@FreeBSD.ORG Mon Jun 1 21:59:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6AB7E106567B; Mon, 1 Jun 2009 21:59:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28A6F1065672 for ; Mon, 1 Jun 2009 21:59:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 14EA78FC18 for ; Mon, 1 Jun 2009 21:59:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51LxAAO068546 for ; Mon, 1 Jun 2009 21:59:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51Lx93Y068544 for perforce@freebsd.org; Mon, 1 Jun 2009 21:59:09 GMT (envelope-from jhb@freebsd.org) Date: Mon, 1 Jun 2009 21:59:09 GMT Message-Id: <200906012159.n51Lx93Y068544@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 21:59:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=163326 Change 163326 by jhb@jhb_jhbbsd on 2009/06/01 21:59:08 IFC @163323 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#3 integrate .. //depot/projects/smpng/share/man/man9/VOP_ACCESS.9#2 integrate .. //depot/projects/smpng/share/man/man9/sglist.9#1 branch .. //depot/projects/smpng/sys/amd64/amd64/dump_machdep.c#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#8 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#24 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#27 integrate .. //depot/projects/smpng/sys/arm/arm/dump_machdep.c#8 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#12 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/smpng/sys/boot/common/boot.c#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#21 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris.c#3 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#6 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#53 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#98 integrate .. //depot/projects/smpng/sys/compat/linux/linux_socket.c#48 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#11 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stat.c#22 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_sysent.c#20 integrate .. //depot/projects/smpng/sys/conf/NOTES#169 integrate .. //depot/projects/smpng/sys/conf/files#241 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#53 integrate .. //depot/projects/smpng/sys/conf/options#168 integrate .. //depot/projects/smpng/sys/contrib/dev/mwl/LICENSE#1 branch .. //depot/projects/smpng/sys/contrib/dev/mwl/Makefile#1 branch .. //depot/projects/smpng/sys/contrib/dev/mwl/mw88W8363.fw.uu#1 branch .. //depot/projects/smpng/sys/contrib/dev/mwl/mwlboot.fw.uu#1 branch .. //depot/projects/smpng/sys/contrib/pf/net/pf_ioctl.c#31 integrate .. //depot/projects/smpng/sys/ddb/db_textdump.c#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/Makefile#14 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm.c#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_gram.y#12 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#5 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_scan.l#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#7 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#64 integrate .. //depot/projects/smpng/sys/dev/ata/ata-usb.c#13 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#8 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#5 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#107 integrate .. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#17 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#22 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#8 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#50 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#34 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#15 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#90 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#26 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#9 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#21 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#23 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.h#9 integrate .. //depot/projects/smpng/sys/dev/mge/if_mge.c#4 integrate .. //depot/projects/smpng/sys/dev/mwl/if_mwl.c#1 branch .. //depot/projects/smpng/sys/dev/mwl/if_mwl_pci.c#1 branch .. //depot/projects/smpng/sys/dev/mwl/if_mwlioctl.h#1 branch .. //depot/projects/smpng/sys/dev/mwl/if_mwlvar.h#1 branch .. //depot/projects/smpng/sys/dev/mwl/mwldiag.h#1 branch .. //depot/projects/smpng/sys/dev/mwl/mwlhal.c#1 branch .. //depot/projects/smpng/sys/dev/mwl/mwlhal.h#1 branch .. //depot/projects/smpng/sys/dev/mwl/mwlreg.h#1 branch .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#28 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge_var.h#15 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#17 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#56 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#109 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#30 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#16 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#75 integrate .. //depot/projects/smpng/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/smpng/sys/dev/sis/if_sis.c#5 integrate .. //depot/projects/smpng/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#32 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#26 integrate .. //depot/projects/smpng/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#10 integrate .. //depot/projects/smpng/sys/dev/syscons/daemon/daemon_saver.c#7 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#5 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/sequences#3 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken.c#6 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken.h#5 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken_subr_compat.h#3 integrate .. //depot/projects/smpng/sys/dev/tsec/if_tsec.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_bus.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_busdma.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_busdma.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_controller.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_core.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_handle_request.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_lookup.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_lookup.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mbuf.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mbuf.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_msctest.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_msctest.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_process.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_request.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_transfer.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/usb_util.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#138 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#6 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#7 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#6 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#25 integrate .. //depot/projects/smpng/sys/dev/vr/if_vr.c#5 integrate .. //depot/projects/smpng/sys/dev/xl/if_xl.c#4 integrate .. //depot/projects/smpng/sys/fs/cd9660/cd9660_rrip.c#7 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsport.h#5 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clstate.c#3 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvfsops.c#5 integrate .. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/smpng/sys/fs/nfsserver/nfs_nfsdport.c#5 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#21 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#41 integrate .. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#58 integrate .. //depot/projects/smpng/sys/geom/label/g_label.c#15 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#25 integrate .. //depot/projects/smpng/sys/i386/i386/dump_machdep.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/minidump_machdep.c#8 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_socksys.c#17 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysent.c#20 integrate .. //depot/projects/smpng/sys/i386/include/apicvar.h#33 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#28 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#45 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/dump_machdep.c#12 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#90 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#61 integrate .. //depot/projects/smpng/sys/kern/kern_cpu.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#69 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#105 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#110 integrate .. //depot/projects/smpng/sys/kern/kern_shutdown.c#76 integrate .. //depot/projects/smpng/sys/kern/kern_vimage.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#25 integrate .. //depot/projects/smpng/sys/kern/makesyscalls.sh#27 integrate .. //depot/projects/smpng/sys/kern/subr_sglist.c#1 branch .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#15 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#123 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#117 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#85 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#123 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#56 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#61 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#94 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#167 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#42 integrate .. //depot/projects/smpng/sys/kgssapi/gsstest.c#4 integrate .. //depot/projects/smpng/sys/modules/Makefile#162 integrate .. //depot/projects/smpng/sys/modules/cpufreq/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/geom/geom_part/geom_part_ebr/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/mwl/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mwlfw/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/Makefile#18 integrate .. //depot/projects/smpng/sys/modules/zfs/Makefile#10 integrate .. //depot/projects/smpng/sys/net/if.c#119 integrate .. //depot/projects/smpng/sys/net/if.h#41 integrate .. //depot/projects/smpng/sys/net/if_var.h#63 integrate .. //depot/projects/smpng/sys/net/netisr.c#17 integrate .. //depot/projects/smpng/sys/net/netisr.h#14 integrate .. //depot/projects/smpng/sys/net/route.c#47 integrate .. //depot/projects/smpng/sys/net/route.h#32 integrate .. //depot/projects/smpng/sys/net/rtsock.c#72 integrate .. //depot/projects/smpng/sys/net/vnet.h#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_dfs.c#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.c#22 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#10 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ht.h#9 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.h#21 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_node.h#29 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#25 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan.h#7 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_superg.c#5 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.c#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_var.h#40 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#33 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#25 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#12 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#20 integrate .. //depot/projects/smpng/sys/netgraph/ng_ksocket.c#34 integrate .. //depot/projects/smpng/sys/netinet/accf_data.c#9 integrate .. //depot/projects/smpng/sys/netinet/accf_dns.c#3 integrate .. //depot/projects/smpng/sys/netinet/accf_http.c#10 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#70 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#33 integrate .. //depot/projects/smpng/sys/netinet/in.h#47 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#96 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#64 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#25 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#65 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#100 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#108 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#81 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#29 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.h#10 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#23 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#30 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#54 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#25 integrate .. //depot/projects/smpng/sys/netinet6/in6_ifattach.c#34 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#62 integrate .. //depot/projects/smpng/sys/netinet6/in6_rmx.c#21 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#63 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#64 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#53 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#31 integrate .. //depot/projects/smpng/sys/netinet6/vinet6.h#8 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#19 integrate .. //depot/projects/smpng/sys/netipx/ipx_input.c#22 integrate .. //depot/projects/smpng/sys/netnatm/natm_proto.c#18 integrate .. //depot/projects/smpng/sys/netsmb/smb_trantcp.c#24 integrate .. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#41 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#58 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#61 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#72 integrate .. //depot/projects/smpng/sys/nfsserver/nfs.h#26 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvkrpc.c#6 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsock.c#38 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#43 integrate .. //depot/projects/smpng/sys/nlm/nlm_advlock.c#5 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#77 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#14 integrate .. //depot/projects/smpng/sys/powerpc/booke/machdep.c#12 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#58 integrate .. //depot/projects/smpng/sys/powerpc/conf/NOTES#15 integrate .. //depot/projects/smpng/sys/powerpc/cpufreq/dfs.c#1 branch .. //depot/projects/smpng/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_cpu.c#1 branch .. //depot/projects/smpng/sys/powerpc/powermac/pmu.c#3 integrate .. //depot/projects/smpng/sys/powerpc/powermac/vcoregpio.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/cpu.c#14 integrate .. //depot/projects/smpng/sys/rpc/authunix_prot.c#5 integrate .. //depot/projects/smpng/sys/rpc/clnt_dg.c#4 integrate .. //depot/projects/smpng/sys/rpc/clnt_vc.c#5 integrate .. //depot/projects/smpng/sys/rpc/svc_dg.c#3 integrate .. //depot/projects/smpng/sys/rpc/svc_vc.c#4 integrate .. //depot/projects/smpng/sys/rpc/xdr.h#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/dump_machdep.c#12 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/dump_machdep.c#5 integrate .. //depot/projects/smpng/sys/sys/buf.h#55 integrate .. //depot/projects/smpng/sys/sys/conf.h#59 integrate .. //depot/projects/smpng/sys/sys/cpu.h#4 integrate .. //depot/projects/smpng/sys/sys/jail.h#27 integrate .. //depot/projects/smpng/sys/sys/kernel.h#45 integrate .. //depot/projects/smpng/sys/sys/mount.h#75 integrate .. //depot/projects/smpng/sys/sys/param.h#146 integrate .. //depot/projects/smpng/sys/sys/pcpu.h#25 integrate .. //depot/projects/smpng/sys/sys/priv.h#18 integrate .. //depot/projects/smpng/sys/sys/sglist.h#1 branch .. //depot/projects/smpng/sys/sys/sockbuf.h#3 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#64 integrate .. //depot/projects/smpng/sys/sys/sockio.h#14 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#61 integrate .. //depot/projects/smpng/sys/sys/sysent.h#33 integrate .. //depot/projects/smpng/sys/sys/ucred.h#32 integrate .. //depot/projects/smpng/sys/sys/user.h#35 integrate .. //depot/projects/smpng/sys/sys/vimage.h#12 integrate .. //depot/projects/smpng/sys/sys/vnode.h#99 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#76 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#104 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#46 integrate .. //depot/projects/smpng/sys/xen/evtchn/evtchn.c#7 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.350 2009/05/27 16:36:54 zml Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.352 2009/06/01 20:35:53 jhb Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -218,6 +218,7 @@ selrecord.9 \ sema.9 \ sf_buf.9 \ + sglist.9 \ signal.9 \ sleep.9 \ sleepqueue.9 \ @@ -1022,6 +1023,24 @@ sf_buf.9 sf_buf_free.9 \ sf_buf.9 sf_buf_kva.9 \ sf_buf.9 sf_buf_page.9 +MLINKS+=sglist.9 sglist_alloc.9 \ + sglist.9 sglist_append.9 \ + sglist.9 sglist_append_mbuf.9 \ + sglist.9 sglist_append_phys.9 \ + sglist.9 sglist_append_uio.9 \ + sglist.9 sglist_append_user.9 \ + sglist.9 sglist_build.9 \ + sglist.9 sglist_clone.9 \ + sglist.9 sglist_consume_uio.9 \ + sglist.9 sglist_count.9 \ + sglist.9 sglist_free.9 \ + sglist.9 sglist_hold.9 \ + sglist.9 sglist_init.9 \ + sglist.9 sglist_join.9 \ + sglist.9 sglist_length.9 \ + sglist.9 sglist_reset.9 \ + sglist.9 sglist_slice.9 \ + sglist.9 sglist_split.9 MLINKS+=signal.9 cursig.9 \ signal.9 execsigs.9 \ signal.9 issignal.9 \ @@ -1288,6 +1307,7 @@ MLINKS+=vm_page_wakeup.9 vm_page_busy.9 \ vm_page_wakeup.9 vm_page_flash.9 MLINKS+=vm_page_wire.9 vm_page_unwire.9 +MLINKS+=VOP_ACCESS.9 VOP_ACCESSX.9 MLINKS+=VOP_ATTRIB.9 VOP_GETATTR.9 \ VOP_ATTRIB.9 VOP_SETATTR.9 MLINKS+=VOP_CREATE.9 VOP_MKDIR.9 \ ==== //depot/projects/smpng/share/man/man9/VOP_ACCESS.9#2 (text+ko) ==== @@ -27,19 +27,22 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.24 2009/03/30 20:56:37 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.26 2009/06/01 07:48:27 trasz Exp $ .\" -.Dd July 24, 1996 +.Dd June 1, 2009 .Os .Dt VOP_ACCESS 9 .Sh NAME -.Nm VOP_ACCESS +.Nm VOP_ACCESS , +.Nm VOP_ACCESSX .Nd "check access permissions of a file or Unix domain socket" .Sh SYNOPSIS .In sys/param.h .In sys/vnode.h .Ft int .Fn VOP_ACCESS "struct vnode *vp" "accmode_t accmode" "struct ucred *cred" "struct thread *td" +.Ft int +.Fn VOP_ACCESSX "struct vnode *vp" "accmode_t accmode" "struct ucred *cred" "struct thread *td" .Sh DESCRIPTION This entry point checks the access permissions of the file against the given credentials. @@ -63,6 +66,20 @@ .Dv VWRITE or .Dv VEXEC . +For +.Fn VOP_ACCESS , +the only flags that may be set in +.Fa accmode +are +.Dv VEXEC , +.Dv VWRITE , +.Dv VREAD , +.Dv VADMIN +and +.Dv VAPPEND . +To check for other flags, one has to use +.Fn VOP_ACCESSX +instead. .Sh LOCKS The vnode will be locked on entry and should remain locked on return. .Sh RETURN VALUES ==== //depot/projects/smpng/sys/amd64/amd64/dump_machdep.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.17 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/dump_machdep.c,v 1.18 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/amd64/amd64/minidump_machdep.c#8 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.9 2008/10/31 10:11:35 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/minidump_machdep.c,v 1.10 2009/05/29 21:27:12 jamie Exp $"); #include #include @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include ==== //depot/projects/smpng/sys/amd64/linux32/linux.h#24 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.28 2009/05/16 18:48:41 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.29 2009/06/01 20:48:39 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -669,6 +669,7 @@ #define LINUX_GETSOCKOPT 15 #define LINUX_SENDMSG 16 #define LINUX_RECVMSG 17 +#define LINUX_ACCEPT4 18 #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#27 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.40 2009/06/01 16:14:38 rwatson Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -19,321 +19,321 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = setup */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ - { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0 }, /* 2 = linux_fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ - { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = linux_chdir */ - { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0 }, /* 13 = linux_time */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = linux_chmod */ - { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0 }, /* 16 = linux_lchown16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ - { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0 }, /* 18 = linux_stat */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = linux_oldumount */ - { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0 }, /* 23 = linux_setuid16 */ - { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0 }, /* 24 = linux_getuid16 */ - { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 25 = linux_stime */ - { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = linux_ptrace */ - { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0 }, /* 27 = linux_alarm */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 28 = fstat */ - { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0 }, /* 29 = linux_pause */ - { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0 }, /* 30 = linux_utime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 31 = stty */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 32 = gtty */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = linux_access */ - { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0 }, /* 34 = linux_nice */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 35 = ftime */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ - { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0 }, /* 37 = linux_kill */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0 }, /* 38 = linux_rename */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 39 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 40 = linux_rmdir */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ - { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = linux_pipe */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0 }, /* 43 = linux_times */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0 }, /* 45 = linux_brk */ - { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0 }, /* 46 = linux_setgid16 */ - { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0 }, /* 47 = linux_getgid16 */ - { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0 }, /* 48 = linux_signal */ - { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0 }, /* 49 = linux_geteuid16 */ - { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0 }, /* 50 = linux_getegid16 */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0 }, /* 52 = linux_umount */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = linux_ioctl */ - { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 55 = linux_fcntl */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 56 = mpx */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 57 = setpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 58 = ulimit */ - { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0 }, /* 59 = linux_olduname */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0 }, /* 62 = linux_ustat */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 63 = dup2 */ - { 0, (sy_call_t *)linux_getppid, AUE_GETPPID, NULL, 0, 0 }, /* 64 = linux_getppid */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 65 = getpgrp */ - { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 66 = setsid */ - { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0 }, /* 67 = linux_sigaction */ - { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0 }, /* 68 = linux_sgetmask */ - { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0 }, /* 69 = linux_ssetmask */ - { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0 }, /* 70 = linux_setreuid16 */ - { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0 }, /* 71 = linux_setregid16 */ - { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 72 = linux_sigsuspend */ - { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0 }, /* 73 = linux_sigpending */ - { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0 }, /* 74 = linux_sethostname */ - { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 75 = linux_setrlimit */ - { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 76 = linux_old_getrlimit */ - { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 77 = linux_getrusage */ - { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL, NULL, 0, 0 }, /* 78 = linux_gettimeofday */ - { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 79 = linux_settimeofday */ - { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0 }, /* 80 = linux_getgroups16 */ - { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0 }, /* 81 = linux_setgroups16 */ - { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0 }, /* 82 = linux_old_select */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 83 = linux_symlink */ - { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0 }, /* 84 = linux_lstat */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0 }, /* 85 = linux_readlink */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 89 = linux_readdir */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ - { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 93 = linux_ftruncate */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 94 = fchmod */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 95 = fchown */ - { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 96 = linux_getpriority */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 97 = setpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 98 = profil */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0 }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 100 = linux_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 101 = ioperm */ - { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0 }, /* 102 = linux_socketcall */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0 }, /* 103 = linux_syslog */ - { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 104 = linux_setitimer */ - { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 105 = linux_getitimer */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0 }, /* 106 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ - { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ - { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = vm86old */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 114 = linux_wait4 */ - { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 115 = linux_swapoff */ - { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0 }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0 }, /* 117 = linux_ipc */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */ - { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */ - { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */ - { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = linux_setdomainname */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 123 = modify_ldt */ - { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 125 = linux_mprotect */ - { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 126 = linux_sigprocmask */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0 }, /* 127 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0 }, /* 128 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0 }, /* 129 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0 }, /* 130 = linux_get_kernel_syms */ - { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 131 = linux_quotactl */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 132 = getpgid */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 133 = fchdir */ - { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0 }, /* 134 = linux_bdflush */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0 }, /* 135 = linux_sysfs */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0 }, /* 136 = linux_personality */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 137 = afs_syscall */ - { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ - { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ - { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 141 = linux_getdents */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ - { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV, NULL, 0, 0 }, /* 145 = linux_readv */ - { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV, NULL, 0, 0 }, /* 146 = linux_writev */ - { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0 }, /* 147 = linux_getsid */ - { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0 }, /* 148 = linux_fdatasync */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 149 = linux_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 150 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 151 = munlock */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 152 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 153 = munlockall */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0 }, /* 154 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0 }, /* 155 = sched_getparam */ - { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0 }, /* 156 = linux_sched_setscheduler */ - { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0 }, /* 157 = linux_sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 158 = sched_yield */ - { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0 }, /* 159 = linux_sched_get_priority_max */ - { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0 }, /* 160 = linux_sched_get_priority_min */ - { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0 }, /* 161 = linux_sched_rr_get_interval */ - { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = linux_nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0 }, /* 163 = linux_mremap */ - { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0 }, /* 164 = linux_setresuid16 */ - { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0 }, /* 165 = linux_getresuid16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 166 = vm86 */ - { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0 }, /* 167 = linux_query_module */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 168 = poll */ - { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ - { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ - { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ - { AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ - { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ - { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ - { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ - { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ - { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ - { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 181 = linux_pwrite */ - { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 }, /* 182 = linux_chown16 */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 }, /* 185 = linux_capset */ - { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 }, /* 186 = linux_sigaltstack */ - { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 187 = linux_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 188 = getpmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 189 = putpmsg */ - { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0 }, /* 190 = linux_vfork */ - { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 191 = linux_getrlimit */ - { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0 }, /* 192 = linux_mmap2 */ - { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0 }, /* 193 = linux_truncate64 */ - { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0 }, /* 194 = linux_ftruncate64 */ - { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0 }, /* 195 = linux_stat64 */ - { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0 }, /* 196 = linux_lstat64 */ - { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0 }, /* 197 = linux_fstat64 */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 198 = linux_lchown */ - { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0 }, /* 199 = linux_getuid */ - { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0 }, /* 200 = linux_getgid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 201 = geteuid */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 202 = getegid */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 203 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 204 = setregid */ - { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 205 = linux_getgroups */ - { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 206 = linux_setgroups */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0 }, /* 207 = fchown */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 208 = setresuid */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 209 = getresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 210 = setresgid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 211 = getresgid */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0 }, /* 212 = linux_chown */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 213 = setuid */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 214 = setgid */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0 }, /* 215 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0 }, /* 216 = linux_setfsgid */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 220 = linux_getdents64 */ - { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ - { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0 }, /* 224 = linux_gettid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 225 = linux_readahead */ - { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0 }, /* 226 = linux_setxattr */ - { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0 }, /* 227 = linux_lsetxattr */ - { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0 }, /* 228 = linux_fsetxattr */ - { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0 }, /* 229 = linux_getxattr */ - { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0 }, /* 230 = linux_lgetxattr */ - { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0 }, /* 231 = linux_fgetxattr */ - { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0 }, /* 232 = linux_listxattr */ - { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0 }, /* 233 = linux_llistxattr */ - { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0 }, /* 234 = linux_flistxattr */ - { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0 }, /* 235 = linux_removexattr */ - { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0 }, /* 236 = linux_lremovexattr */ - { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0 }, /* 237 = linux_fremovexattr */ - { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0 }, /* 238 = linux_tkill */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ - { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ - { AS(linux_sched_setaffinity_args), (sy_call_t *)linux_sched_setaffinity, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ - { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ - { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 248 = inux_io_submit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0 }, /* 250 = linux_fadvise64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ - { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ - { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ - { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0 }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0 }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0 }, /* 263 = linux_timer_delete */ - { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ - { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ - { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ - { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ - { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0 }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ - { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ - { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ - { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0 }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0 }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0 }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0 }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0 }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0 }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0 }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0 }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = */ - { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0 }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0 }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0 }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0 }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0 }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0 }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ - { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ - { AS(linux_mkdirat_args), (sy_call_t *)linux_mkdirat, AUE_MKDIRAT, NULL, 0, 0 }, /* 296 = linux_mkdirat */ - { AS(linux_mknodat_args), (sy_call_t *)linux_mknodat, AUE_MKNODAT, NULL, 0, 0 }, /* 297 = linux_mknodat */ - { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_FCHOWNAT, NULL, 0, 0 }, /* 298 = linux_fchownat */ - { AS(linux_futimesat_args), (sy_call_t *)linux_futimesat, AUE_FUTIMESAT, NULL, 0, 0 }, /* 299 = linux_futimesat */ - { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_FSTATAT, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ - { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 301 = linux_unlinkat */ - { AS(linux_renameat_args), (sy_call_t *)linux_renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 302 = linux_renameat */ - { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_LINKAT, NULL, 0, 0 }, /* 303 = linux_linkat */ - { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 304 = linux_symlinkat */ - { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_READLINKAT, NULL, 0, 0 }, /* 305 = linux_readlinkat */ - { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_FCHMODAT, NULL, 0, 0 }, /* 306 = linux_fchmodat */ - { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_FACCESSAT, NULL, 0, 0 }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ - { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 }, /* 311 = linux_set_robust_list */ - { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 }, /* 312 = linux_get_robust_list */ - { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0 }, /* 313 = linux_splice */ - { 0, (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0 }, /* 314 = linux_sync_file_range */ - { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0 }, /* 315 = linux_tee */ - { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0 }, /* 316 = linux_vmsplice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = setup */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0, 0 }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, 0 }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, 0 }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0, 0 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0, 0 }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0, 0 }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0, 0 }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0, 0 }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0, 0 }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0, 0 }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0, 0 }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 16 = linux_lchown16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 17 = break */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0, 0 }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0, 0 }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0, 0 }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 22 = linux_oldumount */ + { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0, 0 }, /* 23 = linux_setuid16 */ + { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0, 0 }, /* 24 = linux_getuid16 */ + { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 25 = linux_stime */ + { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0, 0 }, /* 26 = linux_ptrace */ + { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0, 0 }, /* 27 = linux_alarm */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 28 = fstat */ + { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0, 0 }, /* 29 = linux_pause */ + { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0, 0 }, /* 30 = linux_utime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 31 = stty */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 32 = gtty */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0, 0 }, /* 33 = linux_access */ + { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0, 0 }, /* 34 = linux_nice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 35 = ftime */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, 0 }, /* 36 = sync */ + { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0, 0 }, /* 37 = linux_kill */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0, 0 }, /* 38 = linux_rename */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0, 0 }, /* 39 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0, 0 }, /* 40 = linux_rmdir */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, 0 }, /* 41 = dup */ + { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0, 0 }, /* 42 = linux_pipe */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0, 0 }, /* 43 = linux_times */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 44 = prof */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0, 0 }, /* 45 = linux_brk */ + { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0, 0 }, /* 46 = linux_setgid16 */ + { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0, 0 }, /* 47 = linux_getgid16 */ + { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0, 0 }, /* 48 = linux_signal */ + { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0, 0 }, /* 49 = linux_geteuid16 */ + { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0, 0 }, /* 50 = linux_getegid16 */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 52 = linux_umount */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 53 = lock */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = linux_ioctl */ + { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0, 0 }, /* 55 = linux_fcntl */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 56 = mpx */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0, 0 }, /* 57 = setpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 58 = ulimit */ + { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0, 0 }, /* 59 = linux_olduname */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, 0 }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0, 0 }, /* 61 = chroot */ + { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0, 0 }, /* 62 = linux_ustat */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, 0 }, /* 63 = dup2 */ + { 0, (sy_call_t *)linux_getppid, AUE_GETPPID, NULL, 0, 0, 0 }, /* 64 = linux_getppid */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, 0 }, /* 65 = getpgrp */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, 0 }, /* 66 = setsid */ + { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0, 0 }, /* 67 = linux_sigaction */ + { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0, 0 }, /* 68 = linux_sgetmask */ + { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0, 0 }, /* 69 = linux_ssetmask */ + { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0, 0 }, /* 70 = linux_setreuid16 */ + { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0, 0 }, /* 71 = linux_setregid16 */ + { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0, 0 }, /* 72 = linux_sigsuspend */ + { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0, 0 }, /* 73 = linux_sigpending */ + { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 74 = linux_sethostname */ + { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0, 0 }, /* 75 = linux_setrlimit */ + { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 76 = linux_old_getrlimit */ + { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE, NULL, 0, 0, 0 }, /* 77 = linux_getrusage */ + { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL, NULL, 0, 0, 0 }, /* 78 = linux_gettimeofday */ + { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 79 = linux_settimeofday */ + { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0, 0 }, /* 80 = linux_getgroups16 */ + { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0, 0 }, /* 81 = linux_setgroups16 */ + { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0, 0 }, /* 82 = linux_old_select */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 83 = linux_symlink */ + { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 84 = linux_lstat */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0, 0 }, /* 85 = linux_readlink */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 86 = linux_uselib */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0, 0 }, /* 87 = swapon */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 89 = linux_readdir */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0, 0 }, /* 90 = linux_mmap */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, 0 }, /* 91 = munmap */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 92 = linux_truncate */ + { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 93 = linux_ftruncate */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, 0 }, /* 94 = fchmod */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, 0 }, /* 95 = fchown */ + { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0, 0 }, /* 96 = linux_getpriority */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, 0 }, /* 97 = setpriority */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 98 = profil */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0, 0 }, /* 99 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0, 0 }, /* 100 = linux_fstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 101 = ioperm */ + { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0, 0 }, /* 102 = linux_socketcall */ + { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0, 0 }, /* 103 = linux_syslog */ + { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0, 0 }, /* 104 = linux_setitimer */ + { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0, 0 }, /* 105 = linux_getitimer */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0, 0 }, /* 106 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 107 = linux_newlstat */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 108 = linux_newfstat */ + { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0, 0 }, /* 109 = linux_uname */ + { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0, 0 }, /* 110 = linux_iopl */ + { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0, 0 }, /* 111 = linux_vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 112 = idle */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 113 = vm86old */ + { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0, 0 }, /* 114 = linux_wait4 */ + { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0, 0 }, /* 115 = linux_swapoff */ + { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0, 0 }, /* 116 = linux_sysinfo */ + { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0, 0 }, /* 117 = linux_ipc */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, 0 }, /* 118 = fsync */ + { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 119 = linux_sigreturn */ + { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0, 0 }, /* 120 = linux_clone */ + { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 121 = linux_setdomainname */ + { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0, 0 }, /* 122 = linux_newuname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 123 = modify_ldt */ + { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0, 0 }, /* 124 = linux_adjtimex */ + { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0, 0 }, /* 125 = linux_mprotect */ + { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0 }, /* 126 = linux_sigprocmask */ + { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0, 0 }, /* 127 = linux_create_module */ + { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0, 0 }, /* 128 = linux_init_module */ + { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0, 0 }, /* 129 = linux_delete_module */ + { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0, 0 }, /* 130 = linux_get_kernel_syms */ + { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0, 0 }, /* 131 = linux_quotactl */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, 0 }, /* 132 = getpgid */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0, 0 }, /* 133 = fchdir */ + { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0, 0 }, /* 134 = linux_bdflush */ + { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0, 0 }, /* 135 = linux_sysfs */ + { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0, 0 }, /* 136 = linux_personality */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 137 = afs_syscall */ + { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0, 0 }, /* 138 = linux_setfsuid16 */ + { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0, 0 }, /* 139 = linux_setfsgid16 */ + { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 141 = linux_getdents */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0, 0 }, /* 142 = linux_select */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, 0 }, /* 143 = flock */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0, 0 }, /* 144 = linux_msync */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 1 22:00:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9005F1065672; Mon, 1 Jun 2009 22:00:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F3491065674 for ; Mon, 1 Jun 2009 22:00:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3DC878FC16 for ; Mon, 1 Jun 2009 22:00:11 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n51M0Bhi068678 for ; Mon, 1 Jun 2009 22:00:11 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n51M0BAo068676 for perforce@freebsd.org; Mon, 1 Jun 2009 22:00:11 GMT (envelope-from jhb@freebsd.org) Date: Mon, 1 Jun 2009 22:00:11 GMT Message-Id: <200906012200.n51M0BAo068676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163327 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 22:00:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=163327 Change 163327 by jhb@jhb_jhbbsd on 2009/06/01 21:59:51 IFC @163325 Affected files ... .. //depot/projects/smpng/sys/dev/ksyms/ksyms.c#2 integrate Differences ... ==== //depot/projects/smpng/sys/dev/ksyms/ksyms.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ksyms/ksyms.c,v 1.2 2009/05/27 16:20:46 sson Exp $ + * $FreeBSD: src/sys/dev/ksyms/ksyms.c,v 1.3 2009/06/01 21:54:22 jhb Exp $ */ #include @@ -552,7 +552,7 @@ /* ARGSUSED */ static int ksyms_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int32_t flag __unused, - d_thread_t *td __unused) + struct thread *td __unused) { int error = 0; struct ksyms_softc *sc; From owner-p4-projects@FreeBSD.ORG Tue Jun 2 02:41:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF38B1065674; Tue, 2 Jun 2009 02:41:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AC50F106566C for ; Tue, 2 Jun 2009 02:41:57 +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 98E5C8FC1A for ; Tue, 2 Jun 2009 02:41:57 +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 n522fvHr005454 for ; Tue, 2 Jun 2009 02:41:57 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n522fvZA005452 for perforce@freebsd.org; Tue, 2 Jun 2009 02:41:57 GMT (envelope-from gabor@freebsd.org) Date: Tue, 2 Jun 2009 02:41:57 GMT Message-Id: <200906020241.n522fvZA005452@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 163331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 02:41:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=163331 Change 163331 by gabor@gabor_server on 2009/06/02 02:41:55 - Make it WARNS=6 clean Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#21 edit .. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#14 edit .. //depot/projects/soc2008/gabor_textproc/grep/file.c#44 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#88 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#50 edit .. //depot/projects/soc2008/gabor_textproc/grep/queue.c#8 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#83 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#21 (text+ko) ==== @@ -15,7 +15,8 @@ grep.1 zegrep.1 \ grep.1 zfgrep.1 -CFLAGS+= -std=c99 -Wall -pedantic +CFLAGS+= -std=c99 +WARNS?= 6 LDADD= -lz -lbz2 DPADD= ${LIBZ} ${LIBBZ2} ==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#14 (text+ko) ==== @@ -55,7 +55,7 @@ void fgrepcomp(fastgrep_t *fg, const char *pat) { - int i; + unsigned int i; /* Initialize. */ fg->len = strlen(pat); @@ -63,10 +63,11 @@ fg->eol = 0; fg->reversed = 0; - fg->pattern = (unsigned char *)pat; /* really const */ + fg->pattern = grep_malloc(strlen(pat) + 1); + strcpy(fg->pattern, pat); /* Preprocess pattern. */ - for (i = 0; i <= (signed)UCHAR_MAX; i++) + for (i = 0; i <= UCHAR_MAX; i++) fg->qsBc[i] = fg->len; for (i = 1; i < fg->len; i++) fg->qsBc[fg->pattern[i]] = fg->len - i; @@ -78,7 +79,7 @@ int fastcomp(fastgrep_t *fg, const char *pat) { - int i; + unsigned int i; int bol = 0; int eol = 0; int shiftPatternLen; @@ -154,7 +155,7 @@ */ if ((!(lflag || cflag)) && ((!(bol || eol)) && ((lastHalfDot) && ((firstHalfDot < 0) || - ((fg->len - (lastHalfDot + 1)) < firstHalfDot)))) && !oflag && !color) { + ((fg->len - (lastHalfDot + 1)) < (size_t)firstHalfDot)))) && !oflag && !color) { fg->reversed = 1; hasDot = fg->len - (firstHalfDot < 0 ? firstLastHalfDot : firstHalfDot) - 1; @@ -184,7 +185,7 @@ shiftPatternLen = fg->len - hasDot; /* Preprocess pattern. */ - for (i = 0; i <= UCHAR_MAX; i++) + for (i = 0; i <= (signed)UCHAR_MAX; i++) fg->qsBc[i] = shiftPatternLen; for (i = hasDot + 1; i < fg->len; i++) { fg->qsBc[fg->pattern[i]] = fg->len - i; @@ -203,10 +204,10 @@ int grep_search(fastgrep_t *fg, unsigned char *data, size_t len, regmatch_t *pmatch) { - int j; - int ret = REG_NOMATCH; + unsigned int j; + int ret = REG_NOMATCH; - if (pmatch->rm_so == len) + if (pmatch->rm_so == (ssize_t)len) return (ret); if (fg->bol && pmatch->rm_so != 0) { @@ -282,25 +283,25 @@ static int grep_cmp(const unsigned char *pat, const unsigned char *data, size_t len) { - int i; + unsigned int i; size_t size; wchar_t *wdata, *wpat; if (iflag) { - if ((size = mbstowcs(NULL, (const char *)data, 0)) == -1) + if ((size = mbstowcs(NULL, (const char *)data, 0)) == ((size_t) - 1)) return (-1); wdata = grep_malloc(size * sizeof(wint_t)); - if (mbstowcs(wdata, (const char *)data, size) == -1) + if (mbstowcs(wdata, (const char *)data, size) == ((size_t) - 1)) return (-1); - if ((size = mbstowcs(NULL, (const char *)pat, 0)) == -1) + if ((size = mbstowcs(NULL, (const char *)pat, 0)) == ((size_t) - 1)) return (-1); wpat = grep_malloc(size * sizeof(wint_t)); - if (mbstowcs(wpat, (const char *)pat, size) == -1) + if (mbstowcs(wpat, (const char *)pat, size) == ((size_t) - 1)) return (-1); for (i = 0; i < len; i++) { if ((towlower(wpat[i]) == towlower(wdata[i])) || ((grepbehave != GREP_FIXED) && wpat[i] == L'.')) ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#44 (text+ko) ==== @@ -122,10 +122,9 @@ char * grep_fgetln(struct file *f, size_t *len) { - int i = 0; int ch = 0; struct stat st; - size_t bufsiz; + size_t bufsiz, i = 0; /* Fill in the buffer if it is empty. */ if (binbufptr == NULL) { @@ -203,7 +202,7 @@ * Opens a normal, a gzipped or a bzip2 compressed file for processing. */ struct file * -grep_open(char *path) +grep_open(const char *path) { struct file *f; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#88 (text+ko) ==== @@ -62,7 +62,7 @@ * Default messags to use when NLS is disabled or no catalogue * is found. */ -char *errstr[] = { +const char *errstr[] = { "", /* 1*/ "(standard input)", /* 2*/ "cannot read bzip2 compressed file", @@ -84,13 +84,13 @@ int matchall; /* Searching patterns */ -int patterns, pattern_sz; +unsigned int patterns, pattern_sz; char **pattern; regex_t *r_pattern; fastgrep_t *fg_pattern; /* Filename exclusion/inclusion patterns */ -int epatterns, epattern_sz; +unsigned int epatterns, epattern_sz; struct epat *epattern; /* For regex errors */ @@ -163,7 +163,7 @@ exit(2); } -static char *optstr = "0123456789A:B:C:D:EFGHIJLOPSRUVZabcd:e:f:hilm:nopqrsuvwxy"; +static const char *optstr = "0123456789A:B:C:D:EFGHIJLOPSRUVZabcd:e:f:hilm:nopqrsuvwxy"; struct option long_options[] = { @@ -285,11 +285,11 @@ int main(int argc, char *argv[]) { - int c, lastc, prevoptind, newarg, i, needpattern; + int c, lastc, prevoptind, newarg, needpattern; + unsigned int i, eargc, aargc; char *ep; unsigned long long l; char **eargv, **aargv, *eopts; - int eargc, aargc; setlocale(LC_ALL, ""); @@ -540,12 +540,12 @@ errx(2, getstr(11)); break; case COLOR_OPT: - if (optarg == NULL) - optarg = "auto"; - if (strcmp("auto", optarg) == 0 || strcmp("always", optarg) == 0 ) { + if (optarg == NULL || strcmp("auto", optarg) == 0 || strcmp("always", optarg) == 0 ) { color = getenv("GREP_COLOR"); - if (color == NULL) - color = "01;31"; + if (color == NULL) { + color = grep_malloc(sizeof(char) * 6); + strcpy(color, "01;31"); + } } else if (strcmp("never", optarg) == 0) color = NULL; else ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#50 (text+ko) ==== @@ -43,7 +43,7 @@ #define getstr(n) catgets(catalog, 1, n, errstr[n]) #endif -extern char *errstr[]; +extern const char *errstr[]; #define VERSION "2.5.1-FreeBSD" @@ -102,7 +102,7 @@ typedef struct { unsigned char *pattern; - int len; + size_t len; int qsBc[UCHAR_MAX + 1]; /* flags */ int bol; @@ -122,7 +122,8 @@ extern char *color, *label; extern int grepbehave, binbehave, filebehave, devbehave, dirbehave, linkbehave; -extern int first, prev, matchall, patterns, epatterns, tail, notfound; +extern int first, prev, matchall, tail, notfound; +extern unsigned int patterns, epatterns; extern char **pattern; extern struct epat *epattern; extern regex_t *r_pattern, *er_pattern; @@ -133,7 +134,7 @@ extern char re_error[RE_ERROR_BUF + 1]; /* Seems big enough */ /* util.c */ -int procfile(char *fn); +int procfile(const char *fn); int grep_tree(char **argv); void *grep_malloc(size_t size); void *grep_calloc(size_t nmemb, size_t size); @@ -148,7 +149,7 @@ /* file.c */ void grep_close(struct file *f); struct file *grep_stdin_open(void); -struct file *grep_open(char *path); +struct file *grep_open(const char *path); int grep_feof(struct file *f); int grep_fgetc(struct file *f); char *grep_fgetln(struct file *f, size_t *len); ==== //depot/projects/soc2008/gabor_textproc/grep/queue.c#8 (text+ko) ==== @@ -53,7 +53,7 @@ }; static STAILQ_HEAD(, qentry) queue = STAILQ_HEAD_INITIALIZER(queue); -static int count; +static unsigned long long count; static struct qentry *dequeue(void); ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#83 (text+ko) ==== @@ -65,8 +65,9 @@ { FTS *fts; FTSENT *p; - int i, c, ok, fts_flags; + int c, ok, fts_flags; char *d, *dir; + unsigned int i; c = fts_flags = 0; @@ -142,7 +143,7 @@ * passing the lines to procline(). */ int -procfile(char *fn) +procfile(const char *fn) { struct str ln; struct file *f; @@ -179,7 +180,8 @@ return (0); } - ln.file = fn; + ln.file = grep_malloc(strlen(fn) + 1); + strcpy(ln.file, fn); ln.line_no = 0; ln.len = 0; linesqueued = 0; @@ -251,8 +253,9 @@ { regmatch_t pmatch; regmatch_t matches[MAX_LINE_MATCHES]; - regoff_t st = 0; - int c = 0, i, r = 0, m = 0; + size_t st = 0; + int c = 0, r = 0, m = 0; + unsigned int i; if (!matchall) { /* Loop to process the whole line */ @@ -280,21 +283,21 @@ continue; /* Check for full match */ if (r == 0 && xflag) - if (pmatch.rm_so != 0 || pmatch.rm_eo != l->len) + if (pmatch.rm_so != 0 || (size_t)pmatch.rm_eo != l->len) r = REG_NOMATCH; /* Check for whole word match */ - if (r == 0 && wflag && pmatch.rm_so != 0 && pmatch.rm_eo != l->len) { + if (r == 0 && wflag && pmatch.rm_so != 0 && (size_t)pmatch.rm_eo != l->len) { wchar_t *wbegin; wint_t wend; size_t size; size = mbstowcs(NULL, l->dat, pmatch.rm_so); - if (size == -1) + if (size == ((size_t) - 1)) r = REG_NOMATCH; else { wbegin = grep_malloc(size); - if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == -1) + if (mbstowcs(wbegin, l->dat, pmatch.rm_so) == ((size_t) - 1)) r = REG_NOMATCH; else if (sscanf(&l->dat[pmatch.rm_eo], "%lc", &wend) != 1) r = REG_NOMATCH; @@ -316,7 +319,7 @@ if (!oflag && !color) break; - if (st == pmatch.rm_so) + if (st == (size_t)pmatch.rm_so) break; /* No matches */ } } else From owner-p4-projects@FreeBSD.ORG Tue Jun 2 03:34:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 276201065672; Tue, 2 Jun 2009 03:34: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 CE71D106564A for ; Tue, 2 Jun 2009 03:34:51 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1D588FC19 for ; Tue, 2 Jun 2009 03:34:51 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n523YpKb020840 for ; Tue, 2 Jun 2009 03:34:51 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n523Yp3x020838 for perforce@freebsd.org; Tue, 2 Jun 2009 03:34:51 GMT (envelope-from dforsyth@FreeBSD.org) Date: Tue, 2 Jun 2009 03:34:51 GMT Message-Id: <200906020334.n523Yp3x020838@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 163332 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 03:34:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=163332 Change 163332 by dforsyth@squirrel on 2009/06/02 03:33:52 Finished read_file_to_text up. Need to move it. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#4 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.c#4 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#4 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#4 (text+ko) ==== @@ -43,6 +43,6 @@ struct pkg_info; -struct pkg_info *pkg_info_digest_info_from_text(const char *text); +struct pkg_info *pkg_info_parse_info_from_text(const char *text); #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ }; struct pkg_info * -pkg_info_digest_info_from_text(const char *text) +pkg_info_parse_info_from_text(const char *text) { struct pkg_info *pi; ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#4 (text+ko) ==== @@ -7,6 +7,7 @@ #include #include #include +#include #include "pkg_util.h" #include "pkg_info.h" @@ -128,7 +129,7 @@ return (NULL); } - text = pkgdb_read_read_pkg_file_to_text(db, p, COMMENT_FILE); + text = pkgdb_read_file_to_text(db, p, COMMENT_FILE); pkg_set_comment(p, text); free(text); @@ -212,23 +213,30 @@ if (path == NULL) return (NULL); strcpy(path, dir); - strcat(path, '/'); + strcat(path, "/"); strcat(path, filename); s = stat(path, &sb); - if (s < 0 || !S_ISREG(st.st_mode)) { + if (s < 0 || !S_ISREG(sb.st_mode)) { free(path); return (NULL); } - fd = open(path, O_READONLY); - if (fd < 0) { - free(path); + fd = open(path, O_RDONLY); + free(path); + text = malloc(sb.st_size + 1); + if (fd < 0 || text == NULL) { + free(text); + return (NULL); + } + /* reuse s */ + s = read(fd, text, sb.st_size); + if (s < 0) { + free(text); return (NULL); } - + text[sb.st_size] = '\0'; - return (text); } From owner-p4-projects@FreeBSD.ORG Tue Jun 2 05:38:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 745F31065674; Tue, 2 Jun 2009 05:38: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 31567106564A for ; Tue, 2 Jun 2009 05:38:57 +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 DE9868FC12 for ; Tue, 2 Jun 2009 05:38:57 +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 n525cvTg042488 for ; Tue, 2 Jun 2009 05:38:57 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n525cvHG042484 for perforce@freebsd.org; Tue, 2 Jun 2009 05:38:57 GMT (envelope-from dforsyth@FreeBSD.org) Date: Tue, 2 Jun 2009 05:38:57 GMT Message-Id: <200906020538.n525cvHG042484@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 163333 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 05:38:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=163333 Change 163333 by dforsyth@squirrel on 2009/06/02 05:38:46 Blotted out the newline from read comments. pkg_info prints names and comments, though with poor formatting. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/info/main.c#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#4 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#5 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/info/main.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ void usage(int exit_val) { - printf("If you don't know how to use me, then you shouldn't be...\n"); + fprintf(stderr, "%s", "If you don't know how to use me, then you shouldn't be...\n"); exit(exit_val); } ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#4 (text+ko) ==== @@ -36,7 +36,8 @@ struct pkg * pkg_set_comment(struct pkg *p, const char *comment) { - int l; + int c; + char *f; if (p == NULL) return (p); @@ -52,6 +53,13 @@ /* Something bad happened... I should probably let people know * about it... */ } + + /* Blot out a trailing '\n'. */ + c = (int) '\n'; + f = strrchr(p->comment, c); + if (f != NULL) + *f = '\0'; + return (p); } ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#5 (text+ko) ==== @@ -231,6 +231,7 @@ } /* reuse s */ s = read(fd, text, sb.st_size); + close(fd); if (s < 0) { free(text); return (NULL); @@ -247,6 +248,7 @@ pkgdb_pkg_list_init(struct pkgdb *db) { if (db == NULL) return; + TAILQ_INIT(&db->p_head); } From owner-p4-projects@FreeBSD.ORG Tue Jun 2 06:20:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6360106566C; Tue, 2 Jun 2009 06:20:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86C96106566B for ; Tue, 2 Jun 2009 06:20:40 +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 5B9878FC1C for ; Tue, 2 Jun 2009 06:20:40 +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 n526Keid047597 for ; Tue, 2 Jun 2009 06:20:40 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n526Ke0Q047595 for perforce@freebsd.org; Tue, 2 Jun 2009 06:20:40 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 2 Jun 2009 06:20:40 GMT Message-Id: <200906020620.n526Ke0Q047595@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 163334 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 06:20:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=163334 Change 163334 by rene@rene_self on 2009/06/02 06:19:39 Add link for Dutch version of the website. Affected files ... .. //depot/projects/docproj_nl/www/en/index.xsl#5 edit Differences ... ==== //depot/projects/docproj_nl/www/en/index.xsl#5 (text+ko) ==== @@ -159,6 +159,9 @@ ja
    • + nl +
      • +
    • ru
    • From owner-p4-projects@FreeBSD.ORG Tue Jun 2 06:26:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72C301065673; Tue, 2 Jun 2009 06:26:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 32DF5106566C for ; Tue, 2 Jun 2009 06:26:46 +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 C64D98FC14 for ; Tue, 2 Jun 2009 06:26:46 +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 n526Qk48048087 for ; Tue, 2 Jun 2009 06:26:46 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n526QkcE048085 for perforce@freebsd.org; Tue, 2 Jun 2009 06:26:46 GMT (envelope-from dforsyth@FreeBSD.org) Date: Tue, 2 Jun 2009 06:26:46 GMT Message-Id: <200906020626.n526QkcE048085@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 163336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 06:26:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=163336 Change 163336 by dforsyth@squirrel on 2009/06/02 06:26:40 Added pkg_private.h. It's empty. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_private.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue Jun 2 06:41:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E80D3106566B; Tue, 2 Jun 2009 06:41: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 A86B91065674 for ; Tue, 2 Jun 2009 06:41:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 96FBB8FC0C for ; Tue, 2 Jun 2009 06:41:02 +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 n526f2ir049474 for ; Tue, 2 Jun 2009 06:41:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n526f1U8049472 for perforce@freebsd.org; Tue, 2 Jun 2009 06:41:01 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 2 Jun 2009 06:41:01 GMT Message-Id: <200906020641.n526f1U8049472@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 163337 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 06:41:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=163337 Change 163337 by hselasky@hselasky_laptop001 on 2009/06/02 06:40:59 USB input: - style fix patch from Sylvestre Gallon Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#15 (text+ko) ==== @@ -822,7 +822,7 @@ return (ENXIO); /* error */ } -int +static int ukbd_detach(device_t dev) { struct ukbd_softc *sc = device_get_softc(dev); @@ -1569,7 +1569,7 @@ ukbd_driver_load(module_t mod, int what, void *arg) { switch (what) { - case MOD_LOAD: + case MOD_LOAD: kbd_add_driver(&ukbd_kbd_driver); break; case MOD_UNLOAD: From owner-p4-projects@FreeBSD.ORG Tue Jun 2 08:18:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAD391065674; Tue, 2 Jun 2009 08:18: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 8B3D21065672 for ; Tue, 2 Jun 2009 08:18:43 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FA5C8FC15 for ; Tue, 2 Jun 2009 08:18:43 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n528Ifen080633 for ; Tue, 2 Jun 2009 08:18:41 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n528IfDX080627 for perforce@freebsd.org; Tue, 2 Jun 2009 08:18:41 GMT (envelope-from trasz@freebsd.org) Date: Tue, 2 Jun 2009 08:18:41 GMT Message-Id: <200906020818.n528IfDX080627@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 08:18:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163338 Change 163338 by trasz@trasz_victim on 2009/06/02 08:18:32 I need IPSEC for stuff unrelated to HRL; add IPSEC to the kernel config file, so I don't have to switch trees. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#3 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#3 (text+ko) ==== @@ -32,6 +32,9 @@ # # env "GENERIC.env" +options IPSEC +device crypto + makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options SCHED_ULE # ULE scheduler From owner-p4-projects@FreeBSD.ORG Tue Jun 2 08:53:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B24001065670; Tue, 2 Jun 2009 08:53: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 720EA106566B for ; Tue, 2 Jun 2009 08:53:17 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 60A638FC17 for ; Tue, 2 Jun 2009 08:53:17 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n528rHQ6006759 for ; Tue, 2 Jun 2009 08:53:17 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n528rHYI006757 for perforce@freebsd.org; Tue, 2 Jun 2009 08:53:17 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 2 Jun 2009 08:53:17 GMT Message-Id: <200906020853.n528rHYI006757@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 163340 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 08:53:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=163340 Change 163340 by rene@rene_self on 2009/06/02 08:52:44 Change text from "Download FreeBSD" to "Verkrijg FreeBSD" since one can also get it on physical media. Affected files ... .. //depot/projects/docproj_nl/www/nl/index.xsl#8 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/index.xsl#8 (text+ko) ==== @@ -98,7 +98,7 @@
      .
      - Download &os; + Verkrijg &os;
      .
      From owner-p4-projects@FreeBSD.ORG Tue Jun 2 12:12:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0F7110657D9; Tue, 2 Jun 2009 12:12:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A4B510657BA for ; Tue, 2 Jun 2009 12:12:48 +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 3CF348FC13 for ; Tue, 2 Jun 2009 12:12:48 +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 n52CCm1j027037 for ; Tue, 2 Jun 2009 12:12:48 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52CCm7V027035 for perforce@freebsd.org; Tue, 2 Jun 2009 12:12:48 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 2 Jun 2009 12:12:48 GMT Message-Id: <200906021212.n52CCm7V027035@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 163346 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 12:12:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=163346 Change 163346 by rene@rene_self on 2009/06/02 12:11:49 [website] Activate the build of publish.sgml Affected files ... .. //depot/projects/docproj_nl/www/nl/Makefile#10 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/Makefile#10 (text+ko) ==== @@ -21,7 +21,7 @@ DOCS+= internet.sgml DOCS+= logo.sgml DOCS+= mailto.sgml -#DOCS+= publish.sgml +DOCS+= publish.sgml DOCS+= relnotes.sgml DOCS+= send-pr.sgml DOCS+= support.sgml From owner-p4-projects@FreeBSD.ORG Tue Jun 2 12:22:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D74EB1065674; Tue, 2 Jun 2009 12:22: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 96AC01065672 for ; Tue, 2 Jun 2009 12:22:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 834FD8FC25 for ; Tue, 2 Jun 2009 12:22:02 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n52CM2H8027855 for ; Tue, 2 Jun 2009 12:22:02 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52CM2Wv027828 for perforce@freebsd.org; Tue, 2 Jun 2009 12:22:02 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 2 Jun 2009 12:22:02 GMT Message-Id: <200906021222.n52CM2Wv027828@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 163347 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 12:22:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=163347 Change 163347 by rene@rene_self on 2009/06/02 12:21:55 IFC (and fix some conflicts) Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#23 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#24 edit .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#31 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#14 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/network-servers/chapter.sgml#22 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/share/sgml/transtable.xml#5 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#20 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#18 integrate .. //depot/projects/docproj_nl/www/en/gnome/docs/faq2.sgml#4 integrate .. //depot/projects/docproj_nl/www/en/projects/netperf/index.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/releng/index.sgml#24 integrate .. //depot/projects/docproj_nl/www/nl/Makefile#11 integrate .. //depot/projects/docproj_nl/www/nl/Makefile.inc#4 integrate .. //depot/projects/docproj_nl/www/nl/about.sgml#7 integrate .. //depot/projects/docproj_nl/www/nl/administration.sgml#6 integrate .. //depot/projects/docproj_nl/www/nl/applications.sgml#7 integrate .. //depot/projects/docproj_nl/www/nl/art.sgml#6 integrate .. //depot/projects/docproj_nl/www/nl/availability.sgml#6 integrate .. //depot/projects/docproj_nl/www/nl/community.xsl#5 integrate .. //depot/projects/docproj_nl/www/nl/docs.sgml#5 integrate .. //depot/projects/docproj_nl/www/nl/features.sgml#5 integrate .. //depot/projects/docproj_nl/www/nl/index.xsl#9 integrate .. //depot/projects/docproj_nl/www/nl/internet.sgml#5 integrate .. //depot/projects/docproj_nl/www/nl/logo.sgml#5 integrate .. //depot/projects/docproj_nl/www/nl/mailto.sgml#6 integrate .. //depot/projects/docproj_nl/www/nl/relnotes.sgml#5 integrate .. //depot/projects/docproj_nl/www/nl/send-pr.sgml#6 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/catalog#5 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/catalog.xml#5 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#6 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/l10n.ent#6 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#7 integrate .. //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#6 integrate .. //depot/projects/docproj_nl/www/nl/support.sgml#6 integrate .. //depot/projects/docproj_nl/www/nl/vendors.html#4 integrate .. //depot/projects/docproj_nl/www/nl/where.sgml#7 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#23 (text+ko) ==== @@ -1,4 +1,4 @@ - + + 8.0-CURRENT after adding hierarchical jails and removing global securelevel. - 800092 May 29, 2009 @@ -13142,9 +13141,20 @@ a new SX_NOADAPTIVE flag is introduced in order to handle the reversed logic. - + + 800093 + May 29, 2009 + 8.0-CURRENT after adding mnt_xflag to + struct mount. + + + 800094 + May 30, 2009 + 8.0-CURRENT after adding + &man.VOP.ACCESSX.9;. + - 800093 + 800095 May 30, 2009 8.0-CURRENT after changing the polling KPI. The polling handlers now return the number of packets @@ -13154,6 +13164,17 @@ not significant and the counting should be skipped. + + 800096 + June 1, 2009 + 8.0-CURRENT after updating to the new netisr + implementation and after changing the way we + store and access FIBs. + + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/explaining-bsd/article.sgml#14 (text+ko) ==== @@ -1,4 +1,4 @@ - + ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#14 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -746,6 +746,11 @@ &pgpkey.nemoliu; + + &a.zml; + &pgpkey.zml; + + &a.nox; &pgpkey.nox; @@ -756,11 +761,6 @@ &pgpkey.remko; - - &a.zml; - &pgpkey.zml; - - &a.avl; &pgpkey.avl; ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#18 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.486 2009/05/16 10:47:00 brueffer Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.487 2009/06/02 01:34:15 gabor Exp $ --> @@ -4723,6 +4723,7 @@ + ==== //depot/projects/docproj_nl/www/en/gnome/docs/faq2.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -1105,14 +1105,13 @@

      Up until GNOME 2.20, GDM would read the locale settings from /etc/login.conf or ~/.login.conf. - This was broken in 2.20, and since GDM 2.22 will use - a new locale scheme, it will not be fixed. However, all - hope is not lost. It is actually very easy to set the - locale for use with the GNOME Destop. GDM offers a - pull-down Language menu from which you can choose your - current locale. If you would rather not use this menu, - you can set the locale by adding the following to - ~/.profile:

      + This was broken in 2.20, and finally restored in GDM + 2.26.1_3.

      + +

      However, GDM also offers a pull-down Language menu from which + you can choose your current locale. If you would rather not + use this menu or /etc/login.conf, you can set the + locale by adding the following to ~/.profile:

       export LANG=<locale>
@@ -1123,7 +1122,9 @@
 	      (e.g. en_US.UTF-8, es_ES.ISO8859-15, fr_FR.ISO8859-1, etc.).
      
 
 	    
      To set the default locale for the GDM greeter, add the
-	      same environment variables to /etc/profile.
      
+	      same environment variables to /etc/profile or
+	      define gdm_lang to the desired locale
+	      in /etc/rc.conf.
      • ==== //depot/projects/docproj_nl/www/en/projects/netperf/index.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -53,11 +53,10 @@ will work toward these goals:

        -

      • Complete locking work to make sure all components of the stack - are able to run without the Giant lock. While most of the network - stack, especially mainstream protocols, runs without Giant, some - components require Giant to be placed back over the stack if compiled - into the kernel, reducing parallelism.

        • +

      • The Netperf project has completed locking work for all components + of the network stack; as of FreeBSD 7.0 we have removed non-MPSAFE + protocol shims, and as of FreeBSD 8.0 we have removed non-MPSAFE + device driver shims.

      • Optimize locking strategies to find better balances between locking granularity and locking overhead. In the first cut at locking @@ -126,7 +125,8 @@ increasing effective CPU utilization and hence throughput. For example, introducing additional netisr threads capable of running on more than one CPU at a time can increase input parallelism, subject - to maintaining desirable packet ordering.

        • + to maintaining desirable packet ordering (present in FreeBSD + 8.0).

      @@ -204,13 +204,12 @@ Employ queued dispatch across netisr dispatch API &a.rwatson; - 20041124 - &status.prototyped; - Pull all of the mbufs in the netisr ifqueue out of the ifqueue - into a thread-local mbuf queue to avoid repeated lock operations - to access the queue. Also use lock-free operations to test for - queue contents being present. This has been prototyped in the - rwatson_netperf branch. + 20090601 + &status.done + Pull all of the mbufs in the netisr queue into a thread-local + mbuf queue to avoid repeated lock operations to access the queue. + This work was completed as part of the netisr2 project, and will + ship with 8.0-RELEASE. @@ -247,8 +246,8 @@ critical sections to synchronize access instead of a mutex. While malloc(9) is less frequently used in the network stack than uma(9), it is used for socket address data, so is on performance critical - paths for datagram operations. This has been committed and will - appear in 6.0-RELEASE. + paths for datagram operations. This has been committed and appeared + 6.0-RELEASE. @@ -266,11 +265,11 @@ cost of critical sections in the common case by avoiding expensive microcode operations on the CPU. By restoring this model, or a variation on it, critical sections can be made substantially - cheaper to enter. In particular, this change will lower the cost + cheaper to enter. In particular, this change lowers the cost of critical sections on UP such that it is approximately the same cost as a mutex, meaning that optimizations on SMP to use critical sections instead of mutexes will not harm UP performance. This - change has now been committed, and will appear in 6.0-RELEASE. + change has now been committed, and appeared in 6.0-RELEASE. @@ -296,26 +295,41 @@ Add true inpcb reference count support &a.mohans;, &a.rwatson;, &a.peter; - 20060412 - &status.new; - Currently, the in-bound TCP and UDP socket paths rely on the + 20081208 + &status.done; + Historically, the in-bound TCP and UDP socket paths relied on global pcbinfo info locks to prevent PCBs being delivered to from being garbage collected by another thread while in use. This set of changes introduces a true reference model for PCBs so that the - global lock can be released during in-bound process. + global lock can be released during in-bound process, and appear + in 8.0-RELEASE./td> Fine-grained locking for UNIX domain sockets &a.rwatson; - 20060416 - &status.prototyped; - Currently, UNIX domain sockets in FreeBSD 5.x and 6.x use a - single global subsystem lock. This is sufficient to allow it to - run without Giant, but results in contention with large numbers - of processors simultaneously operating on UNIX domain sockets. - This task introduces per-protocol control block locks in order - to reduce contention on a larger subsystem lock. + 20070226 + &status.done; + UNIX domain sockets in FreeBSD 5.x and 6.x use a single global + subsystem lock. This is sufficient to allow it to run without + Giant, but results in contention with large numbers of processors + simultaneously operating on UNIX domain sockets. This task + introduced per-protocol control block locks in order to reduce + contention on a larger subsystem lock, and the results appeared in + 7.0-RELEASE. + + + + Multiple netisr threads + &a.rwatson; + 20090601 + &status.done; + Historically, the BSD network stack has used a single network + software interrupt context, for deferred network processing. With + the introduction of multi-processing, this became a single + software interrupt thread. In FreeBSD 8.0, multiple netisr + threads are now supported, up to the number of CPUs present in the + system. ==== //depot/projects/docproj_nl/www/en/releng/index.sgml#24 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -56,7 +56,7 @@ August 2009 FreeBSD 8.0 -   + code slush since June 1st ==== //depot/projects/docproj_nl/www/nl/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/nl/Makefile,v 1.1 2004/09/27 12:00:03 josef Exp $ +# $FreeBSD: www/nl/Makefile,v 1.2 2009/06/01 20:02:31 rene Exp $ # %SOURCE% en/Makefile # %SRCID% 1.146 ==== //depot/projects/docproj_nl/www/nl/Makefile.inc#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/nl/Makefile.inc,v 1.1 2004/09/27 12:00:03 josef Exp $ +# $FreeBSD: www/nl/Makefile.inc,v 1.2 2009/06/01 20:02:31 rene Exp $ # %SOURCE% en/Makefile.inc # %SRCID% 1.8 ==== //depot/projects/docproj_nl/www/nl/about.sgml#7 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/administration.sgml#6 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/applications.sgml#7 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/art.sgml#6 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/availability.sgml#6 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/community.xsl#5 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/docs.sgml#5 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/features.sgml#5 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/index.xsl#9 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/internet.sgml#5 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/logo.sgml#5 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/mailto.sgml#6 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/relnotes.sgml#5 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/send-pr.sgml#6 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/share/sgml/catalog#5 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/share/sgml/catalog.xml#5 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#6 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/share/sgml/l10n.ent#6 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/share/sgml/libcommon.xsl#7 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/share/sgml/navibar.l10n.ent#6 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/support.sgml#6 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/vendors.html#4 (text+ko) ==== ==== //depot/projects/docproj_nl/www/nl/where.sgml#7 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jun 2 13:26:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E0C01065673; Tue, 2 Jun 2009 13:26:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E011D106566B for ; Tue, 2 Jun 2009 13:26:07 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CEC0C8FC13 for ; Tue, 2 Jun 2009 13:26:07 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n52DQ7Y7043723 for ; Tue, 2 Jun 2009 13:26:07 GMT (envelope-from fangwang@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52DQ7fO043721 for perforce@freebsd.org; Tue, 2 Jun 2009 13:26:07 GMT (envelope-from fangwang@FreeBSD.org) Date: Tue, 2 Jun 2009 13:26:07 GMT Message-Id: <200906021326.n52DQ7fO043721@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fangwang@FreeBSD.org using -f From: Fang Wang To: Perforce Change Reviews Cc: Subject: PERFORCE change 163351 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 13:26:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=163351 Change 163351 by fangwang@fangwang_utobsd on 2009/06/02 13:25:39 Add uto relative variables to struct tcpch. Add some macro defines. Affected files ... .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#2 edit Differences ... ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#2 (text+ko) ==== @@ -190,6 +190,15 @@ struct toe_usrreqs *t_tu; /* offload operations vector */ void *t_toe; /* TOE pcb pointer */ int t_bytes_acked; /* # bytes acked during current RTT */ + +/* user timeout variables (RFC 5482) */ + u_int t_rcvuto; /* received user timeout value */ + u_char rcv_uto_granularity:1; /* received user timeout granularity */ + u_int t_snduto; /* send user timeout value */ + u_char snd_uto_granularity:1; /* received user timeout granularity */ + u_char uto_enable:1; /* flag controls whether the UTO option is enabled for a connection */ + u_char uto_changeable:1; /* flag that controls whether USER_TIMEOUT may be changed based on t_rcvuto */ + u_int t_uto; /* implemented user timeout value */ }; /* @@ -221,6 +230,7 @@ #define TF_ECN_PERMIT 0x4000000 /* connection ECN-ready */ #define TF_ECN_SND_CWR 0x8000000 /* ECN CWR in queue */ #define TF_ECN_SND_ECE 0x10000000 /* ECN ECE in queue */ +#define TF_RCVD_UTO 0x20000000 /* a user timeout was received in SYN */ #define IN_FASTRECOVERY(tp) (tp->t_flags & TF_FASTRECOVERY) #define ENTER_FASTRECOVERY(tp) tp->t_flags |= TF_FASTRECOVERY @@ -264,6 +274,7 @@ #define TOF_SIGNATURE 0x0040 /* TCP-MD5 signature option (RFC2385) */ #define TOF_SACK 0x0080 /* Peer sent SACK option */ #define TOF_MAXOPT 0x0100 +#define TOF_UTO 0x0200 /* user timeout (RFC5482) */ u_int32_t to_tsval; /* new timestamp */ u_int32_t to_tsecr; /* reflected timestamp */ u_int16_t to_mss; /* maximum segment size */ From owner-p4-projects@FreeBSD.ORG Tue Jun 2 14:09:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80AD31065677; Tue, 2 Jun 2009 14:09: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 338001065675 for ; Tue, 2 Jun 2009 14:09:52 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21CCC8FC15 for ; Tue, 2 Jun 2009 14:09:52 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n52E9qV5048162 for ; Tue, 2 Jun 2009 14:09:52 GMT (envelope-from fangwang@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52E9quv048160 for perforce@freebsd.org; Tue, 2 Jun 2009 14:09:52 GMT (envelope-from fangwang@FreeBSD.org) Date: Tue, 2 Jun 2009 14:09:52 GMT Message-Id: <200906021409.n52E9quv048160@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fangwang@FreeBSD.org using -f From: Fang Wang To: Perforce Change Reviews Cc: Subject: PERFORCE change 163352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 14:09:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=163352 Change 163352 by fangwang@fangwang_utobsd on 2009/06/02 14:09:16 Add uto variables in struct tcpopt. Affected files ... .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#3 edit Differences ... ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#3 (text+ko) ==== @@ -282,6 +282,8 @@ u_int8_t to_nsacks; /* number of SACK blocks */ u_char *to_sacks; /* pointer to the first SACK blocks */ u_char *to_signature; /* pointer to the TCP-MD5 signature */ + u_int16_t to_uto:15; /* user timeout */ + u_int16_t to_granularity:1; /* user timeout granularity */ }; /* From owner-p4-projects@FreeBSD.ORG Tue Jun 2 15:30:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D326C1065729; Tue, 2 Jun 2009 15:30: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 89103106575F for ; Tue, 2 Jun 2009 15:30:13 +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 774D18FC08 for ; Tue, 2 Jun 2009 15:30:13 +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 n52FUDJo055432 for ; Tue, 2 Jun 2009 15:30:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52FUDou055430 for perforce@freebsd.org; Tue, 2 Jun 2009 15:30:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 2 Jun 2009 15:30:13 GMT Message-Id: <200906021530.n52FUDou055430@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 163353 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 15:30:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163353 Change 163353 by hselasky@hselasky_laptop001 on 2009/06/02 15:29:37 USB CORE: Remove duplicate free(), as result of automatic integration. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#37 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#37 (text+ko) ==== @@ -1992,13 +1992,6 @@ #if USB_HAVE_UGEN KASSERT(LIST_FIRST(&udev->pd_list) == NULL, ("leaked cdev entries")); #endif - /* free all allocated strings */ - if (udev->serial) - free(udev->serial, M_USB); - if (udev->manufacturer) - free(udev->manufacturer, M_USB); - if (udev->product) - free(udev->product, M_USB); /* free device */ free(udev->serial, M_USB); From owner-p4-projects@FreeBSD.ORG Tue Jun 2 18:51:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 903E31065675; Tue, 2 Jun 2009 18:51:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F77C1065672 for ; Tue, 2 Jun 2009 18:51:39 +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 32DEF8FC0A for ; Tue, 2 Jun 2009 18:51:39 +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 n52Ipdr2088019 for ; Tue, 2 Jun 2009 18:51:39 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52IpdoP088017 for perforce@freebsd.org; Tue, 2 Jun 2009 18:51:39 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 2 Jun 2009 18:51:39 GMT Message-Id: <200906021851.n52IpdoP088017@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 163362 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 18:51:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=163362 Change 163362 by rene@rene_self on 2009/06/02 18:51:33 [website] Fix CSS and topnav overflow issues. Submitted by: gabor (slightly different version) Affected files ... .. //depot/projects/docproj_nl/www/nl/index.xsl#10 edit .. //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#7 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/index.xsl#10 (text+ko) ==== @@ -38,8 +38,8 @@ CVS, CVSup, Nieuws, Commerciele Leveranciers, homepage, CTM, Unix"/> - - + + ==== //depot/projects/docproj_nl/www/nl/share/sgml/header.l10n.ent#7 (text+ko) ==== @@ -49,14 +49,14 @@ - - '> + + '> ]]> - - '> + + '> @@ -128,7 +128,7 @@
        -
      • Beginpagina
        • +
      • Begin
      • Over
      • Verkrijg &os;
      • Documentatie
        • From owner-p4-projects@FreeBSD.ORG Tue Jun 2 19:06:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D28F71065673; Tue, 2 Jun 2009 19:06: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 92884106566B for ; Tue, 2 Jun 2009 19:06:55 +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 771058FC19 for ; Tue, 2 Jun 2009 19:06:55 +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 n52J6tdo090238 for ; Tue, 2 Jun 2009 19:06:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52J6tmX090236 for perforce@freebsd.org; Tue, 2 Jun 2009 19:06:55 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 2 Jun 2009 19:06:55 GMT Message-Id: <200906021906.n52J6tmX090236@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 163365 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 19:06:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=163365 Change 163365 by hselasky@hselasky_laptop001 on 2009/06/02 19:06:20 USB CORE: - Separate out cdev ref data from cdev private data. This finally solves some races when multiple threads are reading/writing/polling/ioctling on the same c-device. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#26 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#26 (text+ko) ==== @@ -88,9 +88,9 @@ static void usb2_loc_fill(struct usb_fs_privdata *, struct usb_cdev_privdata *); static void usb2_close(void *); -static usb_error_t usb2_ref_device(struct usb_cdev_privdata *, int); -static usb_error_t usb2_usb_ref_device(struct usb_cdev_privdata *); -static void usb2_unref_device(struct usb_cdev_privdata *); +static usb_error_t usb2_ref_device(struct usb_cdev_privdata *, struct usb_cdev_refdata *, int); +static usb_error_t usb2_usb_ref_device(struct usb_cdev_privdata *, struct usb_cdev_refdata *); +static void usb2_unref_device(struct usb_cdev_privdata *, struct usb_cdev_refdata *); static d_open_t usb2_open; static d_ioctl_t usb2_ioctl; @@ -158,29 +158,30 @@ * Else: Failure. *------------------------------------------------------------------------*/ usb_error_t -usb2_ref_device(struct usb_cdev_privdata* cpd, int need_uref) +usb2_ref_device(struct usb_cdev_privdata *cpd, + struct usb_cdev_refdata *crd, int need_uref) { struct usb_fifo **ppf; struct usb_fifo *f; - DPRINTFN(2, "usb2_ref_device, cpd=%p need uref=%d\n", cpd, need_uref); + DPRINTFN(2, "cpd=%p need uref=%d\n", cpd, need_uref); + + /* clear all refs */ + memset(crd, 0, sizeof(*crd)); mtx_lock(&usb2_ref_lock); cpd->bus = devclass_get_softc(usb2_devclass_ptr, cpd->bus_index); if (cpd->bus == NULL) { DPRINTFN(2, "no bus at %u\n", cpd->bus_index); - need_uref = 0; goto error; } cpd->udev = cpd->bus->devices[cpd->dev_index]; if (cpd->udev == NULL) { DPRINTFN(2, "no device at %u\n", cpd->dev_index); - need_uref = 0; goto error; } if (cpd->udev->refcount == USB_DEV_REF_MAX) { DPRINTFN(2, "no dev ref\n"); - need_uref = 0; goto error; } if (need_uref) { @@ -200,79 +201,64 @@ /* * Set "is_uref" after grabbing the default SX lock */ - cpd->is_uref = 1; + crd->is_uref = 1; } /* check if we are doing an open */ if (cpd->fflags == 0) { - /* set defaults */ - cpd->txfifo = NULL; - cpd->rxfifo = NULL; - cpd->is_write = 0; - cpd->is_read = 0; - cpd->is_usbfs = 0; + /* use zero defaults */ } else { - /* initialise "is_usbfs" flag */ - cpd->is_usbfs = 0; - /* check for write */ if (cpd->fflags & FWRITE) { ppf = cpd->udev->fifo; f = ppf[cpd->fifo_index + USB_FIFO_TX]; - cpd->txfifo = f; - cpd->is_write = 1; /* ref */ + crd->txfifo = f; + crd->is_write = 1; /* ref */ if (f == NULL || f->refcount == USB_FIFO_REF_MAX) goto error; if (f->curr_cpd != cpd) goto error; /* check if USB-FS is active */ if (f->fs_ep_max != 0) { - cpd->is_usbfs = 1; + crd->is_usbfs = 1; } - } else { - cpd->txfifo = NULL; - cpd->is_write = 0; /* no ref */ } /* check for read */ if (cpd->fflags & FREAD) { ppf = cpd->udev->fifo; f = ppf[cpd->fifo_index + USB_FIFO_RX]; - cpd->rxfifo = f; - cpd->is_read = 1; /* ref */ + crd->rxfifo = f; + crd->is_read = 1; /* ref */ if (f == NULL || f->refcount == USB_FIFO_REF_MAX) goto error; if (f->curr_cpd != cpd) goto error; /* check if USB-FS is active */ if (f->fs_ep_max != 0) { - cpd->is_usbfs = 1; + crd->is_usbfs = 1; } - } else { - cpd->rxfifo = NULL; - cpd->is_read = 0; /* no ref */ } } /* when everything is OK we increment the refcounts */ - if (cpd->is_write) { + if (crd->is_write) { DPRINTFN(2, "ref write\n"); - cpd->txfifo->refcount++; + crd->txfifo->refcount++; } - if (cpd->is_read) { + if (crd->is_read) { DPRINTFN(2, "ref read\n"); - cpd->rxfifo->refcount++; + crd->rxfifo->refcount++; } mtx_unlock(&usb2_ref_lock); - if (need_uref) { + if (crd->is_uref) { mtx_lock(&Giant); /* XXX */ } return (0); error: - if (need_uref) { - cpd->is_uref = 0; + if (crd->is_uref) { sx_unlock(cpd->udev->default_sx + 1); if (--(cpd->udev->refcount) == 0) { usb2_cv_signal(cpd->udev->default_cv + 1); @@ -294,25 +280,22 @@ * Else: Failure. *------------------------------------------------------------------------*/ static usb_error_t -usb2_usb_ref_device(struct usb_cdev_privdata *cpd) +usb2_usb_ref_device(struct usb_cdev_privdata *cpd, + struct usb_cdev_refdata *crd) { - uint8_t is_uref; - - is_uref = cpd->is_uref && sx_xlocked(cpd->udev->default_sx + 1); - /* * Check if we already got an USB reference on this location: */ - if (is_uref) + if (crd->is_uref) return (0); /* success */ /* * To avoid deadlock at detach we need to drop the FIFO ref * and re-acquire a new ref! */ - usb2_unref_device(cpd); + usb2_unref_device(cpd, crd); - return (usb2_ref_device(cpd, 1 /* need uref */)); + return (usb2_ref_device(cpd, crd, 1 /* need uref */)); } /*------------------------------------------------------------------------* @@ -322,34 +305,34 @@ * given USB device. *------------------------------------------------------------------------*/ void -usb2_unref_device(struct usb_cdev_privdata *cpd) +usb2_unref_device(struct usb_cdev_privdata *cpd, + struct usb_cdev_refdata *crd) { - uint8_t is_uref; - is_uref = cpd->is_uref && sx_xlocked(cpd->udev->default_sx + 1); + DPRINTFN(2, "cpd=%p is_uref=%d\n", cpd, crd->is_uref); - if (is_uref) { - cpd->is_uref = 0; + if (crd->is_uref) { mtx_unlock(&Giant); /* XXX */ sx_unlock(cpd->udev->default_sx + 1); } mtx_lock(&usb2_ref_lock); - if (cpd->is_read) { - if (--(cpd->rxfifo->refcount) == 0) { - usb2_cv_signal(&cpd->rxfifo->cv_drain); + if (crd->is_read) { + if (--(crd->rxfifo->refcount) == 0) { + usb2_cv_signal(&crd->rxfifo->cv_drain); } - cpd->is_read = 0; + crd->is_read = 0; } - if (cpd->is_write) { - if (--(cpd->txfifo->refcount) == 0) { - usb2_cv_signal(&cpd->txfifo->cv_drain); + if (crd->is_write) { + if (--(crd->txfifo->refcount) == 0) { + usb2_cv_signal(&crd->txfifo->cv_drain); } - cpd->is_write = 0; + crd->is_write = 0; } - if (is_uref) { + if (crd->is_uref) { if (--(cpd->udev->refcount) == 0) { usb2_cv_signal(cpd->udev->default_cv + 1); } + crd->is_uref = 0; } mtx_unlock(&usb2_ref_lock); } @@ -372,7 +355,8 @@ * usb2_fifo_create *------------------------------------------------------------------------*/ static int -usb2_fifo_create(struct usb_cdev_privdata *cpd) +usb2_fifo_create(struct usb_cdev_privdata *cpd, + struct usb_cdev_refdata *crd) { struct usb_device *udev = cpd->udev; struct usb_fifo *f; @@ -396,13 +380,13 @@ f = udev->fifo[cpd->fifo_index + USB_FIFO_TX]; if (f == NULL) return (EINVAL); - cpd->txfifo = f; + crd->txfifo = f; } if (is_rx) { f = udev->fifo[cpd->fifo_index + USB_FIFO_RX]; if (f == NULL) return (EINVAL); - cpd->rxfifo = f; + crd->rxfifo = f; } return (0); } @@ -531,10 +515,10 @@ mtx_unlock(&usb2_ref_lock); } if (is_tx) { - cpd->txfifo = udev->fifo[n + USB_FIFO_TX]; + crd->txfifo = udev->fifo[n + USB_FIFO_TX]; } if (is_rx) { - cpd->rxfifo = udev->fifo[n + USB_FIFO_RX]; + crd->rxfifo = udev->fifo[n + USB_FIFO_RX]; } /* fill out fifo index */ DPRINTFN(5, "fifo index = %d\n", n); @@ -821,6 +805,7 @@ usb2_open(struct cdev *dev, int fflags, int devtype, struct thread *td) { struct usb_fs_privdata* pd = (struct usb_fs_privdata*)dev->si_drv1; + struct usb_cdev_refdata refs; struct usb_cdev_privdata *cpd; int err, ep; @@ -837,7 +822,7 @@ ep = cpd->ep_addr = pd->ep_addr; usb2_loc_fill(pd, cpd); - err = usb2_ref_device(cpd, 1); + err = usb2_ref_device(cpd, &refs, 1); if (err) { DPRINTFN(2, "cannot ref device\n"); free(cpd, M_USBDEV); @@ -846,36 +831,36 @@ cpd->fflags = fflags; /* access mode for open lifetime */ /* create FIFOs, if any */ - err = usb2_fifo_create(cpd); + err = usb2_fifo_create(cpd, &refs); /* check for error */ if (err) { DPRINTFN(2, "cannot create fifo\n"); - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); free(cpd, M_USBDEV); return (err); } if (fflags & FREAD) { - err = usb2_fifo_open(cpd, cpd->rxfifo, fflags); + err = usb2_fifo_open(cpd, refs.rxfifo, fflags); if (err) { DPRINTFN(2, "read open failed\n"); - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); free(cpd, M_USBDEV); return (err); } } if (fflags & FWRITE) { - err = usb2_fifo_open(cpd, cpd->txfifo, fflags); + err = usb2_fifo_open(cpd, refs.txfifo, fflags); if (err) { DPRINTFN(2, "write open failed\n"); if (fflags & FREAD) { - usb2_fifo_close(cpd->rxfifo, fflags); + usb2_fifo_close(refs.rxfifo, fflags); } - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); free(cpd, M_USBDEV); return (err); } } - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); devfs_set_cdevpriv(cpd, usb2_close); return (0); @@ -887,24 +872,25 @@ static void usb2_close(void *arg) { + struct usb_cdev_refdata refs; struct usb_cdev_privdata *cpd = arg; int err; DPRINTFN(2, "cpd=%p\n", cpd); - err = usb2_ref_device(cpd, 1); + err = usb2_ref_device(cpd, &refs, 1); if (err) { free(cpd, M_USBDEV); return; } if (cpd->fflags & FREAD) { - usb2_fifo_close(cpd->rxfifo, cpd->fflags); + usb2_fifo_close(refs.rxfifo, cpd->fflags); } if (cpd->fflags & FWRITE) { - usb2_fifo_close(cpd->txfifo, cpd->fflags); + usb2_fifo_close(refs.txfifo, cpd->fflags); } - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); free(cpd, M_USBDEV); return; } @@ -1003,6 +989,7 @@ static int usb2_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int fflag, struct thread* td) { + struct usb_cdev_refdata refs; struct usb_cdev_privdata* cpd; struct usb_fifo *f; int fflags; @@ -1015,11 +1002,11 @@ return (err); /* - * Performance optimistaion: We try to check for IOCTL's that + * Performance optimisation: We try to check for IOCTL's that * don't need the USB reference first. Then we grab the USB * reference if we need it! */ - err = usb2_ref_device(cpd, 0 /* no uref */ ); + err = usb2_ref_device(cpd, &refs, 0 /* no uref */ ); if (err) { return (ENXIO); } @@ -1029,11 +1016,11 @@ err = ENOIOCTL; /* set default value */ if (fflags & FWRITE) { - f = cpd->txfifo; + f = refs.txfifo; err = usb2_ioctl_f_sub(f, cmd, addr, td); } if (fflags & FREAD) { - f = cpd->rxfifo; + f = refs.rxfifo; err = usb2_ioctl_f_sub(f, cmd, addr, td); } KASSERT(f != NULL, ("fifo not found")); @@ -1041,7 +1028,7 @@ err = (f->methods->f_ioctl) (f, cmd, addr, fflags); DPRINTFN(2, "f_ioctl cmd 0x%lx = %d\n", cmd, err); if (err == ENOIOCTL) { - if (usb2_usb_ref_device(cpd)) { + if (usb2_usb_ref_device(cpd, &refs)) { err = ENXIO; goto done; } @@ -1053,7 +1040,7 @@ err = ENOTTY; } done: - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); return (err); } @@ -1061,13 +1048,14 @@ static int usb2_poll(struct cdev* dev, int events, struct thread* td) { + struct usb_cdev_refdata refs; struct usb_cdev_privdata* cpd; struct usb_fifo *f; struct usb_mbuf *m; int fflags, revents; if (devfs_get_cdevpriv((void **)&cpd) != 0 || - usb2_ref_device(cpd, 0) != 0) + usb2_ref_device(cpd, &refs, 0) != 0) return (events & (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM)); @@ -1078,11 +1066,11 @@ if ((events & (POLLOUT | POLLWRNORM)) && (fflags & FWRITE)) { - f = cpd->txfifo; + f = refs.txfifo; mtx_lock(f->priv_mtx); - if (!cpd->is_usbfs) { + if (!refs.is_usbfs) { if (f->flag_iserror) { /* we got an error */ m = (void *)1; @@ -1117,11 +1105,11 @@ if ((events & (POLLIN | POLLRDNORM)) && (fflags & FREAD)) { - f = cpd->rxfifo; + f = refs.rxfifo; mtx_lock(f->priv_mtx); - if (!cpd->is_usbfs) { + if (!refs.is_usbfs) { if (f->flag_iserror) { /* we have and error */ m = (void *)1; @@ -1150,7 +1138,7 @@ f->flag_isselect = 1; selrecord(td, &f->selinfo); - if (!cpd->is_usbfs) { + if (!refs.is_usbfs) { /* start reading data */ (f->methods->f_start_read) (f); } @@ -1158,13 +1146,14 @@ mtx_unlock(f->priv_mtx); } - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); return (revents); } static int usb2_read(struct cdev *dev, struct uio *uio, int ioflag) { + struct usb_cdev_refdata refs; struct usb_cdev_privdata* cpd; struct usb_fifo *f; struct usb_mbuf *m; @@ -1178,15 +1167,16 @@ if (err != 0) return (err); - err = usb2_ref_device(cpd, 0 /* no uref */ ); + err = usb2_ref_device(cpd, &refs, 0 /* no uref */ ); if (err) { return (ENXIO); } fflags = cpd->fflags; - f = cpd->rxfifo; + f = refs.rxfifo; if (f == NULL) { /* should not happen */ + usb2_unref_device(cpd, &refs); return (EPERM); } @@ -1200,7 +1190,7 @@ goto done; } /* check if USB-FS interface is active */ - if (cpd->is_usbfs) { + if (refs.is_usbfs) { /* * The queue is used for events that should be * retrieved using the "USB_FS_COMPLETE" ioctl. @@ -1278,7 +1268,7 @@ done: mtx_unlock(f->priv_mtx); - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); return (err); } @@ -1286,6 +1276,7 @@ static int usb2_write(struct cdev *dev, struct uio *uio, int ioflag) { + struct usb_cdev_refdata refs; struct usb_cdev_privdata* cpd; struct usb_fifo *f; struct usb_mbuf *m; @@ -1301,16 +1292,16 @@ if (err != 0) return (err); - err = usb2_ref_device(cpd, 0 /* no uref */ ); + err = usb2_ref_device(cpd, &refs, 0 /* no uref */ ); if (err) { return (ENXIO); } fflags = cpd->fflags; - f = cpd->txfifo; + f = refs.txfifo; if (f == NULL) { /* should not happen */ - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); return (EPERM); } resid = uio->uio_resid; @@ -1323,7 +1314,7 @@ goto done; } /* check if USB-FS interface is active */ - if (cpd->is_usbfs) { + if (refs.is_usbfs) { /* * The queue is used for events that should be * retrieved using the "USB_FS_COMPLETE" ioctl. @@ -1391,7 +1382,7 @@ done: mtx_unlock(f->priv_mtx); - usb2_unref_device(cpd); + usb2_unref_device(cpd, &refs); return (err); } ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#12 (text+ko) ==== @@ -88,13 +88,19 @@ struct usb_bus *bus; struct usb_device *udev; struct usb_interface *iface; - struct usb_fifo *rxfifo; - struct usb_fifo *txfifo; int bus_index; /* bus index */ int dev_index; /* device index */ int ep_addr; /* endpoint address */ int fflags; uint8_t fifo_index; /* FIFO index */ +}; + +/* + * Private per-device and per-thread reference information + */ +struct usb_cdev_refdata { + struct usb_fifo *rxfifo; + struct usb_fifo *txfifo; uint8_t is_read; /* location has read access */ uint8_t is_write; /* location has write access */ uint8_t is_uref; /* USB refcount decr. needed */ From owner-p4-projects@FreeBSD.ORG Tue Jun 2 19:12:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53C711065756; Tue, 2 Jun 2009 19:12:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E83E51065749 for ; Tue, 2 Jun 2009 19:12: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 B9B568FC0C for ; Tue, 2 Jun 2009 19:12: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 n52JC0MA090656 for ; Tue, 2 Jun 2009 19:12:00 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52JC0Cf090654 for perforce@freebsd.org; Tue, 2 Jun 2009 19:12:00 GMT (envelope-from antab@FreeBSD.org) Date: Tue, 2 Jun 2009 19:12:00 GMT Message-Id: <200906021912.n52JC0Cf090654@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 163366 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 19:12:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=163366 Change 163366 by antab@antab_farm on 2009/06/02 19:11:29 * Set ETH_TX_DESC_WRAP for last tx buffer, forgot to wrap tx_clean_ptr * Fix atomic ops, atomic_cmpset should return 1 and not the value at *address, atomic_add/fetchadd are sometimes called with -1, so we must handle this. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/atomic.h#8 edit .. //depot/projects/avr32/src/sys/dev/ate/if_ate.c#3 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/atomic.h#8 (text+ko) ==== @@ -90,6 +90,7 @@ "brne 2f\n" "stcond %1, %4\n" "brne 1b\n" + "mov %0, 1\n" "rjmp 3f\n" "2:\n" "mov %0, 0\n" @@ -110,11 +111,11 @@ "1:" "ssrf 5\n" "ld.w %0, %2\n" - "add %0, %3\n" + "sub %0, %3\n" "stcond %1, %0\n" "brne 1b" : "=&r"(tmp), "=m"(*address) - : "m"(*address), "r"(val) + : "m"(*address), "r"(-val) : "cc", "memory"); } @@ -147,12 +148,11 @@ "1:" "ssrf 5\n" "ld.w %0, %3\n" - "mov %2, %0\n" - "add %2, %4\n" + "sub %2, %0, %4\n" "stcond %1, %2\n" "brne 1b\n" : "=&r"(ret), "=m"(*address), "=r" (tmp) - : "m"(*address), "r"(val) + : "m"(*address), "r"(-val) : "cc", "memory"); return ret; ==== //depot/projects/avr32/src/sys/dev/ate/if_ate.c#3 (text) ==== @@ -399,6 +399,9 @@ bus_dmamap_sync(sc->tx_desc_tag, sc->tx_desc_map, BUS_DMASYNC_PREWRITE); sc->tx_descs[sc->txcur].addr = segs[0].ds_addr; sc->tx_descs[sc->txcur].status = mapsize | ETH_TX_DESC_LAST; + if (sc->txcur == ATE_MAX_TX_BUFFERS - 1) { + sc->tx_descs[sc->txcur].status |= ETH_TX_DESC_WRAP; + } bus_dmamap_sync(sc->tx_desc_tag, sc->tx_desc_map, BUS_DMASYNC_POSTWRITE); } #endif /* ATE_EMACB */ @@ -983,7 +986,7 @@ m_freem(sc->sent_mbuf[sc->tx_clean_ptr]); sc->sent_mbuf[sc->tx_clean_ptr] = NULL; ifp->if_opackets++; - sc->tx_clean_ptr++; + sc->tx_clean_ptr = (sc->tx_clean_ptr + 1) % ATE_MAX_TX_BUFFERS; } #else /* ATE_EMACB */ /* XXX TSR register should be cleared */ From owner-p4-projects@FreeBSD.ORG Tue Jun 2 19:42:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C86DA1065692; Tue, 2 Jun 2009 19:42:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81211106568B for ; Tue, 2 Jun 2009 19:42:38 +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 6C5C78FC15 for ; Tue, 2 Jun 2009 19:42:38 +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 n52Jgbts093075 for ; Tue, 2 Jun 2009 19:42:37 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52JgaCX093073 for perforce@freebsd.org; Tue, 2 Jun 2009 19:42:36 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 2 Jun 2009 19:42:36 GMT Message-Id: <200906021942.n52JgaCX093073@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 163369 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 19:42:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=163369 Change 163369 by thompsa@thompsa_burger on 2009/06/02 19:42:29 IFC Affected files ... .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#26 integrate .. //depot/projects/usb/src/sys/amd64/conf/MAC#2 delete .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#14 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#10 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_socket.c#14 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysent.c#5 integrate .. //depot/projects/usb/src/sys/conf/files#66 integrate .. //depot/projects/usb/src/sys/conf/options#31 integrate .. //depot/projects/usb/src/sys/contrib/dev/mwl/LICENSE#1 branch .. //depot/projects/usb/src/sys/contrib/dev/mwl/Makefile#1 branch .. //depot/projects/usb/src/sys/contrib/dev/mwl/mw88W8363.fw.uu#1 branch .. //depot/projects/usb/src/sys/contrib/dev/mwl/mwlboot.fw.uu#1 branch .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#14 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#13 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#8 integrate .. //depot/projects/usb/src/sys/dev/bwi/if_bwi.c#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 integrate .. //depot/projects/usb/src/sys/dev/ksyms/ksyms.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#8 integrate .. //depot/projects/usb/src/sys/dev/mii/e1000phyreg.h#5 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#12 integrate .. //depot/projects/usb/src/sys/dev/msk/if_mskreg.h#9 integrate .. //depot/projects/usb/src/sys/dev/mwl/if_mwl.c#1 branch .. //depot/projects/usb/src/sys/dev/mwl/if_mwl_pci.c#1 branch .. //depot/projects/usb/src/sys/dev/mwl/if_mwlioctl.h#1 branch .. //depot/projects/usb/src/sys/dev/mwl/if_mwlvar.h#1 branch .. //depot/projects/usb/src/sys/dev/mwl/mwldiag.h#1 branch .. //depot/projects/usb/src/sys/dev/mwl/mwlhal.c#1 branch .. //depot/projects/usb/src/sys/dev/mwl/mwlhal.h#1 branch .. //depot/projects/usb/src/sys/dev/mwl/mwlreg.h#1 branch .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#12 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#22 integrate .. //depot/projects/usb/src/sys/dev/pci/pcivar.h#10 integrate .. //depot/projects/usb/src/sys/dev/puc/pucdata.c#12 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#28 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/avr32dci.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#16 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#17 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#20 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#25 integrate .. //depot/projects/usb/src/sys/i386/conf/MAC#2 delete .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysent.c#4 integrate .. //depot/projects/usb/src/sys/i386/linux/linux.h#13 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysent.c#9 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#12 integrate .. //depot/projects/usb/src/sys/ia64/conf/MAC#2 delete .. //depot/projects/usb/src/sys/kern/init_sysent.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_conf.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#22 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#15 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#19 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#16 integrate .. //depot/projects/usb/src/sys/kern/makesyscalls.sh#7 integrate .. //depot/projects/usb/src/sys/kern/subr_sglist.c#1 branch .. //depot/projects/usb/src/sys/kern/sys_socket.c#10 integrate .. //depot/projects/usb/src/sys/kern/uipc_mbuf.c#11 integrate .. //depot/projects/usb/src/sys/kern/uipc_shm.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_sockbuf.c#11 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#19 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#16 integrate .. //depot/projects/usb/src/sys/kern/vfs_aio.c#11 integrate .. //depot/projects/usb/src/sys/modules/Makefile#35 integrate .. //depot/projects/usb/src/sys/modules/mwl/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/mwlfw/Makefile#1 branch .. //depot/projects/usb/src/sys/net/if.c#27 integrate .. //depot/projects/usb/src/sys/net/netisr.c#9 integrate .. //depot/projects/usb/src/sys/net/netisr.h#7 integrate .. //depot/projects/usb/src/sys/net/route.c#17 integrate .. //depot/projects/usb/src/sys/net/route.h#10 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#24 integrate .. //depot/projects/usb/src/sys/net/vnet.h#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#22 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#15 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.c#18 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#13 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ht.h#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_input.c#16 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#22 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.h#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_monitor.c#4 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.h#15 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.h#16 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_radiotap.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan.h#7 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#22 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_input.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ksocket.c#6 integrate .. //depot/projects/usb/src/sys/netinet/accf_data.c#3 integrate .. //depot/projects/usb/src/sys/netinet/accf_dns.c#3 integrate .. //depot/projects/usb/src/sys/netinet/accf_http.c#3 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#17 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#16 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#17 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#22 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#21 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#20 integrate .. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#15 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#22 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#18 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#16 integrate .. //depot/projects/usb/src/sys/netsmb/smb_trantcp.c#6 integrate .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#13 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_socket.c#12 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs.h#10 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_srvsock.c#10 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_syscalls.c#13 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#19 integrate .. //depot/projects/usb/src/sys/pc98/conf/MAC#2 delete .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#20 integrate .. //depot/projects/usb/src/sys/powerpc/conf/MAC#2 delete .. //depot/projects/usb/src/sys/rpc/clnt_dg.c#4 integrate .. //depot/projects/usb/src/sys/rpc/clnt_vc.c#5 integrate .. //depot/projects/usb/src/sys/rpc/svc_dg.c#3 integrate .. //depot/projects/usb/src/sys/rpc/svc_vc.c#4 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#10 integrate .. //depot/projects/usb/src/sys/security/mac/mac_internal.h#12 integrate .. //depot/projects/usb/src/sys/security/mac/mac_socket.c#9 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/usb/src/sys/sparc64/conf/MAC#2 delete .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#13 integrate .. //depot/projects/usb/src/sys/sun4v/conf/MAC#2 delete .. //depot/projects/usb/src/sys/sys/conf.h#17 integrate .. //depot/projects/usb/src/sys/sys/param.h#34 integrate .. //depot/projects/usb/src/sys/sys/sglist.h#1 branch .. //depot/projects/usb/src/sys/sys/sockbuf.h#2 integrate .. //depot/projects/usb/src/sys/sys/socketvar.h#10 integrate .. //depot/projects/usb/src/sys/sys/sysent.h#11 integrate .. //depot/projects/usb/src/sys/sys/ucred.h#6 integrate .. //depot/projects/usb/src/sys/sys/user.h#9 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#21 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_softdep.c#12 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#17 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#17 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/conf/GENERIC#26 (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.525 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.526 2009/06/02 18:31:08 rwatson Exp $ cpu HAMMER ident GENERIC @@ -70,6 +70,7 @@ options STOP_NMI # Stop CPUS using NMI instead of IPI options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing +options MAC # TrustedBSD MAC Framework #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks ==== //depot/projects/usb/src/sys/amd64/linux32/linux.h#14 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.28 2009/05/16 18:48:41 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.29 2009/06/01 20:48:39 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -669,6 +669,7 @@ #define LINUX_GETSOCKOPT 15 #define LINUX_SENDMSG 16 #define LINUX_RECVMSG 17 +#define LINUX_ACCEPT4 18 #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysent.c#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.40 2009/06/01 16:14:38 rwatson Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -19,321 +19,321 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = setup */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ - { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0 }, /* 2 = linux_fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ - { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = linux_chdir */ - { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0 }, /* 13 = linux_time */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = linux_chmod */ - { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0 }, /* 16 = linux_lchown16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ - { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0 }, /* 18 = linux_stat */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = linux_oldumount */ - { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0 }, /* 23 = linux_setuid16 */ - { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0 }, /* 24 = linux_getuid16 */ - { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 25 = linux_stime */ - { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = linux_ptrace */ - { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0 }, /* 27 = linux_alarm */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 28 = fstat */ - { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0 }, /* 29 = linux_pause */ - { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0 }, /* 30 = linux_utime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 31 = stty */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 32 = gtty */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = linux_access */ - { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0 }, /* 34 = linux_nice */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 35 = ftime */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ - { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0 }, /* 37 = linux_kill */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0 }, /* 38 = linux_rename */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 39 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 40 = linux_rmdir */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ - { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = linux_pipe */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0 }, /* 43 = linux_times */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0 }, /* 45 = linux_brk */ - { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0 }, /* 46 = linux_setgid16 */ - { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0 }, /* 47 = linux_getgid16 */ - { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0 }, /* 48 = linux_signal */ - { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0 }, /* 49 = linux_geteuid16 */ - { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0 }, /* 50 = linux_getegid16 */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0 }, /* 52 = linux_umount */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = linux_ioctl */ - { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 55 = linux_fcntl */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 56 = mpx */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 57 = setpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 58 = ulimit */ - { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0 }, /* 59 = linux_olduname */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0 }, /* 62 = linux_ustat */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 63 = dup2 */ - { 0, (sy_call_t *)linux_getppid, AUE_GETPPID, NULL, 0, 0 }, /* 64 = linux_getppid */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 65 = getpgrp */ - { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 66 = setsid */ - { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0 }, /* 67 = linux_sigaction */ - { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0 }, /* 68 = linux_sgetmask */ - { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0 }, /* 69 = linux_ssetmask */ - { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0 }, /* 70 = linux_setreuid16 */ - { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0 }, /* 71 = linux_setregid16 */ - { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 72 = linux_sigsuspend */ - { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0 }, /* 73 = linux_sigpending */ - { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0 }, /* 74 = linux_sethostname */ - { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 75 = linux_setrlimit */ - { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 76 = linux_old_getrlimit */ - { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 77 = linux_getrusage */ - { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL, NULL, 0, 0 }, /* 78 = linux_gettimeofday */ - { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 79 = linux_settimeofday */ - { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0 }, /* 80 = linux_getgroups16 */ - { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0 }, /* 81 = linux_setgroups16 */ - { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0 }, /* 82 = linux_old_select */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 83 = linux_symlink */ - { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0 }, /* 84 = linux_lstat */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0 }, /* 85 = linux_readlink */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 89 = linux_readdir */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ - { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 93 = linux_ftruncate */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 94 = fchmod */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 95 = fchown */ - { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 96 = linux_getpriority */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 97 = setpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 98 = profil */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0 }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 100 = linux_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 101 = ioperm */ - { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0 }, /* 102 = linux_socketcall */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0 }, /* 103 = linux_syslog */ - { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 104 = linux_setitimer */ - { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 105 = linux_getitimer */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0 }, /* 106 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ - { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ - { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = vm86old */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 114 = linux_wait4 */ - { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 115 = linux_swapoff */ - { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0 }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0 }, /* 117 = linux_ipc */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */ - { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */ - { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */ - { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = linux_setdomainname */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 123 = modify_ldt */ - { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 125 = linux_mprotect */ - { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 126 = linux_sigprocmask */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0 }, /* 127 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0 }, /* 128 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0 }, /* 129 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0 }, /* 130 = linux_get_kernel_syms */ - { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 131 = linux_quotactl */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 132 = getpgid */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 133 = fchdir */ - { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0 }, /* 134 = linux_bdflush */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0 }, /* 135 = linux_sysfs */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0 }, /* 136 = linux_personality */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 137 = afs_syscall */ - { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ - { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ - { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 141 = linux_getdents */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ - { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV, NULL, 0, 0 }, /* 145 = linux_readv */ - { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV, NULL, 0, 0 }, /* 146 = linux_writev */ - { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0 }, /* 147 = linux_getsid */ - { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0 }, /* 148 = linux_fdatasync */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 149 = linux_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 150 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 151 = munlock */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 152 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 153 = munlockall */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0 }, /* 154 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0 }, /* 155 = sched_getparam */ - { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0 }, /* 156 = linux_sched_setscheduler */ - { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0 }, /* 157 = linux_sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 158 = sched_yield */ - { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0 }, /* 159 = linux_sched_get_priority_max */ - { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0 }, /* 160 = linux_sched_get_priority_min */ - { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0 }, /* 161 = linux_sched_rr_get_interval */ - { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = linux_nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0 }, /* 163 = linux_mremap */ - { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0 }, /* 164 = linux_setresuid16 */ - { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0 }, /* 165 = linux_getresuid16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 166 = vm86 */ - { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0 }, /* 167 = linux_query_module */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 168 = poll */ - { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ - { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ - { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ - { AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ - { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ - { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ - { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ - { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ - { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ - { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 181 = linux_pwrite */ - { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 }, /* 182 = linux_chown16 */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 }, /* 185 = linux_capset */ - { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 }, /* 186 = linux_sigaltstack */ - { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 187 = linux_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 188 = getpmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 189 = putpmsg */ - { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0 }, /* 190 = linux_vfork */ - { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 191 = linux_getrlimit */ - { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0 }, /* 192 = linux_mmap2 */ - { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0 }, /* 193 = linux_truncate64 */ - { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0 }, /* 194 = linux_ftruncate64 */ - { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0 }, /* 195 = linux_stat64 */ - { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0 }, /* 196 = linux_lstat64 */ - { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0 }, /* 197 = linux_fstat64 */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 198 = linux_lchown */ - { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0 }, /* 199 = linux_getuid */ - { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0 }, /* 200 = linux_getgid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 201 = geteuid */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 202 = getegid */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 203 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 204 = setregid */ - { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 205 = linux_getgroups */ - { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 206 = linux_setgroups */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0 }, /* 207 = fchown */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 208 = setresuid */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 209 = getresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 210 = setresgid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 211 = getresgid */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0 }, /* 212 = linux_chown */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 213 = setuid */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 214 = setgid */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0 }, /* 215 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0 }, /* 216 = linux_setfsgid */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 220 = linux_getdents64 */ - { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ - { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0 }, /* 224 = linux_gettid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 225 = linux_readahead */ - { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0 }, /* 226 = linux_setxattr */ - { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0 }, /* 227 = linux_lsetxattr */ - { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0 }, /* 228 = linux_fsetxattr */ - { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0 }, /* 229 = linux_getxattr */ - { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0 }, /* 230 = linux_lgetxattr */ - { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0 }, /* 231 = linux_fgetxattr */ - { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0 }, /* 232 = linux_listxattr */ - { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0 }, /* 233 = linux_llistxattr */ - { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0 }, /* 234 = linux_flistxattr */ - { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0 }, /* 235 = linux_removexattr */ - { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0 }, /* 236 = linux_lremovexattr */ - { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0 }, /* 237 = linux_fremovexattr */ - { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0 }, /* 238 = linux_tkill */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ - { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ - { AS(linux_sched_setaffinity_args), (sy_call_t *)linux_sched_setaffinity, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ - { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ - { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 248 = inux_io_submit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0 }, /* 250 = linux_fadvise64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ - { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ - { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ - { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0 }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0 }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0 }, /* 263 = linux_timer_delete */ - { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ - { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ - { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ - { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ - { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0 }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ - { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ - { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ - { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0 }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0 }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0 }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0 }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0 }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0 }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0 }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0 }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = */ - { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0 }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0 }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0 }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0 }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0 }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0 }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ - { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ - { AS(linux_mkdirat_args), (sy_call_t *)linux_mkdirat, AUE_MKDIRAT, NULL, 0, 0 }, /* 296 = linux_mkdirat */ - { AS(linux_mknodat_args), (sy_call_t *)linux_mknodat, AUE_MKNODAT, NULL, 0, 0 }, /* 297 = linux_mknodat */ - { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_FCHOWNAT, NULL, 0, 0 }, /* 298 = linux_fchownat */ - { AS(linux_futimesat_args), (sy_call_t *)linux_futimesat, AUE_FUTIMESAT, NULL, 0, 0 }, /* 299 = linux_futimesat */ - { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_FSTATAT, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ - { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 301 = linux_unlinkat */ - { AS(linux_renameat_args), (sy_call_t *)linux_renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 302 = linux_renameat */ - { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_LINKAT, NULL, 0, 0 }, /* 303 = linux_linkat */ - { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 304 = linux_symlinkat */ - { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_READLINKAT, NULL, 0, 0 }, /* 305 = linux_readlinkat */ - { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_FCHMODAT, NULL, 0, 0 }, /* 306 = linux_fchmodat */ - { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_FACCESSAT, NULL, 0, 0 }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ - { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 }, /* 311 = linux_set_robust_list */ - { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 }, /* 312 = linux_get_robust_list */ - { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0 }, /* 313 = linux_splice */ - { 0, (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0 }, /* 314 = linux_sync_file_range */ - { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0 }, /* 315 = linux_tee */ - { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0 }, /* 316 = linux_vmsplice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = setup */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0, 0 }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, 0 }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, 0 }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0, 0 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0, 0 }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0, 0 }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0, 0 }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0, 0 }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0, 0 }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0, 0 }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0, 0 }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 16 = linux_lchown16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 17 = break */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0, 0 }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0, 0 }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0, 0 }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 22 = linux_oldumount */ + { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0, 0 }, /* 23 = linux_setuid16 */ + { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0, 0 }, /* 24 = linux_getuid16 */ + { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 25 = linux_stime */ + { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0, 0 }, /* 26 = linux_ptrace */ + { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0, 0 }, /* 27 = linux_alarm */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 28 = fstat */ + { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0, 0 }, /* 29 = linux_pause */ + { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0, 0 }, /* 30 = linux_utime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 31 = stty */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 32 = gtty */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0, 0 }, /* 33 = linux_access */ + { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0, 0 }, /* 34 = linux_nice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 35 = ftime */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, 0 }, /* 36 = sync */ + { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0, 0 }, /* 37 = linux_kill */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0, 0 }, /* 38 = linux_rename */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0, 0 }, /* 39 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0, 0 }, /* 40 = linux_rmdir */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, 0 }, /* 41 = dup */ + { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0, 0 }, /* 42 = linux_pipe */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0, 0 }, /* 43 = linux_times */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 44 = prof */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0, 0 }, /* 45 = linux_brk */ + { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0, 0 }, /* 46 = linux_setgid16 */ + { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0, 0 }, /* 47 = linux_getgid16 */ + { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0, 0 }, /* 48 = linux_signal */ + { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0, 0 }, /* 49 = linux_geteuid16 */ + { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0, 0 }, /* 50 = linux_getegid16 */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 52 = linux_umount */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 53 = lock */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = linux_ioctl */ + { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0, 0 }, /* 55 = linux_fcntl */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 56 = mpx */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0, 0 }, /* 57 = setpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 58 = ulimit */ + { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0, 0 }, /* 59 = linux_olduname */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, 0 }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0, 0 }, /* 61 = chroot */ + { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0, 0 }, /* 62 = linux_ustat */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, 0 }, /* 63 = dup2 */ + { 0, (sy_call_t *)linux_getppid, AUE_GETPPID, NULL, 0, 0, 0 }, /* 64 = linux_getppid */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, 0 }, /* 65 = getpgrp */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, 0 }, /* 66 = setsid */ + { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0, 0 }, /* 67 = linux_sigaction */ + { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0, 0 }, /* 68 = linux_sgetmask */ + { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0, 0 }, /* 69 = linux_ssetmask */ + { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0, 0 }, /* 70 = linux_setreuid16 */ + { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0, 0 }, /* 71 = linux_setregid16 */ + { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0, 0 }, /* 72 = linux_sigsuspend */ + { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0, 0 }, /* 73 = linux_sigpending */ + { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 74 = linux_sethostname */ + { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0, 0 }, /* 75 = linux_setrlimit */ + { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 76 = linux_old_getrlimit */ + { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE, NULL, 0, 0, 0 }, /* 77 = linux_getrusage */ + { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL, NULL, 0, 0, 0 }, /* 78 = linux_gettimeofday */ + { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 79 = linux_settimeofday */ + { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0, 0 }, /* 80 = linux_getgroups16 */ + { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0, 0 }, /* 81 = linux_setgroups16 */ + { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0, 0 }, /* 82 = linux_old_select */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 83 = linux_symlink */ + { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 84 = linux_lstat */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0, 0 }, /* 85 = linux_readlink */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 86 = linux_uselib */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0, 0 }, /* 87 = swapon */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 89 = linux_readdir */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0, 0 }, /* 90 = linux_mmap */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, 0 }, /* 91 = munmap */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 92 = linux_truncate */ + { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 93 = linux_ftruncate */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, 0 }, /* 94 = fchmod */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, 0 }, /* 95 = fchown */ + { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0, 0 }, /* 96 = linux_getpriority */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, 0 }, /* 97 = setpriority */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 98 = profil */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0, 0 }, /* 99 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0, 0 }, /* 100 = linux_fstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 101 = ioperm */ + { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0, 0 }, /* 102 = linux_socketcall */ + { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0, 0 }, /* 103 = linux_syslog */ + { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0, 0 }, /* 104 = linux_setitimer */ + { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0, 0 }, /* 105 = linux_getitimer */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0, 0 }, /* 106 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 107 = linux_newlstat */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 108 = linux_newfstat */ + { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0, 0 }, /* 109 = linux_uname */ + { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0, 0 }, /* 110 = linux_iopl */ + { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0, 0 }, /* 111 = linux_vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 112 = idle */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 113 = vm86old */ + { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0, 0 }, /* 114 = linux_wait4 */ + { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0, 0 }, /* 115 = linux_swapoff */ + { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0, 0 }, /* 116 = linux_sysinfo */ + { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0, 0 }, /* 117 = linux_ipc */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, 0 }, /* 118 = fsync */ + { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 119 = linux_sigreturn */ + { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0, 0 }, /* 120 = linux_clone */ + { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 121 = linux_setdomainname */ + { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0, 0 }, /* 122 = linux_newuname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 123 = modify_ldt */ + { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0, 0 }, /* 124 = linux_adjtimex */ + { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0, 0 }, /* 125 = linux_mprotect */ + { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0 }, /* 126 = linux_sigprocmask */ + { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0, 0 }, /* 127 = linux_create_module */ + { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0, 0 }, /* 128 = linux_init_module */ + { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0, 0 }, /* 129 = linux_delete_module */ + { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0, 0 }, /* 130 = linux_get_kernel_syms */ + { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0, 0 }, /* 131 = linux_quotactl */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, 0 }, /* 132 = getpgid */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0, 0 }, /* 133 = fchdir */ + { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0, 0 }, /* 134 = linux_bdflush */ + { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0, 0 }, /* 135 = linux_sysfs */ + { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0, 0 }, /* 136 = linux_personality */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 137 = afs_syscall */ + { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0, 0 }, /* 138 = linux_setfsuid16 */ + { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0, 0 }, /* 139 = linux_setfsgid16 */ + { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 141 = linux_getdents */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0, 0 }, /* 142 = linux_select */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, 0 }, /* 143 = flock */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0, 0 }, /* 144 = linux_msync */ + { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV, NULL, 0, 0, 0 }, /* 145 = linux_readv */ + { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV, NULL, 0, 0, 0 }, /* 146 = linux_writev */ + { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0, 0 }, /* 147 = linux_getsid */ + { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0, 0 }, /* 148 = linux_fdatasync */ + { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 149 = linux_sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, 0 }, /* 150 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, 0 }, /* 151 = munlock */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, 0 }, /* 152 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, 0 }, /* 153 = munlockall */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0, 0 }, /* 154 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0, 0 }, /* 155 = sched_getparam */ + { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0, 0 }, /* 156 = linux_sched_setscheduler */ + { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0, 0 }, /* 157 = linux_sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, 0 }, /* 158 = sched_yield */ + { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0, 0 }, /* 159 = linux_sched_get_priority_max */ + { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0, 0 }, /* 160 = linux_sched_get_priority_min */ + { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0, 0 }, /* 161 = linux_sched_rr_get_interval */ + { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL, NULL, 0, 0, 0 }, /* 162 = linux_nanosleep */ + { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0, 0 }, /* 163 = linux_mremap */ + { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0, 0 }, /* 164 = linux_setresuid16 */ + { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0, 0 }, /* 165 = linux_getresuid16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 166 = vm86 */ + { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0, 0 }, /* 167 = linux_query_module */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, 0 }, /* 168 = poll */ + { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0, 0 }, /* 169 = linux_nfsservctl */ + { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0, 0 }, /* 170 = linux_setresgid16 */ + { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0, 0 }, /* 171 = linux_getresgid16 */ + { AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0, 0 }, /* 172 = linux_prctl */ + { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0, 0 }, /* 173 = linux_rt_sigreturn */ + { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0, 0 }, /* 174 = linux_rt_sigaction */ + { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0, 0 }, /* 175 = linux_rt_sigprocmask */ + { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0, 0 }, /* 176 = linux_rt_sigpending */ + { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ + { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ + { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0, 0 }, /* 179 = linux_rt_sigsuspend */ + { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0, 0 }, /* 180 = linux_pread */ + { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0, 0 }, /* 181 = linux_pwrite */ + { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0, 0 }, /* 182 = linux_chown16 */ + { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0, 0 }, /* 183 = linux_getcwd */ + { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0, 0 }, /* 184 = linux_capget */ + { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0, 0 }, /* 185 = linux_capset */ + { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0, 0 }, /* 186 = linux_sigaltstack */ + { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0, 0 }, /* 187 = linux_sendfile */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 188 = getpmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 189 = putpmsg */ + { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0, 0 }, /* 190 = linux_vfork */ + { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 191 = linux_getrlimit */ + { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0, 0 }, /* 192 = linux_mmap2 */ + { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 193 = linux_truncate64 */ + { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 194 = linux_ftruncate64 */ + { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0, 0 }, /* 195 = linux_stat64 */ + { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0, 0 }, /* 196 = linux_lstat64 */ + { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0, 0 }, /* 197 = linux_fstat64 */ + { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 198 = linux_lchown */ + { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0, 0 }, /* 199 = linux_getuid */ + { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0, 0 }, /* 200 = linux_getgid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, 0 }, /* 201 = geteuid */ + { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, 0 }, /* 202 = getegid */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, 0 }, /* 203 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, 0 }, /* 204 = setregid */ + { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0, 0 }, /* 205 = linux_getgroups */ + { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0, 0 }, /* 206 = linux_setgroups */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0, 0 }, /* 207 = fchown */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, 0 }, /* 208 = setresuid */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0, 0 }, /* 209 = getresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, 0 }, /* 210 = setresgid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0, 0 }, /* 211 = getresgid */ + { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0, 0 }, /* 212 = linux_chown */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, 0 }, /* 213 = setuid */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, 0 }, /* 214 = setgid */ + { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0, 0 }, /* 215 = linux_setfsuid */ + { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0, 0 }, /* 216 = linux_setfsgid */ + { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0, 0 }, /* 217 = linux_pivot_root */ + { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0, 0 }, /* 218 = linux_mincore */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, 0 }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 220 = linux_getdents64 */ + { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0, 0 }, /* 221 = linux_fcntl64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 222 = */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 223 = */ + { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0, 0 }, /* 224 = linux_gettid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 225 = linux_readahead */ + { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 226 = linux_setxattr */ + { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 227 = linux_lsetxattr */ + { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 228 = linux_fsetxattr */ + { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 229 = linux_getxattr */ + { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 230 = linux_lgetxattr */ + { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 231 = linux_fgetxattr */ + { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 232 = linux_listxattr */ + { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 233 = linux_llistxattr */ + { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 234 = linux_flistxattr */ + { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0, 0 }, /* 235 = linux_removexattr */ + { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0, 0 }, /* 236 = linux_lremovexattr */ + { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0, 0 }, /* 237 = linux_fremovexattr */ + { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0, 0 }, /* 238 = linux_tkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 239 = linux_sendfile64 */ + { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0, 0 }, /* 240 = linux_sys_futex */ + { AS(linux_sched_setaffinity_args), (sy_call_t *)linux_sched_setaffinity, AUE_NULL, NULL, 0, 0, 0 }, /* 241 = linux_sched_setaffinity */ + { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0, 0 }, /* 242 = linux_sched_getaffinity */ + { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0, 0 }, /* 243 = linux_set_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 244 = linux_get_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 245 = linux_io_setup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 246 = linux_io_destroy */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 247 = linux_io_getevents */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 248 = inux_io_submit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 249 = linux_io_cancel */ + { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0, 0 }, /* 250 = linux_fadvise64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 251 = */ + { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0, 0 }, /* 252 = linux_exit_group */ + { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0, 0 }, /* 253 = linux_lookup_dcookie */ + { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0, 0 }, /* 254 = linux_epoll_create */ + { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0, 0 }, /* 255 = linux_epoll_ctl */ + { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0, 0 }, /* 256 = linux_epoll_wait */ + { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0, 0 }, /* 257 = linux_remap_file_pages */ + { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0, 0 }, /* 258 = linux_set_tid_address */ + { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0, 0 }, /* 259 = linux_timer_create */ + { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0, 0 }, /* 260 = linux_timer_settime */ + { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 261 = linux_timer_gettime */ + { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0, 0 }, /* 262 = linux_timer_getoverrun */ + { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0, 0 }, /* 263 = linux_timer_delete */ + { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0 }, /* 264 = linux_clock_settime */ + { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 265 = linux_clock_gettime */ + { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0, 0 }, /* 266 = linux_clock_getres */ + { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0, 0 }, /* 267 = linux_clock_nanosleep */ + { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0, 0 }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0, 0 }, /* 269 = linux_fstatfs64 */ + { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0, 0 }, /* 270 = linux_tgkill */ + { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0, 0 }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0, 0 }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 273 = */ + { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0, 0 }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0, 0 }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0, 0 }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0, 0 }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0, 0 }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0, 0 }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0, 0 }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0, 0 }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0, 0 }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0, 0 }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0, 0 }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 285 = */ + { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0, 0 }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0, 0 }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0, 0 }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0, 0 }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0, 0 }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0, 0 }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0, 0 }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0, 0 }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0, 0 }, /* 294 = linux_migrate_pages */ + { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 295 = linux_openat */ + { AS(linux_mkdirat_args), (sy_call_t *)linux_mkdirat, AUE_MKDIRAT, NULL, 0, 0, 0 }, /* 296 = linux_mkdirat */ + { AS(linux_mknodat_args), (sy_call_t *)linux_mknodat, AUE_MKNODAT, NULL, 0, 0, 0 }, /* 297 = linux_mknodat */ + { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 }, /* 298 = linux_fchownat */ + { AS(linux_futimesat_args), (sy_call_t *)linux_futimesat, AUE_FUTIMESAT, NULL, 0, 0, 0 }, /* 299 = linux_futimesat */ + { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_FSTATAT, NULL, 0, 0, 0 }, /* 300 = linux_fstatat64 */ + { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_UNLINKAT, NULL, 0, 0, 0 }, /* 301 = linux_unlinkat */ + { AS(linux_renameat_args), (sy_call_t *)linux_renameat, AUE_RENAMEAT, NULL, 0, 0, 0 }, /* 302 = linux_renameat */ + { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_LINKAT, NULL, 0, 0, 0 }, /* 303 = linux_linkat */ + { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_SYMLINKAT, NULL, 0, 0, 0 }, /* 304 = linux_symlinkat */ + { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_READLINKAT, NULL, 0, 0, 0 }, /* 305 = linux_readlinkat */ + { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_FCHMODAT, NULL, 0, 0, 0 }, /* 306 = linux_fchmodat */ + { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_FACCESSAT, NULL, 0, 0, 0 }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0, 0 }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0, 0 }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0, 0 }, /* 310 = linux_unshare */ + { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0, 0 }, /* 311 = linux_set_robust_list */ + { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0, 0 }, /* 312 = linux_get_robust_list */ + { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0 }, /* 313 = linux_splice */ + { 0, (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0, 0 }, /* 314 = linux_sync_file_range */ + { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0, 0 }, /* 315 = linux_tee */ + { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0, 0 }, /* 316 = linux_vmsplice */ }; ==== //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.59 2009/04/14 14:19:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.60 2009/06/01 14:20:13 jhb Exp $"); /* * BIOS disk device handling. @@ -387,6 +387,7 @@ sprintf(line, "%s: FreeBSD swap%s\n", prefix, stats); else sprintf(line, "%s: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x%s\n", + prefix, gp->gp_type.time_low, gp->gp_type.time_mid, gp->gp_type.time_hi_and_version, gp->gp_type.clock_seq_hi_and_reserved, gp->gp_type.clock_seq_low, ==== //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#15 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.100 2009/04/29 21:50:13 jamie Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.101 2009/06/01 16:14:38 rwatson Exp $ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie */ @@ -38,513 +38,513 @@ /* The casts are bogus but will do for now. */ struct sysent freebsd32_sysent[] = { - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = syscall */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ - { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0 }, /* 2 = fork */ - { AS(read_args), (sy_call_t *)read, AUE_READ, NULL, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_WRITE, NULL, 0, 0 }, /* 4 = write */ - { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ - { AS(freebsd32_wait4_args), (sy_call_t *)freebsd32_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 7 = freebsd32_wait4 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 8 = obsolete old creat */ - { AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0 }, /* 9 = link */ - { AS(unlink_args), (sy_call_t *)unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = unlink */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 11 = obsolete execv */ - { AS(chdir_args), (sy_call_t *)chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = chdir */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 13 = fchdir */ - { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = mknod */ - { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = chmod */ - { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0 }, /* 16 = chown */ - { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ - { compat4(AS(freebsd4_freebsd32_getfsstat_args),freebsd32_getfsstat), AUE_GETFSSTAT, NULL, 0, 0 }, /* 18 = old freebsd32_getfsstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 19 = obsolete olseek */ - { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = getpid */ - { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = mount */ - { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = unmount */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 23 = setuid */ - { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0 }, /* 24 = getuid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 25 = geteuid */ - { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = ptrace */ - { AS(freebsd32_recvmsg_args), (sy_call_t *)freebsd32_recvmsg, AUE_RECVMSG, NULL, 0, 0 }, /* 27 = freebsd32_recvmsg */ - { AS(freebsd32_sendmsg_args), (sy_call_t *)freebsd32_sendmsg, AUE_SENDMSG, NULL, 0, 0 }, /* 28 = freebsd32_sendmsg */ - { AS(freebsd32_recvfrom_args), (sy_call_t *)freebsd32_recvfrom, AUE_RECVFROM, NULL, 0, 0 }, /* 29 = freebsd32_recvfrom */ - { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0 }, /* 30 = accept */ - { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0 }, /* 31 = getpeername */ - { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0 }, /* 32 = getsockname */ - { AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = access */ - { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0 }, /* 34 = chflags */ - { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0 }, /* 35 = fchflags */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ - { AS(kill_args), (sy_call_t *)kill, AUE_KILL, NULL, 0, 0 }, /* 37 = kill */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 38 = ostat */ - { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0 }, /* 39 = getppid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 40 = olstat */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ - { 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = pipe */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 43 = getegid */ - { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0 }, /* 44 = profil */ - { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE, NULL, 0, 0 }, /* 45 = ktrace */ - { compat(AS(ofreebsd32_sigaction_args),freebsd32_sigaction), AUE_SIGACTION, NULL, 0, 0 }, /* 46 = old freebsd32_sigaction */ - { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0 }, /* 47 = getgid */ - { compat(AS(ofreebsd32_sigprocmask_args),freebsd32_sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0 }, /* 48 = old freebsd32_sigprocmask */ - { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0 }, /* 49 = getlogin */ - { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0 }, /* 50 = setlogin */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ - { compat(0,freebsd32_sigpending), AUE_SIGPENDING, NULL, 0, 0 }, /* 52 = old freebsd32_sigpending */ - { AS(freebsd32_sigaltstack_args), (sy_call_t *)freebsd32_sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0 }, /* 53 = freebsd32_sigaltstack */ - { AS(freebsd32_ioctl_args), (sy_call_t *)freebsd32_ioctl, AUE_NULL, NULL, 0, 0 }, /* 54 = freebsd32_ioctl */ - { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0 }, /* 55 = reboot */ - { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0 }, /* 56 = revoke */ - { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 57 = symlink */ - { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK, NULL, 0, 0 }, /* 58 = readlink */ - { AS(freebsd32_execve_args), (sy_call_t *)freebsd32_execve, AUE_EXECVE, NULL, 0, 0 }, /* 59 = freebsd32_execve */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 62 = obsolete ofstat */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 63 = obsolete ogetkerninfo */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 64 = obsolete ogetpagesize */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0 }, /* 65 = msync */ - { 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0 }, /* 66 = vfork */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 67 = obsolete vread */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 68 = obsolete vwrite */ - { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0 }, /* 69 = sbrk */ - { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0 }, /* 70 = sstk */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 71 = obsolete ommap */ - { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE, NULL, 0, 0 }, /* 72 = vadvise */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 73 = munmap */ - { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 74 = mprotect */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 75 = madvise */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 76 = obsolete vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 77 = obsolete vlimit */ - { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0 }, /* 78 = mincore */ - { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 79 = getgroups */ - { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 80 = setgroups */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 81 = getpgrp */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 82 = setpgid */ - { AS(freebsd32_setitimer_args), (sy_call_t *)freebsd32_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 83 = freebsd32_setitimer */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 84 = obsolete owait */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 85 = swapon */ - { AS(freebsd32_getitimer_args), (sy_call_t *)freebsd32_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 86 = freebsd32_getitimer */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 87 = obsolete ogethostname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 88 = obsolete osethostname */ - { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0 }, /* 89 = getdtablesize */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 90 = dup2 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 91 = getdopt */ - { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 92 = fcntl */ - { AS(freebsd32_select_args), (sy_call_t *)freebsd32_select, AUE_SELECT, NULL, 0, 0 }, /* 93 = freebsd32_select */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 94 = setdopt */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 95 = fsync */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 96 = setpriority */ - { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0 }, /* 97 = socket */ - { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0 }, /* 98 = connect */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 99 = obsolete oaccept */ - { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 100 = getpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 101 = obsolete osend */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 102 = obsolete orecv */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 103 = obsolete osigreturn */ - { AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0 }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0 }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0 }, /* 106 = listen */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 107 = obsolete vtimes */ - { compat(AS(ofreebsd32_sigvec_args),freebsd32_sigvec), AUE_O_SIGVEC, NULL, 0, 0 }, /* 108 = old freebsd32_sigvec */ - { compat(AS(ofreebsd32_sigblock_args),freebsd32_sigblock), AUE_O_SIGBLOCK, NULL, 0, 0 }, /* 109 = old freebsd32_sigblock */ - { compat(AS(ofreebsd32_sigsetmask_args),freebsd32_sigsetmask), AUE_O_SIGSETMASK, NULL, 0, 0 }, /* 110 = old freebsd32_sigsetmask */ - { compat(AS(ofreebsd32_sigsuspend_args),freebsd32_sigsuspend), AUE_SIGSUSPEND, NULL, 0, 0 }, /* 111 = old freebsd32_sigsuspend */ - { compat(AS(ofreebsd32_sigstack_args),freebsd32_sigstack), AUE_O_SIGSTACK, NULL, 0, 0 }, /* 112 = old freebsd32_sigstack */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 2 19:47:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 206291065698; Tue, 2 Jun 2009 19:47:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB2BE106568C for ; Tue, 2 Jun 2009 19:47:43 +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 B72018FC17 for ; Tue, 2 Jun 2009 19:47:43 +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 n52JlhMB093507 for ; Tue, 2 Jun 2009 19:47:43 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52Jlhc2093505 for perforce@freebsd.org; Tue, 2 Jun 2009 19:47:43 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 2 Jun 2009 19:47:43 GMT Message-Id: <200906021947.n52Jlhc2093505@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 163370 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 19:47:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=163370 Change 163370 by thompsa@thompsa_burger on 2009/06/02 19:47:34 IFC after updating branchspec for libusb and usbconfig Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.3#13 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.c#4 integrate .. //depot/projects/usb/src/lib/libusb/libusb20.h#4 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_int.h#3 integrate .. //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#3 integrate .. //depot/projects/usb/src/lib/libusbhid/descr.c#8 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/acl.h#4 branch .. //depot/projects/usb/src/sys/dev/usb/README.TXT#3 delete .. //depot/projects/usb/src/sys/powerpc/powerpc/uio_machdep.c#5 branch .. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#5 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#12 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#7 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#5 integrate .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#15 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.3#13 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.2 2009/04/05 18:30:24 thompsa Exp $ +.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.5 2009/06/02 17:27:51 thompsa Exp $ .\" .Dd May 28, 2009 .Dt LIBUSB 3 @@ -111,7 +111,7 @@ .Ft const char * .Fn libusb20_dev_get_backend_name "struct libusb20_device *" .Ft int -.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb2_device_info *pinfo" +.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb_device_info *pinfo" .Ft int .Fn libusb20_dev_get_iface_desc "struct libusb20_device *pdev" "uint8_t iface_index" "char *buf" "uint8_t len" .Ft const char * @@ -489,7 +489,7 @@ .Pp . .Fn libusb20_dev_get_info -retrives the BSD specific usb2_device_info structure into the memory location given by +retrives the BSD specific usb_device_info structure into the memory location given by .Fa pinfo . The USB device given by .Fa pdev ==== //depot/projects/usb/src/lib/libusb/libusb20.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.3 2009/06/02 17:27:51 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -931,7 +931,7 @@ int libusb20_dev_get_info(struct libusb20_device *pdev, - struct usb2_device_info *pinfo) + struct usb_device_info *pinfo) { if (pinfo == NULL) return (LIBUSB20_ERROR_INVALID_PARAM); ==== //depot/projects/usb/src/lib/libusb/libusb20.h#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.2 2009/03/17 21:20:39 delphij Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.4 2009/06/02 17:27:51 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. @@ -175,7 +175,7 @@ LIBUSB20_POWER_RESUME, }; -struct usb2_device_info; +struct usb_device_info; struct libusb20_transfer; struct libusb20_backend; struct libusb20_backend_methods; @@ -254,7 +254,7 @@ int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode); uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev); int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index); -int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb2_device_info *pinfo); +int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb_device_info *pinfo); int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); struct LIBUSB20_DEVICE_DESC_DECODED *libusb20_dev_get_device_desc(struct libusb20_device *pdev); ==== //depot/projects/usb/src/lib/libusb/libusb20_int.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -49,7 +49,7 @@ typedef int (libusb20_root_add_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); typedef int (libusb20_root_remove_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); typedef int (libusb20_close_device_t)(struct libusb20_device *pdev); -typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb2_device_info *pinfo); +typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb_device_info *pinfo); typedef int (libusb20_dev_get_iface_desc_t)(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); typedef int (libusb20_init_backend_t)(struct libusb20_backend *pbe); typedef int (libusb20_open_device_t)(struct libusb20_device *pdev, uint16_t transfer_count_max); ==== //depot/projects/usb/src/lib/libusb/libusb20_ugen20.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -126,8 +126,8 @@ ugen20_enumerate(struct libusb20_device *pdev, const char *id) { const char *tmp = id; - struct usb2_device_descriptor ddesc; - struct usb2_device_info devinfo; + struct usb_device_descriptor ddesc; + struct usb_device_info devinfo; uint32_t plugtime; char buf[64]; int f; @@ -213,7 +213,7 @@ } struct ugen20_urd_state { - struct usb2_read_dir urd; + struct usb_read_dir urd; uint32_t nparsed; int f; uint8_t *ptr; @@ -298,7 +298,7 @@ static void ugen20_tr_release(struct libusb20_device *pdev) { - struct usb2_fs_uninit fs_uninit; + struct usb_fs_uninit fs_uninit; if (pdev->nTransfer == 0) { return; @@ -316,8 +316,8 @@ static int ugen20_tr_renew(struct libusb20_device *pdev) { - struct usb2_fs_init fs_init; - struct usb2_fs_endpoint *pfse; + struct usb_fs_init fs_init; + struct usb_fs_endpoint *pfse; int error; uint32_t size; uint16_t nMaxTransfer; @@ -419,7 +419,7 @@ static int ugen20_close_device(struct libusb20_device *pdev) { - struct usb2_fs_uninit fs_uninit; + struct usb_fs_uninit fs_uninit; if (pdev->privBeData) { memset(&fs_uninit, 0, sizeof(fs_uninit)); @@ -447,8 +447,8 @@ ugen20_get_config_desc_full(struct libusb20_device *pdev, uint8_t **ppbuf, uint16_t *plen, uint8_t cfg_index) { - struct usb2_gen_descriptor gen_desc; - struct usb2_config_descriptor cdesc; + struct usb_gen_descriptor gen_desc; + struct usb_config_descriptor cdesc; uint8_t *ptr; uint16_t len; int error; @@ -542,7 +542,7 @@ ugen20_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index) { - struct usb2_alt_interface alt_iface; + struct usb_alt_interface alt_iface; memset(&alt_iface, 0, sizeof(alt_iface)); @@ -663,7 +663,7 @@ struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags) { - struct usb2_ctl_request req; + struct usb_ctl_request req; memset(&req, 0, sizeof(req)); @@ -688,8 +688,8 @@ static int ugen20_process(struct libusb20_device *pdev) { - struct usb2_fs_complete temp; - struct usb2_fs_endpoint *fsep; + struct usb_fs_complete temp; + struct usb_fs_endpoint *fsep; struct libusb20_transfer *xfer; while (1) { @@ -739,8 +739,8 @@ ugen20_tr_open(struct libusb20_transfer *xfer, uint32_t MaxBufSize, uint32_t MaxFrameCount, uint8_t ep_no) { - struct usb2_fs_open temp; - struct usb2_fs_endpoint *fsep; + struct usb_fs_open temp; + struct usb_fs_endpoint *fsep; memset(&temp, 0, sizeof(temp)); @@ -772,7 +772,7 @@ static int ugen20_tr_close(struct libusb20_transfer *xfer) { - struct usb2_fs_close temp; + struct usb_fs_close temp; memset(&temp, 0, sizeof(temp)); @@ -787,7 +787,7 @@ static int ugen20_tr_clear_stall_sync(struct libusb20_transfer *xfer) { - struct usb2_fs_clear_stall_sync temp; + struct usb_fs_clear_stall_sync temp; memset(&temp, 0, sizeof(temp)); @@ -804,8 +804,8 @@ static void ugen20_tr_submit(struct libusb20_transfer *xfer) { - struct usb2_fs_start temp; - struct usb2_fs_endpoint *fsep; + struct usb_fs_start temp; + struct usb_fs_endpoint *fsep; memset(&temp, 0, sizeof(temp)); @@ -839,7 +839,7 @@ static void ugen20_tr_cancel_async(struct libusb20_transfer *xfer) { - struct usb2_fs_stop temp; + struct usb_fs_stop temp; memset(&temp, 0, sizeof(temp)); @@ -876,7 +876,7 @@ ugen20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len) { - struct usb2_gen_descriptor ugd; + struct usb_gen_descriptor ugd; memset(&ugd, 0, sizeof(ugd)); @@ -892,7 +892,7 @@ static int ugen20_dev_get_info(struct libusb20_device *pdev, - struct usb2_device_info *pinfo) + struct usb_device_info *pinfo) { if (ioctl(pdev->file, USB_GET_DEVICEINFO, pinfo)) { return (LIBUSB20_ERROR_INVALID_PARAM); @@ -904,7 +904,7 @@ ugen20_root_get_dev_quirk(struct libusb20_backend *pbe, uint16_t quirk_index, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); @@ -931,7 +931,7 @@ ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t quirk_index, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); @@ -954,7 +954,7 @@ ugen20_root_add_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); @@ -978,7 +978,7 @@ ugen20_root_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); ==== //depot/projects/usb/src/lib/libusbhid/descr.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.11 2009/02/27 15:30:42 thompsa Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.12 2009/05/28 20:21:01 thompsa Exp $"); #include @@ -76,7 +76,7 @@ report_desc_t hid_get_report_desc(int fd) { - struct usb2_gen_descriptor ugd; + struct usb_gen_descriptor ugd; report_desc_t rep; void *data; ==== //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: head/usr.sbin/usbconfig/Makefile 189585 2009-03-09 17:05:31Z thompsa $ +# $FreeBSD: src/usr.sbin/usbconfig/Makefile,v 1.2 2009/03/09 17:05:31 thompsa Exp $ # PROG= usbconfig MAN= usbconfig.8 ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: head/usr.sbin/usbconfig/dump.c 189110 2009-02-27 17:27:16Z thompsa $ */ +/* $FreeBSD: src/usr.sbin/usbconfig/dump.c,v 1.4 2009/02/27 17:27:16 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: head/usr.sbin/usbconfig/dump.h 189110 2009-02-27 17:27:16Z thompsa $ */ +/* $FreeBSD: src/usr.sbin/usbconfig/dump.h,v 1.3 2009/02/27 17:27:16 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: head/usr.sbin/usbconfig/usbconfig.8 184610 2008-11-04 02:31:03Z alfred $ +.\" $FreeBSD: src/usr.sbin/usbconfig/usbconfig.8,v 1.2 2009/05/27 19:21:29 thompsa Exp $ .\" .\" Copyright (c) 2008 Hans Petter Selasky. All rights reserved. .\" ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: head/usr.sbin/usbconfig/usbconfig.c 189110 2009-02-27 17:27:16Z thompsa $ */ +/* $FreeBSD: src/usr.sbin/usbconfig/usbconfig.c,v 1.8 2009/03/17 21:21:33 delphij Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -501,7 +501,6 @@ { struct libusb20_backend *pbe; struct options *opt = &options; - char *cp; int n; int t; From owner-p4-projects@FreeBSD.ORG Tue Jun 2 20:56:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 439BD1065672; Tue, 2 Jun 2009 20:56: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 0395F106564A for ; Tue, 2 Jun 2009 20:56:55 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5DE88FC1C for ; Tue, 2 Jun 2009 20:56:54 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n52KusPf011651 for ; Tue, 2 Jun 2009 20:56:54 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52Kus3j011649 for perforce@freebsd.org; Tue, 2 Jun 2009 20:56:54 GMT (envelope-from mav@freebsd.org) Date: Tue, 2 Jun 2009 20:56:54 GMT Message-Id: <200906022056.n52Kus3j011649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 20:56:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=163376 Change 163376 by mav@mav_mavbook on 2009/06/02 20:56:08 Report absent drive via CAM_SEL_TIMEOUT error on any command, same as SCSI. ATA unable to determine that error type so fast, so use scan info for this. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#11 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#11 (text+ko) ==== @@ -1668,6 +1668,12 @@ /* Common cases first */ case XPT_ATA_IO: /* Execute the requested I/O operation */ case XPT_SCSI_IO: + if ((((ATA_ATA_MASTER | ATA_ATAPI_MASTER) << + ccb->ccb_h.target_id) & ch->devices) == 0) { + ccb->ccb_h.status = CAM_SEL_TIMEOUT; + xpt_done(ccb); + break; + } ahci_begin_transaction(ch->dev, ccb); break; case XPT_EN_LUN: /* Enable LUN as a target */ @@ -1744,10 +1750,6 @@ { struct ccb_pathinq *cpi = &ccb->cpi; - if (ccb->ccb_h.target_id == CAM_TARGET_WILDCARD || - (((ATA_ATA_MASTER | ATA_ATAPI_MASTER) << - ccb->ccb_h.target_id) & ch->devices)) { - cpi->version_num = 1; /* XXX??? */ cpi->hba_inquiry = PI_SDTR_ABLE | PI_TAG_ABLE; cpi->target_sprt = 0; @@ -1764,15 +1766,12 @@ cpi->unit_number = cam_sim_unit(sim); cpi->transport = XPORT_ATA; cpi->transport_version = 2; - if ((ATA_ATA_MASTER << ccb->ccb_h.target_id) & ch->devices) + if ((ATA_ATAPI_MASTER << ccb->ccb_h.target_id) & ch->devices) + cpi->protocol = PROTO_SCSI; + else cpi->protocol = PROTO_ATA; - else - cpi->protocol = PROTO_SCSI; cpi->protocol_version = SCSI_REV_2; cpi->ccb_h.status = CAM_REQ_CMP; - } else { - ccb->ccb_h.status = CAM_REQ_INVALID; - } xpt_done(ccb); break; } From owner-p4-projects@FreeBSD.ORG Tue Jun 2 21:28:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DF541065673; Tue, 2 Jun 2009 21:28:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D396106566B for ; Tue, 2 Jun 2009 21:28:28 +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 ED29E8FC13 for ; Tue, 2 Jun 2009 21:28:27 +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 n52LSRZJ016503 for ; Tue, 2 Jun 2009 21:28:27 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52LSR2l016501 for perforce@freebsd.org; Tue, 2 Jun 2009 21:28:27 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 2 Jun 2009 21:28:27 GMT Message-Id: <200906022128.n52LSR2l016501@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 163381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 21:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=163381 Change 163381 by rene@rene_self on 2009/06/02 21:28:26 [website] translate publish.sgml up to at least 29% Affected files ... .. //depot/projects/docproj_nl/www/nl/publish.sgml#4 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/publish.sgml#4 (text+ko) ==== @@ -3,6 +3,10 @@ ]> + &header; @@ -33,7 +37,7 @@ href="&enbase;/doc/nl_NL.ISO8859-1/handbook/bibliography.html">bibliografie.

        - Klik op een afbeelden om een grotere versie te zien. + Klik op een afbeelding om een grotere versie te zien.

        @@ -42,8 +46,8 @@ - + - + @@ -68,163 +72,147 @@ - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + Internet-servers bouwen met &os; (in het Indonesisch), + uitgegeven door Elex Media + Komputindo, 2000. - - + + - - + + - - + + - + + Engelse versie: 2000, Addison Wesley. ISBN 0-201-70481-1
        + Japanse versie: 2001, Pearson Education Japan. ISBN 4-89471-464-7 - + + The Bit Tree Press. ISBN 0-9712045-1-9 - + - + - + - + + src="&enbase;/gifs/cahiers_adm_cov.jpg" width="187" height="215" + alt="Les cahiers de l'Admin BSD boekomslag"> @@ -331,13 +318,12 @@ suite, ALTQ, spamd, address translation, and more for &os;, NetBSD, OpenBSD, and DragonFly. August 2006, Reed Media Services. - ISBN 978-0-9790342-0-6. - + ISBN 978-0-9790342-0-6. - @@ -345,25 +331,23 @@ &os; to its fullest potential. Jun 7, 2006, - Sams. ISBN 0-672-32875-5 - + Sams. ISBN 0-672-32875-5 + href="http://www.twbsd.org/cht/book/">Drmaster. ISBN 9-575-27878-X @@ -379,7 +363,7 @@ @@ -389,7 +373,7 @@ @@ -398,8 +382,7 @@ tutorials covering a wide range of &os; and open source Unix topics. December 2007. Reed Media Services. - ISBN 978-0-9790342-2-0. - + ISBN 978-0-9790342-2-0.
        boekomslagboekomslag Een publicatie van Tatsumi Hosokawa en anderen. Onder de computerboeken is het een top-seller in Japan en het overtrof de @@ -52,8 +56,8 @@
        boekomslagboekomslag (Japans boek over &os; met 2.0.5, getiteld "&os;: Plezierige en eenvoudige installatie")
        boekomslagboekomslag Dit is "The Complete &os;" van BSDi met installatiegids, handleidingspagina's en ingesloten CD's.
        book coverboekomslagThis book was published (early 1997) in Taiwan. Its title - is "&os;: introduction and applications" and the author is - Jian-Da Li (aka. jdli).Dit boek werd in Taiwan (begin 1997) gepubliceerd. De titel is + "&os;: introductie en applicaties" en de auteur is Jian-Da Li + (ook bekend als jdli).
        book coverboekomslagThis is the "Getting Started with &os;" from Fuki-Shuppan. - Other than the standard installation guide and Japanese environment, - it emphasizes system administration and low-level information (such - as the boot process, etc.) &os;-2.2.2R and XFree86-3.2 on CDROM. - 264 pages, 3,400 yen.Dit is "Aan de slag met &os;" door Fuki-Shuppan. Anders dan de + standaard installatiegids en Japanse omgeving legt het de nadruk op + systeembeheer en low-level informatie (zoals het opstartproces). + &os;-2.2.2R en XFree86-3.2 op CD-ROM. 264 pagina's, 3.400 yen.
        book coverboekomslagThe "Personal Unix Starter Kit - &os;" from ASCII. Includes - history of &unix;, a guide to build a Japanese documentation - processing system and how to create ports. 2.1.7.1R and XFree86-3.2 - in CDROM. 384 pages, 3,000 yen.Het "Persoonlijk Unix beginpakket - &os;" van ASCII. Bevat een + geschiedenis van &unix, een gids om een Japans systeem voor + documentverwerking te bouwen en om ports te creëren. 2.1.7.1R + en XFree86-3.2 op CD-ROM. 384 pagina's, 3.000 yen.
        book coverboekomslagBSD mit Methode, M. Schulze, B. Roehrig, M. Hoelzer und andere, - C&L Computer und Literatur Verlag, 1998, 850 pages. 2 CDROMs, - &os; 2.2.6, NetBSD 1.2.1 and 1.3.2, OpenBSD 2.2 and 2.3. DM + BSD mit Methode, M. Schulze, B. Roehrig, M. Hoelzer en andere, + C&L Computer und Literatur Verlag, 1998, 850 pagina's. 2 + CD-ROMs, &os; 2.2.6, NetBSD 1.2.1 en 1.3.2, OpenBSD 2.2 en 2.3. DM 98,-.
        book coverboekomslagThis is the "&os; Install and utilization manual" from Mainichi - Communications. General introduction to &os; from installation - to utilization with troubleshooting under the supervision of the - user group in Japan. 2.2.7-RELEASE &os;(98)2.2.7-Rev01 PAO and - distfiles in CDROM. 472 pages, 3,600yen.Dit is het "Installatie- en gebruikershandboek voor &os;" van + Mainichi Communications. Algemene introductie tot &os; van + installatie to gebruik met probleemoplossing onder het toeziend oog + van de gebruikersgroep in Japan. 2.2.7-RELEASE &os;(98)2.2.7-Rev01 + PAO en distributiebestanden op CD-ROM. 472 pagina's, 3.600 yen.
        book coverboekomslagThe "&os; User's Reference Manual" from Mainichi - Communications, under the supervision of "jpman project", the manual - translation project by the user group in Japan. Japanese edition of - the section 1 of the &os; manual. 2.2.7-RELEASE - &os;(98)2.2.7-Rev01 and PAO in CDROM. 1,040 pages, 3,800yen.Het "Naslagwerk voor &os;-gebruikers" van Mainichi Communications, + onder het toezicht van het "jpman project", het + handleidingvertaalproject door de gebruikersgroep in Japan. Japanse + editie van sectie 1 van de &os;-handleiding. 2.2.7-RELEASE + &os;(98)2.2.7-Rev01 en PAO op CD-ROM. 1.040 pagina's, 3.800 yen.
        book coverboekomslagThe "&os; System Administrator's Manual" from Mainichi - Communications, under the supervision of "jpman project", the manual - translation project by the user group in Japan. Japanese edition of - the section 5 and 8 of the &os; manual. 756 pages, 3,300yen. - De "Handleiding voor &os;-systeembeheerders" van Mainichi + Communications, onder het toezicht van het "jpman project", het + handleidingvertaalproject door de gebruikersgroep in Japan. Japanse + editie van sectie 5 en 8 van de &os;-handleiding. 756 pagina's, + 3.300 yen.
        book coverboekomslagThis is "About &os;" from Youngjin.com. It is first &os; - book in Korea, and covers several topics from installation to - Korean environment. 3.5.1-RELEASE/PAO and 4.1-RELEASE in - 3 CDROMs. 788 pages, 26,000 won.Dit is "Over &os;" van Youngjin.com. Het is het eerste &os;-boek + in Korea, en behandelt verschillende onderwerpen van installatie + tot de Koreaanse omgeving. 3.5.1-RELEASE/PAO en 4.1-RELEASE op 3 + CD-ROMs. 788 pagina's, 26.000 won.
        book coverboekomslag - Onno W Purbo, Dodi Maryanto, Syahrial Hubbany, Widjil Widodo: + Onno W Purbo, Dodi Maryanto, Syahrial Hubbany, Widjil Widodo: - Building Internet Server with - &os; (in Indonesia Language), published - by Elex Media Komputindo, - 2000. -
        book cover - The &os; Handbook 1st Edition is a comprehensive &os; - Tutorial and reference. It covers installation, day-to-day use - of &os;, and much more. - - April 2000, BSDi. ISBN 1-57176-241-8 - boekomslagDe 1e editie van het &os; Handboek is een uitvoerige tutorial en + naslagwerk over &os;. Het behandelt de installatie en het alledaagse + gebruik van &os; en nog veel meer. April 2000, BSDi. ISBN + 1-57176-241-8
        book cover - The Complete &os; with CDs, 3rd Ed, &os; 4.2. - Everything you ever wanted to know about how to get - your computer up and running &os;. Includes 4 CDs - containing the &os; operating system! - - Released: November 2000 ISBN: 1-57176-246-9 - boekomslagThe Complete &os; met CD's, 3de 3ditie, &os; 4.2. Alles wat + u altijd al wilde weten over hoe uw computer &os; te laten draaien. + Bevat 4 CD's met het besturingssysteem &os;. Uigegeven: november + 2000, ISBN: 1-57176-246-9
        book cover - The &os; Handbook 2nd Edition is a comprehensive &os; - Tutorial and reference. It covers installation, day-to-day use - of &os;, and much more. - - November 2001, Wind River Systems. ISBN 1-57176-303-1 - boekomslagDe 2e editie van het &os; Handboek is een uitvoerige tutorial en + naslagwerk. Het behandelt de installatie en het dagelijkse gebruik + van &os; en nog veel meer. November 2001, Wind River Systems. + ISBN 1-57176-303-1
        book coverboekomslag - "The &os; Corporate Networker's Guide" Mittelstaedt, Ted. + "The &os; Corporate Networker's Guide" door Ted Mittelstaedt. Addison Wesley, 2000.
        - There are two printings: the first has disk 1 of &os; 4.2, the - second has disk 1 of &os; 4.4. 400 pages. The Japanese translation - was published in 2001.
        - The Networker's Guide covers integration of &os; into typical - corporate networks with special emphasis on interoperation with + Er zijn twee drukken: de eerste heeft disk 1 van &os; 4.2, de + tweede heeft disk 1 van &os; 4.4. 400 pagina's. De Japanse + vertaling werd gepubliceerd in 2001.
        + The Networker's Guide behandel de integratie van &os; in typische + bedrijfsnetwerken met speciale nadruk op de samenwerking met Windows 95/98/ME/NT/2K.
        - - English version: 2000, Addison Wesley. ISBN 0-201-70481-1
        - Japanese version: 2001, Pearson Education Japan. ISBN 4-89471-464-7 -
        book coverboekomslag "&os;, An Open-Source Operating System for Your Personal Computer", Annelise Anderson.
        An introduction to &os; for users new to both &os; and UNIX. @@ -232,12 +220,11 @@ you need to know about installation of the system and third-party software; getting sound, X Window, your network, and printing working; building your own kernel; and upgrading. Second Edition. December 2001, - The Bit Tree Press. ISBN 0-9712045-1-9 -
        Absolute BSD book coverAbsolute BSD boekomslag Absolute BSD. This book discusses management of &os;-based servers in high-performance enterprise environments. @@ -247,7 +234,7 @@
        &os; Open Documentation Library&os; Open Documentation Library Fultus presents &os; Open Documentation Library. This @@ -271,9 +258,9 @@
        - book cover + boekomslag "Building an Internet Server with &os; 6" is a step-by-step guide for helping new and experienced users to &os; install and configure the latest Internet server applications @@ -285,7 +272,7 @@
        book coverboekomslag Written by the professionals of EnderUNIX and Huseyin Yuce this book is the first Turkish &os; book. The book is @@ -310,8 +297,8 @@
        Les cahiers de l'Admin BSD book cover Les cahiers de l'Admin: BSD (the BSD sysadmin notebook), from Emmanuel Dreyfus, covers various &unix; administrative @@ -323,7 +310,7 @@
        The OpenBSD PF Packet Filter Book
        &os; 6 Unleashed
        The &os; 6.0 Book (Traditional Chinese &os; book with 6.0) December 2005, Drmaster. ISBN 9-575-27878-X -
        Utilizare, administrare, configurare
        The RadioBSD Crier: Issue 2007/01: Managing &os; and NetBSD Firewalls
        - The Best of &os; Basics by Dru Lavigne
        @@ -408,14 +391,14 @@

        CDROMs

        For more about recent releases go to &os; release information page. + href="&enbase;/releases/index.html">&os; release information page.

        - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +
        CD coverCD-hoes This is InfoMagic's BSDisc, containing &os; 2.0 and NetBSD 1.0 on a single CD. This is the only example I have which had cover @@ -423,24 +406,24 @@
        CD coverCD-hoes This is the original 4.4 BSD Lite2 release from UC Berkeley, the core technology behind much of &os;.
        CD coverCD-hoes The first of Laser5's "BSD" series. Contains &os;-2.0.5R, NetBSD-1.0, XFree86-3.1.1 and &os;(98) kernel.
        CD coverCD-hoes The second of Laser5's "BSD" series. From this version, the CDs come in a standard jewel box. Contains &os;-2.1R, NetBSD-1.1, @@ -448,24 +431,24 @@
        CD coverCD-hoes This is the Laser5 Japanese edition of the &os; CDROM. It is a 4 CD set.
        CD coverCD-hoes This is the only &os; CD Pacific Hitech produced before merging their product line with that of Walnut Creek CDROM. PHT now also produces the &os;/J (Japanese) CD product.
        CD coverCD-hoes This is the cover disc from the Korean magazine. Note the creative cover art! The @@ -474,8 +457,8 @@
        CD coverCD-hoes This is it - the very first &os; CD published! Both the &os; Project and Walnut Creek CDROM were fairly young back then, @@ -485,8 +468,8 @@
        CD coverCD-hoes This was the second &os; CD published by Walnut Creek CDROM and also the very last on the 1.x branch (ref USL/Novell lawsuit and @@ -496,8 +479,8 @@
        CD coverCD-hoes This unusual CD is something of a collector's item now given that almost all existing examples were systematically tracked down and @@ -509,8 +492,8 @@
        CD coverCD-hoes This is the fixed-up version of the &os; 2.0 CD. Note that the color scheme has even been changed in the corrected version, @@ -519,38 +502,38 @@
        CD coverCD-hoes The &os; 2.0.5 release CD. This was the first CD to feature Tatsumi Hosokawa's daemon artwork.
        CD coverCD-hoes The &os; 2.1 release CD. This was the first CD release on the 2.1 branch (the last being 2.1.7).
        CD coverCD-hoes The &os; 2.1.5 release CD.
        CD coverCD-hoes The &os; 2.1.6 release CD.
        CD coverCD-hoes The Japanese version of 2.1.6. This was the first and last Japanese localized version published by WC, responsibility for that @@ -560,46 +543,46 @@
        CD coverCD-hoes The &os; 2.1.7 release CD. Also the last CD released on the 2.1.x branch. Done primarily as a security fixup for 2.1.6
        CD coverCD-hoes An early release SNAPshot of 2.2 (done before 2.2.1 was released).
        CD coverCD-hoes The &os; 2.2.1 release CD. This was the first CD on the 2.2 branch.
        CD coverCD-hoes The &os; 2.2.2 release CD.
        CD coverCD-hoes The &os; 3.0 snapshot CD.
        CD coverCD-hoes The &os; mailing list and newsgroup archives, turned into HTML and semi-indexed by thread. This product ran for 2 releases and @@ -609,27 +592,27 @@
        CD coverCD-hoes &os; Toolkit: Six disc set of resources to make your &os; experience more enriching.
        CD coverCD-hoes &os; Alpha 4.2 - The full version of the DEC Alpha 64-bit UNIX operating system.
        CD coverCD-hoes &os; 4.2: The full version of the PC 32-bit UNIX operating system.
        CD coverCD-hoes &os; 4.2 CD-ROM. Lehmanns CD-ROM Edition. January 2001, 4 CD-ROMs. Lehmanns Fachbuchhandlung. Germany. @@ -637,14 +620,14 @@
        CD coverCD-hoes &os; 4.3 RELEASE CDROM. April 2001, Wind River Systems. ISBN 1-57176-300-7.
        CD coverCD-hoes &os; Toolkit: Six disc set of resources to make your &os; experience more enriching. @@ -653,7 +636,7 @@
        CD coverCD-hoes &os; 4.4 CD-ROM. Lehmanns CD-ROM Edition. November 2001, 6 CD-ROMs in Jewelcase. @@ -663,14 +646,14 @@
        CD coverCD-hoes &os; 4.4 RELEASE CDROM. Wind River Systems. September 2001. ISBN 1-57176-304-X.
        CD coverCD-hoes &os; 4.5 RELEASE CDROM. February 2002, &os; Mall Inc. ISBN 1-57176-306-6. @@ -685,24 +668,24 @@ - + - + - + - + - + - - - + + + @@ -247,8 +246,8 @@ critical sections to synchronize access instead of a mutex. While malloc(9) is less frequently used in the network stack than uma(9), it is used for socket address data, so is on performance critical - paths for datagram operations. This has been committed and will - appear in 6.0-RELEASE. + paths for datagram operations. This has been committed and appeared + 6.0-RELEASE. @@ -266,11 +265,11 @@ cost of critical sections in the common case by avoiding expensive microcode operations on the CPU. By restoring this model, or a variation on it, critical sections can be made substantially - cheaper to enter. In particular, this change will lower the cost + cheaper to enter. In particular, this change lowers the cost of critical sections on UP such that it is approximately the same cost as a mutex, meaning that optimizations on SMP to use critical sections instead of mutexes will not harm UP performance. This - change has now been committed, and will appear in 6.0-RELEASE. + change has now been committed, and appeared in 6.0-RELEASE. @@ -296,26 +295,41 @@ - - - + + + global lock can be released during in-bound process, and appear + in 8.0-RELEASE./td> - - - + + + + + + + + + + +
        magazine coveromslag van tijdschrift Cover of Korean UNIX magazine, May 1997 issue. Also included &os; 2.2.1 with cover CDs.
        magazine coveromslag van tijdschrift UNIX User Magazine November 1996 issue. Also included &os; 2.1.5 on cover CD.
        magazine coveromslag van tijdschrift This is the "&os; Full Course" special in April 1997's Software Design (published by Gijutsu Hyoron Sha). There are 80 pages of @@ -711,9 +694,9 @@
        magazine coveromslag van tijdschrift Quality @@ -723,8 +706,8 @@
        magazine coveromslag van tijdschrift This is the "BSD magazine" published by ASCII corporation, the world's first publication specialized in BSD. From owner-p4-projects@FreeBSD.ORG Tue Jun 2 21:32:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CEB16106567A; Tue, 2 Jun 2009 21:32:38 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86EE61065675 for ; Tue, 2 Jun 2009 21:32:38 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 727638FC12 for ; Tue, 2 Jun 2009 21:32:38 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n52LWc40016850 for ; Tue, 2 Jun 2009 21:32:38 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52LWVsq016841 for perforce@freebsd.org; Tue, 2 Jun 2009 21:32:31 GMT (envelope-from peter@wemm.org) Date: Tue, 2 Jun 2009 21:32:31 GMT Message-Id: <200906022132.n52LWVsq016841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 163382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 21:32:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=163382 Change 163382 by peter@peter_daintree on 2009/06/02 21:32:11 IFC @163377 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#67 integrate .. //depot/projects/hammer/UPDATING#132 integrate .. //depot/projects/hammer/bin/chflags/chflags.c#9 integrate .. //depot/projects/hammer/bin/cp/Makefile#2 integrate .. //depot/projects/hammer/bin/cp/utils.c#16 integrate .. //depot/projects/hammer/bin/ps/print.c#23 integrate .. //depot/projects/hammer/bin/rm/rm.c#15 integrate .. //depot/projects/hammer/bin/sh/alias.c#8 integrate .. //depot/projects/hammer/bin/sh/eval.c#19 integrate .. //depot/projects/hammer/bin/sh/eval.h#4 integrate .. //depot/projects/hammer/bin/sh/exec.c#11 integrate .. //depot/projects/hammer/bin/sh/histedit.c#7 integrate .. //depot/projects/hammer/bin/sh/main.c#7 integrate .. //depot/projects/hammer/bin/sh/memalloc.c#6 integrate .. //depot/projects/hammer/bin/sh/memalloc.h#4 integrate .. //depot/projects/hammer/bin/sh/miscbltin.c#11 integrate .. //depot/projects/hammer/bin/sh/mkinit.c#4 integrate .. //depot/projects/hammer/bin/sh/mksyntax.c#7 integrate .. //depot/projects/hammer/bin/sh/parser.c#15 integrate .. //depot/projects/hammer/bin/sh/sh.1#31 integrate .. //depot/projects/hammer/bin/sh/trap.c#8 integrate .. //depot/projects/hammer/bin/sh/var.c#15 integrate .. //depot/projects/hammer/bin/test/TEST.sh#3 integrate .. //depot/projects/hammer/bin/test/test.c#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/lockstat/sym.c#1 branch .. //depot/projects/hammer/cddl/usr.sbin/Makefile#7 integrate .. //depot/projects/hammer/cddl/usr.sbin/lockstat/Makefile#1 branch .. //depot/projects/hammer/contrib/bind9/CHANGES#15 integrate .. //depot/projects/hammer/contrib/bind9/COPYRIGHT#8 integrate .. //depot/projects/hammer/contrib/bind9/FAQ#9 integrate .. //depot/projects/hammer/contrib/bind9/FAQ.xml#7 integrate .. //depot/projects/hammer/contrib/bind9/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/bind9/NSEC3-NOTES#1 branch .. //depot/projects/hammer/contrib/bind9/README#10 integrate .. //depot/projects/hammer/contrib/bind9/README.idnkit#2 integrate .. //depot/projects/hammer/contrib/bind9/README.pkcs11#1 branch .. //depot/projects/hammer/contrib/bind9/acconfig.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/check-tool.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkconf.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.8#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/check/named-checkzone.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.1#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.c#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dig.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/dighost.c#9 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.1#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/host.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/include/dig/dig.h#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.1#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dig/nslookup.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#1 branch .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#1 branch .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#1 branch .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#1 branch .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#1 branch .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#1 branch .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#1 branch .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#1 branch .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.8#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-keygen.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.8#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.c#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssec-signzone.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssectool.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/dnssec/dnssectool.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/bind9.xsl#1 branch .. //depot/projects/hammer/contrib/bind9/bin/named/bind9.xsl.h#1 branch .. //depot/projects/hammer/contrib/bind9/bin/named/builtin.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/client.c#11 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/config.c#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/control.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/controlconf.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/convertxsl.pl#1 branch .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/builtin.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/client.h#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/config.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/control.h#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/globals.h#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/interfacemgr.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/listenlist.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/log.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/logconf.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwaddr.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwdclient.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwresd.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/lwsearch.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/main.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/notify.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/ns_smf_globals.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/query.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/server.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/sortlist.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/statschannel.h#1 branch .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/tkeyconf.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/tsigconf.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/types.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/update.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/xfrout.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/include/named/zoneconf.h#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/interfacemgr.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/listenlist.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/log.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/logconf.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwaddr.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdclient.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwderror.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgabn.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgnba.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdgrbn.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwdnoop.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.8#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.c#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwresd.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/lwsearch.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/main.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.8#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.5#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.docbook#9 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.conf.html#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.docbook#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/named.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/notify.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/query.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/server.c#11 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/sortlist.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/statschannel.c#1 branch .. //depot/projects/hammer/contrib/bind9/bin/named/tkeyconf.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/tsigconf.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/include/named/os.h#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/unix/os.c#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/update.c#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/xfrout.c#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/named/zoneconf.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.1#2 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.c#8 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/nsupdate/nsupdate.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/include/rndc/os.h#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.8#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.c#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc-confgen.html#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.8#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.c#9 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.5#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.docbook#5 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.conf.html#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.docbook#6 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/rndc.html#7 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/unix/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/unix/os.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/util.c#3 integrate .. //depot/projects/hammer/contrib/bind9/bin/rndc/util.h#3 integrate .. //depot/projects/hammer/contrib/bind9/config.guess#3 integrate .. //depot/projects/hammer/contrib/bind9/config.h.in#2 integrate .. //depot/projects/hammer/contrib/bind9/configure.in#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM-book.xml#11 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch01.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch02.html#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch03.html#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch04.html#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch05.html#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch06.html#10 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch07.html#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch08.html#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch09.html#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.ch10.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.html#9 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Bv9ARM.pdf#8 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dig.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-keygen.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.dnssec-signzone.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.host.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkconf.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named-checkzone.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.named.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.nsupdate.html#1 branch .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc-confgen.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.conf.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/arm/man.rndc.html#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#3 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/draft/update#2 delete .. //depot/projects/hammer/contrib/bind9/doc/misc/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/format-options.pl#4 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/ipv6#3 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/migration#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/options#6 integrate .. //depot/projects/hammer/contrib/bind9/doc/misc/sort-options.pl#2 integrate .. //depot/projects/hammer/contrib/bind9/doc/rfc/index#6 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1032.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1033.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1034.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1035.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1101.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1122.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1123.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1183.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1348.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1535.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1536.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1537.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1591.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1611.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1612.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1706.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1712.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1750.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1876.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1886.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1982.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1995.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc1996.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2052.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2104.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2119.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2133.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2136.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2137.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2163.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2168.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2181.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2230.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2308.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2317.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2373.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2374.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2375.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2418.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2535.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2536.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2537.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2538.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2539.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2540.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2541.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2553.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2671.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2672.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2673.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2782.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2825.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2826.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2845.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2874.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2915.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2929.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2930.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc2931.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3007.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3008.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3071.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3090.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3110.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3123.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3152.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3197.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3225.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3226.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3258.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3363.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3364.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3425.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3445.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3467.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3490.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3491.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3492.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3493.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3513.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3596.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3597.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3645.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3655.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3658.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3757.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3833.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3845.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc3901.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4025.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4033.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4034.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4035.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4074.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4159.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4193.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4255.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4343.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4367.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4398.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4408.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4431.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4470.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4634.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4641.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4648.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc4701.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc5155.txt#2 delete .. //depot/projects/hammer/contrib/bind9/doc/rfc/rfc952.txt#2 delete .. //depot/projects/hammer/contrib/bind9/isc-config.sh.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind/Makefile.in#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/README#2 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/aclocal.m4#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/api#8 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/Makefile.in#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/daemon.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/ftruncate.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/gettimeofday.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/mktemp.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/putenv.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/readv.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/setenv.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/setitimer.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strcasecmp.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strdup.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strerror.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strpbrk.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strsep.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/strtoul.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/utimes.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/bsd/writev.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/config.h.in#8 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/configure.in#9 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/Makefile.in#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/dst_api.c#8 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/dst_internal.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/hmac_link.c#7 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/md5.h#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/md5_dgst.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/md5_locl.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/dst/support.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/Makefile.in#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/arpa/inet.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/arpa/nameser.h#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/fd_setsize.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/hesiod.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/irp.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/irs.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/assertions.h#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/ctl.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/dst.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/eventlib.h#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/heap.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/irpmarshall.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/list.h#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/logging.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/memcluster.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/misc.h#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/platform.h.in#2 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/isc/tree.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/netdb.h#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/netgroup.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/res_update.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/resolv.h#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/include/resolv_mt.h#2 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/Makefile.in#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_addr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_data.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_lnaof.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_makeaddr.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_net_ntop.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_net_pton.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_neta.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_netof.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_network.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_ntoa.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_ntop.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/inet_pton.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/inet/nsap_addr.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/Makefile.in#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_gr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_ho.c#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_nw.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_p.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_pr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_pw.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/dns_sv.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gai_strerror.c#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_gr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_ho.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_ng.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_nw.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_p.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_pr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_pw.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gen_sv.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getaddrinfo.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getgrent.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getgrent_r.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gethostent.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/gethostent_r.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnameinfo.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetent.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetent_r.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetgrent.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getnetgrent_r.c#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getprotoent.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getprotoent_r.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getpwent.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getpwent_r.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getservent.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/getservent_r.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/hesiod.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/hesiod_p.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_gr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_ho.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_ng.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_nw.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_p.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_pr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_pw.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irp_sv.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irpmarshall.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irs_data.c#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irs_data.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/irs_p.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_gr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_ho.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_ng.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_nw.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_p.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_pr.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_pw.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/lcl_sv.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_gr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_ho.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_ng.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_nw.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_p.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_pr.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_pw.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nis_sv.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/nul_ng.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/pathnames.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/irs/util.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/Makefile.in#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/assertions.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/assertions.mdoc#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/base64.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/bitncmp.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/bitncmp.mdoc#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_clnt.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_p.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_p.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ctl_srvr.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_connects.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_files.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_streams.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_timers.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/ev_waits.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/eventlib.c#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/eventlib.mdoc#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/eventlib_p.h#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/heap.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/heap.mdoc#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/hex.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/logging.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/logging.mdoc#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/logging_p.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/memcluster.c#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/memcluster.mdoc#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/movefile.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/tree.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/isc/tree.mdoc#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/make/includes.in#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/make/mkdep.in#2 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/make/rules.in#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/mkinstalldirs#2 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/Makefile.in#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_date.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_name.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_netint.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_parse.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_print.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_samedomain.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_sign.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_ttl.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/nameser/ns_verify.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/port/Makefile.in#2 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/port/freebsd/Makefile.in#2 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/port_after.h.in#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/port_before.h.in#7 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/Makefile.in#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/herror.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/mtctxres.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_comp.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_data.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_debug.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_debug.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_findzonecut.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_init.c#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_mkquery.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_mkupdate.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_mkupdate.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_private.h#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_query.c#4 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_send.c#6 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_sendsigned.c#5 delete .. //depot/projects/hammer/contrib/bind9/lib/bind/resolv/res_update.c#3 delete .. //depot/projects/hammer/contrib/bind9/lib/bind9/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/api#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/check.c#10 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/getaddresses.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/check.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/include/bind9/version.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/bind9/version.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/acache.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/acl.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/adb.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#12 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/byaddr.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/cache.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/callbacks.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/compress.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/db.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dbiterator.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dbtable.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/diff.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dispatch.c#9 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dlz.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dnssec.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/ds.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_api.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_internal.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_lib.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_openssl.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_parse.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/dst_result.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/forward.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/gen-unix.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/gen.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/gssapi_link.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/gssapictx.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/hmac_link.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/acache.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/acl.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/adb.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/bit.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/byaddr.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/cache.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/callbacks.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/cert.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/compress.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/db.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dbiterator.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dbtable.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/diff.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dispatch.h#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dlz.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/dnssec.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ds.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/events.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/fixedname.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/forward.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/iptable.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/journal.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keyflags.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keytable.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/keyvalues.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/lib.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/log.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/lookup.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/master.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/masterdump.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/message.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/name.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ncache.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/nsec.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/nsec3.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/opcode.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/order.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/peer.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/portlist.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rbt.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rcode.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdata.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataclass.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdatalist.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataset.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdataslab.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rdatatype.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/request.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/resolver.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/result.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/rootns.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/sdb.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/sdlz.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/secalg.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/secproto.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/soa.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ssu.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/stats.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tcpmsg.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/time.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/timer.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tkey.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/tsig.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/ttl.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/types.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/validator.h#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/version.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/view.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/xfrin.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zone.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zonekey.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dns/zt.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/dst.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/gssapi.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/lib.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/include/dst/result.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/iptable.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/journal.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/key.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/keytable.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/lib.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/log.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/lookup.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/master.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/masterdump.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/message.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/name.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/ncache.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/nsec.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/nsec3.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/openssl_link.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssldh_link.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssldsa_link.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/opensslrsa_link.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/order.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/peer.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/portlist.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbt.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb64.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rbtdb64.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rcode.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cert_37.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cert_37.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cname_5.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/cname_5.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dname_39.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dname_39.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ds_43.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ds_43.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/key_25.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/key_25.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/loc_29.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/loc_29.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mb_7.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mb_7.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/md_3.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/md_3.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mf_4.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mf_4.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mg_8.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mg_8.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mr_9.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mr_9.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mx_15.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/mx_15.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ns_2.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ns_2.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/null_10.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/null_10.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/opt_41.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/opt_41.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/proforma.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/proforma.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rp_17.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rp_17.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rt_21.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/rt_21.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sig_24.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sig_24.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/soa_6.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/soa_6.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/spf_99.c#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/spf_99.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/txt_16.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/txt_16.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/x25_19.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/generic/x25_19.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a_1.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/a_1.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/px_26.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/px_26.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/rdatastructpre.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdatalist.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdatalist_p.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdataset.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdatasetiter.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rdataslab.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/request.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/resolver.c#12 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/result.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/rootns.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/sdb.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/sdlz.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/soa.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/spnego.asn1#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/spnego.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/spnego.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/spnego_asn1.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/spnego_asn1.pl#1 branch .. //depot/projects/hammer/contrib/bind9/lib/dns/ssu.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/stats.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tcpmsg.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/time.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/timer.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tkey.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/tsig.c#7 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/ttl.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/validator.c#10 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/version.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/view.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/xfrin.c#9 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zone.c#8 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zonekey.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/zt.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/Makefile.in#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/api#9 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/assertions.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/base32.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/base64.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/bitstring.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/buffer.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/bufferlist.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/commandline.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/entropy.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/error.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/event.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/fsaccess.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hash.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/heap.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hex.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hmacmd5.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/hmacsha.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/httpd.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/app.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/assertions.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/base32.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/base64.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/bitstring.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/boolean.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/buffer.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/bufferlist.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/commandline.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/entropy.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/error.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/event.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/eventclass.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/file.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/formatcheck.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/fsaccess.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hash.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/heap.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hex.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hmacmd5.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/hmacsha.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/httpd.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/interfaceiter.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ipv6.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/iterated_hash.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lang.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lex.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lfsr.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/lib.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/list.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/log.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/magic.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/md5.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/mem.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/msgcat.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/msgs.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/mutexblock.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/netaddr.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/netscope.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ondestroy.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/os.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/parseint.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/platform.h.in#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/portset.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/print.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/quota.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/radix.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/random.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/ratelimiter.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/refcount.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/region.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resource.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/result.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/resultclass.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/rwlock.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/serial.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sha1.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sha2.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/sockaddr.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/socket.h#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/stats.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/stdio.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/stdlib.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/string.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/symtab.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/task.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/taskpool.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/timer.h#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/types.h#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/util.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/version.h#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/include/isc/xml.h#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/inet_aton.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/inet_ntop.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/inet_pton.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/iterated_hash.c#1 branch .. //depot/projects/hammer/contrib/bind9/lib/isc/lex.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/lfsr.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/lib.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/log.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/md5.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mem.c#6 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mips/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mips/include/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mips/include/isc/atomic.h#2 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/mutexblock.c#3 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/netaddr.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Jun 2 21:33:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DF2010656E2; Tue, 2 Jun 2009 21:33:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC8CC10656F7 for ; Tue, 2 Jun 2009 21:33:39 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9DEF28FC21 for ; Tue, 2 Jun 2009 21:33:39 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n52LXdJR017020 for ; Tue, 2 Jun 2009 21:33:39 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52LXdGN017018 for perforce@freebsd.org; Tue, 2 Jun 2009 21:33:39 GMT (envelope-from peter@wemm.org) Date: Tue, 2 Jun 2009 21:33:39 GMT Message-Id: <200906022133.n52LXdGN017018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 163383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 21:33:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=163383 Change 163383 by peter@peter_daintree on 2009/06/02 21:33:37 IFC @163382 Affected files ... .. //depot/projects/hammer/sys/dev/ath/if_ath.c#71 integrate Differences ... ==== //depot/projects/hammer/sys/dev/ath/if_ath.c#71 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.255 2009/06/02 21:13:57 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.256 2009/06/02 21:17:56 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -1710,7 +1710,6 @@ DPRINTF(sc, ATH_DEBUG_XMIT, "%s: %s\n", __func__, STAILQ_FIRST(&sc->sc_txbuf) == NULL ? "out of xmit buffers" : "xmit buffer busy"); - sc->sc_stats.ast_tx_nobuf++; } return bf; } @@ -6832,55 +6831,60 @@ struct ifnet *ifp = ic->ic_ifp; struct ath_softc *sc = ifp->if_softc; struct ath_buf *bf; + int error; if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 || sc->sc_invalid) { DPRINTF(sc, ATH_DEBUG_XMIT, "%s: discard frame, %s", __func__, (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0 ? "!running" : "invalid"); - sc->sc_stats.ast_tx_raw_fail++; - ieee80211_free_node(ni); m_freem(m); - return ENETDOWN; + error = ENETDOWN; + goto bad; } /* * Grab a TX buffer and associated resources. */ bf = ath_getbuf(sc); if (bf == NULL) { - /* NB: ath_getbuf handles stat+msg */ - ieee80211_free_node(ni); + sc->sc_stats.ast_tx_nobuf++; m_freem(m); - return ENOBUFS; + error = ENOBUFS; + goto bad; } - ifp->if_opackets++; - sc->sc_stats.ast_tx_raw++; - if (params == NULL) { /* * Legacy path; interpret frame contents to decide * precisely how to send the frame. */ - if (ath_tx_start(sc, ni, bf, m)) - goto bad; + if (ath_tx_start(sc, ni, bf, m)) { + error = EIO; /* XXX */ + goto bad2; + } } else { /* * Caller supplied explicit parameters to use in * sending the frame. */ - if (ath_tx_raw_start(sc, ni, bf, m, params)) - goto bad; + if (ath_tx_raw_start(sc, ni, bf, m, params)) { + error = EIO; /* XXX */ + goto bad2; + } } sc->sc_wd_timer = 5; + ifp->if_opackets++; + sc->sc_stats.ast_tx_raw++; return 0; -bad: - ifp->if_oerrors++; +bad2: ATH_TXBUF_LOCK(sc); STAILQ_INSERT_HEAD(&sc->sc_txbuf, bf, bf_list); ATH_TXBUF_UNLOCK(sc); +bad: + ifp->if_oerrors++; + sc->sc_stats.ast_tx_raw_fail++; ieee80211_free_node(ni); - return EIO; /* XXX */ + return error; } /* From owner-p4-projects@FreeBSD.ORG Tue Jun 2 21:57:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0097C1065673; Tue, 2 Jun 2009 21:57: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 AF0B3106566C for ; Tue, 2 Jun 2009 21:57:03 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9C30A8FC08 for ; Tue, 2 Jun 2009 21:57:03 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n52Lv38F019122 for ; Tue, 2 Jun 2009 21:57:03 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52Lv3eV019120 for perforce@freebsd.org; Tue, 2 Jun 2009 21:57:03 GMT (envelope-from anchie@FreeBSD.org) Date: Tue, 2 Jun 2009 21:57:03 GMT Message-Id: <200906022157.n52Lv3eV019120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163384 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 21:57:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=163384 Change 163384 by anchie@anchie_malimis on 2009/06/02 21:57:01 Preparations for hooks that are function pointers seeded when loading the send module. Changed ordering of new ICMP6 types the header file. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/modules/send/Makefile#1 add .. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#3 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#1 add .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#1 add Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#3 (text+ko) ==== @@ -117,9 +117,6 @@ #define ND_NEIGHBOR_ADVERT 136 /* neighbor advertisement */ #define ND_REDIRECT 137 /* redirect */ -#define SEND_CERT_PATH_SOLICIT 148 /* cert path solicitation */ -#define SEND_CERT_PATH_ADVERT 149 /* cert_path advertisement */ - #define ICMP6_ROUTER_RENUMBERING 138 /* router renumbering */ #define ICMP6_WRUREQUEST 139 /* who are you request */ @@ -130,6 +127,9 @@ #define ICMP6_NI_REPLY 140 /* node information reply */ #define MLDV2_LISTENER_REPORT 143 /* RFC3810 listener report */ +#define SEND_CERT_PATH_SOLICIT 148 /* cert path solicitation */ +#define SEND_CERT_PATH_ADVERT 149 /* cert path advertisement */ + /* The definitions below are experimental. TBA */ #define MLD_MTRACE_RESP 200 /* mtrace resp (to sender) */ #define MLD_MTRACE 201 /* mtrace messages */ From owner-p4-projects@FreeBSD.ORG Tue Jun 2 22:05:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6202310657A3; Tue, 2 Jun 2009 22:05:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1F030106579F for ; Tue, 2 Jun 2009 22:05:12 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CC908FC35 for ; Tue, 2 Jun 2009 22:05:12 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n52M5Bdx020666 for ; Tue, 2 Jun 2009 22:05:11 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52M5BM3020664 for perforce@freebsd.org; Tue, 2 Jun 2009 22:05:11 GMT (envelope-from anchie@FreeBSD.org) Date: Tue, 2 Jun 2009 22:05:11 GMT Message-Id: <200906022205.n52M5BM3020664@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163385 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 22:05:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=163385 Change 163385 by anchie@anchie_malimis on 2009/06/02 22:04:34 Preparations for hooks that are function pointers seeded when loading the send module. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#2 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#4 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#2 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#2 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#2 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#4 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#2 (text+ko) ==== ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Jun 2 23:31:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C37DD1065673; Tue, 2 Jun 2009 23:31:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B8211065670 for ; Tue, 2 Jun 2009 23:31:40 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F1398FC14 for ; Tue, 2 Jun 2009 23:31:40 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n52NVeuE028466 for ; Tue, 2 Jun 2009 23:31:40 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n52NVerG028464 for perforce@freebsd.org; Tue, 2 Jun 2009 23:31:40 GMT (envelope-from anchie@FreeBSD.org) Date: Tue, 2 Jun 2009 23:31:40 GMT Message-Id: <200906022331.n52NVerG028464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Jun 2009 23:31:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=163388 Change 163388 by anchie@anchie_malimis on 2009/06/02 23:31:20 Cosmetic changes. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/modules/Makefile#3 delete .. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#5 delete .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#3 delete .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 3 01:18:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5038C1065674; Wed, 3 Jun 2009 01:18: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 0E8A3106566C; Wed, 3 Jun 2009 01:18:14 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: from qw-out-2122.google.com (qw-out-2122.google.com [74.125.92.26]) by mx1.freebsd.org (Postfix) with ESMTP id 9CD938FC1A; Wed, 3 Jun 2009 01:18:13 +0000 (UTC) (envelope-from kabaev@gmail.com) Received: by qw-out-2122.google.com with SMTP id 3so4694250qwe.7 for ; Tue, 02 Jun 2009 18:18:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:in-reply-to:references:x-mailer:mime-version :content-type; bh=WtKDn5NzBiU+w6H+rI2ulJGS6NEFsJ6bms2yXeSEBMI=; b=ZueMNchLc9yiLO6qryamaz2mUqRugOIwkqMTQk6hRBte7qMXtY6qeuWKfciXUNzK6N Ix0S3+OIC0Avo0olyUqStuotE+F8b0aNDhRwggcEhFrcG8Hj+PF2FN/RrSd3OwqizTha 39RIodYKhmvAs4THdMhjPL2r6l0Jsdi+wrtVc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type; b=erZ7MjAr7pFJTgqJ3Hgmlin1SJGrEh+pkBAtFl9RB1WFx7f/O5f48wMPNrg0xxkySv ZEjts2SE+b+k/dw4x9h3WVvhC9u2zGqvXg0c/j8U555+LVQR0mZRlLIUHdNIq+3zKVUI +EuFuHn75l3UlGlBuZMGAGDReSH7fTrJ9Yjyc= Received: by 10.224.2.130 with SMTP id 2mr351296qaj.298.1243990176202; Tue, 02 Jun 2009 17:49:36 -0700 (PDT) Received: from kan.dnsalias.net (c-98-217-224-113.hsd1.ma.comcast.net [98.217.224.113]) by mx.google.com with ESMTPS id 7sm282643qwf.45.2009.06.02.17.49.34 (version=SSLv3 cipher=RC4-MD5); Tue, 02 Jun 2009 17:49:34 -0700 (PDT) Date: Tue, 2 Jun 2009 20:49:27 -0400 From: Alexander Kabaev To: Fang Wang Message-ID: <20090602204927.22f0e224@kan.dnsalias.net> In-Reply-To: <200906021409.n52E9quv048160@repoman.freebsd.org> References: <200906021409.n52E9quv048160@repoman.freebsd.org> X-Mailer: Claws Mail 3.7.1 (GTK+ 2.16.1; i386-portbld-freebsd8.0) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/3gXBAiAw7DQ6ISvXJvUgUj."; protocol="application/pgp-signature" Cc: Perforce Change Reviews Subject: Re: PERFORCE change 163352 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 01:18:15 -0000 --Sig_/3gXBAiAw7DQ6ISvXJvUgUj. Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 2 Jun 2009 14:09:52 GMT Fang Wang wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D163352 >=20 > Change 163352 by fangwang@fangwang_utobsd on 2009/06/02 14:09:16 >=20 > Add uto variables in struct tcpopt. >=20 > Affected files ... >=20 > .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#3 edit >=20 > Differences ... >=20 > =3D=3D=3D=3D //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#3 > (text+ko) =3D=3D=3D=3D >=20 > @@ -282,6 +282,8 @@ > u_int8_t to_nsacks; /* number of SACK blocks */ > u_char *to_sacks; /* pointer to the > first SACK blocks */ u_char *to_signature; /* > pointer to the TCP-MD5 signature */ > + u_int16_t to_uto:15; /* user timeout */ > + u_int16_t to_granularity:1; /* user timeout granularity */ > }; > =20 > /* This commit is using wrong whitespace. This needs to be fixed if code is meant to make it to official sources any time in the future. --=20 Alexander Kabaev --Sig_/3gXBAiAw7DQ6ISvXJvUgUj. Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (FreeBSD) iD8DBQFKJcicQ6z1jMm+XZYRAijCAKCct4Lh8ShysxYESp9NG99qu1vTJACfZl1b oMOUe2zF3itGdRnaxtooiAQ= =Qwyh -----END PGP SIGNATURE----- --Sig_/3gXBAiAw7DQ6ISvXJvUgUj.-- From owner-p4-projects@FreeBSD.ORG Wed Jun 3 01:46:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF6AD1065672; Wed, 3 Jun 2009 01:46: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 9F956106564A for ; Wed, 3 Jun 2009 01:46:58 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 73D468FC15 for ; Wed, 3 Jun 2009 01:46:58 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n531kwaN053385 for ; Wed, 3 Jun 2009 01:46:58 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n531kwFc053383 for perforce@freebsd.org; Wed, 3 Jun 2009 01:46:58 GMT (envelope-from anchie@FreeBSD.org) Date: Wed, 3 Jun 2009 01:46:58 GMT Message-Id: <200906030146.n531kwFc053383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163390 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 01:47:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=163390 Change 163390 by anchie@anchie_malimis on 2009/06/03 01:46:28 Fixing repository (#1). Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet/icmp6.h#6 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 3 01:53:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 00B321065673; Wed, 3 Jun 2009 01:53: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 AFB481065670 for ; Wed, 3 Jun 2009 01:53:04 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 83F928FC22 for ; Wed, 3 Jun 2009 01:53:04 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n531r4k8053879 for ; Wed, 3 Jun 2009 01:53:04 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n531r416053876 for perforce@freebsd.org; Wed, 3 Jun 2009 01:53:04 GMT (envelope-from anchie@FreeBSD.org) Date: Wed, 3 Jun 2009 01:53:04 GMT Message-Id: <200906030153.n531r416053876@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 01:53:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=163391 Change 163391 by anchie@anchie_malimis on 2009/06/03 01:52:55 Fixing repository (#2). Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#4 add .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#4 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 3 02:03:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 98526106566C; Wed, 3 Jun 2009 02:03:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58487106564A for ; Wed, 3 Jun 2009 02:03:16 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 46A358FC15 for ; Wed, 3 Jun 2009 02:03:16 +0000 (UTC) (envelope-from anchie@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5323EbI055576 for ; Wed, 3 Jun 2009 02:03:14 GMT (envelope-from anchie@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5323E5O055574 for perforce@freebsd.org; Wed, 3 Jun 2009 02:03:14 GMT (envelope-from anchie@FreeBSD.org) Date: Wed, 3 Jun 2009 02:03:14 GMT Message-Id: <200906030203.n5323E5O055574@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to anchie@FreeBSD.org using -f From: Ana Kukec To: Perforce Change Reviews Cc: Subject: PERFORCE change 163392 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 02:03:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=163392 Change 163392 by anchie@anchie_malimis on 2009/06/03 02:02:35 Initial introduction of hooks mechanism based on send module. Affected files ... .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#3 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#5 edit .. //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#5 edit Differences ... ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/icmp6.c#3 (text+ko) ==== @@ -763,6 +763,8 @@ /* give up local */ /* send incoming SeND-protected/ND packet to sendd */ + if (send_input_hook != NULL) + send_input_hook(); nd6_rs_input(m, off, icmp6len); m = NULL; ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.c#5 (text+ko) ==== @@ -1,1 +1,45 @@ /* send module */ + +#include +#include +#include +#include + +#include + +static int X_send_input_hook(void); + +static int +X_send_input_hook(void) +{ + return 0; +} + +static int +send_modevent(module_t mod, int type, void *unused) +{ + int err = 0; + + switch (type) { + case MOD_LOAD: + send_input_hook = X_send_input_hook; + break; + + case MOD_UNLOAD: + send_input_hook = NULL; + break; + + default: + break; + } + return err; +} + +static moduledata_t sendmod = { + "send", + send_modevent, + 0 +}; + +DECLARE_MODULE(send, sendmod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); + ==== //depot/projects/soc2009/anchie_send/src/sys/netinet6/send.h#5 (text+ko) ==== @@ -1,1 +1,2 @@ /* send.c */ +int (*send_input_hook)(void); From owner-p4-projects@FreeBSD.ORG Wed Jun 3 03:57:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB8711065678; Wed, 3 Jun 2009 03:57:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F3DF106564A for ; Wed, 3 Jun 2009 03:57:11 +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 4CEB78FC1B for ; Wed, 3 Jun 2009 03:57:11 +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 n533vAbA068413 for ; Wed, 3 Jun 2009 03:57:10 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n533vApG068411 for perforce@freebsd.org; Wed, 3 Jun 2009 03:57:10 GMT (envelope-from dforsyth@FreeBSD.org) Date: Wed, 3 Jun 2009 03:57:10 GMT Message-Id: <200906030357.n533vApG068411@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 163393 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 03:57:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=163393 Change 163393 by dforsyth@squirrel on 2009/06/03 03:57:00 Moved things around, made a mess. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/Makefile#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/info/Makefile#2 delete .. //depot/projects/soc2009/dforsyth_libpkg/info/main.c#4 delete .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#5 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#5 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.c#5 delete .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_info.h#3 delete .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#6 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info/Makefile#1 add .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#1 add Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/Makefile#2 (text+ko) ==== @@ -1,2 +1,2 @@ -SUBDIR= libpkg info +SUBDIR= libpkg pkg_info .include ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#5 (text+ko) ==== @@ -4,6 +4,7 @@ #include "pkg_util.h" #include "pkgdb.h" +#include "pkg_private.h" #include "pkg.h" @@ -64,7 +65,7 @@ } struct pkg * -pkg_set_pkg_info(struct pkg *p, struct pkg_info *pi) +pkg_set_pkg_contents(struct pkg *p, struct pkg_contents *pc) { return (p); } ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#5 (text+ko) ==== @@ -6,11 +6,15 @@ struct pkg; struct pkg *pkg_new(const char *ident); + struct pkg *pkg_set_path(struct pkg *p, const char *path); + struct pkg *pkg_set_comment(struct pkg *p, const char *comment); char *pkg_ident(struct pkg *p); + char *pkg_name(struct pkg *p); + char *pkg_comment(struct pkg *p); void pkg_free(struct pkg *p); @@ -19,30 +23,24 @@ struct pkgdb; -struct pkgdb *pkgdb_new_hierdb(const char *db_root); +struct pkgdb *pkgdb_read_db_hierdb(const char *db_root); + +int pkgdb_refresh_db_hierdb(struct pkgdb *db); -int pkgdb_init_hierdb(struct pkgdb *db); struct pkg *pkgdb_read_pkg_hierdb(struct pkgdb *db, const char *ident); + struct pkg *pkgdb_next_pkg(struct pkgdb *db); struct pkg *pkgdb_query_pkg(struct pkgdb *db, const char *ident); char *pkgdb_pkg_path(struct pkgdb *db, struct pkg *p); -void pkgdb_pkg_list_init(struct pkgdb *db); -struct pkg *pkgdb_pkg_list_first(struct pkgdb *db); -void pkgdb_pkg_list_append(struct pkgdb *db, struct pkg *p); - -char *pkgdb_read_file_to_text(struct pkgdb *db, struct pkg *p, - const char *filename); - void pkgdb_free_hierdb(struct pkgdb *db); -void pkgdb_free_pkg_list(struct pkgdb *db); -/* pkg_info */ +/* pkg_contents */ -struct pkg_info; +struct pkg_contents; -struct pkg_info *pkg_info_parse_info_from_text(const char *text); +struct pkg_contents *pkg_contents_read_info_from_text(const char *text); #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#6 (text+ko) ==== @@ -10,8 +10,9 @@ #include #include "pkg_util.h" -#include "pkg_info.h" +#include "pkg_contents.h" #include "pkgdb.h" +#include "pkg_private.h" #include "pkg.h" /* Everything in here is written with the current database setup in mind. @@ -23,7 +24,7 @@ /* Allocate and create a new hierdb. */ struct pkgdb * -pkgdb_new_hierdb(const char *db_root) +pkgdb_read_db_hierdb(const char *db_root) { int s; struct stat sb; @@ -60,7 +61,7 @@ * number of subdirectories in the database. */ int -pkgdb_init_hierdb(struct pkgdb *db) +pkgdb_refresh_db_hierdb(struct pkgdb *db) { int i; int p_count; @@ -146,12 +147,13 @@ Need to add callbacks before I do this. } */ - +/* struct pkg * pkgdb_query_pkg_hierdb(struct pkgdb *db, const char *ident) { return (NULL); } +*/ char * pkgdb_pkg_path(struct pkgdb *db, struct pkg *p) From owner-p4-projects@FreeBSD.ORG Wed Jun 3 03:58:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAE431065672; Wed, 3 Jun 2009 03:58:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6B011106566B for ; Wed, 3 Jun 2009 03:58:12 +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 3F64E8FC2A for ; Wed, 3 Jun 2009 03:58:12 +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 n533wC6Z068480 for ; Wed, 3 Jun 2009 03:58:12 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n533wCC4068478 for perforce@freebsd.org; Wed, 3 Jun 2009 03:58:12 GMT (envelope-from dforsyth@FreeBSD.org) Date: Wed, 3 Jun 2009 03:58:12 GMT Message-Id: <200906030358.n533wCC4068478@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 163395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 03:58:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=163395 Change 163395 by dforsyth@squirrel on 2009/06/03 03:57:27 Forgot these... Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_contents.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_contents.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 3 03:58:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02153106572E; Wed, 3 Jun 2009 03:58: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 A01A4106566C for ; Wed, 3 Jun 2009 03:58:12 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8D9548FC2B for ; Wed, 3 Jun 2009 03:58:12 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n533wC8k068485 for ; Wed, 3 Jun 2009 03:58:12 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n533wCc0068483 for perforce@freebsd.org; Wed, 3 Jun 2009 03:58:12 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 3 Jun 2009 03:58:12 GMT Message-Id: <200906030358.n533wCc0068483@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 163396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 03:58:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=163396 Change 163396 by thompsa@thompsa_burger on 2009/06/03 03:57:28 Checkpoint WIP. Not much more than variable renames. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.h#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_controller.h#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.h#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.h#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.h#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.h#6 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#7 (text+ko) ==== @@ -70,7 +70,7 @@ ((uint8_t *)&(((ehci_softc_t *)0)->sc_bus)))) #if USB_DEBUG -static int ehcidebug = 0; +static int ehcidebug = 100; static int ehcinohighspeed = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci"); @@ -94,8 +94,8 @@ extern struct usb_pipe_methods ehci_device_isoc_hs_methods; static void ehci_do_poll(struct usb_bus *bus); -static void ehci_device_done(struct usb_xfer *xfer, usb_error_t error); -static uint8_t ehci_check_transfer(struct usb_xfer *xfer); +static void ehci_device_done(struct usb_urb *urb, usb_error_t error); +static uint8_t ehci_check_transfer(struct usb_urb *urb); static void ehci_timeout(void *arg); static void ehci_root_intr(ehci_softc_t *sc); @@ -952,18 +952,20 @@ #endif static void -ehci_transfer_intr_enqueue(struct usb_xfer *xfer) +ehci_transfer_intr_enqueue(struct usb_urb *urb) { + struct usb_pipe *pipe = urb->ub_pipe; + /* check for early completion */ - if (ehci_check_transfer(xfer)) { + if (ehci_check_transfer(urb)) { return; } /* put transfer on interrupt queue */ - usb2_transfer_enqueue(&xfer->xroot->bus->intr_q, xfer); + usb2_transfer_enqueue(&pipe->xroot->bus->intr_q, urb); /* start timeout, if any */ - if (xfer->timeout != 0) { - usb2_transfer_timeout_ms(xfer, &ehci_timeout, xfer->timeout); + if (urb->timeout != 0) { + usb2_transfer_timeout_ms(urb, &ehci_timeout, urb->timeout); } } @@ -1121,19 +1123,20 @@ } static usb_error_t -ehci_non_isoc_done_sub(struct usb_xfer *xfer) +ehci_non_isoc_done_sub(struct usb_urb *urb) { - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + ehci_softc_t *sc = EHCI_BUS2SC(urb->ub_pipe->bus); + struct usb_pipe *pipe = urb->ub_pipe; ehci_qtd_t *td; ehci_qtd_t *td_alt_next; uint32_t status; uint16_t len; - td = xfer->td_transfer_cache; + td = urb->td_transfer_cache; td_alt_next = td->alt_next; - if (xfer->aframes != xfer->nframes) { - xfer->frlengths[xfer->aframes] = 0; + if (urb->aframes != urb->nframes) { + urb->frlengths[urb->aframes] = 0; } while (1) { @@ -1151,11 +1154,11 @@ DPRINTF("Invalid status length, " "0x%04x/0x%04x bytes\n", len, td->len); status |= EHCI_QTD_HALTED; - } else if (xfer->aframes != xfer->nframes) { - xfer->frlengths[xfer->aframes] += td->len - len; + } else if (urb->aframes != urb->nframes) { + urb->frlengths[urb->aframes] += td->len - len; } /* Check for last transfer */ - if (((void *)td) == xfer->td_transfer_last) { + if (((void *)td) == urb->td_transfer_last) { td = NULL; break; } @@ -1167,7 +1170,7 @@ } /* Check for short transfer */ if (len > 0) { - if (xfer->flags_int.short_frames_ok) { + if (urb->flags_int.short_frames_ok) { /* follow alt next */ td = td->alt_next; } else { @@ -1186,18 +1189,18 @@ /* update transfer cache */ - xfer->td_transfer_cache = td; + urb->td_transfer_cache = td; /* update data toggle */ - xfer->endpoint->toggle_next = + pipe->endpoint->toggle_next = (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0; #if USB_DEBUG if (status & EHCI_QTD_STATERRS) { DPRINTFN(11, "error, addr=%d, endpt=0x%02x, frame=0x%02x" "status=%s%s%s%s%s%s%s%s\n", - xfer->address, xfer->endpointno, xfer->aframes, + pipe->address, pipe->endpointno, urb->aframes, (status & EHCI_QTD_ACTIVE) ? "[ACTIVE]" : "[NOT_ACTIVE]", (status & EHCI_QTD_HALTED) ? "[HALTED]" : "", (status & EHCI_QTD_BUFERR) ? "[BUFERR]" : "", @@ -1214,54 +1217,55 @@ } static void -ehci_non_isoc_done(struct usb_xfer *xfer) +ehci_non_isoc_done(struct usb_urb *urb) { + struct usb_pipe *pipe = urb->ub_pipe; usb_error_t err = 0; - DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", - xfer, xfer->endpoint); + DPRINTFN(13, "urb=%p endpoint=%p transfer done\n", + urb, pipe->endpoint); #if USB_DEBUG if (ehcidebug > 10) { - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); - ehci_dump_sqtds(sc, xfer->td_transfer_first); + ehci_dump_sqtds(sc, urb->td_transfer_first); } #endif /* reset scanner */ - xfer->td_transfer_cache = xfer->td_transfer_first; + urb->td_transfer_cache = urb->td_transfer_first; - if (xfer->flags_int.control_xfr) { + if (urb->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { + if (urb->flags_int.control_hdr) { - err = ehci_non_isoc_done_sub(xfer); + err = ehci_non_isoc_done_sub(urb); } - xfer->aframes = 1; + urb->aframes = 1; - if (xfer->td_transfer_cache == NULL) { + if (urb->td_transfer_cache == NULL) { goto done; } } - while (xfer->aframes != xfer->nframes) { + while (urb->aframes != urb->nframes) { - err = ehci_non_isoc_done_sub(xfer); - xfer->aframes++; + err = ehci_non_isoc_done_sub(urb); + urb->aframes++; - if (xfer->td_transfer_cache == NULL) { + if (urb->td_transfer_cache == NULL) { goto done; } } - if (xfer->flags_int.control_xfr && - !xfer->flags_int.control_act) { + if (urb->flags_int.control_xfr && + !urb->flags_int.control_act) { - err = ehci_non_isoc_done_sub(xfer); + err = ehci_non_isoc_done_sub(urb); } done: - ehci_device_done(xfer, err); + ehci_device_done(urb, err); } /*------------------------------------------------------------------------* @@ -1272,32 +1276,33 @@ * Else: USB transfer is finished *------------------------------------------------------------------------*/ static uint8_t -ehci_check_transfer(struct usb_xfer *xfer) +ehci_check_transfer(struct usb_urb *urb) { - struct usb_pipe_methods *methods = xfer->endpoint->methods; - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + struct usb_pipe *pipe = urb->ub_pipe; + struct usb_pipe_methods *methods = pipe->endpoint->methods; + ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); uint32_t status; - DPRINTFN(13, "xfer=%p checking transfer\n", xfer); + DPRINTFN(13, "urb=%p checking transfer\n", urb); if (methods == &ehci_device_isoc_fs_methods) { ehci_sitd_t *td; /* isochronous full speed transfer */ - td = xfer->td_transfer_last; + td = urb->td_transfer_last; usb2_pc_cpu_invalidate(td->page_cache); status = hc32toh(sc, td->sitd_status); /* also check if first is complete */ - td = xfer->td_transfer_first; + td = urb->td_transfer_first; usb2_pc_cpu_invalidate(td->page_cache); status |= hc32toh(sc, td->sitd_status); if (!(status & EHCI_SITD_ACTIVE)) { - ehci_device_done(xfer, USB_ERR_NORMAL_COMPLETION); + ehci_device_done(urb, USB_ERR_NORMAL_COMPLETION); goto transferred; } } else if (methods == &ehci_device_isoc_hs_methods) { @@ -1305,7 +1310,7 @@ /* isochronous high speed transfer */ - td = xfer->td_transfer_last; + td = urb->td_transfer_last; usb2_pc_cpu_invalidate(td->page_cache); status = td->itd_status[0] | td->itd_status[1] | @@ -1314,7 +1319,7 @@ td->itd_status[6] | td->itd_status[7]; /* also check first transfer */ - td = xfer->td_transfer_first; + td = urb->td_transfer_first; usb2_pc_cpu_invalidate(td->page_cache); status |= td->itd_status[0] | td->itd_status[1] | @@ -1324,7 +1329,7 @@ /* if no transactions are active we continue */ if (!(status & htohc32(sc, EHCI_ITD_ACTIVE))) { - ehci_device_done(xfer, USB_ERR_NORMAL_COMPLETION); + ehci_device_done(urb, USB_ERR_NORMAL_COMPLETION); goto transferred; } } else { @@ -1336,7 +1341,7 @@ * check whether there is an error somewhere in the middle, * or whether there was a short packet (SPD and not ACTIVE) */ - td = xfer->td_transfer_cache; + td = urb->td_transfer_cache; while (1) { usb2_pc_cpu_invalidate(td->page_cache); @@ -1347,13 +1352,13 @@ */ if (status & EHCI_QTD_ACTIVE) { /* update cache */ - xfer->td_transfer_cache = td; + urb->td_transfer_cache = td; goto done; } /* * last transfer descriptor makes the transfer done */ - if (((void *)td) == xfer->td_transfer_last) { + if (((void *)td) == urb->td_transfer_last) { break; } /* @@ -1367,7 +1372,7 @@ * packet also makes the transfer done */ if (EHCI_QTD_GET_BYTES(status)) { - if (xfer->flags_int.short_frames_ok) { + if (urb->flags_int.short_frames_ok) { /* follow alt next */ if (td->alt_next) { td = td->alt_next; @@ -1379,12 +1384,12 @@ } td = td->obj_next; } - ehci_non_isoc_done(xfer); + ehci_non_isoc_done(urb); goto transferred; } done: - DPRINTFN(13, "xfer=%p is still active\n", xfer); + DPRINTFN(13, "urb=%p is still active\n", urb); return (0); transferred: @@ -1408,14 +1413,14 @@ static void ehci_interrupt_poll(ehci_softc_t *sc) { - struct usb_xfer *xfer; + struct usb_urb *urb; repeat: - TAILQ_FOREACH(xfer, &sc->sc_bus.intr_q.head, wait_entry) { + TAILQ_FOREACH(urb, &sc->sc_bus.intr_q.head, wait_entry) { /* * check if transfer is transferred */ - if (ehci_check_transfer(xfer)) { + if (ehci_check_transfer(urb)) { /* queue has been modified */ goto repeat; } @@ -1499,14 +1504,14 @@ static void ehci_timeout(void *arg) { - struct usb_xfer *xfer = arg; + struct usb_urb *urb = arg; - DPRINTF("xfer=%p\n", xfer); + DPRINTF("urb=%p\n", urb); - USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED); + //USB_BUS_LOCK_ASSERT(urb->pipe->bus, MA_OWNED); /* transfer is transferred */ - ehci_device_done(xfer, USB_ERR_TIMEOUT); + ehci_device_done(urb, USB_ERR_TIMEOUT); } static void @@ -1705,8 +1710,9 @@ } static void -ehci_setup_standard_chain(struct usb_xfer *xfer, ehci_qh_t **qh_last) +ehci_setup_standard_chain(struct usb_urb *urb, ehci_qh_t **qh_last) { + struct usb_pipe *pipe = urb->ub_pipe; struct ehci_std_temp temp; struct usb_pipe_methods *methods; ehci_qh_t *qh; @@ -1716,30 +1722,30 @@ uint32_t x; DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", - xfer->address, UE_GET_ADDR(xfer->endpointno), - xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + pipe->address, UE_GET_ADDR(pipe->endpointno), + urb->sumlen, usb2_get_speed(pipe->xroot->udev)); - temp.average = xfer->max_hc_frame_size; - temp.max_frame_size = xfer->max_frame_size; - temp.sc = EHCI_BUS2SC(xfer->xroot->bus); + temp.average = pipe->max_hc_frame_size; + temp.max_frame_size = pipe->max_frame_size; + temp.sc = EHCI_BUS2SC(pipe->xroot->bus); /* toggle the DMA set we are using */ - xfer->flags_int.curr_dma_set ^= 1; + urb->flags_int.curr_dma_set ^= 1; /* get next DMA set */ - td = xfer->td_start[xfer->flags_int.curr_dma_set]; + td = urb->td_start[urb->flags_int.curr_dma_set]; - xfer->td_transfer_first = td; - xfer->td_transfer_cache = td; + urb->td_transfer_first = td; + urb->td_transfer_cache = td; temp.td = NULL; temp.td_next = td; temp.qtd_status = 0; temp.last_frame = 0; - temp.setup_alt_next = xfer->flags_int.short_frames_ok; + temp.setup_alt_next = urb->flags_int.short_frames_ok; - if (xfer->flags_int.control_xfr) { - if (xfer->endpoint->toggle_next) { + if (urb->flags_int.control_xfr) { + if (pipe->endpoint->toggle_next) { /* DATA1 is next */ temp.qtd_status |= htohc32(temp.sc, EHCI_QTD_SET_TOGGLE(1)); @@ -1749,15 +1755,15 @@ temp.auto_data_toggle = 1; } - if (usb2_get_speed(xfer->xroot->udev) != USB_SPEED_HIGH) { + if (usb2_get_speed(pipe->udev) != USB_SPEED_HIGH) { /* max 3 retries */ temp.qtd_status |= htohc32(temp.sc, EHCI_QTD_SET_CERR(3)); } /* check if we should prepend a setup message */ - if (xfer->flags_int.control_xfr) { - if (xfer->flags_int.control_hdr) { + if (urb->flags_int.control_xfr) { + if (urb->flags_int.control_hdr) { temp.qtd_status &= htohc32(temp.sc, EHCI_QTD_SET_CERR(3)); @@ -1766,13 +1772,13 @@ EHCI_QTD_SET_PID(EHCI_QTD_PID_SETUP) | EHCI_QTD_SET_TOGGLE(0)); - temp.len = xfer->frlengths[0]; - temp.pc = xfer->frbuffers + 0; + temp.len = urb->frlengths[0]; + temp.pc = urb->frbuffers + 0; temp.shortpkt = temp.len ? 1 : 0; /* check for last frame */ - if (xfer->nframes == 1) { + if (urb->nframes == 1) { /* no STATUS stage yet, SETUP is last */ - if (xfer->flags_int.control_act) { + if (urb->flags_int.control_act) { temp.last_frame = 1; temp.setup_alt_next = 0; } @@ -1784,19 +1790,19 @@ x = 0; } - while (x != xfer->nframes) { + while (x != urb->nframes) { /* DATA0 / DATA1 message */ - temp.len = xfer->frlengths[x]; - temp.pc = xfer->frbuffers + x; + temp.len = urb->frlengths[x]; + temp.pc = urb->frbuffers + x; x++; - if (x == xfer->nframes) { - if (xfer->flags_int.control_xfr) { + if (x == urb->nframes) { + if (urb->flags_int.control_xfr) { /* no STATUS stage yet, DATA is last */ - if (xfer->flags_int.control_act) { + if (urb->flags_int.control_act) { temp.last_frame = 1; temp.setup_alt_next = 0; } @@ -1821,13 +1827,13 @@ /* regular data transfer */ - temp.shortpkt = (xfer->flags.force_short_xfer) ? 0 : 1; + temp.shortpkt = (pipe->flags.force_short_xfer) ? 0 : 1; } /* set endpoint direction */ temp.qtd_status |= - (UE_GET_DIR(xfer->endpointno) == UE_DIR_IN) ? + (UE_GET_DIR(pipe->endpointno) == UE_DIR_IN) ? htohc32(temp.sc, EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(EHCI_QTD_PID_IN)) : htohc32(temp.sc, EHCI_QTD_ACTIVE | @@ -1838,8 +1844,8 @@ /* check if we should append a status stage */ - if (xfer->flags_int.control_xfr && - !xfer->flags_int.control_act) { + if (urb->flags_int.control_xfr && + !urb->flags_int.control_act) { /* * Send a DATA1 message and invert the current endpoint @@ -1849,7 +1855,7 @@ temp.qtd_status &= htohc32(temp.sc, EHCI_QTD_SET_CERR(3) | EHCI_QTD_SET_TOGGLE(1)); temp.qtd_status |= - (UE_GET_DIR(xfer->endpointno) == UE_DIR_OUT) ? + (UE_GET_DIR(pipe->endpointno) == UE_DIR_OUT) ? htohc32(temp.sc, EHCI_QTD_ACTIVE | EHCI_QTD_SET_PID(EHCI_QTD_PID_IN) | EHCI_QTD_SET_TOGGLE(1)) : @@ -1876,36 +1882,36 @@ /* must have at least one frame! */ - xfer->td_transfer_last = td; + urb->td_transfer_last = td; #if USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", - xfer->endpoint->toggle_next); + pipe->endpoint->toggle_next); ehci_dump_sqtds(temp.sc, - xfer->td_transfer_first); + urb->td_transfer_first); } #endif - methods = xfer->endpoint->methods; + methods = pipe->endpoint->methods; - qh = xfer->qh_start[xfer->flags_int.curr_dma_set]; + qh = urb->qh_start[urb->flags_int.curr_dma_set]; /* the "qh_link" field is filled when the QH is added */ qh_endp = - (EHCI_QH_SET_ADDR(xfer->address) | - EHCI_QH_SET_ENDPT(UE_GET_ADDR(xfer->endpointno)) | - EHCI_QH_SET_MPL(xfer->max_packet_size)); + (EHCI_QH_SET_ADDR(pipe->address) | + EHCI_QH_SET_ENDPT(UE_GET_ADDR(pipe->endpointno)) | + EHCI_QH_SET_MPL(pipe->max_packet_size)); - if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { + if (usb2_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) { qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | EHCI_QH_DTC); if (methods != &ehci_device_intr_methods) qh_endp |= EHCI_QH_SET_NRL(8); } else { - if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_FULL) { + if (usb2_get_speed(pipe->xroot->udev) == USB_SPEED_FULL) { qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_FULL) | EHCI_QH_DTC); } else { @@ -1925,11 +1931,11 @@ qh->qh_endp = htohc32(temp.sc, qh_endp); qh_endphub = - (EHCI_QH_SET_MULT(xfer->max_packet_count & 3) | - EHCI_QH_SET_CMASK(xfer->usb2_cmask) | - EHCI_QH_SET_SMASK(xfer->usb2_smask) | - EHCI_QH_SET_HUBA(xfer->xroot->udev->hs_hub_addr) | - EHCI_QH_SET_PORT(xfer->xroot->udev->hs_port_no)); + (EHCI_QH_SET_MULT(pipe->max_packet_count & 3) | + EHCI_QH_SET_CMASK(pipe->usb2_cmask) | + EHCI_QH_SET_SMASK(pipe->usb2_smask) | + EHCI_QH_SET_HUBA(pipe->udev->hs_hub_addr) | + EHCI_QH_SET_PORT(pipe->udev->hs_port_no)); qh->qh_endphub = htohc32(temp.sc, qh_endphub); qh->qh_curqtd = htohc32(temp.sc, 0); @@ -1943,13 +1949,13 @@ qh->qh_endp &= htohc32(temp.sc, ~EHCI_QH_DTC); - if (xfer->endpoint->toggle_next) { + if (pipe->endpoint->toggle_next) { /* DATA1 is next */ qh->qh_qtd.qtd_status |= htohc32(temp.sc, EHCI_QTD_SET_TOGGLE(1)); } } - td = xfer->td_transfer_first; + td = urb->td_transfer_first; qh->qh_qtd.qtd_next = td->qtd_self; qh->qh_qtd.qtd_altnext = @@ -1957,7 +1963,7 @@ usb2_pc_cpu_flush(qh->page_cache); - if (xfer->xroot->udev->flags.self_suspended == 0) { + if (pipe->udev->flags.self_suspended == 0) { EHCI_APPEND_QH(qh, *qh_last); } } @@ -1990,17 +1996,18 @@ } static void -ehci_isoc_fs_done(ehci_softc_t *sc, struct usb_xfer *xfer) +ehci_isoc_fs_done(ehci_softc_t *sc, struct usb_urb *urb) { - uint32_t nframes = xfer->nframes; + struct usb_pipe *pipe = urb->ub_pipe; + uint32_t nframes = urb->nframes; uint32_t status; - uint32_t *plen = xfer->frlengths; + uint32_t *plen = urb->frlengths; uint16_t len = 0; - ehci_sitd_t *td = xfer->td_transfer_first; - ehci_sitd_t **pp_last = &sc->sc_isoc_fs_p_last[xfer->qh_pos]; + ehci_sitd_t *td = urb->td_transfer_first; + ehci_sitd_t **pp_last = &sc->sc_isoc_fs_p_last[pipe->qh_pos]; - DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", - xfer, xfer->endpoint); + DPRINTFN(13, "urb=%p endpoint=%p transfer done\n", + urb, pipe->endpoint); while (nframes--) { if (td == NULL) { @@ -2039,22 +2046,23 @@ td = td->obj_next; } - xfer->aframes = xfer->nframes; + urb->aframes = urb->nframes; } static void -ehci_isoc_hs_done(ehci_softc_t *sc, struct usb_xfer *xfer) +ehci_isoc_hs_done(ehci_softc_t *sc, struct usb_urb *urb) { - uint32_t nframes = xfer->nframes; + struct usb_pipe *pipe = urb->ub_pipe; + uint32_t nframes = urb->nframes; uint32_t status; - uint32_t *plen = xfer->frlengths; + uint32_t *plen = urb->frlengths; uint16_t len = 0; uint8_t td_no = 0; - ehci_itd_t *td = xfer->td_transfer_first; - ehci_itd_t **pp_last = &sc->sc_isoc_hs_p_last[xfer->qh_pos]; + ehci_itd_t *td = urb->td_transfer_first; + ehci_itd_t **pp_last = &sc->sc_isoc_hs_p_last[pipe->qh_pos]; - DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", - xfer, xfer->endpoint); + DPRINTFN(13, "urb=%p endpoint=%p transfer done\n", + urb, pipe->endpoint); while (nframes--) { if (td == NULL) { @@ -2104,92 +2112,94 @@ td = td->obj_next; } } - xfer->aframes = xfer->nframes; + urb->aframes = urb->nframes; } /* NOTE: "done" can be run two times in a row, * from close and from interrupt */ static void -ehci_device_done(struct usb_xfer *xfer, usb_error_t error) +ehci_device_done(struct usb_urb *urb, usb_error_t error) { - struct usb_pipe_methods *methods = xfer->endpoint->methods; - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + struct usb_pipe *pipe = urb->ub_pipe; + struct usb_pipe_methods *methods = pipe->endpoint->methods; + ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - DPRINTFN(2, "xfer=%p, endpoint=%p, error=%d\n", - xfer, xfer->endpoint, error); + DPRINTFN(2, "urb=%p, endpoint=%p, error=%d\n", + urb, pipe->endpoint, error); if ((methods == &ehci_device_bulk_methods) || (methods == &ehci_device_ctrl_methods)) { #if USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data after transfer:\n", - xfer->endpoint->toggle_next); + pipe->endpoint->toggle_next); ehci_dump_sqtds(sc, - xfer->td_transfer_first); + urb->td_transfer_first); } #endif - EHCI_REMOVE_QH(xfer->qh_start[xfer->flags_int.curr_dma_set], + EHCI_REMOVE_QH(urb->qh_start[urb->flags_int.curr_dma_set], sc->sc_async_p_last); } if (methods == &ehci_device_intr_methods) { - EHCI_REMOVE_QH(xfer->qh_start[xfer->flags_int.curr_dma_set], - sc->sc_intr_p_last[xfer->qh_pos]); + EHCI_REMOVE_QH(urb->qh_start[urb->flags_int.curr_dma_set], + sc->sc_intr_p_last[pipe->qh_pos]); } /* * Only finish isochronous transfers once which will update - * "xfer->frlengths". + * "urb->frlengths". */ - if (xfer->td_transfer_first && - xfer->td_transfer_last) { + if (urb->td_transfer_first && + urb->td_transfer_last) { if (methods == &ehci_device_isoc_fs_methods) { - ehci_isoc_fs_done(sc, xfer); + ehci_isoc_fs_done(sc, urb); } if (methods == &ehci_device_isoc_hs_methods) { - ehci_isoc_hs_done(sc, xfer); + ehci_isoc_hs_done(sc, urb); } - xfer->td_transfer_first = NULL; - xfer->td_transfer_last = NULL; + urb->td_transfer_first = NULL; + urb->td_transfer_last = NULL; } /* dequeue transfer and start next transfer */ - usb2_transfer_done(xfer, error); + usb2_transfer_done(urb, error); } /*------------------------------------------------------------------------* * ehci bulk support *------------------------------------------------------------------------*/ static void -ehci_device_bulk_open(struct usb_xfer *xfer) +ehci_device_bulk_open(struct usb_urb *urb) { return; } static void -ehci_device_bulk_close(struct usb_xfer *xfer) +ehci_device_bulk_close(struct usb_urb *urb) { - ehci_device_done(xfer, USB_ERR_CANCELLED); + ehci_device_done(urb, USB_ERR_CANCELLED); } static void -ehci_device_bulk_enter(struct usb_xfer *xfer) +ehci_device_bulk_enter(struct usb_urb *urb) { return; } static void -ehci_device_bulk_start(struct usb_xfer *xfer) +ehci_device_bulk_start(struct usb_urb *urb) { - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + struct usb_pipe *pipe = urb->ub_pipe; + ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); uint32_t temp; /* setup TD's and QH */ - ehci_setup_standard_chain(xfer, &sc->sc_async_p_last); + ehci_setup_standard_chain(urb, &sc->sc_async_p_last); /* put transfer on interrupt queue */ - ehci_transfer_intr_enqueue(xfer); + ehci_transfer_intr_enqueue(urb); /* XXX Performance quirk: Some Host Controllers have a too low * interrupt rate. Issue an IAAD to stimulate the Host @@ -2212,33 +2222,34 @@ * ehci control support *------------------------------------------------------------------------*/ static void -ehci_device_ctrl_open(struct usb_xfer *xfer) +ehci_device_ctrl_open(struct usb_urb *urb) { return; } static void -ehci_device_ctrl_close(struct usb_xfer *xfer) +ehci_device_ctrl_close(struct usb_urb *urb) { - ehci_device_done(xfer, USB_ERR_CANCELLED); + ehci_device_done(urb, USB_ERR_CANCELLED); } static void -ehci_device_ctrl_enter(struct usb_xfer *xfer) +ehci_device_ctrl_enter(struct usb_urb *urb) { return; } static void -ehci_device_ctrl_start(struct usb_xfer *xfer) +ehci_device_ctrl_start(struct usb_urb *urb) { - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + struct usb_pipe *pipe = urb->ub_pipe; + ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); /* setup TD's and QH */ - ehci_setup_standard_chain(xfer, &sc->sc_async_p_last); + ehci_setup_standard_chain(urb, &sc->sc_async_p_last); /* put transfer on interrupt queue */ - ehci_transfer_intr_enqueue(xfer); + ehci_transfer_intr_enqueue(urb); } struct usb_pipe_methods ehci_device_ctrl_methods = @@ -2253,9 +2264,10 @@ * ehci interrupt support *------------------------------------------------------------------------*/ static void -ehci_device_intr_open(struct usb_xfer *xfer) +ehci_device_intr_open(struct usb_urb *urb) { - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + struct usb_pipe *pipe = urb->ub_pipe; + ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); uint16_t best; uint16_t bit; uint16_t x; @@ -2264,16 +2276,16 @@ /* Allocate a microframe slot first: */ slot = usb2_intr_schedule_adjust - (xfer->xroot->udev, xfer->max_frame_size, USB_HS_MICRO_FRAMES_MAX); + (pipe->xroot->udev, pipe->max_frame_size, USB_HS_MICRO_FRAMES_MAX); - if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { - xfer->usb2_uframe = slot; - xfer->usb2_smask = (1 << slot) & 0xFF; - xfer->usb2_cmask = 0; + if (usb2_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) { + pipe->usb2_uframe = slot; + pipe->usb2_smask = (1 << slot) & 0xFF; + pipe->usb2_cmask = 0; } else { - xfer->usb2_uframe = slot; - xfer->usb2_smask = (1 << slot) & 0x3F; - xfer->usb2_cmask = (-(4 << slot)) & 0xFE; + pipe->usb2_uframe = slot; + pipe->usb2_smask = (1 << slot) & 0x3F; + pipe->usb2_cmask = (-(4 << slot)) & 0xFE; } /* @@ -2283,7 +2295,7 @@ best = 0; bit = EHCI_VIRTUAL_FRAMELIST_COUNT / 2; while (bit) { - if (xfer->interval >= bit) { + if (pipe->interval >= bit) { x = bit; best = bit; while (x & bit) { @@ -2299,42 +2311,44 @@ } sc->sc_intr_stat[best]++; - xfer->qh_pos = best; + pipe->qh_pos = best; DPRINTFN(3, "best=%d interval=%d\n", - best, xfer->interval); + best, pipe->interval); } static void -ehci_device_intr_close(struct usb_xfer *xfer) +ehci_device_intr_close(struct usb_urb *urb) { - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + struct usb_pipe *pipe = urb->ub_pipe; + ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); uint8_t slot; slot = usb2_intr_schedule_adjust - (xfer->xroot->udev, -(xfer->max_frame_size), xfer->usb2_uframe); + (pipe->xroot->udev, -(pipe->max_frame_size), pipe->usb2_uframe); - sc->sc_intr_stat[xfer->qh_pos]--; + sc->sc_intr_stat[pipe->qh_pos]--; - ehci_device_done(xfer, USB_ERR_CANCELLED); + ehci_device_done(urb, USB_ERR_CANCELLED); } static void -ehci_device_intr_enter(struct usb_xfer *xfer) +ehci_device_intr_enter(struct usb_urb *urb) { return; } static void -ehci_device_intr_start(struct usb_xfer *xfer) +ehci_device_intr_start(struct usb_urb *urb) { - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + struct usb_pipe *pipe = urb->ub_pipe; + ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); /* setup TD's and QH */ - ehci_setup_standard_chain(xfer, &sc->sc_intr_p_last[xfer->qh_pos]); + ehci_setup_standard_chain(urb, &sc->sc_intr_p_last[pipe->qh_pos]); /* put transfer on interrupt queue */ - ehci_transfer_intr_enqueue(xfer); + ehci_transfer_intr_enqueue(urb); } struct usb_pipe_methods ehci_device_intr_methods = @@ -2349,20 +2363,21 @@ * ehci full speed isochronous support *------------------------------------------------------------------------*/ static void -ehci_device_isoc_fs_open(struct usb_xfer *xfer) +ehci_device_isoc_fs_open(struct usb_urb *urb) { - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + struct usb_pipe *pipe = urb->ub_pipe; + ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); ehci_sitd_t *td; uint32_t sitd_portaddr; uint8_t ds; sitd_portaddr = - EHCI_SITD_SET_ADDR(xfer->address) | - EHCI_SITD_SET_ENDPT(UE_GET_ADDR(xfer->endpointno)) | - EHCI_SITD_SET_HUBA(xfer->xroot->udev->hs_hub_addr) | - EHCI_SITD_SET_PORT(xfer->xroot->udev->hs_port_no); + EHCI_SITD_SET_ADDR(pipe->address) | + EHCI_SITD_SET_ENDPT(UE_GET_ADDR(pipe->endpointno)) | + EHCI_SITD_SET_HUBA(pipe->xroot->udev->hs_hub_addr) | + EHCI_SITD_SET_PORT(pipe->xroot->udev->hs_port_no); - if (UE_GET_DIR(xfer->endpointno) == UE_DIR_IN) { + if (UE_GET_DIR(pipe->endpointno) == UE_DIR_IN) { sitd_portaddr |= EHCI_SITD_SET_DIR_IN; } sitd_portaddr = htohc32(sc, sitd_portaddr); @@ -2371,7 +2386,7 @@ for (ds = 0; ds != 2; ds++) { - for (td = xfer->td_start[ds]; td; td = td->obj_next) { + for (td = urb->td_start[ds]; td; td = td->obj_next) { td->sitd_portaddr = sitd_portaddr; @@ -2390,16 +2405,17 @@ } static void -ehci_device_isoc_fs_close(struct usb_xfer *xfer) +ehci_device_isoc_fs_close(struct usb_urb *urb) { - ehci_device_done(xfer, USB_ERR_CANCELLED); + ehci_device_done(urb, USB_ERR_CANCELLED); } static void -ehci_device_isoc_fs_enter(struct usb_xfer *xfer) +ehci_device_isoc_fs_enter(struct usb_urb *urb) { struct usb_page_search buf_res; - ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + struct usb_pipe *pipe = urb->ub_pipe; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 3 04:20:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE4991065670; Wed, 3 Jun 2009 04:20: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 85C38106566B for ; Wed, 3 Jun 2009 04:20:35 +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 73BFC8FC12 for ; Wed, 3 Jun 2009 04:20:35 +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 n534KZtm071225 for ; Wed, 3 Jun 2009 04:20:35 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n534KZ4r071223 for perforce@freebsd.org; Wed, 3 Jun 2009 04:20:35 GMT (envelope-from dforsyth@FreeBSD.org) Date: Wed, 3 Jun 2009 04:20:35 GMT Message-Id: <200906030420.n534KZ4r071223@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 163398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 04:20:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=163398 Change 163398 by dforsyth@squirrel on 2009/06/03 04:20:14 Cleaned up the build. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/Makefile#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#6 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_contents.c#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_private.h#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#7 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#4 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#2 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/Makefile#2 (text+ko) ==== @@ -1,7 +1,7 @@ LIB= pkg INCS= pkg.h WARNS?= 6 -SRCS= pkgdb.c pkg_info.c pkg.c pkg_util.c +SRCS= pkgdb.c pkg_contents.c pkg.c pkg_util.c NO_MAN= yes .include ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#6 (text+ko) ==== @@ -45,7 +45,7 @@ if (comment == NULL) { /* embrace it... */ - p->comment = comment; + p->comment = NULL; return (p); } @@ -64,11 +64,13 @@ return (p); } +#if 0 struct pkg * pkg_set_pkg_contents(struct pkg *p, struct pkg_contents *pc) { return (p); } +#endif char * ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_contents.c#2 (text+ko) ==== @@ -31,10 +31,6 @@ struct pkg_contents * pkg_contents_read_info_from_text(const char *text) { - int newline_pos; - int line_len; - char *line; - int meta; struct pkg_contents *pi; /* This function will parse text and create a pkg_contents */ ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_private.h#2 (text+ko) ==== @@ -1,6 +1,13 @@ #ifndef __PKG_PRIVATE_H__ #define __PKG_PRIVATE_H__ -/* Hey look at me I'm empty. */ +struct pkg { + TAILQ_ENTRY(pkg) next; + + char *ident; /* User given name for this pkg. */ + + char *comment; /* Mmmmm, should be 70 or less, right? */ + struct pkg_contents *contents; +}; #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#7 (text+ko) ==== @@ -6,8 +6,10 @@ #include #include #include +#include #include #include +#include #include "pkg_util.h" #include "pkg_contents.h" ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#4 (text+ko) ==== @@ -1,17 +1,9 @@ #ifndef __PKGDB_H__ #define __PKGDB_H__ -#include "pkg_info.h" +#include "pkg_contents.h" #include -struct pkg { - TAILQ_ENTRY(pkg) next; - - char *ident; /* User given name for this pkg. */ - - char *comment; /* Mmmmm, should be 70 or less, right? */ - struct pkg_contents *contents; -}; struct pkgdb { int dirty; /* changes have been made to this database. */ @@ -26,4 +18,13 @@ /* Callbacks */ }; +void pkgdb_pkg_list_init(struct pkgdb *db); +struct pkg *pkgdb_pkg_list_first(struct pkgdb *db); +void pkgdb_pkg_list_append(struct pkgdb *db, struct pkg *p); + +char *pkgdb_read_file_to_text(struct pkgdb *db, struct pkg *p, + const char *filename); + +void pkgdb_free_pkg_list(struct pkgdb *db); + #endif ==== //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#2 (text+ko) ==== @@ -13,11 +13,13 @@ short opt_show_comment = 0; char *info_targets; +#if 0 static char opts[] = "a"; static struct option lopts[] = { {"all", no_argument, NULL, 'a'}, {NULL, 0, NULL, 0}, // <-- something that pkg_add in 7.2 forgot... }; +#endif /* Mock pkg_info for testing, */ @@ -32,11 +34,11 @@ const char *db_root; struct pkgdb *db; - if (argc == 1) { + if (argc == 1 && argv != NULL /* Giving argv something to do */) { opt_all = 1; } - parse_opts(argc, argv); + /* parse_opts(argc, argv); */ db_root = getenv("PKG_DBDIR"); /* User set it */ if (db_root == NULL) @@ -60,18 +62,20 @@ exit(exit_val); } +#if 0 void parse_opts(int argc, char **argv) { /* Ehh... Worthless to write this at this point. */ opt_all = 1; } +#endif void perform_on_db(struct pkgdb *db) { int count; - char *target; + /* char *target; */ struct pkg *p; /* There will be cases where an init is useless, but since I haven't From owner-p4-projects@FreeBSD.ORG Wed Jun 3 05:14:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19F971065672; Wed, 3 Jun 2009 05:14: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 CBF2F106566C for ; Wed, 3 Jun 2009 05:14:04 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: from kientzle.com (kientzle.com [66.166.149.50]) by mx1.freebsd.org (Postfix) with ESMTP id 6DF718FC19 for ; Wed, 3 Jun 2009 05:14:04 +0000 (UTC) (envelope-from kientzle@freebsd.org) Received: (from root@localhost) by kientzle.com (8.14.3/8.14.3) id n534bn8f021856; Tue, 2 Jun 2009 21:37:49 -0700 (PDT) (envelope-from kientzle@freebsd.org) Received: from dark.x.kientzle.com (fw2.kientzle.com [10.123.1.2]) by kientzle.com with SMTP id d7ub5bkcmkzdyq6catvh9ufz3i; Tue, 02 Jun 2009 21:37:49 -0700 (PDT) (envelope-from kientzle@freebsd.org) Message-ID: <4A25FE1D.8030105@freebsd.org> Date: Tue, 02 Jun 2009 21:37:49 -0700 From: Tim Kientzle User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.8.1.21) Gecko/20090601 SeaMonkey/1.1.16 MIME-Version: 1.0 To: David Forsythe References: <200906030420.n534KZ4r071223@repoman.freebsd.org> In-Reply-To: <200906030420.n534KZ4r071223@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 163398 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 05:14:06 -0000 David Forsythe wrote: > http://perforce.freebsd.org/chv.cgi?CH=163398 > > Change 163398 by dforsyth@squirrel on 2009/06/03 04:20:14 > > Cleaned up the build. Thank you. T From owner-p4-projects@FreeBSD.ORG Wed Jun 3 08:12:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE8D61065674; Wed, 3 Jun 2009 08:12: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 A9E001065672 for ; Wed, 3 Jun 2009 08:12:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 95DE28FC08 for ; Wed, 3 Jun 2009 08:12:30 +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 n538CUVZ004263 for ; Wed, 3 Jun 2009 08:12:30 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n538CUaa004261 for perforce@freebsd.org; Wed, 3 Jun 2009 08:12:30 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 3 Jun 2009 08:12:30 GMT Message-Id: <200906030812.n538CUaa004261@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 163402 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 08:12:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=163402 Change 163402 by pgj@beehive on 2009/06/03 08:12:12 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#25 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#31 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#26 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#19 integrate .. //depot/projects/docproj_hu/www/en/gnome/docs/faq2.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/index.xsl#5 integrate .. //depot/projects/docproj_hu/www/en/projects/netperf/index.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#27 integrate .. //depot/projects/docproj_hu/www/share/sgml/header.ent#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.news-rdf.xsl#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.news-rss.xsl#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.press-rss.xsl#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.usergroups.xsl#2 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/config/chapter.sgml#25 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -741,6 +741,11 @@ &pgpkey.nemoliu; + + &a.zml; + &pgpkey.zml; + + &a.nox; &pgpkey.nox; @@ -756,11 +761,6 @@ &pgpkey.rene; - - &a.zml; - &pgpkey.zml; - - &a.avl; &pgpkey.avl; ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#19 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.486 2009/05/16 10:47:00 brueffer Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.487 2009/06/02 01:34:15 gabor Exp $ --> @@ -4723,6 +4723,7 @@ + ==== //depot/projects/docproj_hu/www/en/gnome/docs/faq2.sgml#5 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -1105,14 +1105,13 @@

        Up until GNOME 2.20, GDM would read the locale settings from /etc/login.conf or ~/.login.conf. - This was broken in 2.20, and since GDM 2.22 will use - a new locale scheme, it will not be fixed. However, all - hope is not lost. It is actually very easy to set the - locale for use with the GNOME Destop. GDM offers a - pull-down Language menu from which you can choose your - current locale. If you would rather not use this menu, - you can set the locale by adding the following to - ~/.profile:

        + This was broken in 2.20, and finally restored in GDM + 2.26.1_3.

        + +

        However, GDM also offers a pull-down Language menu from which + you can choose your current locale. If you would rather not + use this menu or /etc/login.conf, you can set the + locale by adding the following to ~/.profile:

         export LANG=<locale>
@@ -1123,7 +1122,9 @@
 	      (e.g. en_US.UTF-8, es_ES.ISO8859-15, fr_FR.ISO8859-1, etc.).
        
 
 	    
        To set the default locale for the GDM greeter, add the
-	      same environment variables to /etc/profile.
        
+	      same environment variables to /etc/profile or
+	      define gdm_lang to the desired locale
+	      in /etc/rc.conf.
        
 	  
 
         

==== //depot/projects/docproj_hu/www/en/index.xsl#5 (text+ko) ====

@@ -4,7 +4,7 @@
 
 ]>
 
-
+
 
 
   
@@ -34,6 +34,13 @@
 	      CVS, CVSup, News, Commercial Vendors, homepage, CTM, Unix"/>
 	
 	
+
     
     
     
@@ -159,6 +166,9 @@
 					ja
 				  
 				  
      • 
+					nl
+				  
        • 
+				  
      • 
 					ru
 				  
        • 
 				  
      • 

==== //depot/projects/docproj_hu/www/en/projects/netperf/index.sgml#2 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -53,11 +53,10 @@
       will work toward these goals:
        
 
     
          
-      
        • Complete locking work to make sure all components of the stack
-	are able to run without the Giant lock.  While most of the network
-	stack, especially mainstream protocols, runs without Giant, some
-	components require Giant to be placed back over the stack if compiled
-	into the kernel, reducing parallelism.
          • 
+      
        • The Netperf project has completed locking work for all components
+	of the network stack; as of FreeBSD 7.0 we have removed non-MPSAFE
+	protocol shims, and as of FreeBSD 8.0 we have removed non-MPSAFE
+	device driver shims.
          • 
 
       
        • Optimize locking strategies to find better balances between
 	locking granularity and locking overhead.  In the first cut at locking
@@ -126,7 +125,8 @@
 	increasing effective CPU utilization and hence throughput.  For
 	example, introducing additional netisr threads capable of running on
 	more than one CPU at a time can increase input parallelism, subject
-	to maintaining desirable packet ordering.
          • 
+	to maintaining desirable packet ordering (present in FreeBSD
+	8.0).
          
     
        
 
     
@@ -204,13 +204,12 @@
        • Employ queued dispatch across netisr dispatch API &a.rwatson; 20041124 &status.prototyped; Pull all of the mbufs in the netisr ifqueue out of the ifqueue - into a thread-local mbuf queue to avoid repeated lock operations - to access the queue. Also use lock-free operations to test for - queue contents being present. This has been prototyped in the - rwatson_netperf branch. 20090601 &status.done Pull all of the mbufs in the netisr queue into a thread-local + mbuf queue to avoid repeated lock operations to access the queue. + This work was completed as part of the netisr2 project, and will + ship with 8.0-RELEASE.
        Add true inpcb reference count support &a.mohans;, &a.rwatson;, &a.peter; 20060412 &status.new; Currently, the in-bound TCP and UDP socket paths rely on the + 20081208 &status.done; Historically, the in-bound TCP and UDP socket paths relied on global pcbinfo info locks to prevent PCBs being delivered to from being garbage collected by another thread while in use. This set of changes introduces a true reference model for PCBs so that the - global lock can be released during in-bound process.
        Fine-grained locking for UNIX domain sockets &a.rwatson; 20060416 &status.prototyped; Currently, UNIX domain sockets in FreeBSD 5.x and 6.x use a - single global subsystem lock. This is sufficient to allow it to - run without Giant, but results in contention with large numbers - of processors simultaneously operating on UNIX domain sockets. - This task introduces per-protocol control block locks in order - to reduce contention on a larger subsystem lock. 20070226 &status.done; UNIX domain sockets in FreeBSD 5.x and 6.x use a single global + subsystem lock. This is sufficient to allow it to run without + Giant, but results in contention with large numbers of processors + simultaneously operating on UNIX domain sockets. This task + introduced per-protocol control block locks in order to reduce + contention on a larger subsystem lock, and the results appeared in + 7.0-RELEASE.
        Multiple netisr threads &a.rwatson; 20090601 &status.done; Historically, the BSD network stack has used a single network + software interrupt context, for deferred network processing. With + the introduction of multi-processing, this became a single + software interrupt thread. In FreeBSD 8.0, multiple netisr + threads are now supported, up to the number of CPUs present in the + system.
        ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#27 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -56,7 +56,7 @@
        August 2009 FreeBSD 8.0 code slush since June 1st
        ==== //depot/projects/docproj_hu/www/share/sgml/header.ent#3 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -46,12 +46,26 @@ + '> ]]> + '> ==== //depot/projects/docproj_hu/www/share/sgml/templates.news-rdf.xsl#2 (text+ko) ==== @@ -5,14 +5,14 @@ ]> - + - + ==== //depot/projects/docproj_hu/www/share/sgml/templates.news-rss.xsl#2 (text+ko) ==== @@ -7,7 +7,7 @@ ]> - + - + ==== //depot/projects/docproj_hu/www/share/sgml/templates.press-rss.xsl#2 (text+ko) ==== @@ -7,7 +7,7 @@ ]> - + + - From owner-p4-projects@FreeBSD.ORG Wed Jun 3 08:43:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 646B11065675; Wed, 3 Jun 2009 08:43: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 223591065674 for ; Wed, 3 Jun 2009 08:43:02 +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 0FA638FC14 for ; Wed, 3 Jun 2009 08:43:02 +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 n538h1lP006817 for ; Wed, 3 Jun 2009 08:43:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n538h1v1006815 for perforce@freebsd.org; Wed, 3 Jun 2009 08:43:01 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 3 Jun 2009 08:43:01 GMT Message-Id: <200906030843.n538h1v1006815@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 163406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 08:43:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=163406 Change 163406 by pgj@beehive on 2009/06/03 08:42:27 MFen (www): 1.167 -> 1.169 hu/index.xsl 1.10 -> 1.11 hu/share/sgml/header.l10n.ent 1.2 -> 1.3 hu/share/sgml/templates.news-rdf.xsl 1.2 -> 1.3 hu/share/sgml/templates.news-rss.xsl 1.1 -> 1.2 hu/share/sgml/templates.press-rss.xsl Affected files ... .. //depot/projects/docproj_hu/www/hu/index.xsl#23 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#11 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rdf.xsl#4 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rss.xsl#4 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.press-rss.xsl#4 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/index.xsl#23 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -167,6 +167,9 @@ ja
      • + nl +
        • +
      • ru
      • ==== //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#11 (text+ko) ==== @@ -4,7 +4,7 @@ ==== //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rdf.xsl#4 (text+ko) ==== @@ -10,7 +10,7 @@ - + ==== //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rss.xsl#4 (text+ko) ==== @@ -12,7 +12,7 @@ - - + + ==== //depot/projects/docproj_hu/www/hu/share/sgml/templates.press-rss.xsl#4 (text+ko) ==== @@ -38,7 +38,7 @@ - + From owner-p4-projects@FreeBSD.ORG Wed Jun 3 13:58:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 823471065670; Wed, 3 Jun 2009 13:58:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4241E106566B for ; Wed, 3 Jun 2009 13:58:22 +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 16B1D8FC13 for ; Wed, 3 Jun 2009 13:58:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n53DwLIK058175 for ; Wed, 3 Jun 2009 13:58:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53DwLLC058173 for perforce@freebsd.org; Wed, 3 Jun 2009 13:58:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 3 Jun 2009 13:58:21 GMT Message-Id: <200906031358.n53DwLLC058173@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 163414 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 13:58:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=163414 Change 163414 by hselasky@hselasky_laptop001 on 2009/06/03 13:57:30 USB input: - remove duplicate variable setting - reported by Sylvestre Gallon Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#17 (text+ko) ==== @@ -706,7 +706,6 @@ sc->sc_iface_index = uaa->info.bIfaceIndex; sc->sc_iface_no = uaa->info.bIfaceNum; sc->sc_mode = K_XLATE; - sc->sc_iface = uaa->iface; usb2_callout_init_mtx(&sc->sc_callout, &Giant, 0); From owner-p4-projects@FreeBSD.ORG Wed Jun 3 15:05:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E6291065676; Wed, 3 Jun 2009 15:05: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 655B6106567E for ; Wed, 3 Jun 2009 15:05:30 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C0C28FC1F for ; Wed, 3 Jun 2009 15:05:30 +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 n53F5UrZ065863 for ; Wed, 3 Jun 2009 15:05:30 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53F5UGZ065861 for perforce@freebsd.org; Wed, 3 Jun 2009 15:05:30 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 3 Jun 2009 15:05:30 GMT Message-Id: <200906031505.n53F5UGZ065861@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 163418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 15:05:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=163418 Change 163418 by pgj@petymeg-current on 2009/06/03 15:04:33 Add a very initial version of the netstat library, to be filled incrementally. Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/Makefile#2 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/Makefile#1 add .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#1 add .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#1 add .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#1 add .. //depot/projects/soc2009/pgj_libstat/src/share/mk/bsd.libnames.mk#2 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/Makefile#2 (text+ko) ==== @@ -36,7 +36,7 @@ libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \ ${_libgssapi} ${_librpcsec_gss} libipsec \ ${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \ - ${_libncp} ${_libngatm} libopie libpam libpcap \ + libnetstat ${_libncp} ${_libngatm} libopie libpam libpcap \ ${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \ ==== //depot/projects/soc2009/pgj_libstat/src/share/mk/bsd.libnames.mk#2 (text+ko) ==== @@ -96,6 +96,7 @@ LIBNCURSES?= ${DESTDIR}${LIBDIR}/libncurses.a LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncursesw.a LIBNETGRAPH?= ${DESTDIR}${LIBDIR}/libnetgraph.a +LIBNETSTAT?= ${DESTDIR}${LIBDIR}/libnetstat.a LIBNGATM?= ${DESTDIR}${LIBDIR}/libngatm.a LIBNVPAIR?= ${DESTDIR}${LIBDIR}/libnvpair.a LIBOBJC?= ${DESTDIR}${LIBDIR}/libobjc.a From owner-p4-projects@FreeBSD.ORG Wed Jun 3 15:09:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBF641065691; Wed, 3 Jun 2009 15:09: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 992B21065689 for ; Wed, 3 Jun 2009 15:09:34 +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 881E28FC23 for ; Wed, 3 Jun 2009 15:09:34 +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 n53F9YZb066135 for ; Wed, 3 Jun 2009 15:09:34 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53F9YvM066133 for perforce@freebsd.org; Wed, 3 Jun 2009 15:09:34 GMT (envelope-from gk@FreeBSD.org) Date: Wed, 3 Jun 2009 15:09:34 GMT Message-Id: <200906031509.n53F9YvM066133@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 163419 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 15:09:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=163419 Change 163419 by gk@gk_h1 on 2009/06/03 15:09:09 reorganize Milestones a little Affected files ... .. //depot/projects/soc2009/gk_pefs/Milestones#2 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/Milestones#2 (text+ko) ==== @@ -1,10 +1,11 @@ Milestones -* May 23 - June 14. Use codebase as a start point. Add trivial -encryption (XOR, single key) to simplify development. +* May 23 - June 7. Use codebase as a start point. + +* June 8 - June 14. Add XTS implementation into kernel. -* June 15 - June 21. Import XTS implementation into kernel. (I already have one, -but it's too memory hungry, fix it, or use one from OpenBSD) +* June 15 - June 21. Add trivial encryption (XOR, single key) to simplify +development. * June 22 - July 5. Add kernel device for specifying keys for mounted filesystem. Add userspace configuration utility. From owner-p4-projects@FreeBSD.ORG Wed Jun 3 15:43:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60DDB1065673; Wed, 3 Jun 2009 15:43: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 21277106564A for ; Wed, 3 Jun 2009 15:43:09 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA5CC8FC15 for ; Wed, 3 Jun 2009 15:43:08 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n53Fh8R5068943 for ; Wed, 3 Jun 2009 15:43:08 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53Fh8WX068941 for perforce@freebsd.org; Wed, 3 Jun 2009 15:43:08 GMT (envelope-from zec@fer.hr) Date: Wed, 3 Jun 2009 15:43:08 GMT Message-Id: <200906031543.n53Fh8WX068941@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 163420 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 15:43:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=163420 Change 163420 by zec@zec_amdx4 on 2009/06/03 15:43:03 Fix misinntegration. Affected files ... .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#41 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#41 (text+ko) ==== @@ -450,9 +450,6 @@ sysctl_ip6_temppltime(SYSCTL_HANDLER_ARGS) { INIT_VNET_INET6(curvnet); -#ifdef VIMAGE - SYSCTL_RESOLVE_V_ARG1(); -#endif int error = 0; int old; @@ -475,9 +472,6 @@ sysctl_ip6_tempvltime(SYSCTL_HANDLER_ARGS) { INIT_VNET_INET6(curvnet); -#ifdef VIMAGE - SYSCTL_RESOLVE_V_ARG1(); -#endif int error = 0; int old; From owner-p4-projects@FreeBSD.ORG Wed Jun 3 15:47:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75BB21065675; Wed, 3 Jun 2009 15:47: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 34B901065670 for ; Wed, 3 Jun 2009 15:47:14 +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 20E6C8FC17 for ; Wed, 3 Jun 2009 15:47:14 +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 n53FlDn3069255 for ; Wed, 3 Jun 2009 15:47:13 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53FlDIx069249 for perforce@freebsd.org; Wed, 3 Jun 2009 15:47:13 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 3 Jun 2009 15:47:13 GMT Message-Id: <200906031547.n53FlDIx069249@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 163421 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 15:47:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163421 Change 163421 by thompsa@thompsa_burger on 2009/06/03 15:46:24 IFC Affected files ... .. //depot/projects/usb_buf/src/lib/libusb/libusb.3#5 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20.c#3 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20.h#3 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20_int.h#2 integrate .. //depot/projects/usb_buf/src/lib/libusb/libusb20_ugen20.c#2 integrate .. //depot/projects/usb_buf/src/lib/libusbhid/descr.c#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/usb_buf/src/sys/amd64/conf/MAC#2 delete .. //depot/projects/usb_buf/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/usb_buf/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/usb_buf/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/usb_buf/src/sys/boot/common/boot.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/usb_buf/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/usb_buf/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/usb_buf/src/sys/compat/linux/linux_socket.c#4 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_stat.c#3 integrate .. //depot/projects/usb_buf/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/usb_buf/src/sys/conf/NOTES#4 integrate .. //depot/projects/usb_buf/src/sys/conf/files#6 integrate .. //depot/projects/usb_buf/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/usb_buf/src/sys/conf/options#4 integrate .. //depot/projects/usb_buf/src/sys/contrib/dev/mwl/LICENSE#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/mwl/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/mwl/mw88W8363.fw.uu#1 branch .. //depot/projects/usb_buf/src/sys/contrib/dev/mwl/mwlboot.fw.uu#1 branch .. //depot/projects/usb_buf/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/usb_buf/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/usb_buf/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/usb_buf/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/usb_buf/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/bwi/if_bwi.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/ksyms/ksyms.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/lmc/if_lmc.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/usb_buf/src/sys/dev/mwl/if_mwl.c#1 branch .. //depot/projects/usb_buf/src/sys/dev/mwl/if_mwl_pci.c#1 branch .. //depot/projects/usb_buf/src/sys/dev/mwl/if_mwlioctl.h#1 branch .. //depot/projects/usb_buf/src/sys/dev/mwl/if_mwlvar.h#1 branch .. //depot/projects/usb_buf/src/sys/dev/mwl/mwldiag.h#1 branch .. //depot/projects/usb_buf/src/sys/dev/mwl/mwlhal.c#1 branch .. //depot/projects/usb_buf/src/sys/dev/mwl/mwlhal.h#1 branch .. //depot/projects/usb_buf/src/sys/dev/mwl/mwlreg.h#1 branch .. //depot/projects/usb_buf/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/usb_buf/src/sys/dev/pci/pci.c#3 integrate .. //depot/projects/usb_buf/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/usb_buf/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/README.TXT#2 delete .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#6 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.h#4 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#6 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#6 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.h#6 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.h#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#8 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#9 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#6 integrate .. //depot/projects/usb_buf/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/usb_buf/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clbio.c#4 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clnode.c#4 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/usb_buf/src/sys/fs/nfsserver/nfs_nfsdport.c#4 integrate .. //depot/projects/usb_buf/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/usb_buf/src/sys/fs/pseudofs/pseudofs_vnops.c#3 integrate .. //depot/projects/usb_buf/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/usb_buf/src/sys/i386/conf/MAC#2 delete .. //depot/projects/usb_buf/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/i386/linux/linux.h#3 integrate .. //depot/projects/usb_buf/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/usb_buf/src/sys/i386/xen/mp_machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/usb_buf/src/sys/ia64/conf/MAC#2 delete .. //depot/projects/usb_buf/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_conf.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_lock.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_poll.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_proc.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_prot.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/usb_buf/src/sys/kern/kern_vimage.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/usb_buf/src/sys/kern/subr_sglist.c#1 branch .. //depot/projects/usb_buf/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/vfs_subr.c#3 integrate .. //depot/projects/usb_buf/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/usb_buf/src/sys/modules/Makefile#3 integrate .. //depot/projects/usb_buf/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/geom/geom_part/geom_part_ebr/Makefile#2 integrate .. //depot/projects/usb_buf/src/sys/modules/mwl/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/modules/mwlfw/Makefile#1 branch .. //depot/projects/usb_buf/src/sys/modules/usb/Makefile#3 integrate .. //depot/projects/usb_buf/src/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/usb_buf/src/sys/net/if.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/if.h#2 integrate .. //depot/projects/usb_buf/src/sys/net/if_var.h#3 integrate .. //depot/projects/usb_buf/src/sys/net/netisr.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/netisr.h#3 integrate .. //depot/projects/usb_buf/src/sys/net/route.c#2 integrate .. //depot/projects/usb_buf/src/sys/net/route.h#2 integrate .. //depot/projects/usb_buf/src/sys/net/rtsock.c#3 integrate .. //depot/projects/usb_buf/src/sys/net/vnet.h#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_hostap.c#4 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_ht.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_monitor.c#4 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_node.h#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_proto.h#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_radiotap.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_scan.h#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_superg.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_tdma.c#3 integrate .. //depot/projects/usb_buf/src/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/usb_buf/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/usb_buf/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#3 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/usb_buf/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/usb_buf/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/accf_data.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/accf_dns.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/accf_http.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/igmp.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/in.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/ip_input.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6.h#3 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet6/in6_rmx.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/usb_buf/src/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/nd6.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/nd6_rtr.c#2 integrate .. //depot/projects/usb_buf/src/sys/netinet6/vinet6.h#2 integrate .. //depot/projects/usb_buf/src/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/usb_buf/src/sys/netipx/ipx_input.c#2 integrate .. //depot/projects/usb_buf/src/sys/netnatm/natm_proto.c#2 integrate .. //depot/projects/usb_buf/src/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/bootp_subr.c#4 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/usb_buf/src/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/usb_buf/src/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/usb_buf/src/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/usb_buf/src/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/usb_buf/src/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/usb_buf/src/sys/pc98/conf/MAC#2 delete .. //depot/projects/usb_buf/src/sys/pci/if_rl.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/aim/machdep.c#3 integrate .. //depot/projects/usb_buf/src/sys/powerpc/booke/machdep.c#4 integrate .. //depot/projects/usb_buf/src/sys/powerpc/conf/GENERIC#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/conf/MAC#2 delete .. //depot/projects/usb_buf/src/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/cpufreq/dfs.c#1 branch .. //depot/projects/usb_buf/src/sys/powerpc/mpc85xx/atpic.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/ofw/ofw_cpu.c#1 branch .. //depot/projects/usb_buf/src/sys/powerpc/powermac/pmu.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powermac/vcoregpio.c#1 branch .. //depot/projects/usb_buf/src/sys/powerpc/powerpc/cpu.c#2 integrate .. //depot/projects/usb_buf/src/sys/powerpc/powerpc/uio_machdep.c#1 branch .. //depot/projects/usb_buf/src/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/usb_buf/src/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/usb_buf/src/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/usb_buf/src/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/usb_buf/src/sys/rpc/xdr.h#3 integrate .. //depot/projects/usb_buf/src/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/usb_buf/src/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/usb_buf/src/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/usb_buf/src/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/usb_buf/src/sys/sparc64/conf/MAC#2 delete .. //depot/projects/usb_buf/src/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/usb_buf/src/sys/sun4v/conf/MAC#2 delete .. //depot/projects/usb_buf/src/sys/sys/buf.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/conf.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/cpu.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/mount.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/param.h#5 integrate .. //depot/projects/usb_buf/src/sys/sys/pcpu.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/priv.h#4 integrate .. //depot/projects/usb_buf/src/sys/sys/sglist.h#1 branch .. //depot/projects/usb_buf/src/sys/sys/sockbuf.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/socketvar.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/sockio.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/usb_buf/src/sys/sys/sysent.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/ucred.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/user.h#2 integrate .. //depot/projects/usb_buf/src/sys/sys/vimage.h#5 integrate .. //depot/projects/usb_buf/src/sys/sys/vnode.h#2 integrate .. //depot/projects/usb_buf/src/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/usb_buf/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/usb_buf/src/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/usb_buf/src/sys/xen/evtchn/evtchn.c#2 integrate .. //depot/projects/usb_buf/src/usr.sbin/usbconfig/Makefile#2 integrate .. //depot/projects/usb_buf/src/usr.sbin/usbconfig/dump.c#2 integrate .. //depot/projects/usb_buf/src/usr.sbin/usbconfig/dump.h#2 integrate .. //depot/projects/usb_buf/src/usr.sbin/usbconfig/usbconfig.8#3 integrate .. //depot/projects/usb_buf/src/usr.sbin/usbconfig/usbconfig.c#2 integrate Differences ... ==== //depot/projects/usb_buf/src/lib/libusb/libusb.3#5 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.2 2009/04/05 18:30:24 thompsa Exp $ +.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.5 2009/06/02 17:27:51 thompsa Exp $ .\" .Dd May 28, 2009 .Dt LIBUSB 3 @@ -111,7 +111,7 @@ .Ft const char * .Fn libusb20_dev_get_backend_name "struct libusb20_device *" .Ft int -.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb2_device_info *pinfo" +.Fn libusb20_dev_get_info "struct libusb20_device *pdev" "struct usb_device_info *pinfo" .Ft int .Fn libusb20_dev_get_iface_desc "struct libusb20_device *pdev" "uint8_t iface_index" "char *buf" "uint8_t len" .Ft const char * @@ -489,7 +489,7 @@ .Pp . .Fn libusb20_dev_get_info -retrives the BSD specific usb2_device_info structure into the memory location given by +retrives the BSD specific usb_device_info structure into the memory location given by .Fa pinfo . The USB device given by .Fa pdev ==== //depot/projects/usb_buf/src/lib/libusb/libusb20.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.3 2009/06/02 17:27:51 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -931,7 +931,7 @@ int libusb20_dev_get_info(struct libusb20_device *pdev, - struct usb2_device_info *pinfo) + struct usb_device_info *pinfo) { if (pinfo == NULL) return (LIBUSB20_ERROR_INVALID_PARAM); ==== //depot/projects/usb_buf/src/lib/libusb/libusb20.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.2 2009/03/17 21:20:39 delphij Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.4 2009/06/02 17:27:51 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. @@ -175,7 +175,7 @@ LIBUSB20_POWER_RESUME, }; -struct usb2_device_info; +struct usb_device_info; struct libusb20_transfer; struct libusb20_backend; struct libusb20_backend_methods; @@ -254,7 +254,7 @@ int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode); uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev); int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index); -int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb2_device_info *pinfo); +int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb_device_info *pinfo); int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); struct LIBUSB20_DEVICE_DESC_DECODED *libusb20_dev_get_device_desc(struct libusb20_device *pdev); ==== //depot/projects/usb_buf/src/lib/libusb/libusb20_int.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_int.h,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -49,7 +49,7 @@ typedef int (libusb20_root_add_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); typedef int (libusb20_root_remove_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); typedef int (libusb20_close_device_t)(struct libusb20_device *pdev); -typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb2_device_info *pinfo); +typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb_device_info *pinfo); typedef int (libusb20_dev_get_iface_desc_t)(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); typedef int (libusb20_init_backend_t)(struct libusb20_backend *pbe); typedef int (libusb20_open_device_t)(struct libusb20_device *pdev, uint16_t transfer_count_max); ==== //depot/projects/usb_buf/src/lib/libusb/libusb20_ugen20.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.1 2009/03/09 17:09:46 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20_ugen20.c,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -126,8 +126,8 @@ ugen20_enumerate(struct libusb20_device *pdev, const char *id) { const char *tmp = id; - struct usb2_device_descriptor ddesc; - struct usb2_device_info devinfo; + struct usb_device_descriptor ddesc; + struct usb_device_info devinfo; uint32_t plugtime; char buf[64]; int f; @@ -213,7 +213,7 @@ } struct ugen20_urd_state { - struct usb2_read_dir urd; + struct usb_read_dir urd; uint32_t nparsed; int f; uint8_t *ptr; @@ -298,7 +298,7 @@ static void ugen20_tr_release(struct libusb20_device *pdev) { - struct usb2_fs_uninit fs_uninit; + struct usb_fs_uninit fs_uninit; if (pdev->nTransfer == 0) { return; @@ -316,8 +316,8 @@ static int ugen20_tr_renew(struct libusb20_device *pdev) { - struct usb2_fs_init fs_init; - struct usb2_fs_endpoint *pfse; + struct usb_fs_init fs_init; + struct usb_fs_endpoint *pfse; int error; uint32_t size; uint16_t nMaxTransfer; @@ -419,7 +419,7 @@ static int ugen20_close_device(struct libusb20_device *pdev) { - struct usb2_fs_uninit fs_uninit; + struct usb_fs_uninit fs_uninit; if (pdev->privBeData) { memset(&fs_uninit, 0, sizeof(fs_uninit)); @@ -447,8 +447,8 @@ ugen20_get_config_desc_full(struct libusb20_device *pdev, uint8_t **ppbuf, uint16_t *plen, uint8_t cfg_index) { - struct usb2_gen_descriptor gen_desc; - struct usb2_config_descriptor cdesc; + struct usb_gen_descriptor gen_desc; + struct usb_config_descriptor cdesc; uint8_t *ptr; uint16_t len; int error; @@ -542,7 +542,7 @@ ugen20_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index) { - struct usb2_alt_interface alt_iface; + struct usb_alt_interface alt_iface; memset(&alt_iface, 0, sizeof(alt_iface)); @@ -663,7 +663,7 @@ struct LIBUSB20_CONTROL_SETUP_DECODED *setup, void *data, uint16_t *pactlen, uint32_t timeout, uint8_t flags) { - struct usb2_ctl_request req; + struct usb_ctl_request req; memset(&req, 0, sizeof(req)); @@ -688,8 +688,8 @@ static int ugen20_process(struct libusb20_device *pdev) { - struct usb2_fs_complete temp; - struct usb2_fs_endpoint *fsep; + struct usb_fs_complete temp; + struct usb_fs_endpoint *fsep; struct libusb20_transfer *xfer; while (1) { @@ -739,8 +739,8 @@ ugen20_tr_open(struct libusb20_transfer *xfer, uint32_t MaxBufSize, uint32_t MaxFrameCount, uint8_t ep_no) { - struct usb2_fs_open temp; - struct usb2_fs_endpoint *fsep; + struct usb_fs_open temp; + struct usb_fs_endpoint *fsep; memset(&temp, 0, sizeof(temp)); @@ -772,7 +772,7 @@ static int ugen20_tr_close(struct libusb20_transfer *xfer) { - struct usb2_fs_close temp; + struct usb_fs_close temp; memset(&temp, 0, sizeof(temp)); @@ -787,7 +787,7 @@ static int ugen20_tr_clear_stall_sync(struct libusb20_transfer *xfer) { - struct usb2_fs_clear_stall_sync temp; + struct usb_fs_clear_stall_sync temp; memset(&temp, 0, sizeof(temp)); @@ -804,8 +804,8 @@ static void ugen20_tr_submit(struct libusb20_transfer *xfer) { - struct usb2_fs_start temp; - struct usb2_fs_endpoint *fsep; + struct usb_fs_start temp; + struct usb_fs_endpoint *fsep; memset(&temp, 0, sizeof(temp)); @@ -839,7 +839,7 @@ static void ugen20_tr_cancel_async(struct libusb20_transfer *xfer) { - struct usb2_fs_stop temp; + struct usb_fs_stop temp; memset(&temp, 0, sizeof(temp)); @@ -876,7 +876,7 @@ ugen20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len) { - struct usb2_gen_descriptor ugd; + struct usb_gen_descriptor ugd; memset(&ugd, 0, sizeof(ugd)); @@ -892,7 +892,7 @@ static int ugen20_dev_get_info(struct libusb20_device *pdev, - struct usb2_device_info *pinfo) + struct usb_device_info *pinfo) { if (ioctl(pdev->file, USB_GET_DEVICEINFO, pinfo)) { return (LIBUSB20_ERROR_INVALID_PARAM); @@ -904,7 +904,7 @@ ugen20_root_get_dev_quirk(struct libusb20_backend *pbe, uint16_t quirk_index, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); @@ -931,7 +931,7 @@ ugen20_root_get_quirk_name(struct libusb20_backend *pbe, uint16_t quirk_index, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); @@ -954,7 +954,7 @@ ugen20_root_add_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); @@ -978,7 +978,7 @@ ugen20_root_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq) { - struct usb2_gen_quirk q; + struct usb_gen_quirk q; int error; memset(&q, 0, sizeof(q)); ==== //depot/projects/usb_buf/src/lib/libusbhid/descr.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.11 2009/02/27 15:30:42 thompsa Exp $"); +__FBSDID("$FreeBSD: src/lib/libusbhid/descr.c,v 1.12 2009/05/28 20:21:01 thompsa Exp $"); #include @@ -76,7 +76,7 @@ report_desc_t hid_get_report_desc(int fd) { - struct usb2_gen_descriptor ugd; + struct usb_gen_descriptor ugd; report_desc_t rep; void *data; ==== //depot/projects/usb_buf/src/sys/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.525 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.526 2009/06/02 18:31:08 rwatson Exp $ cpu HAMMER ident GENERIC @@ -70,6 +70,7 @@ options STOP_NMI # Stop CPUS using NMI instead of IPI options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing +options MAC # TrustedBSD MAC Framework #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks ==== //depot/projects/usb_buf/src/sys/amd64/linux32/linux.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.28 2009/05/16 18:48:41 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.29 2009/06/01 20:48:39 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -669,6 +669,7 @@ #define LINUX_GETSOCKOPT 15 #define LINUX_SENDMSG 16 #define LINUX_RECVMSG 17 +#define LINUX_ACCEPT4 18 #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 ==== //depot/projects/usb_buf/src/sys/amd64/linux32/linux32_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.40 2009/06/01 16:14:38 rwatson Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -19,321 +19,321 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = setup */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ - { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0 }, /* 2 = linux_fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ - { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = linux_chdir */ - { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0 }, /* 13 = linux_time */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = linux_chmod */ - { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0 }, /* 16 = linux_lchown16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ - { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0 }, /* 18 = linux_stat */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = linux_oldumount */ - { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0 }, /* 23 = linux_setuid16 */ - { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0 }, /* 24 = linux_getuid16 */ - { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 25 = linux_stime */ - { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = linux_ptrace */ - { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0 }, /* 27 = linux_alarm */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 28 = fstat */ - { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0 }, /* 29 = linux_pause */ - { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0 }, /* 30 = linux_utime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 31 = stty */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 32 = gtty */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = linux_access */ - { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0 }, /* 34 = linux_nice */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 35 = ftime */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ - { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0 }, /* 37 = linux_kill */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0 }, /* 38 = linux_rename */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 39 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 40 = linux_rmdir */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ - { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = linux_pipe */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0 }, /* 43 = linux_times */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0 }, /* 45 = linux_brk */ - { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0 }, /* 46 = linux_setgid16 */ - { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0 }, /* 47 = linux_getgid16 */ - { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0 }, /* 48 = linux_signal */ - { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0 }, /* 49 = linux_geteuid16 */ - { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0 }, /* 50 = linux_getegid16 */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0 }, /* 52 = linux_umount */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = linux_ioctl */ - { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 55 = linux_fcntl */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 56 = mpx */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 57 = setpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 58 = ulimit */ - { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0 }, /* 59 = linux_olduname */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0 }, /* 62 = linux_ustat */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 63 = dup2 */ - { 0, (sy_call_t *)linux_getppid, AUE_GETPPID, NULL, 0, 0 }, /* 64 = linux_getppid */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 65 = getpgrp */ - { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 66 = setsid */ - { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0 }, /* 67 = linux_sigaction */ - { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0 }, /* 68 = linux_sgetmask */ - { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0 }, /* 69 = linux_ssetmask */ - { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0 }, /* 70 = linux_setreuid16 */ - { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0 }, /* 71 = linux_setregid16 */ - { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 72 = linux_sigsuspend */ - { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0 }, /* 73 = linux_sigpending */ - { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0 }, /* 74 = linux_sethostname */ - { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 75 = linux_setrlimit */ - { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 76 = linux_old_getrlimit */ - { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 77 = linux_getrusage */ - { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL, NULL, 0, 0 }, /* 78 = linux_gettimeofday */ - { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 79 = linux_settimeofday */ - { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0 }, /* 80 = linux_getgroups16 */ - { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0 }, /* 81 = linux_setgroups16 */ - { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0 }, /* 82 = linux_old_select */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 83 = linux_symlink */ - { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0 }, /* 84 = linux_lstat */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0 }, /* 85 = linux_readlink */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 89 = linux_readdir */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ - { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 93 = linux_ftruncate */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 94 = fchmod */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 95 = fchown */ - { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 96 = linux_getpriority */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 97 = setpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 98 = profil */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0 }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 100 = linux_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 101 = ioperm */ - { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0 }, /* 102 = linux_socketcall */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0 }, /* 103 = linux_syslog */ - { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 104 = linux_setitimer */ - { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 105 = linux_getitimer */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0 }, /* 106 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ - { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ - { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = vm86old */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 114 = linux_wait4 */ - { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 115 = linux_swapoff */ - { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0 }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0 }, /* 117 = linux_ipc */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */ - { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */ - { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */ - { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = linux_setdomainname */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 123 = modify_ldt */ - { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 125 = linux_mprotect */ - { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 126 = linux_sigprocmask */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0 }, /* 127 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0 }, /* 128 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0 }, /* 129 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0 }, /* 130 = linux_get_kernel_syms */ - { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 131 = linux_quotactl */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 132 = getpgid */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 133 = fchdir */ - { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0 }, /* 134 = linux_bdflush */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0 }, /* 135 = linux_sysfs */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0 }, /* 136 = linux_personality */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 137 = afs_syscall */ - { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ - { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ - { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 141 = linux_getdents */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ - { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV, NULL, 0, 0 }, /* 145 = linux_readv */ - { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV, NULL, 0, 0 }, /* 146 = linux_writev */ - { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0 }, /* 147 = linux_getsid */ - { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0 }, /* 148 = linux_fdatasync */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 149 = linux_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 150 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 151 = munlock */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 152 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 153 = munlockall */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0 }, /* 154 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0 }, /* 155 = sched_getparam */ - { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0 }, /* 156 = linux_sched_setscheduler */ - { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0 }, /* 157 = linux_sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 158 = sched_yield */ - { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0 }, /* 159 = linux_sched_get_priority_max */ - { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0 }, /* 160 = linux_sched_get_priority_min */ - { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0 }, /* 161 = linux_sched_rr_get_interval */ - { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = linux_nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0 }, /* 163 = linux_mremap */ - { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0 }, /* 164 = linux_setresuid16 */ - { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0 }, /* 165 = linux_getresuid16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 166 = vm86 */ - { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0 }, /* 167 = linux_query_module */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 168 = poll */ - { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ - { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ - { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ - { AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ - { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ - { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ - { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ - { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ - { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ - { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 181 = linux_pwrite */ - { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 }, /* 182 = linux_chown16 */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 }, /* 185 = linux_capset */ - { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 }, /* 186 = linux_sigaltstack */ - { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 187 = linux_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 188 = getpmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 189 = putpmsg */ - { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0 }, /* 190 = linux_vfork */ - { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 191 = linux_getrlimit */ - { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0 }, /* 192 = linux_mmap2 */ - { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0 }, /* 193 = linux_truncate64 */ - { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0 }, /* 194 = linux_ftruncate64 */ - { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0 }, /* 195 = linux_stat64 */ - { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0 }, /* 196 = linux_lstat64 */ - { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0 }, /* 197 = linux_fstat64 */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 198 = linux_lchown */ - { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0 }, /* 199 = linux_getuid */ - { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0 }, /* 200 = linux_getgid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 201 = geteuid */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 202 = getegid */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 203 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 204 = setregid */ - { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 205 = linux_getgroups */ - { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 206 = linux_setgroups */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0 }, /* 207 = fchown */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 208 = setresuid */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 209 = getresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 210 = setresgid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 211 = getresgid */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0 }, /* 212 = linux_chown */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 213 = setuid */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 214 = setgid */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0 }, /* 215 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0 }, /* 216 = linux_setfsgid */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 220 = linux_getdents64 */ - { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ - { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0 }, /* 224 = linux_gettid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 225 = linux_readahead */ - { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0 }, /* 226 = linux_setxattr */ - { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0 }, /* 227 = linux_lsetxattr */ - { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0 }, /* 228 = linux_fsetxattr */ - { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0 }, /* 229 = linux_getxattr */ - { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0 }, /* 230 = linux_lgetxattr */ - { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0 }, /* 231 = linux_fgetxattr */ - { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0 }, /* 232 = linux_listxattr */ - { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0 }, /* 233 = linux_llistxattr */ - { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0 }, /* 234 = linux_flistxattr */ - { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0 }, /* 235 = linux_removexattr */ - { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0 }, /* 236 = linux_lremovexattr */ - { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0 }, /* 237 = linux_fremovexattr */ - { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0 }, /* 238 = linux_tkill */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ - { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ - { AS(linux_sched_setaffinity_args), (sy_call_t *)linux_sched_setaffinity, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ - { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ - { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 248 = inux_io_submit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0 }, /* 250 = linux_fadvise64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ - { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ - { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ - { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0 }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0 }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0 }, /* 263 = linux_timer_delete */ - { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ - { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ - { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ - { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ - { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0 }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ - { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ - { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ - { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0 }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0 }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0 }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0 }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0 }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0 }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0 }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0 }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = */ - { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0 }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0 }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0 }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0 }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0 }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0 }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ - { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ - { AS(linux_mkdirat_args), (sy_call_t *)linux_mkdirat, AUE_MKDIRAT, NULL, 0, 0 }, /* 296 = linux_mkdirat */ - { AS(linux_mknodat_args), (sy_call_t *)linux_mknodat, AUE_MKNODAT, NULL, 0, 0 }, /* 297 = linux_mknodat */ - { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_FCHOWNAT, NULL, 0, 0 }, /* 298 = linux_fchownat */ - { AS(linux_futimesat_args), (sy_call_t *)linux_futimesat, AUE_FUTIMESAT, NULL, 0, 0 }, /* 299 = linux_futimesat */ - { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_FSTATAT, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ - { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 301 = linux_unlinkat */ - { AS(linux_renameat_args), (sy_call_t *)linux_renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 302 = linux_renameat */ - { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_LINKAT, NULL, 0, 0 }, /* 303 = linux_linkat */ - { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 304 = linux_symlinkat */ - { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_READLINKAT, NULL, 0, 0 }, /* 305 = linux_readlinkat */ - { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_FCHMODAT, NULL, 0, 0 }, /* 306 = linux_fchmodat */ - { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_FACCESSAT, NULL, 0, 0 }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ - { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 }, /* 311 = linux_set_robust_list */ - { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 }, /* 312 = linux_get_robust_list */ - { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0 }, /* 313 = linux_splice */ - { 0, (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0 }, /* 314 = linux_sync_file_range */ - { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0 }, /* 315 = linux_tee */ - { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0 }, /* 316 = linux_vmsplice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = setup */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0, 0 }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, 0 }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, 0 }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0, 0 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0, 0 }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0, 0 }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0, 0 }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0, 0 }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0, 0 }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0, 0 }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0, 0 }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 16 = linux_lchown16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 17 = break */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0, 0 }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 19 = linux_lseek */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 3 15:52:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D2701065675; Wed, 3 Jun 2009 15:52: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 C0779106564A for ; Wed, 3 Jun 2009 15:52:19 +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 AD4818FC18 for ; Wed, 3 Jun 2009 15:52:19 +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 n53FqJvF069837 for ; Wed, 3 Jun 2009 15:52:19 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53FqJmS069835 for perforce@freebsd.org; Wed, 3 Jun 2009 15:52:19 GMT (envelope-from zec@fer.hr) Date: Wed, 3 Jun 2009 15:52:19 GMT Message-Id: <200906031552.n53FqJmS069835@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 163422 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 15:52:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=163422 Change 163422 by zec@zec_amdx4 on 2009/06/03 15:51:20 IFC @ 163417 Affected files ... .. //depot/projects/vimage/src/share/man/man4/ch.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/ip.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/msk.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/pcm.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/scsi.4#2 integrate .. //depot/projects/vimage/src/share/man/man5/src.conf.5#4 integrate .. //depot/projects/vimage/src/share/man/man9/Makefile#7 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_ACCESS.9#4 integrate .. //depot/projects/vimage/src/share/man/man9/sglist.9#1 branch .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#31 integrate .. //depot/projects/vimage/src/sys/amd64/conf/MAC#2 delete .. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#15 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysent.c#10 integrate .. //depot/projects/vimage/src/sys/boot/common/boot.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biosdisk.c#7 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#21 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_socket.c#23 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#52 integrate .. //depot/projects/vimage/src/sys/conf/files#70 integrate .. //depot/projects/vimage/src/sys/conf/options#51 integrate .. //depot/projects/vimage/src/sys/contrib/dev/mwl/LICENSE#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/mwl/Makefile#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/mwl/mw88W8363.fw.uu#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/mwl/mwlboot.fw.uu#1 branch .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#23 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#3 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#3 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#15 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#38 integrate .. //depot/projects/vimage/src/sys/dev/bwi/if_bwi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#23 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#27 integrate .. //depot/projects/vimage/src/sys/dev/ksyms/ksyms.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mii/e1000phy.c#8 integrate .. //depot/projects/vimage/src/sys/dev/mii/e1000phyreg.h#5 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#19 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#11 integrate .. //depot/projects/vimage/src/sys/dev/mwl/if_mwl.c#1 branch .. //depot/projects/vimage/src/sys/dev/mwl/if_mwl_pci.c#1 branch .. //depot/projects/vimage/src/sys/dev/mwl/if_mwlioctl.h#1 branch .. //depot/projects/vimage/src/sys/dev/mwl/if_mwlvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/mwl/mwldiag.h#1 branch .. //depot/projects/vimage/src/sys/dev/mwl/mwlhal.c#1 branch .. //depot/projects/vimage/src/sys/dev/mwl/mwlhal.h#1 branch .. //depot/projects/vimage/src/sys/dev/mwl/mwlreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#17 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#12 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#24 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcivar.h#8 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#12 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#32 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scterm-teken.c#5 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.c#5 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.h#4 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#10 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#10 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clbio.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_fs.h#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_lookup.c#4 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#15 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#34 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux.h#13 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysent.c#10 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#14 integrate .. //depot/projects/vimage/src/sys/ia64/conf/MAC#2 delete .. //depot/projects/vimage/src/sys/kern/init_sysent.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#21 integrate .. //depot/projects/vimage/src/sys/kern/kern_descrip.c#27 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#18 integrate .. //depot/projects/vimage/src/sys/kern/kern_poll.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#25 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#18 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#17 integrate .. //depot/projects/vimage/src/sys/kern/makesyscalls.sh#5 integrate .. //depot/projects/vimage/src/sys/kern/subr_sglist.c#1 branch .. //depot/projects/vimage/src/sys/kern/sys_socket.c#16 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#11 integrate .. //depot/projects/vimage/src/sys/kern/uipc_shm.c#6 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#13 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#36 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#28 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#26 integrate .. //depot/projects/vimage/src/sys/kern/vfs_aio.c#10 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#25 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#27 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#34 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#48 integrate .. //depot/projects/vimage/src/sys/modules/mwl/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/mwlfw/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/Makefile#12 integrate .. //depot/projects/vimage/src/sys/net/if.c#84 integrate .. //depot/projects/vimage/src/sys/net/netisr.c#17 integrate .. //depot/projects/vimage/src/sys/net/netisr.h#8 integrate .. //depot/projects/vimage/src/sys/net/route.c#50 integrate .. //depot/projects/vimage/src/sys/net/route.h#10 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#36 integrate .. //depot/projects/vimage/src/sys/net/vnet.h#26 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#35 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#25 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#23 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#17 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#25 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_monitor.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#16 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#19 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#17 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_radiotap.c#3 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.h#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#29 integrate .. //depot/projects/vimage/src/sys/netatalk/ddp_input.c#4 integrate .. //depot/projects/vimage/src/sys/netatalk/ddp_usrreq.c#6 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#8 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ksocket.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/accf_data.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/accf_dns.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/accf_http.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#45 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#41 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#11 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#58 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#34 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#32 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#58 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#38 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#47 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#53 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#54 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.h#12 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#40 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#35 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#36 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#57 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#51 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#35 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#37 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#20 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_input.c#7 integrate .. //depot/projects/vimage/src/sys/netnatm/natm_proto.c#4 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_trantcp.c#6 integrate .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#18 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#14 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_socket.c#18 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs.h#8 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsock.c#11 integrate .. //depot/projects/vimage/src/sys/nfsserver/nfs_syscalls.c#16 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#22 integrate .. //depot/projects/vimage/src/sys/pc98/conf/MAC#2 delete .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#23 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/MAC#2 delete .. //depot/projects/vimage/src/sys/rpc/clnt_dg.c#5 integrate .. //depot/projects/vimage/src/sys/rpc/clnt_vc.c#5 integrate .. //depot/projects/vimage/src/sys/rpc/svc_dg.c#6 integrate .. //depot/projects/vimage/src/sys/rpc/svc_vc.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#12 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#16 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#23 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/MAC#2 delete .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#18 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/MAC#2 delete .. //depot/projects/vimage/src/sys/sys/buf.h#8 integrate .. //depot/projects/vimage/src/sys/sys/conf.h#17 integrate .. //depot/projects/vimage/src/sys/sys/param.h#55 integrate .. //depot/projects/vimage/src/sys/sys/pcpu.h#11 integrate .. //depot/projects/vimage/src/sys/sys/priv.h#17 integrate .. //depot/projects/vimage/src/sys/sys/sglist.h#1 branch .. //depot/projects/vimage/src/sys/sys/sockbuf.h#2 integrate .. //depot/projects/vimage/src/sys/sys/socketvar.h#14 integrate .. //depot/projects/vimage/src/sys/sys/sysent.h#10 integrate .. //depot/projects/vimage/src/sys/sys/ucred.h#10 integrate .. //depot/projects/vimage/src/sys/sys/user.h#11 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#23 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/dirhash.h#4 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_dirhash.c#9 integrate .. //depot/projects/vimage/src/sys/vm/vm_contig.c#10 integrate .. //depot/projects/vimage/src/sys/vm/vm_mmap.c#19 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#17 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/ch.4#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man4/ch.4,v 1.35 2005/01/21 20:51:09 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ch.4,v 1.36 2009/06/01 06:52:03 jmallett Exp $ .\" Copyright (c) 1996 .\" Julian Elischer . All rights reserved. .\" @@ -32,7 +32,6 @@ .Nd SCSI media-changer (juke box) driver .Sh SYNOPSIS .Cd device ch -.Cd device ch1 target 4 unit 0 .Sh DESCRIPTION The .Nm @@ -67,13 +66,12 @@ .Xr scsi 4 for details on kernel configuration. .Sh KERNEL CONFIGURATION -In configuring, if an optional -.Ar count -is given in the specification, that number of SCSI media changers -are configured; Most storage for them is allocated only when found -so a large number of configured devices is cheap. -(once the first -has included the driver). +It is only necessary to explicitly configure one +.Nm +device; data structures are dynamically allocated as media changes are found +on the +.Tn SCSI +bus. .Sh IOCTLS User mode programs communicate with the changer driver through a number of ioctls which are described below. ==== //depot/projects/vimage/src/share/man/man4/ip.4#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.51 2009/03/09 17:53:05 bms Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.52 2009/06/01 10:30:52 pjd Exp $ .\" -.Dd March 9, 2009 +.Dd June 1, 2009 .Dt IP 4 .Os .Sh NAME @@ -243,6 +243,23 @@ .Dv IP_ONESBCAST option has no effect. .Pp If the +.Dv IP_BINDANY +option is enabled on a +.Dv SOCK_STREAM , +.Dv SOCK_DGRAM +or a +.Dv SOCK_RAW +socket, one can +.Xr bind 2 +to any address, even one not bound to any available network interface in the +system. +This functionality (in conjunction with special firewall rules) can be used for +implementing a transparent proxy. +The +.Dv PRIV_NETINET_BINDANY +privilege is needed to set this option. +.Pp +If the .Dv IP_RECVTTL option is enabled on a .Dv SOCK_DGRAM ==== //depot/projects/vimage/src/share/man/man4/msk.4#3 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/msk.4,v 1.8 2009/05/25 08:27:52 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/msk.4,v 1.9 2009/06/02 05:13:02 yongari Exp $ .\" -.Dd May 25, 2009 +.Dd June 2, 2009 .Dt MSK 4 .Os .Sh NAME @@ -202,7 +202,11 @@ .It Marvell Yukon 88E8058 Gigabit Ethernet .It -Marvell Yukon 88E8070 Fast Ethernet +Marvell Yukon 88E8070 Gigabit Ethernet +.It +Marvell Yukon 88E8071 Gigabit Ethernet +.It +Marvell Yukon 88E8072 Gigabit Ethernet .It SysKonnect SK-9Sxx Gigabit Ethernet .It ==== //depot/projects/vimage/src/share/man/man4/pcm.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.52 2007/06/23 14:34:30 joel Exp $ +.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.53 2009/06/01 18:58:46 joel Exp $ .\" -.Dd June 23, 2007 +.Dd June 1, 2009 .Dt SOUND 4 .Os .Sh NAME @@ -51,16 +51,6 @@ hint.pcm.0.flags="0x0" .Ed .Sh DESCRIPTION -.Bf -emphasis -Note: There exists some ambiguity in the naming at the moment -.Pq Nm sound , pcm , snd . -It will be resolved soon by renaming -.Cd "device sound" -to -.Cd "device snd" , -and doing associated changes. -.Ef -.Pp The .Nm driver provides support for @@ -170,6 +160,42 @@ .Va dev.pcm.* are device specific. .Bl -tag -width ".Va hw.snd.report_soft_formats" -offset indent +.It Va hw.snd.compat_linux_mmap +Enable to allow PROT_EXEC page mappings. +All Linux applications using sound and +.Xr mmap 2 +require this. +.It Va hw.snd.default_auto +Enable to automatically assign default sound unit to the most recent +attached device. +.It Va hw.snd.default_unit +Default sound card for systems with multiple sound cards. +When using +.Xr devfs 5 , +the default device for +.Pa /dev/dsp . +Equivalent to a symlink from +.Pa /dev/dsp +to +.Pa /dev/dsp Ns Va ${hw.snd.default_unit} . +.It Va hw.snd.feeder_rate_max +Maximum allowable sample rate. +.It Va hw.snd.feeder_rate_min +Minimum allowable sample rate. +.It Va hw.snd.feeder_rate_round +Sample rate rounding threshold, to avoid large prime division at the +cost of accuracy. +All requested sample rates will be rounded to the nearest threshold value. +Possible values range between 0 (disabled) and 500. +Default is 25. +.It Va hw.snd.latency +Configure the buffering latency. +Only affects applications that do not explicitly request +blocksize / fragments. +This tunable provides finer granularity than the +.Va hw.snd.latency_profile +tunable. +Possible values range between 0 (lowest latency) and 10 (highest latency). .It Va hw.snd.latency_profile Define sets of buffering latency conversion tables for the .Va hw.snd.latency @@ -178,34 +204,23 @@ in possible underruns if the application cannot keep up with a rapid irq rate, especially during high workload. The default value is 1, which is considered a moderate/safe latency profile. -.It Va hw.snd.latency -Configure the buffering latency. -Only affects applications that do not explicitly request -blocksize / fragments. -This tunable provides finer granularity than the -.Va hw.snd.latency_profile -tunable. -Possible values range between 0 (lowest latency) and 10 (highest latency). +.It Va hw.snd.maxautovchans +Global +.Tn VCHAN +setting that only affects devices with at least one playback or recording channel available. +The sound system will dynamically create up this many +.Tn VCHANs . +Set to +.Dq 0 +if no +.Tn VCHANS +are desired. +Maximum value is 256. .It Va hw.snd.report_soft_formats Controls the internal format conversion if it is available transparently to the application software. When disabled or not available, the application will only be able to select formats the device natively supports. -.It Va hw.snd.compat_linux_mmap -Enable to allow PROT_EXEC page mappings. -All Linux applications using sound and -.Xr mmap 2 -require this. -.It Va hw.snd.feeder_rate_round -Sample rate rounding threshold, to avoid large prime division at the -cost of accuracy. -All requested sample rates will be rounded to the nearest threshold value. -Possible values range between 0 (disabled) and 500. -Default is 25. -.It Va hw.snd.feeder_rate_max -Maximum allowable sample rate. -.It Va hw.snd.feeder_rate_min -Minimum allowable sample rate. .It Va hw.snd.verbose Level of verbosity for the .Pa /dev/sndstat @@ -228,31 +243,6 @@ .It 4 Various messages intended for debugging. .El -.It Va hw.snd.maxautovchans -Global -.Tn VCHAN -setting that only affects devices with at least one playback or recording channel available. -The sound system will dynamically create up this many -.Tn VCHANs . -Set to -.Dq 0 -if no -.Tn VCHANS -are desired. -Maximum value is 256. -.It Va hw.snd.default_unit -Default sound card for systems with multiple sound cards. -When using -.Xr devfs 5 , -the default device for -.Pa /dev/dsp . -Equivalent to a symlink from -.Pa /dev/dsp -to -.Pa /dev/dsp Ns Va ${hw.snd.default_unit} . -.It Va hw.snd.default_auto -Enable to automatically assign default sound unit to the most recent -attached device. .It Va dev.pcm.%d.[play|rec].vchans The current number of .Tn VCHANs @@ -264,18 +254,18 @@ will disable .Tn VCHANs for this device. +.It Va dev.pcm.%d.[play|rec].vchanformat +Format for +.Tn VCHAN +mixing. +All playback paths will be converted to this format before the mixing +process begins. .It Va dev.pcm.%d.[play|rec].vchanrate Sample rate speed for .Tn VCHAN mixing. All playback paths will be converted to this sample rate before the mixing process begins. -.It Va dev.pcm.%d.[play|rec].vchanformat -Format for -.Tn VCHAN -mixing. -All playback paths will be converted to this format before the mixing -process begins. .It Va dev.pcm.%d.polling Experimental polling mode support where the driver operates by querying the device state on each tick using a ==== //depot/projects/vimage/src/share/man/man4/scsi.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/scsi.4,v 1.32 2005/02/17 16:01:20 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/scsi.4,v 1.33 2009/06/01 06:52:03 jmallett Exp $ .Dd October 15, 1998 .Dt SCSI 4 .Os @@ -150,7 +150,7 @@ .Pp All devices and the SCSI busses support boot time allocation so that an upper number of devices and controllers does not need to be configured; -.Cd "device da0" +.Cd "device da" will suffice for any number of disk drivers. .Pp The devices are either ==== //depot/projects/vimage/src/share/man/man5/src.conf.5#4 (text) ==== @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 188848 2009-02-20 11:09:55Z mtm -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.33 2009/04/05 22:15:35 ed Exp $ -.Dd April 5, 2009 +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.34 2009/06/01 22:14:45 dougb Exp $ +.Dd June 1, 2009 .Dt SRC.CONF 5 .Os .Sh NAME @@ -150,8 +150,15 @@ .\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_ETC 156932 2006-03-21 07:50:50Z ru Set to avoid installing the default files to .Pa /var/named/etc/namedb . +.It Va WITH_BIND_IDN +.\" from FreeBSD: head/tools/build/options/WITH_BIND_IDN 193280 2009-06-01 21:58:59Z dougb +Set to enable IDN support for dig, host, and nslookup. +This requires ports/dns/idnkit to be installed in /usr/local. +.It Va WITH_BIND_LARGE_FILE +.\" from FreeBSD: head/tools/build/options/WITH_BIND_LARGE_FILE 193280 2009-06-01 21:58:59Z dougb +Set to enable 64-bit file support. .It Va WITH_BIND_LIBS -.\" from FreeBSD: head/tools/build/options/WITH_BIND_LIBS 156932 2006-03-21 07:50:50Z ru +.\" from FreeBSD: head/tools/build/options/WITH_BIND_LIBS 193280 2009-06-01 21:58:59Z dougb Set to install BIND libraries and include files. .It Va WITHOUT_BIND_LIBS_LWRES .\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_LIBS_LWRES 156932 2006-03-21 07:50:50Z ru @@ -182,6 +189,9 @@ .Xr rndc 8 , and .Xr rndc-confgen 8 . +.It Va WITH_BIND_SIGCHASE +.\" from FreeBSD: head/tools/build/options/WITH_BIND_SIGCHASE 193280 2009-06-01 21:58:59Z dougb +Set to enable DNSSEC validation support for dig, host, and nslookup. .It Va WITHOUT_BIND_UTILS .\" from FreeBSD: head/tools/build/options/WITHOUT_BIND_UTILS 156932 2006-03-21 07:50:50Z ru Set to avoid building or installing the BIND userland utilities, @@ -190,6 +200,10 @@ .Xr nslookup 1 , and .Xr nsupdate 8 . +.It Va WITH_BIND_XML +.\" from FreeBSD: head/tools/build/options/WITH_BIND_XML 193280 2009-06-01 21:58:59Z dougb +Set to enable the http statistics interface for named. +This requires ports/textproc/libxml2 to be installed in /usr/local. .It Va WITHOUT_BLUETOOTH .\" from FreeBSD: head/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru Set to not build Bluetooth related kernel modules, programs and libraries. ==== //depot/projects/vimage/src/share/man/man9/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.351 2009/05/30 13:59:05 trasz Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.352 2009/06/01 20:35:53 jhb Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -218,6 +218,7 @@ selrecord.9 \ sema.9 \ sf_buf.9 \ + sglist.9 \ signal.9 \ sleep.9 \ sleepqueue.9 \ @@ -1022,6 +1023,24 @@ sf_buf.9 sf_buf_free.9 \ sf_buf.9 sf_buf_kva.9 \ sf_buf.9 sf_buf_page.9 +MLINKS+=sglist.9 sglist_alloc.9 \ + sglist.9 sglist_append.9 \ + sglist.9 sglist_append_mbuf.9 \ + sglist.9 sglist_append_phys.9 \ + sglist.9 sglist_append_uio.9 \ + sglist.9 sglist_append_user.9 \ + sglist.9 sglist_build.9 \ + sglist.9 sglist_clone.9 \ + sglist.9 sglist_consume_uio.9 \ + sglist.9 sglist_count.9 \ + sglist.9 sglist_free.9 \ + sglist.9 sglist_hold.9 \ + sglist.9 sglist_init.9 \ + sglist.9 sglist_join.9 \ + sglist.9 sglist_length.9 \ + sglist.9 sglist_reset.9 \ + sglist.9 sglist_slice.9 \ + sglist.9 sglist_split.9 MLINKS+=signal.9 cursig.9 \ signal.9 execsigs.9 \ signal.9 issignal.9 \ ==== //depot/projects/vimage/src/share/man/man9/VOP_ACCESS.9#4 (text+ko) ==== @@ -27,9 +27,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.25 2009/05/30 13:59:05 trasz Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_ACCESS.9,v 1.26 2009/06/01 07:48:27 trasz Exp $ .\" -.Dd May 30, 2009 +.Dd June 1, 2009 .Os .Dt VOP_ACCESS 9 .Sh NAME @@ -77,7 +77,7 @@ .Dv VADMIN and .Dv VAPPEND . -To check for other bits, one has to use +To check for other flags, one has to use .Fn VOP_ACCESSX instead. .Sh LOCKS ==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#31 (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.525 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.526 2009/06/02 18:31:08 rwatson Exp $ cpu HAMMER ident GENERIC @@ -70,6 +70,7 @@ options STOP_NMI # Stop CPUS using NMI instead of IPI options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing +options MAC # TrustedBSD MAC Framework #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks ==== //depot/projects/vimage/src/sys/amd64/linux32/linux.h#15 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.28 2009/05/16 18:48:41 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.29 2009/06/01 20:48:39 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -669,6 +669,7 @@ #define LINUX_GETSOCKOPT 15 #define LINUX_SENDMSG 16 #define LINUX_RECVMSG 17 +#define LINUX_ACCEPT4 18 #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysent.c#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.40 2009/06/01 16:14:38 rwatson Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -19,321 +19,321 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = setup */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ - { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0 }, /* 2 = linux_fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ - { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = linux_chdir */ - { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0 }, /* 13 = linux_time */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = linux_chmod */ - { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0 }, /* 16 = linux_lchown16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ - { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0 }, /* 18 = linux_stat */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = linux_oldumount */ - { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0 }, /* 23 = linux_setuid16 */ - { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0 }, /* 24 = linux_getuid16 */ - { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 25 = linux_stime */ - { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = linux_ptrace */ - { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0 }, /* 27 = linux_alarm */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 28 = fstat */ - { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0 }, /* 29 = linux_pause */ - { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0 }, /* 30 = linux_utime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 31 = stty */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 32 = gtty */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = linux_access */ - { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0 }, /* 34 = linux_nice */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 35 = ftime */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ - { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0 }, /* 37 = linux_kill */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0 }, /* 38 = linux_rename */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 39 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 40 = linux_rmdir */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ - { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = linux_pipe */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0 }, /* 43 = linux_times */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0 }, /* 45 = linux_brk */ - { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0 }, /* 46 = linux_setgid16 */ - { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0 }, /* 47 = linux_getgid16 */ - { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0 }, /* 48 = linux_signal */ - { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0 }, /* 49 = linux_geteuid16 */ - { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0 }, /* 50 = linux_getegid16 */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0 }, /* 52 = linux_umount */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = linux_ioctl */ - { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 55 = linux_fcntl */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 56 = mpx */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 57 = setpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 58 = ulimit */ - { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0 }, /* 59 = linux_olduname */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0 }, /* 62 = linux_ustat */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 63 = dup2 */ - { 0, (sy_call_t *)linux_getppid, AUE_GETPPID, NULL, 0, 0 }, /* 64 = linux_getppid */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 65 = getpgrp */ - { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 66 = setsid */ - { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0 }, /* 67 = linux_sigaction */ - { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0 }, /* 68 = linux_sgetmask */ - { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0 }, /* 69 = linux_ssetmask */ - { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0 }, /* 70 = linux_setreuid16 */ - { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0 }, /* 71 = linux_setregid16 */ - { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 72 = linux_sigsuspend */ - { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0 }, /* 73 = linux_sigpending */ - { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0 }, /* 74 = linux_sethostname */ - { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 75 = linux_setrlimit */ - { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 76 = linux_old_getrlimit */ - { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 77 = linux_getrusage */ - { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL, NULL, 0, 0 }, /* 78 = linux_gettimeofday */ - { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 79 = linux_settimeofday */ - { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0 }, /* 80 = linux_getgroups16 */ - { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0 }, /* 81 = linux_setgroups16 */ - { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0 }, /* 82 = linux_old_select */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 83 = linux_symlink */ - { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0 }, /* 84 = linux_lstat */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0 }, /* 85 = linux_readlink */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 89 = linux_readdir */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ - { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 93 = linux_ftruncate */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 94 = fchmod */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 95 = fchown */ - { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 96 = linux_getpriority */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 97 = setpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 98 = profil */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0 }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 100 = linux_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 101 = ioperm */ - { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0 }, /* 102 = linux_socketcall */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0 }, /* 103 = linux_syslog */ - { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 104 = linux_setitimer */ - { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 105 = linux_getitimer */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0 }, /* 106 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ - { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ - { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = vm86old */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 114 = linux_wait4 */ - { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 115 = linux_swapoff */ - { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0 }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0 }, /* 117 = linux_ipc */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */ - { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */ - { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */ - { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = linux_setdomainname */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 123 = modify_ldt */ - { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 125 = linux_mprotect */ - { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 126 = linux_sigprocmask */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0 }, /* 127 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0 }, /* 128 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0 }, /* 129 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0 }, /* 130 = linux_get_kernel_syms */ - { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 131 = linux_quotactl */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 132 = getpgid */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 133 = fchdir */ - { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0 }, /* 134 = linux_bdflush */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0 }, /* 135 = linux_sysfs */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0 }, /* 136 = linux_personality */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 137 = afs_syscall */ - { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ - { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ - { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 141 = linux_getdents */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ - { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV, NULL, 0, 0 }, /* 145 = linux_readv */ - { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV, NULL, 0, 0 }, /* 146 = linux_writev */ - { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0 }, /* 147 = linux_getsid */ - { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0 }, /* 148 = linux_fdatasync */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 149 = linux_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 150 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 151 = munlock */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 152 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 153 = munlockall */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0 }, /* 154 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0 }, /* 155 = sched_getparam */ - { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0 }, /* 156 = linux_sched_setscheduler */ - { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0 }, /* 157 = linux_sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 158 = sched_yield */ - { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0 }, /* 159 = linux_sched_get_priority_max */ - { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0 }, /* 160 = linux_sched_get_priority_min */ - { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0 }, /* 161 = linux_sched_rr_get_interval */ - { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = linux_nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0 }, /* 163 = linux_mremap */ - { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0 }, /* 164 = linux_setresuid16 */ - { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0 }, /* 165 = linux_getresuid16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 166 = vm86 */ - { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0 }, /* 167 = linux_query_module */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 168 = poll */ - { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ - { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ - { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ - { AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ - { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ - { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ - { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ - { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ - { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ - { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 181 = linux_pwrite */ - { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 }, /* 182 = linux_chown16 */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 }, /* 185 = linux_capset */ - { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 }, /* 186 = linux_sigaltstack */ - { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 187 = linux_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 188 = getpmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 189 = putpmsg */ - { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0 }, /* 190 = linux_vfork */ - { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 191 = linux_getrlimit */ - { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0 }, /* 192 = linux_mmap2 */ - { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0 }, /* 193 = linux_truncate64 */ - { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0 }, /* 194 = linux_ftruncate64 */ - { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0 }, /* 195 = linux_stat64 */ - { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0 }, /* 196 = linux_lstat64 */ - { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0 }, /* 197 = linux_fstat64 */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 198 = linux_lchown */ - { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0 }, /* 199 = linux_getuid */ - { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0 }, /* 200 = linux_getgid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 201 = geteuid */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 202 = getegid */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 203 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 204 = setregid */ - { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 205 = linux_getgroups */ - { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 206 = linux_setgroups */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0 }, /* 207 = fchown */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 208 = setresuid */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 209 = getresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 210 = setresgid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 211 = getresgid */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0 }, /* 212 = linux_chown */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 213 = setuid */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 214 = setgid */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0 }, /* 215 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0 }, /* 216 = linux_setfsgid */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 220 = linux_getdents64 */ - { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ - { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0 }, /* 224 = linux_gettid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 225 = linux_readahead */ - { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0 }, /* 226 = linux_setxattr */ - { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0 }, /* 227 = linux_lsetxattr */ - { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0 }, /* 228 = linux_fsetxattr */ - { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0 }, /* 229 = linux_getxattr */ - { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0 }, /* 230 = linux_lgetxattr */ - { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0 }, /* 231 = linux_fgetxattr */ - { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0 }, /* 232 = linux_listxattr */ - { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0 }, /* 233 = linux_llistxattr */ - { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0 }, /* 234 = linux_flistxattr */ - { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0 }, /* 235 = linux_removexattr */ - { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0 }, /* 236 = linux_lremovexattr */ - { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0 }, /* 237 = linux_fremovexattr */ - { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0 }, /* 238 = linux_tkill */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ - { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ - { AS(linux_sched_setaffinity_args), (sy_call_t *)linux_sched_setaffinity, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ - { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ - { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 248 = inux_io_submit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0 }, /* 250 = linux_fadvise64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ - { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ - { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ - { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0 }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0 }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0 }, /* 263 = linux_timer_delete */ - { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ - { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ - { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ - { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ - { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0 }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ - { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ - { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ - { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0 }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0 }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0 }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0 }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0 }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0 }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0 }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0 }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = */ - { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0 }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0 }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0 }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0 }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0 }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0 }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ - { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ - { AS(linux_mkdirat_args), (sy_call_t *)linux_mkdirat, AUE_MKDIRAT, NULL, 0, 0 }, /* 296 = linux_mkdirat */ - { AS(linux_mknodat_args), (sy_call_t *)linux_mknodat, AUE_MKNODAT, NULL, 0, 0 }, /* 297 = linux_mknodat */ - { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_FCHOWNAT, NULL, 0, 0 }, /* 298 = linux_fchownat */ - { AS(linux_futimesat_args), (sy_call_t *)linux_futimesat, AUE_FUTIMESAT, NULL, 0, 0 }, /* 299 = linux_futimesat */ - { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_FSTATAT, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ - { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 301 = linux_unlinkat */ - { AS(linux_renameat_args), (sy_call_t *)linux_renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 302 = linux_renameat */ - { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_LINKAT, NULL, 0, 0 }, /* 303 = linux_linkat */ - { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 304 = linux_symlinkat */ - { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_READLINKAT, NULL, 0, 0 }, /* 305 = linux_readlinkat */ - { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_FCHMODAT, NULL, 0, 0 }, /* 306 = linux_fchmodat */ - { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_FACCESSAT, NULL, 0, 0 }, /* 307 = linux_faccessat */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 3 16:14:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 470671065673; Wed, 3 Jun 2009 16:14: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 05C06106566C for ; Wed, 3 Jun 2009 16:14: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 E67268FC1A for ; Wed, 3 Jun 2009 16:14:42 +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 n53GEgqg076450 for ; Wed, 3 Jun 2009 16:14:42 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53GEgXW076446 for perforce@freebsd.org; Wed, 3 Jun 2009 16:14:42 GMT (envelope-from zec@fer.hr) Date: Wed, 3 Jun 2009 16:14:42 GMT Message-Id: <200906031614.n53GEgXW076446@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 163423 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 16:14:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163423 Change 163423 by zec@zec_amdx4 on 2009/06/03 16:14:12 IFC @ 163417 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#15 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/MAC#2 delete .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/common/boot.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sysent.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#27 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#39 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#29 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/mwl/LICENSE#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/mwl/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/mwl/mw88W8363.fw.uu#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/mwl/mwlboot.fw.uu#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-intel.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bwi/if_bwi.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ksyms/ksyms.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/e1000phy.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_mskreg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mwl/if_mwl.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mwl/if_mwl_pci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mwl/if_mwlioctl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mwl/if_mwlvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mwl/mwldiag.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mwl/mwlhal.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mwl/mwlhal.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mwl/mwlreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/puc/pucdata.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clbio.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_fs.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_lookup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/ext2_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#15 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/MAC#2 delete .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_sysent.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_sysent.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/conf/MAC#2 delete .. //depot/projects/vimage-commit2/src/sys/kern/init_sysent.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_lock.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_proc.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sx.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/makesyscalls.sh#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_sglist.c#1 branch .. //depot/projects/vimage-commit2/src/sys/kern/sys_socket.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_shm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_sockbuf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_aio.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#24 integrate .. //depot/projects/vimage-commit2/src/sys/modules/mwl/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/mwlfw/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#70 integrate .. //depot/projects/vimage-commit2/src/sys/net/netisr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/netisr.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#38 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#20 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_monitor.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_radiotap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_usrreq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/accf_data.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/accf_dns.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/accf_http.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#39 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#40 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#40 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#33 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#25 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netipx/ipx_input.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netnatm/natm_proto.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_socket.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsock.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_syscalls.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC#10 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/MAC#2 delete .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#11 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/conf/MAC#2 delete .. //depot/projects/vimage-commit2/src/sys/rpc/clnt_dg.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/clnt_vc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/svc_dg.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/svc_vc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_internal.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#13 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/MAC#2 delete .. //depot/projects/vimage-commit2/src/sys/sun4v/conf/GENERIC#8 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/conf/MAC#2 delete .. //depot/projects/vimage-commit2/src/sys/sys/buf.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/conf.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#41 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pcpu.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/priv.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sglist.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/sockbuf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/socketvar.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysent.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ucred.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/sys/user.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_softdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/dirhash.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_dirhash.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_contig.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vnode_pager.c#11 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#15 (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.525 2009/05/10 00:00:25 kuriyama Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.526 2009/06/02 18:31:08 rwatson Exp $ cpu HAMMER ident GENERIC @@ -70,6 +70,7 @@ options STOP_NMI # Stop CPUS using NMI instead of IPI options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options AUDIT # Security event auditing +options MAC # TrustedBSD MAC Framework #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.28 2009/05/16 18:48:41 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.29 2009/06/01 20:48:39 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -669,6 +669,7 @@ #define LINUX_GETSOCKOPT 15 #define LINUX_SENDMSG 16 #define LINUX_RECVMSG 17 +#define LINUX_ACCEPT4 18 #define LINUX_SOL_SOCKET 1 #define LINUX_SOL_IP 0 ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysent.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.40 2009/06/01 16:14:38 rwatson Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -19,321 +19,321 @@ /* The casts are bogus but will do for now. */ struct sysent linux_sysent[] = { #define nosys linux_nosys - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 0 = setup */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0 }, /* 1 = exit */ - { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0 }, /* 2 = linux_fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0 }, /* 4 = write */ - { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 5 = linux_open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0 }, /* 6 = close */ - { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0 }, /* 7 = linux_waitpid */ - { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0 }, /* 8 = linux_creat */ - { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0 }, /* 9 = linux_link */ - { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0 }, /* 10 = linux_unlink */ - { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0 }, /* 11 = linux_execve */ - { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0 }, /* 12 = linux_chdir */ - { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0 }, /* 13 = linux_time */ - { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0 }, /* 14 = linux_mknod */ - { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0 }, /* 15 = linux_chmod */ - { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0 }, /* 16 = linux_lchown16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 17 = break */ - { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0 }, /* 18 = linux_stat */ - { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0 }, /* 19 = linux_lseek */ - { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0 }, /* 20 = linux_getpid */ - { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0 }, /* 21 = linux_mount */ - { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0 }, /* 22 = linux_oldumount */ - { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0 }, /* 23 = linux_setuid16 */ - { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0 }, /* 24 = linux_getuid16 */ - { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 25 = linux_stime */ - { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0 }, /* 26 = linux_ptrace */ - { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0 }, /* 27 = linux_alarm */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 28 = fstat */ - { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0 }, /* 29 = linux_pause */ - { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0 }, /* 30 = linux_utime */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 31 = stty */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 32 = gtty */ - { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0 }, /* 33 = linux_access */ - { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0 }, /* 34 = linux_nice */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 35 = ftime */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0 }, /* 36 = sync */ - { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0 }, /* 37 = linux_kill */ - { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0 }, /* 38 = linux_rename */ - { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0 }, /* 39 = linux_mkdir */ - { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0 }, /* 40 = linux_rmdir */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0 }, /* 41 = dup */ - { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0 }, /* 42 = linux_pipe */ - { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0 }, /* 43 = linux_times */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 44 = prof */ - { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0 }, /* 45 = linux_brk */ - { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0 }, /* 46 = linux_setgid16 */ - { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0 }, /* 47 = linux_getgid16 */ - { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0 }, /* 48 = linux_signal */ - { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0 }, /* 49 = linux_geteuid16 */ - { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0 }, /* 50 = linux_getegid16 */ - { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0 }, /* 51 = acct */ - { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0 }, /* 52 = linux_umount */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 53 = lock */ - { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0 }, /* 54 = linux_ioctl */ - { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0 }, /* 55 = linux_fcntl */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 56 = mpx */ - { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0 }, /* 57 = setpgid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 58 = ulimit */ - { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0 }, /* 59 = linux_olduname */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0 }, /* 60 = umask */ - { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0 }, /* 61 = chroot */ - { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0 }, /* 62 = linux_ustat */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0 }, /* 63 = dup2 */ - { 0, (sy_call_t *)linux_getppid, AUE_GETPPID, NULL, 0, 0 }, /* 64 = linux_getppid */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0 }, /* 65 = getpgrp */ - { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0 }, /* 66 = setsid */ - { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0 }, /* 67 = linux_sigaction */ - { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0 }, /* 68 = linux_sgetmask */ - { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0 }, /* 69 = linux_ssetmask */ - { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0 }, /* 70 = linux_setreuid16 */ - { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0 }, /* 71 = linux_setregid16 */ - { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 72 = linux_sigsuspend */ - { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0 }, /* 73 = linux_sigpending */ - { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0 }, /* 74 = linux_sethostname */ - { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0 }, /* 75 = linux_setrlimit */ - { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 76 = linux_old_getrlimit */ - { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE, NULL, 0, 0 }, /* 77 = linux_getrusage */ - { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL, NULL, 0, 0 }, /* 78 = linux_gettimeofday */ - { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0 }, /* 79 = linux_settimeofday */ - { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0 }, /* 80 = linux_getgroups16 */ - { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0 }, /* 81 = linux_setgroups16 */ - { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0 }, /* 82 = linux_old_select */ - { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0 }, /* 83 = linux_symlink */ - { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0 }, /* 84 = linux_lstat */ - { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0 }, /* 85 = linux_readlink */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 86 = linux_uselib */ - { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0 }, /* 87 = swapon */ - { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0 }, /* 88 = linux_reboot */ - { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 89 = linux_readdir */ - { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0 }, /* 90 = linux_mmap */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0 }, /* 91 = munmap */ - { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0 }, /* 92 = linux_truncate */ - { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 }, /* 93 = linux_ftruncate */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0 }, /* 94 = fchmod */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0 }, /* 95 = fchown */ - { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0 }, /* 96 = linux_getpriority */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0 }, /* 97 = setpriority */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 98 = profil */ - { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0 }, /* 99 = linux_statfs */ - { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 100 = linux_fstatfs */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 101 = ioperm */ - { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0 }, /* 102 = linux_socketcall */ - { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0 }, /* 103 = linux_syslog */ - { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0 }, /* 104 = linux_setitimer */ - { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0 }, /* 105 = linux_getitimer */ - { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0 }, /* 106 = linux_newstat */ - { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0 }, /* 107 = linux_newlstat */ - { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0 }, /* 108 = linux_newfstat */ - { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0 }, /* 109 = linux_uname */ - { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0 }, /* 110 = linux_iopl */ - { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0 }, /* 111 = linux_vhangup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 112 = idle */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 113 = vm86old */ - { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0 }, /* 114 = linux_wait4 */ - { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0 }, /* 115 = linux_swapoff */ - { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0 }, /* 116 = linux_sysinfo */ - { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0 }, /* 117 = linux_ipc */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0 }, /* 118 = fsync */ - { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0 }, /* 119 = linux_sigreturn */ - { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0 }, /* 120 = linux_clone */ - { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 121 = linux_setdomainname */ - { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0 }, /* 122 = linux_newuname */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 123 = modify_ldt */ - { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0 }, /* 124 = linux_adjtimex */ - { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0 }, /* 125 = linux_mprotect */ - { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 126 = linux_sigprocmask */ - { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0 }, /* 127 = linux_create_module */ - { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0 }, /* 128 = linux_init_module */ - { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0 }, /* 129 = linux_delete_module */ - { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0 }, /* 130 = linux_get_kernel_syms */ - { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0 }, /* 131 = linux_quotactl */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0 }, /* 132 = getpgid */ - { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0 }, /* 133 = fchdir */ - { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0 }, /* 134 = linux_bdflush */ - { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0 }, /* 135 = linux_sysfs */ - { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0 }, /* 136 = linux_personality */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 137 = afs_syscall */ - { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0 }, /* 138 = linux_setfsuid16 */ - { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0 }, /* 139 = linux_setfsgid16 */ - { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0 }, /* 140 = linux_llseek */ - { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 141 = linux_getdents */ - { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0 }, /* 142 = linux_select */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0 }, /* 143 = flock */ - { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0 }, /* 144 = linux_msync */ - { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV, NULL, 0, 0 }, /* 145 = linux_readv */ - { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV, NULL, 0, 0 }, /* 146 = linux_writev */ - { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0 }, /* 147 = linux_getsid */ - { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0 }, /* 148 = linux_fdatasync */ - { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0 }, /* 149 = linux_sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0 }, /* 150 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0 }, /* 151 = munlock */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 152 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 153 = munlockall */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0 }, /* 154 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0 }, /* 155 = sched_getparam */ - { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0 }, /* 156 = linux_sched_setscheduler */ - { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0 }, /* 157 = linux_sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0 }, /* 158 = sched_yield */ - { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0 }, /* 159 = linux_sched_get_priority_max */ - { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0 }, /* 160 = linux_sched_get_priority_min */ - { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0 }, /* 161 = linux_sched_rr_get_interval */ - { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 162 = linux_nanosleep */ - { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0 }, /* 163 = linux_mremap */ - { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0 }, /* 164 = linux_setresuid16 */ - { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0 }, /* 165 = linux_getresuid16 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 166 = vm86 */ - { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0 }, /* 167 = linux_query_module */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0 }, /* 168 = poll */ - { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0 }, /* 169 = linux_nfsservctl */ - { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0 }, /* 170 = linux_setresgid16 */ - { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0 }, /* 171 = linux_getresgid16 */ - { AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0 }, /* 172 = linux_prctl */ - { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0 }, /* 173 = linux_rt_sigreturn */ - { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0 }, /* 174 = linux_rt_sigaction */ - { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0 }, /* 175 = linux_rt_sigprocmask */ - { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0 }, /* 176 = linux_rt_sigpending */ - { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ - { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ - { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0 }, /* 179 = linux_rt_sigsuspend */ - { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0 }, /* 180 = linux_pread */ - { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 181 = linux_pwrite */ - { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0 }, /* 182 = linux_chown16 */ - { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 183 = linux_getcwd */ - { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0 }, /* 184 = linux_capget */ - { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0 }, /* 185 = linux_capset */ - { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0 }, /* 186 = linux_sigaltstack */ - { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 187 = linux_sendfile */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 188 = getpmsg */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 189 = putpmsg */ - { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0 }, /* 190 = linux_vfork */ - { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0 }, /* 191 = linux_getrlimit */ - { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0 }, /* 192 = linux_mmap2 */ - { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0 }, /* 193 = linux_truncate64 */ - { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0 }, /* 194 = linux_ftruncate64 */ - { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0 }, /* 195 = linux_stat64 */ - { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0 }, /* 196 = linux_lstat64 */ - { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0 }, /* 197 = linux_fstat64 */ - { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0 }, /* 198 = linux_lchown */ - { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0 }, /* 199 = linux_getuid */ - { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0 }, /* 200 = linux_getgid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0 }, /* 201 = geteuid */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0 }, /* 202 = getegid */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0 }, /* 203 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0 }, /* 204 = setregid */ - { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0 }, /* 205 = linux_getgroups */ - { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0 }, /* 206 = linux_setgroups */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0 }, /* 207 = fchown */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0 }, /* 208 = setresuid */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 209 = getresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0 }, /* 210 = setresgid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 211 = getresgid */ - { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0 }, /* 212 = linux_chown */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0 }, /* 213 = setuid */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0 }, /* 214 = setgid */ - { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0 }, /* 215 = linux_setfsuid */ - { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0 }, /* 216 = linux_setfsgid */ - { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0 }, /* 217 = linux_pivot_root */ - { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0 }, /* 218 = linux_mincore */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0 }, /* 219 = madvise */ - { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0 }, /* 220 = linux_getdents64 */ - { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0 }, /* 221 = linux_fcntl64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 222 = */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 223 = */ - { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0 }, /* 224 = linux_gettid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 225 = linux_readahead */ - { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0 }, /* 226 = linux_setxattr */ - { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0 }, /* 227 = linux_lsetxattr */ - { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0 }, /* 228 = linux_fsetxattr */ - { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0 }, /* 229 = linux_getxattr */ - { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0 }, /* 230 = linux_lgetxattr */ - { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0 }, /* 231 = linux_fgetxattr */ - { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0 }, /* 232 = linux_listxattr */ - { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0 }, /* 233 = linux_llistxattr */ - { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0 }, /* 234 = linux_flistxattr */ - { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0 }, /* 235 = linux_removexattr */ - { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0 }, /* 236 = linux_lremovexattr */ - { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0 }, /* 237 = linux_fremovexattr */ - { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0 }, /* 238 = linux_tkill */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 239 = linux_sendfile64 */ - { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0 }, /* 240 = linux_sys_futex */ - { AS(linux_sched_setaffinity_args), (sy_call_t *)linux_sched_setaffinity, AUE_NULL, NULL, 0, 0 }, /* 241 = linux_sched_setaffinity */ - { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0 }, /* 242 = linux_sched_getaffinity */ - { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0 }, /* 243 = linux_set_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 244 = linux_get_thread_area */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 245 = linux_io_setup */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 246 = linux_io_destroy */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 247 = linux_io_getevents */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 248 = inux_io_submit */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 249 = linux_io_cancel */ - { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0 }, /* 250 = linux_fadvise64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 251 = */ - { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0 }, /* 252 = linux_exit_group */ - { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0 }, /* 253 = linux_lookup_dcookie */ - { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0 }, /* 254 = linux_epoll_create */ - { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0 }, /* 255 = linux_epoll_ctl */ - { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0 }, /* 256 = linux_epoll_wait */ - { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0 }, /* 257 = linux_remap_file_pages */ - { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0 }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0 }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0 }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0 }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0 }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0 }, /* 263 = linux_timer_delete */ - { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0 }, /* 264 = linux_clock_settime */ - { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0 }, /* 265 = linux_clock_gettime */ - { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0 }, /* 266 = linux_clock_getres */ - { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0 }, /* 267 = linux_clock_nanosleep */ - { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0 }, /* 268 = linux_statfs64 */ - { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0 }, /* 269 = linux_fstatfs64 */ - { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0 }, /* 270 = linux_tgkill */ - { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0 }, /* 271 = linux_utimes */ - { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0 }, /* 272 = linux_fadvise64_64 */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 273 = */ - { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0 }, /* 274 = linux_mbind */ - { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 275 = linux_get_mempolicy */ - { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0 }, /* 276 = linux_set_mempolicy */ - { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0 }, /* 277 = linux_mq_open */ - { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0 }, /* 278 = linux_mq_unlink */ - { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0 }, /* 279 = linux_mq_timedsend */ - { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0 }, /* 280 = linux_mq_timedreceive */ - { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0 }, /* 281 = linux_mq_notify */ - { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0 }, /* 282 = linux_mq_getsetattr */ - { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0 }, /* 283 = linux_kexec_load */ - { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0 }, /* 284 = linux_waitid */ - { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 285 = */ - { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0 }, /* 286 = linux_add_key */ - { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0 }, /* 287 = linux_request_key */ - { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0 }, /* 288 = linux_keyctl */ - { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0 }, /* 289 = linux_ioprio_set */ - { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0 }, /* 290 = linux_ioprio_get */ - { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0 }, /* 291 = linux_inotify_init */ - { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0 }, /* 292 = linux_inotify_add_watch */ - { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0 }, /* 293 = linux_inotify_rm_watch */ - { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0 }, /* 294 = linux_migrate_pages */ - { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 295 = linux_openat */ - { AS(linux_mkdirat_args), (sy_call_t *)linux_mkdirat, AUE_MKDIRAT, NULL, 0, 0 }, /* 296 = linux_mkdirat */ - { AS(linux_mknodat_args), (sy_call_t *)linux_mknodat, AUE_MKNODAT, NULL, 0, 0 }, /* 297 = linux_mknodat */ - { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_FCHOWNAT, NULL, 0, 0 }, /* 298 = linux_fchownat */ - { AS(linux_futimesat_args), (sy_call_t *)linux_futimesat, AUE_FUTIMESAT, NULL, 0, 0 }, /* 299 = linux_futimesat */ - { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_FSTATAT, NULL, 0, 0 }, /* 300 = linux_fstatat64 */ - { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 301 = linux_unlinkat */ - { AS(linux_renameat_args), (sy_call_t *)linux_renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 302 = linux_renameat */ - { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_LINKAT, NULL, 0, 0 }, /* 303 = linux_linkat */ - { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 304 = linux_symlinkat */ - { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_READLINKAT, NULL, 0, 0 }, /* 305 = linux_readlinkat */ - { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_FCHMODAT, NULL, 0, 0 }, /* 306 = linux_fchmodat */ - { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_FACCESSAT, NULL, 0, 0 }, /* 307 = linux_faccessat */ - { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0 }, /* 308 = linux_pselect6 */ - { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0 }, /* 309 = linux_ppoll */ - { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0 }, /* 310 = linux_unshare */ - { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0 }, /* 311 = linux_set_robust_list */ - { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0 }, /* 312 = linux_get_robust_list */ - { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0 }, /* 313 = linux_splice */ - { 0, (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0 }, /* 314 = linux_sync_file_range */ - { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0 }, /* 315 = linux_tee */ - { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0 }, /* 316 = linux_vmsplice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = setup */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, 0 }, /* 1 = exit */ + { 0, (sy_call_t *)linux_fork, AUE_FORK, NULL, 0, 0, 0 }, /* 2 = linux_fork */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, 0 }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, 0 }, /* 4 = write */ + { AS(linux_open_args), (sy_call_t *)linux_open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = linux_open */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, 0 }, /* 6 = close */ + { AS(linux_waitpid_args), (sy_call_t *)linux_waitpid, AUE_WAIT4, NULL, 0, 0, 0 }, /* 7 = linux_waitpid */ + { AS(linux_creat_args), (sy_call_t *)linux_creat, AUE_CREAT, NULL, 0, 0, 0 }, /* 8 = linux_creat */ + { AS(linux_link_args), (sy_call_t *)linux_link, AUE_LINK, NULL, 0, 0, 0 }, /* 9 = linux_link */ + { AS(linux_unlink_args), (sy_call_t *)linux_unlink, AUE_UNLINK, NULL, 0, 0, 0 }, /* 10 = linux_unlink */ + { AS(linux_execve_args), (sy_call_t *)linux_execve, AUE_EXECVE, NULL, 0, 0, 0 }, /* 11 = linux_execve */ + { AS(linux_chdir_args), (sy_call_t *)linux_chdir, AUE_CHDIR, NULL, 0, 0, 0 }, /* 12 = linux_chdir */ + { AS(linux_time_args), (sy_call_t *)linux_time, AUE_NULL, NULL, 0, 0, 0 }, /* 13 = linux_time */ + { AS(linux_mknod_args), (sy_call_t *)linux_mknod, AUE_MKNOD, NULL, 0, 0, 0 }, /* 14 = linux_mknod */ + { AS(linux_chmod_args), (sy_call_t *)linux_chmod, AUE_CHMOD, NULL, 0, 0, 0 }, /* 15 = linux_chmod */ + { AS(linux_lchown16_args), (sy_call_t *)linux_lchown16, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 16 = linux_lchown16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 17 = break */ + { AS(linux_stat_args), (sy_call_t *)linux_stat, AUE_STAT, NULL, 0, 0, 0 }, /* 18 = linux_stat */ + { AS(linux_lseek_args), (sy_call_t *)linux_lseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 19 = linux_lseek */ + { 0, (sy_call_t *)linux_getpid, AUE_GETPID, NULL, 0, 0, 0 }, /* 20 = linux_getpid */ + { AS(linux_mount_args), (sy_call_t *)linux_mount, AUE_MOUNT, NULL, 0, 0, 0 }, /* 21 = linux_mount */ + { AS(linux_oldumount_args), (sy_call_t *)linux_oldumount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 22 = linux_oldumount */ + { AS(linux_setuid16_args), (sy_call_t *)linux_setuid16, AUE_SETUID, NULL, 0, 0, 0 }, /* 23 = linux_setuid16 */ + { 0, (sy_call_t *)linux_getuid16, AUE_GETUID, NULL, 0, 0, 0 }, /* 24 = linux_getuid16 */ + { 0, (sy_call_t *)linux_stime, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 25 = linux_stime */ + { AS(linux_ptrace_args), (sy_call_t *)linux_ptrace, AUE_PTRACE, NULL, 0, 0, 0 }, /* 26 = linux_ptrace */ + { AS(linux_alarm_args), (sy_call_t *)linux_alarm, AUE_NULL, NULL, 0, 0, 0 }, /* 27 = linux_alarm */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 28 = fstat */ + { 0, (sy_call_t *)linux_pause, AUE_NULL, NULL, 0, 0, 0 }, /* 29 = linux_pause */ + { AS(linux_utime_args), (sy_call_t *)linux_utime, AUE_UTIME, NULL, 0, 0, 0 }, /* 30 = linux_utime */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 31 = stty */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 32 = gtty */ + { AS(linux_access_args), (sy_call_t *)linux_access, AUE_ACCESS, NULL, 0, 0, 0 }, /* 33 = linux_access */ + { AS(linux_nice_args), (sy_call_t *)linux_nice, AUE_NICE, NULL, 0, 0, 0 }, /* 34 = linux_nice */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 35 = ftime */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, 0 }, /* 36 = sync */ + { AS(linux_kill_args), (sy_call_t *)linux_kill, AUE_KILL, NULL, 0, 0, 0 }, /* 37 = linux_kill */ + { AS(linux_rename_args), (sy_call_t *)linux_rename, AUE_RENAME, NULL, 0, 0, 0 }, /* 38 = linux_rename */ + { AS(linux_mkdir_args), (sy_call_t *)linux_mkdir, AUE_MKDIR, NULL, 0, 0, 0 }, /* 39 = linux_mkdir */ + { AS(linux_rmdir_args), (sy_call_t *)linux_rmdir, AUE_RMDIR, NULL, 0, 0, 0 }, /* 40 = linux_rmdir */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, 0 }, /* 41 = dup */ + { AS(linux_pipe_args), (sy_call_t *)linux_pipe, AUE_PIPE, NULL, 0, 0, 0 }, /* 42 = linux_pipe */ + { AS(linux_times_args), (sy_call_t *)linux_times, AUE_NULL, NULL, 0, 0, 0 }, /* 43 = linux_times */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 44 = prof */ + { AS(linux_brk_args), (sy_call_t *)linux_brk, AUE_NULL, NULL, 0, 0, 0 }, /* 45 = linux_brk */ + { AS(linux_setgid16_args), (sy_call_t *)linux_setgid16, AUE_SETGID, NULL, 0, 0, 0 }, /* 46 = linux_setgid16 */ + { 0, (sy_call_t *)linux_getgid16, AUE_GETGID, NULL, 0, 0, 0 }, /* 47 = linux_getgid16 */ + { AS(linux_signal_args), (sy_call_t *)linux_signal, AUE_NULL, NULL, 0, 0, 0 }, /* 48 = linux_signal */ + { 0, (sy_call_t *)linux_geteuid16, AUE_GETEUID, NULL, 0, 0, 0 }, /* 49 = linux_geteuid16 */ + { 0, (sy_call_t *)linux_getegid16, AUE_GETEGID, NULL, 0, 0, 0 }, /* 50 = linux_getegid16 */ + { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ + { AS(linux_umount_args), (sy_call_t *)linux_umount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 52 = linux_umount */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 53 = lock */ + { AS(linux_ioctl_args), (sy_call_t *)linux_ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = linux_ioctl */ + { AS(linux_fcntl_args), (sy_call_t *)linux_fcntl, AUE_FCNTL, NULL, 0, 0, 0 }, /* 55 = linux_fcntl */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 56 = mpx */ + { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0, 0 }, /* 57 = setpgid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 58 = ulimit */ + { 0, (sy_call_t *)linux_olduname, AUE_NULL, NULL, 0, 0, 0 }, /* 59 = linux_olduname */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, 0 }, /* 60 = umask */ + { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0, 0 }, /* 61 = chroot */ + { AS(linux_ustat_args), (sy_call_t *)linux_ustat, AUE_NULL, NULL, 0, 0, 0 }, /* 62 = linux_ustat */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, 0 }, /* 63 = dup2 */ + { 0, (sy_call_t *)linux_getppid, AUE_GETPPID, NULL, 0, 0, 0 }, /* 64 = linux_getppid */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, 0 }, /* 65 = getpgrp */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, 0 }, /* 66 = setsid */ + { AS(linux_sigaction_args), (sy_call_t *)linux_sigaction, AUE_NULL, NULL, 0, 0, 0 }, /* 67 = linux_sigaction */ + { 0, (sy_call_t *)linux_sgetmask, AUE_NULL, NULL, 0, 0, 0 }, /* 68 = linux_sgetmask */ + { AS(linux_ssetmask_args), (sy_call_t *)linux_ssetmask, AUE_NULL, NULL, 0, 0, 0 }, /* 69 = linux_ssetmask */ + { AS(linux_setreuid16_args), (sy_call_t *)linux_setreuid16, AUE_SETREUID, NULL, 0, 0, 0 }, /* 70 = linux_setreuid16 */ + { AS(linux_setregid16_args), (sy_call_t *)linux_setregid16, AUE_SETREGID, NULL, 0, 0, 0 }, /* 71 = linux_setregid16 */ + { AS(linux_sigsuspend_args), (sy_call_t *)linux_sigsuspend, AUE_NULL, NULL, 0, 0, 0 }, /* 72 = linux_sigsuspend */ + { AS(linux_sigpending_args), (sy_call_t *)linux_sigpending, AUE_NULL, NULL, 0, 0, 0 }, /* 73 = linux_sigpending */ + { AS(linux_sethostname_args), (sy_call_t *)linux_sethostname, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 74 = linux_sethostname */ + { AS(linux_setrlimit_args), (sy_call_t *)linux_setrlimit, AUE_SETRLIMIT, NULL, 0, 0, 0 }, /* 75 = linux_setrlimit */ + { AS(linux_old_getrlimit_args), (sy_call_t *)linux_old_getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 76 = linux_old_getrlimit */ + { AS(linux_getrusage_args), (sy_call_t *)linux_getrusage, AUE_GETRUSAGE, NULL, 0, 0, 0 }, /* 77 = linux_getrusage */ + { AS(linux_gettimeofday_args), (sy_call_t *)linux_gettimeofday, AUE_NULL, NULL, 0, 0, 0 }, /* 78 = linux_gettimeofday */ + { AS(linux_settimeofday_args), (sy_call_t *)linux_settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 79 = linux_settimeofday */ + { AS(linux_getgroups16_args), (sy_call_t *)linux_getgroups16, AUE_GETGROUPS, NULL, 0, 0, 0 }, /* 80 = linux_getgroups16 */ + { AS(linux_setgroups16_args), (sy_call_t *)linux_setgroups16, AUE_SETGROUPS, NULL, 0, 0, 0 }, /* 81 = linux_setgroups16 */ + { AS(linux_old_select_args), (sy_call_t *)linux_old_select, AUE_SELECT, NULL, 0, 0, 0 }, /* 82 = linux_old_select */ + { AS(linux_symlink_args), (sy_call_t *)linux_symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 83 = linux_symlink */ + { AS(linux_lstat_args), (sy_call_t *)linux_lstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 84 = linux_lstat */ + { AS(linux_readlink_args), (sy_call_t *)linux_readlink, AUE_READLINK, NULL, 0, 0, 0 }, /* 85 = linux_readlink */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 86 = linux_uselib */ + { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0, 0 }, /* 87 = swapon */ + { AS(linux_reboot_args), (sy_call_t *)linux_reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 88 = linux_reboot */ + { AS(linux_readdir_args), (sy_call_t *)linux_readdir, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 89 = linux_readdir */ + { AS(linux_mmap_args), (sy_call_t *)linux_mmap, AUE_MMAP, NULL, 0, 0, 0 }, /* 90 = linux_mmap */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, 0 }, /* 91 = munmap */ + { AS(linux_truncate_args), (sy_call_t *)linux_truncate, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 92 = linux_truncate */ + { AS(linux_ftruncate_args), (sy_call_t *)linux_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 93 = linux_ftruncate */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, 0 }, /* 94 = fchmod */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, 0 }, /* 95 = fchown */ + { AS(linux_getpriority_args), (sy_call_t *)linux_getpriority, AUE_GETPRIORITY, NULL, 0, 0, 0 }, /* 96 = linux_getpriority */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, 0 }, /* 97 = setpriority */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 98 = profil */ + { AS(linux_statfs_args), (sy_call_t *)linux_statfs, AUE_STATFS, NULL, 0, 0, 0 }, /* 99 = linux_statfs */ + { AS(linux_fstatfs_args), (sy_call_t *)linux_fstatfs, AUE_FSTATFS, NULL, 0, 0, 0 }, /* 100 = linux_fstatfs */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 101 = ioperm */ + { AS(linux_socketcall_args), (sy_call_t *)linux_socketcall, AUE_NULL, NULL, 0, 0, 0 }, /* 102 = linux_socketcall */ + { AS(linux_syslog_args), (sy_call_t *)linux_syslog, AUE_NULL, NULL, 0, 0, 0 }, /* 103 = linux_syslog */ + { AS(linux_setitimer_args), (sy_call_t *)linux_setitimer, AUE_SETITIMER, NULL, 0, 0, 0 }, /* 104 = linux_setitimer */ + { AS(linux_getitimer_args), (sy_call_t *)linux_getitimer, AUE_GETITIMER, NULL, 0, 0, 0 }, /* 105 = linux_getitimer */ + { AS(linux_newstat_args), (sy_call_t *)linux_newstat, AUE_STAT, NULL, 0, 0, 0 }, /* 106 = linux_newstat */ + { AS(linux_newlstat_args), (sy_call_t *)linux_newlstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 107 = linux_newlstat */ + { AS(linux_newfstat_args), (sy_call_t *)linux_newfstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 108 = linux_newfstat */ + { 0, (sy_call_t *)linux_uname, AUE_NULL, NULL, 0, 0, 0 }, /* 109 = linux_uname */ + { AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0, 0 }, /* 110 = linux_iopl */ + { 0, (sy_call_t *)linux_vhangup, AUE_NULL, NULL, 0, 0, 0 }, /* 111 = linux_vhangup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 112 = idle */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 113 = vm86old */ + { AS(linux_wait4_args), (sy_call_t *)linux_wait4, AUE_WAIT4, NULL, 0, 0, 0 }, /* 114 = linux_wait4 */ + { 0, (sy_call_t *)linux_swapoff, AUE_SWAPOFF, NULL, 0, 0, 0 }, /* 115 = linux_swapoff */ + { AS(linux_sysinfo_args), (sy_call_t *)linux_sysinfo, AUE_NULL, NULL, 0, 0, 0 }, /* 116 = linux_sysinfo */ + { AS(linux_ipc_args), (sy_call_t *)linux_ipc, AUE_NULL, NULL, 0, 0, 0 }, /* 117 = linux_ipc */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, 0 }, /* 118 = fsync */ + { AS(linux_sigreturn_args), (sy_call_t *)linux_sigreturn, AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 119 = linux_sigreturn */ + { AS(linux_clone_args), (sy_call_t *)linux_clone, AUE_RFORK, NULL, 0, 0, 0 }, /* 120 = linux_clone */ + { AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 121 = linux_setdomainname */ + { AS(linux_newuname_args), (sy_call_t *)linux_newuname, AUE_NULL, NULL, 0, 0, 0 }, /* 122 = linux_newuname */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 123 = modify_ldt */ + { 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0, 0 }, /* 124 = linux_adjtimex */ + { AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0, 0 }, /* 125 = linux_mprotect */ + { AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0 }, /* 126 = linux_sigprocmask */ + { 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0, 0 }, /* 127 = linux_create_module */ + { 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0, 0 }, /* 128 = linux_init_module */ + { 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0, 0 }, /* 129 = linux_delete_module */ + { 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0, 0 }, /* 130 = linux_get_kernel_syms */ + { 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0, 0 }, /* 131 = linux_quotactl */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, 0 }, /* 132 = getpgid */ + { AS(fchdir_args), (sy_call_t *)fchdir, AUE_FCHDIR, NULL, 0, 0, 0 }, /* 133 = fchdir */ + { 0, (sy_call_t *)linux_bdflush, AUE_BDFLUSH, NULL, 0, 0, 0 }, /* 134 = linux_bdflush */ + { AS(linux_sysfs_args), (sy_call_t *)linux_sysfs, AUE_NULL, NULL, 0, 0, 0 }, /* 135 = linux_sysfs */ + { AS(linux_personality_args), (sy_call_t *)linux_personality, AUE_PERSONALITY, NULL, 0, 0, 0 }, /* 136 = linux_personality */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 137 = afs_syscall */ + { AS(linux_setfsuid16_args), (sy_call_t *)linux_setfsuid16, AUE_SETFSUID, NULL, 0, 0, 0 }, /* 138 = linux_setfsuid16 */ + { AS(linux_setfsgid16_args), (sy_call_t *)linux_setfsgid16, AUE_SETFSGID, NULL, 0, 0, 0 }, /* 139 = linux_setfsgid16 */ + { AS(linux_llseek_args), (sy_call_t *)linux_llseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 140 = linux_llseek */ + { AS(linux_getdents_args), (sy_call_t *)linux_getdents, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 141 = linux_getdents */ + { AS(linux_select_args), (sy_call_t *)linux_select, AUE_SELECT, NULL, 0, 0, 0 }, /* 142 = linux_select */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, 0 }, /* 143 = flock */ + { AS(linux_msync_args), (sy_call_t *)linux_msync, AUE_MSYNC, NULL, 0, 0, 0 }, /* 144 = linux_msync */ + { AS(linux_readv_args), (sy_call_t *)linux_readv, AUE_READV, NULL, 0, 0, 0 }, /* 145 = linux_readv */ + { AS(linux_writev_args), (sy_call_t *)linux_writev, AUE_WRITEV, NULL, 0, 0, 0 }, /* 146 = linux_writev */ + { AS(linux_getsid_args), (sy_call_t *)linux_getsid, AUE_GETSID, NULL, 0, 0, 0 }, /* 147 = linux_getsid */ + { AS(linux_fdatasync_args), (sy_call_t *)linux_fdatasync, AUE_NULL, NULL, 0, 0, 0 }, /* 148 = linux_fdatasync */ + { AS(linux_sysctl_args), (sy_call_t *)linux_sysctl, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 149 = linux_sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, 0 }, /* 150 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, 0 }, /* 151 = munlock */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, 0 }, /* 152 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, 0 }, /* 153 = munlockall */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_SCHED_SETPARAM, NULL, 0, 0, 0 }, /* 154 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_SCHED_GETPARAM, NULL, 0, 0, 0 }, /* 155 = sched_getparam */ + { AS(linux_sched_setscheduler_args), (sy_call_t *)linux_sched_setscheduler, AUE_SCHED_SETSCHEDULER, NULL, 0, 0, 0 }, /* 156 = linux_sched_setscheduler */ + { AS(linux_sched_getscheduler_args), (sy_call_t *)linux_sched_getscheduler, AUE_SCHED_GETSCHEDULER, NULL, 0, 0, 0 }, /* 157 = linux_sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, 0 }, /* 158 = sched_yield */ + { AS(linux_sched_get_priority_max_args), (sy_call_t *)linux_sched_get_priority_max, AUE_SCHED_GET_PRIORITY_MAX, NULL, 0, 0, 0 }, /* 159 = linux_sched_get_priority_max */ + { AS(linux_sched_get_priority_min_args), (sy_call_t *)linux_sched_get_priority_min, AUE_SCHED_GET_PRIORITY_MIN, NULL, 0, 0, 0 }, /* 160 = linux_sched_get_priority_min */ + { AS(linux_sched_rr_get_interval_args), (sy_call_t *)linux_sched_rr_get_interval, AUE_SCHED_RR_GET_INTERVAL, NULL, 0, 0, 0 }, /* 161 = linux_sched_rr_get_interval */ + { AS(linux_nanosleep_args), (sy_call_t *)linux_nanosleep, AUE_NULL, NULL, 0, 0, 0 }, /* 162 = linux_nanosleep */ + { AS(linux_mremap_args), (sy_call_t *)linux_mremap, AUE_NULL, NULL, 0, 0, 0 }, /* 163 = linux_mremap */ + { AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0, 0 }, /* 164 = linux_setresuid16 */ + { AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0, 0 }, /* 165 = linux_getresuid16 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 166 = vm86 */ + { 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0, 0 }, /* 167 = linux_query_module */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, 0 }, /* 168 = poll */ + { 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0, 0 }, /* 169 = linux_nfsservctl */ + { AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0, 0 }, /* 170 = linux_setresgid16 */ + { AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0, 0 }, /* 171 = linux_getresgid16 */ + { AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0, 0 }, /* 172 = linux_prctl */ + { AS(linux_rt_sigreturn_args), (sy_call_t *)linux_rt_sigreturn, AUE_NULL, NULL, 0, 0, 0 }, /* 173 = linux_rt_sigreturn */ + { AS(linux_rt_sigaction_args), (sy_call_t *)linux_rt_sigaction, AUE_NULL, NULL, 0, 0, 0 }, /* 174 = linux_rt_sigaction */ + { AS(linux_rt_sigprocmask_args), (sy_call_t *)linux_rt_sigprocmask, AUE_NULL, NULL, 0, 0, 0 }, /* 175 = linux_rt_sigprocmask */ + { AS(linux_rt_sigpending_args), (sy_call_t *)linux_rt_sigpending, AUE_NULL, NULL, 0, 0, 0 }, /* 176 = linux_rt_sigpending */ + { AS(linux_rt_sigtimedwait_args), (sy_call_t *)linux_rt_sigtimedwait, AUE_NULL, NULL, 0, 0, 0 }, /* 177 = linux_rt_sigtimedwait */ + { 0, (sy_call_t *)linux_rt_sigqueueinfo, AUE_NULL, NULL, 0, 0, 0 }, /* 178 = linux_rt_sigqueueinfo */ + { AS(linux_rt_sigsuspend_args), (sy_call_t *)linux_rt_sigsuspend, AUE_NULL, NULL, 0, 0, 0 }, /* 179 = linux_rt_sigsuspend */ + { AS(linux_pread_args), (sy_call_t *)linux_pread, AUE_PREAD, NULL, 0, 0, 0 }, /* 180 = linux_pread */ + { AS(linux_pwrite_args), (sy_call_t *)linux_pwrite, AUE_PWRITE, NULL, 0, 0, 0 }, /* 181 = linux_pwrite */ + { AS(linux_chown16_args), (sy_call_t *)linux_chown16, AUE_CHOWN, NULL, 0, 0, 0 }, /* 182 = linux_chown16 */ + { AS(linux_getcwd_args), (sy_call_t *)linux_getcwd, AUE_GETCWD, NULL, 0, 0, 0 }, /* 183 = linux_getcwd */ + { 0, (sy_call_t *)linux_capget, AUE_CAPGET, NULL, 0, 0, 0 }, /* 184 = linux_capget */ + { 0, (sy_call_t *)linux_capset, AUE_CAPSET, NULL, 0, 0, 0 }, /* 185 = linux_capset */ + { AS(linux_sigaltstack_args), (sy_call_t *)linux_sigaltstack, AUE_NULL, NULL, 0, 0, 0 }, /* 186 = linux_sigaltstack */ + { 0, (sy_call_t *)linux_sendfile, AUE_SENDFILE, NULL, 0, 0, 0 }, /* 187 = linux_sendfile */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 188 = getpmsg */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 189 = putpmsg */ + { 0, (sy_call_t *)linux_vfork, AUE_VFORK, NULL, 0, 0, 0 }, /* 190 = linux_vfork */ + { AS(linux_getrlimit_args), (sy_call_t *)linux_getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 191 = linux_getrlimit */ + { AS(linux_mmap2_args), (sy_call_t *)linux_mmap2, AUE_MMAP, NULL, 0, 0, 0 }, /* 192 = linux_mmap2 */ + { AS(linux_truncate64_args), (sy_call_t *)linux_truncate64, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 193 = linux_truncate64 */ + { AS(linux_ftruncate64_args), (sy_call_t *)linux_ftruncate64, AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 194 = linux_ftruncate64 */ + { AS(linux_stat64_args), (sy_call_t *)linux_stat64, AUE_STAT, NULL, 0, 0, 0 }, /* 195 = linux_stat64 */ + { AS(linux_lstat64_args), (sy_call_t *)linux_lstat64, AUE_LSTAT, NULL, 0, 0, 0 }, /* 196 = linux_lstat64 */ + { AS(linux_fstat64_args), (sy_call_t *)linux_fstat64, AUE_FSTAT, NULL, 0, 0, 0 }, /* 197 = linux_fstat64 */ + { AS(linux_lchown_args), (sy_call_t *)linux_lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 198 = linux_lchown */ + { 0, (sy_call_t *)linux_getuid, AUE_GETUID, NULL, 0, 0, 0 }, /* 199 = linux_getuid */ + { 0, (sy_call_t *)linux_getgid, AUE_GETGID, NULL, 0, 0, 0 }, /* 200 = linux_getgid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, 0 }, /* 201 = geteuid */ + { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, 0 }, /* 202 = getegid */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, 0 }, /* 203 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, 0 }, /* 204 = setregid */ + { AS(linux_getgroups_args), (sy_call_t *)linux_getgroups, AUE_GETGROUPS, NULL, 0, 0, 0 }, /* 205 = linux_getgroups */ + { AS(linux_setgroups_args), (sy_call_t *)linux_setgroups, AUE_SETGROUPS, NULL, 0, 0, 0 }, /* 206 = linux_setgroups */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_NULL, NULL, 0, 0, 0 }, /* 207 = fchown */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, 0 }, /* 208 = setresuid */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0, 0 }, /* 209 = getresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, 0 }, /* 210 = setresgid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0, 0 }, /* 211 = getresgid */ + { AS(linux_chown_args), (sy_call_t *)linux_chown, AUE_CHOWN, NULL, 0, 0, 0 }, /* 212 = linux_chown */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, 0 }, /* 213 = setuid */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, 0 }, /* 214 = setgid */ + { AS(linux_setfsuid_args), (sy_call_t *)linux_setfsuid, AUE_SETFSUID, NULL, 0, 0, 0 }, /* 215 = linux_setfsuid */ + { AS(linux_setfsgid_args), (sy_call_t *)linux_setfsgid, AUE_SETFSGID, NULL, 0, 0, 0 }, /* 216 = linux_setfsgid */ + { AS(linux_pivot_root_args), (sy_call_t *)linux_pivot_root, AUE_PIVOT_ROOT, NULL, 0, 0, 0 }, /* 217 = linux_pivot_root */ + { AS(linux_mincore_args), (sy_call_t *)linux_mincore, AUE_MINCORE, NULL, 0, 0, 0 }, /* 218 = linux_mincore */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, 0 }, /* 219 = madvise */ + { AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 220 = linux_getdents64 */ + { AS(linux_fcntl64_args), (sy_call_t *)linux_fcntl64, AUE_FCNTL, NULL, 0, 0, 0 }, /* 221 = linux_fcntl64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 222 = */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 223 = */ + { 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0, 0 }, /* 224 = linux_gettid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 225 = linux_readahead */ + { 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 226 = linux_setxattr */ + { 0, (sy_call_t *)linux_lsetxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 227 = linux_lsetxattr */ + { 0, (sy_call_t *)linux_fsetxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 228 = linux_fsetxattr */ + { 0, (sy_call_t *)linux_getxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 229 = linux_getxattr */ + { 0, (sy_call_t *)linux_lgetxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 230 = linux_lgetxattr */ + { 0, (sy_call_t *)linux_fgetxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 231 = linux_fgetxattr */ + { 0, (sy_call_t *)linux_listxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 232 = linux_listxattr */ + { 0, (sy_call_t *)linux_llistxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 233 = linux_llistxattr */ + { 0, (sy_call_t *)linux_flistxattr, AUE_NULL, NULL, 0, 0, 0 }, /* 234 = linux_flistxattr */ + { 0, (sy_call_t *)linux_removexattr, AUE_NULL, NULL, 0, 0, 0 }, /* 235 = linux_removexattr */ + { 0, (sy_call_t *)linux_lremovexattr, AUE_NULL, NULL, 0, 0, 0 }, /* 236 = linux_lremovexattr */ + { 0, (sy_call_t *)linux_fremovexattr, AUE_NULL, NULL, 0, 0, 0 }, /* 237 = linux_fremovexattr */ + { AS(linux_tkill_args), (sy_call_t *)linux_tkill, AUE_NULL, NULL, 0, 0, 0 }, /* 238 = linux_tkill */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 239 = linux_sendfile64 */ + { AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0, 0 }, /* 240 = linux_sys_futex */ + { AS(linux_sched_setaffinity_args), (sy_call_t *)linux_sched_setaffinity, AUE_NULL, NULL, 0, 0, 0 }, /* 241 = linux_sched_setaffinity */ + { AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0, 0 }, /* 242 = linux_sched_getaffinity */ + { AS(linux_set_thread_area_args), (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0, 0 }, /* 243 = linux_set_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 244 = linux_get_thread_area */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 245 = linux_io_setup */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 246 = linux_io_destroy */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 247 = linux_io_getevents */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 248 = inux_io_submit */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 249 = linux_io_cancel */ + { 0, (sy_call_t *)linux_fadvise64, AUE_NULL, NULL, 0, 0, 0 }, /* 250 = linux_fadvise64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 251 = */ + { AS(linux_exit_group_args), (sy_call_t *)linux_exit_group, AUE_EXIT, NULL, 0, 0, 0 }, /* 252 = linux_exit_group */ + { 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0, 0 }, /* 253 = linux_lookup_dcookie */ + { 0, (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0, 0 }, /* 254 = linux_epoll_create */ + { 0, (sy_call_t *)linux_epoll_ctl, AUE_NULL, NULL, 0, 0, 0 }, /* 255 = linux_epoll_ctl */ + { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0, 0 }, /* 256 = linux_epoll_wait */ + { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0, 0 }, /* 257 = linux_remap_file_pages */ + { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0, 0 }, /* 258 = linux_set_tid_address */ + { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0, 0 }, /* 259 = linux_timer_create */ + { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0, 0 }, /* 260 = linux_timer_settime */ + { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 261 = linux_timer_gettime */ + { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0, 0 }, /* 262 = linux_timer_getoverrun */ + { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0, 0 }, /* 263 = linux_timer_delete */ + { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0 }, /* 264 = linux_clock_settime */ + { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 265 = linux_clock_gettime */ + { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0, 0 }, /* 266 = linux_clock_getres */ + { AS(linux_clock_nanosleep_args), (sy_call_t *)linux_clock_nanosleep, AUE_NULL, NULL, 0, 0, 0 }, /* 267 = linux_clock_nanosleep */ + { AS(linux_statfs64_args), (sy_call_t *)linux_statfs64, AUE_STATFS, NULL, 0, 0, 0 }, /* 268 = linux_statfs64 */ + { 0, (sy_call_t *)linux_fstatfs64, AUE_FSTATFS, NULL, 0, 0, 0 }, /* 269 = linux_fstatfs64 */ + { AS(linux_tgkill_args), (sy_call_t *)linux_tgkill, AUE_NULL, NULL, 0, 0, 0 }, /* 270 = linux_tgkill */ + { AS(linux_utimes_args), (sy_call_t *)linux_utimes, AUE_UTIMES, NULL, 0, 0, 0 }, /* 271 = linux_utimes */ + { 0, (sy_call_t *)linux_fadvise64_64, AUE_NULL, NULL, 0, 0, 0 }, /* 272 = linux_fadvise64_64 */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 273 = */ + { 0, (sy_call_t *)linux_mbind, AUE_NULL, NULL, 0, 0, 0 }, /* 274 = linux_mbind */ + { 0, (sy_call_t *)linux_get_mempolicy, AUE_NULL, NULL, 0, 0, 0 }, /* 275 = linux_get_mempolicy */ + { 0, (sy_call_t *)linux_set_mempolicy, AUE_NULL, NULL, 0, 0, 0 }, /* 276 = linux_set_mempolicy */ + { 0, (sy_call_t *)linux_mq_open, AUE_NULL, NULL, 0, 0, 0 }, /* 277 = linux_mq_open */ + { 0, (sy_call_t *)linux_mq_unlink, AUE_NULL, NULL, 0, 0, 0 }, /* 278 = linux_mq_unlink */ + { 0, (sy_call_t *)linux_mq_timedsend, AUE_NULL, NULL, 0, 0, 0 }, /* 279 = linux_mq_timedsend */ + { 0, (sy_call_t *)linux_mq_timedreceive, AUE_NULL, NULL, 0, 0, 0 }, /* 280 = linux_mq_timedreceive */ + { 0, (sy_call_t *)linux_mq_notify, AUE_NULL, NULL, 0, 0, 0 }, /* 281 = linux_mq_notify */ + { 0, (sy_call_t *)linux_mq_getsetattr, AUE_NULL, NULL, 0, 0, 0 }, /* 282 = linux_mq_getsetattr */ + { 0, (sy_call_t *)linux_kexec_load, AUE_NULL, NULL, 0, 0, 0 }, /* 283 = linux_kexec_load */ + { 0, (sy_call_t *)linux_waitid, AUE_NULL, NULL, 0, 0, 0 }, /* 284 = linux_waitid */ + { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 285 = */ + { 0, (sy_call_t *)linux_add_key, AUE_NULL, NULL, 0, 0, 0 }, /* 286 = linux_add_key */ + { 0, (sy_call_t *)linux_request_key, AUE_NULL, NULL, 0, 0, 0 }, /* 287 = linux_request_key */ + { 0, (sy_call_t *)linux_keyctl, AUE_NULL, NULL, 0, 0, 0 }, /* 288 = linux_keyctl */ + { 0, (sy_call_t *)linux_ioprio_set, AUE_NULL, NULL, 0, 0, 0 }, /* 289 = linux_ioprio_set */ + { 0, (sy_call_t *)linux_ioprio_get, AUE_NULL, NULL, 0, 0, 0 }, /* 290 = linux_ioprio_get */ + { 0, (sy_call_t *)linux_inotify_init, AUE_NULL, NULL, 0, 0, 0 }, /* 291 = linux_inotify_init */ + { 0, (sy_call_t *)linux_inotify_add_watch, AUE_NULL, NULL, 0, 0, 0 }, /* 292 = linux_inotify_add_watch */ + { 0, (sy_call_t *)linux_inotify_rm_watch, AUE_NULL, NULL, 0, 0, 0 }, /* 293 = linux_inotify_rm_watch */ + { 0, (sy_call_t *)linux_migrate_pages, AUE_NULL, NULL, 0, 0, 0 }, /* 294 = linux_migrate_pages */ + { AS(linux_openat_args), (sy_call_t *)linux_openat, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 295 = linux_openat */ + { AS(linux_mkdirat_args), (sy_call_t *)linux_mkdirat, AUE_MKDIRAT, NULL, 0, 0, 0 }, /* 296 = linux_mkdirat */ + { AS(linux_mknodat_args), (sy_call_t *)linux_mknodat, AUE_MKNODAT, NULL, 0, 0, 0 }, /* 297 = linux_mknodat */ + { AS(linux_fchownat_args), (sy_call_t *)linux_fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 }, /* 298 = linux_fchownat */ + { AS(linux_futimesat_args), (sy_call_t *)linux_futimesat, AUE_FUTIMESAT, NULL, 0, 0, 0 }, /* 299 = linux_futimesat */ + { AS(linux_fstatat64_args), (sy_call_t *)linux_fstatat64, AUE_FSTATAT, NULL, 0, 0, 0 }, /* 300 = linux_fstatat64 */ + { AS(linux_unlinkat_args), (sy_call_t *)linux_unlinkat, AUE_UNLINKAT, NULL, 0, 0, 0 }, /* 301 = linux_unlinkat */ + { AS(linux_renameat_args), (sy_call_t *)linux_renameat, AUE_RENAMEAT, NULL, 0, 0, 0 }, /* 302 = linux_renameat */ + { AS(linux_linkat_args), (sy_call_t *)linux_linkat, AUE_LINKAT, NULL, 0, 0, 0 }, /* 303 = linux_linkat */ + { AS(linux_symlinkat_args), (sy_call_t *)linux_symlinkat, AUE_SYMLINKAT, NULL, 0, 0, 0 }, /* 304 = linux_symlinkat */ + { AS(linux_readlinkat_args), (sy_call_t *)linux_readlinkat, AUE_READLINKAT, NULL, 0, 0, 0 }, /* 305 = linux_readlinkat */ + { AS(linux_fchmodat_args), (sy_call_t *)linux_fchmodat, AUE_FCHMODAT, NULL, 0, 0, 0 }, /* 306 = linux_fchmodat */ + { AS(linux_faccessat_args), (sy_call_t *)linux_faccessat, AUE_FACCESSAT, NULL, 0, 0, 0 }, /* 307 = linux_faccessat */ + { 0, (sy_call_t *)linux_pselect6, AUE_NULL, NULL, 0, 0, 0 }, /* 308 = linux_pselect6 */ + { 0, (sy_call_t *)linux_ppoll, AUE_NULL, NULL, 0, 0, 0 }, /* 309 = linux_ppoll */ + { 0, (sy_call_t *)linux_unshare, AUE_NULL, NULL, 0, 0, 0 }, /* 310 = linux_unshare */ + { AS(linux_set_robust_list_args), (sy_call_t *)linux_set_robust_list, AUE_NULL, NULL, 0, 0, 0 }, /* 311 = linux_set_robust_list */ + { AS(linux_get_robust_list_args), (sy_call_t *)linux_get_robust_list, AUE_NULL, NULL, 0, 0, 0 }, /* 312 = linux_get_robust_list */ + { 0, (sy_call_t *)linux_splice, AUE_NULL, NULL, 0, 0, 0 }, /* 313 = linux_splice */ + { 0, (sy_call_t *)linux_sync_file_range, AUE_NULL, NULL, 0, 0, 0 }, /* 314 = linux_sync_file_range */ + { 0, (sy_call_t *)linux_tee, AUE_NULL, NULL, 0, 0, 0 }, /* 315 = linux_tee */ + { 0, (sy_call_t *)linux_vmsplice, AUE_NULL, NULL, 0, 0, 0 }, /* 316 = linux_vmsplice */ }; ==== //depot/projects/vimage-commit2/src/sys/boot/common/boot.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/boot.c,v 1.31 2005/05/19 23:03:01 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/boot.c,v 1.32 2009/06/01 01:02:30 rodrigc Exp $"); /* * Loading modules, booting the system @@ -287,7 +287,7 @@ int getrootmount(char *rootdev) { - char lbuf[128], *cp, *ep, *dev, *fstyp; + char lbuf[128], *cp, *ep, *dev, *fstyp, *options; int fd, error; if (getenv("vfs.root.mountfrom") != NULL) @@ -331,11 +331,30 @@ *cp = 0; fstyp = strdup(ep); - /* build the final result and save it */ + /* skip whitespace up to mount options */ + cp += 1; + while ((*cp != 0) && isspace(*cp)) + cp++; + if (*cp == 0) /* misformatted */ + continue; + /* skip text to end of mount options and delimit */ + ep = cp; + while ((*cp != 0) && !isspace(*cp)) + cp++; + *cp = 0; + options = strdup(ep); + /* Build the : and save it in vfs.root.mountfrom */ sprintf(lbuf, "%s:%s", fstyp, dev); free(dev); free(fstyp); setenv("vfs.root.mountfrom", lbuf, 0); + + /* Don't override vfs.root.mountfrom.options if it is already set */ + if (getenv("vfs.root.mountfrom.options") == NULL) { + /* save mount options */ + setenv("vfs.root.mountfrom.options", options, 0); + } + free(options); error = 0; break; } ==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.59 2009/04/14 14:19:18 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.60 2009/06/01 14:20:13 jhb Exp $"); /* * BIOS disk device handling. @@ -387,6 +387,7 @@ sprintf(line, "%s: FreeBSD swap%s\n", prefix, stats); else sprintf(line, "%s: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x%s\n", + prefix, gp->gp_type.time_low, gp->gp_type.time_mid, gp->gp_type.time_hi_and_version, gp->gp_type.clock_seq_hi_and_reserved, gp->gp_type.clock_seq_low, ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 (text+ko) ==== @@ -172,7 +172,6 @@ uint64_t zfs_arc_min; uint64_t zfs_arc_meta_limit = 0; int zfs_mdcomp_disable = 0; -int arc_large_memory_enabled = 0; TUNABLE_QUAD("vfs.zfs.arc_max", &zfs_arc_max); TUNABLE_QUAD("vfs.zfs.arc_min", &zfs_arc_min); @@ -3430,13 +3429,17 @@ arc_min_prefetch_lifespan = 1 * hz; /* Start out with 1/8 of all memory */ -#if defined(_KERNEL) && (__amd64__) - arc_c = physmem*PAGE_SIZE / 8; - if (physmem*PAGE_SIZE > kmem_size()) - arc_large_memory_enabled = 1; -#else arc_c = kmem_size() / 8; -#endif +#if 0 +#ifdef _KERNEL + /* + * On architectures where the physical memory can be larger + * than the addressable space (intel in 32-bit mode), we may + * need to limit the cache to 1/8 of VM size. + */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 3 16:42:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B0B81065675; Wed, 3 Jun 2009 16:42:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0CF781065673 for ; Wed, 3 Jun 2009 16:42:11 +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 EF7C68FC1C for ; Wed, 3 Jun 2009 16:42:10 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n53GgAkM078785 for ; Wed, 3 Jun 2009 16:42:10 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53GgANE078783 for perforce@freebsd.org; Wed, 3 Jun 2009 16:42:10 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 3 Jun 2009 16:42:10 GMT Message-Id: <200906031642.n53GgANE078783@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 163425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 16:42:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=163425 Change 163425 by pgj@petymeg-current on 2009/06/03 16:41:53 Import some utility routines and an overall skeleton from libmemstat(3) sources. This will serve as a base for further experimentations. Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/Makefile#2 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#2 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_all.c#1 add .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#2 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_tcp.c#1 add .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_udp.c#1 add .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#2 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/Makefile#2 (text+ko) ==== @@ -2,7 +2,8 @@ .include LIB= netstat -SRCS= netstat_util.c +SRCS= netstat_tcp.c netstat_udp.c \ + netstat_all.c netstat_util.c INCS= netstat.h ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#2 (text+ko) ==== @@ -2,6 +2,16 @@ #ifndef _NETSTAT_H_ #define _NETSTAT_H_ +#define NETSTAT_MAXCPU 32 +#define NETSTAT_MAXCALLER 16 + +#define NETSTAT_TYPE_UNKNOWN 0 +#define NETSTAT_TYPE_TCP 1 +#define NETSTAT_TYPE_UDP 2 +#define NETSTAT_TYPE_ANY 255 + +#define NETSTAT_MAXNAME 32 + #define NETSTAT_ERROR_UNDEFINED 0 #define NETSTAT_ERROR_NOMEMORY 1 #define NETSTAT_ERROR_VERSION 2 @@ -9,4 +19,28 @@ #define NETSTAT_ERROR_KVM_NOSYMBOL 4 #define NETSTAT_ERROR_KVM_SHORTREAD 5 +struct netstat; +struct netstat_list; + +__BEGIN_DECLS +const char *netstat_strerror(int); + +struct netstat_list *netstat_nsl_alloc(void); +struct netstat *netstat_nsl_first(struct netstat_list *); +struct netstat *netstat_nsl_next(struct netstat *); +struct netstat *netstat_nsl_find(struct netstat_list *, + int, const char *); + +void netstat_nsl_free(struct netstat_list *); +int netstat_nsl_geterror(struct netstat_list *); + +int netstat_sysctl_all(struct netstat_list *, int); +int netstat_sysctl_tcp(struct netstat_list *, int); +int netstat_sysctl_udp(struct netstat_list *, int); + +int netstat_kvm_all(struct netstat_list *, void *); +int netstat_kvm_tcp(struct netstat_list *, void *); +int netstat_kvm_udp(struct netstat_list *, void *); +__END_DECLS + #endif /* !_NETSTAT_H_ */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#2 (text+ko) ==== @@ -2,4 +2,27 @@ #ifndef _NETSTAT_INTERNAL_H_ #define _NETSTAT_INTERNAL_H_ +#include +#include + +struct netstat { + int ns_type; + char ns_name[NETSTAT_MAXNAME]; + + LIST_ENTRY(netstat) ns_list; +}; + +struct netstat_list { + LIST_HEAD(, netstat) nsl_list; + int nsl_error; +}; + +int kread(kvm_t *, void *, void *, size_t, size_t); +int kread_string(kvm_t *, void *, char *, int); + +void _netstat_nsl_empty(struct netstat_list *); +struct netstat *_netstat_ns_allocate(struct netstat_list *, + int, const char *); +void _netstat_ns_reset_stats(struct netstat *); + #endif /* !_NETSTAT_INTERNAL_H_ */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#2 (text+ko) ==== @@ -1,11 +1,14 @@ +#include #include #include +#include +#include #include "netstat.h" #include "netstat_internal.h" -static int +int kread(kvm_t *kvm, void *kvm_pointer, void *address, size_t size, size_t offset) { @@ -20,7 +23,7 @@ return (0); } -static int +int kread_string(kvm_t *kvm, void *kvm_pointer, char *buffer, int buflen) { ssize_t ret; @@ -39,3 +42,124 @@ buffer[i - 1] = '\0'; return (0); } + +const char * +netstat_strerror(int error) +{ + switch (error) { + case NETSTAT_ERROR_NOMEMORY: + return ("Cannot allocate memory"); + case NETSTAT_ERROR_VERSION: + return ("Version mismatch"); + case NETSTAT_ERROR_KVM: + return ("KVM error"); + case NETSTAT_ERROR_KVM_NOSYMBOL: + return ("KVM unable to find symbol"); + case NETSTAT_ERROR_KVM_SHORTREAD: + return ("KVM short read"); + case NETSTAT_ERROR_UNDEFINED: + default: + return ("Unknown error"); + } +} + +struct netstat_list * +netstat_nsl_alloc(void) +{ + struct netstat_list *nslp; + + nslp = malloc(sizeof(*nslp)); + if (nslp == NULL) + return NULL; + + LIST_INIT(&nslp->nsl_list); + nslp->nsl_error = NETSTAT_ERROR_UNDEFINED; + return (nslp); +} + +struct netstat * +netstat_nsl_first(struct netstat_list *list) +{ + return (LIST_FIRST(&list->nsl_list)); +} + +struct netstat * +netstat_nsl_next(struct netstat * nsp) +{ + return (LIST_NEXT(nsp, ns_list)); +} + +void +_netstat_nsl_empty(struct netstat_list *list) +{ + struct netstat *nsp; + + while ((nsp = LIST_FIRST(&list->nsl_list))) { + LIST_REMOVE(nsp, ns_list); + free(nsp); + } +} + +void +_netstat_nsl_free(struct netstat_list *list) +{ + _netstat_nsl_empty(list); + free(list); +} + +int +netstat_nsl_geterror(struct netstat_list *list) +{ + return (list->nsl_error); +} + +struct netstat * +netstat_nsl_find(struct netstat_list *list, int ns_type, + const char *name) +{ + struct netstat *nsp; + + LIST_FOREACH(nsp, &list->nsl_list, ns_list) { + if ((nsp->ns_type == ns_type || + ns_type == NETSTAT_TYPE_ANY) && + strcmp(nsp->ns_name, name) == 0) + return (nsp); + } + return (NULL); +} + +struct netstat * +_netstat_ns_allocate(struct netstat_list *list, int ns_type, + const char *name) +{ + struct netstat *nsp; + + nsp = malloc(sizeof(*nsp)); + if (nsp == NULL) + return (NULL); + + bzero(nsp, sizeof(*nsp)); + + nsp->ns_type = ns_type; + strlcpy(nsp->ns_name, name, NETSTAT_MAXNAME); + LIST_INSERT_HEAD(&list->nsl_list, nsp, ns_list); + return (nsp); +} + +void +_netstat_ns_reset_stats(struct netstat *nsp) +{ +} + +const char * +netstat_get_name(const struct netstat *nsp) +{ + return (nsp->ns_name); +} + +int +netstat_get_type(const struct netstat *nsp) +{ + return (nsp->ns_type); +} + From owner-p4-projects@FreeBSD.ORG Wed Jun 3 16:54:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 211811065677; Wed, 3 Jun 2009 16:54: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 D56CC1065673 for ; Wed, 3 Jun 2009 16:54:23 +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 C4A788FC1D for ; Wed, 3 Jun 2009 16:54:23 +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 n53GsNcB089608 for ; Wed, 3 Jun 2009 16:54:23 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53GsNJb089606 for perforce@freebsd.org; Wed, 3 Jun 2009 16:54:23 GMT (envelope-from zec@fer.hr) Date: Wed, 3 Jun 2009 16:54:23 GMT Message-Id: <200906031654.n53GsNJb089606@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 163426 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 16:54:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=163426 Change 163426 by zec@zec_amdx4 on 2009/06/03 16:54:08 Temporarily disconnect if_epair from modules and LINT build, until netisr2 dependencies get resolved. Affected files ... .. //depot/projects/vimage/src/sys/conf/NOTES#53 edit .. //depot/projects/vimage/src/sys/modules/Makefile#49 edit Differences ... ==== //depot/projects/vimage/src/sys/conf/NOTES#53 (text+ko) ==== @@ -830,7 +830,7 @@ device lagg # -device epair #Virtual cross-over Ethernet +#device epair #Virtual cross-over Ethernet # Internet family options: # ==== //depot/projects/vimage/src/sys/modules/Makefile#49 (text+ko) ==== @@ -106,7 +106,6 @@ if_disc \ if_edsc \ if_ef \ - if_epair \ if_faith \ if_gif \ if_gre \ From owner-p4-projects@FreeBSD.ORG Wed Jun 3 16:55:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BC0C106566C; Wed, 3 Jun 2009 16:55: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 439A91065673 for ; Wed, 3 Jun 2009 16:55: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 31E478FC18 for ; Wed, 3 Jun 2009 16:55: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 n53GtQLl089741 for ; Wed, 3 Jun 2009 16:55:26 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53GtOG1089739 for perforce@freebsd.org; Wed, 3 Jun 2009 16:55:24 GMT (envelope-from zec@fer.hr) Date: Wed, 3 Jun 2009 16:55:24 GMT Message-Id: <200906031655.n53GtOG1089739@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 163427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 16:55:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=163427 Change 163427 by zec@zec_amdx4 on 2009/06/03 16:55:04 Unbreak GENERIC and VIMAGE builds, hopefully LINT and VLINT as well. While here, trim down a few unnecessary diffs against head. Affected files ... .. //depot/projects/vimage/src/sys/net/netisr.h#9 edit .. //depot/projects/vimage/src/sys/net/route.c#51 edit .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#24 edit .. //depot/projects/vimage/src/sys/netinet/igmp.c#42 edit .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#36 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#78 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#52 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#48 edit .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#26 edit .. //depot/projects/vimage/src/sys/nlm/nlm_advlock.c#9 edit .. //depot/projects/vimage/src/sys/rpc/rpc.h#6 edit .. //depot/projects/vimage/src/sys/sys/sysctl.h#37 edit .. //depot/projects/vimage/src/sys/sys/ucred.h#11 edit Differences ... ==== //depot/projects/vimage/src/sys/net/netisr.h#9 (text+ko) ==== @@ -50,6 +50,7 @@ #define NETISR_ETHER 9 /* ethernet input */ #define NETISR_IPV6 10 #define NETISR_NATM 11 +#define NETISR_EPAIR 12 /*- * Protocols express ordering constraints and affinity preferences by ==== //depot/projects/vimage/src/sys/net/route.c#51 (text+ko) ==== @@ -249,7 +249,7 @@ int table; int fam; struct domain *dom; - INIT_VNET_NET(curvnet); + struct radix_node_head **rnh; for (dom = domains; dom; dom = dom->dom_next) { if (dom->dom_rtdetach) { @@ -257,8 +257,10 @@ if ( (fam = dom->dom_family) == AF_INET || table == 0) { /* for now only AF_INET has > 1 table */ - dom->dom_rtdetach( - (void **)&V_rt_tables[table][fam], + rnh = rt_tables_get_rnh_ptr(table, fam); + if (rnh == NULL) + panic("%s: rnh NULL", __func__); + dom->dom_rtdetach((void **)rnh, dom->dom_rtoffset); } else { break; ==== //depot/projects/vimage/src/sys/netgraph/ng_iface.c#24 (text+ko) ==== @@ -123,10 +123,6 @@ static int ng_iface_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data); static int ng_iface_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst, struct route *ro); -#ifdef VIMAGE -static void ng_iface_reassign(struct ifnet *ifp, struct vnet *vnet, - char *dname); -#endif static void ng_iface_bpftap(struct ifnet *ifp, struct mbuf *m, sa_family_t family); static int ng_iface_send(struct ifnet *ifp, struct mbuf *m, @@ -582,9 +578,6 @@ ifp->if_output = ng_iface_output; ifp->if_start = ng_iface_start; ifp->if_ioctl = ng_iface_ioctl; -#ifdef VIMAGE - ifp->if_reassign = ng_iface_reassign; -#endif ifp->if_watchdog = NULL; ifp->if_mtu = NG_IFACE_MTU_DEFAULT; ifp->if_flags = (IFF_SIMPLEX|IFF_POINTOPOINT|IFF_NOARP|IFF_MULTICAST); @@ -609,24 +602,6 @@ return (0); } -#ifdef VIMAGE -static void -ng_iface_reassign(struct ifnet *ifp, struct vnet *vnet, char *dname) -{ - bpfdetach(ifp); - if_detach(ifp); - ifp->if_bpf = NULL; - if_reassign_common(ifp, vnet, "ser"); - if (dname) - snprintf(ifp->if_xname, IFNAMSIZ, "%s", dname); - - CURVNET_SET_QUIET(vnet); - if_attach(ifp); - bpfattach(ifp, DLT_NULL, sizeof(u_int32_t)); - CURVNET_RESTORE(); -} -#endif - /* * Give our ok for a hook to be added */ ==== //depot/projects/vimage/src/sys/netinet/igmp.c#42 (text+ko) ==== @@ -1993,7 +1993,6 @@ 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; ==== //depot/projects/vimage/src/sys/netinet/in_rmx.c#36 (text+ko) ==== @@ -64,9 +64,9 @@ #include #include -int in_inithead(void **head, int off); +extern int in_inithead(void **head, int off); #ifdef VIMAGE -int in_detachhead(void **head, int off); +extern int in_detachhead(void **head, int off); #endif #define RTPRF_OURS RTF_PROTO3 /* set on routes we manage */ @@ -248,6 +248,8 @@ static struct callout rtq_timer; #endif +static void in_rtqtimo_one(void *rock); + static void in_rtqtimo(void *rock) { @@ -272,6 +274,7 @@ in_rtqtimo_one(void *rock) { INIT_VNET_INET(curvnet); + struct radix_node_head *rnh = rock; struct rtqk_arg arg; static time_t last_adjusted_timeout = 0; @@ -310,26 +313,7 @@ rnh->rnh_walktree(rnh, in_rtqkill, &arg); RADIX_NODE_HEAD_UNLOCK(rnh); } -} - -static void -in_rtqtimo(void *rock) -{ - int fibnum; - void *newrock; - CURVNET_SET_QUIET((struct vnet *) rock); - INIT_VNET_NET((struct vnet *) rock); - INIT_VNET_INET((struct vnet *) rock); - struct timeval atv; - for (fibnum = 0; fibnum < rt_numfibs; fibnum++) { - if ((newrock = V_rt_tables[fibnum][AF_INET]) != NULL) - in_rtqtimo_one(newrock); - } - atv.tv_usec = 0; - atv.tv_sec = V_rtq_timeout; - callout_reset(&V_rtq_timer, tvtohz(&atv), in_rtqtimo, rock); - CURVNET_RESTORE(); } void ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#78 (text+ko) ==== @@ -141,14 +141,15 @@ static int fw_verbose; static struct callout ipfw_timeout; static int verbose_limit; +static uma_zone_t ipfw_dyn_rule_zone; +struct ip_fw_chain layer3_chain; +#endif + #ifdef IPFIREWALL_DEFAULT_TO_ACCEPT static int default_to_accept = 1; #else static int default_to_accept; #endif -static uma_zone_t ipfw_dyn_rule_zone; -struct ip_fw_chain layer3_chain; -#endif MALLOC_DEFINE(M_IPFW, "IpFw/IpAcct", "IpFw/IpAcct chain's"); MALLOC_DEFINE(M_IPFW_TBL, "ipfw_tbl", "IpFw tables"); ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#52 (text+ko) ==== @@ -196,6 +196,7 @@ nd6_destroy() { INIT_VNET_INET6(curvnet); + callout_drain(&V_nd6_slowtimo_ch); callout_drain(&V_nd6_timer_ch); } ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#48 (text+ko) ==== @@ -1800,7 +1800,7 @@ } static int -ipsec_iattach(const void *unused) +ipsec_iattach(const void *unused __unused) { INIT_VNET_IPSEC(curvnet); @@ -1816,6 +1816,7 @@ ipsec_idetach(unused) const void *unused; { + return (0); } #endif ==== //depot/projects/vimage/src/sys/netipsec/xform_esp.c#26 (text+ko) ==== @@ -90,7 +90,6 @@ static int esp_input_cb(struct cryptop *op); static int esp_output_cb(struct cryptop *crp); - static int esp_iattach(const void *); #ifndef VIMAGE_GLOBALS @@ -998,6 +997,18 @@ esp_output }; +static void +esp_attach(void) +{ + + xform_register(&esp_xformsw); +#ifndef VIMAGE_GLOBALS + vnet_mod_register(&vnet_esp_modinfo); +#else + esp_iattach(NULL); +#endif +} + static int esp_iattach(const void *unused __unused) { @@ -1018,21 +1029,8 @@ MAXIV(enc_xform_skipjack); /* SADB_X_EALG_SKIPJACK */ MAXIV(enc_xform_null); /* SADB_EALG_NULL */ MAXIV(enc_xform_camellia); /* SADB_X_EALG_CAMELLIACBC */ - #undef MAXIV return (0); } - -static void -esp_attach(void) -{ - -#ifndef VIMAGE_GLOBALS - vnet_mod_register(&vnet_esp_modinfo); -#else - esp_iattach(NULL); -#endif - xform_register(&esp_xformsw); -} SYSINIT(esp_xform_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, esp_attach, NULL); ==== //depot/projects/vimage/src/sys/nlm/nlm_advlock.c#9 (text+ko) ==== @@ -44,7 +44,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage/src/sys/rpc/rpc.h#6 (text+ko) ==== @@ -42,7 +42,6 @@ #ifndef _RPC_RPC_H #define _RPC_RPC_H -#include #include /* some typedefs */ #include #include ==== //depot/projects/vimage/src/sys/sys/sysctl.h#37 (text+ko) ==== @@ -448,7 +448,7 @@ * Resolve void *arg1 in a proper virtualization container. */ #ifdef VIMAGE -#define SYSCTL_RESOLVE_V_ARG1() do { \ +#define SYSCTL_RESOLVE_V_ARG1() do { \ char *cp; \ switch (oidp->oid_v_subs) { \ case V_GLOBAL: \ ==== //depot/projects/vimage/src/sys/sys/ucred.h#11 (text+ko) ==== @@ -35,8 +35,6 @@ #include -struct vimage; - /* * Credentials. * From owner-p4-projects@FreeBSD.ORG Wed Jun 3 18:46:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B1E71065675; Wed, 3 Jun 2009 18:46: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 CD57B1065670 for ; Wed, 3 Jun 2009 18:46:19 +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 A1CE98FC1B for ; Wed, 3 Jun 2009 18:46:19 +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 n53IkJWp003745 for ; Wed, 3 Jun 2009 18:46:19 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53IkJqn003743 for perforce@freebsd.org; Wed, 3 Jun 2009 18:46:19 GMT (envelope-from truncs@FreeBSD.org) Date: Wed, 3 Jun 2009 18:46:19 GMT Message-Id: <200906031846.n53IkJqn003743@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 163433 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 18:46:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=163433 Change 163433 by truncs@aditya on 2009/06/03 18:45:20 New in-memory superblock for ext2fs. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#2 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#2 (text+ko) ==== @@ -52,6 +52,8 @@ #define umode_t mode_t #define loff_t off_t +#define MAXMNTLEN 512 +#define EXT2_MAX_GROUP_LOADED 8 /* * The second extended filesystem constants/structures */ @@ -444,6 +446,45 @@ __u32 s_reserved[204]; /* Padding to the end of the block */ }; +/* + * In-Memory Superblock + */ + +struct m_ext2fs { + struct ext2_super_block * e2fs; + struct buf * e2fs_buf; + struct buf ** e2fs_group_desc; + char e2fs_fsmnt[MAXMNTLEN];/* name mounted on */ + char e2fs_ronly; /* mounted read-only flag */ + char e2fs_fmod; /* super block modified flag */ + uint32_t e2fs_bsize; /* Block size */ + uint32_t e2fs_bshift; /* calc of logical block no */ + int32_t e2fs_bmask; /* calc of block offset */ + int64_t e2fs_qmask; /* = s_blocksize -1 */ + uint32_t e2fs_fstodb; /* Shift to get disk block */ + uint32_t e2fs_ipb; /* Number of inodes per block */ + uint32_t e2fs_itpg; /* Number of inode table per group */ + uint32_t e2fs_fsize; /* Size of fragments per block */ + uint32_t e2fs_fpb; /* Number of fragments per block */ + uint32_t e2fs_fpg; /* Number of fragments per group */ + uint32_t e2fs_dbpg; /* Number of descriptor blocks per group */ + uint32_t e2fs_descpb; /* Number of group descriptors per block */ + uint32_t e2fs_gcount; /* Number of groups */ + uint32_t e2fs_first_inode;/* First inode on fs */ + int32_t e2fs_isize; /* Size of inode */ + uint8_t e2fs_lib; /* Loaded inode bitmap */ + uint8_t e2fs_lbb; /* Loaded block bitmap */ + uint32_t e2fs_ibn[EXT2_MAX_GROUP_LOADED]; + struct buf * e2fs_ib[EXT2_MAX_GROUP_LOADED]; + uint32_t e2fs_bbn[EXT2_MAX_GROUP_LOADED]; + struct buf * e2fs_bb[EXT2_MAX_GROUP_LOADED]; + uint32_t e2fs_mount_opt; + uint32_t e2fs_blocksize_bits; + char e2fs_wasvalid; /* valid at mount time */ + off_t maxfilesize; +}; + + #ifdef __KERNEL__ #define EXT2_SB(sb) (&((sb)->u.ext2_sb)) #else From owner-p4-projects@FreeBSD.ORG Wed Jun 3 18:47:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D3ED106567D; Wed, 3 Jun 2009 18:47: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 279921065675 for ; Wed, 3 Jun 2009 18:47:20 +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 CA9408FC0A for ; Wed, 3 Jun 2009 18:47:20 +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 n53IlKWn003883 for ; Wed, 3 Jun 2009 18:47:20 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53IlK5t003881 for perforce@freebsd.org; Wed, 3 Jun 2009 18:47:20 GMT (envelope-from antab@FreeBSD.org) Date: Wed, 3 Jun 2009 18:47:20 GMT Message-Id: <200906031847.n53IlK5t003881@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 163434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 18:47:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=163434 Change 163434 by antab@antab_farm on 2009/06/03 18:46:29 Allow operand for sub instruction to be immediate value Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/atomic.h#9 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/atomic.h#9 (text+ko) ==== @@ -115,7 +115,7 @@ "stcond %1, %0\n" "brne 1b" : "=&r"(tmp), "=m"(*address) - : "m"(*address), "r"(-val) + : "m"(*address), "rKs21"(-val) : "cc", "memory"); } @@ -132,7 +132,7 @@ "stcond %1, %0\n" "brne 1b" : "=&r"(tmp), "=m"(*address) - : "m"(*address), "r"(val) + : "m"(*address), "rKs21"(val) : "cc", "memory"); } @@ -152,7 +152,7 @@ "stcond %1, %2\n" "brne 1b\n" : "=&r"(ret), "=m"(*address), "=r" (tmp) - : "m"(*address), "r"(-val) + : "m"(*address), "rKs16"(-val) : "cc", "memory"); return ret; From owner-p4-projects@FreeBSD.ORG Wed Jun 3 19:03:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C53A8106566C; Wed, 3 Jun 2009 19:03: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 855E0106564A for ; Wed, 3 Jun 2009 19:03:37 +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 741438FC17 for ; Wed, 3 Jun 2009 19:03:37 +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 n53J3bIw007747 for ; Wed, 3 Jun 2009 19:03:37 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53J3bsT007745 for perforce@freebsd.org; Wed, 3 Jun 2009 19:03:37 GMT (envelope-from antab@FreeBSD.org) Date: Wed, 3 Jun 2009 19:03:37 GMT Message-Id: <200906031903.n53J3bsT007745@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 163436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 19:03:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=163436 Change 163436 by antab@antab_farm on 2009/06/03 19:03:35 * Handle ast after long tlb miss * Implement cpu_throw() Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/exception.S#14 edit .. //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#12 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/exception.S#14 (text+ko) ==== @@ -177,6 +177,7 @@ mov r11, sp csrf AT32_SYS_SR_EM /* Enable exceptions */ rcall trap + rcall handle_ast POP_TLB_TRAPFRAME(EX) rete ==== //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#12 (text+ko) ==== @@ -220,8 +220,18 @@ void cpu_throw(struct thread *old, struct thread *new) { - avr32_impl(); - panic("cpu_throw returns"); + register_t sr; + pmap_t pmap; + + sr = intr_disable(); + + PCPU_SET(curthread, new); + PCPU_SET(curpcb, curthread->td_pcb); + pmap = vmspace_pmap(new->td_proc->p_vmspace); + pmap_activate(new); + + restorectx(new, pmap, sr); + panic("cpu_throw: restorectx() returned"); } void From owner-p4-projects@FreeBSD.ORG Wed Jun 3 19:25:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 993D41065678; Wed, 3 Jun 2009 19:24: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 5975D106564A for ; Wed, 3 Jun 2009 19:24:59 +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 2E1488FC15 for ; Wed, 3 Jun 2009 19:24:59 +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 n53JOx1S009364 for ; Wed, 3 Jun 2009 19:24:59 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53JOxCb009362 for perforce@freebsd.org; Wed, 3 Jun 2009 19:24:59 GMT (envelope-from antab@FreeBSD.org) Date: Wed, 3 Jun 2009 19:24:59 GMT Message-Id: <200906031924.n53JOxCb009362@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 163437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 19:25:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=163437 Change 163437 by antab@antab_farm on 2009/06/03 19:24:30 * Implement pmap_zero_page_area() Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#19 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#19 (text+ko) ==== @@ -430,7 +430,9 @@ void pmap_zero_page_area(vm_page_t m, int off, int size) { - avr32_impl(); + vm_offset_t phys = VM_PAGE_TO_PHYS(m); + + bzero((caddr_t)AVR32_PHYS_TO_P2(phys) + off, size); } void From owner-p4-projects@FreeBSD.ORG Wed Jun 3 20:29:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 39F561065670; Wed, 3 Jun 2009 20:29: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 EE137106564A for ; Wed, 3 Jun 2009 20:29:14 +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 DCCCC8FC08 for ; Wed, 3 Jun 2009 20:29:14 +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 n53KTE0g016898 for ; Wed, 3 Jun 2009 20:29:14 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53KTEL0016896 for perforce@freebsd.org; Wed, 3 Jun 2009 20:29:14 GMT (envelope-from rene@FreeBSD.org) Date: Wed, 3 Jun 2009 20:29:14 GMT Message-Id: <200906032029.n53KTEL0016896@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 163443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 20:29:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163443 Change 163443 by rene@rene_self on 2009/06/03 20:29:03 [website] Let releases link point to English version for now, the Dutch version does not yet exist. Affected files ... .. //depot/projects/docproj_nl/www/nl/where.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/www/nl/where.sgml#8 (text+ko) ==== @@ -13,7 +13,7 @@ -

        Uitgave-informatie

        +

        Uitgave-informatie

        Gedetailleerde beschrijvingen van uitgaven uit het verleden, heden en de toekomst. Kijk eerst hier om te bepalen wat de meest From owner-p4-projects@FreeBSD.ORG Wed Jun 3 20:47:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EB04A1065678; Wed, 3 Jun 2009 20:47:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAF771065676 for ; Wed, 3 Jun 2009 20:47:33 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 98D998FC1D for ; Wed, 3 Jun 2009 20:47:33 +0000 (UTC) (envelope-from marius@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n53KlXmF041808 for ; Wed, 3 Jun 2009 20:47:33 GMT (envelope-from marius@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n53KlXKU041806 for perforce@freebsd.org; Wed, 3 Jun 2009 20:47:33 GMT (envelope-from marius@freebsd.org) Date: Wed, 3 Jun 2009 20:47:33 GMT Message-Id: <200906032047.n53KlXKU041806@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marius@freebsd.org using -f From: Marius Strobl To: Perforce Change Reviews Cc: Subject: PERFORCE change 163445 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 03 Jun 2009 20:47:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=163445 Change 163445 by marius@flak on 2009/06/03 20:46:59 - As intended increase sc_txwin by number of TX descriptors actually used instead of just by one. - Add missing BUS_DMASYNC_PREREAD before returning RX descriptors to the hardware but don't BUS_DMASYNC_POSTREAD if we're not going to use it. - Avoid recursive locking when cas_free() is called via m_freem(9) from within this driver. - Use MEXTADD(9) with M_RDONLY in order to avoid the kernel using the mbuf for other purposes. - Fix some minor nits. Affected files ... .. //depot/projects/usiii/dev/cas/if_cas.c#4 edit .. //depot/projects/usiii/dev/cas/if_casreg.h#5 edit .. //depot/projects/usiii/dev/cas/if_casvar.h#4 edit Differences ... ==== //depot/projects/usiii/dev/cas/if_cas.c#4 (text+ko) ==== @@ -117,7 +117,7 @@ * According to documentation, the hardware has support for basic TCP * checksum offloading only, in practice this can be also used for UDP * however (i.e. the problem of previous Sun NICs that a checksum of 0x0 - * was not converted to 0xffff no longer exists). + * is not converted to 0xffff no longer exists). */ #define CAS_CSUM_FEATURES (CSUM_TCP | CSUM_UDP) @@ -1238,7 +1238,7 @@ CTR3(KTR_CAS, "%s: start of frame at segment %d, TX %d", __func__, seg, nexttx); #endif - if (++sc->sc_txwin > CAS_NTXSEGS * 2 / 3) { + if (sc->sc_txwin += nsegs > CAS_NTXSEGS * 2 / 3) { sc->sc_txwin = 0; sc->sc_txdescs[txs->txs_firstdesc].cd_flags |= htole64(cflags | CAS_TD_START_OF_FRAME | CAS_TD_INT_ME); @@ -1668,10 +1668,10 @@ #endif rxds = &sc->sc_rxdsoft[idx]; MGETHDR(m, M_DONTWAIT, MT_DATA); - bus_dmamap_sync(sc->sc_rdmatag, rxds->rxds_dmamap, - BUS_DMASYNC_POSTREAD); if (m != NULL) { refcount_acquire(&rxds->rxds_refcount); + bus_dmamap_sync(sc->sc_rdmatag, + rxds->rxds_dmamap, BUS_DMASYNC_POSTREAD); MEXTADD(m, (caddr_t)rxds->rxds_buf + off * 256 + ETHER_ALIGN, len, cas_free, #if __FreeBSD_version < 800016 @@ -1679,7 +1679,7 @@ #else sc, (void *)(uintptr_t)idx, #endif - 0, EXT_NET_DRV); + M_RDONLY, EXT_NET_DRV); if ((m->m_flags & M_EXT) == 0) { m_freem(m); m = NULL; @@ -1711,12 +1711,12 @@ #endif rxds = &sc->sc_rxdsoft[idx]; MGETHDR(m, M_DONTWAIT, MT_DATA); - bus_dmamap_sync(sc->sc_rdmatag, rxds->rxds_dmamap, - BUS_DMASYNC_POSTREAD); if (m != NULL) { refcount_acquire(&rxds->rxds_refcount); off += ETHER_ALIGN; m->m_len = min(CAS_PAGE_SIZE - off, len); + bus_dmamap_sync(sc->sc_rdmatag, + rxds->rxds_dmamap, BUS_DMASYNC_POSTREAD); MEXTADD(m, (caddr_t)rxds->rxds_buf + off, m->m_len, cas_free, #if __FreeBSD_version < 800016 @@ -1724,7 +1724,7 @@ #else sc, (void *)(uintptr_t)idx, #endif - 0, EXT_NET_DRV); + M_RDONLY, EXT_NET_DRV); if ((m->m_flags & M_EXT) == 0) { m_freem(m); m = NULL; @@ -1744,13 +1744,13 @@ #endif rxds2 = &sc->sc_rxdsoft[idx2]; MGET(m2, M_DONTWAIT, MT_DATA); - bus_dmamap_sync(sc->sc_rdmatag, - rxds2->rxds_dmamap, - BUS_DMASYNC_POSTREAD); if (m2 != NULL) { refcount_acquire( &rxds2->rxds_refcount); m2->m_len = len - m->m_len; + bus_dmamap_sync(sc->sc_rdmatag, + rxds2->rxds_dmamap, + BUS_DMASYNC_POSTREAD); MEXTADD(m2, (caddr_t)rxds2->rxds_buf, m2->m_len, cas_free, #if __FreeBSD_version < 800016 @@ -1758,7 +1758,7 @@ #else sc, (void *)(uintptr_t)idx2, #endif - 0, EXT_NET_DRV); + M_RDONLY, EXT_NET_DRV); if ((m2->m_flags & M_EXT) == 0) { m_freem(m2); m2 = NULL; @@ -1817,7 +1817,7 @@ { struct cas_rxdsoft *rxds; struct cas_softc *sc; - u_int idx; + u_int idx, locked; #if __FreeBSD_version < 800016 rxds = arg2; @@ -1831,9 +1831,15 @@ if (refcount_release(&rxds->rxds_refcount) == 0) return; - CAS_LOCK(sc); + /* + * NB: this function can be called via m_freem(9) within + * this driver! + */ + if ((locked = CAS_LOCK_OWNED(sc)) == 0) + CAS_LOCK(sc); cas_add_rxdesc(sc, idx); - CAS_UNLOCK(sc); + if (locked == 0) + CAS_UNLOCK(sc); } static inline void @@ -1842,6 +1848,8 @@ CAS_LOCK_ASSERT(sc, MA_OWNED); + bus_dmamap_sync(sc->sc_rdmatag, sc->sc_rxdsoft[idx].rxds_dmamap, + BUS_DMASYNC_PREREAD); CAS_UPDATE_RXDESC(sc, sc->sc_rxdptr, idx); sc->sc_rxdptr = CAS_NEXTRXDESC(sc->sc_rxdptr); ==== //depot/projects/usiii/dev/cas/if_casreg.h#5 (text+ko) ==== @@ -3,7 +3,6 @@ * Copyright (c) 2008 Marius Strobl * All rights reserved. * - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -26,7 +25,7 @@ * SUCH DAMAGE. * * from: NetBSD: gemreg.h,v 1.8 2005/12/11 12:21:26 christos Exp - * from: FreeBSD: if_gemvar.h 174987 2007-12-30 01:32:03Z marius + * from: FreeBSD: if_gemreg.h 174987 2007-12-30 01:32:03Z marius * * $FreeBSD$ */ @@ -39,7 +38,7 @@ * DP83065 Saturn Gigabit Ethernet controllers */ -/* glocal resources */ +/* global resources */ #define CAS_CAW 0x0004 /* core arbitration weight */ #define CAS_INF_BURST 0x0008 /* infinite burst enable */ #define CAS_STATUS 0x000c /* interrupt status */ @@ -420,7 +419,7 @@ #define CAS_RX_RED_10K_12K_MASK 0xff000000 /* 10K < FIFO threshold < 12K */ #define CAS_RX_RED_10K_12K_SHFT 24 -/* CAS_RX_FF_IPP_MASK and CAS_RX_FF_FIFO_MASK is in 8 bytes granularity. */ +/* CAS_RX_FF_IPP_MASK and CAS_RX_FF_FIFO_MASK are in 8 bytes granularity. */ #define CAS_RX_FF_PKT_MASK 0x000000ff /* # of packets in RX FIFO */ #define CAS_RX_FF_PKT_SHFT 0 #define CAS_RX_FF_IPP_MASK 0x0007ff00 /* IPP FIFO level */ @@ -828,8 +827,7 @@ #define CAS_PCS_CONF_JS_NORM 0x00000000 /* jitter study - normal op. */ #define CAS_PCS_CONF_JS_HF 0x00000008 /* jitter study - HF test */ #define CAS_PCS_CONF_JS_LF 0x00000010 /* jitter study - LF test */ -#define CAS_PCS_CONF_JS_MASK \ - (CAS_PCS_CONF_JS_HF | CAS_PCS_CONF_JS_LF) +#define CAS_PCS_CONF_JS_MASK (CAS_PCS_CONF_JS_HF | CAS_PCS_CONF_JS_LF) #define CAS_PCS_CONF_ANEG_TO 0x00000020 /* auto-neg. timer override */ #define CAS_PCS_SM_TX_CTRL_MASK 0x0000000f /* TX control state */ ==== //depot/projects/usiii/dev/cas/if_casvar.h#4 (text+ko) ==== @@ -239,9 +239,8 @@ #if __FreeBSD_version < 800016 #define CAS_INIT_RXDESC(sc, d, s) \ do { \ - struct cas_rxdsoft *__rxds; \ + struct cas_rxdsoft *__rxds = &(sc)->sc_rxdsoft[(s)]; \ \ - __rxds = &(sc)->sc_rxdsoft[(s)]; \ __rxds->rxds_sc = (sc); \ __rxds->rxds_idx = (s); \ __CAS_UPDATE_RXDESC(&(sc)->sc_rxdescs[(d)], __rxds, (s)); \ @@ -256,5 +255,6 @@ #define CAS_UNLOCK(_sc) mtx_unlock(&(_sc)->sc_mtx) #define CAS_LOCK_ASSERT(_sc, _what) mtx_assert(&(_sc)->sc_mtx, (_what)) #define CAS_LOCK_DESTROY(_sc) mtx_destroy(&(_sc)->sc_mtx) +#define CAS_LOCK_OWNED(_sc) mtx_owned(&(_sc)->sc_mtx) #endif From owner-p4-projects@FreeBSD.ORG Thu Jun 4 01:42:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 290261065672; Thu, 4 Jun 2009 01:42:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD6C6106566C for ; Thu, 4 Jun 2009 01:42:35 +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 CB1E28FC1B for ; Thu, 4 Jun 2009 01:42:35 +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 n541gZrA080471 for ; Thu, 4 Jun 2009 01:42:35 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n541gZ2b080469 for perforce@freebsd.org; Thu, 4 Jun 2009 01:42:35 GMT (envelope-from dforsyth@FreeBSD.org) Date: Thu, 4 Jun 2009 01:42:35 GMT Message-Id: <200906040142.n541gZ2b080469@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 163453 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 01:42:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=163453 Change 163453 by dforsyth@squirrel on 2009/06/04 01:42:22 Started adding a way to parse contents from text. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/Makefile#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/Makefile#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#7 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#6 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_contents.c#3 delete .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_contents.h#2 delete .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.c#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.h#1 add .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_private.h#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#8 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#5 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info/Makefile#2 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/Makefile#3 (text+ko) ==== ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ LIB= pkg INCS= pkg.h -WARNS?= 6 -SRCS= pkgdb.c pkg_contents.c pkg.c pkg_util.c +WARNS= 6 +SRCS= pkgdb.c pkg_plist.c pkg.c pkg_util.c NO_MAN= yes .include ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#7 (text+ko) ==== @@ -53,6 +53,7 @@ if (p->comment == NULL) { /* Something bad happened... I should probably let people know * about it... */ + return (p); } /* Blot out a trailing '\n'. */ @@ -66,7 +67,7 @@ #if 0 struct pkg * -pkg_set_pkg_contents(struct pkg *p, struct pkg_contents *pc) +pkg_set_pkg_plist(struct pkg *p, struct pkg_plist *pc) { return (p); } ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#6 (text+ko) ==== @@ -37,10 +37,10 @@ void pkgdb_free_hierdb(struct pkgdb *db); -/* pkg_contents */ +/* pkg_plist */ -struct pkg_contents; +struct pkg_plist; -struct pkg_contents *pkg_contents_read_info_from_text(const char *text); +struct pkg_plist *pkg_plist_parse_contents_from_text(const char *text); #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_private.h#3 (text+ko) ==== @@ -7,7 +7,7 @@ char *ident; /* User given name for this pkg. */ char *comment; /* Mmmmm, should be 70 or less, right? */ - struct pkg_contents *contents; + struct pkg_plist *contents; }; #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#8 (text+ko) ==== @@ -12,7 +12,7 @@ #include #include "pkg_util.h" -#include "pkg_contents.h" +#include "pkg_plist.h" #include "pkgdb.h" #include "pkg_private.h" #include "pkg.h" @@ -117,6 +117,7 @@ char *text; struct stat sb; struct pkg *p; + struct pkg_plist *pc; p = pkg_new(ident); path = pkgdb_pkg_path(db, p); @@ -134,6 +135,9 @@ text = pkgdb_read_file_to_text(db, p, COMMENT_FILE); pkg_set_comment(p, text); + free(text); + text = pkgdb_read_file_to_text(db, p, CONTENTS_FILE); + pc = pkg_plist_parse_contents_from_text(text); free(text); return (p); ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#5 (text+ko) ==== @@ -1,7 +1,7 @@ #ifndef __PKGDB_H__ #define __PKGDB_H__ -#include "pkg_contents.h" +#include "pkg_plist.h" #include ==== //depot/projects/soc2009/dforsyth_libpkg/pkg_info/Makefile#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 4 01:49:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3825106566C; Thu, 4 Jun 2009 01:49: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 4C495106567F for ; Thu, 4 Jun 2009 01:49:43 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED3C28FC14 for ; Thu, 4 Jun 2009 01:49:42 +0000 (UTC) (envelope-from alepulver@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n541ngEN080977 for ; Thu, 4 Jun 2009 01:49:42 GMT (envelope-from alepulver@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n541ngq6080975 for perforce@freebsd.org; Thu, 4 Jun 2009 01:49:42 GMT (envelope-from alepulver@freebsd.org) Date: Thu, 4 Jun 2009 01:49:42 GMT Message-Id: <200906040149.n541ngq6080975@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alepulver@freebsd.org using -f From: Alejandro Pulver To: Perforce Change Reviews Cc: Subject: PERFORCE change 163454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 01:49:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=163454 Change 163454 by alepulver@alepulver_deimos on 2009/06/04 01:49:08 - Update FOSSology port (not yet working, but closer) to version 1.0.0. - Remove patches integrated upstream. - Remove post installation scripts since they recently included one. - Update log.txt with current error. Affected files ... .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/Makefile#2 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/distinfo#2 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/fossology.in#2 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-agents__ununpack__checksum.c#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-agents__ununpack__departition.c#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-agents__ununpack__ununpack.h#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-cli__Makefile#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-mkinstall.sh#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__Makefile#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__spawn.c#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/patch-scheduler__spawn.h#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/pkg-install.in#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/pkg-message.in#2 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/setup-script.sh.in#2 delete .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/log.txt#2 edit .. //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/pkg-plist#2 edit Differences ... ==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/Makefile#2 (text+ko) ==== @@ -10,20 +10,22 @@ # graphics/xpdf -> graphics/poppler-utils # archivers/rpm4 -> archivers/rpm2cpio # - -# FIXME: -# - SQL errors (reported upstream) +# TODO: +# - Handle .conf files properly. (**WARNING**: now deletes .conf files) +# - Investigate scheduler problem when starting some agents. # PORTNAME= fossology -PORTVERSION= 0.9.0 +PORTVERSION= 1.0.0 CATEGORIES= devel MASTER_SITES= SF MAINTAINER= alepulver@FreeBSD.org COMMENT= License analysis tool for Open Source software -BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash +BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ + ${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \ + svn:${PORTSDIR}/devel/subversion LIB_DEPENDS= extractor.2:${PORTSDIR}/textproc/libextractor RUN_DEPENDS= cabextract:${PORTSDIR}/archivers/cabextract \ icat:${PORTSDIR}/sysutils/sleuthkit \ @@ -39,9 +41,10 @@ USE_APACHE= 2.0+ USE_GMAKE= yes USE_GNOME= libxml2 +USE_PERL5= yes USE_PGSQL= yes IGNORE_WITH_PGSQL= 73 74 80 -USE_PHP= pgsql +USE_PHP= pgsql session IGNORE_WITH_PHP=4 WANT_PHP_CLI= yes USE_RC_SUBR= fossology @@ -49,61 +52,45 @@ CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -SUB_FILES= pkg-install pkg-message setup-script.sh +SUB_FILES= pkg-message SUB_LIST= FOSS_DB="${FOSS_DB}" PLIST_SUB= FOSS_DB="${FOSS_DB:S/${PREFIX}\///}" -MAN1= cp2foss.1 +MAN1= cp2foss.1 fossjobs.1 fosslic.1 -FOSS_DB?= ${DATADIR}/db +FOSS_DB?= ${DATADIR}/repository LIBDIR= ${PREFIX}/lib # is /usr/lib by default, and affects build post-patch: # Fix paths (respect PREFIX, etc) @${GREP} -Rl /bin/bash ${WRKSRC} | ${GREP} -v UnMagic.mime | \ - ${XARGS} ${REINPLACE_CMD} -e \ - 's|/bin/bash|${LOCALBASE}/bin/bash|' - @${REINPLACE_CMD} -e 's|"/usr/local/bin/|"${PREFIX}/bin/|' \ - ${WRKSRC}/mkinstall.sh - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ - ${WRKSRC}/utils/freshmeat/wrapGFM \ - ${WRKSRC}/utils/freshmeat/mktop1k.php \ - ${WRKSRC}/utils/freshmeat/GetFM \ - ${WRKSRC}/cli/cp2foss.php \ - ${WRKSRC}/cli/libcp2foss.h.php \ - ${WRKSRC}/agents/ununpack/Makefile \ - ${WRKSRC}/agents/foss_license_agent/licinspect/licinspect.c + ${XARGS} ${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' + @${GREP} -Rl /usr/bin/php ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ + 's|/usr/bin/php|${LOCALBASE}/bin/php|' @${REINPLACE_CMD} -Ee 's|^(PREFIX=).*|\1${PREFIX}|; \ s|^(LIBDIR=).*|\1${LIBDIR}|; \ - s|^(SRVDATADIR=).*|\1${FOSS_DB}|; \ - s|^(MANDIR=).*|\1${MANPREFIX}/man|' ${WRKSRC}/Makefile.conf + s|^(REPODIR=).*|\1${FOSS_DB}|; \ + s|^(MANDIR=).*|\1${MANPREFIX}/man|; \ + s|^(CC=).*|\1${CC}|; \ + s|^(CFLAGS=)(.*)|\1${CFLAGS} \2|; \ + s|^(CFLAGS_DB=)(.*)|\1${CFLAGS} \2|; \ + s|^(CFLAGS_REPO=)(.*)|\1${CFLAGS} \2|; \ + s|^(INSTALL =).*|\1 ${INSTALL}|;' \ + ${WRKSRC}/Makefile.conf # Fix build flags and source - @${FIND} ${WRKSRC} -type f -name Makefile | \ - ${XARGS} ${REINPLACE_CMD} -Ee 's|^(CC=)[[:alnum:]]+|\1${CC}|; \ - s|^(CFLAGS=)(.*)|\1${CFLAGS} \2|' - @${GREP} -ERl '(stat|fopen|mmap)64' ${WRKSRC} | \ - ${XARGS} ${REINPLACE_CMD} -Ee 's,(stat|fopen|mmap)64,\1,' - @${REINPLACE_CMD} -Ee 's|postgresql/(libpq-fe.h)|\1|' \ - ${WRKSRC}/devel/libfossdb/libfossdb.c ${WRKSRC}/mkcheck.sh -# Install to PREFIX, not only WRKSRC/install - @${REINPLACE_CMD} -e 's|^[[:blank:]]*\./install\.sh$$|& -i|' \ - ${WRKSRC}/${MAKEFILE} -# Fix users/groups - @${REINPLACE_CMD} -e 's|postgres|pgsql|' \ - ${WRKSRC}/setup/fossologyinit.sql - @${REINPLACE_CMD} -e 's|fossology|fossy|' \ - ${WRKSRC}/scheduler/scheduler.c + @${GREP} -ERl '(stat|fopen|mmap|lseek|off)64' ${WRKSRC} | \ + ${XARGS} ${REINPLACE_CMD} -Ee 's,(stat|fopen|mmap|lseek|off)64,\1,g' +# Fix PostgreSQL user name (postgres -> pgsql) + @${REINPLACE_CMD} -e 's|su postgres|su pgsql|' \ + ${WRKSRC}/db/dbcreate.in + +pre-install: + @${MKDIR} ${PREFIX}/lib/fossology/agents ${DATADIR}/php post-install: - ${MKDIR} ${DATADIR}/setup - ${INSTALL_DATA} ${WRKSRC}/setup/* ${DATADIR}/setup - ${INSTALL_SCRIPT} ${WRKDIR}/setup-script.sh ${DATADIR}/setup .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} -.endif -.if !defined(PACKAGE_BUILDING) - @${SETENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/INSTALL* ${DOCSDIR} .endif @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} ==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/distinfo#2 (text+ko) ==== @@ -1,3 +1,3 @@ -MD5 (fossology-0.9.0.tar.gz) = 6efa150041452d0afc6556d3cea7b9b0 -SHA256 (fossology-0.9.0.tar.gz) = 8b80ac790cb5ee0c391042c62abf6e406732c28a7a080b82f44f27bda948afec -SIZE (fossology-0.9.0.tar.gz) = 1503665 +MD5 (fossology-1.0.0.tar.gz) = 7d0e26d45871fac0e33a1a83c456e234 +SHA256 (fossology-1.0.0.tar.gz) = 3582c80390aa706878b2814dfb17622287b8574574609340958ddb75e6c3594a +SIZE (fossology-1.0.0.tar.gz) = 1705341 ==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/fossology.in#2 (text+ko) ==== @@ -16,7 +16,7 @@ : ${fossology_enable="NO"} : ${fossology_flags=""} -command="%%PREFIX%%/fossology/agents/scheduler" +command="%%PREFIX%%/lib/fossology/fossology-scheduler" command_args="-d" run_rc_command "$1" ==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/files/pkg-message.in#2 (text+ko) ==== @@ -4,27 +4,14 @@ The following is a quick setup guide, for more information see the documentation available at "%%DOCSDIR%%". -1. Install PostgreSQL server, initialize database, start daemon and run the - following command to set up FOSSology's database: +1. Install PostgreSQL server: initialize database and start the daemon. - # sudo -u pgsql psql postgres -f \ - %%DATADIR%%/setup/fossologyinit.db - -2. Configure PHP, put the following in your php.ini file: +2. Configure PHP: put the following in your php.ini file: max_execution_time = 90 - memory_limit = 128M - error_reporting = E_ALL & E_STRICT - display_startup_errors = On - log_errors = On - log_errors_max_len = 0 - error_log = /var/log/php5.log - post_max_size = 700M - upload_max_filesize = 701M - include_path = ".:%%DATADIR%%/www" - - [soap] - extension=pgsql.so + memory_limit = 702M + post_max_size = 701M + upload_max_filesize = 700M 3. Configure Apache, add the following to your httpd.conf: @@ -44,15 +31,16 @@ User-agent: * Disallow: /repo -5. Run the port setup script: +5. Run the post installation setup script: - # sh %%DATADIR%%/setup/setup-script.sh + %%PREFIX%%/lib/fossology/fo-postinstall 6. Enable at startup, add the following line to /etc/rc.conf: fossology_enable="YES" - To start now use this additional command (requires previous): + To start now use this additional command (requires previous, at least + you use "forcestart" instead of "start"): %%PREFIX%%/etc/rc.d/fossology start ==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/log.txt#2 (text+ko) ==== ==== //depot/projects/soc2008/alepulver-portslicense/ports/devel/fossology/pkg-plist#2 (text+ko) ==== @@ -1,925 +1,946 @@ -bin/GetFM -bin/cp2foss.php +bin/cp2foss bin/departition -bin/diffm -bin/fossinit.php -bin/fossjobs.php -bin/get-projects -bin/mktop1k -bin/ununpack -bin/p.sh -bin/wrapGFM -fossology/agents/Filter_License -fossology/agents/bsam-engine -fossology/agents/checksum -fossology/agents/delagent -fossology/agents/departition -fossology/agents/engine-shell -fossology/agents/filter_clean -fossology/agents/fosscp_agent -fossology/agents/licinspect -fossology/agents/mimetype -fossology/agents/mkconfig -fossology/agents/pathinclude.h.php -fossology/agents/pkgmetagetta -fossology/agents/scheduler -fossology/agents/specagent -fossology/agents/sqlagent -fossology/agents/ununpack -fossology/agents/wget_agent -fossology/repcat -fossology/repcopyin -fossology/repexist -fossology/rephost -fossology/repmmapcheck -fossology/reppath -fossology/repremove -fossology/repwrite -fossology/test.d/dbcheck -fossology/test.d/dbclear.sql -fossology/test.d/dbinit -fossology/test.d/dbinit.sql -include/FMDir -include/fm-paths.php -share/fossology/agents/UnMagic.mime -share/fossology/agents/licenses/AFL/AFL/Academic Free License v1.1 -share/fossology/agents/licenses/AFL/AFL/Academic Free License v1.1.meta -share/fossology/agents/licenses/AFL/AFL/Academic Free License v1.2 -share/fossology/agents/licenses/AFL/AFL/Academic Free License v1.2.meta -share/fossology/agents/licenses/AFL/AFL/Academic Free License v2.0 -share/fossology/agents/licenses/AFL/AFL/Academic Free License v2.0.meta -share/fossology/agents/licenses/AFL/AFL/Academic Free License v2.1 -share/fossology/agents/licenses/AFL/AFL/Academic Free License v2.1.meta -share/fossology/agents/licenses/AFL/AFL/Academic Free License v3.0 -share/fossology/agents/licenses/AFL/AFL/Academic Free License v3.0.meta -share/fossology/agents/licenses/AFL/License Text Protection -share/fossology/agents/licenses/AFL/License Text Protection.meta -share/fossology/agents/licenses/AFL/OSL/Open Software License v1.0 -share/fossology/agents/licenses/AFL/OSL/Open Software License v1.0 reference -share/fossology/agents/licenses/AFL/OSL/Open Software License v1.0 reference.meta -share/fossology/agents/licenses/AFL/OSL/Open Software License v1.0.meta -share/fossology/agents/licenses/AFL/OSL/Open Software License v1.1 -share/fossology/agents/licenses/AFL/OSL/Open Software License v1.1.meta -share/fossology/agents/licenses/AFL/OSL/Open Software License v2.0 -share/fossology/agents/licenses/AFL/OSL/Open Software License v2.0.meta -share/fossology/agents/licenses/AFL/OSL/Open Software License v2.1 -share/fossology/agents/licenses/AFL/OSL/Open Software License v2.1.meta -share/fossology/agents/licenses/AFL/OSL/Open Software License v3.0 -share/fossology/agents/licenses/AFL/OSL/Open Software License v3.0.meta -share/fossology/agents/licenses/APSL/Apple Public Source License v1.0 -share/fossology/agents/licenses/APSL/Apple Public Source License v1.0.meta -share/fossology/agents/licenses/APSL/Apple Public Source License v1.1 -share/fossology/agents/licenses/APSL/Apple Public Source License v1.1.meta -share/fossology/agents/licenses/APSL/Apple Public Source License v1.2 -share/fossology/agents/licenses/APSL/Apple Public Source License v1.2.meta -share/fossology/agents/licenses/APSL/Apple Public Source License v2.0 -share/fossology/agents/licenses/APSL/Apple Public Source License v2.0.meta -share/fossology/agents/licenses/Adaptive/Adaptive v1.0 -share/fossology/agents/licenses/Adaptive/Adaptive v1.0 Appendix A -share/fossology/agents/licenses/Adaptive/Adaptive v1.0 Appendix A.meta -share/fossology/agents/licenses/Adaptive/Adaptive v1.0.meta -share/fossology/agents/licenses/Adobe/Adobe -share/fossology/agents/licenses/Adobe/Adobe AFM short -share/fossology/agents/licenses/Adobe/Adobe AFM short.meta -share/fossology/agents/licenses/Adobe/Adobe short -share/fossology/agents/licenses/Adobe/Adobe short.meta -share/fossology/agents/licenses/Adobe/Adobe.meta -share/fossology/agents/licenses/Artistic/Artistic v1.0 -share/fossology/agents/licenses/Artistic/Artistic v1.0 short -share/fossology/agents/licenses/Artistic/Artistic v1.0 short.meta -share/fossology/agents/licenses/Artistic/Artistic v1.0.meta -share/fossology/agents/licenses/Artistic/Artistic v2.0 -share/fossology/agents/licenses/Artistic/Artistic v2.0.meta -share/fossology/agents/licenses/Artistic/Artistic v2.0beta4 -share/fossology/agents/licenses/Artistic/Artistic v2.0beta4.meta -share/fossology/agents/licenses/BSD/BSD.new/Academy of Motion Picture Arts and Sciences -share/fossology/agents/licenses/BSD/BSD.new/Academy of Motion Picture Arts and Sciences.meta -share/fossology/agents/licenses/BSD/BSD.new/Apache/Apache Software License v1.0 -share/fossology/agents/licenses/BSD/BSD.new/Apache/Apache Software License v1.0.meta -share/fossology/agents/licenses/BSD/BSD.new/Apache/Apache Software License v1.1 -share/fossology/agents/licenses/BSD/BSD.new/Apache/Apache Software License v1.1.meta -share/fossology/agents/licenses/BSD/BSD.new/Apache/Apache Software License v2.0 -share/fossology/agents/licenses/BSD/BSD.new/Apache/Apache Software License v2.0 reference -share/fossology/agents/licenses/BSD/BSD.new/Apache/Apache Software License v2.0 reference.meta -share/fossology/agents/licenses/BSD/BSD.new/Apache/Apache Software License v2.0.meta -share/fossology/agents/licenses/BSD/BSD.new/BSD new -share/fossology/agents/licenses/BSD/BSD.new/BSD new short -share/fossology/agents/licenses/BSD/BSD.new/BSD new short.meta -share/fossology/agents/licenses/BSD/BSD.new/BSD new.meta -share/fossology/agents/licenses/BSD/BSD.new/CWI -share/fossology/agents/licenses/BSD/BSD.new/CWI.meta -share/fossology/agents/licenses/BSD/BSD.new/Cryptix -share/fossology/agents/licenses/BSD/BSD.new/Cryptix.meta -share/fossology/agents/licenses/BSD/BSD.new/Entessa Public License -share/fossology/agents/licenses/BSD/BSD.new/Entessa Public License.meta -share/fossology/agents/licenses/BSD/BSD.new/Maia Mailguard License -share/fossology/agents/licenses/BSD/BSD.new/Maia Mailguard License.meta -share/fossology/agents/licenses/BSD/BSD.new/Naumen Public License -share/fossology/agents/licenses/BSD/BSD.new/Naumen Public License.meta -share/fossology/agents/licenses/BSD/BSD.new/OpenPBS -share/fossology/agents/licenses/BSD/BSD.new/OpenPBS.meta -share/fossology/agents/licenses/BSD/BSD.new/PHP/PHP v3.0 -share/fossology/agents/licenses/BSD/BSD.new/PHP/PHP v3.0.meta -share/fossology/agents/licenses/BSD/BSD.new/Phorum -share/fossology/agents/licenses/BSD/BSD.new/Phorum.meta -share/fossology/agents/licenses/BSD/BSD.new/SSLeay -share/fossology/agents/licenses/BSD/BSD.new/SSLeay.meta -share/fossology/agents/licenses/BSD/BSD.new/Vovida Software License v1.0 -share/fossology/agents/licenses/BSD/BSD.new/Vovida Software License v1.0.meta -share/fossology/agents/licenses/BSD/BSD.new/Zend -share/fossology/agents/licenses/BSD/BSD.new/Zend.meta -share/fossology/agents/licenses/BSD/BSD.old/Attribution Assurance License -share/fossology/agents/licenses/BSD/BSD.old/Attribution Assurance License.meta -share/fossology/agents/licenses/BSD/BSD.old/BSD As-Is clause -share/fossology/agents/licenses/BSD/BSD.old/BSD As-Is clause.meta -share/fossology/agents/licenses/BSD/BSD.old/BSD Gov -share/fossology/agents/licenses/BSD/BSD.old/BSD Gov.meta -share/fossology/agents/licenses/BSD/BSD.old/BSD Harvard -share/fossology/agents/licenses/BSD/BSD.old/BSD Harvard.meta -share/fossology/agents/licenses/BSD/BSD.old/BSD NRL -share/fossology/agents/licenses/BSD/BSD.old/BSD NRL.meta -share/fossology/agents/licenses/BSD/BSD.old/BSD UCRegents -share/fossology/agents/licenses/BSD/BSD.old/BSD UCRegents Variant 2 -share/fossology/agents/licenses/BSD/BSD.old/BSD UCRegents Variant 2.meta -share/fossology/agents/licenses/BSD/BSD.old/BSD UCRegents.meta -share/fossology/agents/licenses/BSD/BSD.old/BSD old -share/fossology/agents/licenses/BSD/BSD.old/BSD old.meta -share/fossology/agents/licenses/BSD/BSD.old/BSD zlib -share/fossology/agents/licenses/BSD/BSD.old/BSD zlib.meta -share/fossology/agents/licenses/BSD/BSD.old/Boost Software License -share/fossology/agents/licenses/BSD/BSD.old/Boost Software License.meta -share/fossology/agents/licenses/BSD/BSD.old/FreeBSD -share/fossology/agents/licenses/BSD/BSD.old/FreeBSD.meta -share/fossology/agents/licenses/BSD/BSD.old/INRIA-OSL -share/fossology/agents/licenses/BSD/BSD.old/INRIA-OSL.meta -share/fossology/agents/licenses/BSD/BSD.old/Intel-OSL -share/fossology/agents/licenses/BSD/BSD.old/Intel-OSL.meta -share/fossology/agents/licenses/BSD/BSD.old/Jython -share/fossology/agents/licenses/BSD/BSD.old/Jython.meta -share/fossology/agents/licenses/BSD/BSD.old/OpenLDAP -share/fossology/agents/licenses/BSD/BSD.old/OpenLDAP.meta -share/fossology/agents/licenses/BSD/BSD.old/OpenSSL -share/fossology/agents/licenses/BSD/BSD.old/OpenSSL.meta -share/fossology/agents/licenses/BSD/BSD.old/Sleepycat -share/fossology/agents/licenses/BSD/BSD.old/Sleepycat short -share/fossology/agents/licenses/BSD/BSD.old/Sleepycat short.meta -share/fossology/agents/licenses/BSD/BSD.old/Sleepycat.meta -share/fossology/agents/licenses/BSD/BSD.old/Zope/Zope v1.0 -share/fossology/agents/licenses/BSD/BSD.old/Zope/Zope v1.0.meta -share/fossology/agents/licenses/BSD/BSD.old/Zope/Zope v2.0 -share/fossology/agents/licenses/BSD/BSD.old/Zope/Zope v2.0.meta -share/fossology/agents/licenses/CDDL/CDDL v1.0 -share/fossology/agents/licenses/CDDL/CDDL v1.0.meta -share/fossology/agents/licenses/CPL/Common Public License v1.0 -share/fossology/agents/licenses/CPL/Common Public License v1.0.meta -share/fossology/agents/licenses/CPL/IBM/IBM_PL/IBM Public License v1.0 -share/fossology/agents/licenses/CPL/IBM/IBM_PL/IBM Public License v1.0.meta -share/fossology/agents/licenses/Corporate/ATI/ATI Software EULA -share/fossology/agents/licenses/Corporate/ATI/ATI Software EULA.meta -share/fossology/agents/licenses/Corporate/Adobe/Adobe Flex 2.0.1 SDK EULA -share/fossology/agents/licenses/Corporate/Adobe/Adobe Flex 2.0.1 SDK EULA.meta -share/fossology/agents/licenses/Corporate/Adobe/Adobe Product License Agreement -share/fossology/agents/licenses/Corporate/Adobe/Adobe Product License Agreement.meta -share/fossology/agents/licenses/Corporate/Agere LT Modem Driver License -share/fossology/agents/licenses/Corporate/Agere LT Modem Driver License.meta -share/fossology/agents/licenses/Corporate/Apple/Apple Common Documentation License v1.0 -share/fossology/agents/licenses/Corporate/Apple/Apple Common Documentation License v1.0.meta -share/fossology/agents/licenses/Corporate/Apple/Apple Squeak -share/fossology/agents/licenses/Corporate/Apple/Apple Squeak.meta -share/fossology/agents/licenses/Corporate/CA/TOSL/Computer Associates Trusted Open Source License v1.1 -share/fossology/agents/licenses/Corporate/CA/TOSL/Computer Associates Trusted Open Source License v1.1.meta -share/fossology/agents/licenses/Corporate/HP/HP-UX JRE -share/fossology/agents/licenses/Corporate/HP/HP-UX JRE.meta -share/fossology/agents/licenses/Corporate/HP/HP-UX Java -share/fossology/agents/licenses/Corporate/HP/HP-UX Java.meta -share/fossology/agents/licenses/Corporate/HP/Hewlett-Packard -share/fossology/agents/licenses/Corporate/HP/Hewlett-Packard.meta -share/fossology/agents/licenses/Corporate/IBM/IBM JRE -share/fossology/agents/licenses/Corporate/IBM/IBM JRE.meta -share/fossology/agents/licenses/Corporate/IBM/IBM reciprocal -share/fossology/agents/licenses/Corporate/IBM/IBM reciprocal.meta -share/fossology/agents/licenses/Corporate/Intel -share/fossology/agents/licenses/Corporate/Intel reference -share/fossology/agents/licenses/Corporate/Intel reference.meta -share/fossology/agents/licenses/Corporate/Intel.meta -share/fossology/agents/licenses/Corporate/Logica/Logica Open Source License v1.0 -share/fossology/agents/licenses/Corporate/Logica/Logica Open Source License v1.0.meta -share/fossology/agents/licenses/Corporate/Lucent/Lucent Public License v1.0 -share/fossology/agents/licenses/Corporate/Lucent/Lucent Public License v1.0.meta -share/fossology/agents/licenses/Corporate/Lucent/Lucent Public License v1.02 -share/fossology/agents/licenses/Corporate/Lucent/Lucent Public License v1.02.meta -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft EULA -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft EULA 2003 -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft EULA 2003.meta -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft EULA Software -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft EULA Software.meta -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft EULA.meta -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Limited Public License -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Limited Public License.meta -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Limited Reciprocal License -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Limited Reciprocal License.meta -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Public License -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Public License.meta -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Reciprocal License -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Reciprocal License.meta -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Reference License -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Reference License.meta -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Shared Source License -share/fossology/agents/licenses/Corporate/Microsoft/Microsoft Shared Source License.meta -share/fossology/agents/licenses/Corporate/Motorola -share/fossology/agents/licenses/Corporate/Motorola.meta -share/fossology/agents/licenses/Corporate/MySQL/MySQL AB Exception -share/fossology/agents/licenses/Corporate/MySQL/MySQL AB Exception.meta -share/fossology/agents/licenses/Corporate/NCD/Network Computing Devices 1993 -share/fossology/agents/licenses/Corporate/NCD/Network Computing Devices 1993.meta -share/fossology/agents/licenses/Corporate/NetComponents/NetComponents -share/fossology/agents/licenses/Corporate/NetComponents/NetComponents.meta -share/fossology/agents/licenses/Corporate/Nokia/Nokia Open Source License v1.0a -share/fossology/agents/licenses/Corporate/Nokia/Nokia Open Source License v1.0a.meta -share/fossology/agents/licenses/Corporate/Nvidia/Nvidia Software License -share/fossology/agents/licenses/Corporate/Nvidia/Nvidia Software License variant 1 -share/fossology/agents/licenses/Corporate/Nvidia/Nvidia Software License variant 1.meta -share/fossology/agents/licenses/Corporate/Nvidia/Nvidia Software License.meta -share/fossology/agents/licenses/Corporate/Nvidia/Nvidia Source Code -share/fossology/agents/licenses/Corporate/Nvidia/Nvidia Source Code.meta -share/fossology/agents/licenses/Corporate/RSA/RSA MD5 -share/fossology/agents/licenses/Corporate/RSA/RSA MD5.meta -share/fossology/agents/licenses/Corporate/SGI/Free Software License B v1.0 -share/fossology/agents/licenses/Corporate/SGI/Free Software License B v1.0.meta -share/fossology/agents/licenses/Corporate/SGI/Free Software License B v1.1 -share/fossology/agents/licenses/Corporate/SGI/Free Software License B v1.1.meta -share/fossology/agents/licenses/Corporate/SGI/SGI CID v1.0 -share/fossology/agents/licenses/Corporate/SGI/SGI CID v1.0.meta -share/fossology/agents/licenses/Corporate/SGI/SGI GLX v1.0 -share/fossology/agents/licenses/Corporate/SGI/SGI GLX v1.0.meta -share/fossology/agents/licenses/Corporate/Skype -share/fossology/agents/licenses/Corporate/Skype.meta -share/fossology/agents/licenses/Corporate/Sun/Bigelow&Holmes -share/fossology/agents/licenses/Corporate/Sun/Bigelow&Holmes.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License TSA v1.0 -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License TSA v1.0.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License v2.3 -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License v2.3 Attachment -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License v2.3 Attachment.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License v2.3.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License v3.0 -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License v3.0 Supplement -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License v3.0 Supplement.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Community Source License v3.0.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Contributor Agreement -share/fossology/agents/licenses/Corporate/Sun/Sun Contributor Agreement reference -share/fossology/agents/licenses/Corporate/Sun/Sun Contributor Agreement reference.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Contributor Agreement.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Glassfish Software License -share/fossology/agents/licenses/Corporate/Sun/Sun Glassfish Software License.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Binary Code License -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Binary Code License J2SDK -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Binary Code License J2SDK.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Binary Code License supplement -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Binary Code License supplement.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Binary Code License.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Free with Copyright Variant 1 -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Free with Copyright Variant 1.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Free with Copyright Variant 2 -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Free with Copyright Variant 2.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Sun Public License -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems Sun Public License.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems variant 1 -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems variant 1.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems variant 2 -share/fossology/agents/licenses/Corporate/Sun/Sun Microsystems variant 2.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Solaris Source Code License Foundation Release -share/fossology/agents/licenses/Corporate/Sun/Sun Solaris Source Code License Foundation Release Attachment A-1 -share/fossology/agents/licenses/Corporate/Sun/Sun Solaris Source Code License Foundation Release Attachment A-1.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Solaris Source Code License Foundation Release Preamble -share/fossology/agents/licenses/Corporate/Sun/Sun Solaris Source Code License Foundation Release Preamble.meta -share/fossology/agents/licenses/Corporate/Sun/Sun Solaris Source Code License Foundation Release.meta -share/fossology/agents/licenses/Creative_Commons/Creative Commons GPL -share/fossology/agents/licenses/Creative_Commons/Creative Commons GPL.meta -share/fossology/agents/licenses/Creative_Commons/Creative Commons LGPL -share/fossology/agents/licenses/Creative_Commons/Creative Commons LGPL.meta -share/fossology/agents/licenses/Creative_Commons/Creative Commons Public Domain -share/fossology/agents/licenses/Creative_Commons/Creative Commons Public Domain.meta -share/fossology/agents/licenses/Creative_Commons/Creative Commons Public License -share/fossology/agents/licenses/Creative_Commons/Creative Commons Public License.meta -share/fossology/agents/licenses/EPL/Eclipse Public License v1.0 -share/fossology/agents/licenses/EPL/Eclipse Public License v1.0 reference -share/fossology/agents/licenses/EPL/Eclipse Public License v1.0 reference.meta -share/fossology/agents/licenses/EPL/Eclipse Public License v1.0.meta -share/fossology/agents/licenses/Edu/CMU/Carnegie Mellon University 1991 -share/fossology/agents/licenses/Edu/CMU/Carnegie Mellon University 1991.meta -share/fossology/agents/licenses/Edu/CMU/Carnegie Mellon University 1998 -share/fossology/agents/licenses/Edu/CMU/Carnegie Mellon University 1998.meta -share/fossology/agents/licenses/Edu/CMU/Carnegie Mellon University 2000 -share/fossology/agents/licenses/Edu/CMU/Carnegie Mellon University 2000.meta -share/fossology/agents/licenses/Edu/Educational Community License -share/fossology/agents/licenses/Edu/Educational Community License.meta -share/fossology/agents/licenses/Edu/Univ of Cambridge -share/fossology/agents/licenses/Edu/Univ of Cambridge.meta -share/fossology/agents/licenses/Edu/Univ of Edinburgh -share/fossology/agents/licenses/Edu/Univ of Edinburgh.meta -share/fossology/agents/licenses/Edu/Univ of Notre Dame -share/fossology/agents/licenses/Edu/Univ of Notre Dame.meta -share/fossology/agents/licenses/Edu/University of Utah Public License -share/fossology/agents/licenses/Edu/University of Utah Public License.meta -share/fossology/agents/licenses/Eiffel/Eiffel Forum License v1 -share/fossology/agents/licenses/Eiffel/Eiffel Forum License v1.meta -share/fossology/agents/licenses/Eiffel/Eiffel Forum License v2 -share/fossology/agents/licenses/Eiffel/Eiffel Forum License v2.meta -share/fossology/agents/licenses/FSF/FSF -share/fossology/agents/licenses/FSF/FSF variant 1 -share/fossology/agents/licenses/FSF/FSF variant 1.meta -share/fossology/agents/licenses/FSF/FSF variant 2 -share/fossology/agents/licenses/FSF/FSF variant 2.meta -share/fossology/agents/licenses/FSF/FSF variant 3 -share/fossology/agents/licenses/FSF/FSF variant 3.meta -share/fossology/agents/licenses/FSF/FSF variant 4 -share/fossology/agents/licenses/FSF/FSF variant 4.meta -share/fossology/agents/licenses/FSF/FSF.meta -share/fossology/agents/licenses/Free/Beerware -share/fossology/agents/licenses/Free/Beerware.meta -share/fossology/agents/licenses/Free/Fair License -share/fossology/agents/licenses/Free/Fair License.meta -share/fossology/agents/licenses/Free/Free clause -share/fossology/agents/licenses/Free/Free clause variant 2 -share/fossology/agents/licenses/Free/Free clause variant 2.meta -share/fossology/agents/licenses/Free/Free clause variant 3 -share/fossology/agents/licenses/Free/Free clause variant 3.meta -share/fossology/agents/licenses/Free/Free clause.meta -share/fossology/agents/licenses/Free/Free use no change clause -share/fossology/agents/licenses/Free/Free use no change clause.meta -share/fossology/agents/licenses/Free/Free with files clause -share/fossology/agents/licenses/Free/Free with files clause.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 1 -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 1.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 10 -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 10.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 11 -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 11.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 3 -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 3.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 4 -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 4.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 5 -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 5.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 8 -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 8.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 9 -share/fossology/agents/licenses/Free/FreeWithCopyright/Free with copyright clause variant 9.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/UC Regents free with copyright clause -share/fossology/agents/licenses/Free/FreeWithCopyright/UC Regents free with copyright clause.meta -share/fossology/agents/licenses/Free/FreeWithCopyright/Unidex -share/fossology/agents/licenses/Free/FreeWithCopyright/Unidex.meta -share/fossology/agents/licenses/Free/WTFPL -share/fossology/agents/licenses/Free/WTFPL.meta -share/fossology/agents/licenses/FreeArtLicense/Free Art License v1.2 -share/fossology/agents/licenses/FreeArtLicense/Free Art License v1.2.meta -share/fossology/agents/licenses/FreeType/FreeType -share/fossology/agents/licenses/FreeType/FreeType reference -share/fossology/agents/licenses/FreeType/FreeType reference.meta -share/fossology/agents/licenses/FreeType/FreeType.meta -share/fossology/agents/licenses/GPL/Affero/Affero GPL v1.0 -share/fossology/agents/licenses/GPL/Affero/Affero GPL v1.0.meta -share/fossology/agents/licenses/GPL/Affero/Affero GPL v3.0 -share/fossology/agents/licenses/GPL/Affero/Affero GPL v3.0.meta -share/fossology/agents/licenses/GPL/Affero/Affero Preamble v1.0 -share/fossology/agents/licenses/GPL/Affero/Affero Preamble v1.0.meta -share/fossology/agents/licenses/GPL/Affero/Affero Preamble v3.0 -share/fossology/agents/licenses/GPL/Affero/Affero Preamble v3.0.meta -share/fossology/agents/licenses/GPL/CopyLeft reference -share/fossology/agents/licenses/GPL/CopyLeft reference.meta -share/fossology/agents/licenses/GPL/Dual MPL GPL -share/fossology/agents/licenses/GPL/Dual MPL GPL.meta -share/fossology/agents/licenses/GPL/Exception/GPL exception clause 1 -share/fossology/agents/licenses/GPL/Exception/GPL exception clause 1.meta -share/fossology/agents/licenses/GPL/Exception/GPL exception clause 2 -share/fossology/agents/licenses/GPL/Exception/GPL exception clause 2.meta -share/fossology/agents/licenses/GPL/GFDL/GNU Free Documentation License v1.1 reference 1 -share/fossology/agents/licenses/GPL/GFDL/GNU Free Documentation License v1.1 reference 1.meta -share/fossology/agents/licenses/GPL/GFDL/GNU Free Documentation License v1.1 reference 2 -share/fossology/agents/licenses/GPL/GFDL/GNU Free Documentation License v1.1 reference 2.meta -share/fossology/agents/licenses/GPL/GFDL/GNU Free Documentation License v1.2 -share/fossology/agents/licenses/GPL/GFDL/GNU Free Documentation License v1.2 reference -share/fossology/agents/licenses/GPL/GFDL/GNU Free Documentation License v1.2 reference.meta -share/fossology/agents/licenses/GPL/GFDL/GNU Free Documentation License v1.2.meta -share/fossology/agents/licenses/GPL/GPL for Computer Programs of the Public Administration -share/fossology/agents/licenses/GPL/GPL for Computer Programs of the Public Administration.meta -share/fossology/agents/licenses/GPL/GPL from FSF reference -share/fossology/agents/licenses/GPL/GPL from FSF reference.meta -share/fossology/agents/licenses/GPL/GPL reference -share/fossology/agents/licenses/GPL/GPL reference.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL GNU C Library variant -share/fossology/agents/licenses/GPL/LGPL/LGPL GNU C Library variant.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL gettext library variant -share/fossology/agents/licenses/GPL/LGPL/LGPL gettext library variant.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.0 -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.0 reference -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.0 reference.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.0 with exceptions -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.0 with exceptions.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.0.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.1 -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.1 Preamble -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.1 Preamble.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.1 reference -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.1 reference.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL v2.1.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL v3.0 -share/fossology/agents/licenses/GPL/LGPL/LGPL v3.0.meta -share/fossology/agents/licenses/GPL/LGPL/LGPL wxWindows Library Licence v3.0 variant -share/fossology/agents/licenses/GPL/LGPL/LGPL wxWindows Library Licence v3.0 variant.meta -share/fossology/agents/licenses/GPL/W3C/World Wide Web Consortium 2001 -share/fossology/agents/licenses/GPL/W3C/World Wide Web Consortium 2001.meta -share/fossology/agents/licenses/GPL/W3C/World Wide Web Consortium Documents 2002 -share/fossology/agents/licenses/GPL/W3C/World Wide Web Consortium Documents 2002.meta -share/fossology/agents/licenses/GPL/W3C/World Wide Web Consortium Software 2002 -share/fossology/agents/licenses/GPL/W3C/World Wide Web Consortium Software 2002.meta -share/fossology/agents/licenses/GPL/v1/GPLv1 -share/fossology/agents/licenses/GPL/v1/GPLv1 Preamble -share/fossology/agents/licenses/GPL/v1/GPLv1 Preamble.meta -share/fossology/agents/licenses/GPL/v1/GPLv1 reference -share/fossology/agents/licenses/GPL/v1/GPLv1 reference.meta -share/fossology/agents/licenses/GPL/v1/GPLv1.meta -share/fossology/agents/licenses/GPL/v2/Free with copyright clause -share/fossology/agents/licenses/GPL/v2/Free with copyright clause.meta -share/fossology/agents/licenses/GPL/v2/GPL from FSF reference 1 -share/fossology/agents/licenses/GPL/v2/GPL from FSF reference 1.meta -share/fossology/agents/licenses/GPL/v2/GPL from FSF reference 2 -share/fossology/agents/licenses/GPL/v2/GPL from FSF reference 2.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 -share/fossology/agents/licenses/GPL/v2/GPLv2 Java Index Serialization Package variant -share/fossology/agents/licenses/GPL/v2/GPLv2 Java Index Serialization Package variant.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 Preamble -share/fossology/agents/licenses/GPL/v2/GPLv2 Preamble.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 reference -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 1 -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 1.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 2 -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 2.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 3 -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 3.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 4 -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 4.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 5 -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 5.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 6 -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 6.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 7 -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 7.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 8 -share/fossology/agents/licenses/GPL/v2/GPLv2 reference 8.meta -share/fossology/agents/licenses/GPL/v2/GPLv2 reference.meta -share/fossology/agents/licenses/GPL/v2/GPLv2.meta -share/fossology/agents/licenses/GPL/v2/McKornik Jr. Public License -share/fossology/agents/licenses/GPL/v2/McKornik Jr. Public License.meta -share/fossology/agents/licenses/GPL/v2/RealNetworks/RealNetworks Community Source Licensing -share/fossology/agents/licenses/GPL/v2/RealNetworks/RealNetworks Community Source Licensing.meta -share/fossology/agents/licenses/GPL/v2/RealNetworks/RealNetworks Public Source License 1.0 -share/fossology/agents/licenses/GPL/v2/RealNetworks/RealNetworks Public Source License 1.0 reference -share/fossology/agents/licenses/GPL/v2/RealNetworks/RealNetworks Public Source License 1.0 reference.meta -share/fossology/agents/licenses/GPL/v2/RealNetworks/RealNetworks Public Source License 1.0.meta -share/fossology/agents/licenses/GPL/v2/Sybase Open Watcom Public License v1.0 -share/fossology/agents/licenses/GPL/v2/Sybase Open Watcom Public License v1.0.meta -share/fossology/agents/licenses/GPL/v2/eCos -share/fossology/agents/licenses/GPL/v2/eCos.meta -share/fossology/agents/licenses/GPL/v3/GPLv3 -share/fossology/agents/licenses/GPL/v3/GPLv3 Preamble -share/fossology/agents/licenses/GPL/v3/GPLv3 Preamble.meta -share/fossology/agents/licenses/GPL/v3/GPLv3 reference 1 -share/fossology/agents/licenses/GPL/v3/GPLv3 reference 1.meta -share/fossology/agents/licenses/GPL/v3/GPLv3 reference 2 -share/fossology/agents/licenses/GPL/v3/GPLv3 reference 2.meta -share/fossology/agents/licenses/GPL/v3/GPLv3.meta -share/fossology/agents/licenses/Gov/CeCILL-B_V1-en -share/fossology/agents/licenses/Gov/CeCILL-B_V1-en.meta -share/fossology/agents/licenses/Gov/CeCILL-B_V1-fr -share/fossology/agents/licenses/Gov/CeCILL-B_V1-fr.meta -share/fossology/agents/licenses/Gov/CeCILL-C_V1-en -share/fossology/agents/licenses/Gov/CeCILL-C_V1-en.meta -share/fossology/agents/licenses/Gov/CeCILL-C_V1-fr -share/fossology/agents/licenses/Gov/CeCILL-C_V1-fr.meta -share/fossology/agents/licenses/Gov/CeCILL_V1-fr -share/fossology/agents/licenses/Gov/CeCILL_V1-fr.meta -share/fossology/agents/licenses/Gov/CeCILL_V1.1-US -share/fossology/agents/licenses/Gov/CeCILL_V1.1-US.meta -share/fossology/agents/licenses/Gov/CeCILL_V2-en -share/fossology/agents/licenses/Gov/CeCILL_V2-en.meta -share/fossology/agents/licenses/Gov/CeCILL_V2-fr -share/fossology/agents/licenses/Gov/CeCILL_V2-fr.meta -share/fossology/agents/licenses/Gov/Government clause -share/fossology/agents/licenses/Gov/Government clause.meta -share/fossology/agents/licenses/Gov/MITRE Collaborative Virtual Workspace License -share/fossology/agents/licenses/Gov/MITRE Collaborative Virtual Workspace License.meta -share/fossology/agents/licenses/Gov/NASA Open Source v1.3 -share/fossology/agents/licenses/Gov/NASA Open Source v1.3.meta -share/fossology/agents/licenses/Gov/Standard ML of New Jersey -share/fossology/agents/licenses/Gov/Standard ML of New Jersey.meta -share/fossology/agents/licenses/Historical/Historical Permission Notice and Disclaimer -share/fossology/agents/licenses/Historical/Historical Permission Notice and Disclaimer.meta -share/fossology/agents/licenses/Historical/Historical free with copyright clause -share/fossology/agents/licenses/Historical/Historical free with copyright clause.meta -share/fossology/agents/licenses/ICU/ICU v1.8.1 -share/fossology/agents/licenses/ICU/ICU v1.8.1 variant -share/fossology/agents/licenses/ICU/ICU v1.8.1 variant.meta -share/fossology/agents/licenses/ICU/ICU v1.8.1.meta -share/fossology/agents/licenses/IETF/IETF -share/fossology/agents/licenses/IETF/IETF variant -share/fossology/agents/licenses/IETF/IETF variant.meta -share/fossology/agents/licenses/IETF/IETF.meta -share/fossology/agents/licenses/MIT/Imlib2 -share/fossology/agents/licenses/MIT/Imlib2.meta -share/fossology/agents/licenses/MIT/JasPer -share/fossology/agents/licenses/MIT/JasPer.meta -share/fossology/agents/licenses/MIT/MIT (modern) -share/fossology/agents/licenses/MIT/MIT (modern) with sublicense -share/fossology/agents/licenses/MIT/MIT (modern) with sublicense.meta -share/fossology/agents/licenses/MIT/MIT (modern).meta -share/fossology/agents/licenses/MIT/MIT (oldstyle) -share/fossology/agents/licenses/MIT/MIT (oldstyle) no ads clause -share/fossology/agents/licenses/MIT/MIT (oldstyle) no ads clause.meta -share/fossology/agents/licenses/MIT/MIT (oldstyle) with disclaimer 1 -share/fossology/agents/licenses/MIT/MIT (oldstyle) with disclaimer 1.meta -share/fossology/agents/licenses/MIT/MIT (oldstyle) with disclaimer 2 -share/fossology/agents/licenses/MIT/MIT (oldstyle) with disclaimer 2.meta -share/fossology/agents/licenses/MIT/MIT (oldstyle) with disclaimer 3 -share/fossology/agents/licenses/MIT/MIT (oldstyle) with disclaimer 3.meta -share/fossology/agents/licenses/MIT/MIT (oldstyle).meta -share/fossology/agents/licenses/MIT/MIT Bigelow&Holmes Luxi font variant -share/fossology/agents/licenses/MIT/MIT Bigelow&Holmes Luxi font variant.meta -share/fossology/agents/licenses/MIT/MIT CMU style -share/fossology/agents/licenses/MIT/MIT CMU style.meta -share/fossology/agents/licenses/MIT/MIT Free with copyright clause -share/fossology/agents/licenses/MIT/MIT Free with copyright clause.meta -share/fossology/agents/licenses/MIT/MIT HP-DEC variant -share/fossology/agents/licenses/MIT/MIT HP-DEC variant.meta -share/fossology/agents/licenses/MIT/MIT MLton variant -share/fossology/agents/licenses/MIT/MIT MLton variant.meta -share/fossology/agents/licenses/MIT/MIT New Jersey variant -share/fossology/agents/licenses/MIT/MIT New Jersey variant.meta -share/fossology/agents/licenses/MIT/MIT Unicode variant -share/fossology/agents/licenses/MIT/MIT Unicode variant.meta -share/fossology/agents/licenses/MIT/NCSA -share/fossology/agents/licenses/MIT/NCSA.meta -share/fossology/agents/licenses/MIT/X.Net License -share/fossology/agents/licenses/MIT/X.Net License.meta -share/fossology/agents/licenses/MIT/X11 -share/fossology/agents/licenses/MIT/X11.meta -share/fossology/agents/licenses/MPL/CUA Office Public License v1.0 -share/fossology/agents/licenses/MPL/CUA Office Public License v1.0.meta -share/fossology/agents/licenses/MPL/Dual MPL MIT -share/fossology/agents/licenses/MPL/Dual MPL MIT.meta -share/fossology/agents/licenses/MPL/Interbase -share/fossology/agents/licenses/MPL/Interbase.meta -share/fossology/agents/licenses/MPL/MPL contributor clause with dual license -share/fossology/agents/licenses/MPL/MPL contributor clause with dual license.meta -share/fossology/agents/licenses/MPL/MPL v1.0 -share/fossology/agents/licenses/MPL/MPL v1.0.meta -share/fossology/agents/licenses/MPL/MPL v1.1 -share/fossology/agents/licenses/MPL/MPL v1.1 reference -share/fossology/agents/licenses/MPL/MPL v1.1 reference.meta -share/fossology/agents/licenses/MPL/MPL v1.1.meta -share/fossology/agents/licenses/MPL/NPL contributor clause with dual license -share/fossology/agents/licenses/MPL/NPL contributor clause with dual license.meta -share/fossology/agents/licenses/MPL/NPL v1.1 -share/fossology/agents/licenses/MPL/NPL v1.1 reference -share/fossology/agents/licenses/MPL/NPL v1.1 reference.meta -share/fossology/agents/licenses/MPL/NPL v1.1.meta -share/fossology/agents/licenses/MPL/Netizen Open Source License -share/fossology/agents/licenses/MPL/Netizen Open Source License.meta -share/fossology/agents/licenses/MPL/Open Public License v1.0 -share/fossology/agents/licenses/MPL/Open Public License v1.0.meta -share/fossology/agents/licenses/MPL/Ricoh Source Code Public License -share/fossology/agents/licenses/MPL/Ricoh Source Code Public License.meta -share/fossology/agents/licenses/MPL/SISSL/SISSL v1.1 -share/fossology/agents/licenses/MPL/SISSL/SISSL v1.1 reference 1 -share/fossology/agents/licenses/MPL/SISSL/SISSL v1.1 reference 1.meta -share/fossology/agents/licenses/MPL/SISSL/SISSL v1.1 reference 2 -share/fossology/agents/licenses/MPL/SISSL/SISSL v1.1 reference 2.meta -share/fossology/agents/licenses/MPL/SISSL/SISSL v1.1.meta -share/fossology/agents/licenses/MPL/gSOAP Public License -share/fossology/agents/licenses/MPL/gSOAP Public License.meta -share/fossology/agents/licenses/Mandriva/Mandriva -share/fossology/agents/licenses/Mandriva/Mandriva.meta -share/fossology/agents/licenses/MiscOSS/Aladdin Free Public License -share/fossology/agents/licenses/MiscOSS/Aladdin Free Public License.meta -share/fossology/agents/licenses/MiscOSS/BitTorrent -share/fossology/agents/licenses/MiscOSS/BitTorrent reference -share/fossology/agents/licenses/MiscOSS/BitTorrent reference.meta -share/fossology/agents/licenses/MiscOSS/BitTorrent.meta -share/fossology/agents/licenses/MiscOSS/Bitstream -share/fossology/agents/licenses/MiscOSS/Bitstream.meta -share/fossology/agents/licenses/MiscOSS/C_Migemo License -share/fossology/agents/licenses/MiscOSS/C_Migemo License.meta -share/fossology/agents/licenses/MiscOSS/Catharon Open Source License -share/fossology/agents/licenses/MiscOSS/Catharon Open Source License.meta -share/fossology/agents/licenses/MiscOSS/Condor -share/fossology/agents/licenses/MiscOSS/Condor.meta -share/fossology/agents/licenses/MiscOSS/Copy clause -share/fossology/agents/licenses/MiscOSS/Copy clause.meta -share/fossology/agents/licenses/MiscOSS/EU DataGrid Software License -share/fossology/agents/licenses/MiscOSS/EU DataGrid Software License.meta -share/fossology/agents/licenses/MiscOSS/Frameworx Open License v1.0 -share/fossology/agents/licenses/MiscOSS/Frameworx Open License v1.0.meta -share/fossology/agents/licenses/MiscOSS/Giftware -share/fossology/agents/licenses/MiscOSS/Giftware.meta -share/fossology/agents/licenses/MiscOSS/Glide -share/fossology/agents/licenses/MiscOSS/Glide.meta -share/fossology/agents/licenses/MiscOSS/Hacktivismo Enhanced-Source Software License Agreement -share/fossology/agents/licenses/MiscOSS/Hacktivismo Enhanced-Source Software License Agreement.meta -share/fossology/agents/licenses/MiscOSS/IJG -share/fossology/agents/licenses/MiscOSS/IJG.meta -share/fossology/agents/licenses/MiscOSS/Internet Software Consortium -share/fossology/agents/licenses/MiscOSS/Internet Software Consortium.meta -share/fossology/agents/licenses/MiscOSS/Jabber Open Source License v1.0 -share/fossology/agents/licenses/MiscOSS/Jabber Open Source License v1.0.meta -share/fossology/agents/licenses/MiscOSS/Jahia Community Source License -share/fossology/agents/licenses/MiscOSS/Jahia Community Source License.meta -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.0 -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.0.meta -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.1 -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.1.meta -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.2 -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.2.meta -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.3a -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.3a reference -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.3a reference.meta -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.3a.meta -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.3c -share/fossology/agents/licenses/MiscOSS/LaTeX Project Public License v1.3c.meta -share/fossology/agents/licenses/MiscOSS/MSNTP License -share/fossology/agents/licenses/MiscOSS/MSNTP License.meta -share/fossology/agents/licenses/MiscOSS/Motosoto Open Source License -share/fossology/agents/licenses/MiscOSS/Motosoto Open Source License.meta -share/fossology/agents/licenses/MiscOSS/Nethack General Public License -share/fossology/agents/licenses/MiscOSS/Nethack General Public License.meta -share/fossology/agents/licenses/MiscOSS/Open Directory License -share/fossology/agents/licenses/MiscOSS/Open Directory License.meta -share/fossology/agents/licenses/MiscOSS/Open Motif Public End User License -share/fossology/agents/licenses/MiscOSS/Open Motif Public End User License.meta -share/fossology/agents/licenses/MiscOSS/Open Services Gateway Initiative -share/fossology/agents/licenses/MiscOSS/Open Services Gateway Initiative.meta -share/fossology/agents/licenses/MiscOSS/OpenContent License -share/fossology/agents/licenses/MiscOSS/OpenContent License.meta -share/fossology/agents/licenses/MiscOSS/Pine License -share/fossology/agents/licenses/MiscOSS/Pine License.meta -share/fossology/agents/licenses/MiscOSS/Q Public License v1.0 -share/fossology/agents/licenses/MiscOSS/Q Public License v1.0.meta -share/fossology/agents/licenses/MiscOSS/Ruby -share/fossology/agents/licenses/MiscOSS/Ruby.meta -share/fossology/agents/licenses/MiscOSS/Scilab License -share/fossology/agents/licenses/MiscOSS/Scilab License.meta -share/fossology/agents/licenses/MiscOSS/TCL -share/fossology/agents/licenses/MiscOSS/TCL.meta -share/fossology/agents/licenses/MiscOSS/Vim -share/fossology/agents/licenses/MiscOSS/Vim.meta -share/fossology/agents/licenses/MiscOSS/gnuplot -share/fossology/agents/licenses/MiscOSS/gnuplot.meta -share/fossology/agents/licenses/MiscOSS/iMatix -share/fossology/agents/licenses/MiscOSS/iMatix.meta -share/fossology/agents/licenses/MiscOSS/mecab-ipadic -share/fossology/agents/licenses/MiscOSS/mecab-ipadic.meta -share/fossology/agents/licenses/MiscOSS/qmail License -share/fossology/agents/licenses/MiscOSS/qmail License.meta -share/fossology/agents/licenses/MiscOSS/zlib/InfoZip -share/fossology/agents/licenses/MiscOSS/zlib/InfoZip.meta -share/fossology/agents/licenses/MiscOSS/zlib/zLib -share/fossology/agents/licenses/MiscOSS/zlib/zLib.meta -share/fossology/agents/licenses/OCLC/OCLC Research Public License v2.0 -share/fossology/agents/licenses/OCLC/OCLC Research Public License v2.0.meta -share/fossology/agents/licenses/OpenGroup/Open Group -share/fossology/agents/licenses/OpenGroup/Open Group Test Suite License -share/fossology/agents/licenses/OpenGroup/Open Group Test Suite License.meta -share/fossology/agents/licenses/OpenGroup/Open Group.meta -share/fossology/agents/licenses/OpenPublicationLicense/Open Publication License reference -share/fossology/agents/licenses/OpenPublicationLicense/Open Publication License reference.meta -share/fossology/agents/licenses/OpenPublicationLicense/Open Publication License v1.0 -share/fossology/agents/licenses/OpenPublicationLicense/Open Publication License v1.0.meta -share/fossology/agents/licenses/Python/JPython -share/fossology/agents/licenses/Python/JPython.meta -share/fossology/agents/licenses/Python/PSF/Python Software Foundation v2.1.1 -share/fossology/agents/licenses/Python/PSF/Python Software Foundation v2.1.1.meta -share/fossology/agents/licenses/Python/PSF/Python Software Foundation v2.2 -share/fossology/agents/licenses/Python/PSF/Python Software Foundation v2.2.meta -share/fossology/agents/licenses/Python/Python BeOpen -share/fossology/agents/licenses/Python/Python BeOpen.meta -share/fossology/agents/licenses/Python/Python CNRI -share/fossology/agents/licenses/Python/Python CNRI.meta -share/fossology/agents/licenses/Python/Python InfoSeek variant -share/fossology/agents/licenses/Python/Python InfoSeek variant.meta -share/fossology/agents/licenses/RPL/Reciprocal Public License v1.1 -share/fossology/agents/licenses/RPL/Reciprocal Public License v1.1.meta -share/fossology/agents/licenses/RPL/Reciprocal Public License v1.5 -share/fossology/agents/licenses/RPL/Reciprocal Public License v1.5.meta -share/fossology/agents/licenses/RedHat/Red Hat EULA -share/fossology/agents/licenses/RedHat/Red Hat EULA.meta -share/fossology/agents/licenses/RedHat/Red Hat reference -share/fossology/agents/licenses/RedHat/Red Hat reference.meta -@unexec if cmp -s %D/share/fossology/agents/proxy.conf %D/share/fossology/agents/proxy.conf.sample; then rm -f %D/share/fossology/agents/proxy.conf; fi -share/fossology/agents/proxy.conf.sample -@exec [ -f %D/share/fossology/agents/proxy.conf ] || cp %D/share/fossology/agents/proxy.conf.sample %D/share/fossology/agents/proxy.conf -@unexec if cmp -s %D/share/fossology/agents/scheduler.conf %D/share/fossology/agents/scheduler.conf.sample; then rm -f %D/share/fossology/agents/scheduler.conf; fi -share/fossology/agents/scheduler.conf.sample -@exec [ -f %D/share/fossology/agents/scheduler.conf ] || cp %D/share/fossology/agents/scheduler.conf.sample %D/share/fossology/agents/scheduler.conf -@unexec if cmp -s %D/share/fossology/dbconnect/fossology %D/share/fossology/dbconnect/fossology.sample; then rm -f %D/share/fossology/dbconnect/fossology; fi -share/fossology/dbconnect/fossology.sample -@exec [ -f %D/share/fossology/dbconnect/fossology ] || cp %D/share/fossology/dbconnect/fossology.sample %D/share/fossology/dbconnect/fossology -share/fossology/php/pathinclude.h.php -@unexec if cmp -s %D/share/fossology/repository/Depth.conf %D/share/fossology/repository/Depth.conf.sample; then rm -f %D/share/fossology/repository/Depth.conf; fi -share/fossology/repository/Depth.conf.sample -@exec [ -f %D/share/fossology/repository/Depth.conf ] || cp %D/share/fossology/repository/Depth.conf.sample %D/share/fossology/repository/Depth.conf -@unexec if cmp -s %D/share/fossology/repository/Hosts.conf %D/share/fossology/repository/Hosts.conf.sample; then rm -f %D/share/fossology/repository/Hosts.conf; fi -share/fossology/repository/Hosts.conf.sample -@exec [ -f %D/share/fossology/repository/Hosts.conf ] || cp %D/share/fossology/repository/Hosts.conf.sample %D/share/fossology/repository/Hosts.conf -@unexec if cmp -s %D/share/fossology/repository/RepPath.conf %D/share/fossology/repository/RepPath.conf.sample; then rm -f %D/share/fossology/repository/RepPath.conf; fi -share/fossology/repository/RepPath.conf.sample -@exec [ -f %D/share/fossology/repository/RepPath.conf ] || cp %D/share/fossology/repository/RepPath.conf.sample %D/share/fossology/repository/RepPath.conf -share/fossology/setup/db.cron -share/fossology/setup/fossologyinit.sql -share/fossology/setup/setup-script.sh -share/fossology/www/common/common-active.php -share/fossology/www/common/common-agents.php -share/fossology/www/common/common-cli.php -share/fossology/www/common/common-dir.php -share/fossology/www/common/common-folders.php -share/fossology/www/common/common-job.php -share/fossology/www/common/common-license.php -share/fossology/www/common/common-menu.php -share/fossology/www/common/common-parm.php -share/fossology/www/common/common-plugin.php -share/fossology/www/common/common-repo.php -share/fossology/www/common/common.php -share/fossology/www/csshover.htc -share/fossology/www/fossology.css -share/fossology/www/images/fossology-logo.gif -share/fossology/www/images/pig.gif -share/fossology/www/index.php -share/fossology/www/init.ui -share/fossology/www/pathinclude.h.php -share/fossology/www/plugins/TBD.php -share/fossology/www/plugins/admin-check-template.php >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 4 02:08:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3D9C1065693; Thu, 4 Jun 2009 02:08: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 B19EA106568F for ; Thu, 4 Jun 2009 02:08:02 +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 9F4C88FC14 for ; Thu, 4 Jun 2009 02:08:02 +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 n54282OB083397 for ; Thu, 4 Jun 2009 02:08:02 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54282V4083395 for perforce@freebsd.org; Thu, 4 Jun 2009 02:08:02 GMT (envelope-from dforsyth@FreeBSD.org) Date: Thu, 4 Jun 2009 02:08:02 GMT Message-Id: <200906040208.n54282V4083395@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 163458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 02:08:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=163458 Change 163458 by dforsyth@squirrel on 2009/06/04 02:07:47 plist creation for clients. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#7 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.c#2 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.h#2 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#7 (text+ko) ==== @@ -41,6 +41,8 @@ struct pkg_plist; -struct pkg_plist *pkg_plist_parse_contents_from_text(const char *text); +struct pkg_plist *pkg_plist_new(void); + +struct pkg_plist *pkg_plist_new_from_text(const char *text); #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.c#2 (text+ko) ==== @@ -33,6 +33,24 @@ }; struct pkg_plist * +pkg_plist_new() +{ + struct pkg_plist *pl; + + pl = calloc(1, sizeof(*pl)); + return (pl); +} + +struct pkg_plist * +pkg_plist_new_from_text(const char *text) +{ + struct pkg_plist *pl; + + pl = pkg_plist_parse_contents_from_text(text); + return (pl); +} + +struct pkg_plist * pkg_plist_parse_contents_from_text(const char *text) { char *p; @@ -45,7 +63,7 @@ if (text == NULL) return (NULL); - pl = calloc(1, sizeof(*pl)); + pl = pkg_plist_new(); if (pl == NULL) return (NULL); ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.h#2 (text+ko) ==== @@ -31,8 +31,8 @@ }; struct pl_entry; -struct pkg_plist; +struct pkg_plist *pkg_plist_parse_contents_from_text(const char *text); struct pl_entry *pkg_plist_parse_line(char *line); void pkg_plist_plist_init(struct pkg_plist *pl); From owner-p4-projects@FreeBSD.ORG Thu Jun 4 02:35:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 68A951065670; Thu, 4 Jun 2009 02:35: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 28D62106564A for ; Thu, 4 Jun 2009 02:35:35 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 166308FC17 for ; Thu, 4 Jun 2009 02:35:35 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n542ZWoD085748 for ; Thu, 4 Jun 2009 02:35:32 GMT (envelope-from fangwang@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n542ZVin085745 for perforce@freebsd.org; Thu, 4 Jun 2009 02:35:31 GMT (envelope-from fangwang@FreeBSD.org) Date: Thu, 4 Jun 2009 02:35:31 GMT Message-Id: <200906040235.n542ZVin085745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fangwang@FreeBSD.org using -f From: Fang Wang To: Perforce Change Reviews Cc: Subject: PERFORCE change 163462 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 02:35:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=163462 Change 163462 by fangwang@fangwang_utobsd on 2009/06/04 02:35:18 fix wrong whitespace. Affected files ... .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp.h#3 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.h#2 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#4 edit Differences ... ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp.h#3 (text+ko) ==== @@ -96,8 +96,8 @@ #define TCPOLEN_TSTAMP_APPA (TCPOLEN_TIMESTAMP+2) /* appendix A */ #define TCPOPT_SIGNATURE 19 /* Keyed MD5: RFC 2385 */ #define TCPOLEN_SIGNATURE 18 -#define TCPOPT_UTO 28 -#define TCPOLEN_UTO 4 +#define TCPOPT_UTO 28 +#define TCPOLEN_UTO 4 /* Miscellaneous constants */ #define MAX_SACK_BLKS 6 /* Max # SACK blocks stored at receiver side */ @@ -152,7 +152,7 @@ #define TCP_MD5SIG 0x10 /* use MD5 digests (RFC2385) */ #define TCP_INFO 0x20 /* retrieve tcp_info structure */ #define TCP_CONGESTION 0x40 /* get/set congestion control algorithm */ -#define TCP_UTO 0x80 /* set tcp user timeout */ +#define TCP_UTO 0x80 /* set tcp user timeout */ #define TCP_CA_NAME_MAX 16 /* max congestion control name length */ @@ -161,7 +161,7 @@ #define TCPI_OPT_WSCALE 0x04 #define TCPI_OPT_ECN 0x08 #define TCPI_OPT_TOE 0x10 -#define TCPI_OPT_UTO 0x20 +#define TCPI_OPT_UTO 0x20 /* * The TCP_INFO socket option comes from the Linux 2.6 TCP API, and permits @@ -221,7 +221,7 @@ u_int32_t tcpi_snd_nxt; /* Next egress seqno */ u_int32_t tcpi_rcv_nxt; /* Next ingress seqno */ u_int32_t tcpi_toe_tid; /* HWTID for TOE endpoints */ - u_int32_t tcpi_uto; /* tcp user timeout value */ + u_int32_t tcpi_uto; /* tcp user timeout value */ /* Padding to grow without breaking ABI. */ u_int32_t __tcpi_pad[28]; /* Padding. */ ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.h#2 (text+ko) ==== @@ -69,6 +69,8 @@ u_int8_t sc_ip_tos; /* IPv4 TOS */ u_int8_t sc_requested_s_scale:4, sc_requested_r_scale:4; + u_int16_t sc_granularity:1, /* user timeout granularity */ + sc_uto:15; /* user timeout, UTO */ u_int16_t sc_flags; #ifndef TCP_OFFLOAD_DISABLE struct toe_usrreqs *sc_tu; /* TOE operations */ @@ -91,6 +93,7 @@ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ #define SCF_ECN 0x100 /* send ECN setup packet */ +#define SCF_UTO 0x200 /* send UTO option */ #define SYNCOOKIE_SECRET_SIZE 8 /* dwords */ #define SYNCOOKIE_LIFETIME 16 /* seconds */ ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#4 (text+ko) ==== @@ -192,13 +192,14 @@ int t_bytes_acked; /* # bytes acked during current RTT */ /* user timeout variables (RFC 5482) */ - u_int t_rcvuto; /* received user timeout value */ - u_char rcv_uto_granularity:1; /* received user timeout granularity */ - u_int t_snduto; /* send user timeout value */ - u_char snd_uto_granularity:1; /* received user timeout granularity */ - u_char uto_enable:1; /* flag controls whether the UTO option is enabled for a connection */ - u_char uto_changeable:1; /* flag that controls whether USER_TIMEOUT may be changed based on t_rcvuto */ - u_int t_uto; /* implemented user timeout value */ + u_int t_rcvuto; /* received user timeout value */ + u_int t_snduto; /* send user timeout value */ + u_char rcv_uto_granularity:1; /* received user timeout granularity */ + u_char snd_uto_granularity:1; /* received user timeout granularity */ + u_char uto_enable:1; /* flag controls whether the UTO option is enabled for a connection */ + u_char uto_changeable:1; /* flag that controls whether USER_TIMEOUT may be changed based on t_rcvuto */ + u_char uto_impl:1; /* flag that controls whelther implement user timeout */ + u_int t_uto; /* implemented user timeout value */ }; /* @@ -230,7 +231,8 @@ #define TF_ECN_PERMIT 0x4000000 /* connection ECN-ready */ #define TF_ECN_SND_CWR 0x8000000 /* ECN CWR in queue */ #define TF_ECN_SND_ECE 0x10000000 /* ECN ECE in queue */ -#define TF_RCVD_UTO 0x20000000 /* a user timeout was received in SYN */ +#define TF_RCVD_UTO 0x20000000 /* a user timeout was received in SYN */ +#define TF_NEEDUTO 0x40000000 /* send user timeout */ #define IN_FASTRECOVERY(tp) (tp->t_flags & TF_FASTRECOVERY) #define ENTER_FASTRECOVERY(tp) tp->t_flags |= TF_FASTRECOVERY @@ -274,7 +276,7 @@ #define TOF_SIGNATURE 0x0040 /* TCP-MD5 signature option (RFC2385) */ #define TOF_SACK 0x0080 /* Peer sent SACK option */ #define TOF_MAXOPT 0x0100 -#define TOF_UTO 0x0200 /* user timeout (RFC5482) */ +#define TOF_UTO 0x0200 /* user timeout (RFC5482) */ u_int32_t to_tsval; /* new timestamp */ u_int32_t to_tsecr; /* reflected timestamp */ u_int16_t to_mss; /* maximum segment size */ @@ -282,8 +284,8 @@ u_int8_t to_nsacks; /* number of SACK blocks */ u_char *to_sacks; /* pointer to the first SACK blocks */ u_char *to_signature; /* pointer to the TCP-MD5 signature */ - u_int16_t to_uto:15; /* user timeout */ - u_int16_t to_granularity:1; /* user timeout granularity */ + u_int16_t to_granularity:1,/* user timeout granularity */ + to_uto:15; /* user timeout */ }; /* From owner-p4-projects@FreeBSD.ORG Thu Jun 4 03:19:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B5AE1065673; Thu, 4 Jun 2009 03:19: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 C6A20106566B for ; Thu, 4 Jun 2009 03:19:24 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 99B098FC0C for ; Thu, 4 Jun 2009 03:19:24 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n543JO2H090066 for ; Thu, 4 Jun 2009 03:19:24 GMT (envelope-from fangwang@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n543JOII090064 for perforce@freebsd.org; Thu, 4 Jun 2009 03:19:24 GMT (envelope-from fangwang@FreeBSD.org) Date: Thu, 4 Jun 2009 03:19:24 GMT Message-Id: <200906040319.n543JOII090064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fangwang@FreeBSD.org using -f From: Fang Wang To: Perforce Change Reviews Cc: Subject: PERFORCE change 163464 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 03:19:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=163464 Change 163464 by fangwang@fangwang_utobsd on 2009/06/04 03:19:11 Initialize tcpcb uto variables in tcp_newtcpcb. Add uto up limit and low limit global variables and relative macro defines. Initialize global uto variables in tcp_init. Affected files ... .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_subr.c#2 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_timer.c#2 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_timer.h#2 edit Differences ... ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_subr.c#2 (text+ko) ==== @@ -403,6 +403,8 @@ tcp_rexmit_slop = TCPTV_CPU_VAR; tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT; tcp_tcbhashsize = hashsize; + tcp_uto_min = TCPTV_UTOMIN; + tcp_uto_max = TCPTV_UTOMAX; #ifdef INET6 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr)) @@ -739,6 +741,14 @@ tp->t_rcvtime = ticks; tp->t_bw_rtttime = ticks; /* + * Init TCP user timeout (RFC5482) variables. We don't use UTO by default, + * but we make it available if a UTO request received or set it through + * setsockopt system call. + */ + tp->uto_impl = 0; + tp->uto_changeable = 1; + tp->uto_enable = 1; + /* * IPv4 TTL initialization is necessary for an IPv6 socket as well, * because the socket may be bound to an IPv6 wildcard address, * which may match an IPv4-mapped IPv6 address. ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_timer.c#2 (text+ko) ==== @@ -111,6 +111,12 @@ SYSCTL_PROC(_net_inet_tcp, OID_AUTO, finwait2_timeout, CTLTYPE_INT|CTLFLAG_RW, &tcp_finwait2_timeout, 0, sysctl_msec_to_ticks, "I", "FIN-WAIT2 timeout"); +int tcp_uto_min; +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, uto_min, CTLTYPE_INT|CTLFLAG_RW, + &tcp_uto_min, 0, sysctl_msec_to_ticks, "I", "Minimun user timeout"); +int tcp_uto_max; +SYSCTL_PROC(_net_inet_tcp, OID_AUTO, uto_max, CTLTYPE_INT|CTLFLAG_RW, + &tcp_uto_max, 0, sysctl_msec_to_ticks, "I", "Maximum user timeout"); static int tcp_keepcnt = TCPTV_KEEPCNT; /* max idle probes */ ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_timer.h#2 (text+ko) ==== @@ -91,6 +91,9 @@ #define TCPTV_FINWAIT2_TIMEOUT (60*hz) /* FIN_WAIT_2 timeout if no receiver */ +#define TCPTV_UTOMIN (120*hz) /* min user timeout */ +#define TCPTV_UTOMAX (720*hz) /* max user timeout */ + /* * Minimum retransmit timer is 3 ticks, for algorithmic stability. * TCPT_RANGESET() will add another TCPTV_CPU_VAR to deal with From owner-p4-projects@FreeBSD.ORG Thu Jun 4 03:47:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 599B3106566C; Thu, 4 Jun 2009 03:47: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 0F1A3106564A for ; Thu, 4 Jun 2009 03:47:54 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F09818FC1B for ; Thu, 4 Jun 2009 03:47:53 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n543lrfN093851 for ; Thu, 4 Jun 2009 03:47:53 GMT (envelope-from fangwang@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n543lrtF093849 for perforce@freebsd.org; Thu, 4 Jun 2009 03:47:53 GMT (envelope-from fangwang@FreeBSD.org) Date: Thu, 4 Jun 2009 03:47:53 GMT Message-Id: <200906040347.n543lrtF093849@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fangwang@FreeBSD.org using -f From: Fang Wang To: Perforce Change Reviews Cc: Subject: PERFORCE change 163466 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 03:47:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=163466 Change 163466 by fangwang@fangwang_utobsd on 2009/06/04 03:47:21 Attach uto option to tcp header. Affected files ... .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_output.c#2 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#5 edit Differences ... ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_output.c#2 (text+ko) ==== @@ -1440,6 +1440,16 @@ TCPSTAT_INC(tcps_sack_send_blocks); break; } + case TOF_UTO: + { + unsigned short uto_load = (unsigned short)to->to_granularity; + uto_load += to->to_uto; + if (TCP_MAXOLEN - optlen < TCPOLEN_UTO) + continue; + optlen += TCPOLEN_UTO; + bcopy((u_char *)&uto_load, optp, sizeof(uto_load)); + optp += sizeof(uto_load); + } default: panic("%s: unknown TCP option type", __func__); break; ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#5 (text+ko) ==== @@ -275,8 +275,8 @@ #define TOF_TS 0x0010 /* timestamp */ #define TOF_SIGNATURE 0x0040 /* TCP-MD5 signature option (RFC2385) */ #define TOF_SACK 0x0080 /* Peer sent SACK option */ -#define TOF_MAXOPT 0x0100 -#define TOF_UTO 0x0200 /* user timeout (RFC5482) */ +#define TOF_UTO 0x0100 /* user timeout (RFC5482) */ +#define TOF_MAXOPT 0x0200 u_int32_t to_tsval; /* new timestamp */ u_int32_t to_tsecr; /* reflected timestamp */ u_int16_t to_mss; /* maximum segment size */ From owner-p4-projects@FreeBSD.ORG Thu Jun 4 04:43:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1B881065679; Thu, 4 Jun 2009 04:43: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 6E6811065676 for ; Thu, 4 Jun 2009 04:43:51 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 41B698FC13 for ; Thu, 4 Jun 2009 04:43:51 +0000 (UTC) (envelope-from dforsyth@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n544hpjM099344 for ; Thu, 4 Jun 2009 04:43:51 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n544hpoW099342 for perforce@freebsd.org; Thu, 4 Jun 2009 04:43:51 GMT (envelope-from dforsyth@FreeBSD.org) Date: Thu, 4 Jun 2009 04:43:51 GMT Message-Id: <200906040443.n544hpoW099342@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 163471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 04:43:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=163471 Change 163471 by dforsyth@squirrel on 2009/06/04 04:43:29 Added pkg_info.h. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info/pkg_info.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 4 07:09:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 522C41065673; Thu, 4 Jun 2009 07:09: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 1113F1065670 for ; Thu, 4 Jun 2009 07:09:24 +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 0137E8FC21 for ; Thu, 4 Jun 2009 07:09:24 +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 n5479NqV023848 for ; Thu, 4 Jun 2009 07:09:23 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5479NuA023846 for perforce@freebsd.org; Thu, 4 Jun 2009 07:09:23 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 07:09:23 GMT Message-Id: <200906040709.n5479NuA023846@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 163475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 07:09:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=163475 Change 163475 by zec@zec_amdx4 on 2009/06/04 07:08:24 Unbreak VLINT build. Affected files ... .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#19 edit Differences ... ==== //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#19 (text+ko) ==== @@ -390,7 +390,7 @@ void bootpboot_p_iflist(void) { - INIT_VNET_NET(basevnet); + INIT_VNET_NET(curvnet); struct ifnet *ifp; struct ifaddr *ifa; @@ -1600,7 +1600,7 @@ void bootpc_init(void) { - INIT_VNET_NET(basevnet); /* XXX only look at base vnet interfaces? */ + INIT_VNET_NET(curvnet); struct bootpc_ifcontext *ifctx, *nctx; /* Interface BOOTP contexts */ struct bootpc_globalcontext *gctx; /* Global BOOTP context */ struct ifnet *ifp; From owner-p4-projects@FreeBSD.ORG Thu Jun 4 07:12:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A16E21065673; Thu, 4 Jun 2009 07:12:27 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 61913106566B for ; Thu, 4 Jun 2009 07:12:27 +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 376CE8FC18 for ; Thu, 4 Jun 2009 07:12:27 +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 n547CRJa024116 for ; Thu, 4 Jun 2009 07:12:27 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n547CRNA024114 for perforce@freebsd.org; Thu, 4 Jun 2009 07:12:27 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 07:12:27 GMT Message-Id: <200906040712.n547CRNA024114@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 163476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 07:12:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=163476 Change 163476 by zec@zec_amdx4 on 2009/06/04 07:11:52 Nuke MAC kernel config. Affected files ... .. //depot/projects/vimage/src/sys/i386/conf/MAC#5 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Jun 4 07:32:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 928151065673; Thu, 4 Jun 2009 07:32:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 525EB106566C for ; Thu, 4 Jun 2009 07:32:48 +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 376078FC19 for ; Thu, 4 Jun 2009 07:32:48 +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 n547WmGh025624 for ; Thu, 4 Jun 2009 07:32:48 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n547Wliw025622 for perforce@freebsd.org; Thu, 4 Jun 2009 07:32:47 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 07:32:47 GMT Message-Id: <200906040732.n547Wliw025622@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 163477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 07:32:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=163477 Change 163477 by zec@zec_amdx4 on 2009/06/04 07:32:16 Reduce diff against head, mostly WS. Affected files ... .. //depot/projects/vimage/src/sys/net/if_loop.c#49 edit .. //depot/projects/vimage/src/sys/net/route.c#52 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#26 edit .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#58 edit .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#24 edit .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#25 edit .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#33 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#85 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#53 edit .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#20 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#36 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_loop.c#49 (text+ko) ==== @@ -138,7 +138,7 @@ #ifdef INVARIANTS INIT_VNET_NET(ifp->if_vnet); #endif - + /* XXX: destroying lo0 will lead to panics. */ KASSERT(V_loif != ifp, ("%s: destroying lo0", __func__)); ==== //depot/projects/vimage/src/sys/net/route.c#52 (text+ko) ==== @@ -186,7 +186,7 @@ route_init(void) { - /* whack the tunable ints into line. */ + /* whack the tunable ints into line. */ if (rt_numfibs > RT_MAXFIBS) rt_numfibs = RT_MAXFIBS; if (rt_numfibs == 0) @@ -219,7 +219,7 @@ for (table = 0; table < rt_numfibs; table++) { if ( (fam = dom->dom_family) == AF_INET || table == 0) { - /* for now only AF_INET has > 1 table */ + /* for now only AF_INET has > 1 table */ /* XXX MRT * rtattach will be also called * from vfs_export.c but the ==== //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#26 (text+ko) ==== @@ -159,7 +159,6 @@ break; } - /* XXX to lock or not to lock the vnet list - we are in DDB here? */ VNET_FOREACH(vnet_iter) { INIT_VNET_NET(vnet_iter); TAILQ_FOREACH(ifp, &V_ifnet, if_list) ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#58 (text+ko) ==== @@ -84,6 +84,11 @@ /* Mutex to protect topology events. */ static struct mtx ng_topo_mtx; +static vnet_attach_fn vnet_netgraph_iattach; +#ifdef VIMAGE +static vnet_detach_fn vnet_netgraph_idetach; +#endif + #ifdef NETGRAPH_DEBUG static struct mtx ng_nodelist_mtx; /* protects global node/hook lists */ static struct mtx ngq_mtx; /* protects the queue item list */ @@ -138,10 +143,10 @@ 1, /* refs */ NULL, /* vnet */ #ifdef NETGRAPH_DEBUG - .nd_magic = ND_MAGIC, - .lastfile = __FILE__, - .lastline = __LINE__, - .nd_all = {NULL} + ND_MAGIC, + __FILE__, + __LINE__, + {NULL} #endif /* NETGRAPH_DEBUG */ }; @@ -267,11 +272,6 @@ #define NG_WORKLIST_WAKEUP() \ wakeup_one(&ng_worklist) -static vnet_attach_fn vnet_netgraph_iattach; -#ifdef VIMAGE -static vnet_detach_fn vnet_netgraph_idetach; -#endif /* VIMAGE */ - #ifdef NETGRAPH_DEBUG /*----------------------------------------------*/ /* * In debug mode: @@ -3077,7 +3077,7 @@ } #ifndef VIMAGE_GLOBALS -static vnet_modinfo_t vnet_netgraph_modinfo = { +static const vnet_modinfo_t vnet_netgraph_modinfo = { .vmi_id = VNET_MOD_NETGRAPH, .vmi_name = "netgraph", .vmi_size = sizeof(struct vnet_netgraph), @@ -3089,6 +3089,41 @@ }; #endif +static int vnet_netgraph_iattach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + + V_nextID = 1; + + return 0; +} + +#ifdef VIMAGE +static int vnet_netgraph_idetach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + node_p node, last_killed = NULL; + + while ((node = LIST_FIRST(&V_ng_nodelist)) != NULL) { + if (node == last_killed) { + /* This should never happen */ + node->nd_flags |= NGF_REALLY_DIE; + printf("netgraph node %s needs NGF_REALLY_DIE\n", + node->nd_name); + ng_rmnode(node, NULL, NULL, 0); + /* This must never happen */ + if (node == LIST_FIRST(&V_ng_nodelist)) + panic("netgraph node %s won't die", + node->nd_name); + } + ng_rmnode(node, NULL, NULL, 0); + last_killed = node; + } + + return 0; +} +#endif /* VIMAGE */ + /* * Handle loading and unloading for this code. * The only thing we need to link into is the NETISR strucure. @@ -3153,44 +3188,6 @@ return (error); } -static int vnet_netgraph_iattach(const void *unused) -{ - INIT_VNET_NETGRAPH(curvnet); - -#ifdef VIMAGE - LIST_INIT(&V_ng_nodelist); /* XXX should go away */ -#endif - V_nextID = 1; - - return 0; -} - -#ifdef VIMAGE -static int vnet_netgraph_idetach(const void *unused) -{ - INIT_VNET_NETGRAPH(curvnet); - node_p node, last_killed = NULL; - - while ((node = LIST_FIRST(&V_ng_nodelist)) != NULL) { - if (node == last_killed) { - /* This should never happen */ - node->nd_flags |= NGF_REALLY_DIE; - printf("netgraph node %s needs NGF_REALLY_DIE\n", - node->nd_name); - ng_rmnode(node, NULL, NULL, 0); - /* This must never happen */ - if (node == LIST_FIRST(&V_ng_nodelist)) - panic("netgraph node %s won't die", - node->nd_name); - } - ng_rmnode(node, NULL, NULL, 0); - last_killed = node; - } - - return 0; -} -#endif /* VIMAGE */ - static moduledata_t netgraph_mod = { "netgraph", ngb_mod_event, ==== //depot/projects/vimage/src/sys/netgraph/ng_ether.c#24 (text+ko) ==== @@ -782,6 +782,7 @@ ng_ether_input_p = ng_ether_input; ng_ether_input_orphan_p = ng_ether_input_orphan; ng_ether_link_state_p = ng_ether_link_state; + #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_ng_ether_modinfo); #else ==== //depot/projects/vimage/src/sys/netgraph/ng_iface.c#25 (text+ko) ==== @@ -908,6 +908,6 @@ #endif delete_unrhdr(V_ng_iface_unit); - + return (0); } ==== //depot/projects/vimage/src/sys/netinet/ip_divert.c#33 (text+ko) ==== @@ -131,7 +131,6 @@ { INIT_VNET_INET(curvnet); - V_divcbinfo.ipi_vnet = curvnet; INP_INFO_LOCK_INIT(&V_divcbinfo, "div"); LIST_INIT(&V_divcb); V_divcbinfo.ipi_listhead = &V_divcb; ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#85 (text+ko) ==== @@ -346,6 +346,8 @@ V_tcp_autosndbuf_inc = 8*1024; V_tcp_autosndbuf_max = 256*1024; + V_nolocaltimewait = 0; + V_tcp_do_sack = 1; V_tcp_sack_maxholes = 128; V_tcp_sack_globalmaxholes = 65536; ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#53 (text+ko) ==== @@ -1157,6 +1157,7 @@ LLE_WUNLOCK(ln); } + int nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp) { ==== //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#20 (text+ko) ==== @@ -386,7 +386,6 @@ printf("\n"); } -/* XXX we are only going to look at interfaces in the base vimage */ void bootpboot_p_iflist(void) { ==== //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#36 (text+ko) ==== @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #include @@ -1520,7 +1520,6 @@ if (v3) { tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED); if (fmode & O_EXCL) { - CURVNET_SET(P_TO_VNET(&proc0)); /* XXX revisit! */ *tl = txdr_unsigned(NFSV3CREATE_EXCLUSIVE); tl = nfsm_build(u_int32_t *, NFSX_V3CREATEVERF); #ifdef INET From owner-p4-projects@FreeBSD.ORG Thu Jun 4 12:07:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96B2710656D6; Thu, 4 Jun 2009 12:07:28 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49DEE10656D3 for ; Thu, 4 Jun 2009 12:07:28 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1CB8A8FC18 for ; Thu, 4 Jun 2009 12:07:28 +0000 (UTC) (envelope-from syl@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54C7RPv062098 for ; Thu, 4 Jun 2009 12:07:27 GMT (envelope-from syl@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54C7Rwg062096 for perforce@freebsd.org; Thu, 4 Jun 2009 12:07:27 GMT (envelope-from syl@FreeBSD.org) Date: Thu, 4 Jun 2009 12:07:27 GMT Message-Id: <200906041207.n54C7Rwg062096@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to syl@FreeBSD.org using -f From: Sylvestre Gallon To: Perforce Change Reviews Cc: Subject: PERFORCE change 163484 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 12:07:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=163484 Change 163484 by syl@syl_rincewind on 2009/06/04 12:07:08 Fix transfer flag in interrupt transfers. Affected files ... .. //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#7 edit Differences ... ==== //depot/projects/soc2009/syl_usb/src/lib/libusb/libusb10_io.c#7 (text+ko) ==== @@ -558,12 +558,13 @@ return (ret); } -int -libusb_bulk_transfer(struct libusb_device_handle *devh, +static int +do_transfer(struct libusb_device_handle *devh, unsigned char endpoint, unsigned char *data, int length, - int *transferred, unsigned int timeout) + int *transferred, unsigned int timeout, int type) { struct libusb_transfer *xfer; + libusb_context *ctx; int complet; int ret; @@ -574,9 +575,11 @@ if (xfer == NULL) return (LIBUSB_ERROR_NO_MEM); + ctx = devh->dev->ctx; + xfer->dev_handle = devh; xfer->endpoint = endpoint; - xfer->type = LIBUSB_TRANSFER_TYPE_BULK; + xfer->type = type; xfer->timeout = timeout; xfer->buffer = data; xfer->length = length; @@ -589,16 +592,18 @@ return (ret); } - while (!complet) - if ((ret = libusb_handle_events(devh->dev->ctx)) < 0) { + while (complet == 0) { + if ((ret = libusb_handle_events(ctx)) < 0) { libusb_cancel_transfer(xfer); libusb_free_transfer(xfer); - while (!complet) - if (libusb_handle_events(devh->dev->ctx)) - break; + while (complet == 0) { + if (libusb_handle_events(ctx)) + break ; + } return (ret); } - + } + *transferred = xfer->actual_length; switch (xfer->status) { case LIBUSB_TRANSFER_COMPLETED: @@ -618,14 +623,23 @@ return (0); } +int +libusb_bulk_transfer(struct libusb_device_handle *devh, + unsigned char endpoint, unsigned char *data, int length, + int *transferred, unsigned int timeout) +{ + return (do_transfer(devh, endpoint, data, length, transferred, + timeout, LIBUSB_TRANSFER_TYPE_BULK)); +} + /* * Need to fix xfer->type */ int libusb_interrupt_transfer(struct libusb_device_handle *devh, - unsigned char endpoint, unsigned char *data, int length, int *transferred, - unsigned int timeout) + unsigned char endpoint, unsigned char *data, int length, + int *transferred, unsigned int timeout) { - return (libusb_bulk_transfer(devh, endpoint, data, length, - transferred, timeout)); + return (do_transfer(devh, endpoint, data, length, transferred, + timeout, LIBUSB_TRANSFER_TYPE_INTERRUPT)); } From owner-p4-projects@FreeBSD.ORG Thu Jun 4 14:01:25 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1523010656A7; Thu, 4 Jun 2009 14:01: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 C641A1065686 for ; Thu, 4 Jun 2009 14:01:24 +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 B447F8FC25 for ; Thu, 4 Jun 2009 14:01:24 +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 n54E1OWu084842 for ; Thu, 4 Jun 2009 14:01:24 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54E1OBv084840 for perforce@freebsd.org; Thu, 4 Jun 2009 14:01:24 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 14:01:24 GMT Message-Id: <200906041401.n54E1OBv084840@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 163486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 14:01:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=163486 Change 163486 by zec@zec_amdx4 on 2009/06/04 14:01:22 Trim unnecessary #ifdef sections. Affected files ... .. //depot/projects/vimage/src/sys/netinet6/mld6.c#28 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet6/mld6.c#28 (text+ko) ==== @@ -149,13 +149,8 @@ static int sysctl_mld_gsr(SYSCTL_HANDLER_ARGS); static int sysctl_mld_ifinfo(SYSCTL_HANDLER_ARGS); -#ifdef VIMAGE static vnet_attach_fn vnet_mld_iattach; static vnet_detach_fn vnet_mld_idetach; -#else -static int vnet_mld_iattach(const void *); -static int vnet_mld_idetach(const void *); -#endif /* VIMAGE */ /* * Normative references: RFC 2710, RFC 3590, RFC 3810. @@ -3296,9 +3291,7 @@ break; case MOD_UNLOAD: #ifndef VIMAGE_GLOBALS -#ifdef NOTYET vnet_mod_deregister(&vnet_mld_modinfo); -#endif #else vnet_mld_idetach(NULL); #endif From owner-p4-projects@FreeBSD.ORG Thu Jun 4 14:04:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49C831065673; Thu, 4 Jun 2009 14:04:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 081B7106564A for ; Thu, 4 Jun 2009 14:04:28 +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 EA28D8FC13 for ; Thu, 4 Jun 2009 14:04:27 +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 n54E4RcN086005 for ; Thu, 4 Jun 2009 14:04:27 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54E4RQT086003 for perforce@freebsd.org; Thu, 4 Jun 2009 14:04:27 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 14:04:27 GMT Message-Id: <200906041404.n54E4RQT086003@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 163487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 14:04:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=163487 Change 163487 by zec@zec_amdx4 on 2009/06/04 14:03:58 Allow for lo0 to be automatically destroyed via the vnet destructor framework. ifconfig lo0 destroy still works with unchanged semantics, i.e. returns an error and can never succeed. Affected files ... .. //depot/projects/vimage/src/sys/net/if_loop.c#50 edit Differences ... ==== //depot/projects/vimage/src/sys/net/if_loop.c#50 (text+ko) ==== @@ -135,12 +135,11 @@ static void lo_clone_destroy(struct ifnet *ifp) { -#ifdef INVARIANTS - INIT_VNET_NET(ifp->if_vnet); -#endif +#ifndef VIMAGE /* XXX: destroying lo0 will lead to panics. */ KASSERT(V_loif != ifp, ("%s: destroying lo0", __func__)); +#endif bpfdetach(ifp); if_detach(ifp); @@ -194,8 +193,10 @@ static int vnet_loif_idetach(unused) const void *unused; { + INIT_VNET_NET(curvnet); - /* XXX nothing done here - revisit! */ + if_clone_detach(V_lo_cloner); + V_loif = NULL; return (0); } From owner-p4-projects@FreeBSD.ORG Thu Jun 4 14:31:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86A6F1065674; Thu, 4 Jun 2009 14:31:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B40C106566B for ; Thu, 4 Jun 2009 14:31:56 +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 291878FC16 for ; Thu, 4 Jun 2009 14:31:56 +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 n54EVuj7088162 for ; Thu, 4 Jun 2009 14:31:56 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54EVuoZ088160 for perforce@freebsd.org; Thu, 4 Jun 2009 14:31:56 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 14:31:56 GMT Message-Id: <200906041431.n54EVuoZ088160@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 163490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 14:31:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=163490 Change 163490 by zec@zec_amdx4 on 2009/06/04 14:31:28 Don't free vnet and per-vnet-module memory on vimage -d just yet, while tracking down uncancelled callout events. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#95 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#95 (text+ko) ==== @@ -563,8 +563,10 @@ if (vmi->vmi_size) { if (curvnet->mod_data[vmi->vmi_id] == NULL) panic("vi_destroy: %s\n", vmi->vmi_name); +#ifdef NOTYET free(curvnet->mod_data[vmi->vmi_id], M_VNET); curvnet->mod_data[vmi->vmi_id] = NULL; +#endif } #endif @@ -723,7 +725,9 @@ /* hopefully, we are finally OK to free the vnet container itself! */ vnet->vnet_magic_n = 0xdeadbeef; +#ifdef NOTYET free(vnet, M_VNET); +#endif free(vprocg, M_VPROCG); free(vip, M_VIMAGE); From owner-p4-projects@FreeBSD.ORG Thu Jun 4 14:48:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4A031065769; Thu, 4 Jun 2009 14:48: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 584AA1065735 for ; Thu, 4 Jun 2009 14:48:13 +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 2BCE58FC21 for ; Thu, 4 Jun 2009 14:48:13 +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 n54EmCqj089425 for ; Thu, 4 Jun 2009 14:48:12 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54EmChP089423 for perforce@freebsd.org; Thu, 4 Jun 2009 14:48:12 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 14:48:12 GMT Message-Id: <200906041448.n54EmChP089423@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 163492 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 14:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=163492 Change 163492 by zec@zec_amdx4 on 2009/06/04 14:48:06 Register in6_detachhead() via protosw. Affected files ... .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#42 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#42 (text+ko) ==== @@ -367,6 +367,9 @@ #else .dom_rtattach = in6_inithead, #endif +#ifdef VIMAGE + .dom_rtdetach = in6_detachhead, +#endif .dom_rtoffset = offsetof(struct sockaddr_in6, sin6_addr) << 3, .dom_maxrtkey = sizeof(struct sockaddr_in6), .dom_ifattach = in6_domifattach, From owner-p4-projects@FreeBSD.ORG Thu Jun 4 15:27:54 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E06221065674; Thu, 4 Jun 2009 15:27:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A05D11065672 for ; Thu, 4 Jun 2009 15:27:53 +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 8DF638FC0C for ; Thu, 4 Jun 2009 15:27:53 +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 n54FRr49093505 for ; Thu, 4 Jun 2009 15:27:53 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54FRrps093503 for perforce@freebsd.org; Thu, 4 Jun 2009 15:27:53 GMT (envelope-from gabor@freebsd.org) Date: Thu, 4 Jun 2009 15:27:53 GMT Message-Id: <200906041527.n54FRrps093503@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 163495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 15:27:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=163495 Change 163495 by gabor@gabor_server on 2009/06/04 15:27:26 - C99-ify bool variable - style Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#45 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#51 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#45 (text+ko) ==== @@ -131,7 +131,7 @@ /* Only pre-read to the buffer if we need the binary check. */ if (binbehave != BINFILE_TEXT) { - if (f->stdin == 1) + if (f->stdin) st.st_size = MAXBUFSIZ; else if (stat(fname, &st) != 0) err(2, NULL); @@ -147,7 +147,7 @@ binbuf[i++] = ch; } - f->binary = memchr(binbuf, (filebehave != FILE_GZIP) ? '\0' : '\200', i - 1) != 0; + f->binary = memchr(binbuf, (filebehave != FILE_GZIP) ? '\0' : '\200', i - 1) != NULL; } binbufsiz = i; binbufptr = binbuf; @@ -190,7 +190,7 @@ f = grep_malloc(sizeof *f); if ((f->f = fdopen(STDIN_FILENO, "r")) != NULL) { - f->stdin = 1; + f->stdin = true; return (f); } @@ -210,7 +210,7 @@ f = grep_malloc(sizeof *f); - f->stdin = 0; + f->stdin = false; switch (filebehave) { case FILE_STDIO: if ((f->f = fopen(path, "r")) != NULL) ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#51 (text+ko) ==== @@ -78,8 +78,8 @@ #define MAX_LINE_MATCHES 32 struct file { - int binary; - int stdin; + bool binary; + bool stdin; FILE *f; struct mmfile *mmf; gzFile *gzf; From owner-p4-projects@FreeBSD.ORG Thu Jun 4 15:55:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E048010656A5; Thu, 4 Jun 2009 15:55: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 81E1510656A4 for ; Thu, 4 Jun 2009 15:55:21 +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 6EFAC8FC29 for ; Thu, 4 Jun 2009 15:55:21 +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 n54FtL6B095674 for ; Thu, 4 Jun 2009 15:55:21 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54FtLJJ095672 for perforce@freebsd.org; Thu, 4 Jun 2009 15:55:21 GMT (envelope-from gabor@freebsd.org) Date: Thu, 4 Jun 2009 15:55:21 GMT Message-Id: <200906041555.n54FtLJJ095672@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 163496 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 15:55:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=163496 Change 163496 by gabor@gabor_server on 2009/06/04 15:54:54 - More C99 bool values Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#15 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#89 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#52 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#84 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/fastgrep.c#15 (text+ko) ==== @@ -59,9 +59,9 @@ /* Initialize. */ fg->len = strlen(pat); - fg->bol = 0; - fg->eol = 0; - fg->reversed = 0; + fg->bol = false; + fg->eol = false; + fg->reversed = false; fg->pattern = grep_malloc(strlen(pat) + 1); strcpy(fg->pattern, pat); @@ -80,8 +80,8 @@ fastcomp(fastgrep_t *fg, const char *pat) { unsigned int i; - int bol = 0; - int eol = 0; + bool bol = false; + bool eol = false; int shiftPatternLen; int hasDot = 0; int firstHalfDot = -1; @@ -90,27 +90,27 @@ /* Initialize. */ fg->len = strlen(pat); - fg->bol = 0; - fg->eol = 0; - fg->reversed = 0; + fg->bol = false; + fg->eol = false; + fg->reversed = false; /* Remove end-of-line character ('$'). */ if (pat[fg->len - 1] == '$') { - eol++; - fg->eol = 1; + eol = true; + fg->eol = true; fg->len--; } /* Remove beginning-of-line character ('^'). */ if (pat[0] == '^') { - bol++; - fg->bol = 1; + bol = true; + fg->bol = true; fg->len--; } if (fg->len >= 14 && - strncmp(pat + fg->bol, "[[:<:]]", 7) == 0 && - strncmp(pat + fg->bol + fg->len - 7, "[[:>:]]", 7) == 0) { + strncmp(pat + (fg->bol ? 1 : 0), "[[:<:]]", 7) == 0 && + strncmp(pat + (fg->bol ? 1 : 0) + fg->len - 7, "[[:>:]]", 7) == 0) { fg->len -= 14; /* Word boundary is handled separately in util.c */ wflag = true; @@ -122,7 +122,7 @@ * string respectively. */ fg->pattern = grep_malloc(fg->len + 1); - memcpy(fg->pattern, pat + bol + wflag, fg->len); + memcpy(fg->pattern, pat + (bol ? 1 : 0) + wflag, fg->len); fg->pattern[fg->len] = '\0'; /* Look for ways to cheat...er...avoid the full regex engine. */ @@ -156,7 +156,7 @@ if ((!(lflag || cflag)) && ((!(bol || eol)) && ((lastHalfDot) && ((firstHalfDot < 0) || ((fg->len - (lastHalfDot + 1)) < (size_t)firstHalfDot)))) && !oflag && !color) { - fg->reversed = 1; + fg->reversed = true; hasDot = fg->len - (firstHalfDot < 0 ? firstLastHalfDot : firstHalfDot) - 1; grep_revstr(fg->pattern, fg->len); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#89 (text+ko) ==== @@ -81,7 +81,7 @@ int eflags = REG_STARTEND; /* Shortcut for matching all cases like empty regex */ -int matchall; +bool matchall; /* Searching patterns */ unsigned int patterns, pattern_sz; @@ -142,10 +142,10 @@ }; /* Housekeeping */ -int first = 1; /* flag whether we are processing the first match */ -int prev; /* flag whether or not the previous line matched */ +bool first = true; /* flag whether we are processing the first match */ +bool prev; /* flag whether or not the previous line matched */ int tail; /* lines left to print */ -int notfound; /* file not found */ +bool notfound; /* file not found */ extern char *__progname; @@ -224,7 +224,7 @@ /* Check if we can do a shortcut */ if (len == 0 || matchall) { - matchall = 1; + matchall = true; return; } /* Increase size if necessary */ ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#52 (text+ko) ==== @@ -105,9 +105,9 @@ size_t len; int qsBc[UCHAR_MAX + 1]; /* flags */ - int bol; - int eol; - int reversed; + bool bol; + bool eol; + bool reversed; } fastgrep_t; /* Flags passed to regcomp() and regexec() */ @@ -122,7 +122,8 @@ extern char *color, *label; extern int grepbehave, binbehave, filebehave, devbehave, dirbehave, linkbehave; -extern int first, prev, matchall, tail, notfound; +extern bool matchall, first, prev, notfound; +extern int tail; extern unsigned int patterns, epatterns; extern char **pattern; extern struct epat *epattern; ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#84 (text+ko) ==== @@ -176,7 +176,7 @@ if (!sflag) warn("%s", fn); if (errno == ENOENT) - notfound++; + notfound = true; return (0); } @@ -348,10 +348,10 @@ } if (c) { - prev++; - first = 0; + prev = true; + first = false; } else - prev = 0; + prev = false; return (c); } From owner-p4-projects@FreeBSD.ORG Thu Jun 4 16:54:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4E4210656A9; Thu, 4 Jun 2009 16:54:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F4DC10656A7 for ; Thu, 4 Jun 2009 16:54:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6B4158FC35 for ; Thu, 4 Jun 2009 16:54:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54GsMqQ011282 for ; Thu, 4 Jun 2009 16:54:22 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54GsLwJ011280 for perforce@freebsd.org; Thu, 4 Jun 2009 16:54:21 GMT (envelope-from trasz@freebsd.org) Date: Thu, 4 Jun 2009 16:54:21 GMT Message-Id: <200906041654.n54GsLwJ011280@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163501 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 16:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=163501 Change 163501 by trasz@trasz_victim on 2009/06/04 16:53:54 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#5 integrate .. //depot/projects/soc2009/trasz_limits/UPDATING#5 integrate .. //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/periodic/daily/100.clean-disks#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/mountd#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/nfscbd#1 branch .. //depot/projects/soc2009/trasz_limits/etc/rc.d/nfsd#2 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/nfsuserd#1 branch .. //depot/projects/soc2009/trasz_limits/lib/bind/config.mk#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb.3#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20.h#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/src/e_rem_pio2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/src/e_rem_pio2f.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/src/k_cosf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/src/k_sinf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/src/k_tanf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/msun/src/math_private.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/fsck.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/gjournal.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mksnap_ffs/mksnap_ffs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/kld/dyn_sysctl/dyn_sysctl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/kld/syscall/module/syscall.c#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/msk.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/pcm.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/src.conf.5#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/sglist.9#1 branch .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.own.mk#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/MAC#2 delete .. //depot/projects/soc2009/trasz_limits/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_socket.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/options#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/mwl/LICENSE#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/mwl/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/mwl/mw88W8363.fw.uu#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/dev/mwl/mwlboot.fw.uu#1 branch .. //depot/projects/soc2009/trasz_limits/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bwi/if_bwi.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iir/iir.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ksyms/ksyms.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/e1000phyreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/if_mwl.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/if_mwl_pci.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/if_mwlioctl.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/if_mwlvar.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/mwldiag.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/mwlhal.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/mwlhal.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/mwlreg.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_zydreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/gnu/fs/ext2fs/ext2_fs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/gnu/fs/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/gnu/fs/ext2fs/sparc64-bitops.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/MAC#2 delete .. //depot/projects/soc2009/trasz_limits/sys/i386/linux/linux.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/conf/MAC#2 delete .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_conf.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_lock.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_proc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_prot.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sx.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_sglist.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/kern/sys_socket.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/mwl/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/mwlfw/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/modules/usb/zyd/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/netisr.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_freebsd.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_hostap.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_input.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_monitor.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_radiotap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_scan.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_scan.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_sta.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ksocket.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/accf_data.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/accf_dns.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/accf_http.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_divert.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/nd6.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_socket.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs_srvsock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsserver/nfs_syscalls.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/nlm/nlm_advlock.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/conf/MAC#2 delete .. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/MAC#2 delete .. //depot/projects/soc2009/trasz_limits/sys/rpc/clnt_dg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/rpc/clnt_vc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/rpc/svc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/rpc/svc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/rpc/svc_dg.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/rpc/svc_vc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_framework.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_inet.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_inet6.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_internal.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_net.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac/mac_socket.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac_biba/mac_biba.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac_mls/mac_mls.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/conf/GENERIC#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/conf/MAC#2 delete .. //depot/projects/soc2009/trasz_limits/sys/sun4v/conf/GENERIC#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/conf/MAC#2 delete .. //depot/projects/soc2009/trasz_limits/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/conf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/mount.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/pmc.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sglist.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/sys/sockbuf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/socketvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/ucred.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/user.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/vnode.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/dirhash.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_contig.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vnode_pager.c#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/build/options/WITH_BIND_IDN#1 branch .. //depot/projects/soc2009/trasz_limits/tools/build/options/WITH_BIND_LARGE_FILE#1 branch .. //depot/projects/soc2009/trasz_limits/tools/build/options/WITH_BIND_LIBS#2 delete .. //depot/projects/soc2009/trasz_limits/tools/build/options/WITH_BIND_SIGCHASE#1 branch .. //depot/projects/soc2009/trasz_limits/tools/build/options/WITH_BIND_XML#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/fstest/fstest.c#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/README#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwldebug/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwldebug/mwldebug.c#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwlstats/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwlstats/main.c#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwlstats/mwlstats.c#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwlstats/mwlstats.h#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwlstats/statfoo.c#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/mwl/mwlstats/statfoo.h#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/dig/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/nfsstat/nfsstat.1#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/nfsstat/nfsstat.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/window/Makefile#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/README#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/alias.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/char.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/char.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/cmd.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/cmd1.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/cmd2.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/cmd3.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/cmd4.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/cmd5.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/cmd6.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/cmd7.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/compress.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/context.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/context.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/defs.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/error.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/lcmd.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/lcmd.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/lcmd1.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/lcmd2.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/local.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/main.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/mloop.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/mystring.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/parser.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/parser1.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/parser2.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/parser3.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/parser4.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/parser5.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/scanner.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/startup.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/string.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/token.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/tt.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/ttf100.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/ttgeneric.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/tth19.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/tth29.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/ttinit.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/ttoutput.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/tttermcap.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/tttvi925.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/ttwyse60.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/ttwyse75.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/ttzapple.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/ttzentec.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/value.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/var.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/var.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/win.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/window.1#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/windowrc#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/ww.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwadd.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwalloc.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwbox.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwchild.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwclose.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwclreol.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwclreos.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwcursor.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwdata.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwdelchar.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwdelete.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwdelline.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwdump.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwend.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwenviron.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwerror.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwflush.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwframe.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwgets.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwinit.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwinschar.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwinsline.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwiomux.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwlabel.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwmisc.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwmove.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwopen.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwprintf.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwpty.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwputc.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwputs.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwredraw.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwredrawwin.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwrint.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwscroll.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwsize.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwspawn.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwsuspend.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwterminfo.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwtty.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwunframe.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwupdate.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/wwwrite.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/xx.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/xx.h#2 delete .. //depot/projects/soc2009/trasz_limits/usr.bin/window/xxflush.c#2 delete .. //depot/projects/soc2009/trasz_limits/usr.sbin/named/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/nfsd/nfsv4.4#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pkg_install/info/main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pmcstat/pmcstat.8#2 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.194 2009/05/30 19:39:57 dougb Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.195 2009/06/02 13:44:36 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090602: removal of window(1) +OLD_FILES+=usr/bin/window +OLD_FILES+=usr/share/man/man1/window.1.gz # 20090530: removal of early.sh OLD_FILES+=etc/rc.d/early.sh # 20090527: renaming of S{LIST,TAILQ}_REMOVE_NEXT() to _REMOVE_AFTER() ==== //depot/projects/soc2009/trasz_limits/UPDATING#5 (text+ko) ==== @@ -22,11 +22,14 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090602: + window(1) has been removed from the base system. It can now be + installed from ports. The port is called misc/window. + 20090601: The way we are storing and accessing `routing table' entries has changed. Programs reading the FIB, like netstat, need to be re-compiled. - Bump __FreeBSD_version to 800097. 20090601: A new netisr implementation has been added for FreeBSD 8. Network @@ -34,6 +37,12 @@ rebuilt. Bump __FreeBSD_version to 800096. +20090531: + For those who use ipfw and especially pf, those two firewalls + are now started BEFORE the network is initialized (i.e., before + rc.d/netif). Please review your rules to make sure that your + interfaces will be properly described. + 20090530: Remove the tunable/sysctl debug.mpsafevfs as its initial purpose is no more valid. @@ -1572,4 +1581,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.612 2009/06/01 16:00:36 rwatson Exp $ +$FreeBSD: src/UPDATING,v 1.615 2009/06/02 13:44:36 ed Exp $ ==== //depot/projects/soc2009/trasz_limits/etc/defaults/rc.conf#4 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.356 2009/05/22 13:56:16 rwatson Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.357 2009/06/02 22:15:47 rmacklem Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -315,6 +315,11 @@ rpc_ypupdated_enable="NO" # Run if NIS master and SecureRPC (or NO). keyserv_enable="NO" # Run the SecureRPC keyserver (or NO). keyserv_flags="" # Flags to keyserv (if enabled). +nfsv4_server_enable="NO" # Enable support for NFSv4 +nfscbd_enable="NO" # NFSv4 client side callback daemon +nfscbd_flags="" # Flags for nfscbd +nfsuserd_enable="NO" # NFSv4 user/group name mapping daemon +nfsuserd_flags="" # Flags for nfsuserd ### Network Time Services options: ### timed_enable="NO" # Run the time daemon (or NO). ==== //depot/projects/soc2009/trasz_limits/etc/periodic/daily/100.clean-disks#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/periodic/daily/100.clean-disks,v 1.9 2001/04/25 12:11:54 ru Exp $ +# $FreeBSD: src/etc/periodic/daily/100.clean-disks,v 1.10 2009/06/02 07:35:51 brian Exp $ # # Remove garbage files more than $daily_clean_disks_days days old # @@ -29,7 +29,7 @@ echo "" echo "Cleaning disks:" set -f noglob - args="$args -name "`echo "$daily_clean_disks_files" | + args="-name "`echo "$daily_clean_disks_files" | sed -e 's/^[ ]*//' \ -e 's/[ ]*$//' \ -e 's/[ ][ ]*/ -o -name /g'` @@ -41,9 +41,9 @@ print=;; esac - rc=$(find / \( ! -fstype local -o -fstype rdonly \) -a -prune -o \ - \( $args \) -atime +$daily_clean_disks_days -delete $print | - tee /dev/stderr | wc -l) + rc=$(find / \( ! -fstype local -o -fstype rdonly \) -prune -o \ + \( $args \) -atime +$daily_clean_disks_days \ + -execdir rm -df {} \; $print | tee /dev/stderr | wc -l) [ -z "$print" ] && rc=0 [ $rc -gt 1 ] && rc=1 set -f glob ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.97 2009/05/30 19:38:51 dougb Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.98 2009/06/02 22:15:47 rmacklem Exp $ .include @@ -23,8 +23,8 @@ mixer motd mountcritlocal mountcritremote mountlate \ mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \ named natd netif netoptions \ - network_ipv6 newsyslog nfsclient nfsd \ - nfsserver nisdomain nsswitch ntpd ntpdate \ + network_ipv6 newsyslog nfsclient nfscbd nfsd \ + nfsserver nfsuserd nisdomain nsswitch ntpd ntpdate \ othermta \ pf pflog pfsync \ powerd power_profile ppp pppoed pwcheck \ ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/mountd#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/mountd,v 1.21 2008/07/16 19:50:29 dougb Exp $ +# $FreeBSD: src/etc/rc.d/mountd,v 1.22 2009/06/02 22:15:47 rmacklem Exp $ # # PROVIDE: mountd @@ -37,6 +37,13 @@ fi fi + # If nfsv4_server_enable is yes, force use of the experimental + # server + # + if checkyesno nfsv4_server_enable; then + rc_flags="-e ${rc_flags}" + fi + if checkyesno zfs_enable; then rc_flags="${rc_flags} /etc/exports /etc/zfs/exports" fi ==== //depot/projects/soc2009/trasz_limits/etc/rc.d/nfsd#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/nfsd,v 1.16 2008/11/03 10:38:00 dfr Exp $ +# $FreeBSD: src/etc/rc.d/nfsd,v 1.17 2009/06/02 22:15:47 rmacklem Exp $ # # PROVIDE: nfsd -# REQUIRE: mountd hostname gssd +# REQUIRE: mountd hostname gssd nfsuserd # KEYWORD: nojail shutdown . /etc/rc.subr @@ -14,14 +14,33 @@ command="/usr/sbin/${name}" load_rc_config $name -command_args="${nfs_server_flags}" start_precmd="nfsd_precmd" sig_stop="USR1" nfsd_precmd() { - if ! sysctl vfs.nfsrv >/dev/null 2>&1; then - force_depend nfsserver || return 1 + if checkyesno nfsv4_server_enable; then + # If nfsv4_server_enable is yes, force use + # of the experimental server + # + rc_flags="-e ${nfs_server_flags}" + + if ! checkyesno nfsuserd_enable && \ + ! /etc/rc.d/nfsuserd forcestatus 1>/dev/null 2>&1 + then + force_depend nfsuserd || return 1 + fi + else + rc_flags="${nfs_server_flags}" + + if ! sysctl vfs.nfsrv >/dev/null 2>&1; then + force_depend nfsserver || return 1 + fi + + if checkyesno nfs_reserved_port_only; then + echo 'NFS on reserved port only=YES' + sysctl vfs.nfsrv.nfs_privport=1 > /dev/null + fi fi if ! checkyesno rpcbind_enable && \ @@ -35,11 +54,6 @@ then force_depend mountd || return 1 fi - - if checkyesno nfs_reserved_port_only; then - echo 'NFS on reserved port only=YES' - sysctl vfs.nfsrv.nfs_privport=1 > /dev/null - fi return 0 } ==== //depot/projects/soc2009/trasz_limits/lib/bind/config.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/bind/config.mk,v 1.20 2007/12/02 19:13:57 dougb Exp $ +# $FreeBSD: src/lib/bind/config.mk,v 1.21 2009/06/01 21:58:59 dougb Exp $ .include @@ -70,6 +70,19 @@ ISC_ATOMIC_ARCH= ${MACHINE_ARCH} .endif +# Optional features +.if ${MK_BIND_LARGE_FILE} == "yes" +CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +.endif +.if ${MK_BIND_SIGCHASE} == "yes" +CFLAGS+= -DDIG_SIGCHASE +.endif +.if ${MK_BIND_XML} == "yes" +CFLAGS+= -DHAVE_LIBXML2 +CFLAGS+= -I/usr/local/include -I/usr/local/include/libxml2 +CFLAGS+= -L/usr/local/lib -lxml2 -lz -liconv -lm +.endif + # Link against BIND libraries .if ${MK_BIND_LIBS} == "no" LIBBIND9= ${LIB_BIND_REL}/bind9/libbind9.a ==== //depot/projects/soc2009/trasz_limits/lib/libusb/libusb.3#4 (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.4 2009/05/28 17:36:36 thompsa Exp $ +.\" $FreeBSD: src/lib/libusb/libusb.3,v 1.5 2009/06/02 17:27:51 thompsa Exp $ .\" -.Dd May 21, 2009 +.Dd May 28, 2009 .Dt LIBUSB 3 .Os .Sh NAME @@ -78,6 +78,8 @@ .Fn libusb20_tr_set_callback "struct libusb20_transfer *xfer" "libusb20_tr_callback_t *cb" .Ft void .Fn libusb20_tr_set_flags "struct libusb20_transfer *xfer" "uint8_t flags" +.Ft uint32_t +.Fn libusb20_tr_get_length "struct libusb20_transfer *xfer" "uint16_t fr_index" .Ft void .Fn libusb20_tr_set_length "struct libusb20_transfer *xfer" "uint32_t length" "uint16_t fr_index" .Ft void @@ -183,6 +185,10 @@ .Ft int .Fn libusb20_be_remove_dev_quirk "struct libusb20_backend *pbe" "struct libusb20_quirk *pq" .Ft struct libusb20_backend * +.Fn libusb20_be_alloc_default "void" +.Ft struct libusb20_backend * +.Fn libusb20_be_alloc_freebsd "void" +.Ft struct libusb20_backend * .Fn libusb20_be_alloc_linux "void" .Ft struct libusb20_device * .Fn libusb20_be_device_foreach "struct libusb20_backend *pbe" "struct libusb20_device *pdev" @@ -227,7 +233,7 @@ .Pp . .Fn libusb20_tr_open -will allocate kernel resources like +will allocate kernel buffer resources according to .Fa max_buf_size and .Fa max_frame_count @@ -235,6 +241,18 @@ .Fa pxfer and bind the transfer to the specified .Fa ep_no . +.Fa max_buf_size +is the minimum buffer size which the data transport layer has to support. +If +.Fa max_buf_size +is zero, the +.Nm +library will use wMaxPacketSize to compute the buffer size. +This can be useful for isochronous transfers. +The actual buffer size can be greater than +.Fa max_buf_size +and is returned by +.Fn libusb20_tr_get_max_total_length . . This function returns zero upon success. . @@ -367,8 +385,14 @@ . .Pp . +.Fn libusb20_tr_get_length +returns the length of the given USB frame by index. +After an USB transfer is complete the USB frame length will get updated to the actual transferred length. +. +.Pp +. .Fn libusb20_tr_set_length -sets the length of a given USB transfer and frame index. +sets the length of the given USB frame by index. . .Pp . @@ -750,7 +774,7 @@ the given USB device. . A timeout value can be specified which is passed on to the -.Xr 2 poll +.Xr poll 2 function. . .Sh USB BACKEND OPERATIONS @@ -829,6 +853,10 @@ If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is returned. . +.Pp +. +.Fn libusb20_be_alloc_default +.Fn libusb20_be_alloc_freebsd .Fn libusb20_be_alloc_linux These functions are used to allocate a specific USB backend or the operating system default USB backend. Allocating a backend is a way to ==== //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.2 2009/05/28 17:36:36 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.c,v 1.3 2009/06/02 17:27:51 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -319,6 +319,12 @@ return; } +uint32_t +libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t frIndex) +{ + return (xfer->pLength[frIndex]); +} + void libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t frIndex) { ==== //depot/projects/soc2009/trasz_limits/lib/libusb/libusb20.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.3 2009/05/28 17:36:36 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb20.h,v 1.4 2009/06/02 17:27:51 thompsa Exp $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. @@ -216,6 +216,7 @@ void libusb20_tr_set_buffer(struct libusb20_transfer *xfer, void *buffer, uint16_t fr_index); void libusb20_tr_set_callback(struct libusb20_transfer *xfer, libusb20_tr_callback_t *cb); void libusb20_tr_set_flags(struct libusb20_transfer *xfer, uint8_t flags); +uint32_t libusb20_tr_get_length(struct libusb20_transfer *xfer, uint16_t fr_index); void libusb20_tr_set_length(struct libusb20_transfer *xfer, uint32_t length, uint16_t fr_index); void libusb20_tr_set_priv_sc0(struct libusb20_transfer *xfer, void *sc0); void libusb20_tr_set_priv_sc1(struct libusb20_transfer *xfer, void *sc1); ==== //depot/projects/soc2009/trasz_limits/lib/msun/src/e_rem_pio2.c#2 (text+ko) ==== @@ -14,7 +14,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.20 2009/01/13 05:13:20 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2.c,v 1.21 2009/06/03 08:16:34 ed Exp $"); /* __ieee754_rem_pio2(x,y) * @@ -48,10 +48,10 @@ pio2_3 = 2.02226624871116645580e-21, /* 0x3BA3198A, 0x2E000000 */ pio2_3t = 8.47842766036889956997e-32; /* 0x397B839A, 0x252049C1 */ -#ifdef INLINE_REM_PIO2 -extern __gnu89_inline +#ifndef INLINE_REM_PIO2 +extern #endif -int +__inline int __ieee754_rem_pio2(double x, double *y) { double z,w,t,r,fn; ==== //depot/projects/soc2009/trasz_limits/lib/msun/src/e_rem_pio2f.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.31 2009/01/13 05:13:20 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/e_rem_pio2f.c,v 1.32 2009/06/03 08:16:34 ed Exp $"); /* __ieee754_rem_pio2f(x,y) * @@ -40,10 +40,10 @@ pio2_1 = 1.57079631090164184570e+00, /* 0x3FF921FB, 0x50000000 */ pio2_1t = 1.58932547735281966916e-08; /* 0x3E5110b4, 0x611A6263 */ -#ifdef INLINE_REM_PIO2F -extern __gnu89_inline +#ifndef INLINE_REM_PIO2F +extern #endif -int +__inline int __ieee754_rem_pio2f(float x, double *y) { double w,r,fn; ==== //depot/projects/soc2009/trasz_limits/lib/msun/src/k_cosf.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef INLINE_KERNEL_COSDF #include -__FBSDID("$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.17 2009/01/13 05:13:20 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/k_cosf.c,v 1.18 2009/06/03 08:16:34 ed Exp $"); #endif #include "math.h" @@ -30,10 +30,10 @@ C2 = -0x16c087e80f1e27.0p-62, /* -0.00138867637746099294692 */ C3 = 0x199342e0ee5069.0p-68; /* 0.0000243904487962774090654 */ -#ifdef INLINE_KERNEL_COSDF -extern __gnu89_inline +#ifndef INLINE_KERNEL_COSDF +extern #endif -float +__inline float __kernel_cosdf(double x) { double r, w, z; ==== //depot/projects/soc2009/trasz_limits/lib/msun/src/k_sinf.c#2 (text+ko) ==== @@ -16,7 +16,7 @@ #ifndef INLINE_KERNEL_SINDF #include -__FBSDID("$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.15 2009/01/13 05:13:20 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/k_sinf.c,v 1.16 2009/06/03 08:16:34 ed Exp $"); #endif #include "math.h" @@ -29,10 +29,10 @@ S3 = -0x1a00f9e2cae774.0p-65, /* -0.000198393348360966317347 */ S4 = 0x16cd878c3b46a7.0p-71; /* 0.0000027183114939898219064 */ -#ifdef INLINE_KERNEL_SINDF -extern __gnu89_inline +#ifndef INLINE_KERNEL_SINDF +extern #endif -float +__inline float __kernel_sindf(double x) { double r, s, w, z; ==== //depot/projects/soc2009/trasz_limits/lib/msun/src/k_tanf.c#2 (text+ko) ==== @@ -15,7 +15,7 @@ #ifndef INLINE_KERNEL_TANDF #include -__FBSDID("$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.22 2009/01/13 05:13:20 das Exp $"); +__FBSDID("$FreeBSD: src/lib/msun/src/k_tanf.c,v 1.23 2009/06/03 08:16:34 ed Exp $"); #endif #include "math.h" @@ -32,10 +32,10 @@ 0x1362b9bf971bcd.0p-59, /* 0.00946564784943673166728 */ }; -#ifdef INLINE_KERNEL_TANDF -extern __gnu89_inline +#ifndef INLINE_KERNEL_TANDF +extern #endif -float +__inline float __kernel_tandf(double x, int iy) { double z,r,w,s,t,u; ==== //depot/projects/soc2009/trasz_limits/lib/msun/src/math_private.h#2 (text+ko) ==== @@ -11,7 +11,7 @@ /* * from: @(#)fdlibm.h 5.1 93/09/24 - * $FreeBSD: src/lib/msun/src/math_private.h,v 1.28 2009/03/14 18:24:15 das Exp $ + * $FreeBSD: src/lib/msun/src/math_private.h,v 1.29 2009/06/03 08:16:34 ed Exp $ */ #ifndef _MATH_PRIVATE_H_ @@ -345,15 +345,30 @@ int __kernel_rem_pio2(double*,double*,int,int,int); /* double precision kernel functions */ +#ifdef INLINE_REM_PIO2 +__inline +#endif int __ieee754_rem_pio2(double,double*); double __kernel_sin(double,double,int); double __kernel_cos(double,double); double __kernel_tan(double,double,int); /* float precision kernel functions */ +#ifdef INLINE_REM_PIO2F +__inline +#endif int __ieee754_rem_pio2f(float,double*); +#ifdef INLINE_KERNEL_SINDF +__inline +#endif float __kernel_sindf(double); +#ifdef INLINE_KERNEL_COSDF +__inline +#endif float __kernel_cosdf(double); +#ifdef INLINE_KERNEL_TANDF +__inline +#endif float __kernel_tandf(double,int); /* long double precision kernel functions */ ==== //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/fsck.h#3 (text+ko) ==== @@ -57,7 +57,7 @@ * SUCH DAMAGE. * * @(#)fsck.h 8.4 (Berkeley) 5/9/95 - * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.42 2009/05/29 20:01:50 lulf Exp $ + * $FreeBSD: src/sbin/fsck_ffs/fsck.h,v 1.43 2009/06/02 17:57:24 lulf Exp $ */ #include @@ -297,8 +297,8 @@ ufs2_daddr_t n_blks; /* number of blocks in use */ ino_t n_files; /* number of files in use */ -sig_atomic_t got_siginfo; /* received a SIGINFO */ -sig_atomic_t got_sigalarm; /* received a SIGALRM */ +volatile sig_atomic_t got_siginfo; /* received a SIGINFO */ +volatile sig_atomic_t got_sigalarm; /* received a SIGALRM */ #define clearinode(dp) \ if (sblock.fs_magic == FS_UFS1_MAGIC) { \ ==== //depot/projects/soc2009/trasz_limits/sbin/fsck_ffs/gjournal.c#2 (text+ko) ==== @@ -52,7 +52,7 @@ */ #include -__FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.2 2006/11/01 10:56:33 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/fsck_ffs/gjournal.c,v 1.3 2009/06/03 09:23:31 pjd Exp $"); #include #include @@ -672,7 +672,7 @@ devnam = filesys; getdisk(); - /* Are there any unreferenced inodes in this cylinder group? */ + /* Are there any unreferenced inodes in this file system? */ if (fs->fs_unrefs == 0) { //printf("No unreferenced inodes.\n"); closedisk(); ==== //depot/projects/soc2009/trasz_limits/sbin/mksnap_ffs/mksnap_ffs.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.9 2009/05/29 19:18:41 pjd Exp $ + * $FreeBSD: src/sbin/mksnap_ffs/mksnap_ffs.c,v 1.10 2009/06/02 18:30:09 pjd Exp $ */ #include @@ -112,6 +112,8 @@ if ((grp = getgrnam("operator")) == NULL) errx(1, "Cannot retrieve operator gid"); + iov = NULL; + iovlen = 0; build_iovec(&iov, &iovlen, "fstype", "ffs", 4); build_iovec(&iov, &iovlen, "from", snapname, (size_t)-1); build_iovec(&iov, &iovlen, "fspath", stfsbuf.f_mntonname, (size_t)-1); ==== //depot/projects/soc2009/trasz_limits/share/examples/kld/dyn_sysctl/dyn_sysctl.c#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/examples/kld/dyn_sysctl/dyn_sysctl.c,v 1.3 2004/08/30 09:49:58 pjd Exp $ + * $FreeBSD: src/share/examples/kld/dyn_sysctl/dyn_sysctl.c,v 1.4 2009/06/03 09:28:58 pjd Exp $ */ #include @@ -42,7 +42,7 @@ static struct sysctl_ctx_list clist, clist1, clist2; static int -sysctl_dyn_sysctl_test (SYSCTL_HANDLER_ARGS) +sysctl_dyn_sysctl_test(SYSCTL_HANDLER_ARGS) { char *buf = "let's produce some text..."; @@ -53,7 +53,7 @@ * The function called at load/unload. */ static int -load (module_t mod, int cmd, void *arg) +load(module_t mod, int cmd, void *arg) { int error; @@ -78,37 +78,37 @@ SYSCTL_STATIC_CHILDREN(/* top of sysctl tree */), OID_AUTO, "dyn_sysctl", CTLFLAG_RW, 0, "dyn_sysctl root node"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 4 17:43:13 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D641C106566C; Thu, 4 Jun 2009 17:43:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 958F2106564A for ; Thu, 4 Jun 2009 17:43:12 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 842218FC1A for ; Thu, 4 Jun 2009 17:43:12 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54HhCUn015879 for ; Thu, 4 Jun 2009 17:43:12 GMT (envelope-from fangwang@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54HhCnS015877 for perforce@freebsd.org; Thu, 4 Jun 2009 17:43:12 GMT (envelope-from fangwang@FreeBSD.org) Date: Thu, 4 Jun 2009 17:43:12 GMT Message-Id: <200906041743.n54HhCnS015877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fangwang@FreeBSD.org using -f From: Fang Wang To: Perforce Change Reviews Cc: Subject: PERFORCE change 163503 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 17:43:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=163503 Change 163503 by fangwang@fangwang_utobsd on 2009/06/04 17:42:55 Add uto support in tcp_syncache.c. Fix stupid mistake in tcp_addoptions, forget kind and length field in uto option. Modify some uto relative variables in tcpcb. Affected files ... .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_output.c#3 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.c#2 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#6 edit Differences ... ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_output.c#3 (text+ko) ==== @@ -1325,6 +1325,10 @@ * At minimum we need 10 bytes (to generate 1 SACK block). If both * TCP Timestamps (12 bytes) and TCP Signatures (18 bytes) are present, * we only have 10 bytes for SACK options (40 - (12 + 18)). + * + * There is a new tcp option UTO (user timeout, defined in RFC 5482), the + * UTO option is a optional option. So we attach the UTO option only when + * there are enough free space in the TCP header. */ int tcp_addoptions(struct tcpopt *to, u_char *optp) @@ -1445,7 +1449,9 @@ unsigned short uto_load = (unsigned short)to->to_granularity; uto_load += to->to_uto; if (TCP_MAXOLEN - optlen < TCPOLEN_UTO) - continue; + continue; + *optp++ = TCPOPT_UTO; + *optp++ = TCPOLEN_UTO; optlen += TCPOLEN_UTO; bcopy((u_char *)&uto_load, optp, sizeof(uto_load)); optp += sizeof(uto_load); ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_syncache.c#2 (text+ko) ==== @@ -772,6 +772,11 @@ #endif if (sc->sc_flags & SCF_SACK) tp->t_flags |= TF_SACK_PERMIT; + if (sc->sc_flags & SCF_UTO) { + tp->t_flags |= TF_RCVD_UTO; + tp->rcv_uto_granularity = sc->sc_granularity; + tp->rcv_uto = sc->sc_uto; + } } if (sc->sc_flags & SCF_ECN) @@ -1209,6 +1214,11 @@ sc->sc_flags |= SCF_NOOPT; if ((th->th_flags & (TH_ECE|TH_CWR)) && V_tcp_do_ecn) sc->sc_flags |= SCF_ECN; + if (to->to_flags & TOF_UTO) { + sc->sc_granularity = to->to_granularity; + sc->sc_uto = to->to_uto; + sc->sc_flags |= SCF_UTO; + } if (V_tcp_syncookies) { syncookie_generate(sch, sc, &flowtmp); @@ -1376,6 +1386,12 @@ if (sc->sc_flags & SCF_SIGNATURE) to.to_flags |= TOF_SIGNATURE; #endif + if (sc->sc_flags & SCF_UTO) { + to.to_granularity = sc->sc_granularity; + to.to_uto = sc->sc_uto; + to.to_flags |= TOF_UTO; + } + optlen = tcp_addoptions(&to, (u_char *)(th + 1)); /* Adjust headers by option size. */ ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#6 (text+ko) ==== @@ -192,14 +192,14 @@ int t_bytes_acked; /* # bytes acked during current RTT */ /* user timeout variables (RFC 5482) */ - u_int t_rcvuto; /* received user timeout value */ - u_int t_snduto; /* send user timeout value */ - u_char rcv_uto_granularity:1; /* received user timeout granularity */ - u_char snd_uto_granularity:1; /* received user timeout granularity */ - u_char uto_enable:1; /* flag controls whether the UTO option is enabled for a connection */ - u_char uto_changeable:1; /* flag that controls whether USER_TIMEOUT may be changed based on t_rcvuto */ - u_char uto_impl:1; /* flag that controls whelther implement user timeout */ - u_int t_uto; /* implemented user timeout value */ + u_int rcv_uto; /* received user timeout value, in seconds */ + u_int snd_uto; /* send user timeout value, in seconds */ + u_char rcv_uto_granularity:1; /* received user timeout granularity */ + u_char snd_uto_granularity:1; /* received user timeout granularity */ + u_char uto_enable:1; /* flag controls whether the UTO option is enabled for a connection */ + u_char uto_changeable:1; /* flag that controls whether USER_TIMEOUT may be changed based on t_rcvuto */ + u_char uto_impl:1; /* flag that controls whelther implement user timeout */ + u_int t_impl_uto; /* implemented user timeout value (ticks) */ }; /* @@ -231,7 +231,7 @@ #define TF_ECN_PERMIT 0x4000000 /* connection ECN-ready */ #define TF_ECN_SND_CWR 0x8000000 /* ECN CWR in queue */ #define TF_ECN_SND_ECE 0x10000000 /* ECN ECE in queue */ -#define TF_RCVD_UTO 0x20000000 /* a user timeout was received in SYN */ +#define TF_RCVD_UTO 0x20000000 /* a user timeout was received */ #define TF_NEEDUTO 0x40000000 /* send user timeout */ #define IN_FASTRECOVERY(tp) (tp->t_flags & TF_FASTRECOVERY) From owner-p4-projects@FreeBSD.ORG Thu Jun 4 17:45:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 36A131065672; Thu, 4 Jun 2009 17:45: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 E521C106564A for ; Thu, 4 Jun 2009 17:45:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D48388FC27 for ; Thu, 4 Jun 2009 17:45:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54HjERZ016074 for ; Thu, 4 Jun 2009 17:45:14 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54HjEOf016072 for perforce@freebsd.org; Thu, 4 Jun 2009 17:45:14 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 17:45:14 GMT Message-Id: <200906041745.n54HjEOf016072@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 163504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 17:45:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=163504 Change 163504 by zec@zec_tpx32 on 2009/06/04 17:45:06 Revert 163490, i.e. freeing memory on vimage -d is now OK again after nailing down at least the most pressing uncancelled callout in in6_rmx.c. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#96 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#96 (text+ko) ==== @@ -563,10 +563,8 @@ if (vmi->vmi_size) { if (curvnet->mod_data[vmi->vmi_id] == NULL) panic("vi_destroy: %s\n", vmi->vmi_name); -#ifdef NOTYET free(curvnet->mod_data[vmi->vmi_id], M_VNET); curvnet->mod_data[vmi->vmi_id] = NULL; -#endif } #endif @@ -710,10 +708,6 @@ TAILQ_FOREACH_SAFE(ifp, &V_ifnet, if_link, nifp) { if (ifp->if_home_vnet != ifp->if_vnet) vi_if_move(NULL, ifp, vip); -#ifdef NOTYET - else - if_clone_destroy(ifp->if_xname); -#endif } /* Detach / free per-module state instances. */ @@ -725,9 +719,7 @@ /* hopefully, we are finally OK to free the vnet container itself! */ vnet->vnet_magic_n = 0xdeadbeef; -#ifdef NOTYET free(vnet, M_VNET); -#endif free(vprocg, M_VPROCG); free(vip, M_VIMAGE); From owner-p4-projects@FreeBSD.ORG Thu Jun 4 18:04:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FED61065670; Thu, 4 Jun 2009 18:04:38 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58836106564A for ; Thu, 4 Jun 2009 18:04:38 +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 455488FC17 for ; Thu, 4 Jun 2009 18:04:38 +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 n54I4cAY018412 for ; Thu, 4 Jun 2009 18:04:38 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54I4Ygd018407 for perforce@freebsd.org; Thu, 4 Jun 2009 18:04:34 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 4 Jun 2009 18:04:34 GMT Message-Id: <200906041804.n54I4Ygd018407@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 163506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 18:04:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=163506 Change 163506 by truncs@aditya on 2009/06/04 18:04:20 Migration to new in-memory superblock Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/dump_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/identcpu.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/local_apic.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/mca.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/minidump_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/MAC#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/conf/XENHVM#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/apicvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/clock.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/mca.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/param.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/pcpu.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/smp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/specialreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/isa/clock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/linux32/linux.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/linux32/linux32_sysent.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/cpufunc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/dump_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/at91/at91.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/at91/at91_cfata.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/at91/at91_spi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/at91/if_ate.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/at91/ohci_atmelarm.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/AVILA#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/CRB#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/EP80219#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/GUMSTIX#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/HL200#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/IQ31244#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/KB920X#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/NSLU#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/NSLU.hints#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/SIMICS#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/include/pmap.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/common/boot.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/uboot/lib/net.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/boot/zfs/README#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_acl.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/mutex.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/rwlock.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/atomic/i386/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/opensolaris_atomic.S#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_array.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/opensolaris_xdr_mem.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/contrib/opensolaris/uts/common/zmod/opensolaris_crc32.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/cddl/dev/lockstat/lockstat.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_futex.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_futex.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_mib.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_mib.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_socket.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_socket.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_stats.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/linux/linux_util.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/kern_ndis.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/subr_ndis.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_fcntl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_ioctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_ioctl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_proto.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_resource.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_signal.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_socket.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_stat.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_syscall.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_syscallnames.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_sysconfig.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_sysent.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_ttold.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/compat/svr4/svr4_ttold.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/NOTES#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.amd64#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.i386#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.pc98#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/files.powerpc#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/kern.post.mk#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/conf/options#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/altq/altq/altq_subr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwi/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwi/ipw2200-bss.fw.uu#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwi/ipw2200-ibss.fw.uu#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/iwi/ipw2200-sniffer.fw.uu#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/mwl/LICENSE#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/mwl/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/mwl/mw88W8363.fw.uu#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/dev/mwl/mwlboot.fw.uu#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/ipfilter/netinet/ip_nat.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/contrib/pf/net/pf_ioctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ddb/db_textdump.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aac/aac.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpi_support/acpi_sony.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/age/if_age.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic/aic.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/amr/amr_linux.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/arcmsr/arcmsr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/asr/asr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-all.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ah_osdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ah_osdep.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/if_ath_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ath/if_athvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bktr/bktr_os.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/bitops.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/bwimac.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/bwimac.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/bwiphy.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/bwiphy.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/bwirf.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/bwirf.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/if_bwi.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/if_bwi_pci.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/if_bwireg.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/bwi/if_bwivar.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ciss/ciss.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_multiq.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/cxgb_sge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/dcons/dcons_os.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/if_em.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ed/if_ed.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fb/creator.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/flash/at45d.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iir/iir_ctrl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ipw/if_ipwvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/isp/isp_freebsd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iwi/if_iwivar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ksyms/ksyms.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/lmc/if_lmc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/malo/if_malo.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/malo/if_malo.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/md/md.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mfi/mfi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mfi/mfi_linux.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/e1000phyreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mii/miidevs#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mpt/mpt_user.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/msk/if_mskreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwl.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwl_pci.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwlioctl.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/if_mwlvar.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/mwldiag.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/mwlhal.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/mwlhal.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mwl/mwlreg.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/if_mxge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/mxge/if_mxge_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/nge/if_ngereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/puc/pucdata.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ral/rt2560.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ral/rt2560var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ral/rt2661.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ral/rt2661var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/random/nehemiah.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/re/if_re.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/rp/rp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/si/si.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/smc/if_smc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/snp/snp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/midi/midi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/emu10kx-midi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/via82c686.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/pcm/sound.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/sbus/cs4231.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/spibus/spibus.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/syscons.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/sysmouse.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/sequences#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/syscons/teken/teken_subr_compat.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/tsec/if_tsec.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twa/tw_osl_freebsd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/twe/twe_freebsd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/uart/uart_tty.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ubsec/ubsec.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/ubsec/ubsecreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/README.TXT#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/bluetooth/TODO.TXT#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/bluetooth/ng_ubt.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/avr32dci.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/avr32dci.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_revision.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_uath.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_uathvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_upgt.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_upgtvar.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_urtw.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_urtwreg.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_urtwvar.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/usb/wlan/usb_wlan.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wi/if_wi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wi/if_wireg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wi/if_wivar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/wpi/if_wpivar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/console/console.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/console/xencons_ring.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xen/netfront/netfront.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/cd9660/cd9660_rrip.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/cd9660/cd9660_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/devfs/devfs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/devfs/devfs_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/devfs/devfs_vnops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/fdescfs/fdesc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/hpfs/hpfs_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_commonacl.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_commonkrpc.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_commonport.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_commonsubs.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfs_var.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfscl.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsclstate.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsdport.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfskpiport.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsm_subs.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsport.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsproto.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsrvcache.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsrvstate.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/nfsv4_errstr.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/rpcv2.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfs/xdr_subs.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clbio.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clcomsubs.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clkrpc.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_cllock.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clnfsiod.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clnode.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clport.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clrpcops.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clstate.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clsubs.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clvfsops.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_clvnops.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfs_lock.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfsargs.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfsdiskless.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfsmount.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nfsnode.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsclient/nlminfo.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdcache.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdport.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdserv.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdsocket.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdstate.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nfsserver/nfs_nfsdsubs.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nullfs/null_subr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nullfs/null_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nwfs/nwfs_io.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/nwfs/nwfs_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/portalfs/portal_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/pseudofs/pseudofs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/pseudofs/pseudofs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/pseudofs/pseudofs_vnops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/concat/g_concat.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/label/g_label.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum_create.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum_events.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum_raid5.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum_rm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum_subr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/geom/vinum/geom_vinum_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#3 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_lookup.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#4 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/fs.h#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/inode.h#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/bios/apm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/bios/smapi.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/GENERIC.hints#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/MAC#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/NOTES#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/conf/XEN#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/cpufreq/hwpstate.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/identcpu.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/mca.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/minidump_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/i386/trap.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_ioctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_isc_syscall.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_isc_sysent.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_proto.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_syscall.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_sysent.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_xenix.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_xenix_syscall.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/ibcs2_xenix_sysent.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/ibcs2/syscalls.master#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/apicvar.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/clock.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/mca.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/param.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/smp.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/include/xen/xen_clock_util.h#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/isa/clock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/linux/linux.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/linux/linux_sysent.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/linux/linux_sysvec.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/xen/clock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/xen/mp_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/xen/xen_clock_util.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/i386/xen/xen_rtc.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/conf/DEFAULTS#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/conf/MAC#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/dump_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/elf_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/mp_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/ia64/ssc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/ia64/include/md_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/isa/atrtc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/isa/rtc.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/init_sysent.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_acct.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_clock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_conf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_cpu.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_cpuset.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_fail.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_intr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_jail.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_linker.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_lock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_lockf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_lockstat.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_mutex.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_osd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_proc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_prot.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_shutdown.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_sx.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_sysctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_vimage.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/kern_xxx.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/link_elf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/link_elf_obj.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sched_ule.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_acl_posix1e.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_bus.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_kdb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_pcpu.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_rman.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_sglist.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_smp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/subr_witness.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sys_generic.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sys_socket.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/syscalls.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/syscalls.master#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/systrace_args.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sysv_msg.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/tty.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/tty_info.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/tty_inq.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/tty_pts.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_mqueue.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_acl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_export.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_extattr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_syscalls.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/ata/ata-usb.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/sound/usb/uaudio.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/sound/usb/uaudio.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/sound/usb/uaudioreg.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/FILES#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/dsbr100io.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ehci.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ehci_pci.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ehcireg.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ehcivar.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/hid.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/hid.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/if_upgt.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/if_urtw.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ohci.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ohci_pci.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ohcireg.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ohcivar.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/rio500_usb.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/sl811hs.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/slhci_pccard.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/u3g.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uark.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ubsa.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ubser.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ubser.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uchcom.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ucom.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ucomvar.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ucycom.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/udbp.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/udbp.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ufm.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ufoma.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uftdi.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uftdireg.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ugen.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uhci.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uhci_pci.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uhcireg.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uhcivar.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uhid.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uhub.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uipaq.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ukbd.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ulpt.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/umass.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/umct.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/umodem.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/ums.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uplcom.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/urio.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb_ethersubr.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb_ethersubr.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb_if.m#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb_mem.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb_mem.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb_port.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb_quirks.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb_quirks.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usb_subr.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usbcdc.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usbdi.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usbdi.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usbdi_util.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usbdi_util.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usbdivar.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/usbhid.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uscanner.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uslcom.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uvisor.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uvscom.c#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/conf/ADM5120#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/conf/IDT#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/conf/MALTA#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/conf/QEMU#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/conf/SENTRY5#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/include/pmap.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/mips/pm_machdep.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/bwi/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/cpufreq/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/dtrace/dtraceall/dtraceall.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/geom/geom_part/geom_part_ebr/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/ksyms/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/linux/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/mwl/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/mwlfw/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/nfs4client/Makefile#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/nfscl/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/nfscommon/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/nfsd/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/opensolaris/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/sound/sound/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/svr4/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/usb/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/usb/upgt/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/usb/urtw/Makefile#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/usb/zyd/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/xfs/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/modules/zfs/Makefile#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/bpf.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/flowtable.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_arcsubr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_bridge.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_clone.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_ef.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_gif.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_gif.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_lagg.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_llatbl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_llatbl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_loop.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_mib.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/if_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/netisr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/netisr.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/pfil.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/route.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/route.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/rtsock.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net/vnet.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_adhoc.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_ddb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_dfs.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_freebsd.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_hostap.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_ht.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_ht.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_input.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_ioctl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_monitor.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_node.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_node.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_output.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_phy.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_proto.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_proto.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_radiotap.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_scan.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_sta.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_superg.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_superg.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_tdma.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_tdma.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/net80211/ieee80211_wds.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netatalk/ddp_input.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/bluetooth/drivers/ubt/TODO#2 delete .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/netflow/ng_netflow.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/netgraph.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_base.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/accf_data.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/accf_dns.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/accf_http.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/icmp6.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/igmp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_pcb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/in_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_dummynet.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_fw_pfil.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/ip_output.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_crc32.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/sctputil.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_hostcache.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/udp_var.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet/vinet.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6.h#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_ifattach.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_mcast.c#1 branch .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_pcb.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/soc2009/soc_ext2fs/src/sys/netinet6/in6_rmx.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 4 18:05:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AEBFB106566C; Thu, 4 Jun 2009 18:05:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C0A0106567A for ; Thu, 4 Jun 2009 18:05:39 +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 5901C8FC13 for ; Thu, 4 Jun 2009 18:05:39 +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 n54I5d1s018562 for ; Thu, 4 Jun 2009 18:05:39 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54I5daJ018560 for perforce@freebsd.org; Thu, 4 Jun 2009 18:05:39 GMT (envelope-from gabor@freebsd.org) Date: Thu, 4 Jun 2009 18:05:39 GMT Message-Id: <200906041805.n54I5daJ018560@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 163507 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 18:05:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=163507 Change 163507 by gabor@gabor_server on 2009/06/04 18:04:53 MFHg: - Add modified GNU regression tests so that I can test compatibility - Replace some build scripts with conventional FreeBSD Makefiles - Eliminate some warnings in the code - mkcsmapper and mkesdb are buildable now Affected files ... .. //depot/projects/soc2009/gabor_iconv/extracted/build.sh#2 delete .. //depot/projects/soc2009/gabor_iconv/extracted/lib/Makefile#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/_iconv.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/build.sh#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ARMSCII-8.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ARMSCII-8.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ASCII.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ATARIST.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-2003.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-2003.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-1999-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-1999-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-1999.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-1999.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-2001-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-2001-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-2001.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-2001.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-2004-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-2004-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-2004.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5-HKSCS-2004.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/BIG5.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1046.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1124.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1125.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1129.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1131.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1133.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1161.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1161.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1162.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1163.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1163.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1250.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1251.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1252.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1253.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1254.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1255-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1255-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1255.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1255.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1256.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1257.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1258-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1258-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1258.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP1258.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP437.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP737.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP775.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP850.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP852.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP853.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP855.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP856.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP857.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP858.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP860.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP861.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP862.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP863.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP864.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP865.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP866.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP869.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP874.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP922.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP932.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP932.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP936.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP949.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP950.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/CP950.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/DEC-HANYU.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/DEC-HANYU.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/DEC-KANJI.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/EUC-CN.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/EUC-JISX0213.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/EUC-JP.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/EUC-JP.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/EUC-KR.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/EUC-TW.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/EUC-TW.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/GB18030-BMP.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/GBK.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/Georgian-Academy.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/Georgian-PS.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/HP-ROMAN8.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/HZ-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/HZ-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-CN-EXT-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-CN-EXT-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-CN-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-CN-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-JP-1-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-JP-1-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-JP-2-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-JP-2-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-JP-3-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-JP-3-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-JP-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-JP-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-KR-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-2022-KR-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-1.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-10.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-11.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-13.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-14.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-15.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-16.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-2.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-3.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-4.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-5.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-6.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-7.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-8.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-8859-9.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-IR-165.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO-IR-165.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO646-CN.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/ISO646-JP.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/JIS_X0201.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/JOHAB.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/KOI8-R.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/KOI8-RU.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/KOI8-T.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/KOI8-U.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacArabic.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacCentralEurope.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacCroatian.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacCyrillic.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacGreek.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacHebrew.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacIceland.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacRoman.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacRomania.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacThai.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacTurkish.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MacUkraine.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/Makefile#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/Makefile.in#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/MuleLao-1.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/NEXTSTEP.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/PT154.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/Quotes.ASCII#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/Quotes.ISO-8859-1#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/Quotes.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/RISCOS-LATIN1.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/RK1048.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/SHIFT_JIS.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/SHIFT_JISX0213.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/TCVN-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/TCVN-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/TCVN.IRREVERSIBLE.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/TCVN.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/TDS565.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/TIS-620.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/Translit1.ASCII#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/Translit1.ISO-8859-1#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/TranslitFail1.ISO-8859-1#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UCS-2BE-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UCS-2BE-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UCS-2LE-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UCS-2LE-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UCS-4BE-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UCS-4BE-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UCS-4LE-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UCS-4LE-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-16-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-16-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-16BE-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-16BE-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-16LE-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-16LE-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-32-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-32-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-32BE-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-32BE-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-32LE-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-32LE-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-7-snippet#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/UTF-7-snippet.UTF-8#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/VISCII.TXT#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/check-stateful#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/check-stateful.bat#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/check-stateless#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/check-stateless.bat#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/check-subst#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/check-translit#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/check-translit.bat#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/check-translitfailure#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/gengb18030z.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/genutf8.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/table-from.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/table-to.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/test-shiftseq.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/test.h#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/tests/uniq-u.c#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/iconv/Makefile#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/util/iconv/iconv.c#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/CVS/Entries#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/CVS/Repository#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/CVS/Root#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/Makefile#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/build.sh#2 delete .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/ldef.h#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/lex.l#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/yacc.y#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/CVS/Entries#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/CVS/Repository#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/CVS/Root#1 add .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/Makefile#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/build.sh#2 delete .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/ldef.h#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/lex.l#2 edit .. //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/yacc.y#2 edit Differences ... ==== //depot/projects/soc2009/gabor_iconv/extracted/lib/modules/build.sh#2 (text+ko) ==== @@ -25,3 +25,42 @@ gcc -fPIC -I.. -shared -Wl,-soname,libiconv_none.so.4 -o libiconv_none.so.4.4 citrus_iconv_none.c ../*.c cp libiconv_none.so.4.4 libiconv_none.so.4 cp libiconv_none.so.4.4 libiconv_none.so +gcc -fPIC -I.. -shared -Wl,-soname,libDECHanyu.so.4 -o libDECHanyu.so.4.4 citrus_dechanyu.c ../*.c +cp libDECHanyu.so.4.4 libDECHanyu.so.4 +cp libDECHanyu.so.4.4 libDECHanyu.so +gcc -fPIC -I.. -shared -Wl,-soname,libEUC.so.4 -o libEUC.so.4.4 citrus_euc.c ../*.c +cp libEUC.so.4.4 libEUC.so.4 +cp libEUC.so.4.4 libEUC.so +gcc -fPIC -I.. -shared -Wl,-soname,libEUCTW.so.4 -o libEUCTW.so.4.4 citrus_euctw.c ../*.c +cp libEUCTW.so.4.4 libEUCTW.so.4 +cp libEUCTW.so.4.4 libEUCTW.so +gcc -fPIC -I.. -shared -Wl,-soname,libGBK2K.so.4 -o libGBK2K.so.4.4 citrus_gbk2k.c ../*.c +cp libGBK2K.so.4.4 libGBK2K.so.4 +cp libGBK2K.so.4.4 libGBK2K.so +gcc -fPIC -I.. -shared -Wl,-soname,libHZ.so.4 -o libHZ.so.4.4 citrus_hz.c ../*.c +cp libHZ.so.4.4 libHZ.so.4 +cp libHZ.so.4.4 libHZ.so +gcc -fPIC -I.. -shared -Wl,-soname,libISO2022.so.4 -o libISO2022.so.4.4 citrus_iso2022.c ../*.c +cp libISO2022.so.4.4 libISO2022.so.4 +cp libISO2022.so.4.4 libISO2022.so +gcc -fPIC -I.. -shared -Wl,-soname,libJOHAB.so.4 -o libJOHAB.so.4.4 citrus_johab.c ../*.c +cp libJOHAB.so.4.4 libJOHAB.so.4 +cp libJOHAB.so.4.4 libJOHAB.so +gcc -fPIC -I.. -shared -Wl,-soname,libMsKanji.so.4 -o libMsKanji.so.4.4 citrus_mskanji.c ../*.c +cp libMsKanji.so.4.4 libMsKanji.so.4 +cp libMsKanji.so.4.4 libMsKanji.so +gcc -fPIC -I.. -shared -Wl,-soname,libUTF1632.so.4 -o libUTF1632.so.4.4 citrus_utf1632.c ../*.c +cp libUTF1632.so.4.4 libUTF1632.so.4 +cp libUTF1632.so.4.4 libUTF1632.so +gcc -fPIC -I.. -shared -Wl,-soname,libUTF8.so.4 -o libUTF8.so.4.4 citrus_utf8.c ../*.c +cp libUTF8.so.4.4 libUTF8.so.4 +cp libUTF8.so.4.4 libUTF8.so +gcc -fPIC -I.. -shared -Wl,-soname,libUTF7.so.4 -o libUTF7.so.4.4 citrus_utf7.c ../*.c +cp libUTF7.so.4.4 libUTF7.so.4 +cp libUTF7.so.4.4 libUTF7.so +gcc -fPIC -I.. -shared -Wl,-soname,libVIQR.so.4 -o libVIQR.so.4.4 citrus_viqr.c ../*.c +cp libVIQR.so.4.4 libVIQR.so.4 +cp libVIQR.so.4.4 libVIQR.so +gcc -fPIC -I.. -shared -Wl,-soname,libHZ.so.4 -o libHZ.so.4.4 citrus_hz.c ../*.c +cp libHZ.so.4.4 libHZ.so.4 +cp libHZ.so.4.4 libHZ.so ==== //depot/projects/soc2009/gabor_iconv/extracted/util/iconv/Makefile#2 (text+ko) ==== @@ -2,12 +2,29 @@ .include +.PATH: ../../lib + PROG= iconv -SRCS= iconv.c -CPPFLAGS+= -I. -I${.CURDIR} -I${NETBSDSRCDIR}/lib/libc +SRCS= iconv.c \ + _iconv.c \ + citrus_db.c \ + citrus_esdb.c \ + citrus_lookup.c \ + citrus_mmap.c \ + citrus_memstream.c \ + citrus_iconv.c \ + citrus_mapper.c \ + citrus_hash.c \ + citrus_module.c \ + citrus_bcs.c \ + citrus_bcs_strtol.c \ + citrus_db_hash.c +CFLAGS+= -I. -I${.CURDIR} -I../../lib MAN= iconv.1 -LDADD+=-lutil -DPADD+=${LIBUTIL} +WARNS?= 6 + +LDADD+=-lroken -lcrypt +DPADD+=${LIBROKEN} ${LIBCRYPT} .include ==== //depot/projects/soc2009/gabor_iconv/extracted/util/iconv/iconv.c#2 (text+ko) ==== @@ -45,7 +45,7 @@ static void usage(void) __unused; static int scmp(const void *, const void *); static void show_codesets(void); -static void do_conv(const char *, FILE *, const char *, const char *, int, int); +static void do_conv(FILE *, const char *, const char *, int, int); static void usage(void) @@ -90,7 +90,7 @@ #define INBUFSIZE 1024 #define OUTBUFSIZE (INBUFSIZE * 2) static void -do_conv(const char *fn, FILE *fp, const char *from, const char *to, int silent, +do_conv(FILE *fp, const char *from, const char *to, int silent, int hide_invalid) { char inbuf[INBUFSIZE], outbuf[OUTBUFSIZE], *out; @@ -215,14 +215,14 @@ opt_t = nl_langinfo(CODESET); if (argc == 0) - do_conv("", stdin, opt_f, opt_t, opt_s, opt_c); + do_conv(stdin, opt_f, opt_t, opt_s, opt_c); else { for (i = 0; i < argc; i++) { fp = fopen(argv[i], "r"); if (fp == NULL) err(EXIT_FAILURE, "Cannot open `%s'", argv[i]); - do_conv(argv[i], fp, opt_f, opt_t, opt_s, + do_conv(fp, opt_f, opt_t, opt_s, opt_c); (void)fclose(fp); } ==== //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/Makefile#2 (text+ko) ==== @@ -1,23 +1,23 @@ # $NetBSD: Makefile,v 1.6 2009/04/20 16:05:30 drochner Exp $ -NOMAN=# defined (must come before bsd.own.mk) +NO_MAN= yes .ifndef HOSTPROG .include .endif -.PATH: ${NETBSDSRCDIR}/lib/libc/citrus +.PATH: ../../lib PROG= mkcsmapper SRCS= yacc.y lex.l \ citrus_db_factory.c citrus_bcs.c citrus_db_hash.c \ citrus_lookup_factory.c citrus_pivot_factory.c -CPPFLAGS+= -I. -I${.CURDIR} -I${NETBSDSRCDIR}/lib/libc \ - -I${NETBSDSRCDIR}/lib/libc/citrus \ - -I${NETBSDSRCDIR}/lib/libc/citrus/modules \ +CFLAGS+= -I. -I../../lib \ -DHOSTPROG -DLIBC_SCCS -DYY_NO_INPUT YHEADER= 1 +WARNS?= 6 + .ifndef HOSTPROG .include .endif ==== //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/ldef.h#2 (text+ko) ==== @@ -26,6 +26,8 @@ * SUCH DAMAGE. */ +#include + typedef struct { u_int32_t begin; u_int32_t end; @@ -34,7 +36,6 @@ extern int line_number; extern int debug; -extern FILE *yyin; extern int yyparse(void); extern int yylex(void); extern int yyerror(const char *); ==== //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/lex.l#2 (text+ko) ==== @@ -49,6 +49,7 @@ int line_number = 1; %} +%option nounput %x COMMENT ==== //depot/projects/soc2009/gabor_iconv/extracted/util/mkcsmapper/yacc.y#2 (text+ko) ==== @@ -62,6 +62,8 @@ #include "citrus_lookup_factory.h" #include "citrus_pivot_factory.h" +extern FILE *yyin; + int debug = 0; static char *output = NULL; static void *table = NULL; @@ -685,8 +687,6 @@ main(int argc, char **argv) { int ch; - extern char *optarg; - extern int optind; FILE *in = NULL; int mkdb = 0, mkpv = 0; ==== //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/Makefile#2 (text+ko) ==== @@ -1,22 +1,23 @@ # $NetBSD: Makefile,v 1.6 2009/04/20 16:05:30 drochner Exp $ -NOMAN=# defined (must come before bsd.own.mk) +NO_MAN= yes .ifndef HOSTPROG .include .endif -.PATH: ${NETBSDSRCDIR}/lib/libc/citrus +.PATH: ../../lib PROG= mkesdb SRCS= yacc.y lex.l \ citrus_bcs.c citrus_db_factory.c citrus_db_hash.c \ citrus_lookup_factory.c -CPPFLAGS+= -I. -I${.CURDIR} -I${NETBSDSRCDIR}/lib/libc \ - -I${NETBSDSRCDIR}/lib/libc/citrus \ +CFLAGS+= -I. -I../../lib \ -DHOSTPROG -DLIBC_SCCS -DYY_NO_INPUT YHEADER= 1 +WARNS?= 6 + .ifndef HOSTPROG .include .endif ==== //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/ldef.h#2 (text+ko) ==== @@ -27,7 +27,6 @@ */ extern int line_number; -extern FILE *yyin; extern int yyparse(void); extern int yylex(void); extern int yyerror(const char *); ==== //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/lex.l#2 (text+ko) ==== @@ -44,12 +44,14 @@ #include #include #include +#include #include "ldef.h" #include "yacc.h" int line_number = 1; %} +%option nounput %x COMMENT ==== //depot/projects/soc2009/gabor_iconv/extracted/util/mkesdb/yacc.y#2 (text+ko) ==== @@ -57,6 +57,8 @@ #include "ldef.h" +extern FILE *yyin; + static int debug = 0, num_csids = 0; static char *output = NULL; static char *name, *encoding, *variable; @@ -301,8 +303,6 @@ main(int argc, char **argv) { int ch; - extern char *optarg; - extern int optind; FILE *in = NULL; int mkdb = 0; From owner-p4-projects@FreeBSD.ORG Thu Jun 4 18:19:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C8F2106567A; Thu, 4 Jun 2009 18:19: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 3745E1065674 for ; Thu, 4 Jun 2009 18:19:54 +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 183B98FC4D for ; Thu, 4 Jun 2009 18:19:54 +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 n54IJrZ7019758 for ; Thu, 4 Jun 2009 18:19:53 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54IJrDZ019756 for perforce@freebsd.org; Thu, 4 Jun 2009 18:19:53 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 4 Jun 2009 18:19:53 GMT Message-Id: <200906041819.n54IJrDZ019756@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 163509 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 18:19:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=163509 Change 163509 by truncs@aditya on 2009/06/04 18:19:50 Migration to new in-memory superblock continues. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_balloc.c#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_bitops.h#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_bmap.c#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_extern.h#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode.c#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_lookup.c#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_mount.h#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_readwrite.c#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_subr.c#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#5 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/fs.h#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/i386-bitops.h#2 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/inode.h#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/sparc64-bitops.h#2 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#4 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_balloc.c#2 (text+ko) ==== @@ -64,7 +64,7 @@ struct buf **bpp; int flags; { - struct ext2_sb_info *fs; + struct m_ext2fs *fs; int32_t nb; struct buf *bp, *nbp; struct vnode *vp = ITOV(ip); @@ -98,8 +98,8 @@ nb = ip->i_db[bn]; /* no new block is to be allocated, and no need to expand the file */ - if (nb != 0 && ip->i_size >= (bn + 1) * fs->s_blocksize) { - error = bread(vp, bn, fs->s_blocksize, NOCRED, &bp); + if (nb != 0 && ip->i_size >= (bn + 1) * fs->e2fs_bsize) { + error = bread(vp, bn, fs->e2fs_bsize, NOCRED, &bp); if (error) { brelse(bp); return (error); @@ -134,10 +134,10 @@ */ } } else { - if (ip->i_size < (bn + 1) * fs->s_blocksize) + if (ip->i_size < (bn + 1) * fs->e2fs_bsize) nsize = fragroundup(fs, size); else - nsize = fs->s_blocksize; + nsize = fs->e2fs_bsize; error = ext2_alloc(ip, bn, ext2_blkpref(ip, bn, (int)bn, &ip->i_db[0], 0), nsize, cred, &newb); @@ -186,11 +186,11 @@ pref = ext2_blkpref(ip, lbn, indirs[0].in_off + EXT2_NDIR_BLOCKS, &ip->i_db[0], 0); #endif - if ((error = ext2_alloc(ip, lbn, pref, (int)fs->s_blocksize, + if ((error = ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb)) != 0) return (error); nb = newb; - bp = getblk(vp, indirs[1].in_lbn, fs->s_blocksize, 0, 0, 0); + bp = getblk(vp, indirs[1].in_lbn, fs->e2fs_bsize, 0, 0, 0); bp->b_blkno = fsbtodb(fs, newb); vfs_bio_clrbuf(bp); /* @@ -198,7 +198,7 @@ * never point at garbage. */ if ((error = bwrite(bp)) != 0) { - ext2_blkfree(ip, nb, fs->s_blocksize); + ext2_blkfree(ip, nb, fs->e2fs_bsize); return (error); } ip->i_ib[indirs[0].in_off] = newb; @@ -209,7 +209,7 @@ */ for (i = 1;;) { error = bread(vp, - indirs[i].in_lbn, (int)fs->s_blocksize, NOCRED, &bp); + indirs[i].in_lbn, (int)fs->e2fs_bsize, NOCRED, &bp); if (error) { brelse(bp); return (error); @@ -237,12 +237,12 @@ pref = ext2_blkpref(ip, lbn, 0, (int32_t *)0, 0); #endif if ((error = - ext2_alloc(ip, lbn, pref, (int)fs->s_blocksize, cred, &newb)) != 0) { + ext2_alloc(ip, lbn, pref, (int)fs->e2fs_bsize, cred, &newb)) != 0) { brelse(bp); return (error); } nb = newb; - nbp = getblk(vp, indirs[i].in_lbn, fs->s_blocksize, 0, 0, 0); + nbp = getblk(vp, indirs[i].in_lbn, fs->e2fs_bsize, 0, 0, 0); nbp->b_blkno = fsbtodb(fs, nb); vfs_bio_clrbuf(nbp); /* @@ -250,7 +250,7 @@ * never point at garbage. */ if ((error = bwrite(nbp)) != 0) { - ext2_blkfree(ip, nb, fs->s_blocksize); + ext2_blkfree(ip, nb, fs->e2fs_bsize); brelse(bp); return (error); } @@ -272,12 +272,12 @@ pref = ext2_blkpref(ip, lbn, indirs[i].in_off, &bap[0], bp->b_lblkno); if ((error = ext2_alloc(ip, - lbn, pref, (int)fs->s_blocksize, cred, &newb)) != 0) { + lbn, pref, (int)fs->e2fs_bsize, cred, &newb)) != 0) { brelse(bp); return (error); } nb = newb; - nbp = getblk(vp, lbn, fs->s_blocksize, 0, 0, 0); + nbp = getblk(vp, lbn, fs->e2fs_bsize, 0, 0, 0); nbp->b_blkno = fsbtodb(fs, nb); if (flags & B_CLRBUF) vfs_bio_clrbuf(nbp); @@ -296,13 +296,13 @@ } brelse(bp); if (flags & B_CLRBUF) { - error = bread(vp, lbn, (int)fs->s_blocksize, NOCRED, &nbp); + error = bread(vp, lbn, (int)fs->e2fs_bsize, NOCRED, &nbp); if (error) { brelse(nbp); return (error); } } else { - nbp = getblk(vp, lbn, fs->s_blocksize, 0, 0, 0); + nbp = getblk(vp, lbn, fs->e2fs_bsize, 0, 0, 0); nbp->b_blkno = fsbtodb(fs, nb); } *bpp = nbp; ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_bitops.h#2 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_bmap.c#2 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_extern.h#2 (text+ko) ==== @@ -62,7 +62,7 @@ void ext2_itimes(struct vnode *vp); int ext2_reallocblks(struct vop_reallocblks_args *); int ext2_reclaim(struct vop_reclaim_args *); -void ext2_setblock(struct ext2_sb_info *, u_char *, int32_t); +void ext2_setblock(struct m_ext2fs *, u_char *, int32_t); int ext2_truncate(struct vnode *, off_t, int, struct ucred *, struct thread *); int ext2_update(struct vnode *, int); int ext2_valloc(struct vnode *, int, struct ucred *, struct vnode **); ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#4 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs_sb.h#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode.c#2 (text+ko) ==== @@ -71,7 +71,7 @@ struct vnode *vp; int waitfor; { - struct ext2_sb_info *fs; + struct m_ext2fs *fs; struct buf *bp; struct inode *ip; int error; @@ -86,7 +86,7 @@ fs = ip->i_e2fs; if ((error = bread(ip->i_devvp, fsbtodb(fs, ino_to_fsba(fs, ip->i_number)), - (int)fs->s_blocksize, NOCRED, &bp)) != 0) { + (int)fs->e2fs_bsize, NOCRED, &bp)) != 0) { brelse(bp); return (error); } @@ -120,7 +120,7 @@ struct inode *oip; int32_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR]; int32_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR]; - struct ext2_sb_info *fs; + struct m_ext2fs *fs; struct buf *bp; int offset, size, level; long count, nblocks, blocksreleased = 0; @@ -160,7 +160,7 @@ * value of oszie is 0, length will be at least 1. */ if (osize < length) { - if (length > oip->i_e2fs->fs_maxfilesize) + if (length > oip->i_e2fs->e2fs_maxfilesize) return (EFBIG); offset = blkoff(fs, length - 1); lbn = lblkno(fs, length - 1); @@ -213,11 +213,11 @@ * which we want to keep. Lastblock is -1 when * the file is truncated to 0. */ - lastblock = lblkno(fs, length + fs->s_blocksize - 1) - 1; + lastblock = lblkno(fs, length + fs->e2fs_bsize - 1) - 1; lastiblock[SINGLE] = lastblock - NDADDR; lastiblock[DOUBLE] = lastiblock[SINGLE] - NINDIR(fs); lastiblock[TRIPLE] = lastiblock[DOUBLE] - NINDIR(fs) * NINDIR(fs); - nblocks = btodb(fs->s_blocksize); + nblocks = btodb(fs->e2fs_bsize); /* * Update file and block pointers on disk before we start freeing * blocks. If we crash before free'ing blocks below, the blocks @@ -244,7 +244,7 @@ bcopy((caddr_t)&oip->i_db[0], (caddr_t)newblks, sizeof newblks); bcopy((caddr_t)oldblks, (caddr_t)&oip->i_db[0], sizeof oldblks); oip->i_size = osize; - error = vtruncbuf(ovp, cred, td, length, (int)fs->s_blocksize); + error = vtruncbuf(ovp, cred, td, length, (int)fs->e2fs_bsize); if (error && (allerror == 0)) allerror = error; @@ -362,7 +362,7 @@ long *countp; { struct buf *bp; - struct ext2_sb_info *fs = ip->i_e2fs; + struct m_ext2fs *fs = ip->i_e2fs; struct vnode *vp; int32_t *bap, *copy, nb, nlbn, last; long blkcount, factor; @@ -380,7 +380,7 @@ last = lastbn; if (lastbn > 0) last /= factor; - nblocks = btodb(fs->s_blocksize); + nblocks = btodb(fs->e2fs_bsize); /* * Get buffer of block pointers, zero those entries corresponding * to blocks to be free'd, and update on disk copy first. Since @@ -390,7 +390,7 @@ * explicitly instead of letting bread do everything for us. */ vp = ITOV(ip); - bp = getblk(vp, lbn, (int)fs->s_blocksize, 0, 0, 0); + bp = getblk(vp, lbn, (int)fs->e2fs_bsize, 0, 0, 0); if (bp->b_flags & (B_DONE | B_DELWRI)) { } else { bp->b_iocmd = BIO_READ; @@ -409,8 +409,8 @@ } bap = (int32_t *)bp->b_data; - copy = malloc(fs->s_blocksize, M_TEMP, M_WAITOK); - bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->s_blocksize); + copy = malloc(fs->e2fs_bsize, M_TEMP, M_WAITOK); + bcopy((caddr_t)bap, (caddr_t)copy, (u_int)fs->e2fs_bsize); bzero((caddr_t)&bap[last + 1], (u_int)(NINDIR(fs) - (last + 1)) * sizeof (int32_t)); if (last == -1) @@ -434,7 +434,7 @@ allerror = error; blocksreleased += blkcount; } - ext2_blkfree(ip, nb, fs->s_blocksize); + ext2_blkfree(ip, nb, fs->e2fs_bsize); blocksreleased += nblocks; } ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#2 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#2 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_lookup.c#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_mount.h#2 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_readwrite.c#2 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_subr.c#2 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#5 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/fs.h#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/i386-bitops.h#2 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/inode.h#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/sparc64-bitops.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 4 19:06:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3009B1065678; Thu, 4 Jun 2009 19:06:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9C651065675 for ; Thu, 4 Jun 2009 19:06:41 +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 B86F68FC16 for ; Thu, 4 Jun 2009 19:06:41 +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 n54J6fug025192 for ; Thu, 4 Jun 2009 19:06:41 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54J6foW025190 for perforce@freebsd.org; Thu, 4 Jun 2009 19:06:41 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 4 Jun 2009 19:06:41 GMT Message-Id: <200906041906.n54J6foW025190@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 163511 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 19:06:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=163511 Change 163511 by truncs@aditya on 2009/06/04 19:06:37 Migration. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#3 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#3 (text+ko) ==== @@ -72,20 +72,20 @@ unsigned int block_group, unsigned long bitmap_nr) { - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; struct ext2_group_desc * gdp; struct buffer_head * bh; int error; gdp = get_group_desc (mp, block_group, NULL); if ((error = bread (VFSTOEXT2(mp)->um_devvp, - fsbtodb(sb, gdp->bg_block_bitmap),sb->s_blocksize, NOCRED, &bh)) != 0) + fsbtodb(sb, gdp->bg_block_bitmap),sb->e2fs_bsize, NOCRED, &bh)) != 0) panic ( "read_block_bitmap: " "Cannot read block bitmap - " "block_group = %d, block_bitmap = %lu", block_group, (unsigned long) gdp->bg_block_bitmap); - sb->s_block_bitmap_number[bitmap_nr] = block_group; - sb->s_block_bitmap[bitmap_nr] = bh; + sb->e2fs_bbn[bitmap_nr] = block_group; + sb->e2fs_bb[bitmap_nr] = bh; LCK_BUF(bh) } @@ -104,19 +104,19 @@ unsigned int block_group) { int i, j; - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; unsigned long block_bitmap_number; struct buffer_head * block_bitmap; - if (block_group >= sb->s_groups_count) + if (block_group >= sb->e2fs_gcount) panic ( "load_block_bitmap: " "block_group >= groups_count - " "block_group = %d, groups_count = %lu", - block_group, sb->s_groups_count); + block_group, sb->e2fs_gcount); - if (sb->s_groups_count <= EXT2_MAX_GROUP_LOADED) { - if (sb->s_block_bitmap[block_group]) { - if (sb->s_block_bitmap_number[block_group] != + if (sb->e2fs_gcount <= EXT2_MAX_GROUP_LOADED) { + if (sb->e2fs_bb[block_group]) { + if (sb->e2fs_bbn[block_group] != block_group) panic ( "load_block_bitmap: " "block_group != block_bitmap_number"); @@ -128,32 +128,32 @@ } } - for (i = 0; i < sb->s_loaded_block_bitmaps && - sb->s_block_bitmap_number[i] != block_group; i++) + for (i = 0; i < sb->e2fs_lbb && + sb->e2fs_bbn[i] != block_group; i++) ; - if (i < sb->s_loaded_block_bitmaps && - sb->s_block_bitmap_number[i] == block_group) { - block_bitmap_number = sb->s_block_bitmap_number[i]; - block_bitmap = sb->s_block_bitmap[i]; + if (i < sb->e2fs_lbb && + sb->e2fs_bbn[i] == block_group) { + block_bitmap_number = sb->e2fs_bbn[i]; + block_bitmap = sb->e2fs_bb[i]; for (j = i; j > 0; j--) { - sb->s_block_bitmap_number[j] = - sb->s_block_bitmap_number[j - 1]; - sb->s_block_bitmap[j] = - sb->s_block_bitmap[j - 1]; + sb->e2fs_bbn[j] = + sb->e2fs_bbn[j - 1]; + sb->e2fs_bb[j] = + sb->e2fs_bb[j - 1]; } - sb->s_block_bitmap_number[0] = block_bitmap_number; - sb->s_block_bitmap[0] = block_bitmap; + sb->e2fs_bbn[0] = block_bitmap_number; + sb->e2fs_bb[0] = block_bitmap; } else { - if (sb->s_loaded_block_bitmaps < EXT2_MAX_GROUP_LOADED) - sb->s_loaded_block_bitmaps++; + if (sb->e2fs_lbb < EXT2_MAX_GROUP_LOADED) + sb->e2fs_lbb++; else - ULCK_BUF(sb->s_block_bitmap[EXT2_MAX_GROUP_LOADED - 1]) + ULCK_BUF(sb->e2fs_bb[EXT2_MAX_GROUP_LOADED - 1]) - for (j = sb->s_loaded_block_bitmaps - 1; j > 0; j--) { - sb->s_block_bitmap_number[j] = - sb->s_block_bitmap_number[j - 1]; - sb->s_block_bitmap[j] = - sb->s_block_bitmap[j - 1]; + for (j = sb->e2fs_lbb - 1; j > 0; j--) { + sb->e2fs_bbn[j] = + sb->e2fs_bbn[j - 1]; + sb->e2fs_bb[j] = + sb->e2fs_bb[j - 1]; } read_block_bitmap (mp, block_group, 0); } @@ -163,14 +163,14 @@ static __inline int load_block_bitmap (struct mount * mp, unsigned int block_group) { - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; - if (sb->s_loaded_block_bitmaps > 0 && - sb->s_block_bitmap_number[0] == block_group) + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; + if (sb->e2fs_lbb > 0 && + sb->e2fs_bbn[0] == block_group) return 0; - if (sb->s_groups_count <= EXT2_MAX_GROUP_LOADED && - sb->s_block_bitmap_number[block_group] == block_group && - sb->s_block_bitmap[block_group]) + if (sb->e2fs_gcount <= EXT2_MAX_GROUP_LOADED && + sb->e2fs_bbn[block_group] == block_group && + sb->e2fs_bb[block_group]) return block_group; return load__block_bitmap (mp, block_group); @@ -179,7 +179,7 @@ void ext2_free_blocks (struct mount * mp, unsigned long block, unsigned long count) { - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; struct buffer_head * bh; struct buffer_head * bh2; unsigned long block_group; @@ -193,7 +193,7 @@ printf ("ext2_free_blocks: nonexistent device"); return; } - es = sb->s_es; + es = sb->e2fs; lock_super (VFSTOEXT2(mp)->um_devvp); if (block < es->s_first_data_block || (block + count) > es->s_blocks_count) { @@ -215,7 +215,7 @@ "Block = %lu, count = %lu", block, count); bitmap_nr = load_block_bitmap (mp, block_group); - bh = sb->s_block_bitmap[bitmap_nr]; + bh = sb->e2fs_bb[bitmap_nr]; gdp = get_group_desc (mp, block_group, &bh2); if (/* test_opt (sb, CHECK_STRICT) && assume always strict ! */ @@ -249,7 +249,7 @@ wait_on_buffer (bh); } ****/ - sb->s_dirt = 1; + sb->e2fs_fmod = 1; unlock_super (VFSTOEXT2(mp)->um_devvp); return; } @@ -265,7 +265,7 @@ u_int32_t * prealloc_count, u_int32_t * prealloc_block) { - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; struct buffer_head * bh; struct buffer_head * bh2; char * p, * r; @@ -281,7 +281,7 @@ printf ("ext2_new_block: nonexistent device"); return 0; } - es = sb->s_es; + es = sb->e2fs; lock_super (VFSTOEXT2(mp)->um_devvp); ext2_debug ("goal=%lu.\n", goal); @@ -301,7 +301,7 @@ goal_attempts++; #endif bitmap_nr = load_block_bitmap (mp, i); - bh = sb->s_block_bitmap[bitmap_nr]; + bh = sb->e2fs_bb[bitmap_nr]; ext2_debug ("goal is at %d:%d.\n", i, j); @@ -360,20 +360,20 @@ * Now search the rest of the groups. We assume that * i and gdp correctly point to the last group visited. */ - for (k = 0; k < sb->s_groups_count; k++) { + for (k = 0; k < sb->e2fs_gcount; k++) { i++; - if (i >= sb->s_groups_count) + if (i >= sb->e2fs_gcount) i = 0; gdp = get_group_desc (mp, i, &bh2); if (gdp->bg_free_blocks_count > 0) break; } - if (k >= sb->s_groups_count) { + if (k >= sb->e2fs_gcount) { unlock_super (VFSTOEXT2(mp)->um_devvp); return 0; } bitmap_nr = load_block_bitmap (mp, i); - bh = sb->s_block_bitmap[bitmap_nr]; + bh = sb->e2fs_bb[bitmap_nr]; r = memscan(bh->b_data, 0, EXT2_BLOCKS_PER_GROUP(sb) >> 3); j = (r - bh->b_data) << 3; @@ -462,7 +462,7 @@ gdp->bg_free_blocks_count--; mark_buffer_dirty(bh2); es->s_free_blocks_count--; - sb->s_dirt = 1; + sb->e2fs_fmod = 1; unlock_super (VFSTOEXT2(mp)->um_devvp); return j; } @@ -470,7 +470,7 @@ #ifdef unused static unsigned long ext2_count_free_blocks (struct mount * mp) { - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; #ifdef EXT2FS_DEBUG struct ext2_super_block * es; unsigned long desc_count, bitmap_count, x; @@ -479,16 +479,16 @@ int i; lock_super (VFSTOEXT2(mp)->um_devvp); - es = sb->s_es; + es = sb->e2fs; desc_count = 0; bitmap_count = 0; gdp = NULL; - for (i = 0; i < sb->s_groups_count; i++) { + for (i = 0; i < sb->e2fs_gcount; i++) { gdp = get_group_desc (mp, i, NULL); desc_count += gdp->bg_free_blocks_count; bitmap_nr = load_block_bitmap (mp, i); - x = ext2_count_free (sb->s_block_bitmap[bitmap_nr], - sb->s_blocksize); + x = ext2_count_free (sb->e2fs_bb[bitmap_nr], + sb->e2fs_bsize); ext2_debug ("group %d: stored = %d, counted = %lu\n", i, gdp->bg_free_blocks_count, x); bitmap_count += x; @@ -498,16 +498,16 @@ unlock_super (VFSTOEXT2(mp)->um_devvp); return bitmap_count; #else - return sb->s_es->s_free_blocks_count; + return sb->e2fs->s_free_blocks_count; #endif } #endif /* unused */ static __inline int block_in_use (unsigned long block, - struct ext2_sb_info * sb, + struct m_ext2fs * sb, unsigned char * map) { - return test_bit ((block - sb->s_es->s_first_data_block) % + return test_bit ((block - sb->e2fs->s_first_data_block) % EXT2_BLOCKS_PER_GROUP(sb), map); } @@ -533,7 +533,7 @@ #ifdef unused static void ext2_check_blocks_bitmap (struct mount * mp) { - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; struct buffer_head * bh; struct ext2_super_block * es; unsigned long desc_count, bitmap_count, x; @@ -543,17 +543,17 @@ int i, j; lock_super (VFSTOEXT2(mp)->um_devvp); - es = sb->s_es; + es = sb->e2fs; desc_count = 0; bitmap_count = 0; gdp = NULL; - desc_blocks = (sb->s_groups_count + EXT2_DESC_PER_BLOCK(sb) - 1) / + desc_blocks = (sb->e2fs_gcount + EXT2_DESC_PER_BLOCK(sb) - 1) / EXT2_DESC_PER_BLOCK(sb); - for (i = 0; i < sb->s_groups_count; i++) { + for (i = 0; i < sb->e2fs_gcount; i++) { gdp = get_group_desc (mp, i, NULL); desc_count += gdp->bg_free_blocks_count; bitmap_nr = load_block_bitmap (mp, i); - bh = sb->s_block_bitmap[bitmap_nr]; + bh = sb->e2fs_bb[bitmap_nr]; if (!(es->s_feature_ro_compat & EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) || From owner-p4-projects@FreeBSD.ORG Thu Jun 4 19:11:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9D7E1065678; Thu, 4 Jun 2009 19:11:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4D6F91065675 for ; Thu, 4 Jun 2009 19:11:47 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AC028FC08 for ; Thu, 4 Jun 2009 19:11:47 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54JBlQY025629 for ; Thu, 4 Jun 2009 19:11:47 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54JBkrb025627 for perforce@freebsd.org; Thu, 4 Jun 2009 19:11:46 GMT (envelope-from nikron@FreeBSD.org) Date: Thu, 4 Jun 2009 19:11:46 GMT Message-Id: <200906041911.n54JBkrb025627@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163512 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 19:11:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=163512 Change 163512 by nikron@nmfreebsd on 2009/06/04 19:11:29 Update NetworkManager with upstream. Affected files ... .. //depot/projects/soc2009/nm-port/NetworkManager/AUTHORS#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/CONTRIBUTING#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/COPYING#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/ChangeLog#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/MAINTAINERS#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/NEWS#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/NetworkManager.pc.in#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/README#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/TODO#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/autogen.sh#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-avahi-autoipd.conf#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/org.freedesktop.nm_dispatcher.service.in#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/configure.ac#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib-docs.sgml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib.types#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/include/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/include/nm-glib-compat.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/include/wireless-helper.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Arch/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Debian/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/networkmanager.in#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/NetworkManager.in#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/all.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/errors.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-access-point.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-active-connection.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-bt.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-cdma.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-ethernet.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-gsm.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-serial.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-wifi.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-manager-client.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-vpn-plugin.xml#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm-glib-test.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.ver#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-settings-system.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-private.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-types-private.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto_nss.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.pc.in#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.ver#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-wireless.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/certs/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/m4/compiler_warnings.m4#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/man/nm-tool.1.in#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal-main.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal.list#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/POTFILES.skip#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/ar.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/bs.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/ca.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/cs.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/de.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/dz.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/en_CA.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/en_GB.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/et.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/eu.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/hr.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/it.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/pl.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/rw.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/sl.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/sv.po#4 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/uk.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/wa.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/zh_CN.po#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/policy/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/policy/org.freedesktop.network-manager-settings.system.policy.in#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/NetworkManagerSystem.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerArch.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGentoo.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerMandriva.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerSlackware.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-dhclient.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-manager.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/named-manager/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-private.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-manager.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/tests/test-supplicant-config.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/tests/test-dhcp-options.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-connection.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/common.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/plugin.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/shvar.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifupdown/interface_parser.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/io/writer.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/main.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.h#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/test/nm-dhcp-opt-test.c#2 edit .. //depot/projects/soc2009/nm-port/NetworkManager/tools/doc-generator.xsl#2 edit Differences ... ==== //depot/projects/soc2009/nm-port/NetworkManager/AUTHORS#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/CONTRIBUTING#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/COPYING#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/ChangeLog#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/MAINTAINERS#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/NEWS#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/NetworkManager.pc.in#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/README#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/TODO#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/autogen.sh#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-avahi-autoipd.conf#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/callouts/org.freedesktop.nm_dispatcher.service.in#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/configure.ac#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib-docs.sgml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib.types#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/include/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/include/nm-glib-compat.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/include/wireless-helper.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/Arch/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/Debian/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/networkmanager.in#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/NetworkManager.in#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/all.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/errors.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-access-point.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-active-connection.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-bt.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-cdma.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-ethernet.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-gsm.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-serial.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-wifi.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-manager-client.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-vpn-plugin.xml#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm-glib-test.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.ver#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-settings-system.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-private.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-types-private.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto_nss.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.pc.in#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.ver#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-wireless.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/certs/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/m4/compiler_warnings.m4#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/man/nm-tool.1.in#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal-main.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal.list#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/POTFILES.skip#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/ar.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/bs.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/ca.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/cs.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/de.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/dz.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/en_CA.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/en_GB.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/et.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/eu.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/hr.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/it.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/pl.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/rw.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/sl.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/sv.po#4 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/uk.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/wa.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/zh_CN.po#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/policy/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/policy/org.freedesktop.network-manager-settings.system.policy.in#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/NetworkManagerSystem.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerArch.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGentoo.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerMandriva.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerSlackware.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-dhclient.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-manager.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/named-manager/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-private.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-manager.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/tests/test-supplicant-config.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/tests/test-dhcp-options.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-connection.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/common.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/plugin.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/shvar.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifupdown/interface_parser.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/io/writer.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/main.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.h#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/test/nm-dhcp-opt-test.c#2 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/tools/doc-generator.xsl#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 4 19:12:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B54C11065672; Thu, 4 Jun 2009 19:12:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 73A0D106564A for ; Thu, 4 Jun 2009 19:12:48 +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 632348FC1F for ; Thu, 4 Jun 2009 19:12:48 +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 n54JCmCd025702 for ; Thu, 4 Jun 2009 19:12:48 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54JCmxo025700 for perforce@freebsd.org; Thu, 4 Jun 2009 19:12:48 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 4 Jun 2009 19:12:48 GMT Message-Id: <200906041912.n54JCmxo025700@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 163513 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 19:12:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=163513 Change 163513 by truncs@aditya on 2009/06/04 19:12:35 Added comments. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#5 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#5 (text+ko) ==== @@ -491,10 +491,10 @@ int32_t e2fs_isize; /* Size of inode */ uint8_t e2fs_lib; /* Loaded inode bitmap */ uint8_t e2fs_lbb; /* Loaded block bitmap */ - uint32_t e2fs_ibn[EXT2_MAX_GROUP_LOADED]; - struct buf * e2fs_ib[EXT2_MAX_GROUP_LOADED]; - uint32_t e2fs_bbn[EXT2_MAX_GROUP_LOADED]; - struct buf * e2fs_bb[EXT2_MAX_GROUP_LOADED]; + uint32_t e2fs_ibn[EXT2_MAX_GROUP_LOADED]; /* Inode bitmap number */ + struct buf * e2fs_ib[EXT2_MAX_GROUP_LOADED];/* Inode bitmap */ + uint32_t e2fs_bbn[EXT2_MAX_GROUP_LOADED]; /* Block bitmap number */ + struct buf * e2fs_bb[EXT2_MAX_GROUP_LOADED];/* Block bitmap */ uint32_t e2fs_mount_opt; uint32_t e2fs_blocksize_bits; char e2fs_wasvalid; /* valid at mount time */ From owner-p4-projects@FreeBSD.ORG Thu Jun 4 19:34:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA9641065674; Thu, 4 Jun 2009 19:34:10 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 621B91065672 for ; Thu, 4 Jun 2009 19:34:10 +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 5077A8FC0A for ; Thu, 4 Jun 2009 19:34:10 +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 n54JY9w1027350 for ; Thu, 4 Jun 2009 19:34:09 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54JY9sD027348 for perforce@freebsd.org; Thu, 4 Jun 2009 19:34:09 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 4 Jun 2009 19:34:09 GMT Message-Id: <200906041934.n54JY9sD027348@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 163514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 19:34:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=163514 Change 163514 by truncs@aditya on 2009/06/04 19:33:17 Migration. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#3 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#3 (text+ko) ==== @@ -79,28 +79,28 @@ unsigned int block_group, struct buffer_head ** bh) { - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; unsigned long group_desc; unsigned long desc; struct ext2_group_desc * gdp; - if (block_group >= sb->s_groups_count) + if (block_group >= sb->e2fs_gcount) panic ("get_group_desc: " "block_group >= groups_count - " "block_group = %d, groups_count = %lu", - block_group, sb->s_groups_count); + block_group, sb->e2fs_gcount); group_desc = block_group / EXT2_DESC_PER_BLOCK(sb); desc = block_group % EXT2_DESC_PER_BLOCK(sb); - if (!sb->s_group_desc[group_desc]) + if (!sb->e2fs_group_desc[group_desc]) panic ( "get_group_desc:" "Group descriptor not loaded - " "block_group = %d, group_desc = %lu, desc = %lu", block_group, group_desc, desc); gdp = (struct ext2_group_desc *) - sb->s_group_desc[group_desc]->b_data; + sb->e2fs_group_desc[group_desc]->b_data; if (bh) - *bh = sb->s_group_desc[group_desc]; + *bh = sb->e2fs_group_desc[group_desc]; return gdp + desc; } @@ -108,7 +108,7 @@ unsigned long block_group, unsigned int bitmap_nr) { - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; struct ext2_group_desc * gdp; struct buffer_head * bh; int error; @@ -116,14 +116,14 @@ gdp = get_group_desc (mp, block_group, NULL); if ((error = bread (VFSTOEXT2(mp)->um_devvp, fsbtodb(sb, gdp->bg_inode_bitmap), - sb->s_blocksize, + sb->e2fs_bsize, NOCRED, &bh)) != 0) panic ( "read_inode_bitmap:" "Cannot read inode bitmap - " "block_group = %lu, inode_bitmap = %lu", block_group, (unsigned long) gdp->bg_inode_bitmap); - sb->s_inode_bitmap_number[bitmap_nr] = block_group; - sb->s_inode_bitmap[bitmap_nr] = bh; + sb->e2fs_ibn[bitmap_nr] = block_group; + sb->e2fs_ib[bitmap_nr] = bh; LCK_BUF(bh) } @@ -141,22 +141,22 @@ static int load_inode_bitmap (struct mount * mp, unsigned int block_group) { - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; int i, j; unsigned long inode_bitmap_number; struct buffer_head * inode_bitmap; - if (block_group >= sb->s_groups_count) + if (block_group >= sb->e2fs_gcount) panic ("load_inode_bitmap:" "block_group >= groups_count - " "block_group = %d, groups_count = %lu", - block_group, sb->s_groups_count); - if (sb->s_loaded_inode_bitmaps > 0 && - sb->s_inode_bitmap_number[0] == block_group) + block_group, sb->e2fs_gcount); + if (sb->e2fs_lib > 0 && + sb->e2fs_ibn[0] == block_group) return 0; - if (sb->s_groups_count <= EXT2_MAX_GROUP_LOADED) { - if (sb->s_inode_bitmap[block_group]) { - if (sb->s_inode_bitmap_number[block_group] != + if (sb->e2fs_gcount <= EXT2_MAX_GROUP_LOADED) { + if (sb->e2fs_ib[block_group]) { + if (sb->e2fs_ibn[block_group] != block_group) panic ( "load_inode_bitmap:" "block_group != inode_bitmap_number"); @@ -168,32 +168,32 @@ } } - for (i = 0; i < sb->s_loaded_inode_bitmaps && - sb->s_inode_bitmap_number[i] != block_group; + for (i = 0; i < sb->e2fs_lib && + sb->e2fs_ibn[i] != block_group; i++) ; - if (i < sb->s_loaded_inode_bitmaps && - sb->s_inode_bitmap_number[i] == block_group) { - inode_bitmap_number = sb->s_inode_bitmap_number[i]; - inode_bitmap = sb->s_inode_bitmap[i]; + if (i < sb->e2fs_lib && + sb->e2fs_ibn[i] == block_group) { + inode_bitmap_number = sb->e2fs_ibn[i]; + inode_bitmap = sb->e2fs_ib[i]; for (j = i; j > 0; j--) { - sb->s_inode_bitmap_number[j] = - sb->s_inode_bitmap_number[j - 1]; - sb->s_inode_bitmap[j] = - sb->s_inode_bitmap[j - 1]; + sb->e2fs_ibn[j] = + sb->e2fs_ibn[j - 1]; + sb->e2fs_ib[j] = + sb->e2fs_ib[j - 1]; } - sb->s_inode_bitmap_number[0] = inode_bitmap_number; - sb->s_inode_bitmap[0] = inode_bitmap; + sb->e2fs_ibn[0] = inode_bitmap_number; + sb->e2fs_ib[0] = inode_bitmap; } else { - if (sb->s_loaded_inode_bitmaps < EXT2_MAX_GROUP_LOADED) - sb->s_loaded_inode_bitmaps++; + if (sb->e2fs_lib < EXT2_MAX_GROUP_LOADED) + sb->e2fs_lib++; else - ULCK_BUF(sb->s_inode_bitmap[EXT2_MAX_GROUP_LOADED - 1]) - for (j = sb->s_loaded_inode_bitmaps - 1; j > 0; j--) { - sb->s_inode_bitmap_number[j] = - sb->s_inode_bitmap_number[j - 1]; - sb->s_inode_bitmap[j] = - sb->s_inode_bitmap[j - 1]; + ULCK_BUF(sb->e2fs_ib[EXT2_MAX_GROUP_LOADED - 1]) + for (j = sb->e2fs_lib - 1; j > 0; j--) { + sb->e2fs_ibn[j] = + sb->e2fs_ibn[j - 1]; + sb->e2fs_ib[j] = + sb->e2fs_ib[j - 1]; } read_inode_bitmap (mp, block_group, 0); } @@ -203,7 +203,7 @@ void ext2_free_inode (struct inode * inode) { - struct ext2_sb_info * sb; + struct m_ext2fs * sb; struct buffer_head * bh; struct buffer_head * bh2; unsigned long block_group; @@ -226,16 +226,16 @@ sb = inode->i_e2fs; lock_super (DEVVP(inode)); if (inode->i_number < EXT2_FIRST_INO(sb) || - inode->i_number > sb->s_es->s_inodes_count) { + inode->i_number > sb->e2fs->s_inodes_count) { printf ("free_inode reserved inode or nonexistent inode"); unlock_super (DEVVP(inode)); return; } - es = sb->s_es; + es = sb->e2fs; block_group = (inode->i_number - 1) / EXT2_INODES_PER_GROUP(sb); bit = (inode->i_number - 1) % EXT2_INODES_PER_GROUP(sb); bitmap_nr = load_inode_bitmap (ITOV(inode)->v_mount, block_group); - bh = sb->s_inode_bitmap[bitmap_nr]; + bh = sb->e2fs_ib[bitmap_nr]; if (!clear_bit (bit, bh->b_data)) printf ( "ext2_free_inode:" "bit already cleared for inode %lu", @@ -255,7 +255,7 @@ wait_on_buffer (bh); } ***/ - sb->s_dirt = 1; + sb->e2fs_fmod = 1; unlock_super (DEVVP(inode)); } @@ -276,7 +276,7 @@ inode_block = gdp->bg_inode_table + (((inode->i_number - 1) % EXT2_INODES_PER_GROUP(inode->i_sb)) / EXT2_INODES_PER_BLOCK(inode->i_sb)); - bh = bread (inode->i_sb->s_dev, inode_block, inode->i_sb->s_blocksize); + bh = bread (inode->i_sb->s_dev, inode_block, inode->i_sb->e2fs_bsize); if (!bh) { printf ("inc_inode_version Cannot load inode table block - " "inode=%lu, inode_block=%lu\n", @@ -310,7 +310,7 @@ */ ino_t ext2_new_inode (const struct inode * dir, int mode) { - struct ext2_sb_info * sb; + struct m_ext2fs * sb; struct buffer_head * bh; struct buffer_head * bh2; int i, j, avefreei; @@ -324,16 +324,16 @@ sb = dir->i_e2fs; lock_super (DEVVP(dir)); - es = sb->s_es; + es = sb->e2fs; repeat: gdp = NULL; i=0; if (S_ISDIR(mode)) { avefreei = es->s_free_inodes_count / - sb->s_groups_count; + sb->e2fs_gcount; /* I am not yet convinced that this next bit is necessary. i = dir->u.ext2_i.i_block_group; - for (j = 0; j < sb->u.ext2_sb.s_groups_count; j++) { + for (j = 0; j < sb->u.ext2_sb.e2fs_gcount; j++) { tmp = get_group_desc (sb, i, &bh2); if ((tmp->bg_used_dirs_count << 8) < tmp->bg_free_inodes_count) { @@ -341,11 +341,11 @@ break; } else - i = ++i % sb->u.ext2_sb.s_groups_count; + i = ++i % sb->u.ext2_sb.e2fs_gcount; } */ if (!gdp) { - for (j = 0; j < sb->s_groups_count; j++) { + for (j = 0; j < sb->e2fs_gcount; j++) { tmp = get_group_desc(ITOV(dir)->v_mount,j,&bh2); if (tmp->bg_free_inodes_count && tmp->bg_free_inodes_count >= avefreei) { @@ -374,10 +374,10 @@ * Use a quadratic hash to find a group with a * free inode */ - for (j = 1; j < sb->s_groups_count; j <<= 1) { + for (j = 1; j < sb->e2fs_gcount; j <<= 1) { i += j; - if (i >= sb->s_groups_count) - i -= sb->s_groups_count; + if (i >= sb->e2fs_gcount) + i -= sb->e2fs_gcount; tmp = get_group_desc(ITOV(dir)->v_mount,i,&bh2); if (tmp->bg_free_inodes_count) { gdp = tmp; @@ -390,8 +390,8 @@ * That failed: try linear search for a free inode */ i = dir->i_block_group + 1; - for (j = 2; j < sb->s_groups_count; j++) { - if (++i >= sb->s_groups_count) + for (j = 2; j < sb->e2fs_gcount; j++) { + if (++i >= sb->e2fs_gcount) i = 0; tmp = get_group_desc(ITOV(dir)->v_mount,i,&bh2); if (tmp->bg_free_inodes_count) { @@ -407,7 +407,7 @@ return 0; } bitmap_nr = load_inode_bitmap (ITOV(dir)->v_mount, i); - bh = sb->s_inode_bitmap[bitmap_nr]; + bh = sb->e2fs_ib[bitmap_nr]; if ((j = find_first_zero_bit ((unsigned long *) bh->b_data, EXT2_INODES_PER_GROUP(sb))) < EXT2_INODES_PER_GROUP(sb)) { @@ -448,7 +448,7 @@ mark_buffer_dirty(bh2); es->s_free_inodes_count--; /* mark_buffer_dirty(sb->u.ext2_sb.s_sbh, 1); */ - sb->s_dirt = 1; + sb->e2fs_fmod = 1; unlock_super (DEVVP(dir)); return j; } @@ -457,7 +457,7 @@ static unsigned long ext2_count_free_inodes (struct mount * mp) { #ifdef EXT2FS_DEBUG - struct ext2_sb_info *sb = VFSTOEXT2(mp)->um_e2fs; + struct m_ext2fs *sb = VFSTOEXT2(mp)->um_e2fs; struct ext2_super_block * es; unsigned long desc_count, bitmap_count, x; int bitmap_nr; @@ -465,15 +465,15 @@ int i; lock_super (VFSTOEXT2(mp)->um_devvp); - es = sb->s_es; + es = sb->e2fs; desc_count = 0; bitmap_count = 0; gdp = NULL; - for (i = 0; i < sb->s_groups_count; i++) { + for (i = 0; i < sb->e2fs_gcount; i++) { gdp = get_group_desc (mp, i, NULL); desc_count += gdp->bg_free_inodes_count; bitmap_nr = load_inode_bitmap (mp, i); - x = ext2_count_free (sb->s_inode_bitmap[bitmap_nr], + x = ext2_count_free (sb->e2fs_ib[bitmap_nr], EXT2_INODES_PER_GROUP(sb) / 8); ext2_debug ("group %d: stored = %d, counted = %lu\n", i, gdp->bg_free_inodes_count, x); @@ -499,15 +499,15 @@ int i; lock_super (sb); - es = sb->u.ext2_sb.s_es; + es = sb->u.ext2_sb.e2fs; desc_count = 0; bitmap_count = 0; gdp = NULL; - for (i = 0; i < sb->u.ext2_sb.s_groups_count; i++) { + for (i = 0; i < sb->u.ext2_sb.e2fs_gcount; i++) { gdp = get_group_desc (sb, i, NULL); desc_count += gdp->bg_free_inodes_count; bitmap_nr = load_inode_bitmap (sb, i); - x = ext2_count_free (sb->u.ext2_sb.s_inode_bitmap[bitmap_nr], + x = ext2_count_free (sb->u.ext2_sb.e2fs_ib[bitmap_nr], EXT2_INODES_PER_GROUP(sb) / 8); if (gdp->bg_free_inodes_count != x) printf ( "ext2_check_inodes_bitmap:" From owner-p4-projects@FreeBSD.ORG Thu Jun 4 19:45:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 528D71065694; Thu, 4 Jun 2009 19:45:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EE951065680 for ; Thu, 4 Jun 2009 19:45:22 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EFF868FC1C for ; Thu, 4 Jun 2009 19:45:21 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54JjLMe028227 for ; Thu, 4 Jun 2009 19:45:21 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54JjL2d028225 for perforce@freebsd.org; Thu, 4 Jun 2009 19:45:21 GMT (envelope-from nikron@FreeBSD.org) Date: Thu, 4 Jun 2009 19:45:21 GMT Message-Id: <200906041945.n54JjL2d028225@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 19:45:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=163515 Change 163515 by nikron@nmfreebsd on 2009/06/04 19:45:11 Change configure.ac to recognize freebad. Affected files ... .. //depot/projects/soc2009/nm-port/NetworkManager/AUTHORS#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/CONTRIBUTING#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/COPYING#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/ChangeLog#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/MAINTAINERS#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/NEWS#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/NetworkManager.pc.in#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/README#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/TODO#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/autogen.sh#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-avahi-autoipd.conf#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/callouts/org.freedesktop.nm_dispatcher.service.in#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/configure.ac#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib-docs.sgml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib.types#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/include/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/include/nm-glib-compat.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/include/wireless-helper.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Arch/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Debian/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/networkmanager.in#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/NetworkManager.in#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/all.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/errors.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-access-point.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-active-connection.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-bt.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-cdma.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-ethernet.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-gsm.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-serial.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-wifi.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-manager-client.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-vpn-plugin.xml#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm-glib-test.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.ver#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-settings-system.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-private.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-types-private.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto_nss.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.pc.in#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.ver#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-wireless.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/certs/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/m4/compiler_warnings.m4#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/man/nm-tool.1.in#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal-main.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal.list#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/POTFILES.skip#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/ar.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/bs.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/ca.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/cs.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/de.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/dz.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/en_CA.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/en_GB.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/et.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/eu.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/hr.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/it.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/pl.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/rw.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/sl.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/sv.po#5 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/uk.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/wa.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/po/zh_CN.po#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/policy/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/policy/org.freedesktop.network-manager-settings.system.policy.in#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/NetworkManagerSystem.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerArch.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGentoo.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerMandriva.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerSlackware.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-dhclient.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-manager.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/named-manager/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-private.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-manager.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/tests/test-supplicant-config.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/tests/test-dhcp-options.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-connection.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/common.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/plugin.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/shvar.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifupdown/interface_parser.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/io/writer.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/main.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.h#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/test/nm-dhcp-opt-test.c#3 edit .. //depot/projects/soc2009/nm-port/NetworkManager/tools/doc-generator.xsl#3 edit Differences ... ==== //depot/projects/soc2009/nm-port/NetworkManager/AUTHORS#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/CONTRIBUTING#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/COPYING#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/ChangeLog#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/MAINTAINERS#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/NEWS#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/NetworkManager.pc.in#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/README#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/TODO#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/autogen.sh#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-avahi-autoipd.conf#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/callouts/nm-dispatcher-action.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/callouts/org.freedesktop.nm_dispatcher.service.in#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/configure.ac#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib-docs.sgml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/docs/libnm-glib/libnm-glib.types#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-kernel.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/gfilemonitor/inotify-sub.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/include/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/include/nm-glib-compat.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/include/wireless-helper.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/Arch/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/Debian/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/Mandriva/networkmanager.in#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/initscript/paldo/NetworkManager.in#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/all.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/errors.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-access-point.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-active-connection.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-bt.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-cdma.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-ethernet.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-gsm.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-serial.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-device-wifi.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-manager-client.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/introspection/nm-vpn-plugin.xml#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm-glib-test.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/libnm_glib.ver#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-client.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-settings-system.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-dbus-utils.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-gsm-device.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-cache.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-object-private.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-serial-device.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-settings.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-types-private.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-connection.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-glib/nm-vpn-plugin.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/crypto_nss.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.pc.in#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/libnm-util.ver#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-param-spec-specialized.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-pppoe.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-vpn.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/nm-setting-wireless.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/tests/certs/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/m4/compiler_warnings.m4#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/man/nm-tool.1.in#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal-main.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/marshallers/nm-marshal.list#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/POTFILES.skip#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/ar.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/bs.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/ca.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/cs.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/de.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/dz.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/en_CA.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/en_GB.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/et.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/eu.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/hr.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/it.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/pl.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/rw.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/sl.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/sv.po#5 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/uk.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/wa.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/po/zh_CN.po#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/policy/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/policy/org.freedesktop.network-manager-settings.system.policy.in#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/NetworkManagerSystem.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerArch.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGeneric.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerGentoo.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerMandriva.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/backends/NetworkManagerSlackware.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/bluez-manager/nm-bluez-device.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-dhclient.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/dhcp-manager/nm-dhcp-manager.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem-gsm.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/modem-manager/nm-modem.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/named-manager/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-ethernet.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-device-private.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-gsm-device.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/nm-logging.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/gnome-keyring-md5.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-config.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-interface.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-manager.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/nm-supplicant-settings-verify.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/supplicant-manager/tests/test-supplicant-config.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/tests/test-dhcp-options.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-connection.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/vpn-manager/nm-vpn-service.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/src/wpa.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/common.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/nm-ifcfg-connection.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/plugin.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/sha1.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/shvar.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-onboot-no#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-open-ssid-quoted#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wep-eap-ttls-chap#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wifi-wpa-psk-adhoc#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-dhcp#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-global-gateway#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-static#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/network-scripts/keys-test-wifi-wpa-psk-adhoc#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/parser.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifcfg-suse/shvar.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/ifupdown/interface_parser.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/io/writer.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/nm-keyfile-connection.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/plugin.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Makefile.am#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/plugins/keyfile/tests/keyfiles/Test_Wireless_Connection#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/dbus-settings.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/main.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/system-settings/src/nm-polkit-helpers.h#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/test/nm-dhcp-opt-test.c#3 (text+ko) ==== ==== //depot/projects/soc2009/nm-port/NetworkManager/tools/doc-generator.xsl#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 4 19:47:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84068106572E; Thu, 4 Jun 2009 19:47: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 3FA35106572B for ; Thu, 4 Jun 2009 19:47:24 +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 2CFCA8FC23 for ; Thu, 4 Jun 2009 19:47:24 +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 n54JlOGf028380 for ; Thu, 4 Jun 2009 19:47:24 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54JlNHU028378 for perforce@freebsd.org; Thu, 4 Jun 2009 19:47:23 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 4 Jun 2009 19:47:23 GMT Message-Id: <200906041947.n54JlNHU028378@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 163516 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 19:47:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=163516 Change 163516 by thompsa@thompsa_burger on 2009/06/04 19:47:02 Checkpoint buffer WIP. Basic operation works, many things broken. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umoscom.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uplcom.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uslcom.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvisor.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvscom.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/urio.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_controller.h#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.h#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.h#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.h#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uath.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgt.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_ural.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtw.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#7 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#8 (text+ko) ==== @@ -70,7 +70,7 @@ ((uint8_t *)&(((ehci_softc_t *)0)->sc_bus)))) #if USB_DEBUG -static int ehcidebug = 100; +static int ehcidebug = 0; static int ehcinohighspeed = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci"); @@ -956,6 +956,10 @@ { struct usb_pipe *pipe = urb->ub_pipe; + USB_BUS_LOCK_ASSERT(pipe->bus, MA_OWNED); + + pipe->urb_curr = urb; + /* check for early completion */ if (ehci_check_transfer(urb)) { return; @@ -1132,7 +1136,7 @@ uint32_t status; uint16_t len; - td = urb->td_transfer_cache; + td = pipe->td_transfer_cache; td_alt_next = td->alt_next; if (urb->aframes != urb->nframes) { @@ -1158,7 +1162,7 @@ urb->frlengths[urb->aframes] += td->len - len; } /* Check for last transfer */ - if (((void *)td) == urb->td_transfer_last) { + if (((void *)td) == pipe->td_transfer_last) { td = NULL; break; } @@ -1170,7 +1174,7 @@ } /* Check for short transfer */ if (len > 0) { - if (urb->flags_int.short_frames_ok) { + if (pipe->flags_int.short_frames_ok) { /* follow alt next */ td = td->alt_next; } else { @@ -1189,7 +1193,7 @@ /* update transfer cache */ - urb->td_transfer_cache = td; + pipe->td_transfer_cache = td; /* update data toggle */ @@ -1229,23 +1233,23 @@ if (ehcidebug > 10) { ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); - ehci_dump_sqtds(sc, urb->td_transfer_first); + ehci_dump_sqtds(sc, pipe->td_transfer_first); } #endif /* reset scanner */ - urb->td_transfer_cache = urb->td_transfer_first; + pipe->td_transfer_cache = pipe->td_transfer_first; - if (urb->flags_int.control_xfr) { + if (pipe->flags_int.control_xfr) { - if (urb->flags_int.control_hdr) { + if (pipe->flags_int.control_hdr) { err = ehci_non_isoc_done_sub(urb); } urb->aframes = 1; - if (urb->td_transfer_cache == NULL) { + if (pipe->td_transfer_cache == NULL) { goto done; } } @@ -1254,13 +1258,13 @@ err = ehci_non_isoc_done_sub(urb); urb->aframes++; - if (urb->td_transfer_cache == NULL) { + if (pipe->td_transfer_cache == NULL) { goto done; } } - if (urb->flags_int.control_xfr && - !urb->flags_int.control_act) { + if (pipe->flags_int.control_xfr && + !pipe->flags_int.control_act) { err = ehci_non_isoc_done_sub(urb); } @@ -1279,7 +1283,7 @@ ehci_check_transfer(struct usb_urb *urb) { struct usb_pipe *pipe = urb->ub_pipe; - struct usb_pipe_methods *methods = pipe->endpoint->methods; + struct usb_pipe_methods *methods = pipe->methods; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); uint32_t status; @@ -1291,13 +1295,13 @@ /* isochronous full speed transfer */ - td = urb->td_transfer_last; + td = pipe->td_transfer_last; usb2_pc_cpu_invalidate(td->page_cache); status = hc32toh(sc, td->sitd_status); /* also check if first is complete */ - td = urb->td_transfer_first; + td = pipe->td_transfer_first; usb2_pc_cpu_invalidate(td->page_cache); status |= hc32toh(sc, td->sitd_status); @@ -1310,7 +1314,7 @@ /* isochronous high speed transfer */ - td = urb->td_transfer_last; + td = pipe->td_transfer_last; usb2_pc_cpu_invalidate(td->page_cache); status = td->itd_status[0] | td->itd_status[1] | @@ -1319,7 +1323,7 @@ td->itd_status[6] | td->itd_status[7]; /* also check first transfer */ - td = urb->td_transfer_first; + td = pipe->td_transfer_first; usb2_pc_cpu_invalidate(td->page_cache); status |= td->itd_status[0] | td->itd_status[1] | @@ -1341,7 +1345,7 @@ * check whether there is an error somewhere in the middle, * or whether there was a short packet (SPD and not ACTIVE) */ - td = urb->td_transfer_cache; + td = pipe->td_transfer_cache; while (1) { usb2_pc_cpu_invalidate(td->page_cache); @@ -1352,13 +1356,13 @@ */ if (status & EHCI_QTD_ACTIVE) { /* update cache */ - urb->td_transfer_cache = td; + pipe->td_transfer_cache = td; goto done; } /* * last transfer descriptor makes the transfer done */ - if (((void *)td) == urb->td_transfer_last) { + if (((void *)td) == pipe->td_transfer_last) { break; } /* @@ -1372,7 +1376,7 @@ * packet also makes the transfer done */ if (EHCI_QTD_GET_BYTES(status)) { - if (urb->flags_int.short_frames_ok) { + if (pipe->flags_int.short_frames_ok) { /* follow alt next */ if (td->alt_next) { td = td->alt_next; @@ -1551,6 +1555,7 @@ td = temp->td; td_next = temp->td_next; + //printf("%s: td %p td_next %p td_nextnext %p\n", __func__, td, td_next, td_next->obj_next); while (1) { @@ -1583,6 +1588,7 @@ td = td_next; td_next = td->obj_next; + //printf("%s1: td %p td_next %p\n", __func__, td, td_next); /* check if we are pre-computing */ @@ -1684,6 +1690,7 @@ } if (precompute) { + //printf("done precompute\n"); precompute = 0; /* setup alt next pointer, if any */ @@ -1730,21 +1737,22 @@ temp.sc = EHCI_BUS2SC(pipe->xroot->bus); /* toggle the DMA set we are using */ - urb->flags_int.curr_dma_set ^= 1; + pipe->curr_dma_set ^= 1; /* get next DMA set */ - td = urb->td_start[urb->flags_int.curr_dma_set]; + td = pipe->td_start[pipe->curr_dma_set]; - urb->td_transfer_first = td; - urb->td_transfer_cache = td; + KASSERT(td != NULL, ("td is null, dma = %d", pipe->curr_dma_set)); + pipe->td_transfer_first = td; + pipe->td_transfer_cache = td; temp.td = NULL; temp.td_next = td; temp.qtd_status = 0; temp.last_frame = 0; - temp.setup_alt_next = urb->flags_int.short_frames_ok; + temp.setup_alt_next = pipe->flags_int.short_frames_ok; - if (urb->flags_int.control_xfr) { + if (pipe->flags_int.control_xfr) { if (pipe->endpoint->toggle_next) { /* DATA1 is next */ temp.qtd_status |= @@ -1762,8 +1770,8 @@ } /* check if we should prepend a setup message */ - if (urb->flags_int.control_xfr) { - if (urb->flags_int.control_hdr) { + if (pipe->flags_int.control_xfr) { + if (pipe->flags_int.control_hdr) { temp.qtd_status &= htohc32(temp.sc, EHCI_QTD_SET_CERR(3)); @@ -1778,7 +1786,7 @@ /* check for last frame */ if (urb->nframes == 1) { /* no STATUS stage yet, SETUP is last */ - if (urb->flags_int.control_act) { + if (pipe->flags_int.control_act) { temp.last_frame = 1; temp.setup_alt_next = 0; } @@ -1800,9 +1808,9 @@ x++; if (x == urb->nframes) { - if (urb->flags_int.control_xfr) { + if (pipe->flags_int.control_xfr) { /* no STATUS stage yet, DATA is last */ - if (urb->flags_int.control_act) { + if (pipe->flags_int.control_act) { temp.last_frame = 1; temp.setup_alt_next = 0; } @@ -1844,8 +1852,8 @@ /* check if we should append a status stage */ - if (urb->flags_int.control_xfr && - !urb->flags_int.control_act) { + if (pipe->flags_int.control_xfr && + !pipe->flags_int.control_act) { /* * Send a DATA1 message and invert the current endpoint @@ -1882,20 +1890,20 @@ /* must have at least one frame! */ - urb->td_transfer_last = td; + pipe->td_transfer_last = td; #if USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", pipe->endpoint->toggle_next); ehci_dump_sqtds(temp.sc, - urb->td_transfer_first); + pipe->td_transfer_first); } #endif - methods = pipe->endpoint->methods; + methods = pipe->methods; - qh = urb->qh_start[urb->flags_int.curr_dma_set]; + qh = pipe->qh_start[pipe->curr_dma_set]; /* the "qh_link" field is filled when the QH is added */ @@ -1955,7 +1963,7 @@ htohc32(temp.sc, EHCI_QTD_SET_TOGGLE(1)); } } - td = urb->td_transfer_first; + td = pipe->td_transfer_first; qh->qh_qtd.qtd_next = td->qtd_self; qh->qh_qtd.qtd_altnext = @@ -2003,7 +2011,7 @@ uint32_t status; uint32_t *plen = urb->frlengths; uint16_t len = 0; - ehci_sitd_t *td = urb->td_transfer_first; + ehci_sitd_t *td = pipe->td_transfer_first; ehci_sitd_t **pp_last = &sc->sc_isoc_fs_p_last[pipe->qh_pos]; DPRINTFN(13, "urb=%p endpoint=%p transfer done\n", @@ -2058,7 +2066,7 @@ uint32_t *plen = urb->frlengths; uint16_t len = 0; uint8_t td_no = 0; - ehci_itd_t *td = urb->td_transfer_first; + ehci_itd_t *td = pipe->td_transfer_first; ehci_itd_t **pp_last = &sc->sc_isoc_hs_p_last[pipe->qh_pos]; DPRINTFN(13, "urb=%p endpoint=%p transfer done\n", @@ -2122,7 +2130,7 @@ ehci_device_done(struct usb_urb *urb, usb_error_t error) { struct usb_pipe *pipe = urb->ub_pipe; - struct usb_pipe_methods *methods = pipe->endpoint->methods; + struct usb_pipe_methods *methods = pipe->methods; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); @@ -2130,6 +2138,12 @@ DPRINTFN(2, "urb=%p, endpoint=%p, error=%d\n", urb, pipe->endpoint, error); + if (urb != pipe->urb_curr) { + printf("urb %p wasnt the current one\n", urb); + usb2_transfer_done(urb, error); + return; + } + if ((methods == &ehci_device_bulk_methods) || (methods == &ehci_device_ctrl_methods)) { #if USB_DEBUG @@ -2137,59 +2151,106 @@ DPRINTF("nexttog=%d; data after transfer:\n", pipe->endpoint->toggle_next); ehci_dump_sqtds(sc, - urb->td_transfer_first); + pipe->td_transfer_first); } #endif - EHCI_REMOVE_QH(urb->qh_start[urb->flags_int.curr_dma_set], + EHCI_REMOVE_QH(pipe->qh_start[pipe->curr_dma_set], sc->sc_async_p_last); } if (methods == &ehci_device_intr_methods) { - EHCI_REMOVE_QH(urb->qh_start[urb->flags_int.curr_dma_set], + EHCI_REMOVE_QH(pipe->qh_start[pipe->curr_dma_set], sc->sc_intr_p_last[pipe->qh_pos]); } /* * Only finish isochronous transfers once which will update * "urb->frlengths". */ - if (urb->td_transfer_first && - urb->td_transfer_last) { + if (pipe->td_transfer_first && + pipe->td_transfer_last) { if (methods == &ehci_device_isoc_fs_methods) { ehci_isoc_fs_done(sc, urb); } if (methods == &ehci_device_isoc_hs_methods) { ehci_isoc_hs_done(sc, urb); } - urb->td_transfer_first = NULL; - urb->td_transfer_last = NULL; + pipe->td_transfer_first = NULL; + pipe->td_transfer_last = NULL; } - /* dequeue transfer and start next transfer */ + pipe->urb_curr = NULL; + /* dequeue transfer */ usb2_transfer_done(urb, error); + + /* Load next */ + urb = TAILQ_FIRST(&pipe->urb_xmit_q); + if (error == 0 && urb != NULL) { + printf("LOAD NEXT %p\n", urb); + TAILQ_REMOVE(&pipe->urb_xmit_q, urb, ub_next); + error = (pipe->methods->load)(urb); + if (error) + usb2_transfer_done(urb, error); + } } -/*------------------------------------------------------------------------* - * ehci bulk support - *------------------------------------------------------------------------*/ static void -ehci_device_bulk_open(struct usb_urb *urb) +ehci_urb_load(struct usb_urb *urb) { - return; + struct usb_pipe *pipe = urb->ub_pipe; + usb_error_t error; + + USB_BUS_LOCK(pipe->bus); + + if (pipe->urb_curr != NULL || TAILQ_FIRST(&pipe->urb_xmit_q) != NULL) { + TAILQ_INSERT_TAIL(&pipe->urb_xmit_q, urb, ub_next); + USB_BUS_UNLOCK(pipe->bus); + return; + } + + /* Rock n' Roll */ + error = (pipe->methods->load)(urb); + USB_BUS_UNLOCK(pipe->bus); + if (error) + usb2_transfer_done(urb, error); } static void -ehci_device_bulk_close(struct usb_urb *urb) +ehci_pipe_unload(struct usb_pipe *pipe) { - ehci_device_done(urb, USB_ERR_CANCELLED); + struct usb_urb *urb; + + USB_BUS_LOCK_ASSERT(pipe->bus, MA_OWNED); + + if (pipe->urb_curr != NULL) { + ehci_device_done(pipe->urb_curr, USB_ERR_CANCELLED); + pipe->urb_curr = NULL; + } + /* Flush queued urbs */ + while ((urb = TAILQ_FIRST(&pipe->urb_xmit_q)) != NULL) { + TAILQ_REMOVE(&pipe->urb_xmit_q, urb, ub_next); + usb2_transfer_done(urb, USB_ERR_CANCELLED); + } } +/*------------------------------------------------------------------------* + * ehci bulk support + *------------------------------------------------------------------------*/ static void -ehci_device_bulk_enter(struct usb_urb *urb) +ehci_device_bulk_open(struct usb_pipe *pipe) { + KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); return; } static void -ehci_device_bulk_start(struct usb_urb *urb) +ehci_device_bulk_close(struct usb_pipe *pipe) +{ + USB_BUS_LOCK(pipe->bus); + ehci_pipe_unload(pipe); + USB_BUS_UNLOCK(pipe->bus); +} + +static usb_error_t +ehci_device_bulk_load(struct usb_urb *urb) { struct usb_pipe *pipe = urb->ub_pipe; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); @@ -2208,40 +2269,41 @@ temp = EOREAD4(sc, EHCI_USBCMD); if (!(temp & EHCI_CMD_IAAD)) EOWRITE4(sc, EHCI_USBCMD, temp | EHCI_CMD_IAAD); + + /* put transfer on interrupt queue */ + ehci_transfer_intr_enqueue(urb); + return (0); } struct usb_pipe_methods ehci_device_bulk_methods = { .open = ehci_device_bulk_open, .close = ehci_device_bulk_close, - .enter = ehci_device_bulk_enter, - .start = ehci_device_bulk_start, + .enqueue = ehci_urb_load, + .load = ehci_device_bulk_load, }; /*------------------------------------------------------------------------* * ehci control support *------------------------------------------------------------------------*/ static void -ehci_device_ctrl_open(struct usb_urb *urb) +ehci_device_ctrl_open(struct usb_pipe *pipe) { + KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); return; } static void -ehci_device_ctrl_close(struct usb_urb *urb) +ehci_device_ctrl_close(struct usb_pipe *pipe) { - ehci_device_done(urb, USB_ERR_CANCELLED); + USB_BUS_LOCK(pipe->bus); + ehci_pipe_unload(pipe); + USB_BUS_UNLOCK(pipe->bus); } -static void -ehci_device_ctrl_enter(struct usb_urb *urb) +static usb_error_t +ehci_device_ctrl_load(struct usb_urb *urb) { - return; -} - -static void -ehci_device_ctrl_start(struct usb_urb *urb) -{ struct usb_pipe *pipe = urb->ub_pipe; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); @@ -2250,31 +2312,34 @@ /* put transfer on interrupt queue */ ehci_transfer_intr_enqueue(urb); + return (0); } struct usb_pipe_methods ehci_device_ctrl_methods = { .open = ehci_device_ctrl_open, .close = ehci_device_ctrl_close, - .enter = ehci_device_ctrl_enter, - .start = ehci_device_ctrl_start, + .enqueue = ehci_urb_load, + .load = ehci_device_ctrl_load, }; /*------------------------------------------------------------------------* * ehci interrupt support *------------------------------------------------------------------------*/ static void -ehci_device_intr_open(struct usb_urb *urb) +ehci_device_intr_open(struct usb_pipe *pipe) { - struct usb_pipe *pipe = urb->ub_pipe; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); uint16_t best; uint16_t bit; uint16_t x; uint8_t slot; + KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); + /* Allocate a microframe slot first: */ + USB_BUS_LOCK(pipe->bus); slot = usb2_intr_schedule_adjust (pipe->xroot->udev, pipe->max_frame_size, USB_HS_MICRO_FRAMES_MAX); @@ -2312,34 +2377,30 @@ sc->sc_intr_stat[best]++; pipe->qh_pos = best; + USB_BUS_UNLOCK(pipe->bus); DPRINTFN(3, "best=%d interval=%d\n", best, pipe->interval); } static void -ehci_device_intr_close(struct usb_urb *urb) +ehci_device_intr_close(struct usb_pipe *pipe) { - struct usb_pipe *pipe = urb->ub_pipe; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); uint8_t slot; + USB_BUS_LOCK(pipe->bus); slot = usb2_intr_schedule_adjust (pipe->xroot->udev, -(pipe->max_frame_size), pipe->usb2_uframe); sc->sc_intr_stat[pipe->qh_pos]--; - ehci_device_done(urb, USB_ERR_CANCELLED); + ehci_pipe_unload(pipe); + USB_BUS_UNLOCK(pipe->bus); } -static void -ehci_device_intr_enter(struct usb_urb *urb) -{ - return; -} - -static void -ehci_device_intr_start(struct usb_urb *urb) +static usb_error_t +ehci_device_intr_load(struct usb_urb *urb) { struct usb_pipe *pipe = urb->ub_pipe; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); @@ -2349,28 +2410,31 @@ /* put transfer on interrupt queue */ ehci_transfer_intr_enqueue(urb); + return (0); } struct usb_pipe_methods ehci_device_intr_methods = { .open = ehci_device_intr_open, .close = ehci_device_intr_close, - .enter = ehci_device_intr_enter, - .start = ehci_device_intr_start, + .enqueue = ehci_urb_load, + .load = ehci_device_intr_load, }; /*------------------------------------------------------------------------* * ehci full speed isochronous support *------------------------------------------------------------------------*/ static void -ehci_device_isoc_fs_open(struct usb_urb *urb) +ehci_device_isoc_fs_open(struct usb_pipe *pipe) { - struct usb_pipe *pipe = urb->ub_pipe; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); ehci_sitd_t *td; uint32_t sitd_portaddr; uint8_t ds; + KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); + + USB_BUS_LOCK(pipe->bus); sitd_portaddr = EHCI_SITD_SET_ADDR(pipe->address) | EHCI_SITD_SET_ENDPT(UE_GET_ADDR(pipe->endpointno)) | @@ -2386,7 +2450,7 @@ for (ds = 0; ds != 2; ds++) { - for (td = urb->td_start[ds]; td; td = td->obj_next) { + for (td = pipe->td_start[ds]; td; td = td->obj_next) { td->sitd_portaddr = sitd_portaddr; @@ -2402,16 +2466,19 @@ usb2_pc_cpu_flush(td->page_cache); } } + USB_BUS_UNLOCK(pipe->bus); } static void -ehci_device_isoc_fs_close(struct usb_urb *urb) +ehci_device_isoc_fs_close(struct usb_pipe *pipe) { - ehci_device_done(urb, USB_ERR_CANCELLED); + USB_BUS_LOCK(pipe->bus); + ehci_pipe_unload(pipe); + USB_BUS_UNLOCK(pipe->bus); } -static void -ehci_device_isoc_fs_enter(struct usb_urb *urb) +static usb_error_t +ehci_device_isoc_fs_load(struct usb_urb *urb) { struct usb_page_search buf_res; struct usb_pipe *pipe = urb->ub_pipe; @@ -2488,11 +2555,11 @@ plen = urb->frlengths; /* toggle the DMA set we are using */ - urb->flags_int.curr_dma_set ^= 1; + pipe->curr_dma_set ^= 1; /* get next DMA set */ - td = urb->td_start[urb->flags_int.curr_dma_set]; - urb->td_transfer_first = td; + td = pipe->td_start[pipe->curr_dma_set]; + pipe->td_transfer_first = td; pp_last = &sc->sc_isoc_fs_p_last[pipe->endpoint->isoc_next]; @@ -2622,45 +2689,44 @@ td = td->obj_next; } - urb->td_transfer_last = td_last; + pipe->td_transfer_last = td_last; /* update isoc_next */ pipe->endpoint->isoc_next = (pp_last - &sc->sc_isoc_fs_p_last[0]) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); -} -static void -ehci_device_isoc_fs_start(struct usb_urb *urb) -{ /* put transfer on interrupt queue */ ehci_transfer_intr_enqueue(urb); + return (0); } struct usb_pipe_methods ehci_device_isoc_fs_methods = { .open = ehci_device_isoc_fs_open, .close = ehci_device_isoc_fs_close, - .enter = ehci_device_isoc_fs_enter, - .start = ehci_device_isoc_fs_start, + .enqueue = ehci_urb_load, + .load = ehci_device_isoc_fs_load, }; /*------------------------------------------------------------------------* * ehci high speed isochronous support *------------------------------------------------------------------------*/ static void -ehci_device_isoc_hs_open(struct usb_urb *urb) +ehci_device_isoc_hs_open(struct usb_pipe *pipe) { - struct usb_pipe *pipe = urb->ub_pipe; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); ehci_itd_t *td; uint32_t temp; uint8_t ds; + KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); + /* initialize all TD's */ + USB_BUS_LOCK(pipe->bus); for (ds = 0; ds != 2; ds++) { - for (td = urb->td_start[ds]; td; td = td->obj_next) { + for (td = pipe->td_start[ds]; td; td = td->obj_next) { /* set TD inactive */ td->itd_status[0] = 0; @@ -2693,16 +2759,19 @@ usb2_pc_cpu_flush(td->page_cache); } } + USB_BUS_UNLOCK(pipe->bus); } static void -ehci_device_isoc_hs_close(struct usb_urb *urb) +ehci_device_isoc_hs_close(struct usb_pipe *pipe) { - ehci_device_done(urb, USB_ERR_CANCELLED); + USB_BUS_LOCK(pipe->bus); + ehci_pipe_unload(pipe); + USB_BUS_UNLOCK(pipe->bus); } -static void -ehci_device_isoc_hs_enter(struct usb_urb *urb) +static usb_error_t +ehci_device_isoc_hs_load(struct usb_urb *urb) { struct usb_page_search buf_res; struct usb_pipe *pipe = urb->ub_pipe; @@ -2776,11 +2845,11 @@ plen = urb->frlengths; /* toggle the DMA set we are using */ - urb->flags_int.curr_dma_set ^= 1; + pipe->curr_dma_set ^= 1; /* get next DMA set */ - td = urb->td_start[urb->flags_int.curr_dma_set]; - urb->td_transfer_first = td; + td = pipe->td_start[pipe->curr_dma_set]; + pipe->td_transfer_first = td; pp_last = &sc->sc_isoc_hs_p_last[pipe->endpoint->isoc_next]; @@ -2890,26 +2959,23 @@ } } - urb->td_transfer_last = td_last; + pipe->td_transfer_last = td_last; /* update isoc_next */ pipe->endpoint->isoc_next = (pp_last - &sc->sc_isoc_hs_p_last[0]) & (EHCI_VIRTUAL_FRAMELIST_COUNT - 1); -} -static void -ehci_device_isoc_hs_start(struct usb_urb *urb) -{ /* put transfer on interrupt queue */ ehci_transfer_intr_enqueue(urb); + return (0); } struct usb_pipe_methods ehci_device_isoc_hs_methods = { .open = ehci_device_isoc_hs_open, .close = ehci_device_isoc_hs_close, - .enter = ehci_device_isoc_hs_enter, - .start = ehci_device_isoc_hs_start, + .enqueue = ehci_urb_load, + .load = ehci_device_isoc_hs_load, }; /*------------------------------------------------------------------------* @@ -3420,7 +3486,7 @@ /* * compute maximum number of some structures */ - if (parm->methods == &ehci_device_ctrl_methods) { + if (pipe->methods == &ehci_device_ctrl_methods) { /* * The proof for the "nqtd" formula is illustrated like @@ -3454,28 +3520,28 @@ parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = EHCI_QTD_PAYLOAD_MAX; - (&pipe->urb0)->flags_int.bdma_enable = 1; + pipe->flags_int.bdma_enable = 1; usb2_transfer_setup_sub(parm); nqh = 1; - nqtd = ((2 * (&pipe->urb0)->nframes) + 1 /* STATUS */ + nqtd = ((2 * pipe->nframes) + 1 /* STATUS */ + (pipe->max_data_length / pipe->max_hc_frame_size)); - } else if (parm->methods == &ehci_device_bulk_methods) { + } else if (pipe->methods == &ehci_device_bulk_methods) { parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = EHCI_QTD_PAYLOAD_MAX; - (&pipe->urb0)->flags_int.bdma_enable = 1; + pipe->flags_int.bdma_enable = 1; usb2_transfer_setup_sub(parm); nqh = 1; - nqtd = ((2 * (&pipe->urb0)->nframes) + nqtd = ((2 * pipe->nframes) + (pipe->max_data_length / pipe->max_hc_frame_size)); - } else if (parm->methods == &ehci_device_intr_methods) { + } else if (pipe->methods == &ehci_device_intr_methods) { if (parm->speed == USB_SPEED_HIGH) { parm->hc_max_packet_size = 0x400; @@ -3489,35 +3555,35 @@ } parm->hc_max_frame_size = EHCI_QTD_PAYLOAD_MAX; - (&pipe->urb0)->flags_int.bdma_enable = 1; + pipe->flags_int.bdma_enable = 1; usb2_transfer_setup_sub(parm); nqh = 1; - nqtd = ((2 * (&pipe->urb0)->nframes) + nqtd = ((2 * pipe->nframes) + (pipe->max_data_length / pipe->max_hc_frame_size)); - } else if (parm->methods == &ehci_device_isoc_fs_methods) { + } else if (pipe->methods == &ehci_device_isoc_fs_methods) { parm->hc_max_packet_size = 0x3FF; parm->hc_max_packet_count = 1; parm->hc_max_frame_size = 0x3FF; - (&pipe->urb0)->flags_int.bdma_enable = 1; + pipe->flags_int.bdma_enable = 1; usb2_transfer_setup_sub(parm); - nsitd = (&pipe->urb0)->nframes; + nsitd = pipe->nframes; - } else if (parm->methods == &ehci_device_isoc_hs_methods) { + } else if (pipe->methods == &ehci_device_isoc_hs_methods) { parm->hc_max_packet_size = 0x400; parm->hc_max_packet_count = 3; parm->hc_max_frame_size = 0xC00; - (&pipe->urb0)->flags_int.bdma_enable = 1; + pipe->flags_int.bdma_enable = 1; usb2_transfer_setup_sub(parm); - nitd = ((&pipe->urb0)->nframes + 7) / 8; + nitd = (pipe->nframes + 7) / 8; } else { @@ -3610,7 +3676,7 @@ usb2_pc_cpu_flush(pc + n); } } - (&pipe->urb0)->td_start[(&pipe->urb0)->flags_int.curr_dma_set] = last_obj; + pipe->td_start[pipe->curr_dma_set] = last_obj; last_obj = NULL; @@ -3638,10 +3704,10 @@ usb2_pc_cpu_flush(pc + n); } } - (&pipe->urb0)->qh_start[(&pipe->urb0)->flags_int.curr_dma_set] = last_obj; + pipe->qh_start[pipe->curr_dma_set] = last_obj; - if (!(&pipe->urb0)->flags_int.curr_dma_set) { - (&pipe->urb0)->flags_int.curr_dma_set = 1; + if (!pipe->curr_dma_set) { + pipe->curr_dma_set = 1; goto alloc_dma_set; } } @@ -3653,8 +3719,8 @@ } static void -ehci_pipe_init(struct usb_device *udev, struct usb_endpoint_descriptor *edesc, - struct usb_endpoint *ep) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 4 19:52:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 274A01065674; Thu, 4 Jun 2009 19:52: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 D8FE91065670 for ; Thu, 4 Jun 2009 19:52:29 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C853E8FC1A for ; Thu, 4 Jun 2009 19:52:29 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54JqTQq028741 for ; Thu, 4 Jun 2009 19:52:29 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54JqTN0028739 for perforce@freebsd.org; Thu, 4 Jun 2009 19:52:29 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 19:52:29 GMT Message-Id: <200906041952.n54JqTN0028739@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 163517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 19:52:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=163517 Change 163517 by zec@zec_amdx4 on 2009/06/04 19:51:45 Garbage collect if_reassign(). Affected files ... .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#30 edit Differences ... ==== //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#30 (text+ko) ==== @@ -623,8 +623,6 @@ int ieee80211_vap_attach(struct ieee80211vap *, ifm_change_cb_t, ifm_stat_cb_t); void ieee80211_vap_detach(struct ieee80211vap *); -void ieee80211_reassign(struct ieee80211vap *, struct vnet *, char *); - const struct ieee80211_rateset *ieee80211_get_suprates(struct ieee80211com *ic, const struct ieee80211_channel *); void ieee80211_announce(struct ieee80211com *); From owner-p4-projects@FreeBSD.ORG Thu Jun 4 20:00:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 563401065675; Thu, 4 Jun 2009 20:00: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 152FC1065670; Thu, 4 Jun 2009 20:00:41 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211]) by mx1.freebsd.org (Postfix) with ESMTP id A90998FC16; Thu, 4 Jun 2009 20:00:40 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id E44FE1CC2E; Thu, 4 Jun 2009 22:00:39 +0200 (CEST) Date: Thu, 4 Jun 2009 22:00:39 +0200 From: Ed Schouten To: Nikhil Bysani Message-ID: <20090604200039.GH48776@hoeg.nl> References: <200906041945.n54JjL2d028225@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7DP64HymKb+JCWvF" Content-Disposition: inline In-Reply-To: <200906041945.n54JjL2d028225@repoman.freebsd.org> User-Agent: Mutt/1.5.19 (2009-01-05) Cc: Perforce Change Reviews Subject: Re: PERFORCE change 163515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 20:00:42 -0000 --7DP64HymKb+JCWvF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Nikhil Bysani wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D163515 >=20 > Change 163515 by nikron@nmfreebsd on 2009/06/04 19:45:11 >=20 > Change configure.ac to recognize freebad. >=20 > Affected files ... >=20 > .. //depot/projects/soc2009/nm-port/NetworkManager/AUTHORS#3 edit > Woops! Be sure to only `p4 edit' files you actually change. Perforce isn't smart enough to figure out you didn't actually change the file contents... --=20 Ed Schouten WWW: http://80386.nl/ --7DP64HymKb+JCWvF Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkooJ+cACgkQ52SDGA2eCwVbWwCdGHQvxpl4gPyyhR9WluCWF/4E 8OcAnA6RamLimPEPs6vagcTts2FSns22 =HAAw -----END PGP SIGNATURE----- --7DP64HymKb+JCWvF-- From owner-p4-projects@FreeBSD.ORG Thu Jun 4 20:05:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B446E106566C; Thu, 4 Jun 2009 20:05: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 5C17A1065676 for ; Thu, 4 Jun 2009 20:05:43 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4A6CD8FC08 for ; Thu, 4 Jun 2009 20:05:43 +0000 (UTC) (envelope-from nikron@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54K5hMh030782 for ; Thu, 4 Jun 2009 20:05:43 GMT (envelope-from nikron@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54K5h0u030780 for perforce@freebsd.org; Thu, 4 Jun 2009 20:05:43 GMT (envelope-from nikron@FreeBSD.org) Date: Thu, 4 Jun 2009 20:05:43 GMT Message-Id: <200906042005.n54K5h0u030780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nikron@FreeBSD.org using -f From: Nikhil Bysani To: Perforce Change Reviews Cc: Subject: PERFORCE change 163518 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 20:05:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163518 Change 163518 by nikron@nmfreebsd on 2009/06/04 20:05:21 Hack to allow libnm-util to include /usr/local/include Affected files ... .. //depot/projects/soc2009/nm-port/NetworkManager/configure.ac#4 edit .. //depot/projects/soc2009/nm-port/NetworkManager/libnm-util/Makefile.am#1 add Differences ... ==== //depot/projects/soc2009/nm-port/NetworkManager/configure.ac#4 (text+ko) ==== @@ -97,6 +97,9 @@ if test "z$with_distro" = "z"; then with_distro=`lsb_release -is` fi + if test "z$with_distro" = "z"; then + with_distro=`uname` + fi fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` @@ -105,7 +108,7 @@ exit 1 else case $with_distro in - redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva) ;; + redhat|suse|gentoo|debian|slackware|arch|paldo|frugalware|mandriva|freebsd) ;; *) echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" exit 1 @@ -158,23 +161,30 @@ AC_DEFINE(TARGET_MANDRIVA, 1, [Define if you have Mandriva]) fi -AC_MSG_CHECKING([Linux Wireless Extensions >= 18]) -AC_TRY_COMPILE([#ifndef __user - #define __user - #endif - #include - #include - #include - #include - #include ], - [#ifndef IWEVGENIE - #error "not found" - #endif], - [ac_have_iwevgenie=yes], - [ac_have_iwevgenie=no]) -AC_MSG_RESULT($ac_have_iwevgenie) -if test "$ac_have_iwevgenie" = no; then +AM_CONDITIONAL(TARGET_FREEBSD, test x"$with_distro" = xfreebsd) +if test x"$with_distro" = xfreebsd; then + AC_DEFINE(TARGET_FREEBSD, 1, [Define if you have FreeBSD]) + +else + + AC_MSG_CHECKING([Linux Wireless Extensions >= 18]) + AC_TRY_COMPILE([#ifndef __user + #define __user + #endif + #include + #include + #include + #include + #include ], + [#ifndef IWEVGENIE + #error "not found" + #endif], + [ac_have_iwevgenie=yes], + [ac_have_iwevgenie=no]) + AC_MSG_RESULT($ac_have_iwevgenie) + if test "$ac_have_iwevgenie" = no; then AC_MSG_ERROR(wireless-tools library and development headers >= 28pre9 not installed or not functional) + fi fi PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.1 dbus-glib-1 >= 0.75) @@ -204,9 +214,11 @@ AC_SUBST(HAL_CFLAGS) AC_SUBST(HAL_LIBS) -PKG_CHECK_MODULES(LIBNL, libnl-1 >= 1.0-pre8) -AC_SUBST(LIBNL_CFLAGS) -AC_SUBST(LIBNL_LIBS) +if ! (test x"$with_distro" = "xfreebsd"); then + PKG_CHECK_MODULES(LIBNL, libnl-1 >= 1.0-pre8) + AC_SUBST(LIBNL_CFLAGS) + AC_SUBST(LIBNL_LIBS) +fi PKG_CHECK_MODULES(UUID, uuid) AC_SUBST(UUID_CFLAGS) @@ -293,17 +305,20 @@ AC_SUBST(DBUS_SYS_DIR) # PPPD -AC_CHECK_HEADERS(pppd/pppd.h,, - AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.)) +if (test x"$with_distro" = "xfreebsd"); then +else + AC_CHECK_HEADERS(pppd/pppd.h,, + AC_MSG_ERROR(couldn't find pppd.h. pppd development headers are required.)) -AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory])) + AC_ARG_WITH([pppd-plugin-dir], AS_HELP_STRING([--with-pppd-plugin-dir=DIR], [path to the pppd plugins directory])) -if test -n "$with_pppd_plugin_dir" ; then - PPPD_PLUGIN_DIR="$with_pppd_plugin_dir" -else - PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.4" + if test -n "$with_pppd_plugin_dir" ; then + PPPD_PLUGIN_DIR="$with_pppd_plugin_dir" + else + PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.4" + fi + AC_SUBST(PPPD_PLUGIN_DIR) fi -AC_SUBST(PPPD_PLUGIN_DIR) # DHCP client AC_ARG_WITH([dhcp-client], AS_HELP_STRING([--with-dhcp-client=dhcpcd|dhclient], [path to the chosen dhcp client])) From owner-p4-projects@FreeBSD.ORG Thu Jun 4 20:24:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 605CE1065676; Thu, 4 Jun 2009 20:24: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 020E3106564A for ; Thu, 4 Jun 2009 20:24:02 +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 E36BD8FC0A for ; Thu, 4 Jun 2009 20:24:01 +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 n54KO1fA032801 for ; Thu, 4 Jun 2009 20:24:01 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54KO1NL032799 for perforce@freebsd.org; Thu, 4 Jun 2009 20:24:01 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 20:24:01 GMT Message-Id: <200906042024.n54KO1NL032799@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 163519 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 20:24:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=163519 Change 163519 by zec@zec_amdx4 on 2009/06/04 20:23:23 Merge vnet destructor framework from vimage branch. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#49 edit .. //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#5 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#71 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#27 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#33 edit .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#29 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#39 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#29 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#40 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#31 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#16 edit .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#29 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#52 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#36 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#27 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#40 edit .. //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#7 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#23 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#33 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#34 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_var.h#9 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6protosw.h#3 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#35 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#9 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#32 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#30 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/key.h#3 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#21 edit .. //depot/projects/vimage-commit2/src/sys/sys/domain.h#2 edit .. //depot/projects/vimage-commit2/src/sys/sys/protosw.h#4 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#70 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#49 (text+ko) ==== @@ -65,8 +65,8 @@ static int vnet_mod_destructor(struct vnet_modlink *); #ifdef VIMAGE -static struct vimage *vimage_by_name(struct vimage *, char *); static struct vimage *vi_alloc(struct vimage *, char *); +static int vi_destroy(struct vimage *); static struct vimage *vimage_get_next(struct vimage *, struct vimage *, int); static void vimage_relative_name(struct vimage *, struct vimage *, char *, int); @@ -216,11 +216,7 @@ case SIOCSPVIMAGE: if (vi_req->vi_req_action == VI_DESTROY) { -#ifdef NOTYET error = vi_destroy(vip_r); -#else - error = EOPNOTSUPP; -#endif break; } @@ -283,7 +279,7 @@ return (0); } -static struct vimage * +struct vimage * vimage_by_name(struct vimage *top, char *name) { struct vimage *vip; @@ -541,7 +537,6 @@ return (0); } - static int vnet_mod_destructor(struct vnet_modlink *vml) { @@ -663,6 +658,73 @@ return (vip); } + +/* + * Destroy a vnet - unlink all linked lists, free all the memory, stop all + * the timers... How can one ever be sure to have done *all* the necessary + * steps? + */ +static int +vi_destroy(struct vimage *vip) +{ + struct vnet *vnet = vip->v_net; + struct vprocg *vprocg = vip->v_procg; + struct ifnet *ifp, *nifp; + struct vnet_modlink *vml; + + /* XXX Beware of races -> more locking to be done... */ + if (!LIST_EMPTY(&vip->vi_child_head)) + return (EBUSY); + + if (vprocg->nprocs != 0) + return (EBUSY); + + if (vnet->sockcnt != 0) + return (EBUSY); + + if (vip->vi_ucredrefc != 0) + printf("vi_destroy: %s ucredrefc %d\n", + vip->vi_name, vip->vi_ucredrefc); + + /* Point with no return - cleanup MUST succeed! */ + /* XXX locking */ + LIST_REMOVE(vip, vi_le); + LIST_REMOVE(vip, vi_sibling); + + /* XXX locking */ + LIST_REMOVE(vprocg, vprocg_le); + + VNET_LIST_WLOCK(); + LIST_REMOVE(vnet, vnet_le); + VNET_LIST_WUNLOCK(); + + CURVNET_SET_QUIET(vnet); + INIT_VNET_NET(vnet); + + /* + * Return all inherited interfaces to their parent vnets, + * alternatively attempt to kill cloning ifnets. + */ + TAILQ_FOREACH_SAFE(ifp, &V_ifnet, if_link, nifp) { + if (ifp->if_home_vnet != ifp->if_vnet) + vi_if_move(NULL, ifp, vip); + } + + /* Detach / free per-module state instances. */ + TAILQ_FOREACH_REVERSE(vml, &vnet_modlink_head, + vnet_modlink_head, vml_mod_le) + vnet_mod_destructor(vml); + + CURVNET_RESTORE(); + + /* hopefully, we are finally OK to free the vnet container itself! */ + vnet->vnet_magic_n = 0xdeadbeef; + free(vnet, M_VNET); + free(vprocg, M_VPROCG); + free(vip, M_VIMAGE); + + return (0); +} #endif /* VIMAGE */ static void ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#5 (text+ko) ==== @@ -66,6 +66,9 @@ NULL); static vnet_attach_fn net_init_domain; +#ifdef VIMAGE +static vnet_detach_fn net_detach_domain; +#endif static struct callout pffast_callout; static struct callout pfslow_callout; @@ -107,7 +110,10 @@ vnet_modinfo_t vnet_domain_modinfo = { .vmi_id = VNET_MOD_DOMAIN, .vmi_name = "domain", - .vmi_iattach = net_init_domain + .vmi_iattach = net_init_domain, +#ifdef VIMAGE + .vmi_idetach = net_detach_domain, +#endif }; #endif @@ -166,9 +172,7 @@ } /* - * Add a new protocol domain to the list of supported domains - * Note: you cant unload it again because a socket may be using it. - * XXX can't fail at this time. + * Initialize a domain instance. */ static int net_init_domain(const void *arg) @@ -190,6 +194,26 @@ return (0); } +#ifdef VIMAGE +/* + * Detach / free a domain instance. + */ +static int +net_detach_domain(const void *arg) +{ + const struct domain *dp = arg; + struct protosw *pr; + + if (dp->dom_destroy) + (*dp->dom_destroy)(); + for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) + if (pr->pr_destroy) + (*pr->pr_destroy)(); + + return 0; +} +#endif + /* * Add a new protocol domain to the list of supported domains * Note: you cant unload it again because a socket may be using it. ==== //depot/projects/vimage-commit2/src/sys/net/if.c#71 (text+ko) ==== @@ -154,6 +154,9 @@ #endif static int vnet_net_iattach(const void *); +#ifdef VIMAGE +static int vnet_net_idetach(const void *); +#endif #ifdef VIMAGE_GLOBALS struct ifnethead ifnet; /* depend on static init XXX */ @@ -190,7 +193,10 @@ .vmi_name = "net", .vmi_size = sizeof(struct vnet_net), .vmi_symmap = vnet_net_symmap, - .vmi_iattach = vnet_net_iattach + .vmi_iattach = vnet_net_iattach, +#ifdef VIMAGE + .vmi_idetach = vnet_net_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ @@ -447,6 +453,25 @@ return (0); } +#ifdef VIMAGE +static int +vnet_net_idetach(unused) + const void *unused; +{ + INIT_VNET_NET(curvnet); + + VNET_ASSERT(TAILQ_EMPTY(&V_ifnet)); +#ifdef NOTYET + VNET_ASSERT(TAILQ_EMPTY(&V_ifg_head)); +#endif + VNET_ASSERT(SLIST_EMPTY(&V_ifklist.kl_list)); + + free((caddr_t)V_ifindex_table, M_IFNET); + + return (0); +} +#endif + void if_grow(void) { @@ -689,6 +714,8 @@ #ifdef VIMAGE ifp->if_vnet = curvnet; + if (ifp->if_home_vnet == NULL) + ifp->if_home_vnet = curvnet; #endif if_addgroup(ifp, IFG_ALL); ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#27 (text+ko) ==== @@ -302,12 +302,10 @@ break; case MOD_UNLOAD: if_clone_detach(&gif_cloner); +#ifdef VIMAGE + vnet_mod_deregister(&vnet_gif_modinfo); +#endif mtx_destroy(&gif_mtx); -#ifdef INET6 -#ifndef VIMAGE - V_ip6_gif_hlim = 0; /* XXX -> vnet_gif_idetach() */ -#endif -#endif break; default: return EOPNOTSUPP; ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#33 (text+ko) ==== @@ -106,6 +106,9 @@ static int lo_clone_create(struct if_clone *, int, caddr_t); static void lo_clone_destroy(struct ifnet *); static int vnet_loif_iattach(const void *); +#ifdef VIMAGE +static int vnet_loif_idetach(const void *); +#endif #ifdef VIMAGE_GLOBALS struct ifnet *loif; /* Used externally */ @@ -120,7 +123,10 @@ .vmi_id = VNET_MOD_LOIF, .vmi_dependson = VNET_MOD_IF_CLONE, .vmi_name = "loif", - .vmi_iattach = vnet_loif_iattach + .vmi_iattach = vnet_loif_iattach, +#ifdef VIMAGE + .vmi_idetach = vnet_loif_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ @@ -129,12 +135,11 @@ static void lo_clone_destroy(struct ifnet *ifp) { -#ifdef INVARIANTS - INIT_VNET_NET(ifp->if_vnet); -#endif +#ifndef VIMAGE /* XXX: destroying lo0 will lead to panics. */ KASSERT(V_loif != ifp, ("%s: destroying lo0", __func__)); +#endif bpfdetach(ifp); if_detach(ifp); @@ -184,6 +189,19 @@ return (0); } +#ifdef VIMAGE +static int vnet_loif_idetach(unused) + const void *unused; +{ + INIT_VNET_NET(curvnet); + + if_clone_detach(V_lo_cloner); + V_loif = NULL; + + return (0); +} +#endif + static int loop_modevent(module_t mod, int type, void *data) { ==== //depot/projects/vimage-commit2/src/sys/net/if_var.h#29 (text+ko) ==== @@ -71,6 +71,7 @@ struct carp_if; struct ifvlantrunk; struct route; +struct vnet; #endif #include /* get TAILQ macros */ @@ -169,6 +170,9 @@ (struct ifnet *); int (*if_transmit) /* initiate output routine */ (struct ifnet *, struct mbuf *); + void (*if_reassign) /* reassign to vnet routine */ + (struct ifnet *, struct vnet *, char *); + struct vnet *if_home_vnet; /* where this ifnet originates from */ struct ifaddr *if_addr; /* pointer to link-level address */ void *if_llsoftc; /* link layer softc */ int if_drv_flags; /* driver-managed status flags */ ==== //depot/projects/vimage-commit2/src/sys/net/route.c#39 (text+ko) ==== @@ -99,12 +99,18 @@ static void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); static int vnet_route_iattach(const void *); +#ifdef VIMAGE +static int vnet_route_idetach(const void *); +#endif #ifndef VIMAGE_GLOBALS static const vnet_modinfo_t vnet_rtable_modinfo = { .vmi_id = VNET_MOD_RTABLE, .vmi_name = "rtable", - .vmi_iattach = vnet_route_iattach + .vmi_iattach = vnet_route_iattach, +#ifdef VIMAGE + .vmi_idetach = vnet_route_idetach +#endif }; #endif /* !VIMAGE_GLOBALS */ @@ -194,7 +200,8 @@ #endif } -static int vnet_route_iattach(const void *unused __unused) +static int +vnet_route_iattach(const void *unused __unused) { INIT_VNET_NET(curvnet); struct domain *dom; @@ -235,6 +242,36 @@ return (0); } +#ifdef VIMAGE +static int +vnet_route_idetach(const void *unused) +{ + int table; + int fam; + struct domain *dom; + struct radix_node_head **rnh; + + for (dom = domains; dom; dom = dom->dom_next) { + if (dom->dom_rtdetach) { + for (table = 0; table < rt_numfibs; table++) { + if ( (fam = dom->dom_family) == AF_INET || + table == 0) { + /* for now only AF_INET has > 1 table */ + rnh = rt_tables_get_rnh_ptr(table, fam); + if (rnh == NULL) + panic("%s: rnh NULL", __func__); + dom->dom_rtdetach((void **)rnh, + dom->dom_rtoffset); + } else { + break; + } + } + } + } + return (0); +} +#endif + #ifndef _SYS_SYSPROTO_H_ struct setfib_args { int fibnum; ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#29 (text+ko) ==== @@ -85,6 +85,9 @@ static struct mtx ng_topo_mtx; static vnet_attach_fn vnet_netgraph_iattach; +#ifdef VIMAGE +static vnet_detach_fn vnet_netgraph_idetach; +#endif #ifdef NETGRAPH_DEBUG static struct mtx ng_nodelist_mtx; /* protects global node/hook lists */ @@ -647,6 +650,9 @@ return (ENOMEM); } node->nd_type = type; +#ifdef VIMAGE + node->nd_vnet = curvnet; +#endif NG_NODE_REF(node); /* note reference */ type->refs++; @@ -3074,22 +3080,49 @@ static const vnet_modinfo_t vnet_netgraph_modinfo = { .vmi_id = VNET_MOD_NETGRAPH, .vmi_name = "netgraph", + .vmi_size = sizeof(struct vnet_netgraph), + .vmi_dependson = VNET_MOD_LOIF, + .vmi_iattach = vnet_netgraph_iattach, #ifdef VIMAGE - .vmi_size = sizeof(struct vnet_netgraph), + .vmi_idetach = vnet_netgraph_idetach #endif - .vmi_iattach = vnet_netgraph_iattach }; #endif -static int -vnet_netgraph_iattach(const void *arg __unused) +static int vnet_netgraph_iattach(const void *unused) { INIT_VNET_NETGRAPH(curvnet); V_nextID = 1; - return (0); + return 0; +} + +#ifdef VIMAGE +static int vnet_netgraph_idetach(const void *unused) +{ + INIT_VNET_NETGRAPH(curvnet); + node_p node, last_killed = NULL; + + while ((node = LIST_FIRST(&V_ng_nodelist)) != NULL) { + if (node == last_killed) { + /* This should never happen */ + node->nd_flags |= NGF_REALLY_DIE; + printf("netgraph node %s needs NGF_REALLY_DIE\n", + node->nd_name); + ng_rmnode(node, NULL, NULL, 0); + /* This must never happen */ + if (node == LIST_FIRST(&V_ng_nodelist)) + panic("netgraph node %s won't die", + node->nd_name); + } + ng_rmnode(node, NULL, NULL, 0); + last_killed = node; + } + + return 0; } +#endif /* VIMAGE */ /* * Handle loading and unloading for this code. @@ -3313,6 +3346,7 @@ NG_WORKLIST_SLEEP(); STAILQ_REMOVE_HEAD(&ng_worklist, nd_input_queue.q_work); NG_WORKLIST_UNLOCK(); + CURVNET_SET(node->nd_vnet); CTR3(KTR_NET, "%20s: node [%x] (%p) taken off worklist", __func__, node->nd_ID, node); /* @@ -3342,6 +3376,7 @@ } } NG_NODE_UNREF(node); + CURVNET_RESTORE(); } } @@ -3675,7 +3710,9 @@ { item_p item = arg; + CURVNET_SET(NGI_NODE(item)->nd_vnet); ng_snd_item(item, 0); + CURVNET_RESTORE(); } ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#40 (text+ko) ==== @@ -1993,7 +1993,6 @@ 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; ==== //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#13 (text+ko) ==== @@ -127,6 +127,9 @@ .pr_ctlinput = udp_ctlinput, .pr_ctloutput = ip_ctloutput, .pr_init = udp_init, +#ifdef VIMAGE + .pr_destroy = udp_destroy, +#endif .pr_usrreqs = &udp_usrreqs }, { @@ -138,6 +141,9 @@ .pr_ctlinput = tcp_ctlinput, .pr_ctloutput = tcp_ctloutput, .pr_init = tcp_init, +#ifdef VIMAGE + .pr_destroy = tcp_destroy, +#endif .pr_slowtimo = tcp_slowtimo, .pr_drain = tcp_drain, .pr_usrreqs = &tcp_usrreqs @@ -348,11 +354,15 @@ .pr_input = rip_input, .pr_ctloutput = rip_ctloutput, .pr_init = rip_init, +#ifdef VIMAGE + .pr_destroy = rip_destroy, +#endif .pr_usrreqs = &rip_usrreqs }, }; extern int in_inithead(void **, int); +extern int in_detachhead(void **, int); struct domain inetdomain = { .dom_family = AF_INET, @@ -364,6 +374,9 @@ #else .dom_rtattach = in_inithead, #endif +#ifdef VIMAGE + .dom_rtdetach = in_detachhead, +#endif .dom_rtoffset = 32, .dom_maxrtkey = sizeof(struct sockaddr_in), .dom_ifattach = in_domifattach, ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#31 (text+ko) ==== @@ -65,6 +65,9 @@ #include extern int in_inithead(void **head, int off); +#ifdef VIMAGE +extern int in_detachhead(void **head, int off); +#endif #define RTPRF_OURS RTF_PROTO3 /* set on routes we manage */ @@ -382,6 +385,17 @@ return 1; } +#ifdef VIMAGE +int +in_detachhead(void **head, int off) +{ + INIT_VNET_INET(curvnet); + + callout_drain(&V_rtq_timer); + return 1; +} +#endif + /* * This zaps old routes when the interface goes down or interface * address is deleted. In the latter case, it deletes static routes ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#16 (text+ko) ==== @@ -209,6 +209,9 @@ int rip_ctloutput(struct socket *, struct sockopt *); void rip_ctlinput(int, struct sockaddr *, void *); void rip_init(void); +#ifdef VIMAGE +void rip_destroy(void); +#endif void rip_input(struct mbuf *, int); int rip_output(struct mbuf *, struct socket *, u_long); void ipip_input(struct mbuf *, int); ==== //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#29 (text+ko) ==== @@ -202,6 +202,19 @@ EVENTHANDLER_PRI_ANY); } +#ifdef VIMAGE +void +rip_destroy(void) +{ + INIT_VNET_INET(curvnet); + + hashdestroy(V_ripcbinfo.ipi_hashbase, M_PCB, + V_ripcbinfo.ipi_hashmask); + hashdestroy(V_ripcbinfo.ipi_porthashbase, M_PCB, + V_ripcbinfo.ipi_porthashmask); +} +#endif + static int rip_append(struct inpcb *last, struct ip *ip, struct mbuf *n, struct sockaddr_in *ripsrc) ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#24 (text+ko) ==== @@ -230,6 +230,16 @@ tcp_hc_purge, curvnet); } +void +tcp_hc_destroy(void) +{ + INIT_VNET_INET(curvnet); + + /* XXX TODO walk the hashtable and free all entries */ + + callout_drain(&V_tcp_hc_callout); +} + /* * Internal function: look up an entry in the hostcache or return NULL. * @@ -663,5 +673,6 @@ callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz, tcp_hc_purge, arg); + CURVNET_RESTORE(); } ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#52 (text+ko) ==== @@ -427,6 +427,25 @@ EVENTHANDLER_PRI_ANY); } +#ifdef VIMAGE +void +tcp_destroy(void) +{ + INIT_VNET_INET(curvnet); + + tcp_tw_destroy(); + tcp_hc_destroy(); + syncache_destroy(); + + /* XXX check that hashes are empty! */ + hashdestroy(V_tcbinfo.ipi_hashbase, M_PCB, + V_tcbinfo.ipi_hashmask); + hashdestroy(V_tcbinfo.ipi_porthashbase, M_PCB, + V_tcbinfo.ipi_porthashmask); + INP_INFO_LOCK_DESTROY(&V_tcbinfo); +} +#endif + void tcp_fini(void *xtp) { ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#36 (text+ko) ==== @@ -276,6 +276,19 @@ uma_zone_set_max(V_tcp_syncache.zone, V_tcp_syncache.cache_limit); } +#ifdef VIMAGE +void +syncache_destroy(void) +{ + INIT_VNET_INET(curvnet); + + /* XXX walk the cache, free remaining objects, stop timers */ + + uma_zdestroy(V_tcp_syncache.zone); + FREE(V_tcp_syncache.hashbase, M_SYNCACHE); +} +#endif + /* * Inserts a syncache entry into the specified bucket row. * Locks and unlocks the syncache_head autonomously. ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#7 (text+ko) ==== @@ -35,6 +35,9 @@ #ifdef _KERNEL void syncache_init(void); +#ifdef VIMAGE +void syncache_destroy(void); +#endif void syncache_unreach(struct in_conninfo *, struct tcphdr *); int syncache_expand(struct in_conninfo *, struct tcpopt *, struct tcphdr *, struct socket **, struct mbuf *); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#27 (text+ko) ==== @@ -180,6 +180,20 @@ TAILQ_INIT(&V_twq_2msl); } +#ifdef VIMAGE +void +tcp_tw_destroy(void) +{ + INIT_VNET_INET(curvnet); + struct tcptw *tw; + + INP_INFO_WLOCK(&V_tcbinfo); + while((tw = TAILQ_FIRST(&V_twq_2msl)) != NULL) + tcp_twclose(tw, 0); + INP_INFO_WUNLOCK(&V_tcbinfo); +} +#endif + /* * Move a TCP connection into TIME_WAIT state. * tcbinfo is locked. ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#14 (text+ko) ==== @@ -584,6 +584,7 @@ void tcp_drain(void); void tcp_fasttimo(void); void tcp_init(void); +void tcp_destroy(void); void tcp_fini(void *); char *tcp_log_addrs(struct in_conninfo *, struct tcphdr *, void *, const void *); @@ -605,6 +606,9 @@ void tcp_respond(struct tcpcb *, void *, struct tcphdr *, struct mbuf *, tcp_seq, tcp_seq, int); void tcp_tw_init(void); +#ifdef VIMAGE +void tcp_tw_destroy(void); +#endif void tcp_tw_zone_change(void); int tcp_twcheck(struct inpcb *, struct tcpopt *, struct tcphdr *, struct mbuf *, int); @@ -625,6 +629,7 @@ * All tcp_hc_* functions are IPv4 and IPv6 (via in_conninfo) */ void tcp_hc_init(void); +void tcp_hc_destroy(void); void tcp_hc_get(struct in_conninfo *, struct hc_metrics_lite *); u_long tcp_hc_getmtu(struct in_conninfo *); void tcp_hc_updatemtu(struct in_conninfo *, u_long); ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#40 (text+ko) ==== @@ -222,6 +222,20 @@ uma_zfree(V_udpcb_zone, up); } +#ifdef VIMAGE +void +udp_destroy(void) +{ + INIT_VNET_INET(curvnet); + + hashdestroy(V_udbinfo.ipi_hashbase, M_PCB, + V_udbinfo.ipi_hashmask); + hashdestroy(V_udbinfo.ipi_porthashbase, M_PCB, + V_udbinfo.ipi_porthashmask); + INP_INFO_LOCK_DESTROY(&V_udbinfo); +} +#endif + /* * Subroutine of udp_input(), which appends the provided mbuf chain to the * passed pcb/socket. The caller must provide a sockaddr_in via udp_in that ==== //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#7 (text+ko) ==== @@ -128,6 +128,9 @@ void udp_ctlinput(int, struct sockaddr *, void *); void udp_init(void); +#ifdef VIMAGE +void udp_destroy(void); +#endif void udp_input(struct mbuf *, int); struct inpcb *udp_notify(struct inpcb *inp, int errno); int udp_shutdown(struct socket *so); ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#23 (text+ko) ==== @@ -148,6 +148,9 @@ .pr_domain = &inet6domain, .pr_protocol = IPPROTO_IPV6, .pr_init = ip6_init, +#ifdef VIMAGE + .pr_destroy = ip6_destroy, +#endif .pr_slowtimo = frag6_slowtimo, .pr_drain = frag6_drain, .pr_usrreqs = &nousrreqs, @@ -349,6 +352,9 @@ }; extern int in6_inithead(void **, int); +#ifdef VIMAGE +extern int in6_detachhead(void **, int); +#endif struct domain inet6domain = { .dom_family = AF_INET6, @@ -361,6 +367,9 @@ #else .dom_rtattach = in6_inithead, #endif +#ifdef VIMAGE + .dom_rtdetach = in6_detachhead, +#endif .dom_rtoffset = offsetof(struct sockaddr_in6, sin6_addr) << 3, .dom_maxrtkey = sizeof(struct sockaddr_in6), .dom_ifattach = in6_domifattach, ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#33 (text+ko) ==== @@ -112,6 +112,9 @@ #include extern int in6_inithead(void **head, int off); +#ifdef VIMAGE +extern int in6_detachhead(void **head, int off); +#endif #define RTPRF_OURS RTF_PROTO3 /* set on routes we manage */ @@ -464,3 +467,15 @@ in6_mtutimo(curvnet); /* kick off timeout first time */ return 1; } + +#ifdef VIMAGE +int +in6_detachhead(void **head, int off) +{ + INIT_VNET_INET6(curvnet); + + callout_drain(&V_rtq_timer6); + callout_drain(&V_rtq_mtutimer); + return (1); +} +#endif ==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#34 (text+ko) ==== @@ -303,6 +303,17 @@ netisr_register(&ip6_nh); } +#ifdef VIMAGE +void +ip6_destroy() +{ + INIT_VNET_INET6(curvnet); + + nd6_destroy(); + callout_drain(&V_in6_tmpaddrtimer_ch); +} +#endif + static int ip6_init2_vnet(const void *unused __unused) { ==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_var.h#9 (text+ko) ==== @@ -339,6 +339,9 @@ struct in6_ifaddr; void ip6_init __P((void)); +#ifdef VIMAGE +void ip6_destroy __P((void)); +#endif void ip6_input __P((struct mbuf *)); struct in6_ifaddr *ip6_getdstifaddr __P((struct mbuf *)); void ip6_freepcbopts __P((struct ip6_pktopts *)); ==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6protosw.h#3 (text+ko) ==== @@ -129,6 +129,8 @@ /* utility hooks */ void (*pr_init) /* initialization hook */ __P((void)); + void (*pr_destroy) /* cleanup hook */ + __P((void)); void (*pr_fasttimo) /* fast timeout (200ms) */ __P((void)); ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#35 (text+ko) ==== @@ -135,14 +135,8 @@ nd6_init(void) { INIT_VNET_INET6(curvnet); - static int nd6_init_done = 0; int i; - if (nd6_init_done) { - log(LOG_NOTICE, "nd6_init called more than once(ignored)\n"); - return; - } - V_nd6_prune = 1; /* walk list every 1 seconds */ V_nd6_delay = 5; /* delay first probe time 5 second */ V_nd6_umaxtries = 3; /* maximum unicast query */ @@ -181,6 +175,8 @@ V_ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; V_ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE; + V_ip6_desync_factor = 0; + all1_sa.sin6_family = AF_INET6; all1_sa.sin6_len = sizeof(struct sockaddr_in6); for (i = 0; i < sizeof(all1_sa.sin6_addr); i++) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 4 20:30:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A6E21065675; Thu, 4 Jun 2009 20:30:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4A590106564A for ; Thu, 4 Jun 2009 20:30:08 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 383558FC16 for ; Thu, 4 Jun 2009 20:30:08 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54KU8TK033258 for ; Thu, 4 Jun 2009 20:30:08 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54KU8PH033256 for perforce@freebsd.org; Thu, 4 Jun 2009 20:30:08 GMT (envelope-from zec@fer.hr) Date: Thu, 4 Jun 2009 20:30:08 GMT Message-Id: <200906042030.n54KU8PH033256@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 163520 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 20:30:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=163520 Change 163520 by zec@zec_amdx4 on 2009/06/04 20:29:14 Trim comments. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#50 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#50 (text+ko) ==== @@ -660,9 +660,8 @@ } /* - * Destroy a vnet - unlink all linked lists, free all the memory, stop all - * the timers... How can one ever be sure to have done *all* the necessary - * steps? + * Destroy a vnet - unlink all linked lists, hashtables etc., free all + * the memory, stop all the timers... */ static int vi_destroy(struct vimage *vip) @@ -687,11 +686,8 @@ vip->vi_name, vip->vi_ucredrefc); /* Point with no return - cleanup MUST succeed! */ - /* XXX locking */ LIST_REMOVE(vip, vi_le); LIST_REMOVE(vip, vi_sibling); - - /* XXX locking */ LIST_REMOVE(vprocg, vprocg_le); VNET_LIST_WLOCK(); @@ -701,10 +697,7 @@ CURVNET_SET_QUIET(vnet); INIT_VNET_NET(vnet); - /* - * Return all inherited interfaces to their parent vnets, - * alternatively attempt to kill cloning ifnets. - */ + /* Return all inherited interfaces to their parent vnets. */ TAILQ_FOREACH_SAFE(ifp, &V_ifnet, if_link, nifp) { if (ifp->if_home_vnet != ifp->if_vnet) vi_if_move(NULL, ifp, vip); @@ -717,7 +710,7 @@ CURVNET_RESTORE(); - /* hopefully, we are finally OK to free the vnet container itself! */ + /* Hopefully, we are OK to free the vnet container itself. */ vnet->vnet_magic_n = 0xdeadbeef; free(vnet, M_VNET); free(vprocg, M_VPROCG); From owner-p4-projects@FreeBSD.ORG Thu Jun 4 20:30:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05CCA1065709; Thu, 4 Jun 2009 20:30:08 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C8D11065673 for ; Thu, 4 Jun 2009 20:30:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AA318FC17 for ; Thu, 4 Jun 2009 20:30:08 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54KU8uL033263 for ; Thu, 4 Jun 2009 20:30:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54KU881033261 for perforce@freebsd.org; Thu, 4 Jun 2009 20:30:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 4 Jun 2009 20:30:08 GMT Message-Id: <200906042030.n54KU881033261@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 163521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 20:30:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=163521 Change 163521 by hselasky@hselasky_laptop001 on 2009/06/04 20:29:57 USB audio: - revert r162516. We only support 1 or 2 channels per stream which reflects mono and stereo. Affected files ... .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#46 edit Differences ... ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#46 (text+ko) ==== @@ -97,7 +97,7 @@ #define MAKE_WORD(h,l) (((h) << 8) | (l)) #define BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1) -#define UAUDIO_MAX_CHAN(x) (((x) < 2) ? (x) : 2) /* XXX fixme later */ +#define UAUDIO_MAX_CHAN(x) (x) struct uaudio_mixer_node { int32_t minval; @@ -940,6 +940,8 @@ bChannels = UAUDIO_MAX_CHAN(asf1d->bNrChannels); bBitResolution = asf1d->bBitResolution; + DPRINTFN(9, "bChannels=%u\n", bChannels); + if (asf1d->bSamFreqType == 0) { DPRINTFN(16, "Sample rate: %d-%dHz\n", UA_SAMP_LO(asf1d), UA_SAMP_HI(asf1d)); From owner-p4-projects@FreeBSD.ORG Thu Jun 4 20:31:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F33DE1065675; Thu, 4 Jun 2009 20:31: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 B329F1065670 for ; Thu, 4 Jun 2009 20:31:09 +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 834758FC0A for ; Thu, 4 Jun 2009 20:31:09 +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 n54KV9PC033351 for ; Thu, 4 Jun 2009 20:31:09 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54KV9xT033349 for perforce@freebsd.org; Thu, 4 Jun 2009 20:31:09 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 4 Jun 2009 20:31:09 GMT Message-Id: <200906042031.n54KV9xT033349@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 163522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 20:31:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=163522 Change 163522 by truncs@aditya on 2009/06/04 20:31:06 Added new members to the in-memory superblock. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#6 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#6 (text+ko) ==== @@ -477,8 +477,10 @@ uint32_t e2fs_bsize; /* Block size */ uint32_t e2fs_bshift; /* calc of logical block no */ int32_t e2fs_bmask; /* calc of block offset */ + int32_t e2fs_bpg; /* Number of blocks per group */ int64_t e2fs_qmask; /* = s_blocksize -1 */ uint32_t e2fs_fstodb; /* Shift to get disk block */ + uint32_t e2fs_ipg; /* Number of inodes per group */ uint32_t e2fs_ipb; /* Number of inodes per block */ uint32_t e2fs_itpg; /* Number of inode table per group */ uint32_t e2fs_fsize; /* Size of fragments per block */ @@ -486,6 +488,7 @@ uint32_t e2fs_fpg; /* Number of fragments per group */ uint32_t e2fs_dbpg; /* Number of descriptor blocks per group */ uint32_t e2fs_descpb; /* Number of group descriptors per block */ + uint32_t e2fs_gdbcount; /* Number of group descriptors */ uint32_t e2fs_gcount; /* Number of groups */ uint32_t e2fs_first_inode;/* First inode on fs */ int32_t e2fs_isize; /* Size of inode */ From owner-p4-projects@FreeBSD.ORG Thu Jun 4 20:52:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 88EEA106566C; Thu, 4 Jun 2009 20:52: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 482C6106564A for ; Thu, 4 Jun 2009 20:52:31 +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 3537D8FC14 for ; Thu, 4 Jun 2009 20:52:31 +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 n54KqVuI044915 for ; Thu, 4 Jun 2009 20:52:31 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54KqVas044913 for perforce@freebsd.org; Thu, 4 Jun 2009 20:52:31 GMT (envelope-from truncs@FreeBSD.org) Date: Thu, 4 Jun 2009 20:52:31 GMT Message-Id: <200906042052.n54KqVas044913@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 163523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 20:52:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=163523 Change 163523 by truncs@aditya on 2009/06/04 20:52:22 Migration in progress. Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_mount.h#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_readwrite.c#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_subr.c#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#6 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_mount.h#3 (text+ko) ==== @@ -47,8 +47,8 @@ struct cdev *um_dev; /* device mounted */ struct vnode *um_devvp; /* block device mounted vnode */ - struct ext2_sb_info *um_e2fs; /* EXT2FS */ -#define em_e2fsb um_e2fs->s_es + struct m_ext2fs *um_e2fs; /* EXT2FS */ +#define em_e2fsb um_e2fs->e2fs u_long um_nindir; /* indirect ptrs per block */ u_long um_bptrtodb; /* indir ptr to disk block */ ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_readwrite.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #define BLKSIZE(a, b, c) blksize(a, b, c) -#define FS struct ext2_sb_info +#define FS struct m_ext2fs #define I_FS i_e2fs #define READ ext2_read #define READ_S "ext2_read" @@ -85,7 +85,7 @@ panic("%s: type %d", READ_S, vp->v_type); #endif fs = ip->I_FS; - if ((uoff_t)uio->uio_offset > fs->fs_maxfilesize) + if ((uoff_t)uio->uio_offset > fs->e2fs_maxfilesize) return (EFBIG); orig_resid = uio->uio_resid; @@ -97,7 +97,7 @@ size = BLKSIZE(fs, ip, lbn); blkoffset = blkoff(fs, uio->uio_offset); - xfersize = fs->s_frag_size - blkoffset; + xfersize = fs->e2fs_fsize - blkoffset; if (uio->uio_resid < xfersize) xfersize = uio->uio_resid; if (bytesinfile < xfersize) @@ -202,7 +202,7 @@ fs = ip->I_FS; if (uio->uio_offset < 0 || - (uoff_t)uio->uio_offset + uio->uio_resid > fs->fs_maxfilesize) + (uoff_t)uio->uio_offset + uio->uio_resid > fs->e2fs_maxfilesize) return (EFBIG); /* * Maybe this should be above the vnode op call, but so long as @@ -227,7 +227,7 @@ for (error = 0; uio->uio_resid > 0;) { lbn = lblkno(fs, uio->uio_offset); blkoffset = blkoff(fs, uio->uio_offset); - xfersize = fs->s_frag_size - blkoffset; + xfersize = fs->e2fs_fsize - blkoffset; if (uio->uio_resid < xfersize) xfersize = uio->uio_resid; @@ -269,7 +269,7 @@ if (ioflag & IO_SYNC) { (void)bwrite(bp); - } else if (xfersize + blkoffset == fs->s_frag_size) { + } else if (xfersize + blkoffset == fs->e2fs_fsize) { if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERW) == 0) { bp->b_flags |= B_CLUSTEROK; cluster_write(vp, bp, ip->i_size, seqcount); ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_subr.c#3 (text+ko) ==== @@ -68,7 +68,7 @@ struct buf **bpp; { struct inode *ip; - struct ext2_sb_info *fs; + struct m_ext2fs *fs; struct buf *bp; int32_t lbn; int bsize, error; ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#4 (text+ko) ==== @@ -112,7 +112,7 @@ static int ext2_check_sb_compat(struct ext2_super_block *es, struct cdev *dev, int ronly); static int compute_sb_data(struct vnode * devvp, - struct ext2_super_block * es, struct ext2_sb_info * fs); + struct ext2_super_block * es, struct m_ext2fs * fs); static const char *ext2_opts[] = { "from", "export", "acls", "noexec", "noatime", "union", "suiddir", "multilabel", "nosymfollow", @@ -130,7 +130,7 @@ struct vnode *devvp; struct thread *td; struct ext2mount *ump = 0; - struct ext2_sb_info *fs; + struct m_ext2fs *fs; struct nameidata nd, *ndp = &nd; accmode_t accmode; char *path, *fspec; @@ -160,7 +160,7 @@ ump = VFSTOEXT2(mp); fs = ump->um_e2fs; error = 0; - if (fs->s_rd_only == 0 && + if (fs->e2fs_ronly == 0 && vfs_flagopt(opts, "ro", NULL, 0)) { error = VFS_SYNC(mp, MNT_WAIT); if (error) @@ -172,8 +172,8 @@ return (EBUSY); error = ext2_flushfiles(mp, flags, td); vfs_unbusy(mp); - if (!error && fs->s_wasvalid) { - fs->s_es->s_state |= EXT2_VALID_FS; + if (!error && fs->e2fs_wasvalid) { + fs->e2fs->s_state |= EXT2_VALID_FS; ext2_sbupdate(ump, MNT_WAIT); } fs->s_rd_only = 1; @@ -190,7 +190,7 @@ return (error); devvp = ump->um_devvp; if (fs->s_rd_only && !vfs_flagopt(opts, "ro", NULL, 0)) { - if (ext2_check_sb_compat(fs->s_es, devvp->v_rdev, 0)) + if (ext2_check_sb_compat(fs->e2fs, devvp->v_rdev, 0)) return (EPERM); /* @@ -215,21 +215,21 @@ if (error) return (error); - if ((fs->s_es->s_state & EXT2_VALID_FS) == 0 || - (fs->s_es->s_state & EXT2_ERROR_FS)) { + if ((fs->e2fs->s_state & EXT2_VALID_FS) == 0 || + (fs->e2fs->s_state & EXT2_ERROR_FS)) { if (mp->mnt_flag & MNT_FORCE) { printf("WARNING: %s was not properly " - "dismounted\n", fs->fs_fsmnt); + "dismounted\n", fs->e2fs_fsmnt); } else { printf("WARNING: R/W mount of %s " "denied. Filesystem is not clean" - " - run fsck\n", fs->fs_fsmnt); + " - run fsck\n", fs->e2fs_fsmnt); return (EPERM); } } - fs->s_es->s_state &= ~EXT2_VALID_FS; + fs->e2fs->s_state &= ~EXT2_VALID_FS; ext2_sbupdate(ump, MNT_WAIT); - fs->s_rd_only = 0; + fs->e2fs_ronly = 0; MNT_ILOCK(mp); mp->mnt_flag &= ~MNT_RDONLY; MNT_IUNLOCK(mp); @@ -294,8 +294,8 @@ * Note that this strncpy() is ok because of a check at the start * of ext2_mount(). */ - strncpy(fs->fs_fsmnt, path, MAXMNTLEN); - fs->fs_fsmnt[MAXMNTLEN - 1] = '\0'; + strncpy(fs->e2fs_fsmnt, path, MAXMNTLEN); + fs->e2fs_fsmnt[MAXMNTLEN - 1] = '\0'; vfs_mountedfrom(mp, fspec); return (0); } @@ -305,18 +305,18 @@ * this is taken from ext2/super.c. */ static int -ext2_check_descriptors(struct ext2_sb_info *sb) +ext2_check_descriptors(struct m_ext2fs *sb) { struct ext2_group_desc *gdp = NULL; - unsigned long block = sb->s_es->s_first_data_block; + unsigned long block = sb->e2fs->s_first_data_block; int desc_block = 0; int i; - for (i = 0; i < sb->s_groups_count; i++) { + for (i = 0; i < sb->e2fs_gcount; i++) { /* examine next descriptor block */ if ((i % EXT2_DESC_PER_BLOCK(sb)) == 0) gdp = (struct ext2_group_desc *) - sb->s_group_desc[desc_block++]->b_data; + sb->e2fs_group_desc[desc_block++]->b_data; if (gdp->bg_block_bitmap < block || gdp->bg_block_bitmap >= block + EXT2_BLOCKS_PER_GROUP(sb)) { printf ("ext2_check_descriptors: " @@ -379,51 +379,51 @@ */ static int compute_sb_data(struct vnode *devvp, struct ext2_super_block *es, - struct ext2_sb_info *fs) + struct m_ext2fs *fs) { int db_count, error; int i, j; int logic_sb_block = 1; /* XXX for now */ - fs->s_blocksize = EXT2_MIN_BLOCK_SIZE << es->s_log_block_size; - fs->s_bshift = EXT2_MIN_BLOCK_LOG_SIZE + es->s_log_block_size; - fs->s_fsbtodb = es->s_log_block_size + 1; - fs->s_qbmask = fs->s_blocksize - 1; - fs->s_blocksize_bits = es->s_log_block_size + 10; - fs->s_frag_size = EXT2_MIN_FRAG_SIZE << es->s_log_frag_size; - if (fs->s_frag_size) - fs->s_frags_per_block = fs->s_blocksize / fs->s_frag_size; - fs->s_blocks_per_group = es->s_blocks_per_group; - fs->s_frags_per_group = es->s_frags_per_group; - fs->s_inodes_per_group = es->s_inodes_per_group; + fs->e2fs_bsize = EXT2_MIN_BLOCK_SIZE << es->s_log_block_size; + fs->e2fs_bshift = EXT2_MIN_BLOCK_LOG_SIZE + es->s_log_block_size; + fs->e2fs_fsbtodb = es->s_log_block_size + 1; + fs->e2fs_qbmask = fs->s_blocksize - 1; + fs->e2fs_blocksize_bits = es->s_log_block_size + 10; + fs->e2fs_fsize = EXT2_MIN_FRAG_SIZE << es->s_log_frag_size; + if (fs->e2fs_fsize) + fs->e2fs_fpb = fs->e2fs_bsize / fs->e2fs_fsize; + fs->e2fs_bpg = es->s_blocks_per_group; + fs->e2fs_fpg = es->s_frags_per_group; + fs->e2fs_ipg = es->s_inodes_per_group; if (es->s_rev_level == EXT2_GOOD_OLD_REV) { - fs->s_first_ino = EXT2_GOOD_OLD_FIRST_INO; - fs->s_inode_size = EXT2_GOOD_OLD_INODE_SIZE; + fs->e2fs_first_inode = EXT2_GOOD_OLD_FIRST_INO; + fs->e2fs_isize = EXT2_GOOD_OLD_INODE_SIZE; } else { - fs->s_first_ino = es->s_first_ino; - fs->s_inode_size = es->s_inode_size; + fs->e2fs_first_inode = es->s_first_ino; + fs->e2fs_isize = es->s_inode_size; /* * Simple sanity check for superblock inode size value. */ - if (fs->s_inode_size < EXT2_GOOD_OLD_INODE_SIZE || - fs->s_inode_size > fs->s_blocksize || - (fs->s_inode_size & (fs->s_inode_size - 1)) != 0) { + if (fs->e2fs_isize < EXT2_GOOD_OLD_INODE_SIZE || + fs->e2fs_isize > fs->e2fs_bsize || + (fs->e2fs_isize & (fs->e2fs_isize - 1)) != 0) { printf("EXT2-fs: invalid inode size %d\n", - fs->s_inode_size); + fs->e2fs_isize); return (EIO); } } - fs->s_inodes_per_block = fs->s_blocksize / EXT2_INODE_SIZE(fs); - fs->s_itb_per_group = fs->s_inodes_per_group /fs->s_inodes_per_block; - fs->s_desc_per_block = fs->s_blocksize / sizeof (struct ext2_group_desc); + fs->e2fs_ipb = fs->e2fs_bsize / EXT2_INODE_SIZE(fs); + fs->e2fs_itbg = fs->e2fs_ipg /fs->e2fs_ipb; + fs->e2fs_desc_per_block = fs->e2fs_bsize / sizeof (struct ext2_group_desc); /* s_resuid / s_resgid ? */ - fs->s_groups_count = (es->s_blocks_count - es->s_first_data_block + + fs->e2fs_gcount = (es->s_blocks_count - es->s_first_data_block + EXT2_BLOCKS_PER_GROUP(fs) - 1) / EXT2_BLOCKS_PER_GROUP(fs); - db_count = (fs->s_groups_count + EXT2_DESC_PER_BLOCK(fs) - 1) / + db_count = (fs->e2fs_gcount + EXT2_DESC_PER_BLOCK(fs) - 1) / EXT2_DESC_PER_BLOCK(fs); - fs->s_gdb_count = db_count; - fs->s_group_desc = malloc(db_count * sizeof (struct buf *), + fs->e2fs_gdbcount = db_count; + fs->e2fs_group_desc = malloc(db_count * sizeof (struct buf *), M_EXT2MNT, M_WAITOK); /* @@ -431,43 +431,43 @@ * Godmar thinks: if the blocksize is greater than 1024, then * the superblock is logically part of block zero. */ - if(fs->s_blocksize > SBSIZE) + if(fs->e2fs_bsize > SBSIZE) logic_sb_block = 0; for (i = 0; i < db_count; i++) { error = bread(devvp , fsbtodb(fs, logic_sb_block + i + 1), - fs->s_blocksize, NOCRED, &fs->s_group_desc[i]); + fs->e2fs_bsize, NOCRED, &fs->e2fs_group_desc[i]); if(error) { for (j = 0; j < i; j++) - brelse(fs->s_group_desc[j]); - free(fs->s_group_desc, M_EXT2MNT); + brelse(fs->e2fs_group_desc[j]); + free(fs->e2fs_group_desc, M_EXT2MNT); printf("EXT2-fs: unable to read group descriptors" " (%d)\n", error); return (EIO); } - LCK_BUF(fs->s_group_desc[i]) + LCK_BUF(fs->e2fs_group_desc[i]) } if(!ext2_check_descriptors(fs)) { for (j = 0; j < db_count; j++) - ULCK_BUF(fs->s_group_desc[j]) - free(fs->s_group_desc, M_EXT2MNT); + ULCK_BUF(fs->e2fs_group_desc[j]) + free(fs->e2fs_group_desc, M_EXT2MNT); printf("EXT2-fs: (ext2_check_descriptors failure) " "unable to read group descriptors\n"); return (EIO); } for (i = 0; i < EXT2_MAX_GROUP_LOADED; i++) { - fs->s_inode_bitmap_number[i] = 0; - fs->s_inode_bitmap[i] = NULL; - fs->s_block_bitmap_number[i] = 0; - fs->s_block_bitmap[i] = NULL; + fs->e2fs_ibn[i] = 0; + fs->e2fs_ib[i] = NULL; + fs->e2fs_bbn[i] = 0; + fs->e2fs_bb[i] = NULL; } - fs->s_loaded_inode_bitmaps = 0; - fs->s_loaded_block_bitmaps = 0; + fs->e2fs_lib = 0; + fs->e2fs_lbb = 0; if (es->s_rev_level == EXT2_GOOD_OLD_REV || (es->s_feature_ro_compat & EXT2_FEATURE_RO_COMPAT_LARGE_FILE) == 0) - fs->fs_maxfilesize = 0x7fffffff; + fs->e2fs_maxfilesize = 0x7fffffff; else - fs->fs_maxfilesize = 0x7fffffffffffffff; + fs->e2fs_maxfilesize = 0x7fffffffffffffff; return (0); } @@ -491,7 +491,7 @@ struct inode *ip; struct buf *bp; struct ext2_super_block *es; - struct ext2_sb_info *fs; + struct m_ext2fs *fs; int error; if ((mp->mnt_flag & MNT_RDONLY) == 0) @@ -517,7 +517,7 @@ return (EIO); /* XXX needs translation */ } fs = VFSTOEXT2(mp)->um_e2fs; - bcopy(bp->b_data, fs->s_es, sizeof(struct ext2_super_block)); + bcopy(bp->b_data, fs->e2fs, sizeof(struct ext2_super_block)); if((error = compute_sb_data(devvp, es, fs)) != 0) { brelse(bp); @@ -553,7 +553,7 @@ */ ip = VTOI(vp); error = bread(devvp, fsbtodb(fs, ino_to_fsba(fs, ip->i_number)), - (int)fs->s_blocksize, NOCRED, &bp); + (int)fs->e2fs_bsize, NOCRED, &bp); if (error) { VOP_UNLOCK(vp, 0); vrele(vp); @@ -579,7 +579,7 @@ { struct ext2mount *ump; struct buf *bp; - struct ext2_sb_info *fs; + struct m_ext2fs *fs; struct ext2_super_block *es; struct cdev *dev = devvp->v_rdev; struct g_consumer *cp; @@ -646,12 +646,12 @@ * we dynamically allocate both an ext2_sb_info and an ext2_super_block * while Linux keeps the super block in a locked buffer. */ - ump->um_e2fs = malloc(sizeof(struct ext2_sb_info), + ump->um_e2fs = malloc(sizeof(struct m_ext2fs), M_EXT2MNT, M_WAITOK); - ump->um_e2fs->s_es = malloc(sizeof(struct ext2_super_block), + ump->um_e2fs->e2fs = malloc(sizeof(struct ext2_super_block), M_EXT2MNT, M_WAITOK); - bcopy(es, ump->um_e2fs->s_es, (u_int)sizeof(struct ext2_super_block)); - if ((error = compute_sb_data(devvp, ump->um_e2fs->s_es, ump->um_e2fs))) + bcopy(es, ump->um_e2fs->e2fs, (u_int)sizeof(struct ext2_super_block)); + if ((error = compute_sb_data(devvp, ump->um_e2fs->e2fs, ump->um_e2fs))) goto out; /* @@ -661,16 +661,16 @@ brelse(bp); bp = NULL; fs = ump->um_e2fs; - fs->s_rd_only = ronly; /* ronly is set according to mnt_flags */ + fs->e2fs_ronly = ronly; /* ronly is set according to mnt_flags */ /* * If the fs is not mounted read-only, make sure the super block is * always written back on a sync(). */ - fs->s_wasvalid = fs->s_es->s_state & EXT2_VALID_FS ? 1 : 0; + fs->e2fs_wasvalid = fs->e2fs->s_state & EXT2_VALID_FS ? 1 : 0; if (ronly == 0) { - fs->s_dirt = 1; /* mark it modified */ - fs->s_es->s_state &= ~EXT2_VALID_FS; /* set fs invalid */ + fs->e2fs_fmod = 1; /* mark it modified */ + fs->e2fs->s_state &= ~EXT2_VALID_FS; /* set fs invalid */ } mp->mnt_data = ump; mp->mnt_stat.f_fsid.val[0] = dev2udev(dev); @@ -690,7 +690,7 @@ * ufs_bmap w/o changse! */ ump->um_nindir = EXT2_ADDR_PER_BLOCK(fs); - ump->um_bptrtodb = fs->s_es->s_log_block_size + 1; + ump->um_bptrtodb = fs->e2fs->s_log_block_size + 1; ump->um_seqinc = EXT2_FRAGS_PER_BLOCK(fs); if (ronly == 0) ext2_sbupdate(ump, MNT_WAIT); @@ -706,7 +706,7 @@ PICKUP_GIANT(); } if (ump) { - free(ump->um_e2fs->s_es, M_EXT2MNT); + free(ump->um_e2fs->e2fs, M_EXT2MNT); free(ump->um_e2fs, M_EXT2MNT); free(ump, M_EXT2MNT); mp->mnt_data = NULL; @@ -721,7 +721,7 @@ ext2_unmount(struct mount *mp, int mntflags) { struct ext2mount *ump; - struct ext2_sb_info *fs; + struct m_ext2fs *fs; int error, flags, ronly, i; flags = 0; @@ -734,25 +734,25 @@ return (error); ump = VFSTOEXT2(mp); fs = ump->um_e2fs; - ronly = fs->s_rd_only; + ronly = fs->e2fs_ronly; if (ronly == 0) { - if (fs->s_wasvalid) - fs->s_es->s_state |= EXT2_VALID_FS; + if (fs->e2fs_wasvalid) + fs->e2fs->s_state |= EXT2_VALID_FS; ext2_sbupdate(ump, MNT_WAIT); } /* release buffers containing group descriptors */ - for(i = 0; i < fs->s_gdb_count; i++) - ULCK_BUF(fs->s_group_desc[i]) - free(fs->s_group_desc, M_EXT2MNT); + for(i = 0; i < fs->e2fs_gdbcount; i++) + ULCK_BUF(fs->e2fs_group_desc[i]) + free(fs->e2fs_group_desc, M_EXT2MNT); /* release cached inode/block bitmaps */ for (i = 0; i < EXT2_MAX_GROUP_LOADED; i++) - if (fs->s_inode_bitmap[i]) - ULCK_BUF(fs->s_inode_bitmap[i]) + if (fs->e2fs_ib[i]) + ULCK_BUF(fs->e2fs_ib[i]) for (i = 0; i < EXT2_MAX_GROUP_LOADED; i++) - if (fs->s_block_bitmap[i]) - ULCK_BUF(fs->s_block_bitmap[i]) + if (fs->e2fs_bb[i]) + ULCK_BUF(fs->e2fs_bb[i]) DROP_GIANT(); g_topology_lock(); @@ -760,7 +760,7 @@ g_topology_unlock(); PICKUP_GIANT(); vrele(ump->um_devvp); - free(fs->s_es, M_EXT2MNT); + free(fs->e2fs, M_EXT2MNT); free(fs, M_EXT2MNT); free(ump, M_EXT2MNT); mp->mnt_data = NULL; @@ -790,14 +790,14 @@ ext2_statfs(struct mount *mp, struct statfs *sbp) { struct ext2mount *ump; - struct ext2_sb_info *fs; + struct m_ext2fs *fs; struct ext2_super_block *es; unsigned long overhead; int i, nsb; ump = VFSTOEXT2(mp); fs = ump->um_e2fs; - es = fs->s_es; + es = fs->e2fs; if (es->s_magic != EXT2_SUPER_MAGIC) panic("ext2_statfs - magic number spoiled"); @@ -807,16 +807,16 @@ */ if (es->s_feature_ro_compat & EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER) { nsb = 0; - for (i = 0 ; i < fs->s_groups_count; i++) + for (i = 0 ; i < fs->e2fs_gcount; i++) if (ext2_group_sparse(i)) nsb++; } else - nsb = fs->s_groups_count; + nsb = fs->e2fs_gcount; overhead = es->s_first_data_block + /* Superblocks and block group descriptors: */ - nsb * (1 + fs->s_gdb_count) + + nsb * (1 + fs->e2fs_gdbcount) + /* Inode bitmap, block bitmap, and inode table: */ - fs->s_groups_count * (1 + 1 + fs->s_itb_per_group); + fs->e2fs_gcount * (1 + 1 + fs->e2fs_itpg); sbp->f_bsize = EXT2_FRAG_SIZE(fs); sbp->f_iosize = EXT2_BLOCK_SIZE(fs); @@ -842,13 +842,13 @@ struct thread *td; struct inode *ip; struct ext2mount *ump = VFSTOEXT2(mp); - struct ext2_sb_info *fs; + struct m_ext2fs *fs; int error, allerror = 0; td = curthread; fs = ump->um_e2fs; - if (fs->s_dirt != 0 && fs->s_rd_only != 0) { /* XXX */ - printf("fs = %s\n", fs->fs_fsmnt); + if (fs->e2fs_fmod != 0 && fs->e2fs_ronly != 0) { /* XXX */ + printf("fs = %s\n", fs->e2fs_fsmnt); panic("ext2_sync: rofs mod"); } @@ -903,9 +903,9 @@ /* * Write back modified superblock. */ - if (fs->s_dirt != 0) { - fs->s_dirt = 0; - fs->s_es->s_wtime = time_second; + if (fs->e2fs_fmod != 0) { + fs->e2fs_fmod = 0; + fs->e2fs->s_wtime = time_second; if ((error = ext2_sbupdate(ump, waitfor)) != 0) allerror = error; } @@ -921,7 +921,7 @@ static int ext2_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) { - struct ext2_sb_info *fs; + struct m_ext2fs *fs; struct inode *ip; struct ext2mount *ump; struct buf *bp; @@ -972,7 +972,7 @@ /* Read in the disk contents for the inode, copy into the inode. */ if ((error = bread(ump->um_devvp, fsbtodb(fs, ino_to_fsba(fs, ino)), - (int)fs->s_blocksize, NOCRED, &bp)) != 0) { + (int)fs->e2fs_bsize, NOCRED, &bp)) != 0) { /* * The inode does not contain anything useful, so it would * be misleading to leave it on its hash chain. With mode @@ -999,7 +999,7 @@ * although for regular files and directories only */ if(S_ISDIR(ip->i_mode) || S_ISREG(ip->i_mode)) { - used_blocks = (ip->i_size+fs->s_blocksize-1) / fs->s_blocksize; + used_blocks = (ip->i_size+fs->e2fs_bsize-1) / fs->e2fs_bsize; for(i = used_blocks; i < EXT2_NDIR_BLOCKS; i++) ip->i_db[i] = 0; } @@ -1052,13 +1052,13 @@ struct inode *ip; struct ufid *ufhp; struct vnode *nvp; - struct ext2_sb_info *fs; + struct m_ext2fs *fs; int error; ufhp = (struct ufid *)fhp; fs = VFSTOEXT2(mp)->um_e2fs; if (ufhp->ufid_ino < ROOTINO || - ufhp->ufid_ino > fs->s_groups_count * fs->s_es->s_inodes_per_group) + ufhp->ufid_ino > fs->e2fs_gcount * fs->e2fs->s_inodes_per_group) return (ESTALE); error = VFS_VGET(mp, ufhp->ufid_ino, LK_EXCLUSIVE, &nvp); @@ -1084,8 +1084,8 @@ static int ext2_sbupdate(struct ext2mount *mp, int waitfor) { - struct ext2_sb_info *fs = mp->um_e2fs; - struct ext2_super_block *es = fs->s_es; + struct m_ext2fs *fs = mp->um_e2fs; + struct ext2_super_block *es = fs->e2fs; struct buf *bp; int error = 0; ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#6 (text+ko) ==== @@ -1203,7 +1203,7 @@ * so let's just redefine it - for this function only */ #undef DIRBLKSIZ -#define DIRBLKSIZ VTOI(dvp)->i_e2fs->s_blocksize +#define DIRBLKSIZ VTOI(dvp)->i_e2fs->e2fs_bsize dirtemplate.dotdot_reclen = DIRBLKSIZ - 12; error = vn_rdwr(UIO_WRITE, tvp, (caddr_t)&dirtemplate, sizeof (dirtemplate), (off_t)0, UIO_SYSSPACE, From owner-p4-projects@FreeBSD.ORG Thu Jun 4 21:01:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B87A1065676; Thu, 4 Jun 2009 21:01: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 BD93F106568A for ; Thu, 4 Jun 2009 21:01:40 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 941C58FC29 for ; Thu, 4 Jun 2009 21:01:40 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54L1emm045639 for ; Thu, 4 Jun 2009 21:01:40 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54L1eNm045637 for perforce@freebsd.org; Thu, 4 Jun 2009 21:01:40 GMT (envelope-from trasz@freebsd.org) Date: Thu, 4 Jun 2009 21:01:40 GMT Message-Id: <200906042101.n54L1eNm045637@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 21:01:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=163524 Change 163524 by trasz@trasz_victim on 2009/06/04 21:00:56 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifieee80211.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#4 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifieee80211.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.78 2009/03/26 21:29:38 sam Exp $ + * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.79 2009/06/04 18:22:21 sam Exp $ */ /*- @@ -2888,7 +2888,7 @@ case IEEE80211_ELEMID_TPCREQ: return " TPCREQ"; case IEEE80211_ELEMID_TPCREP: return " TPCREP"; case IEEE80211_ELEMID_SUPPCHAN: return " SUPPCHAN"; - case IEEE80211_ELEMID_CHANSWITCHANN:return " CSA"; + case IEEE80211_ELEMID_CSA: return " CSA"; case IEEE80211_ELEMID_MEASREQ: return " MEASREQ"; case IEEE80211_ELEMID_MEASREP: return " MEASREP"; case IEEE80211_ELEMID_QUIET: return " QUIET"; ==== //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.281 2009/06/04 16:18:07 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.282 2009/06/04 16:50:03 ps Exp $"); #include "opt_mac.h" @@ -594,8 +594,7 @@ (error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0) goto unlock; - if (vp->v_mount != NULL && - (vp->v_mount->mnt_kern_flag & MNTK_SHARED_WRITES) && + if (mp != NULL && (mp->mnt_kern_flag & MNTK_SHARED_WRITES) && (flags & FOF_OFFSET) != 0) { lock_flags = LK_SHARED; } else { From owner-p4-projects@FreeBSD.ORG Thu Jun 4 21:08:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 364CE106566B; Thu, 4 Jun 2009 21:08:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E85161065673 for ; Thu, 4 Jun 2009 21:08:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D3F868FC13 for ; Thu, 4 Jun 2009 21:08:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54L8qpO047123 for ; Thu, 4 Jun 2009 21:08:52 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54L8lDF047117 for perforce@freebsd.org; Thu, 4 Jun 2009 21:08:47 GMT (envelope-from trasz@freebsd.org) Date: Thu, 4 Jun 2009 21:08:47 GMT Message-Id: <200906042108.n54L8lDF047117@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 21:08:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=163525 Change 163525 by trasz@trasz_victim on 2009/06/04 21:07:56 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/ObsoleteFiles.inc#26 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#31 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/alias.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/histedit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/memalloc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/memalloc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/miscbltin.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/mkinit.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/mksyntax.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/sh.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/trap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/var.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/CHANGES#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/COPYRIGHT#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/FAQ#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/NSEC3-NOTES#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/README#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/README.idnkit#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/README.pkcs11#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/dighost.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/bind9.xsl#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/bind9.xsl.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/client.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/config.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/controlconf.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/convertxsl.pl#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/statschannel.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/interfacemgr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwaddr.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwdgnba.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwdnoop.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.docbook#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/server.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/statschannel.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/config.guess#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/config.h.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/configure.in#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM-book.xml#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.nsupdate.html#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/draft/update#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/format-options.pl#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/misc/sort-options.pl#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/index#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1032.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1033.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1034.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1035.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1101.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1122.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1123.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1183.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1348.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1535.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1536.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1537.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1591.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1611.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1612.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1706.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1712.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1750.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1876.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1886.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1982.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1995.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc1996.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2052.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2104.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2119.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2133.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2136.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2137.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2163.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2168.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2181.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2230.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2308.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2317.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2373.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2374.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2375.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2418.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2535.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2536.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2537.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2538.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2539.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2540.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2541.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2553.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2671.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2672.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2673.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2782.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2825.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2826.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2845.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2874.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2915.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2929.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2930.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc2931.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3007.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3008.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3071.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3090.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3110.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3123.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3152.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3197.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3225.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3226.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3258.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3363.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3364.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3425.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3445.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3467.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3490.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3491.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3492.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3493.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3513.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3596.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3597.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3645.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3655.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3658.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3757.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3833.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3845.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc3901.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4025.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4033.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4034.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4035.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4074.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4159.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4193.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4255.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4343.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4367.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4398.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4408.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4431.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4470.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4634.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4641.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4648.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc4701.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc5155.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/doc/rfc/rfc952.txt#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/Makefile.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/README#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/aclocal.m4#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/api#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/Makefile.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/daemon.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/ftruncate.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/mktemp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/putenv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/readv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/setenv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/setitimer.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strdup.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strerror.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strpbrk.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strsep.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/strtoul.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/utimes.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/bsd/writev.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/config.h.in#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/configure.in#4 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/Makefile.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/dst_api.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/dst_internal.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/hmac_link.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/md5.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/md5_dgst.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/md5_locl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/dst/support.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/Makefile.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/arpa/inet.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/arpa/nameser.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/fd_setsize.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/hesiod.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/irp.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/irs.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/assertions.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/ctl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/dst.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/eventlib.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/heap.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/list.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/logging.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/misc.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/platform.h.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/isc/tree.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/netdb.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/netgroup.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/res_update.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/resolv.h#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/include/resolv_mt.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/Makefile.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_addr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_data.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_net_pton.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_neta.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_netof.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_network.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_ntop.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/inet_pton.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/inet/nsap_addr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/Makefile.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns_gr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns_ho.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns_nw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns_pr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns_pw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/dns_sv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gai_strerror.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gen.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gen_gr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gen_ho.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gen_ng.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gen_nw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gen_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gen_pr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gen_pw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gen_sv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getgrent.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getgrent_r.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gethostent.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/gethostent_r.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getnameinfo.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getnetent.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getnetent_r.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getnetgrent.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getprotoent.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getpwent.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getpwent_r.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getservent.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/getservent_r.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/hesiod.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/hesiod_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp_gr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp_ho.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp_ng.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp_nw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp_pr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp_pw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irp_sv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irpmarshall.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irs_data.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irs_data.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/irs_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/lcl.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/lcl_gr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/lcl_ho.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/lcl_ng.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/lcl_nw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/lcl_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/lcl_pr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/lcl_pw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/lcl_sv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nis.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nis_gr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nis_ho.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nis_ng.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nis_nw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nis_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nis_pr.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nis_pw.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nis_sv.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/nul_ng.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/pathnames.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/irs/util.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/Makefile.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/assertions.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/assertions.mdoc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/base64.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/bitncmp.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ctl_p.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ctl_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ctl_srvr.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ev_connects.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ev_files.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ev_streams.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ev_timers.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/ev_waits.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/eventlib.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/eventlib_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/heap.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/heap.mdoc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/hex.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/logging.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/logging.mdoc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/logging_p.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/memcluster.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/movefile.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/tree.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/isc/tree.mdoc#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/make/includes.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/make/mkdep.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/make/rules.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/mkinstalldirs#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/Makefile.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/ns_date.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/ns_name.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/ns_netint.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/ns_parse.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/ns_print.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/ns_sign.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/nameser/ns_verify.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port/Makefile.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port/freebsd/Makefile.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port_after.h.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/port_before.h.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/Makefile.in#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/herror.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/mtctxres.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_comp.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_data.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_debug.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_debug.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_init.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_mkquery.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_private.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_query.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_send.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind/resolv/res_update.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/check.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/acache.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/api#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dispatch.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dlz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_parse.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_parse.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/acache.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/dispatch.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/dlz.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/iptable.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/nsec3.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/sdlz.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/iptable.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/nsec3.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/spf_99.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/spf_99.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/txt_16.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/request.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/resolver.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/spnego.asn1#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/spnego.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/spnego.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/spnego_asn1.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/spnego_asn1.pl#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/xfrin.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/alpha/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/alpha/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/api#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/assertions.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/base32.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/httpd.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/ia64/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/ia64/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/assertions.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/base32.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/hmacsha.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/httpd.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/iterated_hash.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/lex.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/msgs.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/portset.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/radix.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/resource.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/sha2.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/socket.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/stats.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/timer.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/types.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/include/isc/xml.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/iterated_hash.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/log.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/md5.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/mem.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/mips/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/mips/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/mips/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/mips/include/isc/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/mutexblock.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/netaddr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/netscope.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/nls/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/nls/msgcat.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/noatomic/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/noatomic/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/noatomic/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/noatomic/include/isc/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/nothreads/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/nothreads/condition.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/nothreads/include/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/nothreads/include/isc/Makefile.in#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/bind9/lib/isc/nothreads/include/isc/condition.h#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 4 22:42:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C44B91065693; Thu, 4 Jun 2009 22:42:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81902106568D for ; Thu, 4 Jun 2009 22:42:28 +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 6FB7C8FC13 for ; Thu, 4 Jun 2009 22:42:28 +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 n54MgSju055606 for ; Thu, 4 Jun 2009 22:42:28 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54MgSlt055604 for perforce@freebsd.org; Thu, 4 Jun 2009 22:42:28 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 4 Jun 2009 22:42:28 GMT Message-Id: <200906042242.n54MgSlt055604@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 163529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 22:42:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=163529 Change 163529 by thompsa@thompsa_burger on 2009/06/04 22:42:02 Nuke usb2_transfer_pending(). Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#9 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#9 (text+ko) ==== @@ -549,7 +549,6 @@ usb_frcount_t frindex); void usb2_transfer_clear_stall(struct usb_pipe *pipe); void usb2_transfer_set_stall(struct usb_pipe *pipe); -uint8_t usb2_transfer_pending(struct usb_pipe *pipe); void usb2_transfer_start(struct usb_urb *urb); void usb2_transfer_unsetup(struct usb_pipe **pipe, uint16_t n_setup); void usb2_set_parent_iface(struct usb_device *udev, uint8_t iface_index, ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#9 (text+ko) ==== @@ -999,13 +999,8 @@ return (EINVAL); } urb = usb_get_urb(pipe, 0); - - mtx_lock(f->priv_mtx); - if (usb2_transfer_pending(pipe)) { - mtx_unlock(f->priv_mtx); + if (urb == NULL) return (EBUSY); /* should not happen */ - } - mtx_unlock(f->priv_mtx); error = copyin(f->fs_ep_ptr + ep_index, &fs_ep, sizeof(fs_ep)); @@ -1180,13 +1175,8 @@ return (EINVAL); urb = usb_get_urb(pipe, 0); - - mtx_lock(f->priv_mtx); - if (usb2_transfer_pending(pipe)) { - mtx_unlock(f->priv_mtx); + if (urb == NULL) return (EBUSY); /* should not happen */ - } - mtx_unlock(f->priv_mtx); fs_ep_uptr = f->fs_ep_ptr + ep_index; error = copyin(fs_ep_uptr, &fs_ep, sizeof(fs_ep)); @@ -1501,6 +1491,7 @@ error = EINVAL; break; } +#if 0 mtx_lock(f->priv_mtx); error = usb2_transfer_pending(f->fs_pipe[u.pstall->ep_index]); mtx_unlock(f->priv_mtx); @@ -1508,6 +1499,7 @@ if (error) { return (EBUSY); } +#endif ep = f->fs_pipe[u.pstall->ep_index]->endpoint; /* setup a clear-stall packet */ ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#9 (text+ko) ==== @@ -1661,54 +1661,6 @@ } /*------------------------------------------------------------------------* - * usb2_transfer_pending - * - * This function will check if an USB transfer is pending which is a - * little bit complicated! - * Return values: - * 0: Not pending - * 1: Pending: The USB transfer will receive a callback in the future. - *------------------------------------------------------------------------*/ -uint8_t -usb2_transfer_pending(struct usb_pipe *pipe) -{ - struct usb_xfer_root *info; - struct usb_xfer_queue *pq; - - USB_PIPE_LOCK_ASSERT(pipe, MA_OWNED); - - if (TAILQ_FIRST(&pipe->urb_free_q) == NULL) - return (1); - - if (pipe->urb_curr == (&pipe->urb0)) { - /* XXX */ - USB_BUS_UNLOCK(pipe->xroot->bus); - return (1); - } - if (pipe->flags_int.transferring) { - /* trivial case */ - return (1); - } - USB_BUS_LOCK(pipe->xroot->bus); - if ((&pipe->urb0)->wait_queue) { - /* we are waiting on a queue somewhere */ - USB_BUS_UNLOCK(pipe->xroot->bus); - return (1); - } - info = pipe->xroot; - pq = &info->done_q; - - if (pq->curr == (&pipe->urb0)) { - /* we are currently scheduled for callback */ - USB_BUS_UNLOCK(pipe->xroot->bus); - return (1); - } - /* we are not pending */ - USB_BUS_UNLOCK(pipe->xroot->bus); - return (0); -} - -/*------------------------------------------------------------------------* * usb_pipe_drain * * This function will stop the USB transfer and wait for any From owner-p4-projects@FreeBSD.ORG Thu Jun 4 22:46:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08998106566C; Thu, 4 Jun 2009 22:46:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD1CF106564A for ; Thu, 4 Jun 2009 22:46:32 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AB5678FC08 for ; Thu, 4 Jun 2009 22:46:32 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54MkWrc055915 for ; Thu, 4 Jun 2009 22:46:32 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54MkWob055913 for perforce@freebsd.org; Thu, 4 Jun 2009 22:46:32 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 4 Jun 2009 22:46:32 GMT Message-Id: <200906042246.n54MkWob055913@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 163530 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 22:46:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=163530 Change 163530 by thompsa@thompsa_burger on 2009/06/04 22:46:00 Nuke usb2_transfer_start() Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#10 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#10 (text+ko) ==== @@ -549,7 +549,6 @@ usb_frcount_t frindex); void usb2_transfer_clear_stall(struct usb_pipe *pipe); void usb2_transfer_set_stall(struct usb_pipe *pipe); -void usb2_transfer_start(struct usb_urb *urb); void usb2_transfer_unsetup(struct usb_pipe **pipe, uint16_t n_setup); void usb2_set_parent_iface(struct usb_device *udev, uint8_t iface_index, uint8_t parent_index); From owner-p4-projects@FreeBSD.ORG Thu Jun 4 22:58:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E2261065675; Thu, 4 Jun 2009 22:58:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DBF0106566B for ; Thu, 4 Jun 2009 22:58:45 +0000 (UTC) (envelope-from tatsianka@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A79D8FC1A for ; Thu, 4 Jun 2009 22:58:45 +0000 (UTC) (envelope-from tatsianka@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54MwjrA056755 for ; Thu, 4 Jun 2009 22:58:45 GMT (envelope-from tatsianka@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54Mwj7x056753 for perforce@freebsd.org; Thu, 4 Jun 2009 22:58:45 GMT (envelope-from tatsianka@FreeBSD.org) Date: Thu, 4 Jun 2009 22:58:45 GMT Message-Id: <200906042258.n54Mwj7x056753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to tatsianka@FreeBSD.org using -f From: Tatsiana Severyna To: Perforce Change Reviews Cc: Subject: PERFORCE change 163531 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 22:58:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=163531 Change 163531 by tatsianka@tatsianka_zonder on 2009/06/04 22:57:52 Some fixes in puffs (but some important code paths are not ported yet). Add libpuffs port. Add puffs nullfs implementation - pnullfs. Affected files ... .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/Makefile#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/callcontext.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/creds.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/dirent_compat.h#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/dispatcher.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/flush.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/framebuf.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/null.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/opdump.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/paths.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/pnode.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs.3#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs.h#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs_cc.3#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs_cred.3#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs_flush.3#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs_framebuf.3#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs_node.3#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs_ops.3#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs_path.3#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs_priv.h#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffs_suspend.3#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/puffsdump.h#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/requests.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/subr.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/libpuffs/suspend.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/pnullfs/Makefile#1 add .. //depot/projects/soc2009/tatsianka_puffs/pnullfs/pnullfs.c#1 add .. //depot/projects/soc2009/tatsianka_puffs/puffs/Makefile#2 edit .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_msgif.c#2 edit .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_msgif.h#2 edit .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_node.c#2 edit .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_subr.c#2 edit .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_sys.h#2 edit .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_vfsops.c#2 edit .. //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_vnops.c#2 edit .. //depot/projects/soc2009/tatsianka_puffs/putter/Makefile#2 edit Differences ... ==== //depot/projects/soc2009/tatsianka_puffs/puffs/Makefile#2 (text+ko) ==== @@ -8,4 +8,4 @@ .include -CFLAGS+= -I../putter +CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../putter ==== //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_msgif.c#2 (text+ko) ==== @@ -51,10 +51,6 @@ #include #include -#ifdef XXX_TS -#include /* XXX: for syncer_mutex reference */ -#endif - /* * waitq data structures */ @@ -117,7 +113,7 @@ puffs_msgif_init() { - parkpc = uma_zcreate("puffprkl", sizeof(struct puffs_msgpark), + parkpc = uma_zcreate("puffprkl", sizeof(struct puffs_msgpark), NULL, NULL, makepark, nukepark, UMA_ALIGN_PTR, UMA_ZONE_ZINIT); } @@ -776,12 +772,7 @@ puffsop_flush(struct puffs_mount *pmp, struct puffs_flush *pf) { struct vnode *vp; -#ifdef XXX_TS - off_t offlo, offhi; - int rv, flags = 0; -#else int rv; -#endif if (pf->pf_req.preq_pth.pth_framelen != sizeof(struct puffs_flush)) { rv = EINVAL; @@ -939,10 +930,8 @@ * wait for syncer_mutex. Otherwise the mointpoint can be * wiped out while we wait. XXX Should be done earlier */ -#ifdef XXX_TS - atomic_inc_uint((unsigned int*)&mp->mnt_refcnt); -#endif - /* FIXME */ + /* XXX_TS */ + vfs_ref(mp); mtx_lock(&Giant); /* dounmount() */ (void)dounmount(mp, MNT_FORCE, curthread); mtx_unlock(&Giant); /* dounmount() */ @@ -990,7 +979,7 @@ * on the queue and move on to the next one. */ if (park->park_flags & PARKFLAG_WAITERGONE) { - KASSERT((park->park_flags & PARKFLAG_CALL) == 0, + KASSERT((park->park_flags & PARKFLAG_CALL) == 0, ("park_flags & PARKFLAG_CALL == 0")); KASSERT(park->park_flags & PARKFLAG_WANTREPLY, ("park_flags & PARKFLAG_WANTREPLY")); ==== //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_msgif.h#2 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -109,7 +110,7 @@ #define PUFFS_TYPELEN (MFSNAMELEN - (sizeof(PUFFS_TYPEPREFIX)+1)) #define PUFFS_NAMELEN (MNAMELEN-1) -/* +/* * Just a weak typedef for code clarity. Additionally, we have a * more appropriate vanity type for puffs: * it should be croissant, not cookie. @@ -193,7 +194,7 @@ /* * Flush operation. This can be used to invalidate: * 1) name cache for one node - * 2) name cache for all children + * 2) name cache for all children * 3) name cache for the entire mount * 4) page cache for a set of ranges in one node * 5) page cache for one entire node @@ -577,7 +578,7 @@ struct puffs_req pcache_pr; int pcache_type; - size_t pcache_nruns; + size_t pcache_nruns; struct puffs_cacherun pcache_runs[0]; }; #define PCACHE_TYPE_READ 0 ==== //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_node.c#2 (text+ko) ==== @@ -53,20 +53,6 @@ #include #include -#ifdef XXX_TS -#include -#include - -static const struct genfs_ops puffs_genfsops = { - .gop_size = puffs_gop_size, - .gop_write = genfs_gop_write, - .gop_markupdate = puffs_gop_markupdate, -#if 0 - .gop_alloc, should ask userspace -#endif -}; -#endif - static __inline struct puffs_node_hashlist *puffs_cookie2hashlist(struct puffs_mount *, puffs_cookie_t); static struct puffs_node *puffs_cookie2pnode(struct puffs_mount *, @@ -161,7 +147,7 @@ break; default: panic("puffs_getvnode: invalid vtype %d", type); - } + } #endif pnode = uma_zalloc(puffs_pnpool, M_WAITOK); @@ -327,7 +313,6 @@ return pnode; } -#ifdef XXX_TS /* fix vget and locking */ /* * Make sure root vnode exists and reference it. Does NOT lock. */ @@ -347,9 +332,9 @@ mtx_lock(&pmp->pmp_lock); vp = pmp->pmp_root; if (vp) { - mtx_lock(&vp->v_interlock); + VI_LOCK(vp); mtx_unlock(&pmp->pmp_lock); - if (vget(vp, LK_INTERLOCK) == 0) + if (vget(vp, LK_INTERLOCK, curthread) == 0) return 0; } else mtx_unlock(&pmp->pmp_lock); @@ -371,7 +356,7 @@ mtx_unlock(&pmp->pmp_lock); puffs_putvnode(vp); goto retry; - } + } /* store cache */ vp->v_vflag |= VV_ROOT; @@ -425,19 +410,18 @@ return PUFFS_NOSUCHCOOKIE; } vp = pnode->pn_vp; - mtx_lock(&vp->v_interlock); + VI_LOCK(vp); mtx_unlock(&pmp->pmp_lock); vgetflags = LK_INTERLOCK; if (lock) vgetflags |= LK_EXCLUSIVE | LK_RETRY; - if ((rv = vget(vp, vgetflags))) + if ((rv = vget(vp, vgetflags, curthread))) return rv; *vpp = vp; return 0; } -#endif void puffs_updatenode(struct puffs_node *pn, int flags, off_t size) ==== //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_subr.c#2 (text+ko) ==== @@ -120,10 +120,7 @@ } } -#ifdef XXX_TS - /* XXX should be bio ??? */ - biodone(bp); -#endif + bdone(bp); } void @@ -146,10 +143,7 @@ } } -#ifdef XXX_TS - /* XXX should be bio ??? */ - biodone(bp); -#endif + bdone(bp); } /* XXX: userspace can leak kernel resources */ @@ -193,30 +187,6 @@ } void -puffs_gop_size(struct vnode *vp, off_t size, off_t *eobp, - int flags) -{ - - *eobp = size; -} - -void -puffs_gop_markupdate(struct vnode *vp, int flags) -{ - int uflags = 0; - -#ifdef XXX_TS - /* different beast in freebsd */ - if (flags & GOP_UPDATE_ACCESSED) - uflags |= PUFFS_UPDATEATIME; - if (flags & GOP_UPDATE_MODIFIED) - uflags |= PUFFS_UPDATEMTIME; -#endif - - puffs_updatenode(VPTOPP(vp), uflags, 0); -} - -void puffs_senderr(struct puffs_mount *pmp, int type, int error, const char *str, puffs_cookie_t ck) { ==== //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_sys.h#2 (text+ko) ==== @@ -225,9 +225,6 @@ void puffs_mp_reference(struct puffs_mount *); void puffs_mp_release(struct puffs_mount *); -void puffs_gop_size(struct vnode *, off_t, off_t *, int); -void puffs_gop_markupdate(struct vnode *, int); - void puffs_senderr(struct puffs_mount *, int, int, const char *, puffs_cookie_t); ==== //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_vfsops.c#2 (text+ko) ==== @@ -526,4 +526,5 @@ }; VFS_SET(puffs_vfsops, puffs, VFCF_NETWORK); +MODULE_DEPEND(puffs, putter, 1, 1, 1); ==== //depot/projects/soc2009/tatsianka_puffs/puffs/puffs_vnops.c#2 (text+ko) ==== @@ -108,7 +108,6 @@ * don't want to think of the consequences for the time being. */ -/* XXX_TS TEST TEST TEST */ static int puffs_vnop_vptofh(struct vop_vptofh_args *ap) { @@ -162,7 +161,7 @@ static int puffs_vnop_lookup(struct vop_cachedlookup_args *ap) { - + PUFFS_MSG_VARS(vn, lookup); struct puffs_mount *pmp; struct componentname *cnp; @@ -728,10 +727,10 @@ * => resid + cookiesize/minsize * resid = maxreq * => (cookiesize/minsize + 1) * resid = maxreq * => resid = maxreq / (cookiesize/minsize + 1) - * + * * Since cookiesize <= minsize and we're not very big on floats, * we approximate that to be 1. Therefore: - * + * * resid = maxreq / 2; * * Well, at least we didn't have to use differential equations @@ -836,7 +835,7 @@ /* flush out information from our metacache, see vop_setattr */ if (pn->pn_stat & PNODE_METACACHE_MASK) { vattr_null(&va); - error = VOP_SETATTR(vp, &va, FSCRED); + error = VOP_SETATTR(vp, &va, FSCRED); if (error) return error; } @@ -1538,7 +1537,7 @@ NULL, error); PUFFS_MSG_RELEASE(print); } - + return 0; } @@ -1745,7 +1744,7 @@ */ if (dofaf && error == 0) moved = tomove; - else + else moved = tomove - rw_msg->pvnr_resid; bp->b_resid = bp->b_bcount - moved; @@ -1808,7 +1807,7 @@ int puffs_vnop_mmap(void *); #endif -struct vop_vector tmpfs_vnodeop_entries = { +struct vop_vector puffs_vnodeops = { .vop_default = &default_vnodeops, .vop_lookup = vfs_cache_lookup, .vop_cachedlookup = puffs_vnop_lookup, ==== //depot/projects/soc2009/tatsianka_puffs/putter/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/putter - KMOD= putter SRCS= putter.c putter.h putter_sys.h +CFLAGS+= -I${.CURDIR} + .include From owner-p4-projects@FreeBSD.ORG Thu Jun 4 22:58:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7981B106573B; Thu, 4 Jun 2009 22:58:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6338A106566C for ; Thu, 4 Jun 2009 22:58:45 +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 5057B8FC1D for ; Thu, 4 Jun 2009 22:58:45 +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 n54MwjCU056760 for ; Thu, 4 Jun 2009 22:58:45 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54MwjVl056758 for perforce@freebsd.org; Thu, 4 Jun 2009 22:58:45 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 4 Jun 2009 22:58:45 GMT Message-Id: <200906042258.n54MwjVl056758@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 163532 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 04 Jun 2009 22:58:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=163532 Change 163532 by thompsa@thompsa_burger on 2009/06/04 22:58:04 Rename usb2_transfer_setup and usb2_transfer_unsetup Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#10 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#8 (text+ko) ==== @@ -720,7 +720,7 @@ /* optimize */ return (0); } - usb2_transfer_unsetup(uhe->bsd_xfer, 2); + usb_pipe_close(uhe->bsd_xfer, 2); uhe->fbsd_buf_size = bufsize; @@ -759,8 +759,8 @@ /* Allocate and setup two generic FreeBSD USB transfers */ - if (usb2_transfer_setup(dev, &uhe->bsd_iface_index, - uhe->bsd_xfer, cfg, 2, uhe, &Giant)) { + if (usb_pipe_open(dev, &uhe->bsd_iface_index, + uhe->bsd_xfer, cfg, 2, uhe)) { return (-EINVAL); } } else { @@ -779,8 +779,8 @@ cfg[0].flags.proxy_buffer = 1; cfg[0].flags.short_xfer_ok = 1; - if (usb2_transfer_setup(dev, &uhe->bsd_iface_index, - uhe->bsd_xfer, cfg, 1, uhe, &Giant)) { + if (usb_pipe_open(dev, &uhe->bsd_iface_index, + uhe->bsd_xfer, cfg, 1, uhe)) { return (-EINVAL); } } ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#11 (text+ko) ==== @@ -539,17 +539,12 @@ enum usb_hc_mode usb2_get_mode(struct usb_device *udev); enum usb_dev_speed usb2_get_speed(struct usb_device *udev); uint32_t usb2_get_isoc_fps(struct usb_device *udev); -usb_error_t usb2_transfer_setup(struct usb_device *udev, - const uint8_t *ifaces, struct usb_pipe **pipe, - const struct usb_config *setup_start, uint16_t n_setup, - void *priv_sc, struct mtx *priv_mtx); void usb2_set_frame_data(struct usb_pipe *pipe, void *ptr, usb_frcount_t frindex); void usb2_set_frame_offset(struct usb_pipe *pipe, usb_frlength_t offset, usb_frcount_t frindex); void usb2_transfer_clear_stall(struct usb_pipe *pipe); void usb2_transfer_set_stall(struct usb_pipe *pipe); -void usb2_transfer_unsetup(struct usb_pipe **pipe, uint16_t n_setup); void usb2_set_parent_iface(struct usb_device *udev, uint8_t iface_index, uint8_t parent_index); uint8_t usb2_get_bus_index(struct usb_device *udev); @@ -564,6 +559,11 @@ void usb_free_urb(struct usb_urb *); void usb_submit_urb(struct usb_urb *urb); void usb_submit_urb_sync(struct usb_urb *urb); +usb_error_t usb_pipe_open(struct usb_device *udev, + const uint8_t *ifaces, struct usb_pipe **pipe, + const struct usb_config *setup_start, uint16_t n_setup, + void *priv_sc); +void usb_pipe_close(struct usb_pipe **pipe, uint16_t n_setup); void usb_pipe_halt(struct usb_pipe *pipe); void usb_pipe_drain(struct usb_pipe *pipe); #endif /* _USB2_CORE_H_ */ ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#10 (text+ko) ==== @@ -1965,14 +1965,14 @@ if (udev->flags.usb_mode == USB_MODE_DEVICE) { /* stop receiving any control transfers (Device Side Mode) */ - usb2_transfer_unsetup(udev->default_pipe, USB_DEFAULT_XFER_MAX); + usb_pipe_close(udev->default_pipe, USB_DEFAULT_XFER_MAX); } /* the following will get the device unconfigured in software */ usb2_unconfigure(udev, flag); /* unsetup any leftover default USB transfers */ - usb2_transfer_unsetup(udev->default_pipe, USB_DEFAULT_XFER_MAX); + usb_pipe_close(udev->default_pipe, USB_DEFAULT_XFER_MAX); /* template unsetup, if any */ (usb2_temp_unsetup_p) (udev); ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#10 (text+ko) ==== @@ -125,11 +125,10 @@ mtx_unlock(f->priv_mtx); /* - * "usb2_transfer_setup()" can sleep so one needs to make a wrapper, + * "usb_pipe_open()" can sleep so one needs to make a wrapper, * exiting the mutex and checking things */ - error = usb2_transfer_setup(udev, &iface_index, f->pipe, - setup, n_setup, f, f->priv_mtx); + error = usb_pipe_open(udev, &iface_index, f->pipe, setup, n_setup, f); if (error == 0) { if (f->pipe[0]->nframes == 1) { @@ -141,7 +140,7 @@ 2 * f->pipe[0]->nframes); } if (error) { - usb2_transfer_unsetup(f->pipe, n_setup); + usb_pipe_close(f->pipe, n_setup); } } mtx_lock(f->priv_mtx); @@ -195,7 +194,7 @@ usb_pipe_halt(f->pipe[1]); mtx_unlock(f->priv_mtx); - usb2_transfer_unsetup(f->pipe, 2); + usb_pipe_close(f->pipe, 2); usb2_fifo_free_buffer(f); if (ugen_fs_uninit(f)) { @@ -920,7 +919,7 @@ if (f->fs_pipe == NULL) { return (EINVAL); } - usb2_transfer_unsetup(f->fs_pipe, f->fs_ep_max); + usb_pipe_close(f->fs_pipe, f->fs_ep_max); free(f->fs_pipe, M_USB); f->fs_pipe = NULL; f->fs_ep_max = 0; @@ -1450,9 +1449,8 @@ } } } - error = usb2_transfer_setup(f->udev, &iface_index, - f->fs_pipe + u.popen->ep_index, usb_config, 1, - f, f->priv_mtx); + error = usb_pipe_open(f->udev, &iface_index, + f->fs_pipe + u.popen->ep_index, usb_config, 1, f); if (error == 0) { /* update maximums */ u.popen->max_packet_length = @@ -1475,7 +1473,7 @@ error = EINVAL; break; } - usb2_transfer_unsetup(f->fs_pipe + u.pclose->ep_index, 1); + usb_pipe_close(f->fs_pipe + u.pclose->ep_index, 1); break; case USB_FS_CLEAR_STALL_SYNC: ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#9 (text+ko) ==== @@ -752,8 +752,8 @@ err = 0; } else { /* normal HUB */ - err = usb2_transfer_setup(udev, &iface_index, sc->sc_xfer, - uhub_config, UHUB_N_TRANSFER, sc, &Giant); + err = usb_pipe_open(udev, &iface_index, sc->sc_xfer, + uhub_config, UHUB_N_TRANSFER, sc); } if (err) { DPRINTFN(0, "cannot setup interrupt transfer, " @@ -841,7 +841,7 @@ return (0); error: - usb2_transfer_unsetup(sc->sc_xfer, UHUB_N_TRANSFER); + usb_pipe_close(sc->sc_xfer, UHUB_N_TRANSFER); if (udev->hub) { free(udev->hub, M_USBDEV); @@ -883,7 +883,7 @@ USB_UNCFG_FLAG_FREE_EP0); } - usb2_transfer_unsetup(sc->sc_xfer, UHUB_N_TRANSFER); + usb_pipe_close(sc->sc_xfer, UHUB_N_TRANSFER); free(hub, M_USBDEV); sc->sc_udev->hub = NULL; ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#6 (text+ko) ==== @@ -510,9 +510,8 @@ mtx_init(&sc->mtx, "USB autoinstall", NULL, MTX_DEF); usb2_cv_init(&sc->cv, "WBBB"); - err = usb2_transfer_setup(udev, - &iface_index, sc->xfer, bbb_config, - ST_MAX, sc, &sc->mtx); + err = usb_pipe_open(udev, &iface_index, sc->xfer, bbb_config, + ST_MAX, sc); if (err) { goto done; @@ -566,7 +565,7 @@ done: mtx_unlock(&sc->mtx); - usb2_transfer_unsetup(sc->xfer, ST_MAX); + usb_pipe_close(sc->xfer, ST_MAX); mtx_destroy(&sc->mtx); usb2_cv_destroy(&sc->cv); free(sc, M_USB); ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#10 (text+ko) ==== @@ -90,7 +90,6 @@ static void usb2_callback_ss_done_defer(struct usb_urb *); static void usb2_callback_wrapper(struct usb_xfer_queue *); static void usb2_dma_delay_done_cb(void *); -//static void usb2_transfer_start_cb(void *); static uint8_t usb2_callback_wrapper_sub(struct usb_urb *); static void usb2_get_std_packet_size(struct usb2_std_packet_size *ptr, uint8_t type, enum usb_dev_speed speed); @@ -710,10 +709,10 @@ } /*------------------------------------------------------------------------* - * usb2_transfer_setup - setup an array of USB transfers + * usb_pipe_open - setup an array of USB transfers * - * NOTE: You must always call "usb2_transfer_unsetup" after calling - * "usb2_transfer_setup" if success was returned. + * NOTE: You must always call "usb_pipe_close" after calling + * "usb_pipe_open" if success was returned. * * The idea is that the USB device driver should pre-allocate all its * transfers by one call to this function. @@ -723,10 +722,10 @@ * Else: Failure *------------------------------------------------------------------------*/ usb_error_t -usb2_transfer_setup(struct usb_device *udev, +usb_pipe_open(struct usb_device *udev, const uint8_t *ifaces, struct usb_pipe **ppxfer, const struct usb_config *setup_start, uint16_t n_setup, - void *priv_sc, struct mtx *fer_mtx) + void *priv_sc) { struct usb_pipe dummy; struct usb_setup_params parm; @@ -744,7 +743,7 @@ info = NULL; WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "usb2_transfer_setup can sleep!"); + "usb_pipe_open can sleep!"); /* do some checking first */ @@ -1040,7 +1039,7 @@ } } if (parm.err) { - usb2_transfer_unsetup(ppxfer, n_setup); + usb_pipe_close(ppxfer, n_setup); } return (parm.err); } @@ -1098,21 +1097,21 @@ } /*------------------------------------------------------------------------* - * usb2_transfer_unsetup - unsetup/free an array of USB transfers + * usb_pipe_close - unsetup/free an array of USB transfers * * NOTE: All USB transfers in progress will get called back passing * the error code "USB_ERR_CANCELLED" before this function * returns. *------------------------------------------------------------------------*/ void -usb2_transfer_unsetup(struct usb_pipe **pxfer, uint16_t n_setup) +usb_pipe_close(struct usb_pipe **pxfer, uint16_t n_setup) { struct usb_pipe *pipe; struct usb_xfer_root *info; uint8_t needs_delay = 0; WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, - "usb2_transfer_unsetup can sleep!"); + "usb_pipe_close can sleep!"); while (n_setup--) { pipe = pxfer[n_setup]; @@ -1653,7 +1652,7 @@ /* * Any additional DMA delay is done by - * "usb2_transfer_unsetup()". + * "usb_pipe_close()". */ } @@ -2471,16 +2470,15 @@ /* * Unsetup any existing USB transfer: */ - usb2_transfer_unsetup(udev->default_pipe, USB_DEFAULT_XFER_MAX); + usb_pipe_close(udev->default_pipe, USB_DEFAULT_XFER_MAX); /* * Try to setup a new USB transfer for the * default control endpoint: */ iface_index = 0; - if (usb2_transfer_setup(udev, &iface_index, - udev->default_pipe, usb2_control_ep_cfg, USB_DEFAULT_XFER_MAX, NULL, - udev->default_mtx)) { + if (usb_pipe_open(udev, &iface_index, udev->default_pipe, + usb2_control_ep_cfg, USB_DEFAULT_XFER_MAX, NULL)) { DPRINTFN(0, "could not setup default " "USB transfer!\n"); } else { From owner-p4-projects@FreeBSD.ORG Fri Jun 5 00:26:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2807B1065672; Fri, 5 Jun 2009 00:26: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 DB83D106564A for ; Fri, 5 Jun 2009 00:26:14 +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 C7C8B8FC0A for ; Fri, 5 Jun 2009 00:26:14 +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 n550QEFu065808 for ; Fri, 5 Jun 2009 00:26:14 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n550QEQ5065806 for perforce@freebsd.org; Fri, 5 Jun 2009 00:26:14 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 5 Jun 2009 00:26:14 GMT Message-Id: <200906050026.n550QEQ5065806@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 163535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 00:26:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=163535 Change 163535 by thompsa@thompsa_burger on 2009/06/05 00:25:18 Reorganise includes. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_mbus.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_pci.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_atmelarm.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_pci.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci_pci.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb.h#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.c#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_defs.h#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_parse.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_revision.h#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#2 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#7 (text+ko) ==== @@ -44,9 +44,30 @@ * endpoints, Function-address and more. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #define USB_DEBUG_VAR at91dcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 (text+ko) ==== @@ -26,9 +26,30 @@ * SUCH DAMAGE. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include +#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#7 (text+ko) ==== @@ -36,9 +36,30 @@ * endpoints, Function-address and more. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #define USB_DEBUG_VAR atmegadci_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 (text+ko) ==== @@ -26,7 +26,28 @@ * SUCH DAMAGE. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include +#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#7 (text+ko) ==== @@ -36,9 +36,30 @@ * endpoints, Function-address and more. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #define USB_DEBUG_VAR avr32dci_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#9 (text+ko) ==== @@ -46,9 +46,30 @@ #include __FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci.c,v 1.22 2009/05/29 18:46:57 thompsa Exp $"); +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #define USB_DEBUG_VAR ehcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 (text+ko) ==== @@ -31,8 +31,29 @@ #include "opt_bus.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 ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_mbus.c#2 (text+ko) ==== @@ -38,8 +38,29 @@ #include "opt_bus.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 ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_pci.c#2 (text+ko) ==== @@ -52,8 +52,29 @@ * sharing of code between *BSD's */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include +#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#7 (text+ko) ==== @@ -36,9 +36,30 @@ * NOTE: The current implementation only supports Device Side Mode! */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #define USB_DEBUG_VAR musbotgdebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 (text+ko) ==== @@ -24,8 +24,29 @@ * SUCH DAMAGE. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include +#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#7 (text+ko) ==== @@ -35,9 +35,30 @@ * USB spec: http://www.usb.org/developers/docs/usbspec.zip */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #define USB_DEBUG_VAR ohcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_atmelarm.c#2 (text+ko) ==== @@ -25,8 +25,29 @@ #include __FBSDID("$FreeBSD: src/sys/dev/usb/controller/ohci_atmelarm.c,v 1.4 2009/04/06 00:32:54 thompsa Exp $"); +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include +#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_pci.c#2 (text+ko) ==== @@ -49,9 +49,30 @@ * sharing of code between *BSD's */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#7 (text+ko) ==== @@ -38,9 +38,30 @@ * ftp://download.intel.com/design/intarch/datashts/29056201.pdf */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #define USB_DEBUG_VAR uhcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci_pci.c#2 (text+ko) ==== @@ -48,8 +48,29 @@ * sharing of code between *BSD's */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include +#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#6 (text+ko) ==== @@ -24,9 +24,30 @@ * SUCH DAMAGE. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #define USB_DEBUG_VAR usb2_ctrl_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#7 (text+ko) ==== @@ -32,10 +32,31 @@ * NOTE: The datasheet does not document everything. */ +#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 USB_DEBUG_VAR uss820dcidebug ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 (text+ko) ==== @@ -27,8 +27,29 @@ * SUCH DAMAGE. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include +#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#4 (text+ko) ==== @@ -26,7 +26,6 @@ #include #include -#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#3 (text+ko) ==== @@ -26,9 +26,30 @@ * SUCH DAMAGE. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #include "usbdevs.h" #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/usb.h#4 (text+ko) ==== @@ -39,8 +39,40 @@ #ifndef _USB2_STANDARD_H_ #define _USB2_STANDARD_H_ +#if defined(_KERNEL) +#include "opt_usb.h" + +#include + +MALLOC_DECLARE(M_USB); +MALLOC_DECLARE(M_USBDEV); +MALLOC_DECLARE(M_USBHC); +#endif /* _KERNEL */ + #include +#define USB_STACK_VERSION 2000 /* 2.0 */ + +/* Definition of some hardcoded USB constants. */ + +#define USB_MAX_IPACKET 8 /* initial USB packet size */ +#define USB_EP_MAX (2*16) /* hardcoded */ +#define USB_ROOT_HUB_ADDR 1 /* index */ +#define USB_MIN_DEVICES 2 /* unused + root HUB */ +#define USB_UNCONFIG_INDEX 0xFF /* internal use only */ +#define USB_IFACE_INDEX_ANY 0xFF /* internal use only */ +#define USB_START_ADDR 0 /* default USB device BUS address + * after USB bus reset */ +#define USB_CONTROL_ENDPOINT 0 /* default control endpoint */ + +#define USB_FRAMES_PER_SECOND_FS 1000 /* full speed */ +#define USB_FRAMES_PER_SECOND_HS 8000 /* high speed */ + +#define USB_FS_BYTES_PER_HS_UFRAME 188 /* bytes */ +#define USB_HS_MICRO_FRAMES_MAX 8 /* units */ + +#define USB_ISOC_TIME_MAX 128 /* ms */ + /* * Minimum time a device needs to be powered down to go through a * power cycle. These values are not in the USB specification. @@ -642,4 +674,51 @@ } __packed; typedef struct usb_port_status usb_port_status_t; +/* + * The "USB_SPEED" macros defines all the supported USB speeds. + */ +enum usb_dev_speed { + USB_SPEED_VARIABLE, + USB_SPEED_LOW, + USB_SPEED_FULL, + USB_SPEED_HIGH, + USB_SPEED_SUPER, +}; +#define USB_SPEED_MAX (USB_SPEED_SUPER+1) + +/* + * The "USB_REV" macros defines all the supported USB revisions. + */ +enum usb_revision { + USB_REV_UNKNOWN, + USB_REV_PRE_1_0, + USB_REV_1_0, + USB_REV_1_1, + USB_REV_2_0, + USB_REV_2_5, + USB_REV_3_0 +}; +#define USB_REV_MAX (USB_REV_3_0+1) + +/* + * Supported host contoller modes. + */ +enum usb_hc_mode { + USB_MODE_HOST, /* initiates transfers */ + USB_MODE_DEVICE, /* bus transfer target */ + USB_MODE_DUAL /* can be host or device */ +}; +#define USB_MODE_MAX (USB_MODE_DUAL+1) + +/* + * The "USB_MODE" macros defines all the supported device states. + */ +enum usb_dev_state { + USB_STATE_DETACHED, + USB_STATE_ATTACHED, + USB_STATE_POWERED, + USB_STATE_ADDRESSED, + USB_STATE_CONFIGURED, +}; +#define USB_STATE_MAX (USB_STATE_CONFIGURED+1) #endif /* _USB2_STANDARD_H_ */ ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#8 (text+ko) ==== @@ -24,9 +24,30 @@ * SUCH DAMAGE. */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include #include +#include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#9 (text+ko) ==== @@ -25,10 +25,31 @@ * SUCH DAMAGE. */ +#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 USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_core.c#2 (text+ko) ==== @@ -30,6 +30,28 @@ * http://www.usb.org/developers/devclass_docs/ */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#12 (text+ko) ==== @@ -31,8 +31,6 @@ #ifndef _USB2_CORE_H_ #define _USB2_CORE_H_ -#define USB_STACK_VERSION 2000 /* 2.0 */ - /* Allow defines in "opt_usb.h" to override configuration */ #include "opt_usb.h" @@ -135,31 +133,6 @@ #define USB_PROC_GET_GID(td) (td)->p_pgid #endif -/* Include files */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - #include "usb_if.h" #ifndef USB_HOST_ALIGN @@ -229,12 +202,6 @@ /* macros */ -#define usb2_callout_init_mtx(c,m,f) callout_init_mtx(&(c)->co,m,f) -#define usb2_callout_reset(c,t,f,d) callout_reset(&(c)->co,t,f,d) -#define usb2_callout_stop(c) callout_stop(&(c)->co) -#define usb2_callout_drain(c) callout_drain(&(c)->co) -#define usb2_callout_pending(c) callout_pending(&(c)->co) - #define USB_BUS_LOCK(_b) mtx_lock(&(_b)->bus_mtx) #define USB_BUS_UNLOCK(_b) mtx_unlock(&(_b)->bus_mtx) #define USB_BUS_LOCK_ASSERT(_b, _t) mtx_assert(&(_b)->bus_mtx, _t) @@ -254,39 +221,6 @@ /* typedefs */ -#ifndef USB_HAVE_USB_ERROR_T -typedef uint8_t usb_error_t; /* see "USB_ERR_XXX" */ -#endif - -#ifndef USB_HAVE_TIMEOUT_T >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 5 01:36:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 394F11065674; Fri, 5 Jun 2009 01:36: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 EA8A2106564A for ; Fri, 5 Jun 2009 01:36:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D6ED58FC0A for ; Fri, 5 Jun 2009 01:36:25 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n551aPxQ082211 for ; Fri, 5 Jun 2009 01:36:25 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n551aPi5082209 for perforce@freebsd.org; Fri, 5 Jun 2009 01:36:25 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 5 Jun 2009 01:36:25 GMT Message-Id: <200906050136.n551aPi5082209@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 163536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 01:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=163536 Change 163536 by thompsa@thompsa_burger on 2009/06/05 01:36:24 Reshuffle includes - delete empty .h files - move content around Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_pci.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci_pci.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umoscom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uplcom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uslcom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvisor.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvscom.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/urio.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb.h#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#13 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.h#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dev.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_dynamic.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.h#2 delete .. //depot/projects/usb_buf/src/sys/dev/usb/usb_freebsd.h#1 add .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.h#2 delete .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_mbuf.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_parse.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_process.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_revision.h#4 delete .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uath.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgt.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_ural.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtw.c#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#8 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#8 (text+ko) ==== @@ -66,7 +66,6 @@ #include #include -#include #include #define USB_DEBUG_VAR at91dcidebug @@ -91,7 +90,7 @@ #define AT9100_DCI_PC2SC(pc) \ AT9100_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int at91dcidebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, at91dci, CTLFLAG_RW, 0, "USB at91dci"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#8 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include -#include #include #define USB_DEBUG_VAR atmegadci_debug @@ -83,7 +82,7 @@ #define ATMEGA_PC2SC(pc) \ ATMEGA_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int atmegadci_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#8 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include -#include #include #define USB_DEBUG_VAR avr32dci_debug @@ -83,7 +82,7 @@ #define AVR32_PC2SC(pc) \ AVR32_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int avr32dci_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, avr32dci, CTLFLAG_RW, 0, "USB AVR32 DCI"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#10 (text+ko) ==== @@ -68,7 +68,6 @@ #include #include -#include #include #define USB_DEBUG_VAR ehcidebug @@ -90,7 +89,7 @@ ((ehci_softc_t *)(((uint8_t *)(bus)) - \ ((uint8_t *)&(((ehci_softc_t *)0)->sc_bus)))) -#if USB_DEBUG +#ifdef USB_DEBUG static int ehcidebug = 0; static int ehcinohighspeed = 0; @@ -244,7 +243,7 @@ usb2_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, 0); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 2) { ehci_dump_regs(sc); } @@ -468,7 +467,7 @@ usb2_bus_mem_flush_all(&sc->sc_bus, &ehci_iterate_hw_softc); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug) { ehci_dump_sqh(sc, sc->sc_async_p_last); } @@ -665,7 +664,7 @@ } } -#if USB_DEBUG +#ifdef USB_DEBUG static void ehci_dump_regs(ehci_softc_t *sc) { @@ -1221,7 +1220,7 @@ pipe->endpoint->toggle_next = (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0; -#if USB_DEBUG +#ifdef USB_DEBUG if (status & EHCI_QTD_STATERRS) { DPRINTFN(11, "error, addr=%d, endpt=0x%02x, frame=0x%02x" "status=%s%s%s%s%s%s%s%s\n", @@ -1250,7 +1249,7 @@ DPRINTFN(13, "urb=%p endpoint=%p transfer done\n", urb, pipe->endpoint); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 10) { ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); @@ -1468,7 +1467,7 @@ DPRINTFN(16, "real interrupt\n"); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { ehci_dump_regs(sc); } @@ -1489,7 +1488,7 @@ if (status & EHCI_STS_HSE) { printf("%s: unrecoverable error, " "controller halted\n", __FUNCTION__); -#if USB_DEBUG +#ifdef USB_DEBUG ehci_dump_regs(sc); ehci_dump_isoc(sc); #endif @@ -1913,7 +1912,7 @@ pipe->td_transfer_last = td; -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", pipe->endpoint->toggle_next); @@ -2046,7 +2045,7 @@ if (pp_last >= &sc->sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]) { pp_last = &sc->sc_isoc_fs_p_last[0]; } -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { DPRINTF("isoc FS-TD\n"); ehci_dump_sitd(sc, td); @@ -2101,7 +2100,7 @@ if (pp_last >= &sc->sc_isoc_hs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT]) { pp_last = &sc->sc_isoc_hs_p_last[0]; } -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { DPRINTF("isoc HS-TD\n"); ehci_dump_itd(sc, td); @@ -2167,7 +2166,7 @@ if ((methods == &ehci_device_bulk_methods) || (methods == &ehci_device_ctrl_methods)) { -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 8) { DPRINTF("nexttog=%d; data after transfer:\n", pipe->endpoint->toggle_next); @@ -2520,7 +2519,7 @@ uint8_t sb; uint8_t error; -#if USB_DEBUG +#ifdef USB_DEBUG uint8_t once = 1; #endif @@ -2604,7 +2603,7 @@ /* reuse sitd_portaddr and sitd_back from last transfer */ if (*plen > pipe->max_frame_size) { -#if USB_DEBUG +#ifdef USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d " @@ -2694,7 +2693,7 @@ } usb2_pc_cpu_flush(td->page_cache); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { DPRINTF("FS-TD %d\n", nframes); ehci_dump_sitd(sc, td); @@ -2810,7 +2809,7 @@ uint8_t td_no; uint8_t page_no; -#if USB_DEBUG +#ifdef USB_DEBUG uint8_t once = 1; #endif @@ -2888,7 +2887,7 @@ } /* range check */ if (*plen > pipe->max_frame_size) { -#if USB_DEBUG +#ifdef USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d bytes " @@ -2964,7 +2963,7 @@ td->itd_status[7] |= htohc32(sc, EHCI_ITD_IOC); } usb2_pc_cpu_flush(td->page_cache); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcidebug > 15) { DPRINTF("HS-TD %d\n", nframes); ehci_dump_itd(sc, td); @@ -3397,7 +3396,7 @@ break; case UHF_PORT_RESET: DPRINTFN(6, "reset port %d\n", index); -#if USB_DEBUG +#ifdef USB_DEBUG if (ehcinohighspeed) { /* * Connect USB device to companion ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#8 (text+ko) ==== @@ -58,7 +58,6 @@ #include #include -#include #include #define USB_DEBUG_VAR musbotgdebug @@ -85,7 +84,7 @@ #define MUSBOTG_PC2SC(pc) \ MUSBOTG_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int musbotgdebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, musbotg, CTLFLAG_RW, 0, "USB musbotg"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#8 (text+ko) ==== @@ -57,7 +57,6 @@ #include #include -#include #include #define USB_DEBUG_VAR ohcidebug @@ -79,7 +78,7 @@ ((ohci_softc_t *)(((uint8_t *)(bus)) - \ ((uint8_t *)&(((ohci_softc_t *)0)->sc_bus)))) -#if USB_DEBUG +#ifdef USB_DEBUG static int ohcidebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ohci, CTLFLAG_RW, 0, "USB ohci"); @@ -226,7 +225,7 @@ device_printf(sc->sc_bus.bdev, "reset timeout\n"); return (USB_ERR_IOERROR); } -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 15) { ohci_dumpregs(sc); } @@ -285,7 +284,7 @@ sc->sc_noport = OHCI_GET_NDP(OREAD4(sc, OHCI_RH_DESCRIPTOR_A)); } -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 5) { ohci_dumpregs(sc); } @@ -401,7 +400,7 @@ usb2_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.bus_mtx, 0); -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 15) { for (i = 0; i != OHCI_NO_EDS; i++) { printf("ed#%d ", i); @@ -454,7 +453,7 @@ USB_BUS_LOCK(&sc->sc_bus); -#if USB_DEBUG +#ifdef USB_DEBUG DPRINTF("\n"); if (ohcidebug > 2) { ohci_dumpregs(sc); @@ -484,7 +483,7 @@ { uint32_t ctl; -#if USB_DEBUG +#ifdef USB_DEBUG DPRINTF("\n"); if (ohcidebug > 2) { ohci_dumpregs(sc); @@ -518,7 +517,7 @@ ohci_do_poll(&sc->sc_bus); } -#if USB_DEBUG +#ifdef USB_DEBUG static void ohci_dumpregs(ohci_softc_t *sc) { @@ -765,7 +764,7 @@ panic("%s:%d: out of TD's\n", __FUNCTION__, __LINE__); } -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 5) { DPRINTF("isoc TD\n"); ohci_dump_itd(td); @@ -806,7 +805,7 @@ ohci_device_done(xfer, USB_ERR_NORMAL_COMPLETION); } -#if USB_DEBUG +#ifdef USB_DEBUG static const char *const ohci_cc_strs[] = { @@ -934,7 +933,7 @@ DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", xfer, xfer->endpoint); -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 10) { ohci_dump_tds(xfer->td_transfer_first); } @@ -1159,7 +1158,7 @@ DPRINTFN(16, "real interrupt\n"); -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 15) { ohci_dumpregs(sc); } @@ -1585,7 +1584,7 @@ xfer->td_transfer_last = td; -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", xfer->endpoint->toggle_next); @@ -2016,7 +2015,7 @@ xfer->td_transfer_last = td_last; -#if USB_DEBUG +#ifdef USB_DEBUG if (ohcidebug > 8) { DPRINTF("data before transfer:\n"); ohci_dump_itds(xfer->td_transfer_first); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci_pci.c#3 (text+ko) ==== @@ -71,7 +71,6 @@ #include #include -#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#8 (text+ko) ==== @@ -60,7 +60,6 @@ #include #include -#include #include #define USB_DEBUG_VAR uhcidebug @@ -83,7 +82,7 @@ ((uhci_softc_t *)(((uint8_t *)(bus)) - \ ((uint8_t *)&(((uhci_softc_t *)0)->sc_bus)))) -#if USB_DEBUG +#ifdef USB_DEBUG static int uhcidebug = 0; static int uhcinoloop = 0; @@ -456,7 +455,7 @@ usb2_callout_init_mtx(&sc->sc_root_intr, &sc->sc_bus.bus_mtx, 0); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -665,7 +664,7 @@ { USB_BUS_LOCK(&sc->sc_bus); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -709,7 +708,7 @@ uhci_start(sc); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 2) { uhci_dumpregs(sc); } @@ -721,7 +720,7 @@ uhci_do_poll(&sc->sc_bus); } -#if USB_DEBUG +#ifdef USB_DEBUG static void uhci_dumpregs(uhci_softc_t *sc) { @@ -879,7 +878,7 @@ struct uhci_qh *qh_lst; struct uhci_qh *qh_rec; -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcinoloop) { return; } @@ -902,7 +901,7 @@ { struct uhci_qh *qh_lst; -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcinoloop) { return; } @@ -1070,7 +1069,7 @@ if (pp_last >= &sc->sc_isoc_p_last[UHCI_VFRAMELIST_COUNT]) { pp_last = &sc->sc_isoc_p_last[0]; } -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 5) { DPRINTF("isoc TD\n"); uhci_dump_td(td); @@ -1201,7 +1200,7 @@ xfer->endpoint->toggle_next = (token & UHCI_TD_SET_DT(1)) ? 0 : 1; -#if USB_DEBUG +#ifdef USB_DEBUG if (status & UHCI_TD_ERROR) { DPRINTFN(11, "error, addr=%d, endpt=0x%02x, frame=0x%02x " "status=%s%s%s%s%s%s%s%s%s%s%s\n", @@ -1231,7 +1230,7 @@ DPRINTFN(13, "xfer=%p endpoint=%p transfer done\n", xfer, xfer->endpoint); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 10) { uhci_dump_tds(xfer->td_transfer_first); } @@ -1470,7 +1469,7 @@ DPRINTFN(16, "real interrupt\n"); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 15) { uhci_dumpregs(sc); } @@ -1484,7 +1483,7 @@ UHCI_STS_HCPE | UHCI_STS_HCH)) { if (status & UHCI_STS_RD) { -#if USB_DEBUG +#ifdef USB_DEBUG printf("%s: resume detect\n", __FUNCTION__); #endif @@ -1501,7 +1500,7 @@ /* no acknowledge needed */ DPRINTF("%s: host controller halted\n", __FUNCTION__); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 0) { uhci_dump_all(sc); } @@ -1863,7 +1862,7 @@ xfer->td_transfer_last = td; -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 8) { DPRINTF("nexttog=%d; data before transfer:\n", xfer->endpoint->toggle_next); @@ -2179,7 +2178,7 @@ uint32_t temp; uint32_t *plen; -#if USB_DEBUG +#ifdef USB_DEBUG uint8_t once = 1; #endif @@ -2251,7 +2250,7 @@ pp_last = &sc->sc_isoc_p_last[0]; } if (*plen > xfer->max_frame_size) { -#if USB_DEBUG +#ifdef USB_DEBUG if (once) { once = 0; printf("%s: frame length(%d) exceeds %d " @@ -2303,7 +2302,7 @@ usb2_pc_cpu_flush(td->page_cache); -#if USB_DEBUG +#ifdef USB_DEBUG if (uhcidebug > 5) { DPRINTF("TD %d\n", nframes); uhci_dump_td(td); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci_pci.c#3 (text+ko) ==== @@ -360,7 +360,7 @@ * that the BIOS won't touch the keyboard anymore if it is connected * to the ports of the root hub? */ -#if USB_DEBUG +#ifdef USB_DEBUG if (pci_read_config(self, PCI_LEGSUP, 2) != PCI_LEGSUP_USBPIRQDEN) { device_printf(self, "LegSup = 0x%04x\n", pci_read_config(self, PCI_LEGSUP, 2)); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#7 (text+ko) ==== @@ -45,7 +45,6 @@ #include #include -#include #include #include @@ -73,7 +72,7 @@ /* static variables */ -#if USB_DEBUG +#ifdef USB_DEBUG static int usb2_ctrl_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, ctrl, CTLFLAG_RW, 0, "USB controller"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#8 (text+ko) ==== @@ -54,8 +54,6 @@ #include #include -#include -#include #include #define USB_DEBUG_VAR uss820dcidebug @@ -80,7 +78,7 @@ #define USS820_DCI_PC2SC(pc) \ USS820_DCI_BUS2SC(USB_DMATAG_TO_XROOT((pc)->tag_parent)->bus) -#if USB_DEBUG +#ifdef USB_DEBUG static int uss820dcidebug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uss820dci, CTLFLAG_RW, 0, "USB uss820dci"); ==== //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#7 (text+ko) ==== @@ -51,7 +51,6 @@ #include "usbdevs.h" #include #include -#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#8 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include -#include #include #define USB_DEBUG_VAR ukbd_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#7 (text+ko) ==== @@ -45,7 +45,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR ums_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#7 (text+ko) ==== @@ -60,7 +60,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR udbp_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#6 (text+ko) ==== @@ -35,7 +35,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#7 (text+ko) ==== @@ -71,7 +71,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR aue_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#7 (text+ko) ==== @@ -79,7 +79,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR axe_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#7 (text+ko) ==== @@ -46,7 +46,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR cdce_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#7 (text+ko) ==== @@ -54,7 +54,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR cue_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#7 (text+ko) ==== @@ -68,7 +68,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR kue_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#7 (text+ko) ==== @@ -68,7 +68,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR rue_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#7 (text+ko) ==== @@ -49,7 +49,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR udav_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#5 (text+ko) ==== @@ -25,7 +25,6 @@ */ #include -#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/quirk/usb_quirk.c#4 (text+ko) ==== @@ -54,7 +54,6 @@ #define USB_DEBUG_VAR usb2_debug -#include #include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#7 (text+ko) ==== @@ -33,7 +33,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR u3g_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#7 (text+ko) ==== @@ -26,7 +26,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#7 (text+ko) ==== @@ -65,7 +65,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR ubsa_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#7 (text+ko) ==== @@ -78,7 +78,6 @@ #include #include -#include #include #define USB_DEBUG_VAR ubser_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#7 (text+ko) ==== @@ -72,7 +72,6 @@ #include "usbdevs.h" #include #include -#include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#7 (text+ko) ==== @@ -37,7 +37,6 @@ #include "usbdevs.h" #include #include -#include #include #include #include ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#7 (text+ko) ==== @@ -85,7 +85,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#7 (text+ko) ==== @@ -51,7 +51,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR uftdi_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#8 (text+ko) ==== @@ -45,7 +45,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#7 (text+ko) ==== @@ -54,7 +54,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#7 (text+ko) ==== @@ -48,7 +48,6 @@ #include "usbdevs.h" #include #include -#include #define USB_DEBUG_VAR ulpt_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#8 (text+ko) ==== @@ -47,7 +47,6 @@ #include "usbdevs.h" #include #include -#include #include #define USB_DEBUG_VAR usb2_debug ==== //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#7 (text+ko) ==== @@ -83,7 +83,6 @@ #include "usbdevs.h" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 5 01:58:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5067F1065672; Fri, 5 Jun 2009 01:58:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F88C106566C for ; Fri, 5 Jun 2009 01:58:49 +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 F0A878FC16 for ; Fri, 5 Jun 2009 01:58:48 +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 n551wmoa083823 for ; Fri, 5 Jun 2009 01:58:48 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n551wme3083821 for perforce@freebsd.org; Fri, 5 Jun 2009 01:58:48 GMT (envelope-from gk@FreeBSD.org) Date: Fri, 5 Jun 2009 01:58:48 GMT Message-Id: <200906050158.n551wme3083821@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 163537 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 01:58:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=163537 Change 163537 by gk@gk_h1 on 2009/06/05 01:58:45 Import OpenBSD XTS-AES implementation Affected files ... .. //depot/projects/soc2009/gk_pefs/sys/opencrypto/cryptodev.c#2 edit .. //depot/projects/soc2009/gk_pefs/sys/opencrypto/cryptodev.h#2 edit .. //depot/projects/soc2009/gk_pefs/sys/opencrypto/cryptosoft.c#2 edit .. //depot/projects/soc2009/gk_pefs/sys/opencrypto/xform.c#2 edit .. //depot/projects/soc2009/gk_pefs/sys/opencrypto/xform.h#2 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sys/opencrypto/cryptodev.c#2 (text+ko) ==== @@ -215,6 +215,9 @@ case CRYPTO_CAMELLIA_CBC: txform = &enc_xform_camellia; break; + case CRYPTO_AES_XTS: + txform = &enc_xform_aes_xts; + break; default: return (EINVAL); } ==== //depot/projects/soc2009/gk_pefs/sys/opencrypto/cryptodev.h#2 (text+ko) ==== @@ -123,7 +123,8 @@ #define CRYPTO_SHA2_384_HMAC 19 #define CRYPTO_SHA2_512_HMAC 20 #define CRYPTO_CAMELLIA_CBC 21 -#define CRYPTO_ALGORITHM_MAX 21 /* Keep updated - see below */ +#define CRYPTO_AES_XTS 22 +#define CRYPTO_ALGORITHM_MAX 22 /* Keep updated - see below */ /* Algorithm flags */ #define CRYPTO_ALG_FLAG_SUPPORTED 0x01 /* Algorithm is supported */ ==== //depot/projects/soc2009/gk_pefs/sys/opencrypto/cryptosoft.c#2 (text+ko) ==== @@ -61,7 +61,8 @@ static int swcr_encdec(struct cryptodesc *, struct swcr_data *, caddr_t, int); static int swcr_authcompute(struct cryptodesc *, struct swcr_data *, caddr_t, int); static int swcr_compdec(struct cryptodesc *, struct swcr_data *, caddr_t, int); -static int swcr_freesession(device_t dev, u_int64_t tid); +static int swcr_freesession(device_t, u_int64_t); +/* $OpenBSD: cryptosoft.c,v 1.51 2008/06/09 16:07:00 djm Exp $ */ /* * Apply a symmetric encryption/decryption algorithm. @@ -73,10 +74,11 @@ unsigned char iv[EALG_MAX_BLOCK_LEN], blk[EALG_MAX_BLOCK_LEN], *idat; unsigned char *ivp, piv[EALG_MAX_BLOCK_LEN]; struct enc_xform *exf; - int i, k, j, blks; + int i, k, j, blks, ivlen; exf = sw->sw_exf; blks = exf->blocksize; + ivlen = exf->ivsize; /* Check for non-padded data */ if (crd->crd_len % blks) @@ -86,21 +88,21 @@ if (crd->crd_flags & CRD_F_ENCRYPT) { /* IV explicitly provided ? */ if (crd->crd_flags & CRD_F_IV_EXPLICIT) - bcopy(crd->crd_iv, iv, blks); + bcopy(crd->crd_iv, iv, ivlen); else - arc4rand(iv, blks, 0); + arc4rand(iv, ivlen, 0); /* Do we need to write the IV */ if (!(crd->crd_flags & CRD_F_IV_PRESENT)) - crypto_copyback(flags, buf, crd->crd_inject, blks, iv); + crypto_copyback(flags, buf, crd->crd_inject, ivlen, iv); } else { /* Decryption */ /* IV explicitly provided ? */ if (crd->crd_flags & CRD_F_IV_EXPLICIT) - bcopy(crd->crd_iv, iv, blks); + bcopy(crd->crd_iv, iv, ivlen); else { /* Get IV off buf */ - crypto_copydata(flags, buf, crd->crd_inject, blks, iv); + crypto_copydata(flags, buf, crd->crd_inject, ivlen, iv); } } @@ -116,6 +118,13 @@ } ivp = iv; + /* + * xforms that provide a reinit method perform all IV + * handling themselves. + */ + if (exf->reinit) + exf->reinit(sw->sw_kschedule, iv); + if (flags & CRYPTO_F_IMBUF) { struct mbuf *m = (struct mbuf *) buf; @@ -135,7 +144,15 @@ m_copydata(m, k, blks, blk); /* Actual encryption/decryption */ - if (crd->crd_flags & CRD_F_ENCRYPT) { + if (exf->reinit) { + if (crd->crd_flags & CRD_F_ENCRYPT) { + exf->encrypt(sw->sw_kschedule, + blk); + } else { + exf->decrypt(sw->sw_kschedule, + blk); + } + } else if (crd->crd_flags & CRD_F_ENCRYPT) { /* XOR with previous block */ for (j = 0; j < blks; j++) blk[j] ^= ivp[j]; @@ -205,7 +222,15 @@ idat = mtod(m, unsigned char *) + k; while (m->m_len >= k + blks && i > 0) { - if (crd->crd_flags & CRD_F_ENCRYPT) { + if (exf->reinit) { + if (crd->crd_flags & CRD_F_ENCRYPT) { + exf->encrypt(sw->sw_kschedule, + idat); + } else { + exf->decrypt(sw->sw_kschedule, + idat); + } + } else if (crd->crd_flags & CRD_F_ENCRYPT) { /* XOR with previous block/IV */ for (j = 0; j < blks; j++) idat[j] ^= ivp[j]; @@ -261,7 +286,15 @@ cuio_copydata(uio, k, blks, blk); /* Actual encryption/decryption */ - if (crd->crd_flags & CRD_F_ENCRYPT) { + if (exf->reinit) { + if (crd->crd_flags & CRD_F_ENCRYPT) { + exf->encrypt(sw->sw_kschedule, + blk); + } else { + exf->decrypt(sw->sw_kschedule, + blk); + } + } else if (crd->crd_flags & CRD_F_ENCRYPT) { /* XOR with previous block */ for (j = 0; j < blks; j++) blk[j] ^= ivp[j]; @@ -319,7 +352,15 @@ idat = (char *)iov->iov_base + k; while (iov->iov_len >= k + blks && i > 0) { - if (crd->crd_flags & CRD_F_ENCRYPT) { + if (exf->reinit) { + if (crd->crd_flags & CRD_F_ENCRYPT) { + exf->encrypt(sw->sw_kschedule, + idat); + } else { + exf->decrypt(sw->sw_kschedule, + idat); + } + } else if (crd->crd_flags & CRD_F_ENCRYPT) { /* XOR with previous block/IV */ for (j = 0; j < blks; j++) idat[j] ^= ivp[j]; ==== //depot/projects/soc2009/gk_pefs/sys/opencrypto/xform.c#2 (text+ko) ==== @@ -1,8 +1,9 @@ /* $OpenBSD: xform.c,v 1.16 2001/08/28 12:20:43 ben Exp $ */ /*- * The authors of this code are John Ioannidis (ji@tla.org), - * Angelos D. Keromytis (kermit@csd.uch.gr) and - * Niels Provos (provos@physnet.uni-hamburg.de). + * Angelos D. Keromytis (kermit@csd.uch.gr), + * Niels Provos (provos@physnet.uni-hamburg.de) and + * Damien Miller (djm@mindrot.org). * * This code was written by John Ioannidis for BSD/OS in Athens, Greece, * in November 1995. @@ -15,11 +16,15 @@ * * Additional features in 1999 by Angelos D. Keromytis. * + * AES XTS implementation in 2008 by Damien Miller + * * Copyright (C) 1995, 1996, 1997, 1998, 1999 by John Ioannidis, * Angelos D. Keromytis and Niels Provos. * * Copyright (C) 2001, Angelos D. Keromytis. * + * Copyright (C) 2008, Damien Miller + * * Permission to use, copy, and modify this software with or without fee * is hereby granted, provided that this entire notice is included in * all copies of any software which is or includes a copy or @@ -76,6 +81,7 @@ static int skipjack_setkey(u_int8_t **, u_int8_t *, int); static int rijndael128_setkey(u_int8_t **, u_int8_t *, int); static int cml_setkey(u_int8_t **, u_int8_t *, int); +static int aes_xts_setkey(u_int8_t **, u_int8_t *, int); static void des1_encrypt(caddr_t, u_int8_t *); static void des3_encrypt(caddr_t, u_int8_t *); static void blf_encrypt(caddr_t, u_int8_t *); @@ -83,6 +89,7 @@ static void skipjack_encrypt(caddr_t, u_int8_t *); static void rijndael128_encrypt(caddr_t, u_int8_t *); static void cml_encrypt(caddr_t, u_int8_t *); +static void aes_xts_encrypt(caddr_t, u_int8_t *); static void des1_decrypt(caddr_t, u_int8_t *); static void des3_decrypt(caddr_t, u_int8_t *); static void blf_decrypt(caddr_t, u_int8_t *); @@ -90,6 +97,7 @@ static void skipjack_decrypt(caddr_t, u_int8_t *); static void rijndael128_decrypt(caddr_t, u_int8_t *); static void cml_decrypt(caddr_t, u_int8_t *); +static void aes_xts_decrypt(caddr_t, u_int8_t *); static void des1_zerokey(u_int8_t **); static void des3_zerokey(u_int8_t **); static void blf_zerokey(u_int8_t **); @@ -97,7 +105,10 @@ static void skipjack_zerokey(u_int8_t **); static void rijndael128_zerokey(u_int8_t **); static void cml_zerokey(u_int8_t **); +static void aes_xts_zerokey(u_int8_t **); +static void aes_xts_reinit(caddr_t, u_int8_t *); + static void null_init(void *); static int null_update(void *, u_int8_t *, u_int16_t); static void null_final(u_int8_t *, void *); @@ -115,20 +126,25 @@ MALLOC_DEFINE(M_XDATA, "xform", "xform data buffers"); +/* Helper */ +struct aes_xts_ctx; +void aes_xts_crypt(struct aes_xts_ctx *, u_int8_t *, u_int); + /* Encryption instances */ struct enc_xform enc_xform_null = { CRYPTO_NULL_CBC, "NULL", /* NB: blocksize of 4 is to generate a properly aligned ESP header */ - NULL_BLOCK_LEN, 0, 256, /* 2048 bits, max key */ + NULL_BLOCK_LEN, 0, 0, 256, /* 2048 bits, max key */ null_encrypt, null_decrypt, null_setkey, null_zerokey, + NULL }; struct enc_xform enc_xform_des = { CRYPTO_DES_CBC, "DES", - DES_BLOCK_LEN, 8, 8, + DES_BLOCK_LEN, DES_BLOCK_LEN, 8, 8, des1_encrypt, des1_decrypt, des1_setkey, @@ -137,67 +153,83 @@ struct enc_xform enc_xform_3des = { CRYPTO_3DES_CBC, "3DES", - DES3_BLOCK_LEN, 24, 24, + DES3_BLOCK_LEN, DES3_BLOCK_LEN, 24, 24, des3_encrypt, des3_decrypt, des3_setkey, - des3_zerokey + des3_zerokey, + NULL }; struct enc_xform enc_xform_blf = { CRYPTO_BLF_CBC, "Blowfish", - BLOWFISH_BLOCK_LEN, 5, 56 /* 448 bits, max key */, + BLOWFISH_BLOCK_LEN, BLOWFISH_BLOCK_LEN, 5, 56 /* 448 bits, max key */, blf_encrypt, blf_decrypt, blf_setkey, - blf_zerokey + blf_zerokey, + NULL }; struct enc_xform enc_xform_cast5 = { CRYPTO_CAST_CBC, "CAST-128", - CAST128_BLOCK_LEN, 5, 16, + CAST128_BLOCK_LEN, CAST128_BLOCK_LEN, 5, 16, cast5_encrypt, cast5_decrypt, cast5_setkey, - cast5_zerokey + cast5_zerokey, + NULL }; struct enc_xform enc_xform_skipjack = { CRYPTO_SKIPJACK_CBC, "Skipjack", - SKIPJACK_BLOCK_LEN, 10, 10, + SKIPJACK_BLOCK_LEN, SKIPJACK_BLOCK_LEN, 10, 10, skipjack_encrypt, skipjack_decrypt, skipjack_setkey, - skipjack_zerokey + skipjack_zerokey, + NULL }; struct enc_xform enc_xform_rijndael128 = { CRYPTO_RIJNDAEL128_CBC, "Rijndael-128/AES", - RIJNDAEL128_BLOCK_LEN, 8, 32, + RIJNDAEL128_BLOCK_LEN, RIJNDAEL128_BLOCK_LEN, 8, 32, rijndael128_encrypt, rijndael128_decrypt, rijndael128_setkey, rijndael128_zerokey, + NULL }; struct enc_xform enc_xform_arc4 = { CRYPTO_ARC4, "ARC4", - 1, 1, 32, + 1, 1, 1, 32, NULL, NULL, NULL, NULL, + NULL }; struct enc_xform enc_xform_camellia = { CRYPTO_CAMELLIA_CBC, "Camellia", - CAMELLIA_BLOCK_LEN, 8, 32, + CAMELLIA_BLOCK_LEN, CAMELLIA_BLOCK_LEN, 8, 32, cml_encrypt, cml_decrypt, cml_setkey, cml_zerokey, }; +struct enc_xform enc_xform_aes_xts = { + CRYPTO_AES_XTS, "AES-XTS", + 16, 8, 32, 64, + aes_xts_encrypt, + aes_xts_decrypt, + aes_xts_setkey, + aes_xts_zerokey, + aes_xts_reinit +}; + /* Authentication instances */ struct auth_hash auth_hash_null = { CRYPTO_NULL_HMAC, "NULL-HMAC", @@ -586,6 +618,106 @@ *sched = NULL; } +#define AES_XTS_BLOCKSIZE 16 +#define AES_XTS_IVSIZE 8 +#define AES_XTS_ALPHA 0x87 /* GF(2^128) generator polynomial */ + +struct aes_xts_ctx { + rijndael_ctx key1; + rijndael_ctx key2; + u_int8_t tweak[AES_XTS_BLOCKSIZE]; +}; + +void +aes_xts_reinit(caddr_t key, u_int8_t *iv) +{ + struct aes_xts_ctx *ctx = (struct aes_xts_ctx *)key; + u_int64_t blocknum; + u_int i; + + /* + * Prepare tweak as E_k2(IV). IV is specified as LE representation + * of a 64-bit block number which we allow to be passed in directly. + */ + bcopy(iv, &blocknum, AES_XTS_IVSIZE); + for (i = 0; i < AES_XTS_IVSIZE; i++) { + ctx->tweak[i] = blocknum & 0xff; + blocknum >>= 8; + } + /* Last 64 bits of IV are always zero */ + bzero(ctx->tweak + AES_XTS_IVSIZE, AES_XTS_IVSIZE); + + rijndael_encrypt(&ctx->key2, ctx->tweak, ctx->tweak); +} + +void +aes_xts_crypt(struct aes_xts_ctx *ctx, u_int8_t *data, u_int do_encrypt) +{ + u_int8_t block[AES_XTS_BLOCKSIZE]; + u_int i, carry_in, carry_out; + + for (i = 0; i < AES_XTS_BLOCKSIZE; i++) + block[i] = data[i] ^ ctx->tweak[i]; + + if (do_encrypt) + rijndael_encrypt(&ctx->key1, block, data); + else + rijndael_decrypt(&ctx->key1, block, data); + + for (i = 0; i < AES_XTS_BLOCKSIZE; i++) + data[i] ^= ctx->tweak[i]; + + /* Exponentiate tweak */ + carry_in = 0; + for (i = 0; i < AES_XTS_BLOCKSIZE; i++) { + carry_out = ctx->tweak[i] & 0x80; + ctx->tweak[i] = (ctx->tweak[i] << 1) | (carry_in ? 1 : 0); + carry_in = carry_out; + } + if (carry_in) + ctx->tweak[0] ^= AES_XTS_ALPHA; + bzero(block, sizeof(block)); +} + +void +aes_xts_encrypt(caddr_t key, u_int8_t *data) +{ + aes_xts_crypt((struct aes_xts_ctx *)key, data, 1); +} + +void +aes_xts_decrypt(caddr_t key, u_int8_t *data) +{ + aes_xts_crypt((struct aes_xts_ctx *)key, data, 0); +} + +int +aes_xts_setkey(u_int8_t **sched, u_int8_t *key, int len) +{ + struct aes_xts_ctx *ctx; + + if (len != 32 && len != 64) + return -1; + + *sched = malloc(sizeof(struct aes_xts_ctx), M_CRYPTO_DATA, + M_WAITOK | M_ZERO); + ctx = (struct aes_xts_ctx *)*sched; + + rijndael_set_key(&ctx->key1, key, len * 4); + rijndael_set_key(&ctx->key2, key + (len / 2), len * 4); + + return 0; +} + +void +aes_xts_zerokey(u_int8_t **sched) +{ + bzero(*sched, sizeof(struct aes_xts_ctx)); + free(*sched, M_CRYPTO_DATA); + *sched = NULL; +} + + /* * And now for auth. */ ==== //depot/projects/soc2009/gk_pefs/sys/opencrypto/xform.h#2 (text+ko) ==== @@ -48,12 +48,13 @@ struct enc_xform { int type; char *name; - u_int16_t blocksize; + u_int16_t blocksize, ivsize; u_int16_t minkey, maxkey; void (*encrypt) (caddr_t, u_int8_t *); void (*decrypt) (caddr_t, u_int8_t *); int (*setkey) (u_int8_t **, u_int8_t *, int len); void (*zerokey) (u_int8_t **); + void (*reinit) (caddr_t, u_int8_t *); }; struct comp_algo { @@ -80,6 +81,7 @@ extern struct enc_xform enc_xform_cast5; extern struct enc_xform enc_xform_skipjack; extern struct enc_xform enc_xform_rijndael128; +extern struct enc_xform enc_xform_aes_xts; extern struct enc_xform enc_xform_arc4; extern struct enc_xform enc_xform_camellia; From owner-p4-projects@FreeBSD.ORG Fri Jun 5 04:47:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BF4E1065677; Fri, 5 Jun 2009 04:47:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3156E106566C; Fri, 5 Jun 2009 04:47:01 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from server.mypc.hu (server.mypc.hu [87.229.73.95]) by mx1.freebsd.org (Postfix) with ESMTP id DF2508FC0A; Fri, 5 Jun 2009 04:47:00 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 545EA14D6266; Fri, 5 Jun 2009 06:31:25 +0200 (CEST) X-Virus-Scanned: amavisd-new at t-hosting.hu Received: from server.mypc.hu ([127.0.0.1]) by localhost (server.mypc.hu [127.0.0.1]) (amavisd-new, port 10024) with LMTP id HuJjLPJm4j2t; Fri, 5 Jun 2009 06:31:24 +0200 (CEST) Received: from [192.168.1.105] (catv-80-98-231-64.catv.broadband.hu [80.98.231.64]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by server.mypc.hu (Postfix) with ESMTPSA id 03D8D14D5B42; Fri, 5 Jun 2009 06:31:23 +0200 (CEST) Message-ID: <4A289F98.5030004@FreeBSD.org> Date: Fri, 05 Jun 2009 06:31:20 +0200 From: Gabor Kovesdan User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) MIME-Version: 1.0 To: Ed Schouten References: <200906041945.n54JjL2d028225@repoman.freebsd.org> <20090604200039.GH48776@hoeg.nl> In-Reply-To: <20090604200039.GH48776@hoeg.nl> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Cc: Perforce Change Reviews , Nikhil Bysani Subject: Re: PERFORCE change 163515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 04:47:02 -0000 Ed Schouten escribió: > * Nikhil Bysani wrote: > >> http://perforce.freebsd.org/chv.cgi?CH=163515 >> >> Change 163515 by nikron@nmfreebsd on 2009/06/04 19:45:11 >> >> Change configure.ac to recognize freebad. >> >> Affected files ... >> >> .. //depot/projects/soc2009/nm-port/NetworkManager/AUTHORS#3 edit >> >> > > Woops! Be sure to only `p4 edit' files you actually change. Perforce > isn't smart enough to figure out you didn't actually change the file > contents... > > Yes, it is! You just need to run "p4 client" and change SubmitOptions: SubmitOptions: revertunchanged Recently, I changed mine one for the same reason. :) Cheers, -- Gabor Kovesdan FreeBSD Volunteer EMAIL: gabor@FreeBSD.org .:|:. gabor@kovesdan.org WEB: http://people.FreeBSD.org/~gabor .:|:. http://kovesdan.org From owner-p4-projects@FreeBSD.ORG Fri Jun 5 06:36:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8FA61065674; Fri, 5 Jun 2009 06:36: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 85F8E106564A; Fri, 5 Jun 2009 06:36:23 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: from palm.hoeg.nl (mx0.hoeg.nl [IPv6:2001:7b8:613:100::211]) by mx1.freebsd.org (Postfix) with ESMTP id 21F158FC1D; Fri, 5 Jun 2009 06:36:23 +0000 (UTC) (envelope-from ed@hoeg.nl) Received: by palm.hoeg.nl (Postfix, from userid 1000) id 25FB11CC2E; Fri, 5 Jun 2009 08:36:22 +0200 (CEST) Date: Fri, 5 Jun 2009 08:36:22 +0200 From: Ed Schouten To: Gabor Kovesdan Message-ID: <20090605063622.GI48776@hoeg.nl> References: <200906041945.n54JjL2d028225@repoman.freebsd.org> <20090604200039.GH48776@hoeg.nl> <4A289F98.5030004@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="9Za+rIOv72GXlfHR" Content-Disposition: inline In-Reply-To: <4A289F98.5030004@FreeBSD.org> User-Agent: Mutt/1.5.19 (2009-01-05) Cc: Perforce Change Reviews , Nikhil Bysani Subject: Re: PERFORCE change 163515 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 06:36:24 -0000 --9Za+rIOv72GXlfHR Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable * Gabor Kovesdan wrote: > Yes, it is! You just need to run "p4 client" and change SubmitOptions: > > SubmitOptions: revertunchanged Ah, that's very useful to know. Thanks! --=20 Ed Schouten WWW: http://80386.nl/ --9Za+rIOv72GXlfHR Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (FreeBSD) iEYEARECAAYFAkoovOUACgkQ52SDGA2eCwUcawCdHAr4dvcCFjbtKr+rKdkiK7D/ ylkAn3+I+r86z8aqxvuHVDSy7UTmotij =YXdh -----END PGP SIGNATURE----- --9Za+rIOv72GXlfHR-- From owner-p4-projects@FreeBSD.ORG Fri Jun 5 07:05:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D011310656A9; Fri, 5 Jun 2009 07:05: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 8818F10656A6; Fri, 5 Jun 2009 07:05:15 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe03.swip.net [212.247.154.65]) by mx1.freebsd.org (Postfix) with ESMTP id E767F8FC0A; Fri, 5 Jun 2009 07:05:14 +0000 (UTC) (envelope-from hselasky@c2i.net) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=QSkunCX0_XMA:10 a=j+k/Ze5hWUCaCztCgEjzDQ==:17 a=XNz72zHY2H-g9mIx1mYA:9 a=Gt8fSPKNgt4oUvYZ6CtfYPB5eSQA:4 Received: from [81.191.55.181] (account mc467741@c2i.net HELO laptop) by mailfe03.swip.net (CommuniGate Pro SMTP 5.2.13) with ESMTPA id 1257488052; Fri, 05 Jun 2009 09:05:13 +0200 From: Hans Petter Selasky To: Andrew Thompson Date: Fri, 5 Jun 2009 09:09:24 +0200 User-Agent: KMail/1.9.7 References: <200906050136.n551aPi5082209@repoman.freebsd.org> In-Reply-To: <200906050136.n551aPi5082209@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200906050909.24464.hselasky@c2i.net> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 163536 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 07:05:17 -0000 On Friday 05 June 2009, Andrew Thompson wrote: > -#if USB_DEBUG > +#ifdef USB_DEBUG Did you update usb_debug.h to reflect this change? Currently USB_DEBUG is always defined. Only the value changes 0/1. --HPS From owner-p4-projects@FreeBSD.ORG Fri Jun 5 08:06:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5C251065672; Fri, 5 Jun 2009 08:06:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7582E106566C for ; Fri, 5 Jun 2009 08:06:01 +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 631AA8FC0A for ; Fri, 5 Jun 2009 08:06:01 +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 n558611w048039 for ; Fri, 5 Jun 2009 08:06:01 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55861nn048037 for perforce@freebsd.org; Fri, 5 Jun 2009 08:06:01 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 5 Jun 2009 08:06:01 GMT Message-Id: <200906050806.n55861nn048037@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 163542 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 08:06:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=163542 Change 163542 by pgj@petymeg-current on 2009/06/05 08:05:35 Create a type for the "socket" (connection) abstraction, remove previous code snippets about tcp and udp statistics. Hopefully, this abstraction will cover them too :) Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/Makefile#3 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#3 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_all.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#3 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_tcp.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_udp.c#2 delete .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#3 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/Makefile#3 (text+ko) ==== @@ -2,8 +2,7 @@ .include LIB= netstat -SRCS= netstat_tcp.c netstat_udp.c \ - netstat_all.c netstat_util.c +SRCS= netstat.c netstat_util.c INCS= netstat.h ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#3 (text+ko) ==== @@ -2,15 +2,9 @@ #ifndef _NETSTAT_H_ #define _NETSTAT_H_ -#define NETSTAT_MAXCPU 32 #define NETSTAT_MAXCALLER 16 -#define NETSTAT_TYPE_UNKNOWN 0 -#define NETSTAT_TYPE_TCP 1 -#define NETSTAT_TYPE_UDP 2 -#define NETSTAT_TYPE_ANY 255 - -#define NETSTAT_MAXNAME 32 +#define SOCKTYPE_MAXNAME 32 #define NETSTAT_ERROR_UNDEFINED 0 #define NETSTAT_ERROR_NOMEMORY 1 @@ -19,28 +13,23 @@ #define NETSTAT_ERROR_KVM_NOSYMBOL 4 #define NETSTAT_ERROR_KVM_SHORTREAD 5 -struct netstat; -struct netstat_list; +struct socket_type; +struct socket_type_list; __BEGIN_DECLS -const char *netstat_strerror(int); +const char *netstat_strerror(int); -struct netstat_list *netstat_nsl_alloc(void); -struct netstat *netstat_nsl_first(struct netstat_list *); -struct netstat *netstat_nsl_next(struct netstat *); -struct netstat *netstat_nsl_find(struct netstat_list *, - int, const char *); +struct socket_type_list *netstat_stl_alloc(void); +struct socket_type *netstat_stl_first(struct socket_type_list *); +struct socket_type *netstat_stl_next(struct socket_type *); +struct socket_type *netstat_stl_find(struct socket_type_list *, + int, const char *); -void netstat_nsl_free(struct netstat_list *); -int netstat_nsl_geterror(struct netstat_list *); +void netstat_stl_free(struct socket_type_list *); +int netstat_stl_geterror(struct socket_type_list *); -int netstat_sysctl_all(struct netstat_list *, int); -int netstat_sysctl_tcp(struct netstat_list *, int); -int netstat_sysctl_udp(struct netstat_list *, int); - -int netstat_kvm_all(struct netstat_list *, void *); -int netstat_kvm_tcp(struct netstat_list *, void *); -int netstat_kvm_udp(struct netstat_list *, void *); +int netstat_sysctl_socket(struct socket_type_list *, int); +int netstat_kvm_socket(struct socket_type_list *, void *); __END_DECLS #endif /* !_NETSTAT_H_ */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#3 (text+ko) ==== @@ -3,26 +3,41 @@ #define _NETSTAT_INTERNAL_H_ #include +#include #include -struct netstat { - int ns_type; - char ns_name[NETSTAT_MAXNAME]; +struct socket_type { + /* static properties */ + unsigned short st_family; + unsigned short st_protocol; + int st_type; + int st_flags; + char st_name[SOCKTYPE_MAXNAME]; + + struct sockaddr_storage *st_local_address; + /* local address count, XXX: SCTP */ + int st_la_cnt; + struct sockaddr_storage *st_remote_address; + /* remote address count */ + int st_ra_cnt; + + struct sockcred st_credentials; - LIST_ENTRY(netstat) ns_list; + /* list of types */ + LIST_ENTRY(socket_type) st_list; }; -struct netstat_list { - LIST_HEAD(, netstat) nsl_list; - int nsl_error; +struct socket_type_list { + LIST_HEAD(, socket_type) stl_list; + int stl_error; }; int kread(kvm_t *, void *, void *, size_t, size_t); int kread_string(kvm_t *, void *, char *, int); -void _netstat_nsl_empty(struct netstat_list *); -struct netstat *_netstat_ns_allocate(struct netstat_list *, +void _netstat_stl_empty(struct socket_type_list *); +struct socket_type *_netstat_st_allocate(struct socket_type_list *, int, const char *); -void _netstat_ns_reset_stats(struct netstat *); +void _netstat_ns_reset_stats(struct socket_type *); #endif /* !_NETSTAT_INTERNAL_H_ */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#3 (text+ko) ==== @@ -63,103 +63,103 @@ } } -struct netstat_list * -netstat_nsl_alloc(void) +struct socket_type_list * +netstat_stl_alloc(void) { - struct netstat_list *nslp; + struct socket_type_list *stlp; - nslp = malloc(sizeof(*nslp)); - if (nslp == NULL) + stlp = malloc(sizeof(*stlp)); + if (stlp == NULL) return NULL; - LIST_INIT(&nslp->nsl_list); - nslp->nsl_error = NETSTAT_ERROR_UNDEFINED; - return (nslp); + LIST_INIT(&stlp->stl_list); + stlp->stl_error = NETSTAT_ERROR_UNDEFINED; + return (stlp); } -struct netstat * -netstat_nsl_first(struct netstat_list *list) +struct socket_type * +netstat_stl_first(struct socket_type_list *list) { - return (LIST_FIRST(&list->nsl_list)); + return (LIST_FIRST(&list->stl_list)); } -struct netstat * -netstat_nsl_next(struct netstat * nsp) +struct socket_type * +netstat_stl_next(struct socket_type *stp) { - return (LIST_NEXT(nsp, ns_list)); + return (LIST_NEXT(stp, st_list)); } void -_netstat_nsl_empty(struct netstat_list *list) +_netstat_stl_empty(struct socket_type_list *list) { - struct netstat *nsp; + struct socket_type *stp; - while ((nsp = LIST_FIRST(&list->nsl_list))) { - LIST_REMOVE(nsp, ns_list); - free(nsp); + while ((stp = LIST_FIRST(&list->stl_list))) { + LIST_REMOVE(stp, st_list); + free(stp); } } void -_netstat_nsl_free(struct netstat_list *list) +_netstat_stl_free(struct socket_type_list *list) { - _netstat_nsl_empty(list); + _netstat_stl_empty(list); free(list); } int -netstat_nsl_geterror(struct netstat_list *list) +netstat_stl_geterror(struct socket_type_list *list) { - return (list->nsl_error); + return (list->stl_error); } -struct netstat * -netstat_nsl_find(struct netstat_list *list, int ns_type, +struct socket_type * +netstat_stl_find(struct socket_type_list *list, int st_type, const char *name) { - struct netstat *nsp; + struct socket_type *stp; - LIST_FOREACH(nsp, &list->nsl_list, ns_list) { - if ((nsp->ns_type == ns_type || - ns_type == NETSTAT_TYPE_ANY) && - strcmp(nsp->ns_name, name) == 0) - return (nsp); + /* XXX: no "any" */ + LIST_FOREACH(stp, &list->stl_list, st_list) { + if ((stp->st_type == st_type) && + strcmp(stp->st_name, name) == 0) + return (stp); } return (NULL); } -struct netstat * -_netstat_ns_allocate(struct netstat_list *list, int ns_type, +struct socket_type * +_netstat_st_allocate(struct socket_type_list *list, int st_type, const char *name) { - struct netstat *nsp; + struct socket_type *stp; - nsp = malloc(sizeof(*nsp)); - if (nsp == NULL) + stp = malloc(sizeof(*stp)); + if (stp == NULL) return (NULL); - bzero(nsp, sizeof(*nsp)); + bzero(stp, sizeof(*stp)); - nsp->ns_type = ns_type; - strlcpy(nsp->ns_name, name, NETSTAT_MAXNAME); - LIST_INSERT_HEAD(&list->nsl_list, nsp, ns_list); - return (nsp); + stp->st_type = st_type; + strlcpy(stp->st_name, name, SOCKTYPE_MAXNAME); + LIST_INSERT_HEAD(&list->stl_list, stp, st_list); + return (stp); } void -_netstat_ns_reset_stats(struct netstat *nsp) +_netstat_st_reset_stats(struct socket_type *stp) { } const char * -netstat_get_name(const struct netstat *nsp) +netstat_st_get_name(const struct socket_type *stp) { - return (nsp->ns_name); + return (stp->st_name); } int -netstat_get_type(const struct netstat *nsp) +netstat_st_get_type(const struct socket_type *stp) { - return (nsp->ns_type); + return (stp->st_type); } From owner-p4-projects@FreeBSD.ORG Fri Jun 5 10:43:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B967D1065670; Fri, 5 Jun 2009 10:43: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 791D0106566C for ; Fri, 5 Jun 2009 10:43:07 +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 64B4F8FC13 for ; Fri, 5 Jun 2009 10:43:07 +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 n55Ah7ps071817 for ; Fri, 5 Jun 2009 10:43:07 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55Ah6Jd071815 for perforce@freebsd.org; Fri, 5 Jun 2009 10:43:07 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 5 Jun 2009 10:43:07 GMT Message-Id: <200906051043.n55Ah6Jd071815@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 163548 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 10:43:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=163548 Change 163548 by pgj@beehive on 2009/06/05 10:43:01 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#32 integrate .. //depot/projects/docproj_hu/www/en/administration.sgml#7 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#28 integrate .. //depot/projects/docproj_hu/www/hu/index.xsl#24 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/header.l10n.ent#12 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rdf.xsl#5 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rss.xsl#5 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.press-rss.xsl#5 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#60 integrate .. //depot/projects/docproj_hu/www/share/sgml/press.xml#17 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.news-rdf.xsl#3 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#32 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.483 2009/05/29 16:10:25 bcr Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.484 2009/06/03 22:44:14 linimon Exp $ --> aaron@FreeBSD.org"> @@ -150,6 +150,8 @@ brooks@FreeBSD.org"> +brucec@FreeBSD.org"> + brueffer@FreeBSD.org"> bruno@FreeBSD.org"> @@ -368,6 +370,8 @@ garys@FreeBSD.org"> +gavin@FreeBSD.org"> + gerald@FreeBSD.org"> ghelmer@FreeBSD.org"> @@ -1138,6 +1142,8 @@ vsevolod@FreeBSD.org"> +vwe@FreeBSD.org"> + weongyo@FreeBSD.org"> wes@FreeBSD.org"> ==== //depot/projects/docproj_hu/www/en/administration.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -139,7 +139,8 @@

      • &a.erwin; <erwin@FreeBSD.org>
      • &a.linimon; <linimon@FreeBSD.org>
      • &a.pav; <pav@FreeBSD.org>
        • -
      • &a.krion; <krion@FreeBSD.org>
        • +
      • &a.miwi; <miwi@FreeBSD.org>
        • +
      • &a.itetcu; <itetcu@FreeBSD.org>
      • &a.flz; <flz@FreeBSD.org>
      @@ -426,9 +427,10 @@ also responsible for the problem report group.

      Cluster Administrators ==== //depot/projects/docproj_hu/www/en/developers.sgml#28 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.224 2009/05/29 16:12:22 bcr Exp $ +$FreeBSD: www/en/developers.sgml,v 1.226 2009/06/04 16:22:32 linimon Exp $ --> @@ -591,6 +591,11 @@ + + + + + @@ -602,7 +607,7 @@ so that we may keep a list of hat owners and modify only this file. --> - + @@ -611,7 +616,7 @@ - + ==== //depot/projects/docproj_hu/www/hu/index.xsl#24 (text+ko) ==== @@ -4,7 +4,7 @@ ]> - + + + + + + - + From owner-p4-projects@FreeBSD.ORG Fri Jun 5 11:57:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B85D11065673; Fri, 5 Jun 2009 11:57:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77EEC1065670 for ; Fri, 5 Jun 2009 11:57:22 +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 5C6C88FC0C for ; Fri, 5 Jun 2009 11:57:22 +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 n55BvMXK078353 for ; Fri, 5 Jun 2009 11:57:22 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55BvM7e078351 for perforce@freebsd.org; Fri, 5 Jun 2009 11:57:22 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 5 Jun 2009 11:57:22 GMT Message-Id: <200906051157.n55BvM7e078351@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 163549 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 11:57:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=163549 Change 163549 by pgj@beehive on 2009/06/05 11:57:14 MFen (www): 1.24 -> 1.25 hu/administration.sgml 1.259 -> 1.260 hu/share/sgml/news.xml 1.82 -> 1.83 hu/share/sgml/press.xml 1.3 -> 1.4 hu/share/sgml/templates.news-rdf.xsl Affected files ... .. //depot/projects/docproj_hu/www/hu/administration.sgml#18 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#34 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#13 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rdf.xsl#6 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/administration.sgml#18 (text+ko) ==== @@ -9,7 +9,7 @@ @@ -218,8 +218,9 @@
    • &a.erwin; <erwin@FreeBSD.org>
    • &a.linimon; <linimon@FreeBSD.org>
    • &a.pav; <pav@FreeBSD.org>
      • -
    • &a.krion; <krion@FreeBSD.org>
      • +
    • &a.itetcu; <itetcu@FreeBSD.org>
    • &a.flz; <flz@FreeBSD.org>
      • +
    • &a.miwi; <miwi@FreeBSD.org>

    @@ -656,8 +657,8 @@ bejegyzések.

    Klaszter rendszergazdák ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#34 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -19,6 +19,51 @@ 2009 + 6 + + + 4 + + + Átszervezések a Port Manager + Teamben + +

    A Port Manager Team lelkesedéssel köszönti + két új tagját.

    + +

    Martin Wilke három évvel ezelõtt kapta + commit jogát, és azóta az egyik + legaktívabb fejlesztõnk. A projekten belül + számos kisebb csoportnak, többek közt a + python, ports-security és KDE csapatnak is tagja.

    + +

    Ion-Mihai Tetcu a portok regressziós + tesztelésével és + minõségbiztosításával + foglalkozik. Ebbõl a célból hozta + létre a QAT elnevezésû automatikus + tesztelõrendszert, amely az egyes commitok után + ellenõrzi az egyes portokat, illetve a pointyhat + csomagkészítõ klaszter + számára szolgáltat folyamatosan friss + visszajelzéseket.

    + +

    Ezzel egyidõben sajnos búcsút kell + intenünk Kirill Ponomarewnek, akinek mostanság + már nincs ideje a &os; fejlesztésével + foglalkozni, ezért elhagyja a Port Manager + csapatát.

    + +

    Köszönjük Kirillnek az eddig végzett + remek munkáját és sok sikert + kívánunk Martinnak és Ion-Mihainak a + rájuk bízott feladataik + teljesítésében!

    +     +     +     + + 5 ==== //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#13 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -19,6 +19,24 @@ 2009 + 6 + + + 2009 májusának legmegbízhatóbb + szolgáltatói + http://news.netcraft.com/archives/2009/06/02/most_reliable_hosting_company_sites_in_may_2009.html + Netcraft Ltd. + http://www.netcraft.com/ + 2009. június 2. + Paul Mutton +

    A Netcraft felmérése szerint az öt + legmegbízhatóbb szolgáltató + közül három a &os; rendszerét + használja.

    +     +     + + 5 ==== //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rdf.xsl#6 (text+ko) ==== @@ -10,7 +10,7 @@ - + From owner-p4-projects@FreeBSD.ORG Fri Jun 5 14:33:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1583C1065673; Fri, 5 Jun 2009 14:33: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 C7438106564A for ; Fri, 5 Jun 2009 14:33: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 87FA68FC08 for ; Fri, 5 Jun 2009 14:33: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 n55EX4Ke003926 for ; Fri, 5 Jun 2009 14:33:04 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55EX4cr003924 for perforce@freebsd.org; Fri, 5 Jun 2009 14:33:04 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 14:33:04 GMT Message-Id: <200906051433.n55EX4cr003924@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 163562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 14:33:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=163562 Change 163562 by zec@zec_amdx4 on 2009/06/05 14:32:21 IFC @ 163559 -> sync up with Luigi's ipfw changes. Affected files ... .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/disk.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iir/iir.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydreg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonacl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/ext2fs/sparc64-bitops.h#2 delete .. //depot/projects/vimage-commit2/src/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb/zyd/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#41 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#45 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#41 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/nlm/nlm_advlock.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/platform_bare.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/clnt_dg.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/clnt_vc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/svc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/svc.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/svc_vc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_atalk.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet6.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_test/mac_test.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pcpu.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pmc.h#8 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/disk.c#4 (text+ko) ==== @@ -31,9 +31,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/disk.c,v 1.4 2009/05/05 16:29:08 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/disk.c,v 1.5 2009/06/03 16:28:29 raj Exp $"); #include +#include #include #include #include @@ -122,6 +123,15 @@ stor_print }; +static void +uuid_letoh(uuid_t *uuid) +{ + + uuid->time_low = le32toh(uuid->time_low); + uuid->time_mid = le16toh(uuid->time_mid); + uuid->time_hi_and_version = le16toh(uuid->time_hi_and_version); +} + static int stor_init(void) { @@ -251,7 +261,7 @@ } /* Check the slice table magic. */ - if (*((uint16_t *)(buf + DOSMAGICOFFSET)) != DOSMAGIC) { + if (le16toh(*((uint16_t *)(buf + DOSMAGICOFFSET))) != DOSMAGIC) { err = ENXIO; goto out; } @@ -286,9 +296,10 @@ /* Check GPT header */ if (bcmp(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig)) != 0 || - hdr->hdr_lba_self != 1 || hdr->hdr_revision < 0x00010000 || - hdr->hdr_entsz < sizeof(*ent) || - od->od_bsize % hdr->hdr_entsz != 0) { + le64toh(hdr->hdr_lba_self) != 1 || + le32toh(hdr->hdr_revision) < 0x00010000 || + le32toh(hdr->hdr_entsz) < sizeof(*ent) || + od->od_bsize % le32toh(hdr->hdr_entsz) != 0) { debugf("Invalid GPT header!\n"); err = EINVAL; goto out; @@ -296,9 +307,9 @@ /* Count number of valid partitions */ part = 0; - eps = od->od_bsize / hdr->hdr_entsz; - slba = hdr->hdr_lba_table; - elba = slba + hdr->hdr_entries / eps; + eps = od->od_bsize / le32toh(hdr->hdr_entsz); + slba = le64toh(hdr->hdr_lba_table); + elba = slba + le32toh(hdr->hdr_entries) / eps; for (lba = slba; lba < elba; lba++) { err = stor_readdev(dev, lba, 1, buf); @@ -312,8 +323,9 @@ for (i = 0; i < eps; i++) { if (uuid_is_nil(&ent[i].ent_type, NULL) || - ent[i].ent_lba_start == 0 || - ent[i].ent_lba_end < ent[i].ent_lba_start) + le64toh(ent[i].ent_lba_start) == 0 || + le64toh(ent[i].ent_lba_end) < + le64toh(ent[i].ent_lba_start)) continue; part += 1; @@ -343,8 +355,9 @@ for (i = 0; i < eps; i++) { if (uuid_is_nil(&ent[i].ent_type, NULL) || - ent[i].ent_lba_start == 0 || - ent[i].ent_lba_end < ent[i].ent_lba_start) + le64toh(ent[i].ent_lba_start) == 0 || + le64toh(ent[i].ent_lba_end) < + le64toh(ent[i].ent_lba_start)) continue; od->od_partitions[part].gp_index = (lba - slba) @@ -352,9 +365,11 @@ od->od_partitions[part].gp_type = ent[i].ent_type; od->od_partitions[part].gp_start = - ent[i].ent_lba_start; + le64toh(ent[i].ent_lba_start); od->od_partitions[part].gp_end = - ent[i].ent_lba_end; + le64toh(ent[i].ent_lba_end); + + uuid_letoh(&od->od_partitions[part].gp_type); part += 1; } } ==== //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 (text+ko) ==== @@ -573,6 +573,7 @@ vfsp->mnt_flag |= MNT_LOCAL; vfsp->mnt_kern_flag |= MNTK_MPSAFE; vfsp->mnt_kern_flag |= MNTK_LOOKUP_SHARED; + vfsp->mnt_kern_flag |= MNTK_SHARED_WRITES; if (error = dsl_prop_get_integer(osname, "readonly", &readonly, NULL)) goto out; ==== //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#17 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.256 2009/06/02 21:17:56 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.257 2009/06/03 17:25:19 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -2802,7 +2802,7 @@ slot = ((tsftu % ic->ic_lintval) * ATH_BCBUF) / ic->ic_lintval; vap = sc->sc_bslot[(slot+1) % ATH_BCBUF]; bfaddr = 0; - if (vap != NULL && vap->iv_state == IEEE80211_S_RUN) { + if (vap != NULL && vap->iv_state >= IEEE80211_S_RUN) { bf = ath_beacon_generate(sc, vap); if (bf != NULL) bfaddr = bf->bf_daddr; @@ -2812,7 +2812,7 @@ for (slot = 0; slot < ATH_BCBUF; slot++) { vap = sc->sc_bslot[slot]; - if (vap != NULL && vap->iv_state == IEEE80211_S_RUN) { + if (vap != NULL && vap->iv_state >= IEEE80211_S_RUN) { bf = ath_beacon_generate(sc, vap); if (bf != NULL) { *bflink = bf->bf_daddr; @@ -2878,7 +2878,7 @@ struct mbuf *m; int nmcastq, error; - KASSERT(vap->iv_state == IEEE80211_S_RUN, + KASSERT(vap->iv_state >= IEEE80211_S_RUN, ("not running, state %d", vap->iv_state)); KASSERT(avp->av_bcbuf != NULL, ("no beacon buffer")); @@ -5506,7 +5506,7 @@ IEEE80211_LOCK_ASSERT(ic); TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { - if (vap != this && vap->iv_state == IEEE80211_S_RUN) + if (vap != this && vap->iv_state >= IEEE80211_S_RUN) return 1; } return 0; ==== //depot/projects/vimage-commit2/src/sys/dev/iir/iir.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.20 2008/01/09 20:02:56 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.21 2009/06/03 20:25:13 jhb Exp $"); #define _IIR_C_ @@ -67,9 +67,6 @@ #include #include -#include -#include - #include MALLOC_DEFINE(M_GDTBUF, "iirbuf", "iir driver buffer"); ==== //depot/projects/vimage-commit2/src/sys/dev/iir/iir_ctrl.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.19 2009/05/20 17:29:21 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.20 2009/06/03 20:25:13 jhb Exp $"); #include #include @@ -52,10 +52,6 @@ #include #include #include -#include -#include -#include -#include #include ==== //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#9 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.47 2009/05/29 18:46:57 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.48 2009/06/04 21:59:28 thompsa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ #define MAKE_WORD(h,l) (((h) << 8) | (l)) #define BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1) -#define UAUDIO_MAX_CHAN(x) (((x) < 2) ? (x) : 2) /* XXX fixme later */ +#define UAUDIO_MAX_CHAN(x) (x) struct uaudio_mixer_node { int32_t minval; @@ -940,6 +940,8 @@ bChannels = UAUDIO_MAX_CHAN(asf1d->bNrChannels); bBitResolution = asf1d->bBitResolution; + DPRINTFN(9, "bChannels=%u\n", bChannels); + if (asf1d->bSamFreqType == 0) { DPRINTFN(16, "Sample rate: %d-%dHz\n", UA_SAMP_LO(asf1d), UA_SAMP_HI(asf1d)); ==== //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/input/ukbd.c,v 1.9 2009/06/02 17:29:15 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/input/ukbd.c,v 1.10 2009/06/04 22:00:48 thompsa Exp $"); /*- @@ -706,7 +706,6 @@ sc->sc_iface_index = uaa->info.bIfaceIndex; sc->sc_iface_no = uaa->info.bIfaceNum; sc->sc_mode = K_XLATE; - sc->sc_iface = uaa->iface; usb2_callout_init_mtx(&sc->sc_callout, &Giant, 0); ==== //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#10 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ /* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/wlan/if_zyd.c,v 1.14 2009/06/01 01:51:37 weongyo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/wlan/if_zyd.c,v 1.16 2009/06/04 02:49:50 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -20,7 +20,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_zyd.c,v 1.14 2009/06/01 01:51:37 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_zyd.c,v 1.16 2009/06/04 02:49:50 weongyo Exp $"); /* * ZyDAS ZD1211/ZD1211B USB WLAN driver. @@ -190,9 +190,10 @@ static int zyd_gct_init(struct zyd_rf *); static int zyd_gct_switch_radio(struct zyd_rf *, int); static int zyd_gct_set_channel(struct zyd_rf *, uint8_t); -static int zyd_maxim_init(struct zyd_rf *); -static int zyd_maxim_switch_radio(struct zyd_rf *, int); -static int zyd_maxim_set_channel(struct zyd_rf *, uint8_t); +static int zyd_gct_mode(struct zyd_rf *); +static int zyd_gct_set_channel_synth(struct zyd_rf *, int, int); +static int zyd_gct_write(struct zyd_rf *, uint16_t); +static int zyd_gct_txgain(struct zyd_rf *, uint8_t); static int zyd_maxim2_init(struct zyd_rf *); static int zyd_maxim2_switch_radio(struct zyd_rf *, int); static int zyd_maxim2_set_channel(struct zyd_rf *, uint8_t); @@ -204,55 +205,59 @@ #define ZYD_ZD1211 0 #define ZYD_ZD1211B 1 +#define ZYD_ZD1211_DEV(v,p) \ + { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, ZYD_ZD1211) } +#define ZYD_ZD1211B_DEV(v,p) \ + { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, ZYD_ZD1211B) } static const struct usb_device_id zyd_devs[] = { - /* ZYD_ZD1211 */ - {USB_VPI(USB_VENDOR_3COM2, USB_PRODUCT_3COM2_3CRUSB10075, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WL54, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL159G, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_DRAYTEK, USB_PRODUCT_DRAYTEK_VIGOR550, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GD, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GZL, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54GZ, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54MINI, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG760A, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_SENAO, USB_PRODUCT_SENAO_NUB8301, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_SWEEX, USB_PRODUCT_SWEEX_ZD1211, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_QUICKWLAN, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_1, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_2, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_G240, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB_A, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_AG225H, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_ZYAIRG220, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G200V2, ZYD_ZD1211)}, - /* ZYD_ZD1211B */ - {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SMCWUSBG, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_A9T_WIFI, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050_V4000, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSBF54G, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_FIBERLINE, USB_PRODUCT_FIBERLINE_WL430U, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54L, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SNU5600, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW_US54GXS, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG76NA, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UBC1, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_USR, USB_PRODUCT_USR_USR5423, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_VTECH, USB_PRODUCT_VTECH_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_M202, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G202, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220V2, ZYD_ZD1211B)}, + /* ZYD_ZD1211 */ + ZYD_ZD1211_DEV(3COM2, 3CRUSB10075), + ZYD_ZD1211_DEV(ABOCOM, WL54), + ZYD_ZD1211_DEV(ASUS, WL159G), + ZYD_ZD1211_DEV(CYBERTAN, TG54USB), + ZYD_ZD1211_DEV(DRAYTEK, VIGOR550), + ZYD_ZD1211_DEV(PLANEX2, GWUS54GD), + ZYD_ZD1211_DEV(PLANEX2, GWUS54GZL), + ZYD_ZD1211_DEV(PLANEX3, GWUS54GZ), + ZYD_ZD1211_DEV(PLANEX3, GWUS54MINI), + ZYD_ZD1211_DEV(SAGEM, XG760A), + ZYD_ZD1211_DEV(SENAO, NUB8301), + ZYD_ZD1211_DEV(SITECOMEU, WL113), + ZYD_ZD1211_DEV(SWEEX, ZD1211), + ZYD_ZD1211_DEV(TEKRAM, QUICKWLAN), + ZYD_ZD1211_DEV(TEKRAM, ZD1211_1), + ZYD_ZD1211_DEV(TEKRAM, ZD1211_2), + ZYD_ZD1211_DEV(TWINMOS, G240), + ZYD_ZD1211_DEV(UMEDIA, ALL0298V2), + ZYD_ZD1211_DEV(UMEDIA, TEW429UB_A), + ZYD_ZD1211_DEV(UMEDIA, TEW429UB), + ZYD_ZD1211_DEV(WISTRONNEWEB, UR055G), + ZYD_ZD1211_DEV(ZCOM, ZD1211), + ZYD_ZD1211_DEV(ZYDAS, ZD1211), + ZYD_ZD1211_DEV(ZYXEL, AG225H), + ZYD_ZD1211_DEV(ZYXEL, ZYAIRG220), + ZYD_ZD1211_DEV(ZYXEL, G200V2), + /* ZYD_ZD1211B */ + ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG), + ZYD_ZD1211B_DEV(ACCTON, ZD1211B), + ZYD_ZD1211B_DEV(ASUS, A9T_WIFI), + ZYD_ZD1211B_DEV(BELKIN, F5D7050_V4000), + ZYD_ZD1211B_DEV(BELKIN, ZD1211B), + ZYD_ZD1211B_DEV(CISCOLINKSYS, WUSBF54G), + ZYD_ZD1211B_DEV(FIBERLINE, WL430U), + ZYD_ZD1211B_DEV(MELCO, KG54L), + ZYD_ZD1211B_DEV(PHILIPS, SNU5600), + ZYD_ZD1211B_DEV(PLANEX2, GW_US54GXS), + ZYD_ZD1211B_DEV(SAGEM, XG76NA), + ZYD_ZD1211B_DEV(SITECOMEU, ZD1211B), + ZYD_ZD1211B_DEV(UMEDIA, TEW429UBC1), + ZYD_ZD1211B_DEV(USR, USR5423), + ZYD_ZD1211B_DEV(VTECH, ZD1211B), + ZYD_ZD1211B_DEV(ZCOM, ZD1211B), + ZYD_ZD1211B_DEV(ZYDAS, ZD1211B), + ZYD_ZD1211B_DEV(ZYXEL, M202), + ZYD_ZD1211B_DEV(ZYXEL, G202), + ZYD_ZD1211B_DEV(ZYXEL, G220V2) }; static const struct usb_config zyd_config[ZYD_N_TRANSFER] = { @@ -1417,11 +1422,14 @@ static int zyd_gct_init(struct zyd_rf *rf) { +#define ZYD_GCT_INTR_REG 0x85c1 #define N(a) (sizeof(a) / sizeof((a)[0])) struct zyd_softc *sc = rf->rf_sc; static const struct zyd_phy_pair phyini[] = ZYD_GCT_PHY; static const uint32_t rfini[] = ZYD_GCT_RF; - int i, error; + static const uint16_t vco[11][7] = ZYD_GCT_VCO; + int i, idx = -1, error; + uint16_t data; /* init RF-dependent PHY registers */ for (i = 0; i < N(phyini); i++) @@ -1432,119 +1440,150 @@ if ((error = zyd_rfwrite(sc, rfini[i])) != 0) return (error); } + + error = zyd_gct_mode(rf); + if (error != 0) + return (error); + + for (i = 0; i < N(vco) - 1; i++) { + error = zyd_gct_set_channel_synth(rf, 1, 0); + if (error != 0) + goto fail; + error = zyd_gct_write(rf, vco[i][0]); + if (error != 0) + goto fail; + zyd_write16_m(sc, ZYD_GCT_INTR_REG, 0xf); + zyd_read16_m(sc, ZYD_GCT_INTR_REG, &data); + if ((data & 0xf) == 0) { + idx = i; + break; + } + } + if (idx == -1) { + error = zyd_gct_set_channel_synth(rf, 1, 1); + if (error != 0) + goto fail; + error = zyd_gct_write(rf, 0x6662); + if (error != 0) + goto fail; + } + + rf->idx = idx; + zyd_write16_m(sc, ZYD_CR203, 0x6); fail: return (error); #undef N +#undef ZYD_GCT_INTR_REG } static int -zyd_gct_switch_radio(struct zyd_rf *rf, int on) +zyd_gct_mode(struct zyd_rf *rf) { - /* vendor driver does nothing for this RF chip */ +#define N(a) (sizeof(a) / sizeof((a)[0])) + struct zyd_softc *sc = rf->rf_sc; + static const uint32_t mode[] = { + 0x25f98, 0x25f9a, 0x25f94, 0x27fd4 + }; + int i, error; - return (0); + for (i = 0; i < N(mode); i++) { + if ((error = zyd_rfwrite(sc, mode[i])) != 0) + break; + } + return (error); +#undef N } static int -zyd_gct_set_channel(struct zyd_rf *rf, uint8_t chan) +zyd_gct_set_channel_synth(struct zyd_rf *rf, int chan, int acal) { - int error; + int error, idx = chan - 1; struct zyd_softc *sc = rf->rf_sc; - static const uint32_t rfprog[] = ZYD_GCT_CHANTABLE; + static uint32_t acal_synth[] = ZYD_GCT_CHANNEL_ACAL; + static uint32_t std_synth[] = ZYD_GCT_CHANNEL_STD; + static uint32_t div_synth[] = ZYD_GCT_CHANNEL_DIV; - error = zyd_rfwrite(sc, 0x1c0000); + error = zyd_rfwrite(sc, + (acal == 1) ? acal_synth[idx] : std_synth[idx]); if (error != 0) - goto fail; - error = zyd_rfwrite(sc, rfprog[chan - 1]); - if (error != 0) - goto fail; - error = zyd_rfwrite(sc, 0x1c0008); -fail: - return (error); + return (error); + return zyd_rfwrite(sc, div_synth[idx]); } -/* - * Maxim RF methods. - */ static int -zyd_maxim_init(struct zyd_rf *rf) +zyd_gct_write(struct zyd_rf *rf, uint16_t value) { -#define N(a) (sizeof(a) / sizeof((a)[0])) struct zyd_softc *sc = rf->rf_sc; - static const struct zyd_phy_pair phyini[] = ZYD_MAXIM_PHY; - static const uint32_t rfini[] = ZYD_MAXIM_RF; - uint16_t tmp; - int i, error; - /* init RF-dependent PHY registers */ - for (i = 0; i < N(phyini); i++) - zyd_write16_m(sc, phyini[i].reg, phyini[i].val); - - zyd_read16_m(sc, ZYD_CR203, &tmp); - zyd_write16_m(sc, ZYD_CR203, tmp & ~(1 << 4)); - - /* init maxim radio */ - for (i = 0; i < N(rfini); i++) { - if ((error = zyd_rfwrite(sc, rfini[i])) != 0) - return (error); - } - zyd_read16_m(sc, ZYD_CR203, &tmp); - zyd_write16_m(sc, ZYD_CR203, tmp | (1 << 4)); -fail: - return (error); -#undef N + return zyd_rfwrite(sc, 0x300000 | 0x40000 | value); } static int -zyd_maxim_switch_radio(struct zyd_rf *rf, int on) +zyd_gct_switch_radio(struct zyd_rf *rf, int on) { +#define N(a) (sizeof(a) / sizeof((a)[0])) + int error; + struct zyd_softc *sc = rf->rf_sc; - /* vendor driver does nothing for this RF chip */ - return (0); + error = zyd_rfwrite(sc, on ? 0x25f94 : 0x25f90); + if (error != 0) + return (error); + + zyd_write16_m(sc, ZYD_CR11, on ? 0x00 : 0x04); + zyd_write16_m(sc, ZYD_CR251, + on ? ((sc->sc_macrev == ZYD_ZD1211B) ? 0x7f : 0x3f) : 0x2f); +fail: + return (error); } static int -zyd_maxim_set_channel(struct zyd_rf *rf, uint8_t chan) +zyd_gct_set_channel(struct zyd_rf *rf, uint8_t chan) { #define N(a) (sizeof(a) / sizeof((a)[0])) + int error, i; struct zyd_softc *sc = rf->rf_sc; - static const struct zyd_phy_pair phyini[] = ZYD_MAXIM_PHY; - static const uint32_t rfini[] = ZYD_MAXIM_RF; - static const struct { - uint32_t r1, r2; - } rfprog[] = ZYD_MAXIM_CHANTABLE; - uint16_t tmp; - int i, error; + static const struct zyd_phy_pair cmd[] = { + { ZYD_CR80, 0x30 }, { ZYD_CR81, 0x30 }, { ZYD_CR79, 0x58 }, + { ZYD_CR12, 0xf0 }, { ZYD_CR77, 0x1b }, { ZYD_CR78, 0x58 }, + }; + static const uint16_t vco[11][7] = ZYD_GCT_VCO; - /* - * Do the same as we do when initializing it, except for the channel - * values coming from the two channel tables. - */ - - /* init RF-dependent PHY registers */ - for (i = 0; i < N(phyini); i++) - zyd_write16_m(sc, phyini[i].reg, phyini[i].val); - - zyd_read16_m(sc, ZYD_CR203, &tmp); - zyd_write16_m(sc, ZYD_CR203, tmp & ~(1 << 4)); - - /* first two values taken from the chantables */ - error = zyd_rfwrite(sc, rfprog[chan - 1].r1); + error = zyd_gct_set_channel_synth(rf, chan, 0); if (error != 0) goto fail; - error = zyd_rfwrite(sc, rfprog[chan - 1].r2); + error = zyd_gct_write(rf, (rf->idx == -1) ? 0x6662 : + vco[rf->idx][((chan - 1) / 2)]); if (error != 0) goto fail; + error = zyd_gct_mode(rf); + if (error != 0) + return (error); + for (i = 0; i < N(cmd); i++) + zyd_write16_m(sc, cmd[i].reg, cmd[i].val); + error = zyd_gct_txgain(rf, chan); + if (error != 0) + return (error); + zyd_write16_m(sc, ZYD_CR203, 0x6); +fail: + return (error); +#undef N +} + +static int +zyd_gct_txgain(struct zyd_rf *rf, uint8_t chan) +{ +#define N(a) (sizeof(a) / sizeof((a)[0])) + struct zyd_softc *sc = rf->rf_sc; + static uint32_t txgain[] = ZYD_GCT_TXGAIN; + uint8_t idx = sc->sc_pwrint[chan - 1]; - /* init maxim radio - skipping the two first values */ - for (i = 2; i < N(rfini); i++) { - if ((error = zyd_rfwrite(sc, rfini[i])) != 0) - return (error); + if (idx >= N(txgain)) { + device_printf(sc->sc_dev, "could not set TX gain (%d %#x)\n", + chan, idx); + return 0; } - zyd_read16_m(sc, ZYD_CR203, &tmp); - zyd_write16_m(sc, ZYD_CR203, tmp | (1 << 4)); -fail: - return (error); + + return zyd_rfwrite(sc, 0x700000 | txgain[idx]); #undef N } @@ -1639,6 +1678,7 @@ struct zyd_rf *rf = &sc->sc_rf; rf->rf_sc = sc; + rf->update_pwr = 1; switch (type) { case ZYD_RF_RFMD: @@ -1672,17 +1712,13 @@ rf->set_channel = zyd_al2210_set_channel; rf->width = 24; /* 24-bit RF values */ break; + case ZYD_RF_MAXIM_NEW: case ZYD_RF_GCT: rf->init = zyd_gct_init; rf->switch_radio = zyd_gct_switch_radio; rf->set_channel = zyd_gct_set_channel; - rf->width = 21; /* 21-bit RF values */ - break; - case ZYD_RF_MAXIM_NEW: - rf->init = zyd_maxim_init; - rf->switch_radio = zyd_maxim_switch_radio; - rf->set_channel = zyd_maxim_set_channel; - rf->width = 18; /* 18-bit RF values */ + rf->width = 24; /* 24-bit RF values */ + rf->update_pwr = 0; break; case ZYD_RF_MAXIM_NEW2: rf->init = zyd_maxim2_init; @@ -2062,16 +2098,21 @@ if (error != 0) goto fail; - /* update Tx power */ - zyd_write16_m(sc, ZYD_CR31, sc->sc_pwrint[chan - 1]); + if (rf->update_pwr) { + /* update Tx power */ + zyd_write16_m(sc, ZYD_CR31, sc->sc_pwrint[chan - 1]); - if (sc->sc_macrev == ZYD_ZD1211B) { - zyd_write16_m(sc, ZYD_CR67, sc->sc_ofdm36_cal[chan - 1]); - zyd_write16_m(sc, ZYD_CR66, sc->sc_ofdm48_cal[chan - 1]); - zyd_write16_m(sc, ZYD_CR65, sc->sc_ofdm54_cal[chan - 1]); - zyd_write16_m(sc, ZYD_CR68, sc->sc_pwrcal[chan - 1]); - zyd_write16_m(sc, ZYD_CR69, 0x28); - zyd_write16_m(sc, ZYD_CR69, 0x2a); + if (sc->sc_macrev == ZYD_ZD1211B) { + zyd_write16_m(sc, ZYD_CR67, + sc->sc_ofdm36_cal[chan - 1]); + zyd_write16_m(sc, ZYD_CR66, + sc->sc_ofdm48_cal[chan - 1]); + zyd_write16_m(sc, ZYD_CR65, + sc->sc_ofdm54_cal[chan - 1]); + zyd_write16_m(sc, ZYD_CR68, sc->sc_pwrcal[chan - 1]); + zyd_write16_m(sc, ZYD_CR69, 0x28); + zyd_write16_m(sc, ZYD_CR69, 0x2a); + } } if (sc->sc_cckgain) { /* set CCK baseband gain from EEPROM */ ==== //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydreg.h#5 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */ /* $NetBSD: if_zydreg.h,v 1.2 2007/06/16 11:18:45 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/wlan/if_zydreg.h,v 1.4 2009/05/28 17:36:36 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/wlan/if_zydreg.h,v 1.5 2009/06/04 02:49:50 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -840,82 +840,75 @@ #define ZYD_GCT_PHY \ { \ - { ZYD_CR47, 0x1e }, { ZYD_CR15, 0xdc }, { ZYD_CR113, 0xc0 }, \ - { ZYD_CR20, 0x0c }, { ZYD_CR17, 0x65 }, { ZYD_CR34, 0x04 }, \ - { ZYD_CR35, 0x35 }, { ZYD_CR24, 0x20 }, { ZYD_CR9, 0xe0 }, \ - { ZYD_CR127, 0x02 }, { ZYD_CR10, 0x91 }, { ZYD_CR23, 0x7f }, \ - { ZYD_CR27, 0x10 }, { ZYD_CR28, 0x7a }, { ZYD_CR79, 0xb5 }, \ - { ZYD_CR64, 0x80 }, { ZYD_CR33, 0x28 }, { ZYD_CR38, 0x30 } \ + { ZYD_CR10, 0x89 }, { ZYD_CR15, 0x20 }, { ZYD_CR17, 0x28 }, \ + { ZYD_CR23, 0x38 }, { ZYD_CR24, 0x20 }, { ZYD_CR26, 0x93 }, \ + { ZYD_CR27, 0x15 }, { ZYD_CR28, 0x3e }, { ZYD_CR29, 0x00 }, \ + { ZYD_CR33, 0x28 }, { ZYD_CR34, 0x30 }, { ZYD_CR35, 0x43 }, \ + { ZYD_CR41, 0x24 }, { ZYD_CR44, 0x32 }, { ZYD_CR46, 0x92 }, \ + { ZYD_CR47, 0x1e }, { ZYD_CR48, 0x04 }, { ZYD_CR49, 0xfa }, \ + { ZYD_CR79, 0x58 }, { ZYD_CR80, 0x30 }, { ZYD_CR81, 0x30 }, \ + { ZYD_CR87, 0x0a }, { ZYD_CR89, 0x04 }, { ZYD_CR91, 0x00 }, \ + { ZYD_CR92, 0x0a }, { ZYD_CR98, 0x8d }, { ZYD_CR99, 0x28 }, \ + { ZYD_CR100, 0x02 }, { ZYD_CR101, 0x09 }, { ZYD_CR102, 0x27 }, \ + { ZYD_CR106, 0x1c }, { ZYD_CR107, 0x1c }, { ZYD_CR109, 0x13 }, \ + { ZYD_CR110, 0x1f }, { ZYD_CR111, 0x13 }, { ZYD_CR112, 0x1f }, \ + { ZYD_CR113, 0x27 }, { ZYD_CR114, 0x23 }, { ZYD_CR115, 0x24 }, \ + { ZYD_CR116, 0x24 }, { ZYD_CR117, 0xfa }, { ZYD_CR118, 0xf0 }, \ + { ZYD_CR119, 0x1a }, { ZYD_CR120, 0x4f }, { ZYD_CR121, 0x1f }, \ + { ZYD_CR122, 0xf0 }, { ZYD_CR123, 0x57 }, { ZYD_CR125, 0xad }, \ + { ZYD_CR126, 0x6c }, { ZYD_CR127, 0x03 }, { ZYD_CR128, 0x14 }, \ + { ZYD_CR129, 0x12 }, { ZYD_CR130, 0x10 }, { ZYD_CR137, 0x50 }, \ + { ZYD_CR138, 0xa8 }, { ZYD_CR144, 0xac }, { ZYD_CR146, 0x20 }, \ + { ZYD_CR252, 0xff }, { ZYD_CR253, 0xff } \ } #define ZYD_GCT_RF \ { \ - 0x1f0000, 0x1f0000, 0x1f0200, 0x1f0600, 0x1f8600, 0x1f8600, \ - 0x002050, 0x1f8000, 0x1f8200, 0x1f8600, 0x1c0000, 0x10c458, \ - 0x088e92, 0x187b82, 0x0401b4, 0x140816, 0x0c7000, 0x1c0000, \ - 0x02ccae, 0x128023, 0x0a0000, 0x1a0000, 0x06e380, 0x16cb94, \ - 0x0e1740, 0x014980, 0x116240, 0x090000, 0x192304, 0x05112f, \ - 0x0d54a8, 0x0f8000, 0x1c0008, 0x1c0000, 0x1a0000, 0x1c0008, \ - 0x150000, 0x0c7000, 0x150800, 0x150000 \ + 0x40002b, 0x519e4f, 0x6f81ad, 0x73fffe, 0x25f9c, 0x100047, \ + 0x200999, 0x307602, 0x346063, \ +} + +#define ZYD_GCT_VCO \ +{ \ + { 0x664d, 0x604d, 0x6675, 0x6475, 0x6655, 0x6455, 0x6665 }, \ + { 0x666d, 0x606d, 0x664d, 0x644d, 0x6675, 0x6475, 0x6655 }, \ + { 0x665d, 0x605d, 0x666d, 0x646d, 0x664d, 0x644d, 0x6675 }, \ + { 0x667d, 0x607d, 0x665d, 0x645d, 0x666d, 0x646d, 0x664d }, \ + { 0x6643, 0x6043, 0x667d, 0x647d, 0x665d, 0x645d, 0x666d }, \ + { 0x6663, 0x6063, 0x6643, 0x6443, 0x667d, 0x647d, 0x665d }, \ + { 0x6653, 0x6053, 0x6663, 0x6463, 0x6643, 0x6443, 0x667d }, \ + { 0x6673, 0x6073, 0x6653, 0x6453, 0x6663, 0x6463, 0x6643 }, \ + { 0x664b, 0x604b, 0x6673, 0x6473, 0x6653, 0x6453, 0x6663 }, \ + { 0x666b, 0x606b, 0x664b, 0x644b, 0x6673, 0x6473, 0x6653 }, \ + { 0x665b, 0x605b, 0x666b, 0x646b, 0x664b, 0x644b, 0x6673 } \ } -#define ZYD_GCT_CHANTABLE \ +#define ZYD_GCT_TXGAIN \ { \ - 0x1a0000, 0x1a8000, 0x1a4000, 0x1ac000, 0x1a2000, 0x1aa000, \ - 0x1a6000, 0x1ae000, 0x1a1000, 0x1a9000, 0x1a5000, 0x1ad000, \ - 0x1a3000, 0x1ab000 \ + 0x0e313, 0x0fb13, 0x0e093, 0x0f893, 0x0ea93, 0x1f093, 0x1f493, \ + 0x1f693, 0x1f393, 0x1f35b, 0x1e6db, 0x1ff3f, 0x1ffff, 0x361d7, \ + 0x37fbf, 0x3ff8b, 0x3ff33, 0x3fb3f, 0x3ffff \ } -#define ZYD_MAXIM_PHY \ +#define ZYD_GCT_CHANNEL_ACAL \ { \ - { ZYD_CR23, 0x40 }, { ZYD_CR15, 0x20 }, { ZYD_CR28, 0x3e }, \ - { ZYD_CR29, 0x00 }, { ZYD_CR26, 0x11 }, { ZYD_CR44, 0x33 }, \ - { ZYD_CR106, 0x2a }, { ZYD_CR107, 0x1a }, { ZYD_CR109, 0x2b }, \ - { ZYD_CR110, 0x2b }, { ZYD_CR111, 0x2b }, { ZYD_CR112, 0x2b }, \ - { ZYD_CR10, 0x89 }, { ZYD_CR17, 0x20 }, { ZYD_CR26, 0x93 }, \ - { ZYD_CR34, 0x30 }, { ZYD_CR35, 0x40 }, { ZYD_CR41, 0x24 }, \ - { ZYD_CR44, 0x32 }, { ZYD_CR46, 0x90 }, { ZYD_CR89, 0x18 }, \ - { ZYD_CR92, 0x0a }, { ZYD_CR101, 0x13 }, { ZYD_CR102, 0x27 }, \ - { ZYD_CR106, 0x20 }, { ZYD_CR107, 0x24 }, { ZYD_CR109, 0x09 }, \ - { ZYD_CR110, 0x13 }, { ZYD_CR111, 0x13 }, { ZYD_CR112, 0x13 }, \ - { ZYD_CR113, 0x27 }, { ZYD_CR114, 0x27 }, { ZYD_CR115, 0x24 }, \ - { ZYD_CR116, 0x24 }, { ZYD_CR117, 0xf4 }, { ZYD_CR118, 0xfa }, \ - { ZYD_CR120, 0x4f }, { ZYD_CR121, 0x77 }, { ZYD_CR122, 0xfe }, \ - { ZYD_CR10, 0x89 }, { ZYD_CR17, 0x20 }, { ZYD_CR26, 0x93 }, \ - { ZYD_CR34, 0x30 }, { ZYD_CR35, 0x40 }, { ZYD_CR41, 0x24 }, \ - { ZYD_CR44, 0x32 }, { ZYD_CR46, 0x90 }, { ZYD_CR89, 0x18 }, \ - { ZYD_CR92, 0x0a }, { ZYD_CR101, 0x13 }, { ZYD_CR102, 0x27 }, \ - { ZYD_CR106, 0x20 }, { ZYD_CR107, 0x24 }, { ZYD_CR109, 0x13 }, \ - { ZYD_CR110, 0x27 }, { ZYD_CR111, 0x27 }, { ZYD_CR112, 0x13 }, \ - { ZYD_CR113, 0x27 }, { ZYD_CR114, 0x27 }, { ZYD_CR115, 0x24 }, \ - { ZYD_CR116, 0x24 }, { ZYD_CR117, 0xf4 }, { ZYD_CR118, 0x00 }, \ - { ZYD_CR120, 0x4f }, { ZYD_CR121, 0x06 }, { ZYD_CR122, 0xfe }, \ - { ZYD_CR150, 0x0d } \ + 0x106847, 0x106847, 0x106867, 0x106867, 0x106867, 0x106867, \ + 0x106857, 0x106857, 0x106857, 0x106857, 0x106877, 0x106877, \ + 0x106877, 0x10684f \ } -#define ZYD_MAXIM_RF \ +#define ZYD_GCT_CHANNEL_STD \ { \ - 0x00ccd4, 0x030a03, 0x000400, 0x000ca1, 0x010072, 0x018645, \ - 0x004006, 0x0000a7, 0x008258, 0x003fc9, 0x00040a, 0x00000b, \ - 0x00026c \ + 0x100047, 0x100047, 0x100067, 0x100067, 0x100067, 0x100067, \ + 0x100057, 0x100057, 0x100057, 0x100057, 0x100077, 0x100077, \ + 0x100077, 0x10004f \ } -#define ZYD_MAXIM_CHANTABLE \ -{ \ - { 0x0ccd4, 0x30a03 }, \ - { 0x22224, 0x00a13 }, \ - { 0x37774, 0x10a13 }, \ - { 0x0ccd4, 0x30a13 }, \ - { 0x22224, 0x00a23 }, \ - { 0x37774, 0x10a23 }, \ - { 0x0ccd4, 0x30a23 }, \ - { 0x22224, 0x00a33 }, \ - { 0x37774, 0x10a33 }, \ - { 0x0ccd4, 0x30a33 }, \ - { 0x22224, 0x00a43 }, \ - { 0x37774, 0x10a43 }, \ - { 0x0ccd4, 0x30a43 }, \ - { 0x199a4, 0x20a53 } \ +#define ZYD_GCT_CHANNEL_DIV \ +{ \ + 0x200999, 0x20099b, 0x200998, 0x20099a, 0x200999, 0x20099b, \ + 0x200998, 0x20099a, 0x200999, 0x20099b, 0x200998, 0x20099a, \ + 0x200999, 0x200ccc \ } #define ZYD_MAXIM2_PHY \ @@ -1226,6 +1219,8 @@ /* RF attributes */ struct zyd_softc *rf_sc; /* back-pointer */ int width; + int idx; /* for GIT RF */ + int update_pwr; }; struct zyd_rq { ==== //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vfsops.c#3 (text+ko) ==== @@ -31,9 +31,11 @@ * @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.54 2009/05/11 15:33:26 attilio Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.55 2009/06/04 10:30:18 rwatson Exp $ */ +#include "opt_mac.h" /* To set MNT_MULTILABEL. */ + #include #include #include ==== //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonacl.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonacl.c,v 1.3 2009/05/26 22:21:53 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonacl.c,v 1.4 2009/06/05 14:15:00 rwatson Exp $"); #ifndef APPLEKEXT #include @@ -703,10 +703,6 @@ if (aclp->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2) return (NFSERR_ATTRNOTSUPP); error = VOP_ACLCHECK(vp, ACL_TYPE_NFS4, aclp, cred, p); -#ifdef MAC - if (!error) - error = mac_check_vnode_setacl(cred, vp, ACL_TYPE_NFS4, aclp); -#endif if (!error) error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, p); return (error); ==== //depot/projects/vimage-commit2/src/sys/kern/kern_malloc.c#7 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.171 2009/05/09 19:00:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.172 2009/06/05 09:16:52 brian Exp $"); #include "opt_ddb.h" #include "opt_kdtrace.h" @@ -675,8 +675,8 @@ KASSERT(cnt.v_page_count != 0, ("malloc_register before vm_init")); mtp = data; - KASSERT(mtp->ks_magic == M_MAGIC, - ("malloc_init: bad malloc type magic")); + if (mtp->ks_magic != M_MAGIC) + panic("malloc_init: bad malloc type magic"); mtip = uma_zalloc(mt_zone, M_WAITOK | M_ZERO); mtp->ks_handle = mtip; @@ -709,9 +709,13 @@ if (mtp != kmemstatistics) { for (temp = kmemstatistics; temp != NULL; temp = temp->ks_next) { - if (temp->ks_next == mtp) + if (temp->ks_next == mtp) { temp->ks_next = mtp->ks_next; + break; + } } + KASSERT(temp, + ("malloc_uninit: type '%s' not found", mtp->ks_shortdesc)); } else kmemstatistics = mtp->ks_next; kmemcount--; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 5 14:43:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 75E961065691; Fri, 5 Jun 2009 14:43: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 2BEA11065675 for ; Fri, 5 Jun 2009 14:43: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 1AE118FC0A for ; Fri, 5 Jun 2009 14:43: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 n55EhEUW004708 for ; Fri, 5 Jun 2009 14:43:14 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55EhE6i004706 for perforce@freebsd.org; Fri, 5 Jun 2009 14:43:14 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 14:43:14 GMT Message-Id: <200906051443.n55EhE6i004706@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 163564 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 14:43:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=163564 Change 163564 by zec@zec_tpx32 on 2009/06/05 14:42:33 Improve style - enclose return values in braces. Pointed out by: julian Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#30 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#32 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#6 (text+ko) ==== @@ -210,7 +210,7 @@ if (pr->pr_destroy) (*pr->pr_destroy)(); - return 0; + return (0); } #endif ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#30 (text+ko) ==== @@ -3095,7 +3095,7 @@ V_nextID = 1; - return 0; + return (0); } #ifdef VIMAGE @@ -3120,7 +3120,7 @@ last_killed = node; } - return 0; + return (0); } #endif /* VIMAGE */ ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#32 (text+ko) ==== @@ -392,7 +392,7 @@ INIT_VNET_INET(curvnet); callout_drain(&V_rtq_timer); - return 1; + return (1); } #endif From owner-p4-projects@FreeBSD.ORG Fri Jun 5 14:55:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0442E1065672; Fri, 5 Jun 2009 14:55:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B80A1106566C for ; Fri, 5 Jun 2009 14:55:27 +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 8CEA38FC15 for ; Fri, 5 Jun 2009 14:55:27 +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 n55EtRna005671 for ; Fri, 5 Jun 2009 14:55:27 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55EtRgO005669 for perforce@freebsd.org; Fri, 5 Jun 2009 14:55:27 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 14:55:27 GMT Message-Id: <200906051455.n55EtRgO005669@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 163565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 14:55:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=163565 Change 163565 by zec@zec_tpx32 on 2009/06/05 14:54:51 Fix ordering of destructor calls. Pointed out by: bz Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#7 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#7 (text+ko) ==== @@ -204,11 +204,11 @@ const struct domain *dp = arg; struct protosw *pr; - if (dp->dom_destroy) - (*dp->dom_destroy)(); for (pr = dp->dom_protosw; pr < dp->dom_protoswNPROTOSW; pr++) if (pr->pr_destroy) (*pr->pr_destroy)(); + if (dp->dom_destroy) + (*dp->dom_destroy)(); return (0); } From owner-p4-projects@FreeBSD.ORG Fri Jun 5 15:22:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70B001065673; Fri, 5 Jun 2009 15:22:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 307FD1065670 for ; Fri, 5 Jun 2009 15:22:56 +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 055A88FC16 for ; Fri, 5 Jun 2009 15:22:56 +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 n55FMtFG009222 for ; Fri, 5 Jun 2009 15:22:55 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55FMtFw009220 for perforce@freebsd.org; Fri, 5 Jun 2009 15:22:55 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 15:22:55 GMT Message-Id: <200906051522.n55FMtFw009220@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 163568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 15:22:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=163568 Change 163568 by zec@zec_tpx32 on 2009/06/05 15:22:44 Restore the original comment re. net_init_domain(). Suggested by: bz Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#8 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#8 (text+ko) ==== @@ -172,7 +172,9 @@ } /* - * Initialize a domain instance. + * Add a new protocol domain to the list of supported domains + * Note: you cant unload it again because a socket may be using it. + * XXX can't fail at this time. */ static int net_init_domain(const void *arg) From owner-p4-projects@FreeBSD.ORG Fri Jun 5 15:26:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1B3D106567B; Fri, 5 Jun 2009 15:25: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 6BD611065678 for ; Fri, 5 Jun 2009 15:25:59 +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 404898FC20 for ; Fri, 5 Jun 2009 15:25:59 +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 n55FPxWA009503 for ; Fri, 5 Jun 2009 15:25:59 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55FPxKK009501 for perforce@freebsd.org; Fri, 5 Jun 2009 15:25:59 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 15:25:59 GMT Message-Id: <200906051525.n55FPxKK009501@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 163569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 15:26:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=163569 Change 163569 by zec@zec_tpx32 on 2009/06/05 15:25:04 Misc. style improvements. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#51 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#40 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#31 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#31 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#51 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/net/route.c#40 (text+ko) ==== @@ -244,7 +244,7 @@ #ifdef VIMAGE static int -vnet_route_idetach(const void *unused) +vnet_route_idetach(const void *unused __unused) { int table; int fam; @@ -256,7 +256,7 @@ for (table = 0; table < rt_numfibs; table++) { if ( (fam = dom->dom_family) == AF_INET || table == 0) { - /* for now only AF_INET has > 1 table */ + /* For now only AF_INET has > 1 table. */ rnh = rt_tables_get_rnh_ptr(table, fam); if (rnh == NULL) panic("%s: rnh NULL", __func__); ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#31 (text+ko) ==== @@ -3089,7 +3089,8 @@ }; #endif -static int vnet_netgraph_iattach(const void *unused) +static int +vnet_netgraph_iattach(const void *unused __unused) { INIT_VNET_NETGRAPH(curvnet); @@ -3099,7 +3100,8 @@ } #ifdef VIMAGE -static int vnet_netgraph_idetach(const void *unused) +static int +vnet_netgraph_idetach(const void *unused __unused) { INIT_VNET_NETGRAPH(curvnet); node_p node, last_killed = NULL; ==== //depot/projects/vimage-commit2/src/sys/netipsec/key.c#31 (text+ko) ==== @@ -7226,7 +7226,8 @@ } #ifdef VIMAGE -void key_destroy(void) +void +key_destroy(void) { INIT_VNET_IPSEC(curvnet); struct secpolicy *sp, *nextsp; @@ -7238,7 +7239,7 @@ SPTREE_LOCK(); for (i = 0; i < IPSEC_DIR_MAX; i++) { for (sp = LIST_FIRST(&V_sptree[i]); - sp != NULL; sp = nextsp) { + sp != NULL; sp = nextsp) { nextsp = LIST_NEXT(sp, chain); if (__LIST_CHAINED(sp)) { LIST_REMOVE(sp, chain); From owner-p4-projects@FreeBSD.ORG Fri Jun 5 15:34:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D5A651065673; Fri, 5 Jun 2009 15:34:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9526A106566C for ; Fri, 5 Jun 2009 15:34:10 +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 69FA58FC08 for ; Fri, 5 Jun 2009 15:34:10 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55FYAiP010102 for ; Fri, 5 Jun 2009 15:34:10 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55FY8wv010100 for perforce@freebsd.org; Fri, 5 Jun 2009 15:34:08 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 15:34:08 GMT Message-Id: <200906051534.n55FY8wv010100@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 163570 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 15:34:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=163570 Change 163570 by zec@zec_tpx32 on 2009/06/05 15:33:59 Enclose a debugging printf in #ifdef INVARIANTS. Pointed out by: bz Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#52 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#52 (text+ko) ==== @@ -681,9 +681,11 @@ if (vnet->sockcnt != 0) return (EBUSY); +#ifdef INVARIANTS if (vip->vi_ucredrefc != 0) printf("vi_destroy: %s ucredrefc %d\n", vip->vi_name, vip->vi_ucredrefc); +#endif /* Point with no return - cleanup MUST succeed! */ LIST_REMOVE(vip, vi_le); From owner-p4-projects@FreeBSD.ORG Fri Jun 5 15:42:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6565A106566C; Fri, 5 Jun 2009 15:42:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22C2E1065686 for ; Fri, 5 Jun 2009 15:42:19 +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 EA97A8FC1A for ; Fri, 5 Jun 2009 15:42: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 n55FgIp8010827 for ; Fri, 5 Jun 2009 15:42:18 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55FgItZ010824 for perforce@freebsd.org; Fri, 5 Jun 2009 15:42:18 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 15:42:18 GMT Message-Id: <200906051542.n55FgItZ010824@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 163572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 15:42:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=163572 Change 163572 by zec@zec_tpx32 on 2009/06/05 15:42:03 Trim long line. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/route.c#41 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/route.c#41 (text+ko) ==== @@ -256,7 +256,7 @@ for (table = 0; table < rt_numfibs; table++) { if ( (fam = dom->dom_family) == AF_INET || table == 0) { - /* For now only AF_INET has > 1 table. */ + /* For now only AF_INET has > 1 tbl. */ rnh = rt_tables_get_rnh_ptr(table, fam); if (rnh == NULL) panic("%s: rnh NULL", __func__); From owner-p4-projects@FreeBSD.ORG Fri Jun 5 15:46:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8403B1065672; Fri, 5 Jun 2009 15:46: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 43F0D106564A for ; Fri, 5 Jun 2009 15:46:23 +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 32C128FC0A for ; Fri, 5 Jun 2009 15:46:23 +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 n55FkNBJ011183 for ; Fri, 5 Jun 2009 15:46:23 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55FkNuf011181 for perforce@freebsd.org; Fri, 5 Jun 2009 15:46:23 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 15:46:23 GMT Message-Id: <200906051546.n55FkNuf011181@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 163573 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 15:46:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=163573 Change 163573 by zec@zec_tpx32 on 2009/06/05 15:46:18 Hopefully the last WS trim submit in route.c for today :) Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/route.c#42 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/route.c#42 (text+ko) ==== @@ -252,16 +252,16 @@ struct radix_node_head **rnh; for (dom = domains; dom; dom = dom->dom_next) { - if (dom->dom_rtdetach) { - for (table = 0; table < rt_numfibs; table++) { + if (dom->dom_rtdetach) { + for (table = 0; table < rt_numfibs; table++) { if ( (fam = dom->dom_family) == AF_INET || table == 0) { - /* For now only AF_INET has > 1 tbl. */ + /* For now only AF_INET has > 1 tbl. */ rnh = rt_tables_get_rnh_ptr(table, fam); if (rnh == NULL) panic("%s: rnh NULL", __func__); dom->dom_rtdetach((void **)rnh, - dom->dom_rtoffset); + dom->dom_rtoffset); } else { break; } From owner-p4-projects@FreeBSD.ORG Fri Jun 5 15:53:31 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4178C1065670; Fri, 5 Jun 2009 15:53: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 01D01106564A for ; Fri, 5 Jun 2009 15:53:31 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C99FB8FC0C for ; Fri, 5 Jun 2009 15:53:30 +0000 (UTC) (envelope-from fangwang@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55FrUZb011658 for ; Fri, 5 Jun 2009 15:53:30 GMT (envelope-from fangwang@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55FrUUV011655 for perforce@freebsd.org; Fri, 5 Jun 2009 15:53:30 GMT (envelope-from fangwang@FreeBSD.org) Date: Fri, 5 Jun 2009 15:53:30 GMT Message-Id: <200906051553.n55FrUUV011655@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to fangwang@FreeBSD.org using -f From: Fang Wang To: Perforce Change Reviews Cc: Subject: PERFORCE change 163574 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 15:53:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=163574 Change 163574 by fangwang@fangwang_utobsd on 2009/06/05 15:52:44 Add UTO support in tcp_dooptions. Modify some mistakes. Affected files ... .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_input.c#2 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_output.c#4 edit .. //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#7 edit Differences ... ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_input.c#2 (text+ko) ==== @@ -2943,6 +2943,16 @@ to->to_sacks = cp + 2; TCPSTAT_INC(tcps_sack_rcv_blocks); break; + case TCPOPT_UTO: + unsigned short uto_load; + if (optlen != TCPOLEN_UTO) + continue; + to->to_flags |= TOF_UTO; + bcopy((char *)cp + 2, + (char *)&uto_load, sizeof(uto_load)); + uto_load = ntohs(uto_load); + to->to_granularity = uto_load >> 15; + to->to_uto = uto_load - ((unsigned short)to->to_granularity << 15)); default: continue; } ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_output.c#4 (text+ko) ==== @@ -1446,7 +1446,7 @@ } case TOF_UTO: { - unsigned short uto_load = (unsigned short)to->to_granularity; + unsigned short uto_load = (unsigned short)to->to_granularity << 15; uto_load += to->to_uto; if (TCP_MAXOLEN - optlen < TCPOLEN_UTO) continue; ==== //depot/projects/soc2009/tcputo/src/sys/netinet/tcp_var.h#7 (text+ko) ==== @@ -196,10 +196,10 @@ u_int snd_uto; /* send user timeout value, in seconds */ u_char rcv_uto_granularity:1; /* received user timeout granularity */ u_char snd_uto_granularity:1; /* received user timeout granularity */ - u_char uto_enable:1; /* flag controls whether the UTO option is enabled for a connection */ - u_char uto_changeable:1; /* flag that controls whether USER_TIMEOUT may be changed based on t_rcvuto */ - u_char uto_impl:1; /* flag that controls whelther implement user timeout */ - u_int t_impl_uto; /* implemented user timeout value (ticks) */ + u_char uto_enable:1; /* flag controls whether the UTO option is enabled */ + u_char uto_changeable:1; /* flag that controls whether USER_TIMEOUT may be changed based on rcv_uto */ + u_char uto_impl:1; /* flag that controls whether implement user timeout */ + u_int t_impl_uto; /* implemented user timeout */ }; /* From owner-p4-projects@FreeBSD.ORG Fri Jun 5 15:54:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 26FF41065673; Fri, 5 Jun 2009 15:54: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 DB8A7106566C for ; Fri, 5 Jun 2009 15:54:31 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AFBEB8FC17 for ; Fri, 5 Jun 2009 15:54:31 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55FsVSU011722 for ; Fri, 5 Jun 2009 15:54:31 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55FsVkG011720 for perforce@freebsd.org; Fri, 5 Jun 2009 15:54:31 GMT (envelope-from sson@FreeBSD.org) Date: Fri, 5 Jun 2009 15:54:31 GMT Message-Id: <200906051554.n55FsVkG011720@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 163575 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 15:54:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=163575 Change 163575 by sson@sson_amd64 on 2009/06/05 15:54:10 Fix parsing bug for AUT_SOCKUNIX tokens. fetch_sock_unix_tok() assumes that the path component of AUT_SOCKUNIX is a fixed length when is actually a variable length. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#63 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#93 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#63 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#63 $ */ #include @@ -3176,19 +3176,25 @@ /* * socket family 2 bytes - * path 104 bytes + * path (up to) 104 bytes + NULL (NULL terminated string). */ static int fetch_sock_unix_tok(tokenstr_t *tok, u_char *buf, int len) { int err = 0; + u_char *p; + int slen; + READ_TOKEN_U_INT16(buf, len, tok->tt.sockunix.family, tok->len, err); if (err) return (-1); - READ_TOKEN_BYTES(buf, len, tok->tt.sockunix.path, 104, tok->len, - err); + /* slen = strnlen((buf + tok->len), 104) + 1; */ + p = (u_char *)memchr((const void *)(buf + tok->len), '\0', 104); + slen = (p ? (int)(p - (buf + tok->len)) : 104) + 1; + + READ_TOKEN_BYTES(buf, len, tok->tt.sockunix.path, slen, tok->len, err); if (err) return (-1); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#93 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#92 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#93 $ */ #include @@ -996,7 +996,7 @@ /* * token ID 1 byte * socket family 2 bytes - * path 104 bytes + * path (up to) 104 bytes + NULL (NULL terminated string) */ token_t * au_to_sock_unix(struct sockaddr_un *so) From owner-p4-projects@FreeBSD.ORG Fri Jun 5 15:59:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A17B1065670; Fri, 5 Jun 2009 15:59: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 2A282106564A for ; Fri, 5 Jun 2009 15:59: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 F39FA8FC0C for ; Fri, 5 Jun 2009 15:59:36 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55FxaBx012117 for ; Fri, 5 Jun 2009 15:59:36 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55Fxaql012115 for perforce@freebsd.org; Fri, 5 Jun 2009 15:59:36 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 15:59:36 GMT Message-Id: <200906051559.n55Fxaql012115@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 163576 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 15:59:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=163576 Change 163576 by zec@zec_tpx32 on 2009/06/05 15:59:12 Style improvement. Pointed out by: bz Affected files ... .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#33 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#33 (text+ko) ==== @@ -1810,13 +1810,13 @@ return (0); } -/* XXX revisit this! */ #ifdef VIMAGE static int -ipsec_idetach(unused) - const void *unused; +ipsec_idetach(const void *unused __unused) { + /* XXX revisit this! */ + return (0); } #endif From owner-p4-projects@FreeBSD.ORG Fri Jun 5 16:09:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D92EC1065670; Fri, 5 Jun 2009 16:09:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9969F106564A for ; Fri, 5 Jun 2009 16:09:47 +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 880A08FC0A for ; Fri, 5 Jun 2009 16:09:47 +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 n55G9ljU013901 for ; Fri, 5 Jun 2009 16:09:47 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55G9lpk013899 for perforce@freebsd.org; Fri, 5 Jun 2009 16:09:47 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 16:09:47 GMT Message-Id: <200906051609.n55G9lpk013899@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 163578 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 16:09:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=163578 Change 163578 by zec@zec_tpx32 on 2009/06/05 16:08:48 Further style improvements. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#72 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#34 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#25 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#15 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#72 (text+ko) ==== @@ -455,8 +455,7 @@ #ifdef VIMAGE static int -vnet_net_idetach(unused) - const void *unused; +vnet_net_idetach(const void *unused __unused) { INIT_VNET_NET(curvnet); ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#34 (text+ko) ==== @@ -172,7 +172,8 @@ return (0); } -static int vnet_loif_iattach(const void *unused __unused) +static int +vnet_loif_iattach(const void *unused __unused) { INIT_VNET_NET(curvnet); @@ -190,8 +191,8 @@ } #ifdef VIMAGE -static int vnet_loif_idetach(unused) - const void *unused; +static int +vnet_loif_idetach(const void *unused __unused) { INIT_VNET_NET(curvnet); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#25 (text+ko) ==== @@ -673,6 +673,5 @@ callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz, tcp_hc_purge, arg); - CURVNET_RESTORE(); } ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#15 (text+ko) ==== @@ -584,7 +584,9 @@ void tcp_drain(void); void tcp_fasttimo(void); void tcp_init(void); +#ifdef VIMAGE void tcp_destroy(void); +#endif void tcp_fini(void *); char *tcp_log_addrs(struct in_conninfo *, struct tcphdr *, void *, const void *); @@ -629,7 +631,9 @@ * All tcp_hc_* functions are IPv4 and IPv6 (via in_conninfo) */ void tcp_hc_init(void); +#ifdef VIMAGE void tcp_hc_destroy(void); +#endif void tcp_hc_get(struct in_conninfo *, struct hc_metrics_lite *); u_long tcp_hc_getmtu(struct in_conninfo *); void tcp_hc_updatemtu(struct in_conninfo *, u_long); From owner-p4-projects@FreeBSD.ORG Fri Jun 5 16:12:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 666C91065677; Fri, 5 Jun 2009 16:12: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 178F6106566C for ; Fri, 5 Jun 2009 16:12: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 E068C8FC12 for ; Fri, 5 Jun 2009 16:12:50 +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 n55GCoTU014192 for ; Fri, 5 Jun 2009 16:12:50 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55GCoXw014190 for perforce@freebsd.org; Fri, 5 Jun 2009 16:12:50 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 16:12:50 GMT Message-Id: <200906051612.n55GCoXw014190@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 163580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 16:12:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=163580 Change 163580 by zec@zec_tpx32 on 2009/06/05 16:12:22 tcp_hc_destroy() should be compiled in only for options VIMAGE builds. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#26 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#26 (text+ko) ==== @@ -230,6 +230,7 @@ tcp_hc_purge, curvnet); } +#ifdef VIMAGE void tcp_hc_destroy(void) { @@ -239,6 +240,7 @@ callout_drain(&V_tcp_hc_callout); } +#ifdef VIMAGE /* * Internal function: look up an entry in the hostcache or return NULL. From owner-p4-projects@FreeBSD.ORG Fri Jun 5 16:13:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8DBF1065675; Fri, 5 Jun 2009 16:13: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 87E871065673 for ; Fri, 5 Jun 2009 16:13:52 +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 5C83F8FC0C for ; Fri, 5 Jun 2009 16:13:52 +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 n55GDpRj014271 for ; Fri, 5 Jun 2009 16:13:51 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55GDpm2014269 for perforce@freebsd.org; Fri, 5 Jun 2009 16:13:51 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 16:13:51 GMT Message-Id: <200906051613.n55GDpm2014269@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 163581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 16:13:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=163581 Change 163581 by zec@zec_tpx32 on 2009/06/05 16:13:17 Fix typo. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#27 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#27 (text+ko) ==== @@ -240,7 +240,7 @@ callout_drain(&V_tcp_hc_callout); } -#ifdef VIMAGE +#endif /* * Internal function: look up an entry in the hostcache or return NULL. From owner-p4-projects@FreeBSD.ORG Fri Jun 5 16:53:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B75451065673; Fri, 5 Jun 2009 16:53: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 59AF8106566C for ; Fri, 5 Jun 2009 16:53:35 +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 46A608FC1F for ; Fri, 5 Jun 2009 16:53:35 +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 n55GrZLR027317 for ; Fri, 5 Jun 2009 16:53:35 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55GrYre027315 for perforce@freebsd.org; Fri, 5 Jun 2009 16:53:34 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 16:53:34 GMT Message-Id: <200906051653.n55GrYre027315@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 163586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 16:53:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=163586 Change 163586 by zec@zec_amdx4 on 2009/06/05 16:52:50 IFC @ 163559 Affected files ... .. //depot/projects/vimage/src/sys/boot/uboot/lib/disk.c#5 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#39 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir.c#5 integrate .. //depot/projects/vimage/src/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#14 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#11 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#6 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/nfs/nfs_commonacl.c#3 integrate .. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/sparc64-bitops.h#2 delete .. //depot/projects/vimage/src/sys/kern/kern_malloc.c#13 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#12 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#25 integrate .. //depot/projects/vimage/src/sys/modules/usb/zyd/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#30 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#42 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.h#16 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#18 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#26 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#26 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#20 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#18 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.h#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#31 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#59 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#16 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#31 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#79 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#59 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#19 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#48 integrate .. //depot/projects/vimage/src/sys/nlm/nlm_advlock.c#10 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/platform_bare.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#12 integrate .. //depot/projects/vimage/src/sys/rpc/clnt_dg.c#6 integrate .. //depot/projects/vimage/src/sys/rpc/clnt_vc.c#6 integrate .. //depot/projects/vimage/src/sys/rpc/svc.c#3 integrate .. //depot/projects/vimage/src/sys/rpc/svc.h#4 integrate .. //depot/projects/vimage/src/sys/rpc/svc_vc.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_atalk.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#14 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet6.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_net.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#17 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#16 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#18 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#17 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#17 integrate .. //depot/projects/vimage/src/sys/sun4v/include/pcpu.h#9 integrate .. //depot/projects/vimage/src/sys/sys/mount.h#22 integrate .. //depot/projects/vimage/src/sys/sys/pcpu.h#12 integrate .. //depot/projects/vimage/src/sys/sys/pmc.h#10 integrate Differences ... ==== //depot/projects/vimage/src/sys/boot/uboot/lib/disk.c#5 (text+ko) ==== @@ -31,9 +31,10 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/disk.c,v 1.4 2009/05/05 16:29:08 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/disk.c,v 1.5 2009/06/03 16:28:29 raj Exp $"); #include +#include #include #include #include @@ -122,6 +123,15 @@ stor_print }; +static void +uuid_letoh(uuid_t *uuid) +{ + + uuid->time_low = le32toh(uuid->time_low); + uuid->time_mid = le16toh(uuid->time_mid); + uuid->time_hi_and_version = le16toh(uuid->time_hi_and_version); +} + static int stor_init(void) { @@ -251,7 +261,7 @@ } /* Check the slice table magic. */ - if (*((uint16_t *)(buf + DOSMAGICOFFSET)) != DOSMAGIC) { + if (le16toh(*((uint16_t *)(buf + DOSMAGICOFFSET))) != DOSMAGIC) { err = ENXIO; goto out; } @@ -286,9 +296,10 @@ /* Check GPT header */ if (bcmp(hdr->hdr_sig, GPT_HDR_SIG, sizeof(hdr->hdr_sig)) != 0 || - hdr->hdr_lba_self != 1 || hdr->hdr_revision < 0x00010000 || - hdr->hdr_entsz < sizeof(*ent) || - od->od_bsize % hdr->hdr_entsz != 0) { + le64toh(hdr->hdr_lba_self) != 1 || + le32toh(hdr->hdr_revision) < 0x00010000 || + le32toh(hdr->hdr_entsz) < sizeof(*ent) || + od->od_bsize % le32toh(hdr->hdr_entsz) != 0) { debugf("Invalid GPT header!\n"); err = EINVAL; goto out; @@ -296,9 +307,9 @@ /* Count number of valid partitions */ part = 0; - eps = od->od_bsize / hdr->hdr_entsz; - slba = hdr->hdr_lba_table; - elba = slba + hdr->hdr_entries / eps; + eps = od->od_bsize / le32toh(hdr->hdr_entsz); + slba = le64toh(hdr->hdr_lba_table); + elba = slba + le32toh(hdr->hdr_entries) / eps; for (lba = slba; lba < elba; lba++) { err = stor_readdev(dev, lba, 1, buf); @@ -312,8 +323,9 @@ for (i = 0; i < eps; i++) { if (uuid_is_nil(&ent[i].ent_type, NULL) || - ent[i].ent_lba_start == 0 || - ent[i].ent_lba_end < ent[i].ent_lba_start) + le64toh(ent[i].ent_lba_start) == 0 || + le64toh(ent[i].ent_lba_end) < + le64toh(ent[i].ent_lba_start)) continue; part += 1; @@ -343,8 +355,9 @@ for (i = 0; i < eps; i++) { if (uuid_is_nil(&ent[i].ent_type, NULL) || - ent[i].ent_lba_start == 0 || - ent[i].ent_lba_end < ent[i].ent_lba_start) + le64toh(ent[i].ent_lba_start) == 0 || + le64toh(ent[i].ent_lba_end) < + le64toh(ent[i].ent_lba_start)) continue; od->od_partitions[part].gp_index = (lba - slba) @@ -352,9 +365,11 @@ od->od_partitions[part].gp_type = ent[i].ent_type; od->od_partitions[part].gp_start = - ent[i].ent_lba_start; + le64toh(ent[i].ent_lba_start); od->od_partitions[part].gp_end = - ent[i].ent_lba_end; + le64toh(ent[i].ent_lba_end); + + uuid_letoh(&od->od_partitions[part].gp_type); part += 1; } } ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 (text+ko) ==== @@ -573,6 +573,7 @@ vfsp->mnt_flag |= MNT_LOCAL; vfsp->mnt_kern_flag |= MNTK_MPSAFE; vfsp->mnt_kern_flag |= MNTK_LOOKUP_SHARED; + vfsp->mnt_kern_flag |= MNTK_SHARED_WRITES; if (error = dsl_prop_get_integer(osname, "readonly", &readonly, NULL)) goto out; ==== //depot/projects/vimage/src/sys/dev/ath/if_ath.c#39 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.256 2009/06/02 21:17:56 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.257 2009/06/03 17:25:19 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -2802,7 +2802,7 @@ slot = ((tsftu % ic->ic_lintval) * ATH_BCBUF) / ic->ic_lintval; vap = sc->sc_bslot[(slot+1) % ATH_BCBUF]; bfaddr = 0; - if (vap != NULL && vap->iv_state == IEEE80211_S_RUN) { + if (vap != NULL && vap->iv_state >= IEEE80211_S_RUN) { bf = ath_beacon_generate(sc, vap); if (bf != NULL) bfaddr = bf->bf_daddr; @@ -2812,7 +2812,7 @@ for (slot = 0; slot < ATH_BCBUF; slot++) { vap = sc->sc_bslot[slot]; - if (vap != NULL && vap->iv_state == IEEE80211_S_RUN) { + if (vap != NULL && vap->iv_state >= IEEE80211_S_RUN) { bf = ath_beacon_generate(sc, vap); if (bf != NULL) { *bflink = bf->bf_daddr; @@ -2878,7 +2878,7 @@ struct mbuf *m; int nmcastq, error; - KASSERT(vap->iv_state == IEEE80211_S_RUN, + KASSERT(vap->iv_state >= IEEE80211_S_RUN, ("not running, state %d", vap->iv_state)); KASSERT(avp->av_bcbuf != NULL, ("no beacon buffer")); @@ -5506,7 +5506,7 @@ IEEE80211_LOCK_ASSERT(ic); TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next) { - if (vap != this && vap->iv_state == IEEE80211_S_RUN) + if (vap != this && vap->iv_state >= IEEE80211_S_RUN) return 1; } return 0; ==== //depot/projects/vimage/src/sys/dev/iir/iir.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.20 2008/01/09 20:02:56 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iir/iir.c,v 1.21 2009/06/03 20:25:13 jhb Exp $"); #define _IIR_C_ @@ -67,9 +67,6 @@ #include #include -#include -#include - #include MALLOC_DEFINE(M_GDTBUF, "iirbuf", "iir driver buffer"); ==== //depot/projects/vimage/src/sys/dev/iir/iir_ctrl.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.19 2009/05/20 17:29:21 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iir/iir_ctrl.c,v 1.20 2009/06/03 20:25:13 jhb Exp $"); #include #include @@ -52,10 +52,6 @@ #include #include #include -#include -#include -#include -#include #include ==== //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#14 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.47 2009/05/29 18:46:57 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.48 2009/06/04 21:59:28 thompsa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -97,7 +97,7 @@ #define MAKE_WORD(h,l) (((h) << 8) | (l)) #define BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1) -#define UAUDIO_MAX_CHAN(x) (((x) < 2) ? (x) : 2) /* XXX fixme later */ +#define UAUDIO_MAX_CHAN(x) (x) struct uaudio_mixer_node { int32_t minval; @@ -940,6 +940,8 @@ bChannels = UAUDIO_MAX_CHAN(asf1d->bNrChannels); bBitResolution = asf1d->bBitResolution; + DPRINTFN(9, "bChannels=%u\n", bChannels); + if (asf1d->bSamFreqType == 0) { DPRINTFN(16, "Sample rate: %d-%dHz\n", UA_SAMP_LO(asf1d), UA_SAMP_HI(asf1d)); ==== //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/input/ukbd.c,v 1.9 2009/06/02 17:29:15 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/input/ukbd.c,v 1.10 2009/06/04 22:00:48 thompsa Exp $"); /*- @@ -706,7 +706,6 @@ sc->sc_iface_index = uaa->info.bIfaceIndex; sc->sc_iface_no = uaa->info.bIfaceNum; sc->sc_mode = K_XLATE; - sc->sc_iface = uaa->iface; usb2_callout_init_mtx(&sc->sc_callout, &Giant, 0); ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#11 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */ /* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/wlan/if_zyd.c,v 1.14 2009/06/01 01:51:37 weongyo Exp $ */ +/* $FreeBSD: src/sys/dev/usb/wlan/if_zyd.c,v 1.16 2009/06/04 02:49:50 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -20,7 +20,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_zyd.c,v 1.14 2009/06/01 01:51:37 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_zyd.c,v 1.16 2009/06/04 02:49:50 weongyo Exp $"); /* * ZyDAS ZD1211/ZD1211B USB WLAN driver. @@ -190,9 +190,10 @@ static int zyd_gct_init(struct zyd_rf *); static int zyd_gct_switch_radio(struct zyd_rf *, int); static int zyd_gct_set_channel(struct zyd_rf *, uint8_t); -static int zyd_maxim_init(struct zyd_rf *); -static int zyd_maxim_switch_radio(struct zyd_rf *, int); -static int zyd_maxim_set_channel(struct zyd_rf *, uint8_t); +static int zyd_gct_mode(struct zyd_rf *); +static int zyd_gct_set_channel_synth(struct zyd_rf *, int, int); +static int zyd_gct_write(struct zyd_rf *, uint16_t); +static int zyd_gct_txgain(struct zyd_rf *, uint8_t); static int zyd_maxim2_init(struct zyd_rf *); static int zyd_maxim2_switch_radio(struct zyd_rf *, int); static int zyd_maxim2_set_channel(struct zyd_rf *, uint8_t); @@ -204,55 +205,59 @@ #define ZYD_ZD1211 0 #define ZYD_ZD1211B 1 +#define ZYD_ZD1211_DEV(v,p) \ + { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, ZYD_ZD1211) } +#define ZYD_ZD1211B_DEV(v,p) \ + { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, ZYD_ZD1211B) } static const struct usb_device_id zyd_devs[] = { - /* ZYD_ZD1211 */ - {USB_VPI(USB_VENDOR_3COM2, USB_PRODUCT_3COM2_3CRUSB10075, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WL54, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL159G, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_CYBERTAN, USB_PRODUCT_CYBERTAN_TG54USB, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_DRAYTEK, USB_PRODUCT_DRAYTEK_VIGOR550, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GD, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54GZL, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54GZ, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GWUS54MINI, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG760A, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_SENAO, USB_PRODUCT_SENAO_NUB8301, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_SWEEX, USB_PRODUCT_SWEEX_ZD1211, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_QUICKWLAN, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_1, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_TEKRAM, USB_PRODUCT_TEKRAM_ZD1211_2, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_G240, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_ALL0298V2, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB_A, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_AG225H, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_ZYAIRG220, ZYD_ZD1211)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G200V2, ZYD_ZD1211)}, - /* ZYD_ZD1211B */ - {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SMCWUSBG, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_A9T_WIFI, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050_V4000, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSBF54G, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_FIBERLINE, USB_PRODUCT_FIBERLINE_WL430U, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54L, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SNU5600, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GW_US54GXS, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_XG76NA, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UBC1, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_USR, USB_PRODUCT_USR_USR5423, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_VTECH, USB_PRODUCT_VTECH_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZCOM, USB_PRODUCT_ZCOM_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZYDAS, USB_PRODUCT_ZYDAS_ZD1211B, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_M202, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G202, ZYD_ZD1211B)}, - {USB_VPI(USB_VENDOR_ZYXEL, USB_PRODUCT_ZYXEL_G220V2, ZYD_ZD1211B)}, + /* ZYD_ZD1211 */ + ZYD_ZD1211_DEV(3COM2, 3CRUSB10075), + ZYD_ZD1211_DEV(ABOCOM, WL54), + ZYD_ZD1211_DEV(ASUS, WL159G), + ZYD_ZD1211_DEV(CYBERTAN, TG54USB), + ZYD_ZD1211_DEV(DRAYTEK, VIGOR550), + ZYD_ZD1211_DEV(PLANEX2, GWUS54GD), + ZYD_ZD1211_DEV(PLANEX2, GWUS54GZL), + ZYD_ZD1211_DEV(PLANEX3, GWUS54GZ), + ZYD_ZD1211_DEV(PLANEX3, GWUS54MINI), + ZYD_ZD1211_DEV(SAGEM, XG760A), + ZYD_ZD1211_DEV(SENAO, NUB8301), + ZYD_ZD1211_DEV(SITECOMEU, WL113), + ZYD_ZD1211_DEV(SWEEX, ZD1211), + ZYD_ZD1211_DEV(TEKRAM, QUICKWLAN), + ZYD_ZD1211_DEV(TEKRAM, ZD1211_1), + ZYD_ZD1211_DEV(TEKRAM, ZD1211_2), + ZYD_ZD1211_DEV(TWINMOS, G240), + ZYD_ZD1211_DEV(UMEDIA, ALL0298V2), + ZYD_ZD1211_DEV(UMEDIA, TEW429UB_A), + ZYD_ZD1211_DEV(UMEDIA, TEW429UB), + ZYD_ZD1211_DEV(WISTRONNEWEB, UR055G), + ZYD_ZD1211_DEV(ZCOM, ZD1211), + ZYD_ZD1211_DEV(ZYDAS, ZD1211), + ZYD_ZD1211_DEV(ZYXEL, AG225H), + ZYD_ZD1211_DEV(ZYXEL, ZYAIRG220), + ZYD_ZD1211_DEV(ZYXEL, G200V2), + /* ZYD_ZD1211B */ + ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG), + ZYD_ZD1211B_DEV(ACCTON, ZD1211B), + ZYD_ZD1211B_DEV(ASUS, A9T_WIFI), + ZYD_ZD1211B_DEV(BELKIN, F5D7050_V4000), + ZYD_ZD1211B_DEV(BELKIN, ZD1211B), + ZYD_ZD1211B_DEV(CISCOLINKSYS, WUSBF54G), + ZYD_ZD1211B_DEV(FIBERLINE, WL430U), + ZYD_ZD1211B_DEV(MELCO, KG54L), + ZYD_ZD1211B_DEV(PHILIPS, SNU5600), + ZYD_ZD1211B_DEV(PLANEX2, GW_US54GXS), + ZYD_ZD1211B_DEV(SAGEM, XG76NA), + ZYD_ZD1211B_DEV(SITECOMEU, ZD1211B), + ZYD_ZD1211B_DEV(UMEDIA, TEW429UBC1), + ZYD_ZD1211B_DEV(USR, USR5423), + ZYD_ZD1211B_DEV(VTECH, ZD1211B), + ZYD_ZD1211B_DEV(ZCOM, ZD1211B), + ZYD_ZD1211B_DEV(ZYDAS, ZD1211B), + ZYD_ZD1211B_DEV(ZYXEL, M202), + ZYD_ZD1211B_DEV(ZYXEL, G202), + ZYD_ZD1211B_DEV(ZYXEL, G220V2) }; static const struct usb_config zyd_config[ZYD_N_TRANSFER] = { @@ -1417,11 +1422,14 @@ static int zyd_gct_init(struct zyd_rf *rf) { +#define ZYD_GCT_INTR_REG 0x85c1 #define N(a) (sizeof(a) / sizeof((a)[0])) struct zyd_softc *sc = rf->rf_sc; static const struct zyd_phy_pair phyini[] = ZYD_GCT_PHY; static const uint32_t rfini[] = ZYD_GCT_RF; - int i, error; + static const uint16_t vco[11][7] = ZYD_GCT_VCO; + int i, idx = -1, error; + uint16_t data; /* init RF-dependent PHY registers */ for (i = 0; i < N(phyini); i++) @@ -1432,119 +1440,150 @@ if ((error = zyd_rfwrite(sc, rfini[i])) != 0) return (error); } + + error = zyd_gct_mode(rf); + if (error != 0) + return (error); + + for (i = 0; i < N(vco) - 1; i++) { + error = zyd_gct_set_channel_synth(rf, 1, 0); + if (error != 0) + goto fail; + error = zyd_gct_write(rf, vco[i][0]); + if (error != 0) + goto fail; + zyd_write16_m(sc, ZYD_GCT_INTR_REG, 0xf); + zyd_read16_m(sc, ZYD_GCT_INTR_REG, &data); + if ((data & 0xf) == 0) { + idx = i; + break; + } + } + if (idx == -1) { + error = zyd_gct_set_channel_synth(rf, 1, 1); + if (error != 0) + goto fail; + error = zyd_gct_write(rf, 0x6662); + if (error != 0) + goto fail; + } + + rf->idx = idx; + zyd_write16_m(sc, ZYD_CR203, 0x6); fail: return (error); #undef N +#undef ZYD_GCT_INTR_REG } static int -zyd_gct_switch_radio(struct zyd_rf *rf, int on) +zyd_gct_mode(struct zyd_rf *rf) { - /* vendor driver does nothing for this RF chip */ +#define N(a) (sizeof(a) / sizeof((a)[0])) + struct zyd_softc *sc = rf->rf_sc; + static const uint32_t mode[] = { + 0x25f98, 0x25f9a, 0x25f94, 0x27fd4 + }; + int i, error; - return (0); + for (i = 0; i < N(mode); i++) { + if ((error = zyd_rfwrite(sc, mode[i])) != 0) + break; + } + return (error); +#undef N } static int -zyd_gct_set_channel(struct zyd_rf *rf, uint8_t chan) +zyd_gct_set_channel_synth(struct zyd_rf *rf, int chan, int acal) { - int error; + int error, idx = chan - 1; struct zyd_softc *sc = rf->rf_sc; - static const uint32_t rfprog[] = ZYD_GCT_CHANTABLE; + static uint32_t acal_synth[] = ZYD_GCT_CHANNEL_ACAL; + static uint32_t std_synth[] = ZYD_GCT_CHANNEL_STD; + static uint32_t div_synth[] = ZYD_GCT_CHANNEL_DIV; - error = zyd_rfwrite(sc, 0x1c0000); + error = zyd_rfwrite(sc, + (acal == 1) ? acal_synth[idx] : std_synth[idx]); if (error != 0) - goto fail; - error = zyd_rfwrite(sc, rfprog[chan - 1]); - if (error != 0) - goto fail; - error = zyd_rfwrite(sc, 0x1c0008); -fail: - return (error); + return (error); + return zyd_rfwrite(sc, div_synth[idx]); } -/* - * Maxim RF methods. - */ static int -zyd_maxim_init(struct zyd_rf *rf) +zyd_gct_write(struct zyd_rf *rf, uint16_t value) { -#define N(a) (sizeof(a) / sizeof((a)[0])) struct zyd_softc *sc = rf->rf_sc; - static const struct zyd_phy_pair phyini[] = ZYD_MAXIM_PHY; - static const uint32_t rfini[] = ZYD_MAXIM_RF; - uint16_t tmp; - int i, error; - /* init RF-dependent PHY registers */ - for (i = 0; i < N(phyini); i++) - zyd_write16_m(sc, phyini[i].reg, phyini[i].val); - - zyd_read16_m(sc, ZYD_CR203, &tmp); - zyd_write16_m(sc, ZYD_CR203, tmp & ~(1 << 4)); - - /* init maxim radio */ - for (i = 0; i < N(rfini); i++) { - if ((error = zyd_rfwrite(sc, rfini[i])) != 0) - return (error); - } - zyd_read16_m(sc, ZYD_CR203, &tmp); - zyd_write16_m(sc, ZYD_CR203, tmp | (1 << 4)); -fail: - return (error); -#undef N + return zyd_rfwrite(sc, 0x300000 | 0x40000 | value); } static int -zyd_maxim_switch_radio(struct zyd_rf *rf, int on) +zyd_gct_switch_radio(struct zyd_rf *rf, int on) { +#define N(a) (sizeof(a) / sizeof((a)[0])) + int error; + struct zyd_softc *sc = rf->rf_sc; - /* vendor driver does nothing for this RF chip */ - return (0); + error = zyd_rfwrite(sc, on ? 0x25f94 : 0x25f90); + if (error != 0) + return (error); + + zyd_write16_m(sc, ZYD_CR11, on ? 0x00 : 0x04); + zyd_write16_m(sc, ZYD_CR251, + on ? ((sc->sc_macrev == ZYD_ZD1211B) ? 0x7f : 0x3f) : 0x2f); +fail: + return (error); } static int -zyd_maxim_set_channel(struct zyd_rf *rf, uint8_t chan) +zyd_gct_set_channel(struct zyd_rf *rf, uint8_t chan) { #define N(a) (sizeof(a) / sizeof((a)[0])) + int error, i; struct zyd_softc *sc = rf->rf_sc; - static const struct zyd_phy_pair phyini[] = ZYD_MAXIM_PHY; - static const uint32_t rfini[] = ZYD_MAXIM_RF; - static const struct { - uint32_t r1, r2; - } rfprog[] = ZYD_MAXIM_CHANTABLE; - uint16_t tmp; - int i, error; + static const struct zyd_phy_pair cmd[] = { + { ZYD_CR80, 0x30 }, { ZYD_CR81, 0x30 }, { ZYD_CR79, 0x58 }, + { ZYD_CR12, 0xf0 }, { ZYD_CR77, 0x1b }, { ZYD_CR78, 0x58 }, + }; + static const uint16_t vco[11][7] = ZYD_GCT_VCO; - /* - * Do the same as we do when initializing it, except for the channel - * values coming from the two channel tables. - */ - - /* init RF-dependent PHY registers */ - for (i = 0; i < N(phyini); i++) - zyd_write16_m(sc, phyini[i].reg, phyini[i].val); - - zyd_read16_m(sc, ZYD_CR203, &tmp); - zyd_write16_m(sc, ZYD_CR203, tmp & ~(1 << 4)); - - /* first two values taken from the chantables */ - error = zyd_rfwrite(sc, rfprog[chan - 1].r1); + error = zyd_gct_set_channel_synth(rf, chan, 0); if (error != 0) goto fail; - error = zyd_rfwrite(sc, rfprog[chan - 1].r2); + error = zyd_gct_write(rf, (rf->idx == -1) ? 0x6662 : + vco[rf->idx][((chan - 1) / 2)]); if (error != 0) goto fail; + error = zyd_gct_mode(rf); + if (error != 0) + return (error); + for (i = 0; i < N(cmd); i++) + zyd_write16_m(sc, cmd[i].reg, cmd[i].val); + error = zyd_gct_txgain(rf, chan); + if (error != 0) + return (error); + zyd_write16_m(sc, ZYD_CR203, 0x6); +fail: + return (error); +#undef N +} + +static int +zyd_gct_txgain(struct zyd_rf *rf, uint8_t chan) +{ +#define N(a) (sizeof(a) / sizeof((a)[0])) + struct zyd_softc *sc = rf->rf_sc; + static uint32_t txgain[] = ZYD_GCT_TXGAIN; + uint8_t idx = sc->sc_pwrint[chan - 1]; - /* init maxim radio - skipping the two first values */ - for (i = 2; i < N(rfini); i++) { - if ((error = zyd_rfwrite(sc, rfini[i])) != 0) - return (error); + if (idx >= N(txgain)) { + device_printf(sc->sc_dev, "could not set TX gain (%d %#x)\n", + chan, idx); + return 0; } - zyd_read16_m(sc, ZYD_CR203, &tmp); - zyd_write16_m(sc, ZYD_CR203, tmp | (1 << 4)); -fail: - return (error); + + return zyd_rfwrite(sc, 0x700000 | txgain[idx]); #undef N } @@ -1639,6 +1678,7 @@ struct zyd_rf *rf = &sc->sc_rf; rf->rf_sc = sc; + rf->update_pwr = 1; switch (type) { case ZYD_RF_RFMD: @@ -1672,17 +1712,13 @@ rf->set_channel = zyd_al2210_set_channel; rf->width = 24; /* 24-bit RF values */ break; + case ZYD_RF_MAXIM_NEW: case ZYD_RF_GCT: rf->init = zyd_gct_init; rf->switch_radio = zyd_gct_switch_radio; rf->set_channel = zyd_gct_set_channel; - rf->width = 21; /* 21-bit RF values */ - break; - case ZYD_RF_MAXIM_NEW: - rf->init = zyd_maxim_init; - rf->switch_radio = zyd_maxim_switch_radio; - rf->set_channel = zyd_maxim_set_channel; - rf->width = 18; /* 18-bit RF values */ + rf->width = 24; /* 24-bit RF values */ + rf->update_pwr = 0; break; case ZYD_RF_MAXIM_NEW2: rf->init = zyd_maxim2_init; @@ -2062,16 +2098,21 @@ if (error != 0) goto fail; - /* update Tx power */ - zyd_write16_m(sc, ZYD_CR31, sc->sc_pwrint[chan - 1]); + if (rf->update_pwr) { + /* update Tx power */ + zyd_write16_m(sc, ZYD_CR31, sc->sc_pwrint[chan - 1]); - if (sc->sc_macrev == ZYD_ZD1211B) { - zyd_write16_m(sc, ZYD_CR67, sc->sc_ofdm36_cal[chan - 1]); - zyd_write16_m(sc, ZYD_CR66, sc->sc_ofdm48_cal[chan - 1]); - zyd_write16_m(sc, ZYD_CR65, sc->sc_ofdm54_cal[chan - 1]); - zyd_write16_m(sc, ZYD_CR68, sc->sc_pwrcal[chan - 1]); - zyd_write16_m(sc, ZYD_CR69, 0x28); - zyd_write16_m(sc, ZYD_CR69, 0x2a); + if (sc->sc_macrev == ZYD_ZD1211B) { + zyd_write16_m(sc, ZYD_CR67, + sc->sc_ofdm36_cal[chan - 1]); + zyd_write16_m(sc, ZYD_CR66, + sc->sc_ofdm48_cal[chan - 1]); + zyd_write16_m(sc, ZYD_CR65, + sc->sc_ofdm54_cal[chan - 1]); + zyd_write16_m(sc, ZYD_CR68, sc->sc_pwrcal[chan - 1]); + zyd_write16_m(sc, ZYD_CR69, 0x28); + zyd_write16_m(sc, ZYD_CR69, 0x2a); + } } if (sc->sc_cckgain) { /* set CCK baseband gain from EEPROM */ ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#6 (text+ko) ==== @@ -1,6 +1,6 @@ /* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */ /* $NetBSD: if_zydreg.h,v 1.2 2007/06/16 11:18:45 kiyohara Exp $ */ -/* $FreeBSD: src/sys/dev/usb/wlan/if_zydreg.h,v 1.4 2009/05/28 17:36:36 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/wlan/if_zydreg.h,v 1.5 2009/06/04 02:49:50 weongyo Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini @@ -840,82 +840,75 @@ #define ZYD_GCT_PHY \ { \ - { ZYD_CR47, 0x1e }, { ZYD_CR15, 0xdc }, { ZYD_CR113, 0xc0 }, \ - { ZYD_CR20, 0x0c }, { ZYD_CR17, 0x65 }, { ZYD_CR34, 0x04 }, \ - { ZYD_CR35, 0x35 }, { ZYD_CR24, 0x20 }, { ZYD_CR9, 0xe0 }, \ - { ZYD_CR127, 0x02 }, { ZYD_CR10, 0x91 }, { ZYD_CR23, 0x7f }, \ - { ZYD_CR27, 0x10 }, { ZYD_CR28, 0x7a }, { ZYD_CR79, 0xb5 }, \ - { ZYD_CR64, 0x80 }, { ZYD_CR33, 0x28 }, { ZYD_CR38, 0x30 } \ + { ZYD_CR10, 0x89 }, { ZYD_CR15, 0x20 }, { ZYD_CR17, 0x28 }, \ + { ZYD_CR23, 0x38 }, { ZYD_CR24, 0x20 }, { ZYD_CR26, 0x93 }, \ + { ZYD_CR27, 0x15 }, { ZYD_CR28, 0x3e }, { ZYD_CR29, 0x00 }, \ + { ZYD_CR33, 0x28 }, { ZYD_CR34, 0x30 }, { ZYD_CR35, 0x43 }, \ + { ZYD_CR41, 0x24 }, { ZYD_CR44, 0x32 }, { ZYD_CR46, 0x92 }, \ + { ZYD_CR47, 0x1e }, { ZYD_CR48, 0x04 }, { ZYD_CR49, 0xfa }, \ + { ZYD_CR79, 0x58 }, { ZYD_CR80, 0x30 }, { ZYD_CR81, 0x30 }, \ + { ZYD_CR87, 0x0a }, { ZYD_CR89, 0x04 }, { ZYD_CR91, 0x00 }, \ + { ZYD_CR92, 0x0a }, { ZYD_CR98, 0x8d }, { ZYD_CR99, 0x28 }, \ + { ZYD_CR100, 0x02 }, { ZYD_CR101, 0x09 }, { ZYD_CR102, 0x27 }, \ + { ZYD_CR106, 0x1c }, { ZYD_CR107, 0x1c }, { ZYD_CR109, 0x13 }, \ + { ZYD_CR110, 0x1f }, { ZYD_CR111, 0x13 }, { ZYD_CR112, 0x1f }, \ + { ZYD_CR113, 0x27 }, { ZYD_CR114, 0x23 }, { ZYD_CR115, 0x24 }, \ + { ZYD_CR116, 0x24 }, { ZYD_CR117, 0xfa }, { ZYD_CR118, 0xf0 }, \ + { ZYD_CR119, 0x1a }, { ZYD_CR120, 0x4f }, { ZYD_CR121, 0x1f }, \ + { ZYD_CR122, 0xf0 }, { ZYD_CR123, 0x57 }, { ZYD_CR125, 0xad }, \ + { ZYD_CR126, 0x6c }, { ZYD_CR127, 0x03 }, { ZYD_CR128, 0x14 }, \ + { ZYD_CR129, 0x12 }, { ZYD_CR130, 0x10 }, { ZYD_CR137, 0x50 }, \ + { ZYD_CR138, 0xa8 }, { ZYD_CR144, 0xac }, { ZYD_CR146, 0x20 }, \ + { ZYD_CR252, 0xff }, { ZYD_CR253, 0xff } \ } #define ZYD_GCT_RF \ { \ - 0x1f0000, 0x1f0000, 0x1f0200, 0x1f0600, 0x1f8600, 0x1f8600, \ - 0x002050, 0x1f8000, 0x1f8200, 0x1f8600, 0x1c0000, 0x10c458, \ - 0x088e92, 0x187b82, 0x0401b4, 0x140816, 0x0c7000, 0x1c0000, \ - 0x02ccae, 0x128023, 0x0a0000, 0x1a0000, 0x06e380, 0x16cb94, \ - 0x0e1740, 0x014980, 0x116240, 0x090000, 0x192304, 0x05112f, \ - 0x0d54a8, 0x0f8000, 0x1c0008, 0x1c0000, 0x1a0000, 0x1c0008, \ - 0x150000, 0x0c7000, 0x150800, 0x150000 \ + 0x40002b, 0x519e4f, 0x6f81ad, 0x73fffe, 0x25f9c, 0x100047, \ + 0x200999, 0x307602, 0x346063, \ +} + +#define ZYD_GCT_VCO \ +{ \ + { 0x664d, 0x604d, 0x6675, 0x6475, 0x6655, 0x6455, 0x6665 }, \ + { 0x666d, 0x606d, 0x664d, 0x644d, 0x6675, 0x6475, 0x6655 }, \ + { 0x665d, 0x605d, 0x666d, 0x646d, 0x664d, 0x644d, 0x6675 }, \ + { 0x667d, 0x607d, 0x665d, 0x645d, 0x666d, 0x646d, 0x664d }, \ + { 0x6643, 0x6043, 0x667d, 0x647d, 0x665d, 0x645d, 0x666d }, \ + { 0x6663, 0x6063, 0x6643, 0x6443, 0x667d, 0x647d, 0x665d }, \ + { 0x6653, 0x6053, 0x6663, 0x6463, 0x6643, 0x6443, 0x667d }, \ + { 0x6673, 0x6073, 0x6653, 0x6453, 0x6663, 0x6463, 0x6643 }, \ + { 0x664b, 0x604b, 0x6673, 0x6473, 0x6653, 0x6453, 0x6663 }, \ + { 0x666b, 0x606b, 0x664b, 0x644b, 0x6673, 0x6473, 0x6653 }, \ + { 0x665b, 0x605b, 0x666b, 0x646b, 0x664b, 0x644b, 0x6673 } \ } -#define ZYD_GCT_CHANTABLE \ +#define ZYD_GCT_TXGAIN \ { \ - 0x1a0000, 0x1a8000, 0x1a4000, 0x1ac000, 0x1a2000, 0x1aa000, \ - 0x1a6000, 0x1ae000, 0x1a1000, 0x1a9000, 0x1a5000, 0x1ad000, \ - 0x1a3000, 0x1ab000 \ + 0x0e313, 0x0fb13, 0x0e093, 0x0f893, 0x0ea93, 0x1f093, 0x1f493, \ + 0x1f693, 0x1f393, 0x1f35b, 0x1e6db, 0x1ff3f, 0x1ffff, 0x361d7, \ + 0x37fbf, 0x3ff8b, 0x3ff33, 0x3fb3f, 0x3ffff \ } -#define ZYD_MAXIM_PHY \ +#define ZYD_GCT_CHANNEL_ACAL \ { \ - { ZYD_CR23, 0x40 }, { ZYD_CR15, 0x20 }, { ZYD_CR28, 0x3e }, \ - { ZYD_CR29, 0x00 }, { ZYD_CR26, 0x11 }, { ZYD_CR44, 0x33 }, \ - { ZYD_CR106, 0x2a }, { ZYD_CR107, 0x1a }, { ZYD_CR109, 0x2b }, \ - { ZYD_CR110, 0x2b }, { ZYD_CR111, 0x2b }, { ZYD_CR112, 0x2b }, \ - { ZYD_CR10, 0x89 }, { ZYD_CR17, 0x20 }, { ZYD_CR26, 0x93 }, \ - { ZYD_CR34, 0x30 }, { ZYD_CR35, 0x40 }, { ZYD_CR41, 0x24 }, \ - { ZYD_CR44, 0x32 }, { ZYD_CR46, 0x90 }, { ZYD_CR89, 0x18 }, \ - { ZYD_CR92, 0x0a }, { ZYD_CR101, 0x13 }, { ZYD_CR102, 0x27 }, \ - { ZYD_CR106, 0x20 }, { ZYD_CR107, 0x24 }, { ZYD_CR109, 0x09 }, \ - { ZYD_CR110, 0x13 }, { ZYD_CR111, 0x13 }, { ZYD_CR112, 0x13 }, \ - { ZYD_CR113, 0x27 }, { ZYD_CR114, 0x27 }, { ZYD_CR115, 0x24 }, \ - { ZYD_CR116, 0x24 }, { ZYD_CR117, 0xf4 }, { ZYD_CR118, 0xfa }, \ - { ZYD_CR120, 0x4f }, { ZYD_CR121, 0x77 }, { ZYD_CR122, 0xfe }, \ - { ZYD_CR10, 0x89 }, { ZYD_CR17, 0x20 }, { ZYD_CR26, 0x93 }, \ - { ZYD_CR34, 0x30 }, { ZYD_CR35, 0x40 }, { ZYD_CR41, 0x24 }, \ - { ZYD_CR44, 0x32 }, { ZYD_CR46, 0x90 }, { ZYD_CR89, 0x18 }, \ - { ZYD_CR92, 0x0a }, { ZYD_CR101, 0x13 }, { ZYD_CR102, 0x27 }, \ - { ZYD_CR106, 0x20 }, { ZYD_CR107, 0x24 }, { ZYD_CR109, 0x13 }, \ - { ZYD_CR110, 0x27 }, { ZYD_CR111, 0x27 }, { ZYD_CR112, 0x13 }, \ - { ZYD_CR113, 0x27 }, { ZYD_CR114, 0x27 }, { ZYD_CR115, 0x24 }, \ - { ZYD_CR116, 0x24 }, { ZYD_CR117, 0xf4 }, { ZYD_CR118, 0x00 }, \ - { ZYD_CR120, 0x4f }, { ZYD_CR121, 0x06 }, { ZYD_CR122, 0xfe }, \ - { ZYD_CR150, 0x0d } \ + 0x106847, 0x106847, 0x106867, 0x106867, 0x106867, 0x106867, \ + 0x106857, 0x106857, 0x106857, 0x106857, 0x106877, 0x106877, \ + 0x106877, 0x10684f \ } -#define ZYD_MAXIM_RF \ +#define ZYD_GCT_CHANNEL_STD \ { \ - 0x00ccd4, 0x030a03, 0x000400, 0x000ca1, 0x010072, 0x018645, \ - 0x004006, 0x0000a7, 0x008258, 0x003fc9, 0x00040a, 0x00000b, \ - 0x00026c \ + 0x100047, 0x100047, 0x100067, 0x100067, 0x100067, 0x100067, \ + 0x100057, 0x100057, 0x100057, 0x100057, 0x100077, 0x100077, \ + 0x100077, 0x10004f \ } -#define ZYD_MAXIM_CHANTABLE \ -{ \ - { 0x0ccd4, 0x30a03 }, \ - { 0x22224, 0x00a13 }, \ - { 0x37774, 0x10a13 }, \ - { 0x0ccd4, 0x30a13 }, \ - { 0x22224, 0x00a23 }, \ - { 0x37774, 0x10a23 }, \ - { 0x0ccd4, 0x30a23 }, \ - { 0x22224, 0x00a33 }, \ - { 0x37774, 0x10a33 }, \ - { 0x0ccd4, 0x30a33 }, \ - { 0x22224, 0x00a43 }, \ - { 0x37774, 0x10a43 }, \ - { 0x0ccd4, 0x30a43 }, \ - { 0x199a4, 0x20a53 } \ +#define ZYD_GCT_CHANNEL_DIV \ +{ \ + 0x200999, 0x20099b, 0x200998, 0x20099a, 0x200999, 0x20099b, \ + 0x200998, 0x20099a, 0x200999, 0x20099b, 0x200998, 0x20099a, \ + 0x200999, 0x200ccc \ } #define ZYD_MAXIM2_PHY \ @@ -1226,6 +1219,8 @@ /* RF attributes */ struct zyd_softc *rf_sc; /* back-pointer */ int width; + int idx; /* for GIT RF */ + int update_pwr; }; struct zyd_rq { ==== //depot/projects/vimage/src/sys/fs/devfs/devfs_vfsops.c#4 (text+ko) ==== @@ -31,9 +31,11 @@ * @(#)kernfs_vfsops.c 8.10 (Berkeley) 5/14/95 * From: FreeBSD: src/sys/miscfs/kernfs/kernfs_vfsops.c 1.36 * - * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.54 2009/05/11 15:33:26 attilio Exp $ + * $FreeBSD: src/sys/fs/devfs/devfs_vfsops.c,v 1.55 2009/06/04 10:30:18 rwatson Exp $ */ +#include "opt_mac.h" /* To set MNT_MULTILABEL. */ + #include #include #include ==== //depot/projects/vimage/src/sys/fs/nfs/nfs_commonacl.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonacl.c,v 1.3 2009/05/26 22:21:53 rmacklem Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/nfs/nfs_commonacl.c,v 1.4 2009/06/05 14:15:00 rwatson Exp $"); #ifndef APPLEKEXT #include @@ -703,10 +703,6 @@ if (aclp->acl_cnt > (ACL_MAX_ENTRIES - 6) / 2) return (NFSERR_ATTRNOTSUPP); error = VOP_ACLCHECK(vp, ACL_TYPE_NFS4, aclp, cred, p); -#ifdef MAC - if (!error) - error = mac_check_vnode_setacl(cred, vp, ACL_TYPE_NFS4, aclp); -#endif if (!error) error = VOP_SETACL(vp, ACL_TYPE_NFS4, aclp, cred, p); return (error); ==== //depot/projects/vimage/src/sys/kern/kern_malloc.c#13 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.171 2009/05/09 19:00:47 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_malloc.c,v 1.172 2009/06/05 09:16:52 brian Exp $"); #include "opt_ddb.h" #include "opt_kdtrace.h" @@ -675,8 +675,8 @@ KASSERT(cnt.v_page_count != 0, ("malloc_register before vm_init")); mtp = data; - KASSERT(mtp->ks_magic == M_MAGIC, - ("malloc_init: bad malloc type magic")); + if (mtp->ks_magic != M_MAGIC) + panic("malloc_init: bad malloc type magic"); mtip = uma_zalloc(mt_zone, M_WAITOK | M_ZERO); mtp->ks_handle = mtip; @@ -709,9 +709,13 @@ if (mtp != kmemstatistics) { for (temp = kmemstatistics; temp != NULL; temp = temp->ks_next) { - if (temp->ks_next == mtp) + if (temp->ks_next == mtp) { temp->ks_next = mtp->ks_next; + break; + } } + KASSERT(temp, + ("malloc_uninit: type '%s' not found", mtp->ks_shortdesc)); } else kmemstatistics = mtp->ks_next; kmemcount--; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 5 17:03:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 092C41065670; Fri, 5 Jun 2009 17:03: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 BCC61106564A for ; Fri, 5 Jun 2009 17:03:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A9B3A8FC1D for ; Fri, 5 Jun 2009 17:03:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55H3jsH029066 for ; Fri, 5 Jun 2009 17:03:45 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55H3jYI029064 for perforce@freebsd.org; Fri, 5 Jun 2009 17:03:45 GMT (envelope-from trasz@freebsd.org) Date: Fri, 5 Jun 2009 17:03:45 GMT Message-Id: <200906051703.n55H3jYI029064@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163587 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 17:03:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=163587 Change 163587 by trasz@trasz_victim on 2009/06/05 17:03:09 Use rbtree to store HRL limits. Still not quite right, but less obviously wrong than before. Remove limits for exiting processes. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#4 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#4 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -40,19 +41,64 @@ #include #include #include +#include +#include + +struct hrl_node { + struct hrl_limit hn_limit; + RB_ENTRY(hrl_node) hn_next; +}; + +/* + * XXX: This is silly. Some better way of organising these + * will be required. + */ +static int +hn_compare(const struct hrl_node *a, const struct hrl_node *b) +{ + if (a->hn_limit.hl_subject < b->hn_limit.hl_subject) + return (-1); + else if (a->hn_limit.hl_subject > b->hn_limit.hl_subject) + return (1); + + if (a->hn_limit.hl_subject_id < b->hn_limit.hl_subject_id) + return (-1); + else if (a->hn_limit.hl_subject_id > b->hn_limit.hl_subject_id) + return (1); -MALLOC_DEFINE(M_HRL, "hrl", "Hierarchical Resource Limits"); + if (a->hn_limit.hl_per < b->hn_limit.hl_per) + return (-1); + else if (a->hn_limit.hl_per > b->hn_limit.hl_per) + return (1); + + if (a->hn_limit.hl_object < b->hn_limit.hl_object) + return (-1); + else if (a->hn_limit.hl_object > b->hn_limit.hl_object) + return (1); + + if (a->hn_limit.hl_action < b->hn_limit.hl_action) + return (-1); + else if (a->hn_limit.hl_action > b->hn_limit.hl_action) + return (1); + + return (0); +} /* - * XXX: Need a better way to store stuff; rbtree? + * hrl_lock must be held during all operations on hrls. */ -static struct hrl_limit *limits = NULL; -static int nlimits = 0; -static struct mtx hrllock; +RB_HEAD(hrl_tree, hrl_node) hrls = RB_INITIALIZER(hrls); +RB_GENERATE_STATIC(hrl_tree, hrl_node, hn_next, hn_compare); static void hrl_init(void); SYSINIT(hrl, SI_SUB_RUN_SCHEDULER, SI_ORDER_SECOND, hrl_init, NULL); +static int nhrls = 0; +static uma_zone_t hrl_zone; +static struct mtx hrl_lock; + +MALLOC_DEFINE(M_HRL, "hrl", "Hierarchical Resource Limits"); + int hrl_alloc(int object, uint64_t amount) { @@ -72,34 +118,54 @@ void hrl_adjust(int subject, id_t subject_id, int per, int object, int action, int64_t amount) { + struct hrl_node searched, *node, *existing; + + searched.hn_limit.hl_subject = subject; + searched.hn_limit.hl_subject_id = subject_id; + searched.hn_limit.hl_per = per; + searched.hn_limit.hl_object = object; + searched.hn_limit.hl_action = action; + /* - * Limit removal? + * Removing a limit. */ - if (amount == 0) + if (amount == 0) { + mtx_lock(&hrl_lock); + node = RB_FIND(hrl_tree, &hrls, &searched); + if (node != NULL) { + node = RB_REMOVE(hrl_tree, &hrls, node); + KASSERT(node != NULL, ("node removal failed")); + nhrls--; + } + mtx_unlock(&hrl_lock); + if (node != NULL) + uma_zfree(hrl_zone, node); return; + } - mtx_lock(&hrllock); - - nlimits++; /* - * XXX: Make it possible to remove and overwrite limits, not just add them. + * Adding a new limit or changing existing one. */ - limits = realloc(limits, sizeof(struct hrl_limit) * nlimits, M_HRL, M_WAITOK); - - limits[nlimits - 1].hl_subject = subject; - limits[nlimits - 1].hl_subject_id = subject_id; - limits[nlimits - 1].hl_per = per; - limits[nlimits - 1].hl_object = object; - limits[nlimits - 1].hl_action = action; - limits[nlimits - 1].hl_amount = amount; - - mtx_unlock(&hrllock); + node = uma_zalloc(hrl_zone, M_WAITOK); + *node = searched; + mtx_lock(&hrl_lock); + existing = RB_INSERT(hrl_tree, &hrls, node); + if (existing != NULL) { + existing->hn_limit.hl_amount = amount; + } else { + node->hn_limit.hl_amount = amount; + nhrls++; + } + mtx_unlock(&hrl_lock); + if (existing != NULL) + uma_zfree(hrl_zone, node); } /* * System calls. */ +#if 0 static int hrl_check(struct hrl_limit *limits, int nlimits) { @@ -120,10 +186,12 @@ return (0); } +#endif int hrl_set(struct thread *td, struct hrl_set_args *uap) { +#if 0 int error; size_t buflen; struct hrl_limit *newlimits; @@ -143,11 +211,11 @@ * Removing all the limits? */ if (uap->nentries == 0) { - mtx_lock(&hrllock); + mtx_lock(&hrl_lock); free(limits, M_HRL); limits = NULL; - nlimits = 0; - mtx_unlock(&hrllock); + nhrls = 0; + mtx_unlock(&hrl_lock); return (0); } @@ -163,79 +231,125 @@ if (error) goto out; - mtx_lock(&hrllock); + mtx_lock(&hrl_lock); if (limits != NULL) free(limits, M_HRL); limits = newlimits; - nlimits = uap->nentries; + nhrls = uap->nentries; - mtx_unlock(&hrllock); + mtx_unlock(&hrl_lock); return (0); out: free(newlimits, M_HRL); return (error); +#else + return (ENOSYS); +#endif } int hrl_get(struct thread *td, struct hrl_get_args *uap) { - int error; + int error = 0, copied = 0; size_t buflen; + struct hrl_node *node; + struct hrl_limit *buf; + + if (uap->nentries == 0 && uap->bufp == NULL) { + mtx_lock(&hrl_lock); + error = suword(uap->required, nhrls); + mtx_unlock(&hrl_lock); - error = priv_check(td, PRIV_HRL_SET); - if (error) return (error); + } + if (uap->nentries < 0 || uap->nentries >= HRL_MAX_LIMITS) + return (EINVAL); + + buflen = sizeof(struct hrl_limit) * uap->nentries; + buf = malloc(buflen, M_HRL, M_WAITOK); + /* - * XXX: Check for being in jail? + * Copy the limits to the temporary buffer. We cannot + * copy it directly to the userland because of the mutex. */ - - mtx_lock(&hrllock); - - if (suword(uap->required, nlimits) != 0) { - error = EINVAL; - goto out; + mtx_lock(&hrl_lock); + RB_FOREACH(node, hrl_tree, &hrls) { + /* + * XXX: Do not show everything to the client; just the + * nodes that affect him. + */ + if (copied >= uap->nentries) { + error = EFBIG; + break; + } + *(buf + copied) = node->hn_limit; + copied++; } - - if (uap->nentries == 0 && uap->bufp == NULL) { - error = 0; + mtx_unlock(&hrl_lock); + if (error) goto out; - } - if (uap->nentries < nlimits) { - error = EFBIG; + error = copyout(buf, uap->bufp, sizeof(struct hrl_limit) * copied); + if (error) goto out; - } - if (nlimits == 0) { - error = 0; + if (suword(uap->required, copied) != 0) { + error = EINVAL; goto out; } - buflen = sizeof(struct hrl_limit) * nlimits; - error = copyout(limits, uap->bufp, buflen); - out: - mtx_unlock(&hrllock); - + free(buf, M_HRL); + return (error); } static void hrl_proc_exit(void *arg __unused, struct proc *p) { + struct hrl_node *node, *next; + /* - * XXX: Remove per-process limits here. + * Go through all the limits, looking for the ones with subject + * equal to the exiting process, and remove them. + * + * XXX: What are we gonna do - insert a HRL entry for every process + * that inherits a limit set with setrlimit(2), or do some + * magic here, moving limits from the parent process that's + * exiting to its children? */ +restart: + mtx_lock(&hrl_lock); + for (node = RB_MIN(hrl_tree, &hrls); node != NULL; node = next) { + next = RB_NEXT(hrl_tree, &hrls, node); + + if (node->hn_limit.hl_subject != HRL_SUBJECT_PROCESS) + continue; + if (node->hn_limit.hl_subject_id != p->p_pid) + continue; + + node = RB_REMOVE(hrl_tree, &hrls, node); + KASSERT(node != NULL, ("node removal failed")); + nhrls--; + + mtx_unlock(&hrl_lock); + uma_zfree(hrl_zone, node); + goto restart; + } + mtx_unlock(&hrl_lock); } static void hrl_init(void) { - mtx_init(&hrllock, "hrl lock", NULL, MTX_DEF); + + hrl_zone = uma_zcreate("hrl", sizeof(struct hrl_node), NULL, NULL, + NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + mtx_init(&hrl_lock, "hrl lock", NULL, MTX_DEF); EVENTHANDLER_REGISTER(process_exit, hrl_proc_exit, NULL, EVENTHANDLER_PRI_ANY); } From owner-p4-projects@FreeBSD.ORG Fri Jun 5 17:36:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7BA3D1065675; Fri, 5 Jun 2009 17:36: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 37372106566C for ; Fri, 5 Jun 2009 17:36:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 24C998FC14 for ; Fri, 5 Jun 2009 17:36:20 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55HaJ9T031796 for ; Fri, 5 Jun 2009 17:36:19 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55HaJK9031794 for perforce@freebsd.org; Fri, 5 Jun 2009 17:36:19 GMT (envelope-from trasz@freebsd.org) Date: Fri, 5 Jun 2009 17:36:19 GMT Message-Id: <200906051736.n55HaJK9031794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 163589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 17:36:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=163589 Change 163589 by trasz@trasz_victim on 2009/06/05 17:36:05 In setrlimit(2), the 'max' limit doesn't enforce anything other than the 'soft' limit. No point in putting it into hrl. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#3 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_resource.c#3 (text+ko) ==== @@ -646,7 +646,7 @@ static void hrl_handle_setrlimit(u_int which, struct rlimit *lim, struct thread *td) { - int object, subject, soft_action, hard_action; + int object, subject, action = -1; id_t id; /* @@ -654,13 +654,11 @@ */ subject = HRL_SUBJECT_PROCESS; id = td->td_proc->p_pid; - soft_action = HRL_ACTION_LOG; - hard_action = HRL_ACTION_DENY; switch (which) { case RLIMIT_CPU: object = HRL_OBJECT_CPUTIME; - soft_action = HRL_ACTION_SIGXCPU; + action = HRL_ACTION_SIGXCPU; break; case RLIMIT_FSIZE: object = HRL_OBJECT_FILESIZE; @@ -670,7 +668,7 @@ break; case RLIMIT_STACK: object = HRL_OBJECT_STACKSIZE; - soft_action = HRL_ACTION_SIGSEGV; + action = HRL_ACTION_SIGSEGV; break; case RLIMIT_CORE: object = HRL_OBJECT_COREDUMPSIZE; @@ -688,7 +686,7 @@ break; case RLIMIT_NOFILE: object = HRL_OBJECT_OPENFILES; - soft_action = HRL_ACTION_SIGXFSZ; + action = HRL_ACTION_SIGXFSZ; break; case RLIMIT_SBSIZE: object = HRL_OBJECT_SBSIZE; @@ -707,16 +705,17 @@ panic("hrl_handle_setrlimit: unknown limit"); } - if (lim->rlim_cur != RLIM_INFINITY) - hrl_adjust(subject, id, subject, object, soft_action, + if (lim->rlim_cur != RLIM_INFINITY) { + hrl_adjust(subject, id, subject, object, HRL_ACTION_DENY, lim->rlim_cur); - else - hrl_adjust(subject, id, subject, object, soft_action, 0); - if (lim->rlim_max != RLIM_INFINITY) - hrl_adjust(subject, id, subject, object, hard_action, - lim->rlim_max); - else - hrl_adjust(subject, id, subject, object, hard_action, 0); + if (action != -1) + hrl_adjust(subject, id, subject, object, action, + lim->rlim_cur); + } else { + hrl_adjust(subject, id, subject, object, HRL_ACTION_DENY, 0); + if (action != -1) + hrl_adjust(subject, id, subject, object, action, 0); + } } int From owner-p4-projects@FreeBSD.ORG Fri Jun 5 17:49:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF0701065675; Fri, 5 Jun 2009 17:49:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F09C1065673 for ; Fri, 5 Jun 2009 17:49:33 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E06D8FC1F for ; Fri, 5 Jun 2009 17:49:33 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55HnXNp032814 for ; Fri, 5 Jun 2009 17:49:33 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55HnXI5032812 for perforce@freebsd.org; Fri, 5 Jun 2009 17:49:33 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 17:49:33 GMT Message-Id: <200906051749.n55HnXI5032812@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 163591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 17:49:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=163591 Change 163591 by zec@zec_tpx32 on 2009/06/05 17:49:07 vi_if_move() may be called with vi_req set to NULL, if called from vi_destroy(), hence check whether vi_req is non-NULL before attempting to dereference it. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#53 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#53 (text+ko) ==== @@ -122,7 +122,7 @@ struct vnet *new_vnet = NULL; /* Check for API / ABI version mismatch. */ - if (vi_req->vi_api_cookie != VI_API_COOKIE) + if (vi_req != NULL && vi_req->vi_api_cookie != VI_API_COOKIE) return (EDOOFUS); /* Find the target vnet. */ From owner-p4-projects@FreeBSD.ORG Fri Jun 5 19:26:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 881021065693; Fri, 5 Jun 2009 19:26:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CA6781065688 for ; Fri, 5 Jun 2009 19:26:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ADF6F8FC13 for ; Fri, 5 Jun 2009 19:26:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55JQcW4045155 for ; Fri, 5 Jun 2009 19:26:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55JQMDn045140 for perforce@freebsd.org; Fri, 5 Jun 2009 19:26:22 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 Jun 2009 19:26:22 GMT Message-Id: <200906051926.n55JQMDn045140@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 163598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 19:26:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=163598 Change 163598 by rwatson@rwatson_freebsd_capabilities on 2009/06/05 19:26:19 Integrate TrustedBSD Capabilities branch from April 8-CURRENT to June 8-CURRENT; some parts of the merge are works in progress still. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#8 integrate .. //depot/projects/trustedbsd/capabilities/src/UPDATING#8 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/chflags/chflags.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cp/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/cp/utils.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pkill/pkill.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/pkill/pkill.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/print.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/ps.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/ps.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/ps/ps.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/rm/rm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/alias.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/eval.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/exec.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/histedit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/main.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/memalloc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/memalloc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/miscbltin.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/mkinit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/mksyntax.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/parser.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/sh.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/trap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/sh/var.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/test/TEST.sh#2 integrate .. //depot/projects/trustedbsd/capabilities/src/bin/test/test.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/lockstat/lockstat.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/cmd/lockstat/sym.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/lib/libzpool/Makefile#5 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.sbin/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/cddl/usr.sbin/lockstat/Makefile#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/CHANGES#5 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/COPYRIGHT#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/FAQ#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/FAQ.xml#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/NSEC3-NOTES#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/README#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/README.idnkit#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/README.pkcs11#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/acconfig.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/check-tool.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/check-tool.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkconf.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkconf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkconf.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkconf.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkzone.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkzone.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkzone.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/check/named-checkzone.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dig.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/dighost.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.1#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/host.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/include/dig/dig.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/nslookup.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/nslookup.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/nslookup.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dig/nslookup.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.8#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.docbook#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-keygen.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssec-signzone.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssectool.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/dnssec/dnssectool.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/bind9.xsl#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/bind9.xsl.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/builtin.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/client.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/config.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/control.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/controlconf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/convertxsl.pl#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/builtin.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/client.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/config.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/control.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/globals.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/interfacemgr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/listenlist.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/log.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/logconf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/lwaddr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/lwdclient.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/lwresd.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/lwsearch.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/main.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/notify.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/query.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/server.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/sortlist.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/statschannel.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/tkeyconf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/tsigconf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/types.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/update.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/xfrout.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/include/named/zoneconf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/interfacemgr.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/listenlist.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/log.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/logconf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwaddr.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwdclient.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwderror.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwdgabn.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwdgnba.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwdgrbn.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwdnoop.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwresd.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/lwsearch.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/main.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.conf.5#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.conf.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.conf.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/named.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/notify.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/query.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/server.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/sortlist.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/statschannel.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/tkeyconf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/tsigconf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/unix/include/named/os.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/unix/os.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/update.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/xfrout.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/named/zoneconf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.1#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/nsupdate/nsupdate.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/include/rndc/os.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc-confgen.8#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc-confgen.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc-confgen.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.8#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.conf#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.conf.5#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.conf.docbook#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.conf.html#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.docbook#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/rndc.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/unix/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/unix/os.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/util.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/bin/rndc/util.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/config.guess#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/config.h.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/configure.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM-book.xml#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch01.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch02.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch03.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch04.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch05.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch06.html#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch07.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch08.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch09.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.ch10.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Bv9ARM.pdf#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dig.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-keygen.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.dnssec-signzone.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.host.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.named-checkconf.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.named-checkzone.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.named.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.nsupdate.html#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.rndc-confgen.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.rndc.conf.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/arm/man.rndc.html#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-baba-dnsext-acl-reqts-01.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-daigle-napstr-04.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-danisch-dns-rr-smtp-03.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-dnsext-opcode-discover-02.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-durand-dnsop-dynreverse-00.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-2929bis-01.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-axfr-clarify-05.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dhcid-rr-12.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dns-name-p-s-00.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-2535typecode-change-06.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-bis-updates-01.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-experiments-01.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-online-signing-02.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-opt-in-07.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-rsasha256-00.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-dnssec-trans-02.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ds-sha256-05.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-ecc-key-07.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-interop3597-02.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-keyrr-key-signing-flag-12.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-mdns-43.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsec3-04.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-nsid-01.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2536bis-dsa-06.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2538bis-04.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-rfc2539bis-dhk-06.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-signed-nonexistence-requirements-01.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tkey-renewal-mode-05.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-threshold-00.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-trustupdate-timers-02.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-tsig-sha-06.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsext-wcard-clarify-10.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsop-bad-dns-res-05.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsop-dnssec-operational-practices-08.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsop-inaddr-required-07.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-configuration-06.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-dns-issues-11.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsop-ipv6-transport-guidelines-01.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsop-key-rollover-requirements-02.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsop-respsize-02.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-dnsop-serverid-06.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-enum-e164-gstn-np-05.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-ipv6-node-requirements-08.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ietf-secsh-dns-05.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-ihren-dnsext-threshold-validation-00.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-kato-dnsop-local-zones-00.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/draft-park-ipv6-extensions-dns-pnp-00.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/draft/update#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/format-options.pl#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/ipv6#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/migration#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/options#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/misc/sort-options.pl#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/index#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1032.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1033.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1034.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1035.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1101.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1122.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1123.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1183.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1348.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1535.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1536.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1537.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1591.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1611.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1612.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1706.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1712.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1750.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1876.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1886.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1982.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1995.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc1996.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2052.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2104.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2119.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2133.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2136.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2137.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2163.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2168.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2181.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2230.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2308.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2317.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2373.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2374.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2375.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2418.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2535.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2536.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2537.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2538.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2539.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2540.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2541.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2553.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2671.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2672.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2673.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2782.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2825.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2826.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2845.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2874.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2915.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2929.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2930.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc2931.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3007.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3008.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3071.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3090.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3110.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3123.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3152.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3197.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3225.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3226.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3258.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3363.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3364.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3425.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3445.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3467.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3490.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3491.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3492.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3493.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3513.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3596.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3597.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3645.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3655.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3658.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3757.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3833.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3845.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc3901.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4025.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4033.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4034.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4035.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4074.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4159.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4193.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4255.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4343.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4367.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4398.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4408.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4431.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4470.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4634.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4641.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4648.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc4701.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc5155.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/doc/rfc/rfc952.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/isc-config.sh.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/Makefile.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/README#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/aclocal.m4#4 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/api#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/Makefile.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/daemon.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/ftruncate.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/gettimeofday.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/mktemp.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/putenv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/readv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/setenv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/setitimer.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/strcasecmp.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/strdup.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/strerror.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/strpbrk.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/strsep.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/strtoul.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/utimes.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/bsd/writev.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/config.h.in#4 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/configure.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/Makefile.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/dst_api.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/dst_internal.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/hmac_link.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/md5.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/md5_dgst.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/md5_locl.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/dst/support.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/Makefile.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/arpa/inet.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/arpa/nameser.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/arpa/nameser_compat.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/fd_setsize.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/hesiod.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/irp.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/irs.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/assertions.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/ctl.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/dst.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/eventlib.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/heap.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/irpmarshall.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/list.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/logging.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/memcluster.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/misc.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/platform.h.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/isc/tree.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/netdb.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/netgroup.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/res_update.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/resolv.h#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/include/resolv_mt.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/Makefile.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_addr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_cidr_ntop.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_cidr_pton.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_data.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_lnaof.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_makeaddr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_net_ntop.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_net_pton.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_neta.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_netof.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_network.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_ntoa.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_ntop.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/inet_pton.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/inet/nsap_addr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/Makefile.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/dns.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/dns_gr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/dns_ho.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/dns_nw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/dns_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/dns_pr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/dns_pw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/dns_sv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gai_strerror.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gen.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gen_gr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gen_ho.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gen_ng.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gen_nw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gen_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gen_pr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gen_pw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gen_sv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getaddrinfo.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getgrent.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getgrent_r.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gethostent.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/gethostent_r.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getnameinfo.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getnetent.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getnetent_r.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getnetgrent.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getnetgrent_r.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getprotoent.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getprotoent_r.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getpwent.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getpwent_r.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getservent.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/getservent_r.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/hesiod.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/hesiod_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp_gr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp_ho.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp_ng.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp_nw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp_pr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp_pw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irp_sv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irpmarshall.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irs_data.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irs_data.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/irs_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/lcl.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/lcl_gr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/lcl_ho.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/lcl_ng.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/lcl_nw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/lcl_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/lcl_pr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/lcl_pw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/lcl_sv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nis.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nis_gr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nis_ho.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nis_ng.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nis_nw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nis_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nis_pr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nis_pw.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nis_sv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/nul_ng.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/pathnames.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/irs/util.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/Makefile.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/assertions.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/assertions.mdoc#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/base64.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/bitncmp.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/bitncmp.mdoc#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ctl_clnt.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ctl_p.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ctl_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ctl_srvr.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ev_connects.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ev_files.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ev_streams.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ev_timers.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/ev_waits.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/eventlib.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/eventlib.mdoc#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/eventlib_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/heap.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/heap.mdoc#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/hex.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/logging.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/logging.mdoc#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/logging_p.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/memcluster.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/memcluster.mdoc#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/movefile.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/tree.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/isc/tree.mdoc#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/make/includes.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/make/mkdep.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/make/rules.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/mkinstalldirs#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/Makefile.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/ns_date.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/ns_name.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/ns_netint.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/ns_parse.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/ns_print.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/ns_samedomain.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/ns_sign.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/ns_ttl.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/nameser/ns_verify.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/port/Makefile.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/port/freebsd/Makefile.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/port/freebsd/include/Makefile.in#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/port/freebsd/include/sys/bitypes.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/port_after.h.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/port_before.h.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/Makefile.in#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/herror.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/mtctxres.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_comp.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_data.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_debug.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_debug.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_findzonecut.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_init.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_mkquery.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_mkupdate.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_mkupdate.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_private.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_query.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_send.c#3 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_sendsigned.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind/resolv/res_update.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/api#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/check.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/getaddresses.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/include/bind9/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/include/bind9/check.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/include/bind9/getaddresses.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/include/bind9/version.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/bind9/version.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/acache.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/acl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/adb.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/api#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/byaddr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/cache.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/callbacks.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/compress.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/db.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dbiterator.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dbtable.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/diff.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dispatch.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dlz.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dnssec.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/ds.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_api.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_internal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_lib.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_openssl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_parse.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_parse.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/dst_result.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/forward.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/gen-unix.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/gen.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/gssapi_link.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/gssapictx.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/hmac_link.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/acache.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/acl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/adb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/bit.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/byaddr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/cache.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/callbacks.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/cert.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/compress.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/db.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/dbiterator.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/dbtable.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/diff.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/dispatch.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/dlz.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/dnssec.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/ds.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/events.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/fixedname.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/forward.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/iptable.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/journal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/keyflags.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/keytable.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/keyvalues.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/lib.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/log.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/lookup.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/master.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/masterdump.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/message.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/name.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/ncache.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/nsec.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/nsec3.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/opcode.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/order.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/peer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/portlist.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rbt.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rcode.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rdata.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rdataclass.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rdatalist.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rdataset.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rdatasetiter.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rdataslab.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rdatatype.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/request.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/resolver.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/result.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/rootns.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/sdb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/sdlz.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/secalg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/secproto.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/soa.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/ssu.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/stats.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/tcpmsg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/time.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/timer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/tkey.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/tsig.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/ttl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/types.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/validator.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/version.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/view.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/xfrin.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/zone.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/zonekey.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dns/zt.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dst/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dst/dst.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dst/gssapi.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dst/lib.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/include/dst/result.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/iptable.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/journal.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/key.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/keytable.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/lib.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/log.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/lookup.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/master.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/masterdump.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/message.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/name.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/ncache.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/nsec.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/nsec3.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/openssl_link.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/openssldh_link.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/openssldsa_link.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/opensslrsa_link.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/order.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/peer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/portlist.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbt.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbtdb.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbtdb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbtdb64.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rbtdb64.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rcode.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/any_255/tsig_250.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/ch_3/a_1.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/afsdb_18.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/cert_37.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/cert_37.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/cname_5.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/cname_5.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/dlv_32769.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/dname_39.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/dname_39.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/dnskey_48.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/ds_43.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/ds_43.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/gpos_27.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/hinfo_13.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/ipseckey_45.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/isdn_20.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/key_25.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/key_25.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/loc_29.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/loc_29.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mb_7.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mb_7.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/md_3.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/md_3.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mf_4.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mf_4.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mg_8.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mg_8.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/minfo_14.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mr_9.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mr_9.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mx_15.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/mx_15.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/ns_2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/ns_2.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nsec3_50.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nsec3_50.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nsec3param_51.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nsec_47.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/null_10.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/null_10.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/nxt_30.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/opt_41.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/opt_41.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/proforma.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/proforma.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/ptr_12.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/rp_17.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/rp_17.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/rrsig_46.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/rt_21.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/rt_21.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/sig_24.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/sig_24.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/soa_6.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/soa_6.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/spf_99.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/spf_99.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/sshfp_44.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/tkey_249.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/txt_16.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/txt_16.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/unspec_103.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/x25_19.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/generic/x25_19.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/hs_4/a_1.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/a6_38.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/a_1.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/a_1.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/aaaa_28.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/apl_42.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/dhcid_49.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/kx_36.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/naptr_35.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/nsap-ptr_23.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/nsap_22.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/px_26.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/px_26.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/srv_33.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/in_1/wks_11.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/rdatastructpre.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdata/rdatastructsuf.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdatalist.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdatalist_p.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdataset.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdatasetiter.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rdataslab.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/request.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/resolver.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/result.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/rootns.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/sdb.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/sdlz.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/soa.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/spnego.asn1#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/spnego.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/spnego.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/spnego_asn1.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/spnego_asn1.pl#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/ssu.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/stats.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/tcpmsg.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/time.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/timer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/tkey.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/tsig.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/ttl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/validator.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/version.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/view.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/xfrin.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/zone.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/zonekey.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/dns/zt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/alpha/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/alpha/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/alpha/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/alpha/include/isc/atomic.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/api#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/assertions.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/base32.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/base64.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/bitstring.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/buffer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/bufferlist.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/commandline.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/entropy.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/error.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/event.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/fsaccess.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/hash.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/heap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/hex.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/hmacmd5.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/hmacsha.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/httpd.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/ia64/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/ia64/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/ia64/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/ia64/include/isc/atomic.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/Makefile.in#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/app.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/assertions.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/base32.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/base64.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/bitstring.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/boolean.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/buffer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/bufferlist.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/commandline.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/entropy.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/error.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/event.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/eventclass.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/file.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/formatcheck.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/fsaccess.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/hash.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/heap.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/hex.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/hmacmd5.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/hmacsha.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/httpd.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/interfaceiter.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/ipv6.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/iterated_hash.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/lang.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/lex.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/lfsr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/lib.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/list.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/log.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/magic.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/md5.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/mem.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/msgcat.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/msgs.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/mutexblock.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/netaddr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/netscope.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/ondestroy.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/os.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/parseint.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/platform.h.in#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/portset.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/print.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/quota.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/radix.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/random.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/ratelimiter.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/refcount.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/region.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/resource.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/result.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/resultclass.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/rwlock.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/serial.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/sha1.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/sha2.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/sockaddr.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/socket.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/stats.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/stdio.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/stdlib.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/string.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/symtab.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/task.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/taskpool.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/timer.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/types.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/util.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/version.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/include/isc/xml.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/inet_aton.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/inet_ntop.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/inet_pton.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/iterated_hash.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/lex.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/lfsr.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/lib.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/contrib/bind9/lib/isc/log.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 5 20:01:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E04D11065679; Fri, 5 Jun 2009 20:01: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 A00021065674 for ; Fri, 5 Jun 2009 20:01:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 74D378FC1E for ; Fri, 5 Jun 2009 20:01:14 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55K1E5o051826 for ; Fri, 5 Jun 2009 20:01:14 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55K1DFQ051824 for perforce@freebsd.org; Fri, 5 Jun 2009 20:01:13 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 20:01:13 GMT Message-Id: <200906052001.n55K1DFQ051824@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 163600 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 20:01:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=163600 Change 163600 by zec@zec_tpx32 on 2009/06/05 20:01:01 A crude hack aiming at providing each vnet with completely independent copy of if_clone descriptor for loif interface class. Until now loif's ifc_simple_data struct was shared among all vnets, which resulted in its ifcs_minifs field being reset from 1 to 0 on first vimage -d invocation. In turn, this resulted in all subsequent new vnets being created without lo0 instance. This patch restores correct behavior, i.e. vimage -c will now always automatically create a lo0 instance in a new vnet, regardless on whether vimage -d was previously called on another vnet. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#35 edit .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#21 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#35 (text+ko) ==== @@ -182,7 +182,11 @@ #ifdef VIMAGE V_lo_cloner = malloc(sizeof(*V_lo_cloner), M_LO_CLONER, M_WAITOK | M_ZERO); + V_lo_cloner_data = malloc(sizeof(*V_lo_cloner_data), M_LO_CLONER, + M_WAITOK | M_ZERO); bcopy(&lo_cloner, V_lo_cloner, sizeof(*V_lo_cloner)); + bcopy(lo_cloner.ifc_data, V_lo_cloner_data, sizeof(*V_lo_cloner_data)); + V_lo_cloner->ifc_data = V_lo_cloner_data; if_clone_attach(V_lo_cloner); #else if_clone_attach(&lo_cloner); @@ -197,6 +201,8 @@ INIT_VNET_NET(curvnet); if_clone_detach(V_lo_cloner); + free(V_lo_cloner, M_LO_CLONER); + free(V_lo_cloner_data, M_LO_CLONER); V_loif = NULL; return (0); ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#21 (text+ko) ==== @@ -51,6 +51,7 @@ struct ifnet * _loif; struct if_clone * _lo_cloner; + struct ifc_simple_data *_lo_cloner_data; LIST_HEAD(, rawcb) _rawcb_list; @@ -87,6 +88,7 @@ #define V_ifklist VNET_NET(ifklist) #define V_ifnet VNET_NET(ifnet) #define V_lo_cloner VNET_NET(lo_cloner) +#define V_lo_cloner_data VNET_NET(lo_cloner_data) #define V_loif VNET_NET(loif) #define V_rawcb_list VNET_NET(rawcb_list) #define V_rt_tables VNET_NET(rt_tables) From owner-p4-projects@FreeBSD.ORG Fri Jun 5 20:07:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B3911065680; Fri, 5 Jun 2009 20:07: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 1AB291065677 for ; Fri, 5 Jun 2009 20:07:21 +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 057068FC0C for ; Fri, 5 Jun 2009 20:07:21 +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 n55K7KHm053248 for ; Fri, 5 Jun 2009 20:07:20 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 n55K7Kaf053246 for perforce@freebsd.org; Fri, 5 Jun 2009 20:07:20 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 Jun 2009 20:07:20 GMT Message-Id: <200906052007.n55K7Kaf053246@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 163601 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 20:07:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=163601 Change 163601 by rwatson@rwatson_freebsd_capabilities on 2009/06/05 20:06:58 Forced integrate of dev/usb to try and resolve inconsistencies associated with svn/cvs/... repo-copies/renames propated poorly into P4. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/avr32dci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/avr32dci.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_mbus.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/usb_rdesc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/udbp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/udbp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_auereg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axereg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdcereg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cuereg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kuefw.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kuereg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_ruereg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_udavreg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uchcom.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi_reg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ugensa.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/rio500_usb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_msc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/ufm_ioctl.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_cdc.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_debug.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_debug.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_defs.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dynamic.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dynamic.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_endian.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_error.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_error.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_generic.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_if.m#4 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_ioctl.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_lookup.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_lookup.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mbuf.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mbuf.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mfunc.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_msctest.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_msctest.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_parse.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_parse.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_pci.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_revision.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_util.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_util.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbhid.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumfw.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uath.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uathreg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uathvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgtvar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uralreg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwreg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwvar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zydfw.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zydreg.h#3 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/avr32dci.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/avr32dci.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_mbus.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_pci.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_atmelarm.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_pci.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci_pci.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/usb_controller.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/uhid.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ukbd.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ums.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/usb_rdesc.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/udbp.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/udbp.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/ufm.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_aue.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_auereg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axe.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axereg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdce.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdcereg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cue.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cuereg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kue.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kuefw.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kuereg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_rue.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_ruereg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_udav.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_udavreg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/u3g.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uark.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubsa.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubser.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uchcom.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ucycom.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ufoma.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi_reg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ugensa.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uipaq.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ulpt.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umct.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umodem.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umoscom.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uplcom.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uslcom.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvisor.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvscom.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/rio500_usb.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/umass.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/urio.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/ustorage_fs.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_cdce.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_msc.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_mtp.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/ufm_ioctl.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb.h#6 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_bus.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_cdc.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_controller.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_debug.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_debug.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_defs.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dynamic.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dynamic.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_endian.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_error.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_error.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_generic.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_generic.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hid.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hid.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_ioctl.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_lookup.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_lookup.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mbuf.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mbuf.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mfunc.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_msctest.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_msctest.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_parse.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_parse.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_pci.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_request.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_request.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_revision.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_util.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_util.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#12 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbhid.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rum.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumfw.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumreg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumvar.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uath.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uathreg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uathvar.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgt.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgtvar.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_ural.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uralreg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uralvar.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwreg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwvar.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zyd.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zydfw.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zydreg.h#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jun 5 20:11:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D544A1065673; Fri, 5 Jun 2009 20:11: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 949D7106564A for ; Fri, 5 Jun 2009 20:11:25 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7F75B8FC18 for ; Fri, 5 Jun 2009 20:11:25 +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 n55KBPGo053595 for ; Fri, 5 Jun 2009 20:11:25 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 n55KBPfb053593 for perforce@freebsd.org; Fri, 5 Jun 2009 20:11:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 Jun 2009 20:11:25 GMT Message-Id: <200906052011.n55KBPfb053593@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 163602 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 20:11:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=163602 Change 163602 by rwatson@rwatson_freebsd_capabilities on 2009/06/05 20:11:06 Retry forced integrate of usb code. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/avr32dci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/avr32dci.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_mbus.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_atmelarm.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/usb_controller.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ukbd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/usb_rdesc.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/udbp.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/ufm.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_auereg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axereg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdcereg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cuereg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kuefw.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kuereg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_ruereg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_udavreg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uark.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubsa.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uchcom.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi_reg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uipaq.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ulpt.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umoscom.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uslcom.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvscom.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/rio500_usb.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/urio.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/ustorage_fs.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_cdce.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_msc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_mtp.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/ufm_ioctl.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb.h#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_bus.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_cdc.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_controller.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_debug.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_debug.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_defs.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dynamic.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dynamic.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_endian.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_error.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_error.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_generic.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hid.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_if.m#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_ioctl.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_lookup.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_lookup.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mbuf.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mbuf.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mfunc.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_msctest.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_msctest.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_parse.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_parse.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_pci.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_request.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_request.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_revision.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_util.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_util.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbhid.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumfw.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumreg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumvar.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uath.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uathreg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uathvar.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgt.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgtvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uralreg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uralvar.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwreg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwvar.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zydfw.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zydreg.h#4 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/atmegadci_atmelarm.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/avr32dci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/avr32dci.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_mbus.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ehci_pci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/ohci_pci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uhci_pci.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/usb_controller.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/uhid.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ukbd.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/ums.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/input/usb_rdesc.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/udbp.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/udbp.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/misc/ufm.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_aue.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_auereg.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axe.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_axereg.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdce.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cdcereg.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cue.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_cuereg.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kue.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kuefw.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_kuereg.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_rue.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_ruereg.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_udav.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/if_udavreg.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/net/usb_ethernet.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/quirk/usb_quirk.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/u3g.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uark.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubsa.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ubser.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uchcom.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ucycom.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ufoma.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uftdi_reg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ugensa.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uipaq.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/ulpt.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umct.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umodem.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/umoscom.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uplcom.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/usb_serial.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uslcom.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvisor.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/serial/uvscom.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/rio500_usb.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/umass.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/urio.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/storage/ustorage_fs.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_cdce.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_msc.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/template/usb_template_mtp.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/ufm_ioctl.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb.h#7 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_bus.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_busdma.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_cdc.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_compat_linux.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_controller.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_core.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_debug.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_debug.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_defs.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dev.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_device.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dynamic.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_dynamic.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_endian.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_error.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_error.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_generic.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_generic.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_handle_request.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hid.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hid.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_hub.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_if.m#5 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_ioctl.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_lookup.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_lookup.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mbuf.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mbuf.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_mfunc.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_msctest.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_msctest.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_parse.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_parse.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_pci.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_process.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_request.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_request.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_revision.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_transfer.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_util.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usb_util.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbdevs#13 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/usbhid.h#5 (text+ko) ==== @@ -1,12 +1,9 @@ /* $FreeBSD: src/sys/dev/usb/usbhid.h,v 1.19 2009/05/28 17:36:36 thompsa Exp $ */ /*- - * Copyright (c) 1998 The NetBSD Foundation, Inc. - * All rights reserved. + * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved. + * Copyright (c) 1998 Lennart Augustsson. All rights reserved. * - * This code is derived from software contributed to The NetBSD Foundation - * by Lennart Augustsson (lennart@augustsson.net) at - * Carlstedt Research & Technology. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -15,42 +12,36 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the NetBSD - * Foundation, Inc. and its contributors. - * 4. Neither the name of The NetBSD Foundation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ +#ifndef _USB2_HID_H_ +#define _USB2_HID_H_ -#ifndef _USBHID_H_ -#define _USBHID_H_ +#include -#define UR_GET_HID_DESCRIPTOR 0x06 -#define UDESC_HID 0x21 -#define UDESC_REPORT 0x22 -#define UDESC_PHYSICAL 0x23 -#define UR_SET_HID_DESCRIPTOR 0x07 -#define UR_GET_REPORT 0x01 -#define UR_SET_REPORT 0x09 -#define UR_GET_IDLE 0x02 -#define UR_SET_IDLE 0x0a -#define UR_GET_PROTOCOL 0x03 -#define UR_SET_PROTOCOL 0x0b +#define UR_GET_HID_DESCRIPTOR 0x06 +#define UDESC_HID 0x21 +#define UDESC_REPORT 0x22 +#define UDESC_PHYSICAL 0x23 +#define UR_SET_HID_DESCRIPTOR 0x07 +#define UR_GET_REPORT 0x01 +#define UR_SET_REPORT 0x09 +#define UR_GET_IDLE 0x02 +#define UR_SET_IDLE 0x0a +#define UR_GET_PROTOCOL 0x03 +#define UR_SET_PROTOCOL 0x0b struct usb_hid_descriptor { uByte bLength; @@ -59,40 +50,41 @@ uByte bCountryCode; uByte bNumDescriptors; struct { - uByte bDescriptorType; - uWord wDescriptorLength; - } descrs[1]; -} UPACKED usb_hid_descriptor_t; -#define USB_HID_DESCRIPTOR_SIZE(n) (9+(n)*3) + uByte bDescriptorType; + uWord wDescriptorLength; + } descrs[1]; +} __packed; + +#define USB_HID_DESCRIPTOR_SIZE(n) (9+((n)*3)) /* Usage pages */ -#define HUP_UNDEFINED 0x0000 -#define HUP_GENERIC_DESKTOP 0x0001 -#define HUP_SIMULATION 0x0002 -#define HUP_VR_CONTROLS 0x0003 -#define HUP_SPORTS_CONTROLS 0x0004 -#define HUP_GAMING_CONTROLS 0x0005 -#define HUP_KEYBOARD 0x0007 -#define HUP_LEDS 0x0008 -#define HUP_BUTTON 0x0009 -#define HUP_ORDINALS 0x000a -#define HUP_TELEPHONY 0x000b -#define HUP_CONSUMER 0x000c -#define HUP_DIGITIZERS 0x000d -#define HUP_PHYSICAL_IFACE 0x000e -#define HUP_UNICODE 0x0010 -#define HUP_ALPHANUM_DISPLAY 0x0014 -#define HUP_MONITOR 0x0080 -#define HUP_MONITOR_ENUM_VAL 0x0081 -#define HUP_VESA_VC 0x0082 -#define HUP_VESA_CMD 0x0083 -#define HUP_POWER 0x0084 -#define HUP_BATTERY_SYSTEM 0x0085 -#define HUP_BARCODE_SCANNER 0x008b -#define HUP_SCALE 0x008c -#define HUP_CAMERA_CONTROL 0x0090 -#define HUP_ARCADE 0x0091 -#define HUP_MICROSOFT 0xff00 +#define HUP_UNDEFINED 0x0000 +#define HUP_GENERIC_DESKTOP 0x0001 +#define HUP_SIMULATION 0x0002 +#define HUP_VR_CONTROLS 0x0003 +#define HUP_SPORTS_CONTROLS 0x0004 +#define HUP_GAMING_CONTROLS 0x0005 +#define HUP_KEYBOARD 0x0007 +#define HUP_LEDS 0x0008 +#define HUP_BUTTON 0x0009 +#define HUP_ORDINALS 0x000a +#define HUP_TELEPHONY 0x000b +#define HUP_CONSUMER 0x000c +#define HUP_DIGITIZERS 0x000d +#define HUP_PHYSICAL_IFACE 0x000e +#define HUP_UNICODE 0x0010 +#define HUP_ALPHANUM_DISPLAY 0x0014 +#define HUP_MONITOR 0x0080 +#define HUP_MONITOR_ENUM_VAL 0x0081 +#define HUP_VESA_VC 0x0082 +#define HUP_VESA_CMD 0x0083 +#define HUP_POWER 0x0084 +#define HUP_BATTERY_SYSTEM 0x0085 +#define HUP_BARCODE_SCANNER 0x008b +#define HUP_SCALE 0x008c +#define HUP_CAMERA_CONTROL 0x0090 +#define HUP_ARCADE 0x0091 +#define HUP_MICROSOFT 0xff00 /* Usages, generic desktop */ #define HUG_POINTER 0x0001 @@ -139,46 +131,46 @@ #define HUG_APPLE_EJECT 0x00b8 /* Usages Digitizers */ -#define HUD_UNDEFINED 0x0000 -#define HUD_TIP_PRESSURE 0x0030 -#define HUD_BARREL_PRESSURE 0x0031 -#define HUD_IN_RANGE 0x0032 -#define HUD_TOUCH 0x0033 -#define HUD_UNTOUCH 0x0034 -#define HUD_TAP 0x0035 -#define HUD_QUALITY 0x0036 -#define HUD_DATA_VALID 0x0037 -#define HUD_TRANSDUCER_INDEX 0x0038 -#define HUD_TABLET_FKEYS 0x0039 -#define HUD_PROGRAM_CHANGE_KEYS 0x003a -#define HUD_BATTERY_STRENGTH 0x003b -#define HUD_INVERT 0x003c -#define HUD_X_TILT 0x003d -#define HUD_Y_TILT 0x003e -#define HUD_AZIMUTH 0x003f -#define HUD_ALTITUDE 0x0040 -#define HUD_TWIST 0x0041 -#define HUD_TIP_SWITCH 0x0042 -#define HUD_SEC_TIP_SWITCH 0x0043 -#define HUD_BARREL_SWITCH 0x0044 -#define HUD_ERASER 0x0045 -#define HUD_TABLET_PICK 0x0046 +#define HUD_UNDEFINED 0x0000 +#define HUD_TIP_PRESSURE 0x0030 +#define HUD_BARREL_PRESSURE 0x0031 +#define HUD_IN_RANGE 0x0032 +#define HUD_TOUCH 0x0033 +#define HUD_UNTOUCH 0x0034 +#define HUD_TAP 0x0035 +#define HUD_QUALITY 0x0036 +#define HUD_DATA_VALID 0x0037 +#define HUD_TRANSDUCER_INDEX 0x0038 +#define HUD_TABLET_FKEYS 0x0039 +#define HUD_PROGRAM_CHANGE_KEYS 0x003a +#define HUD_BATTERY_STRENGTH 0x003b +#define HUD_INVERT 0x003c +#define HUD_X_TILT 0x003d +#define HUD_Y_TILT 0x003e +#define HUD_AZIMUTH 0x003f +#define HUD_ALTITUDE 0x0040 +#define HUD_TWIST 0x0041 +#define HUD_TIP_SWITCH 0x0042 +#define HUD_SEC_TIP_SWITCH 0x0043 +#define HUD_BARREL_SWITCH 0x0044 +#define HUD_ERASER 0x0045 +#define HUD_TABLET_PICK 0x0046 -#define HID_USAGE2(p,u) (((p) << 16) | u) +#define HID_USAGE2(p,u) (((p) << 16) | (u)) -#define UHID_INPUT_REPORT 0x01 -#define UHID_OUTPUT_REPORT 0x02 -#define UHID_FEATURE_REPORT 0x03 +#define UHID_INPUT_REPORT 0x01 +#define UHID_OUTPUT_REPORT 0x02 +#define UHID_FEATURE_REPORT 0x03 /* Bits in the input/output/feature items */ -#define HIO_CONST 0x001 -#define HIO_VARIABLE 0x002 -#define HIO_RELATIVE 0x004 -#define HIO_WRAP 0x008 -#define HIO_NONLINEAR 0x010 -#define HIO_NOPREF 0x020 -#define HIO_NULLSTATE 0x040 -#define HIO_VOLATILE 0x080 -#define HIO_BUFBYTES 0x100 +#define HIO_CONST 0x001 +#define HIO_VARIABLE 0x002 +#define HIO_RELATIVE 0x004 +#define HIO_WRAP 0x008 +#define HIO_NONLINEAR 0x010 +#define HIO_NOPREF 0x020 +#define HIO_NULLSTATE 0x040 +#define HIO_VOLATILE 0x080 +#define HIO_BUFBYTES 0x100 -#endif /* _USBHID_H_ */ +#endif /* _USB2_HID_H_ */ ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rum.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumfw.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumreg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_rumvar.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uath.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uathreg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uathvar.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgt.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_upgtvar.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_ural.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uralreg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_uralvar.h#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtw.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwreg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_urtwvar.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zyd.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zydfw.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/usb/wlan/if_zydreg.h#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jun 5 20:26:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB5181065674; Fri, 5 Jun 2009 20:26: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 976621065672 for ; Fri, 5 Jun 2009 20:26:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81F908FC0C for ; Fri, 5 Jun 2009 20:26:43 +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 n55KQhQJ054983 for ; Fri, 5 Jun 2009 20:26:43 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 n55KQg9O054981 for perforce@freebsd.org; Fri, 5 Jun 2009 20:26:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 Jun 2009 20:26:42 GMT Message-Id: <200906052026.n55KQg9O054981@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 163604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 20:26:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163604 Change 163604 by rwatson@rwatson_freebsd_capabilities on 2009/06/05 20:26:42 Further integrate TrustedBSD capabilities branch along the 8-CURRENT head in an attempt to get a clean snapshot. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipfw2.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ral.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/rum.4#5 integrate .. //depot/projects/trustedbsd/capabilities/src/share/man/man4/ural.4#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_machdep.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/madt.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_file.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_misc.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_stats.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_fcntl.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/files#15 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/conf/options#11 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/CHANGES.txt#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acapps.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acconfig.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acdebug.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acdisasm.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acdispat.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acefi.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acenv.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acevents.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acexcep.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acfreebsd.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acgcc.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acglobal.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/achware.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acinterp.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/aclocal.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acmacros.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acnames.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acnamesp.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acobject.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acopcode.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acoutput.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acparser.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acpi.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acpiosxf.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acpixf.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acresrc.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acstruct.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/actables.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/actbl.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/actbl1.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/actbl2.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/actypes.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/acutils.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/aecommon.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/amlcode.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/amlresrc.h#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/changes.txt#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/adfile.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/adwalk.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmrestag.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtable.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslstartup.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dbcmds.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dbdisply.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dbexec.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dbfileio.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dbhistry.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dbinput.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dbstats.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dbutils.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dbxface.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbcmds.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbdisply.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbexec.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbfileio.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbhistry.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbinput.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbstats.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbutils.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/debugger/dbxface.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmbuffer.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmnames.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmobject.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmresrcl.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmresrcs.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmutils.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dswexec.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dswload.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dswscope.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dispatcher/dswstate.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dmbuffer.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dmnames.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dmobject.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dmopcode.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dmresrc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dmresrcl.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dmresrcs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dmutils.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dmwalk.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dsfield.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dsinit.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dsmethod.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dsmthdat.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dsobject.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dsopcode.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dsutils.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dswexec.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dswload.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dswscope.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/dswstate.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evevent.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evgpe.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evgpeblk.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evmisc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evregion.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evrgnini.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evsci.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evxface.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evxfevnt.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/events/evxfregn.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evevent.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evgpe.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evgpeblk.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evmisc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evregion.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evrgnini.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evsci.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evxface.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evxfevnt.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/evxfregn.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exconfig.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exconvrt.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/excreate.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exdump.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exconfig.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exconvrt.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/excreate.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exdump.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exfield.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exfldio.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exmisc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exmutex.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exnames.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exoparg1.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exoparg2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exoparg3.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exoparg6.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exprep.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exregion.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exresnte.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exresolv.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exresop.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exstore.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exstoren.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exstorob.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exsystem.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/executer/exutils.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exfield.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exfldio.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exmisc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exmutex.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exnames.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exoparg1.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exoparg2.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exoparg3.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exoparg6.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exprep.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exregion.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exresnte.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exresolv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exresop.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exstore.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exstoren.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exstorob.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exsystem.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/exutils.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwacpi.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwgpe.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwregs.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwsleep.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwtimer.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwvalid.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hardware/hwxface.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hwacpi.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hwgpe.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hwregs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hwsleep.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/hwtimer.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acapps.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/accommon.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acconfig.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdebug.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdisasm.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acdispat.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acevents.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acexcep.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acglobal.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/achware.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acinterp.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/aclocal.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acmacros.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acnames.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acnamesp.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acobject.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acopcode.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acoutput.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acparser.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpi.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpiosxf.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpixf.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acpredef.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acresrc.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acrestyp.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acstruct.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actables.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actbl.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actbl1.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/actypes.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/acutils.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/amlcode.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/amlresrc.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/platform/acenv.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/include/platform/acgcc.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsaccess.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsalloc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsdump.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nseval.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsinit.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsload.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsnames.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsobject.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsparse.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nspredef.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nssearch.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsutils.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nswalk.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsxfname.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsaccess.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsalloc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsdump.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsdumpdv.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nseval.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsinit.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsload.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsnames.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsobject.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsparse.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nssearch.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsutils.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nswalk.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsxfeval.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsxfname.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/nsxfobj.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psargs.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psloop.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psopcode.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psparse.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psscope.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/pstree.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psutils.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/pswalk.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/parser/psxface.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/psargs.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/psloop.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/psopcode.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/psparse.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/psscope.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/pstree.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/psutils.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/pswalk.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/psxface.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rsaddr.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rscalc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rscreate.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rsdump.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rsinfo.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rsio.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rsirq.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rslist.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rsmemory.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rsmisc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rsutils.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/resources/rsxface.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rsaddr.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rscalc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rscreate.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rsdump.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rsinfo.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rsio.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rsirq.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rslist.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rsmemory.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rsmisc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rsutils.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/rsxface.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tables/tbfadt.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tables/tbfind.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tables/tbinstal.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tables/tbutils.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tables/tbxface.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tables/tbxfroot.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tbfadt.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tbfind.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tbinstal.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tbutils.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tbxface.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tbxfroot.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utalloc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utcache.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utclib.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utcopy.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utdebug.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utdelete.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/uteval.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utglobal.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utalloc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utcache.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utcopy.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utdebug.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utdelete.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/uteval.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utglobal.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utinit.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utlock.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utmath.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utmisc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utmutex.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utobject.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utresrc.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utstate.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/uttrack.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utilities/utxface.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utinit.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utmath.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utmisc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utmutex.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utobject.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utresrc.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utstate.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/uttrack.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/dev/acpica/utxface.c#2 delete .. //depot/projects/trustedbsd/capabilities/src/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_asus.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_sony.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpi_support/acpi_toshiba.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/Osd/OsdSynch.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_cpu.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_thermal.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ipmi/ipmi_acpi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/kbdmux/kbdmux.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/pci/pci.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/devfs/devfs_vfsops.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/devfs/devfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfs/nfs_commonacl.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/acpica/madt.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/cpufreq/est.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/cpufreq/hwpstate.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/cpufreq/p4tcc.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/i386/sys_machdep.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/acpica/madt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ia64/ia64/nexus.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_main.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_acct.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_alq.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_environment.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#16 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exit.c#15 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_fork.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_jail.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_linker.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_priv.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_prot.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_shutdown.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_sysctl.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/link_elf.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/link_elf_obj.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_clist.c#5 delete .. //depot/projects/trustedbsd/capabilities/src/sys/kern/subr_trap.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_pipe.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_socket.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sysv_msg.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_shm.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_syscalls.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_acl.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_cache.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_default.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_extattr.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_lookup.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_vnops.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi_aiboost/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi_dock/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi_fujitsu/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi_ibm/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi_sony/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/cpufreq/Makefile#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/dummynet/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/modules/ipfw_nat/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/bpf.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_bridge.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_fddisubr.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_fwsubr.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_gif.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_iso88025subr.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_loop.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_stf.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net/if_tun.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netatalk/aarp.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/igmp.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/in_pcb.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_divert.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_dummynet.c#7 delete .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_dummynet.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fw2.c#10 delete .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fw_nat.c#7 delete .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_fw_pfil.c#7 delete .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_icmp.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_input.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_mroute.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_options.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_output.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ip_var.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_dummynet.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw2.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw_nat.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/ipfw/ip_fw_pfil.c#1 branch .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/raw_ip.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_input.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_subr.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_syncache.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/tcp_timewait.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet/udp_usrreq.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/frag6.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/in6_pcb.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/nd6.c#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_srvkrpc.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/rpc/svc_vc.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/clist.h#5 delete .. //depot/projects/trustedbsd/capabilities/src/sys/sys/param.h#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/sys/pcpu.h#6 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/ufs/ufs/ufs_vnops.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/swap_pager.c#7 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_glue.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_mmap.c#11 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/acpi/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/acpi/acpiconf/acpiconf.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/acpi/acpidb/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/acpi/acpidb/acpidb.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/acpi/acpidump/acpi.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/acpi/iasl/Makefile#2 integrate .. //depot/projects/trustedbsd/capabilities/src/usr.sbin/wpa/hostapd/driver_freebsd.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.195 2009/06/02 13:44:36 ed Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.196 2009/06/05 15:31:38 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090605: removal of clists +OLD_FILES+=usr/include/sys/clist.h # 20090602: removal of window(1) OLD_FILES+=usr/bin/window OLD_FILES+=usr/share/man/man1/window.1.gz ==== //depot/projects/trustedbsd/capabilities/src/sbin/ipfw/ipfw2.c#7 (text+ko) ==== @@ -17,7 +17,7 @@ * * NEW command line interface for IP firewall facility * - * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.147 2009/04/01 20:23:47 piso Exp $ + * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.148 2009/06/05 16:16:07 luigi Exp $ */ #include @@ -2859,7 +2859,7 @@ if (have_tag) errx(EX_USAGE, "tag and untag cannot be " "specified more than once"); - GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, i, + GET_UINT_ARG(tag, IPFW_ARG_MIN, IPFW_ARG_MAX, i, rule_action_params); have_tag = cmd; fill_cmd(cmd, O_TAG, (i == TOK_TAG) ? 0: F_NOT, tag); @@ -3336,7 +3336,7 @@ if (c->limit_mask == 0) errx(EX_USAGE, "limit: missing limit mask"); - GET_UINT_ARG(c->conn_limit, 1, IPFW_DEFAULT_RULE - 1, + GET_UINT_ARG(c->conn_limit, IPFW_ARG_MIN, IPFW_ARG_MAX, TOK_LIMIT, rule_options); ac--; av++; @@ -3464,7 +3464,7 @@ else { uint16_t tag; - GET_UINT_ARG(tag, 1, IPFW_DEFAULT_RULE - 1, + GET_UINT_ARG(tag, IPFW_ARG_MIN, IPFW_ARG_MAX, TOK_TAGGED, rule_options); fill_cmd(cmd, O_TAGGED, 0, tag); } ==== //depot/projects/trustedbsd/capabilities/src/share/man/man4/ral.4#3 (text+ko) ==== @@ -13,7 +13,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/ral.4,v 1.14 2008/04/20 20:35:45 sam Exp $ +.\" $FreeBSD: src/share/man/man4/ral.4,v 1.16 2009/06/05 17:44:43 sam Exp $ .\" .Dd April 13, 2008 .Os @@ -251,3 +251,7 @@ .Nm driver was written by .An Damien Bergamini Aq damien@FreeBSD.org . +.Sh BUGS +Host AP mode doesn't support client power save. +Clients using power save mode will experience +packet loss (disabling power saving on the client will fix this). ==== //depot/projects/trustedbsd/capabilities/src/share/man/man4/rum.4#5 (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/rum.4,v 1.6 2009/02/06 15:03:17 kevlo Exp $ +.\" $FreeBSD: src/share/man/man4/rum.4,v 1.8 2009/06/05 17:44:43 sam Exp $ .\" .Dd April 13, 2008 .Os @@ -181,3 +181,7 @@ .An Niall O'Higgins Aq niallo@openbsd.org and .An Damien Bergamini Aq damien@openbsd.org . +.Sh BUGS +Host AP mode doesn't support client power save. +Clients using power save mode will experience +packet loss (disabling power saving on the client will fix this). ==== //depot/projects/trustedbsd/capabilities/src/share/man/man4/ural.4#3 (text+ko) ==== @@ -13,7 +13,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/ural.4,v 1.16 2008/04/20 20:35:45 sam Exp $ +.\" $FreeBSD: src/share/man/man4/ural.4,v 1.18 2009/06/05 17:44:43 sam Exp $ .\" .Dd April 13, 2008 .Os @@ -160,3 +160,7 @@ .Nm driver was written by .An Damien Bergamini Aq damien.bergamini@free.fr +.Sh BUGS +Host AP mode doesn't support client power save. +Clients using power save mode will experience +packet loss (disabling power saving on the client will fix this). ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.14 2007/03/22 18:16:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.15 2009/06/05 18:44:36 jkim Exp $"); /* * 6.1 : Environmental support @@ -36,8 +36,8 @@ #include #include -#include -#include +#include +#include static u_long amd64_acpi_root; @@ -63,7 +63,7 @@ if (amd64_acpi_root == 0 && (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || - AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) && + AcpiFindRootPointer((ACPI_SIZE *)&ptr) == AE_OK) && ptr != 0) amd64_acpi_root = ptr; ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.20 2009/03/23 22:35:30 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.21 2009/06/05 18:44:36 jkim Exp $"); #include #include @@ -33,7 +33,8 @@ #include #include -#include +#include + #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/acpi_wakeup.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.25 2009/04/02 00:23:56 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.26 2009/06/05 18:44:36 jkim Exp $"); #include #include @@ -53,7 +53,8 @@ #include #endif -#include +#include + #include #include "acpi_wakecode.h" ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/acpica/madt.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.27 2009/03/05 16:03:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.28 2009/06/05 18:44:36 jkim Exp $"); #include #include @@ -48,8 +48,10 @@ #include #include -#include -#include +#include +#include +#include + #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.45 2009/04/07 17:58:15 jkim Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.46 2009/06/05 18:44:36 jkim Exp $ # LIB= i386 INTERNALLIB= @@ -48,7 +48,7 @@ CFLAGS+= -Dalloca=__builtin_alloca CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ - -I${.CURDIR}/../../../contrib/dev/acpica \ + -I${.CURDIR}/../../../contrib/dev/acpica/include \ -I${.CURDIR}/../../.. -I. # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ==== //depot/projects/trustedbsd/capabilities/src/sys/boot/i386/libi386/biosacpi.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.12 2007/03/22 18:16:39 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.13 2009/06/05 18:44:36 jkim Exp $"); #include #include @@ -33,7 +33,7 @@ #include #include "libi386.h" -#include "acfreebsd.h" +#include "platform/acfreebsd.h" #include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" ==== //depot/projects/trustedbsd/capabilities/src/sys/boot/ia64/ski/acpi_stub.c#2 (text+ko) ==== @@ -25,9 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/acpi_stub.c,v 1.8 2007/03/22 18:16:39 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/acpi_stub.c,v 1.9 2009/06/05 18:44:36 jkim Exp $"); -#include +#include #define APIC_IO_SAPIC 6 #define APIC_LOCAL_SAPIC 7 ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_file.c#7 (text+ko) ==== @@ -27,10 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.118 2009/03/26 17:14:22 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.119 2009/06/05 14:55:22 rwatson Exp $"); #include "opt_compat.h" -#include "opt_mac.h" #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_getcwd.c#4 (text+ko) ==== @@ -37,10 +37,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.32 2009/02/13 18:18:14 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.33 2009/06/05 14:55:22 rwatson Exp $"); #include "opt_compat.h" -#include "opt_mac.h" #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_misc.c#8 (text+ko) ==== @@ -28,10 +28,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.237 2009/05/29 21:27:12 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.238 2009/06/05 14:55:22 rwatson Exp $"); #include "opt_compat.h" -#include "opt_mac.h" #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/linux/linux_stats.c#8 (text+ko) ==== @@ -27,10 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.96 2009/05/07 18:36:47 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.97 2009/06/05 14:55:22 rwatson Exp $"); #include "opt_compat.h" -#include "opt_mac.h" #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_fcntl.c#6 (text+ko) ==== @@ -30,9 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.47 2009/05/29 05:58:46 delphij Exp $"); - -#include "opt_mac.h" +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.48 2009/06/05 14:55:22 rwatson Exp $"); #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_misc.c#5 (text+ko) ==== @@ -33,9 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.108 2009/05/29 05:58:46 delphij Exp $"); - -#include "opt_mac.h" +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.109 2009/06/05 14:55:22 rwatson Exp $"); #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/conf/files#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1411 2009/06/01 20:35:53 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1414 2009/06/05 19:22:47 luigi Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -122,131 +122,134 @@ contrib/altq/altq/altq_rmclass.c optional altq contrib/altq/altq/altq_subr.c optional altq \ compile-with "${NORMAL_C} -I$S/contrib/pf" -contrib/dev/acpica/dbcmds.c optional acpi acpi_debug -contrib/dev/acpica/dbdisply.c optional acpi acpi_debug -contrib/dev/acpica/dbexec.c optional acpi acpi_debug -contrib/dev/acpica/dbfileio.c optional acpi acpi_debug -contrib/dev/acpica/dbhistry.c optional acpi acpi_debug -contrib/dev/acpica/dbinput.c optional acpi acpi_debug -contrib/dev/acpica/dbstats.c optional acpi acpi_debug -contrib/dev/acpica/dbutils.c optional acpi acpi_debug -contrib/dev/acpica/dbxface.c optional acpi acpi_debug -contrib/dev/acpica/dmbuffer.c optional acpi acpi_debug -contrib/dev/acpica/dmnames.c optional acpi acpi_debug -contrib/dev/acpica/dmopcode.c optional acpi acpi_debug -contrib/dev/acpica/dmobject.c optional acpi acpi_debug -contrib/dev/acpica/dmresrc.c optional acpi acpi_debug -contrib/dev/acpica/dmresrcl.c optional acpi acpi_debug -contrib/dev/acpica/dmresrcs.c optional acpi acpi_debug -contrib/dev/acpica/dmutils.c optional acpi acpi_debug -contrib/dev/acpica/dmwalk.c optional acpi acpi_debug -contrib/dev/acpica/dsfield.c optional acpi -contrib/dev/acpica/dsinit.c optional acpi -contrib/dev/acpica/dsmethod.c optional acpi -contrib/dev/acpica/dsmthdat.c optional acpi -contrib/dev/acpica/dsobject.c optional acpi -contrib/dev/acpica/dsopcode.c optional acpi -contrib/dev/acpica/dsutils.c optional acpi -contrib/dev/acpica/dswexec.c optional acpi -contrib/dev/acpica/dswload.c optional acpi -contrib/dev/acpica/dswscope.c optional acpi -contrib/dev/acpica/dswstate.c optional acpi -contrib/dev/acpica/evevent.c optional acpi -contrib/dev/acpica/evgpe.c optional acpi -contrib/dev/acpica/evgpeblk.c optional acpi -contrib/dev/acpica/evmisc.c optional acpi -contrib/dev/acpica/evregion.c optional acpi -contrib/dev/acpica/evrgnini.c optional acpi >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 5 20:28:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29D2E1065673; Fri, 5 Jun 2009 20:28: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 DDC85106566B for ; Fri, 5 Jun 2009 20:28:45 +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 B28988FC14 for ; Fri, 5 Jun 2009 20:28:45 +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 n55KSjWe055114 for ; Fri, 5 Jun 2009 20:28:45 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55KSjNL055112 for perforce@freebsd.org; Fri, 5 Jun 2009 20:28:45 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 20:28:45 GMT Message-Id: <200906052028.n55KSjNL055112@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 163605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 20:28:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=163605 Change 163605 by zec@zec_tpx32 on 2009/06/05 20:27:52 Uncomment an assert that seems to be no longer triggering on each vimage -d invocation. Pointed out by: bz Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#73 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#73 (text+ko) ==== @@ -460,9 +460,7 @@ INIT_VNET_NET(curvnet); VNET_ASSERT(TAILQ_EMPTY(&V_ifnet)); -#ifdef NOTYET VNET_ASSERT(TAILQ_EMPTY(&V_ifg_head)); -#endif VNET_ASSERT(SLIST_EMPTY(&V_ifklist.kl_list)); free((caddr_t)V_ifindex_table, M_IFNET); From owner-p4-projects@FreeBSD.ORG Fri Jun 5 20:34:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBCFA1065678; Fri, 5 Jun 2009 20:34: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 85D4E1065673 for ; Fri, 5 Jun 2009 20:34:52 +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 726188FC1D for ; Fri, 5 Jun 2009 20:34:52 +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 n55KYqG2055590 for ; Fri, 5 Jun 2009 20:34:52 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55KYp3H055588 for perforce@freebsd.org; Fri, 5 Jun 2009 20:34:51 GMT (envelope-from zec@fer.hr) Date: Fri, 5 Jun 2009 20:34:51 GMT Message-Id: <200906052034.n55KYp3H055588@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 163606 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 20:34:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=163606 Change 163606 by zec@zec_amdx4 on 2009/06/05 20:34:38 IFC @ 163603 -> merge more of recent ipfw et al changes to simplify compile-testing on a bunch of machines... Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosacpi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/ia64/ski/acpi_stub.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_getcwd.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_stats.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_fcntl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_misc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#40 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#30 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/CHANGES.txt#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acapps.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acconfig.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acdebug.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acdisasm.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acdispat.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acefi.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acenv.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acevents.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acexcep.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acfreebsd.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acgcc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acglobal.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/achware.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acinterp.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/aclocal.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acmacros.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acnames.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acnamesp.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acobject.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acopcode.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acoutput.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acparser.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acpi.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acpiosxf.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acpixf.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acresrc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acstruct.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/actables.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/actbl.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/actbl1.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/actbl2.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/actypes.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/acutils.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/aecommon.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/amlcode.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/amlresrc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/changes.txt#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/adfile.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/adisasm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/adwalk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmrestag.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmtable.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmtbdump.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/dmtbinfo.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/common/getopt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslcodegen.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asldefine.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslfiles.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslfold.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslglobal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asllength.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asllisting.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslload.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslmain.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslmap.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslopt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslresource.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslrestype2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslstartup.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslstubs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asltree.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslutils.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dbcmds.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dbdisply.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dbexec.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dbfileio.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dbhistry.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dbinput.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dbstats.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dbutils.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dbxface.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbcmds.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbdisply.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbexec.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbfileio.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbhistry.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbinput.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbstats.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbutils.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/debugger/dbxface.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/disassembler/dmbuffer.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/disassembler/dmnames.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/disassembler/dmobject.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/disassembler/dmopcode.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/disassembler/dmresrc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/disassembler/dmresrcl.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/disassembler/dmresrcs.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/disassembler/dmutils.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsinit.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsopcode.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dsutils.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dswexec.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dswload.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dswscope.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dispatcher/dswstate.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dmbuffer.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dmnames.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dmobject.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dmopcode.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dmresrc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dmresrcl.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dmresrcs.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dmutils.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dmwalk.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dsfield.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dsinit.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dsmethod.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dsmthdat.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dsobject.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dsopcode.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dsutils.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dswexec.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dswload.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dswscope.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/dswstate.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evevent.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evgpe.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evgpeblk.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evmisc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evregion.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evrgnini.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evsci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evxface.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evxfevnt.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/events/evxfregn.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evevent.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evgpe.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evgpeblk.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evmisc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evregion.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evrgnini.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evsci.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evxface.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evxfevnt.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/evxfregn.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exconfig.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exconvrt.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/excreate.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exdump.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exconfig.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exconvrt.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/excreate.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exdump.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exfield.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exfldio.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exmisc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exmutex.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exnames.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exoparg1.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exoparg2.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exoparg3.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exoparg6.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exprep.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exregion.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exresnte.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exresolv.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exresop.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exstore.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exstoren.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exstorob.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exsystem.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/executer/exutils.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exfield.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exfldio.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exmisc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exmutex.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exnames.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exoparg1.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exoparg2.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exoparg3.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exoparg6.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exprep.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exregion.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exresnte.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exresolv.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exresop.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exstore.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exstoren.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exstorob.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exsystem.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/exutils.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwacpi.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwgpe.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwregs.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwsleep.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwtimer.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwvalid.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hardware/hwxface.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hwacpi.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hwgpe.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hwregs.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hwsleep.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/hwtimer.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acapps.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/accommon.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acconfig.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acdebug.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acdisasm.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acdispat.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acevents.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acexcep.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acglobal.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/achware.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acinterp.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/aclocal.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acmacros.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acnames.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acnamesp.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acobject.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acopcode.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acoutput.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acparser.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acpi.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acpiosxf.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acpixf.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acpredef.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acresrc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acrestyp.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acstruct.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/actables.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/actbl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/actbl1.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/actypes.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/acutils.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/amlcode.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/amlresrc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/platform/acenv.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/include/platform/acgcc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsaccess.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsalloc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsdump.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsdumpdv.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nseval.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsinit.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsload.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsnames.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsobject.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsparse.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nspredef.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nssearch.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsutils.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nswalk.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsxfname.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsaccess.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsalloc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsdump.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsdumpdv.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nseval.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsinit.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsload.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsnames.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsobject.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsparse.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nssearch.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsutils.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nswalk.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsxfeval.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsxfname.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/nsxfobj.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/osunixxf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/psargs.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/psloop.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/psopcode.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/psparse.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/psscope.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/pstree.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/psutils.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/pswalk.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/parser/psxface.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/psargs.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/psloop.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/psopcode.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/psparse.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/psscope.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/pstree.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/psutils.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/pswalk.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/psxface.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rsaddr.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rscalc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rscreate.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rsdump.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rsinfo.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rsio.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rsirq.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rslist.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rsmemory.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rsmisc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rsutils.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/resources/rsxface.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rsaddr.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rscalc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rscreate.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rsdump.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rsinfo.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rsio.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rsirq.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rslist.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rsmemory.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rsmisc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rsutils.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/rsxface.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tables/tbfadt.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tables/tbfind.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tables/tbinstal.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tables/tbutils.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tables/tbxface.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tables/tbxfroot.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tbfadt.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tbfind.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tbinstal.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tbutils.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tbxface.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tbxfroot.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utalloc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utcache.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utclib.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utcopy.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utdebug.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utdelete.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/uteval.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utglobal.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utalloc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utcache.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utcopy.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utdebug.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utdelete.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/uteval.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utglobal.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utinit.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utlock.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utmath.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utmisc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utmutex.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utobject.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utresrc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utstate.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/uttrack.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utilities/utxface.c#1 branch .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utinit.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utmath.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utmisc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utmutex.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utobject.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utresrc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utstate.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/uttrack.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/utxface.c#2 delete .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_aiboost.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_asus.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_toshiba.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdMemory.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdStream.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdTable.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_acad.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_button.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_cmbat.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_cpu.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_dock.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_ec.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_isab.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_lid.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_package.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pci_link.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_perf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_thermal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_throttle.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_video.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fdc/fdc_acpi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmi_acpi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/kbdmux/kbdmux.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_devs.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_subr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/est.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/hwpstate.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/p4tcc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/acpica/madt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/init_main.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_acct.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_alq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_environment.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_ktrace.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_priv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/link_elf.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/link_elf_obj.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_clist.c#5 delete .. //depot/projects/vimage-commit2/src/sys/kern/subr_trap.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_socket.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_msg.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_sem.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_mbuf2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_sem.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_shm.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_extattr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_aiboost/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_asus/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_dock/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_fujitsu/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_ibm/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_sony/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_toshiba/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/cpufreq/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/dummynet/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/fdc/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/ipfw_nat/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#74 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fddisubr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fwsubr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_iso88025subr.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/aarp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_input.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#41 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#42 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#12 delete .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#46 delete .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_nat.c#15 delete .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#18 delete .. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#42 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_dummynet.c#1 branch .. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw2.c#1 branch .. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw_nat.c#1 branch .. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw_pfil.c#1 branch .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#53 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#41 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#36 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/rpc/svc_vc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_syscalls.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/clist.h#4 delete .. //depot/projects/vimage-commit2/src/sys/sys/param.h#42 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vnops.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/vm/swap_pager.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_glue.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#10 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/OsdEnvironment.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.14 2007/03/22 18:16:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.15 2009/06/05 18:44:36 jkim Exp $"); /* * 6.1 : Environmental support @@ -36,8 +36,8 @@ #include #include -#include -#include +#include +#include static u_long amd64_acpi_root; @@ -63,7 +63,7 @@ if (amd64_acpi_root == 0 && (resource_long_value("acpi", 0, "rsdp", (long *)&ptr) == 0 || - AcpiFindRootPointer((ACPI_NATIVE_UINT *)&ptr) == AE_OK) && + AcpiFindRootPointer((ACPI_SIZE *)&ptr) == AE_OK) && ptr != 0) amd64_acpi_root = ptr; ==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.20 2009/03/23 22:35:30 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.21 2009/06/05 18:44:36 jkim Exp $"); #include #include @@ -33,7 +33,8 @@ #include #include -#include +#include + #include #include ==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/acpi_wakeup.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.25 2009/04/02 00:23:56 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.26 2009/06/05 18:44:36 jkim Exp $"); #include #include @@ -53,7 +53,8 @@ #include #endif -#include +#include + #include #include "acpi_wakecode.h" ==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.27 2009/03/05 16:03:44 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.28 2009/06/05 18:44:36 jkim Exp $"); #include #include @@ -48,8 +48,10 @@ #include #include -#include -#include +#include +#include +#include + #include #include ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/support.S#3 (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/amd64/support.S,v 1.129 2008/08/08 16:26:53 stas Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.130 2009/06/05 20:23:29 kib Exp $ */ #include "opt_ddb.h" @@ -38,6 +38,7 @@ #include "assym.s" + .data ALIGN_DATA .globl intrcnt, eintrcnt intrcnt: ==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.45 2009/04/07 17:58:15 jkim Exp $ +# $FreeBSD: src/sys/boot/i386/libi386/Makefile,v 1.46 2009/06/05 18:44:36 jkim Exp $ # LIB= i386 INTERNALLIB= @@ -48,7 +48,7 @@ CFLAGS+= -Dalloca=__builtin_alloca CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ - -I${.CURDIR}/../../../contrib/dev/acpica \ + -I${.CURDIR}/../../../contrib/dev/acpica/include \ -I${.CURDIR}/../../.. -I. # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ==== //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosacpi.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.12 2007/03/22 18:16:39 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.13 2009/06/05 18:44:36 jkim Exp $"); #include #include @@ -33,7 +33,7 @@ #include #include "libi386.h" -#include "acfreebsd.h" +#include "platform/acfreebsd.h" #include "acconfig.h" #define ACPI_SYSTEM_XFACE #include "actypes.h" ==== //depot/projects/vimage-commit2/src/sys/boot/ia64/ski/acpi_stub.c#2 (text+ko) ==== @@ -25,9 +25,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/acpi_stub.c,v 1.8 2007/03/22 18:16:39 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/ia64/ski/acpi_stub.c,v 1.9 2009/06/05 18:44:36 jkim Exp $"); -#include +#include #define APIC_IO_SAPIC 6 #define APIC_LOCAL_SAPIC 7 ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_file.c#5 (text+ko) ==== @@ -27,10 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.118 2009/03/26 17:14:22 ambrisko Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.119 2009/06/05 14:55:22 rwatson Exp $"); #include "opt_compat.h" -#include "opt_mac.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_getcwd.c#5 (text+ko) ==== @@ -37,10 +37,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.32 2009/02/13 18:18:14 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_getcwd.c,v 1.33 2009/06/05 14:55:22 rwatson Exp $"); #include "opt_compat.h" -#include "opt_mac.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#20 (text+ko) ==== @@ -28,10 +28,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.237 2009/05/29 21:27:12 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.238 2009/06/05 14:55:22 rwatson Exp $"); #include "opt_compat.h" -#include "opt_mac.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_stats.c#5 (text+ko) ==== @@ -27,10 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.96 2009/05/07 18:36:47 jamie Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.97 2009/06/05 14:55:22 rwatson Exp $"); #include "opt_compat.h" -#include "opt_mac.h" #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_fcntl.c#4 (text+ko) ==== @@ -30,9 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.47 2009/05/29 05:58:46 delphij Exp $"); - -#include "opt_mac.h" +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.48 2009/06/05 14:55:22 rwatson Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_misc.c#5 (text+ko) ==== @@ -33,9 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.108 2009/05/29 05:58:46 delphij Exp $"); - -#include "opt_mac.h" +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.109 2009/06/05 14:55:22 rwatson Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/conf/files#40 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1411 2009/06/01 20:35:53 jhb Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1414 2009/06/05 19:22:47 luigi Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -122,131 +122,134 @@ contrib/altq/altq/altq_rmclass.c optional altq contrib/altq/altq/altq_subr.c optional altq \ compile-with "${NORMAL_C} -I$S/contrib/pf" -contrib/dev/acpica/dbcmds.c optional acpi acpi_debug -contrib/dev/acpica/dbdisply.c optional acpi acpi_debug -contrib/dev/acpica/dbexec.c optional acpi acpi_debug -contrib/dev/acpica/dbfileio.c optional acpi acpi_debug -contrib/dev/acpica/dbhistry.c optional acpi acpi_debug -contrib/dev/acpica/dbinput.c optional acpi acpi_debug -contrib/dev/acpica/dbstats.c optional acpi acpi_debug -contrib/dev/acpica/dbutils.c optional acpi acpi_debug -contrib/dev/acpica/dbxface.c optional acpi acpi_debug -contrib/dev/acpica/dmbuffer.c optional acpi acpi_debug -contrib/dev/acpica/dmnames.c optional acpi acpi_debug -contrib/dev/acpica/dmopcode.c optional acpi acpi_debug -contrib/dev/acpica/dmobject.c optional acpi acpi_debug -contrib/dev/acpica/dmresrc.c optional acpi acpi_debug -contrib/dev/acpica/dmresrcl.c optional acpi acpi_debug -contrib/dev/acpica/dmresrcs.c optional acpi acpi_debug -contrib/dev/acpica/dmutils.c optional acpi acpi_debug -contrib/dev/acpica/dmwalk.c optional acpi acpi_debug -contrib/dev/acpica/dsfield.c optional acpi -contrib/dev/acpica/dsinit.c optional acpi -contrib/dev/acpica/dsmethod.c optional acpi -contrib/dev/acpica/dsmthdat.c optional acpi -contrib/dev/acpica/dsobject.c optional acpi -contrib/dev/acpica/dsopcode.c optional acpi -contrib/dev/acpica/dsutils.c optional acpi -contrib/dev/acpica/dswexec.c optional acpi -contrib/dev/acpica/dswload.c optional acpi -contrib/dev/acpica/dswscope.c optional acpi -contrib/dev/acpica/dswstate.c optional acpi -contrib/dev/acpica/evevent.c optional acpi -contrib/dev/acpica/evgpe.c optional acpi -contrib/dev/acpica/evgpeblk.c optional acpi -contrib/dev/acpica/evmisc.c optional acpi -contrib/dev/acpica/evregion.c optional acpi -contrib/dev/acpica/evrgnini.c optional acpi -contrib/dev/acpica/evsci.c optional acpi -contrib/dev/acpica/evxface.c optional acpi -contrib/dev/acpica/evxfevnt.c optional acpi -contrib/dev/acpica/evxfregn.c optional acpi -contrib/dev/acpica/exconfig.c optional acpi -contrib/dev/acpica/exconvrt.c optional acpi -contrib/dev/acpica/excreate.c optional acpi -contrib/dev/acpica/exdump.c optional acpi -contrib/dev/acpica/exfield.c optional acpi -contrib/dev/acpica/exfldio.c optional acpi -contrib/dev/acpica/exmisc.c optional acpi -contrib/dev/acpica/exmutex.c optional acpi -contrib/dev/acpica/exnames.c optional acpi -contrib/dev/acpica/exoparg1.c optional acpi -contrib/dev/acpica/exoparg2.c optional acpi -contrib/dev/acpica/exoparg3.c optional acpi -contrib/dev/acpica/exoparg6.c optional acpi -contrib/dev/acpica/exprep.c optional acpi -contrib/dev/acpica/exregion.c optional acpi -contrib/dev/acpica/exresnte.c optional acpi -contrib/dev/acpica/exresolv.c optional acpi -contrib/dev/acpica/exresop.c optional acpi -contrib/dev/acpica/exstore.c optional acpi -contrib/dev/acpica/exstoren.c optional acpi -contrib/dev/acpica/exstorob.c optional acpi -contrib/dev/acpica/exsystem.c optional acpi -contrib/dev/acpica/exutils.c optional acpi -contrib/dev/acpica/hwacpi.c optional acpi -contrib/dev/acpica/hwgpe.c optional acpi -contrib/dev/acpica/hwregs.c optional acpi -contrib/dev/acpica/hwsleep.c optional acpi -contrib/dev/acpica/hwtimer.c optional acpi -contrib/dev/acpica/nsaccess.c optional acpi -contrib/dev/acpica/nsalloc.c optional acpi -contrib/dev/acpica/nsdump.c optional acpi -contrib/dev/acpica/nseval.c optional acpi -contrib/dev/acpica/nsinit.c optional acpi -contrib/dev/acpica/nsload.c optional acpi -contrib/dev/acpica/nsnames.c optional acpi -contrib/dev/acpica/nsobject.c optional acpi -contrib/dev/acpica/nsparse.c optional acpi -contrib/dev/acpica/nssearch.c optional acpi -contrib/dev/acpica/nsutils.c optional acpi -contrib/dev/acpica/nswalk.c optional acpi -contrib/dev/acpica/nsxfeval.c optional acpi -contrib/dev/acpica/nsxfname.c optional acpi -contrib/dev/acpica/nsxfobj.c optional acpi -contrib/dev/acpica/psargs.c optional acpi -contrib/dev/acpica/psloop.c optional acpi -contrib/dev/acpica/psopcode.c optional acpi -contrib/dev/acpica/psparse.c optional acpi -contrib/dev/acpica/psscope.c optional acpi -contrib/dev/acpica/pstree.c optional acpi -contrib/dev/acpica/psutils.c optional acpi -contrib/dev/acpica/pswalk.c optional acpi -contrib/dev/acpica/psxface.c optional acpi -contrib/dev/acpica/rsaddr.c optional acpi -contrib/dev/acpica/rscalc.c optional acpi -contrib/dev/acpica/rscreate.c optional acpi -contrib/dev/acpica/rsdump.c optional acpi -contrib/dev/acpica/rsinfo.c optional acpi -contrib/dev/acpica/rsio.c optional acpi -contrib/dev/acpica/rsirq.c optional acpi -contrib/dev/acpica/rslist.c optional acpi -contrib/dev/acpica/rsmemory.c optional acpi -contrib/dev/acpica/rsmisc.c optional acpi -contrib/dev/acpica/rsutils.c optional acpi -contrib/dev/acpica/rsxface.c optional acpi -contrib/dev/acpica/tbfadt.c optional acpi -contrib/dev/acpica/tbfind.c optional acpi -contrib/dev/acpica/tbinstal.c optional acpi -contrib/dev/acpica/tbutils.c optional acpi -contrib/dev/acpica/tbxface.c optional acpi -contrib/dev/acpica/tbxfroot.c optional acpi -contrib/dev/acpica/utalloc.c optional acpi -contrib/dev/acpica/utcache.c optional acpi -contrib/dev/acpica/utclib.c optional acpi -contrib/dev/acpica/utcopy.c optional acpi -contrib/dev/acpica/utdebug.c optional acpi -contrib/dev/acpica/utdelete.c optional acpi -contrib/dev/acpica/uteval.c optional acpi -contrib/dev/acpica/utglobal.c optional acpi -contrib/dev/acpica/utinit.c optional acpi -contrib/dev/acpica/utmath.c optional acpi -contrib/dev/acpica/utmisc.c optional acpi -contrib/dev/acpica/utmutex.c optional acpi -contrib/dev/acpica/utobject.c optional acpi -contrib/dev/acpica/utresrc.c optional acpi -contrib/dev/acpica/utstate.c optional acpi -contrib/dev/acpica/utxface.c optional acpi +contrib/dev/acpica/debugger/dbcmds.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbdisply.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbexec.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbfileio.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbhistry.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbinput.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbstats.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbutils.c optional acpi acpi_debug +contrib/dev/acpica/debugger/dbxface.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmbuffer.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmnames.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmopcode.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmobject.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmresrc.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmresrcl.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmresrcs.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmutils.c optional acpi acpi_debug +contrib/dev/acpica/disassembler/dmwalk.c optional acpi acpi_debug +contrib/dev/acpica/dispatcher/dsfield.c optional acpi +contrib/dev/acpica/dispatcher/dsinit.c optional acpi +contrib/dev/acpica/dispatcher/dsmethod.c optional acpi +contrib/dev/acpica/dispatcher/dsmthdat.c optional acpi +contrib/dev/acpica/dispatcher/dsobject.c optional acpi +contrib/dev/acpica/dispatcher/dsopcode.c optional acpi +contrib/dev/acpica/dispatcher/dsutils.c optional acpi +contrib/dev/acpica/dispatcher/dswexec.c optional acpi >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 5 20:58:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCE111065678; Fri, 5 Jun 2009 20:58:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9B2EA106566C for ; Fri, 5 Jun 2009 20:58:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 85AFA8FC19 for ; Fri, 5 Jun 2009 20:58:16 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n55KwG0n067766 for ; Fri, 5 Jun 2009 20:58:16 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 n55KwGHr067764 for perforce@freebsd.org; Fri, 5 Jun 2009 20:58:16 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Fri, 5 Jun 2009 20:58:16 GMT Message-Id: <200906052058.n55KwGHr067764@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 163608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 20:58:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=163608 Change 163608 by rwatson@rwatson_freebsd_capabilities on 2009/06/05 20:57:38 Forced integrate over more merge issues in USB-related code. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/chip.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/clone.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/clone.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/driver.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ad1816.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/gusc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/mss.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sbc.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sndbuf_dma.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbus.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbusreg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/i2s.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/snapper.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/tumbler.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midi.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midiq.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu401.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu401.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpufoi_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/sequencer.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/sequencer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/synth_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/als4000.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/atiixp.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/atiixp.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/aureal.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cmi.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cmireg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cs4281.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csareg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csavar.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1-fw.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx-midi.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24ht.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hda_reg.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_reg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ich.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro_reg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic-coeff.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/spicds.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/spicds.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via8233.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/vibes.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/vibes.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/dsp.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_fmt.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_volume.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer_if.m#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sound.c#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/apcdmareg.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/cs4231.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/cs4231.h#3 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/unit.c#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/unit.h#2 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.c#5 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.h#4 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio_pcm.c#4 branch .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudioreg.h#4 integrate .. //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/version.h#2 integrate Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/chip.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/clone.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/clone.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/driver.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ad1816.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ad1816.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/ess.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/gusc.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/mss.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/mss.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb16.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sb8.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sbc.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/isa/sndbuf_dma.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/aoa.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbus.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/davbusreg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/i2s.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/snapper.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/macio/tumbler.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midi.c#3 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midi.h#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/midiq.h#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu401.c#3 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu401.h#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpu_if.m#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/mpufoi_if.m#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/sequencer.c#5 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/sequencer.h#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/midi/synth_if.m#2 (text) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/als4000.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/als4000.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/atiixp.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/atiixp.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/aureal.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/aureal.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cmi.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cmireg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cs4281.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/cs4281.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csa.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csapcm.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csareg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/csavar.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1-fw.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ds1.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10k1.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx-midi.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx-pcm.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/emu10kx.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24ht.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/envy24ht.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/es137x.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/fm801.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hda_reg.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.c#9 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_private.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/hda/hdac_reg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ich.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/ich.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro3.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/maestro_reg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic-coeff.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/neomagic.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/solo.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/spicds.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/spicds.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/t4dwave.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via8233.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via8233.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via82c686.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/via82c686.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/vibes.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pci/vibes.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_if.m#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_patch.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/ac97_patch.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/buffer.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/buffer.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/channel_if.m#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/dsp.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/dsp.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/fake.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_fmt.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_if.m#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_rate.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/feeder_volume.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer.c#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/mixer_if.m#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sndstat.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sound.c#4 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/sound.h#5 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/vchan.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/pcm/vchan.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/apcdmareg.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/cs4231.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/sbus/cs4231.h#3 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/unit.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/unit.h#2 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudio.c#5 (text+ko) ==== ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/sound/usb/uaudioreg.h#4 (text+ko) ==== @@ -31,30 +31,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define UAUDIO_VERSION 0x100 +#define UAUDIO_VERSION 0x100 -#define UDESC_CS_CONFIG 0x22 -#define UDESC_CS_STRING 0x23 -#define UDESC_CS_INTERFACE 0x24 -#define UDESC_CS_ENDPOINT 0x25 +#define UDESC_CS_CONFIG 0x22 +#define UDESC_CS_STRING 0x23 +#define UDESC_CS_INTERFACE 0x24 +#define UDESC_CS_ENDPOINT 0x25 -#define UDESCSUB_AC_HEADER 1 -#define UDESCSUB_AC_INPUT 2 -#define UDESCSUB_AC_OUTPUT 3 -#define UDESCSUB_AC_MIXER 4 -#define UDESCSUB_AC_SELECTOR 5 -#define UDESCSUB_AC_FEATURE 6 -#define UDESCSUB_AC_PROCESSING 7 -#define UDESCSUB_AC_EXTENSION 8 +#define UDESCSUB_AC_HEADER 1 +#define UDESCSUB_AC_INPUT 2 +#define UDESCSUB_AC_OUTPUT 3 +#define UDESCSUB_AC_MIXER 4 +#define UDESCSUB_AC_SELECTOR 5 +#define UDESCSUB_AC_FEATURE 6 +#define UDESCSUB_AC_PROCESSING 7 +#define UDESCSUB_AC_EXTENSION 8 /* The first fields are identical to struct usb_endpoint_descriptor */ typedef struct { - uByte bLength; - uByte bDescriptorType; - uByte bEndpointAddress; - uByte bmAttributes; - uWord wMaxPacketSize; - uByte bInterval; + uByte bLength; + uByte bDescriptorType; + uByte bEndpointAddress; + uByte bmAttributes; + uWord wMaxPacketSize; + uByte bInterval; /* * The following two entries are only used by the Audio Class. * And according to the specs the Audio Class is the only one @@ -62,60 +62,62 @@ * Who knows what goes on in the minds of the people in the USB * standardization? :-( */ - uByte bRefresh; - uByte bSynchAddress; -} UPACKED usb_endpoint_descriptor_audio_t; + uByte bRefresh; + uByte bSynchAddress; +} __packed usb2_endpoint_descriptor_audio_t; -struct usb_audio_control_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uWord bcdADC; - uWord wTotalLength; - uByte bInCollection; - uByte baInterfaceNr[1]; -} UPACKED; +struct usb2_audio_control_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uWord bcdADC; + uWord wTotalLength; + uByte bInCollection; + uByte baInterfaceNr[1]; +} __packed; -struct usb_audio_streaming_interface_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalLink; - uByte bDelay; - uWord wFormatTag; -} UPACKED; +struct usb2_audio_streaming_interface_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalLink; + uByte bDelay; + uWord wFormatTag; +} __packed; -struct usb_audio_streaming_endpoint_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bmAttributes; -#define UA_SED_FREQ_CONTROL 0x01 -#define UA_SED_PITCH_CONTROL 0x02 -#define UA_SED_MAXPACKETSONLY 0x80 - uByte bLockDelayUnits; - uWord wLockDelay; -} UPACKED; +struct usb2_audio_streaming_endpoint_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bmAttributes; +#define UA_SED_FREQ_CONTROL 0x01 +#define UA_SED_PITCH_CONTROL 0x02 +#define UA_SED_MAXPACKETSONLY 0x80 + uByte bLockDelayUnits; + uWord wLockDelay; +} __packed; -struct usb_audio_streaming_type1_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bFormatType; - uByte bNrChannels; - uByte bSubFrameSize; - uByte bBitResolution; - uByte bSamFreqType; -#define UA_SAMP_CONTNUOUS 0 - uByte tSamFreq[3*2]; /* room for low and high */ -#define UA_GETSAMP(p, n) ((p)->tSamFreq[(n)*3+0] | ((p)->tSamFreq[(n)*3+1] << 8) | ((p)->tSamFreq[(n)*3+2] << 16)) -#define UA_SAMP_LO(p) UA_GETSAMP(p, 0) -#define UA_SAMP_HI(p) UA_GETSAMP(p, 1) -} UPACKED; +struct usb2_audio_streaming_type1_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bFormatType; + uByte bNrChannels; + uByte bSubFrameSize; + uByte bBitResolution; + uByte bSamFreqType; +#define UA_SAMP_CONTNUOUS 0 + uByte tSamFreq[0]; +#define UA_GETSAMP(p, n) (((p)->tSamFreq[((n)*3)+0]) | \ + ((p)->tSamFreq[((n)*3)+1] << 8) | \ + ((p)->tSamFreq[((n)*3)+2] << 16)) +#define UA_SAMP_LO(p) UA_GETSAMP(p, 0) +#define UA_SAMP_HI(p) UA_GETSAMP(p, 1) +} __packed; -struct usb_audio_cluster { - uByte bNrChannels; - uWord wChannelConfig; +struct usb2_audio_cluster { + uByte bNrChannels; + uWord wChannelConfig; #define UA_CHANNEL_LEFT 0x0001 #define UA_CHANNEL_RIGHT 0x0002 #define UA_CHANNEL_CENTER 0x0004 @@ -128,270 +130,270 @@ #define UA_CHANNEL_L_SIDE 0x0200 #define UA_CHANNEL_R_SIDE 0x0400 #define UA_CHANNEL_TOP 0x0800 - uByte iChannelNames; -} UPACKED; + uByte iChannelNames; +} __packed; /* Shared by all units and terminals */ -struct usb_audio_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; +struct usb2_audio_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; }; /* UDESCSUB_AC_INPUT */ -struct usb_audio_input_terminal { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalId; - uWord wTerminalType; - uByte bAssocTerminal; - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte iTerminal; -} UPACKED; +struct usb2_audio_input_terminal { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalId; + uWord wTerminalType; + uByte bAssocTerminal; + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; +/* uByte iTerminal; */ +} __packed; /* UDESCSUB_AC_OUTPUT */ -struct usb_audio_output_terminal { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalId; - uWord wTerminalType; - uByte bAssocTerminal; - uByte bSourceId; - uByte iTerminal; -} UPACKED; +struct usb2_audio_output_terminal { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalId; + uWord wTerminalType; + uByte bAssocTerminal; + uByte bSourceId; + uByte iTerminal; +} __packed; /* UDESCSUB_AC_MIXER */ -struct usb_audio_mixer_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_mixer_unit_1 */ -} UPACKED; -struct usb_audio_mixer_unit_1 { - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bmControls[255]; /* [bNrChannels] */ - /*uByte iMixer;*/ -} UPACKED; +struct usb2_audio_mixer_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_mixer_unit_1 */ +} __packed; +struct usb2_audio_mixer_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bmControls[0]; /* [see source code] */ + /* uByte iMixer; */ +} __packed; /* UDESCSUB_AC_SELECTOR */ -struct usb_audio_selector_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ +struct usb2_audio_selector_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ /* uByte iSelector; */ -} UPACKED; +} __packed; /* UDESCSUB_AC_FEATURE */ -struct usb_audio_feature_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bSourceId; - uByte bControlSize; - uByte bmaControls[255]; /* size for more than enough */ +struct usb2_audio_feature_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bSourceId; + uByte bControlSize; + uByte bmaControls[0]; /* [bControlSize * x] */ /* uByte iFeature; */ -} UPACKED; +} __packed; /* UDESCSUB_AC_PROCESSING */ -struct usb_audio_processing_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uWord wProcessType; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_processing_unit_1 */ -} UPACKED; -struct usb_audio_processing_unit_1{ - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bControlSize; - uByte bmControls[255]; /* [bControlSize] */ -#define UA_PROC_ENABLE_MASK 1 -} UPACKED; +struct usb2_audio_processing_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uWord wProcessType; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_processing_unit_1 */ +} __packed; +struct usb2_audio_processing_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bControlSize; + uByte bmControls[0]; /* [bControlSize] */ +#define UA_PROC_ENABLE_MASK 1 +} __packed; -struct usb_audio_processing_unit_updown { - uByte iProcessing; - uByte bNrModes; - uWord waModes[255]; /* [bNrModes] */ -} UPACKED; +struct usb2_audio_processing_unit_updown { + uByte iProcessing; + uByte bNrModes; + uWord waModes[0]; /* [bNrModes] */ +} __packed; /* UDESCSUB_AC_EXTENSION */ -struct usb_audio_extension_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uWord wExtensionCode; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_extension_unit_1 */ -} UPACKED; -struct usb_audio_extension_unit_1 { - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bControlSize; - uByte bmControls[255]; /* [bControlSize] */ -#define UA_EXT_ENABLE_MASK 1 -#define UA_EXT_ENABLE 1 - /*uByte iExtension;*/ -} UPACKED; +struct usb2_audio_extension_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uWord wExtensionCode; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_extension_unit_1 */ +} __packed; +struct usb2_audio_extension_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bControlSize; + uByte bmControls[0]; /* [bControlSize] */ +#define UA_EXT_ENABLE_MASK 1 +#define UA_EXT_ENABLE 1 + /* uByte iExtension; */ +} __packed; /* USB terminal types */ -#define UAT_UNDEFINED 0x0100 -#define UAT_STREAM 0x0101 -#define UAT_VENDOR 0x01ff +#define UAT_UNDEFINED 0x0100 +#define UAT_STREAM 0x0101 +#define UAT_VENDOR 0x01ff /* input terminal types */ -#define UATI_UNDEFINED 0x0200 -#define UATI_MICROPHONE 0x0201 -#define UATI_DESKMICROPHONE 0x0202 -#define UATI_PERSONALMICROPHONE 0x0203 -#define UATI_OMNIMICROPHONE 0x0204 -#define UATI_MICROPHONEARRAY 0x0205 -#define UATI_PROCMICROPHONEARR 0x0206 +#define UATI_UNDEFINED 0x0200 +#define UATI_MICROPHONE 0x0201 +#define UATI_DESKMICROPHONE 0x0202 +#define UATI_PERSONALMICROPHONE 0x0203 +#define UATI_OMNIMICROPHONE 0x0204 +#define UATI_MICROPHONEARRAY 0x0205 +#define UATI_PROCMICROPHONEARR 0x0206 /* output terminal types */ -#define UATO_UNDEFINED 0x0300 -#define UATO_SPEAKER 0x0301 -#define UATO_HEADPHONES 0x0302 -#define UATO_DISPLAYAUDIO 0x0303 -#define UATO_DESKTOPSPEAKER 0x0304 -#define UATO_ROOMSPEAKER 0x0305 -#define UATO_COMMSPEAKER 0x0306 -#define UATO_SUBWOOFER 0x0307 +#define UATO_UNDEFINED 0x0300 +#define UATO_SPEAKER 0x0301 +#define UATO_HEADPHONES 0x0302 +#define UATO_DISPLAYAUDIO 0x0303 +#define UATO_DESKTOPSPEAKER 0x0304 +#define UATO_ROOMSPEAKER 0x0305 +#define UATO_COMMSPEAKER 0x0306 +#define UATO_SUBWOOFER 0x0307 /* bidir terminal types */ -#define UATB_UNDEFINED 0x0400 -#define UATB_HANDSET 0x0401 -#define UATB_HEADSET 0x0402 -#define UATB_SPEAKERPHONE 0x0403 -#define UATB_SPEAKERPHONEESUP 0x0404 -#define UATB_SPEAKERPHONEECANC 0x0405 +#define UATB_UNDEFINED 0x0400 +#define UATB_HANDSET 0x0401 +#define UATB_HEADSET 0x0402 +#define UATB_SPEAKERPHONE 0x0403 +#define UATB_SPEAKERPHONEESUP 0x0404 +#define UATB_SPEAKERPHONEECANC 0x0405 /* telephony terminal types */ -#define UATT_UNDEFINED 0x0500 -#define UATT_PHONELINE 0x0501 -#define UATT_TELEPHONE 0x0502 -#define UATT_DOWNLINEPHONE 0x0503 +#define UATT_UNDEFINED 0x0500 +#define UATT_PHONELINE 0x0501 +#define UATT_TELEPHONE 0x0502 +#define UATT_DOWNLINEPHONE 0x0503 /* external terminal types */ -#define UATE_UNDEFINED 0x0600 -#define UATE_ANALOGCONN 0x0601 -#define UATE_DIGITALAUIFC 0x0602 -#define UATE_LINECONN 0x0603 -#define UATE_LEGACYCONN 0x0604 -#define UATE_SPDIF 0x0605 -#define UATE_1394DA 0x0606 -#define UATE_1394DV 0x0607 +#define UATE_UNDEFINED 0x0600 +#define UATE_ANALOGCONN 0x0601 +#define UATE_DIGITALAUIFC 0x0602 +#define UATE_LINECONN 0x0603 +#define UATE_LEGACYCONN 0x0604 +#define UATE_SPDIF 0x0605 +#define UATE_1394DA 0x0606 +#define UATE_1394DV 0x0607 /* embedded function terminal types */ -#define UATF_UNDEFINED 0x0700 -#define UATF_CALIBNOISE 0x0701 -#define UATF_EQUNOISE 0x0702 -#define UATF_CDPLAYER 0x0703 -#define UATF_DAT 0x0704 -#define UATF_DCC 0x0705 -#define UATF_MINIDISK 0x0706 -#define UATF_ANALOGTAPE 0x0707 -#define UATF_PHONOGRAPH 0x0708 -#define UATF_VCRAUDIO 0x0709 -#define UATF_VIDEODISCAUDIO 0x070a -#define UATF_DVDAUDIO 0x070b -#define UATF_TVTUNERAUDIO 0x070c -#define UATF_SATELLITE 0x070d -#define UATF_CABLETUNER 0x070e -#define UATF_DSS 0x070f -#define UATF_RADIORECV 0x0710 -#define UATF_RADIOXMIT 0x0711 -#define UATF_MULTITRACK 0x0712 -#define UATF_SYNTHESIZER 0x0713 +#define UATF_UNDEFINED 0x0700 +#define UATF_CALIBNOISE 0x0701 +#define UATF_EQUNOISE 0x0702 +#define UATF_CDPLAYER 0x0703 +#define UATF_DAT 0x0704 +#define UATF_DCC 0x0705 +#define UATF_MINIDISK 0x0706 +#define UATF_ANALOGTAPE 0x0707 +#define UATF_PHONOGRAPH 0x0708 +#define UATF_VCRAUDIO 0x0709 +#define UATF_VIDEODISCAUDIO 0x070a +#define UATF_DVDAUDIO 0x070b +#define UATF_TVTUNERAUDIO 0x070c +#define UATF_SATELLITE 0x070d +#define UATF_CABLETUNER 0x070e +#define UATF_DSS 0x070f +#define UATF_RADIORECV 0x0710 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 5 21:22:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6A96106567A; Fri, 5 Jun 2009 21:22: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 70AAD106566C for ; Fri, 5 Jun 2009 21:22:51 +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 5BF398FC25 for ; Fri, 5 Jun 2009 21:22:51 +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 n55LMpIu070550 for ; Fri, 5 Jun 2009 21:22:51 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55LMpC9070548 for perforce@freebsd.org; Fri, 5 Jun 2009 21:22:51 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 5 Jun 2009 21:22:51 GMT Message-Id: <200906052122.n55LMpC9070548@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 163610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 21:22:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=163610 Change 163610 by thompsa@thompsa_burger on 2009/06/05 21:22:19 Checkpoint usb buf WIP - rename functions - add urb accessors - move includes Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_pci.c#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/misc/udbp.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/misc/ufm.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_aue.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_auereg.h#3 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_axe.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cdce.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_cue.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_kue.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_rue.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/if_udav.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/net/usb_ethernet.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/u3g.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uark.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubsa.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ubser.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uchcom.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ucycom.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ufoma.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uftdi.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ugensa.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uipaq.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/ulpt.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umct.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umodem.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/umoscom.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uplcom.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/usb_serial.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uslcom.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvisor.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/serial/uvscom.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/umass.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/urio.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/storage/ustorage_fs.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/template/usb_template.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_busdma.h#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_compat_linux.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#14 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_device.c#13 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_error.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_freebsd.h#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#13 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hid.c#7 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_hub.c#12 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_lookup.h#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_msctest.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.c#13 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_request.h#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#13 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.c#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_util.h#2 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#4 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_uath.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_upgt.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_ural.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_urtw.c#5 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_zyd.c#9 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci.c#9 (text+ko) ==== @@ -280,7 +280,7 @@ /* wait 8 milliseconds */ /* Wait for reset to complete. */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); AT91_UDP_WRITE_4(sc, AT91_UDP_GSTATE, 0); } @@ -885,7 +885,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpointno), - xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + xfer->sumlen, usb_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -1395,7 +1395,7 @@ (sc->sc_clocks_on) (sc->sc_clocks_arg); } /* wait a little for things to stabilise */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); /* disable and clear all interrupts */ ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/at91dci_atmelarm.c#3 (text+ko) ==== @@ -187,7 +187,7 @@ at91_udp_pull_down(sc); /* wait 10ms for pulldown to stabilise */ - usb2_pause_mtx(NULL, hz / 100); + usb_pause_mtx(NULL, hz / 100); sc->sc_iclk = at91_pmc_clock_ref("udc_clk"); sc->sc_fclk = at91_pmc_clock_ref("udpck"); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/atmegadci.c#9 (text+ko) ==== @@ -224,7 +224,7 @@ /* wait 8 milliseconds */ /* Wait for reset to complete. */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); /* hardware should have cleared RMWKUP bit */ } @@ -788,7 +788,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpointno), - xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + xfer->sumlen, usb_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -1256,7 +1256,7 @@ if (ATMEGA_READ_1(sc, 0x49) & 0x01) break; /* wait a little bit for PLL to start */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); } /* make sure USB is enabled */ @@ -1272,7 +1272,7 @@ ATMEGA_WRITE_1(sc, ATMEGA_UDCON, ATMEGA_UDCON_DETACH); /* wait a little for things to stabilise */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20); /* enable interrupts */ ATMEGA_WRITE_1(sc, ATMEGA_UDIEN, ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/avr32dci.c#9 (text+ko) ==== @@ -257,7 +257,7 @@ /* wait 8 milliseconds */ /* Wait for reset to complete. */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); /* hardware should have cleared RMWKUP bit */ } @@ -758,7 +758,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpoint), - xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + xfer->sumlen, usb_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -1218,7 +1218,7 @@ avr32dci_mod_ctrl(sc, AVR32_CTRL_DEV_DETACH, 0); /* wait a little for things to stabilise */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20); /* disable interrupts */ avr32dci_mod_ien(sc, 0, 0xFFFFFFFF); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#11 (text+ko) ==== @@ -173,7 +173,7 @@ EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET); for (i = 0; i < 100; i++) { - usb2_pause_mtx(NULL, hz / 1000); + usb_pause_mtx(NULL, hz / 1000); hcr = EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_HCRESET; if (!hcr) { if (sc->sc_flags & (EHCI_SCFLG_SETMODE | EHCI_SCFLG_BIGEMMIO)) { @@ -209,7 +209,7 @@ EOWRITE4(sc, EHCI_USBCMD, 0); /* Halt controller */ for (i = 0; i < 100; i++) { - usb2_pause_mtx(NULL, hz / 1000); + usb_pause_mtx(NULL, hz / 1000); hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH; if (hcr) break; @@ -241,7 +241,7 @@ DPRINTF("start\n"); - usb2_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, 0); + usb_callout_init_mtx(&sc->sc_tmo_pcd, &sc->sc_bus.bus_mtx, 0); #ifdef USB_DEBUG if (ehcidebug > 2) { @@ -492,7 +492,7 @@ EOWRITE4(sc, EHCI_CONFIGFLAG, EHCI_CONF_CF); for (i = 0; i < 100; i++) { - usb2_pause_mtx(NULL, hz / 1000); + usb_pause_mtx(NULL, hz / 1000); hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH; if (!hcr) { break; @@ -518,7 +518,7 @@ { USB_BUS_LOCK(&sc->sc_bus); - usb2_callout_stop(&sc->sc_tmo_pcd); + usb_callout_stop(&sc->sc_tmo_pcd); EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs); USB_BUS_UNLOCK(&sc->sc_bus); @@ -528,9 +528,9 @@ } /* XXX let stray task complete */ - usb2_pause_mtx(NULL, hz / 20); + usb_pause_mtx(NULL, hz / 20); - usb2_callout_drain(&sc->sc_tmo_pcd); + usb_callout_drain(&sc->sc_tmo_pcd); } void @@ -563,7 +563,7 @@ if (hcr == 0) { break; } - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); } if (hcr != 0) { @@ -577,7 +577,7 @@ if (hcr == EHCI_STS_HCH) { break; } - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); } if (hcr != EHCI_STS_HCH) { @@ -620,7 +620,7 @@ } if (hcr) { - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_RESUME_WAIT)); for (i = 1; i <= sc->sc_noport; i++) { @@ -639,7 +639,7 @@ if (hcr != EHCI_STS_HCH) { break; } - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); } if (hcr == EHCI_STS_HCH) { device_printf(sc->sc_bus.bdev, "config timeout\n"); @@ -647,7 +647,7 @@ USB_BUS_UNLOCK(&sc->sc_bus); - usb2_pause_mtx(NULL, + usb_pause_mtx(NULL, USB_MS_TO_TICKS(USB_RESUME_WAIT)); /* catch any lost interrupts */ @@ -1504,7 +1504,7 @@ ehci_root_intr(sc); /* do not allow RHSC interrupts > 1 per second */ - usb2_callout_reset(&sc->sc_tmo_pcd, hz, + usb_callout_reset(&sc->sc_tmo_pcd, hz, (void *)&ehci_pcd_enable, sc); } status &= ~(EHCI_STS_INT | EHCI_STS_ERRINT | EHCI_STS_PCD | EHCI_STS_IAA); @@ -1750,7 +1750,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", pipe->address, UE_GET_ADDR(pipe->endpointno), - urb->sumlen, usb2_get_speed(pipe->xroot->udev)); + urb->sumlen, usb_get_speed(pipe->xroot->udev)); temp.average = pipe->max_hc_frame_size; temp.max_frame_size = pipe->max_frame_size; @@ -1783,7 +1783,7 @@ temp.auto_data_toggle = 1; } - if (usb2_get_speed(pipe->udev) != USB_SPEED_HIGH) { + if (usb_get_speed(pipe->udev) != USB_SPEED_HIGH) { /* max 3 retries */ temp.qtd_status |= htohc32(temp.sc, EHCI_QTD_SET_CERR(3)); @@ -1932,14 +1932,14 @@ EHCI_QH_SET_ENDPT(UE_GET_ADDR(pipe->endpointno)) | EHCI_QH_SET_MPL(pipe->max_packet_size)); - if (usb2_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) { + if (usb_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) { qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_HIGH) | EHCI_QH_DTC); if (methods != &ehci_device_intr_methods) qh_endp |= EHCI_QH_SET_NRL(8); } else { - if (usb2_get_speed(pipe->xroot->udev) == USB_SPEED_FULL) { + if (usb_get_speed(pipe->xroot->udev) == USB_SPEED_FULL) { qh_endp |= (EHCI_QH_SET_EPS(EHCI_QH_SPEED_FULL) | EHCI_QH_DTC); } else { @@ -2202,10 +2202,10 @@ usb2_transfer_done(urb, error); /* Load next */ - urb = TAILQ_FIRST(&pipe->urb_xmit_q); + urb = TAILQ_FIRST(&pipe->urb_hc_q); if (error == 0 && urb != NULL) { printf("LOAD NEXT %p\n", urb); - TAILQ_REMOVE(&pipe->urb_xmit_q, urb, ub_next); + TAILQ_REMOVE(&pipe->urb_hc_q, urb, ub_hcnext); error = (pipe->methods->load)(urb); if (error) usb2_transfer_done(urb, error); @@ -2220,8 +2220,8 @@ USB_BUS_LOCK(pipe->bus); - if (pipe->urb_curr != NULL || TAILQ_FIRST(&pipe->urb_xmit_q) != NULL) { - TAILQ_INSERT_TAIL(&pipe->urb_xmit_q, urb, ub_next); + if (pipe->urb_curr != NULL || TAILQ_FIRST(&pipe->urb_hc_q) != NULL) { + TAILQ_INSERT_TAIL(&pipe->urb_hc_q, urb, ub_hcnext); USB_BUS_UNLOCK(pipe->bus); return; } @@ -2245,8 +2245,8 @@ pipe->urb_curr = NULL; } /* Flush queued urbs */ - while ((urb = TAILQ_FIRST(&pipe->urb_xmit_q)) != NULL) { - TAILQ_REMOVE(&pipe->urb_xmit_q, urb, ub_next); + while ((urb = TAILQ_FIRST(&pipe->urb_hc_q)) != NULL) { + TAILQ_REMOVE(&pipe->urb_hc_q, urb, ub_hcnext); usb2_transfer_done(urb, USB_ERR_CANCELLED); } } @@ -2257,7 +2257,7 @@ static void ehci_device_bulk_open(struct usb_pipe *pipe) { - KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); + KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q")); return; } @@ -2309,7 +2309,7 @@ static void ehci_device_ctrl_open(struct usb_pipe *pipe) { - KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); + KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q")); return; } @@ -2355,7 +2355,7 @@ uint16_t x; uint8_t slot; - KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); + KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q")); /* Allocate a microframe slot first: */ @@ -2363,7 +2363,7 @@ slot = usb2_intr_schedule_adjust (pipe->xroot->udev, pipe->max_frame_size, USB_HS_MICRO_FRAMES_MAX); - if (usb2_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) { + if (usb_get_speed(pipe->xroot->udev) == USB_SPEED_HIGH) { pipe->usb2_uframe = slot; pipe->usb2_smask = (1 << slot) & 0xFF; pipe->usb2_cmask = 0; @@ -2452,7 +2452,7 @@ uint32_t sitd_portaddr; uint8_t ds; - KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); + KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q")); USB_BUS_LOCK(pipe->bus); sitd_portaddr = @@ -2739,7 +2739,7 @@ uint32_t temp; uint8_t ds; - KASSERT(TAILQ_FIRST(&pipe->urb_xmit_q) == NULL, ("corrupt q")); + KASSERT(TAILQ_FIRST(&pipe->urb_hc_q) == NULL, ("corrupt q")); /* initialize all TD's */ @@ -3260,13 +3260,13 @@ EOWRITE4(sc, port, v | EHCI_PS_FPR); } /* wait 20ms for resume sequence to complete */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50); EOWRITE4(sc, port, v & ~(EHCI_PS_SUSP | EHCI_PS_FPR | (3 << 10) /* High Speed */ )); /* 4ms settle time */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 250); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 250); break; case UHF_PORT_POWER: EOWRITE4(sc, port, v & ~EHCI_PS_PP); @@ -3417,7 +3417,7 @@ EOWRITE4(sc, port, v | EHCI_PS_PR); /* Wait for reset to complete. */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_PORT_ROOT_RESET_DELAY)); /* Terminate reset sequence. */ @@ -3425,7 +3425,7 @@ EOWRITE4(sc, port, v); /* Wait for HC to complete reset. */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(EHCI_PORT_RESET_COMPLETE)); v = EOREAD4(sc, port); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci_pci.c#3 (text+ko) ==== @@ -474,7 +474,7 @@ "timed out waiting for BIOS\n"); break; } - usb2_pause_mtx(NULL, hz / 100); /* wait 10ms */ + usb_pause_mtx(NULL, hz / 100); /* wait 10ms */ } } } ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/musb_otg.c#9 (text+ko) ==== @@ -229,7 +229,7 @@ /* wait 8 milliseconds */ /* Wait for reset to complete. */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 125); temp = MUSB2_READ_1(sc, MUSB2_REG_POWER); temp &= ~MUSB2_MASK_RESUME; @@ -1135,7 +1135,7 @@ DPRINTFN(8, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpointno), - xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + xfer->sumlen, usb_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -1709,7 +1709,7 @@ (sc->sc_clocks_on) (sc->sc_clocks_arg); } /* wait a little for things to stabilise */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); /* disable all interrupts */ @@ -1722,7 +1722,7 @@ musbotg_pull_common(sc, 0); /* wait a little bit (10ms) */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); /* disable double packet buffering */ MUSB2_WRITE_2(sc, MUSB2_REG_RXDBDIS, 0xFFFF); @@ -2031,7 +2031,7 @@ */ temp = (nframes - xfer->endpoint->isoc_next) & MUSB2_MASK_FRAME; - if (usb2_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { + if (usb_get_speed(xfer->xroot->udev) == USB_SPEED_HIGH) { fs_frames = (xfer->nframes + 7) / 8; } else { fs_frames = xfer->nframes; ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ohci.c#9 (text+ko) ==== @@ -182,7 +182,7 @@ DPRINTF("SMM active, request owner change\n"); OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_OCR); for (i = 0; (i < 100) && (ctl & OHCI_IR); i++) { - usb2_pause_mtx(NULL, hz / 1000); + usb_pause_mtx(NULL, hz / 1000); ctl = OREAD4(sc, OHCI_CONTROL); } if (ctl & OHCI_IR) { @@ -195,7 +195,7 @@ DPRINTF("cold started\n"); reset: /* controller was cold started */ - usb2_pause_mtx(NULL, + usb_pause_mtx(NULL, USB_MS_TO_TICKS(USB_BUS_RESET_DELAY)); } @@ -206,7 +206,7 @@ DPRINTF("%s: resetting\n", device_get_nameunit(sc->sc_bus.bdev)); OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET); - usb2_pause_mtx(NULL, + usb_pause_mtx(NULL, USB_MS_TO_TICKS(USB_BUS_RESET_DELAY)); /* we now own the host controller and the bus has been reset */ @@ -269,7 +269,7 @@ desca = OREAD4(sc, OHCI_RH_DESCRIPTOR_A); OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca | OHCI_NOCP); OWRITE4(sc, OHCI_RH_STATUS, OHCI_LPSC); /* Enable port power */ - usb2_pause_mtx(NULL, + usb_pause_mtx(NULL, USB_MS_TO_TICKS(OHCI_ENABLE_POWER_DELAY)); OWRITE4(sc, OHCI_RH_DESCRIPTOR_A, desca); @@ -279,7 +279,7 @@ */ sc->sc_noport = 0; for (i = 0; (i < 10) && (sc->sc_noport == 0); i++) { - usb2_pause_mtx(NULL, + usb_pause_mtx(NULL, USB_MS_TO_TICKS(OHCI_READ_DESC_DELAY)); sc->sc_noport = OHCI_GET_NDP(OREAD4(sc, OHCI_RH_DESCRIPTOR_A)); } @@ -398,7 +398,7 @@ /* set up the bus struct */ sc->sc_bus.methods = &ohci_bus_methods; - usb2_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.bus_mtx, 0); + usb_callout_init_mtx(&sc->sc_tmo_rhsc, &sc->sc_bus.bus_mtx, 0); #ifdef USB_DEBUG if (ohcidebug > 15) { @@ -430,7 +430,7 @@ { USB_BUS_LOCK(&sc->sc_bus); - usb2_callout_stop(&sc->sc_tmo_rhsc); + usb_callout_stop(&sc->sc_tmo_rhsc); OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_ALL_INTRS); OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET); @@ -438,9 +438,9 @@ USB_BUS_UNLOCK(&sc->sc_bus); /* XXX let stray task complete */ - usb2_pause_mtx(NULL, hz / 20); + usb_pause_mtx(NULL, hz / 20); - usb2_callout_drain(&sc->sc_tmo_rhsc); + usb_callout_drain(&sc->sc_tmo_rhsc); } /* NOTE: suspend/resume is called from @@ -472,7 +472,7 @@ ctl |= OHCI_HCFS_SUSPEND; OWRITE4(sc, OHCI_CONTROL, ctl); - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_RESUME_WAIT)); USB_BUS_UNLOCK(&sc->sc_bus); @@ -503,11 +503,11 @@ ctl = OREAD4(sc, OHCI_CONTROL); ctl |= OHCI_HCFS_RESUME; OWRITE4(sc, OHCI_CONTROL, ctl); - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_RESUME_DELAY)); ctl = (ctl & ~OHCI_HCFS_MASK) | OHCI_HCFS_OPERATIONAL; OWRITE4(sc, OHCI_CONTROL, ctl); - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_RESUME_RECOVERY)); sc->sc_control = sc->sc_intre = 0; @@ -1235,7 +1235,7 @@ ohci_root_intr(sc); /* do not allow RHSC interrupts > 1 per second */ - usb2_callout_reset(&sc->sc_tmo_rhsc, hz, + usb_callout_reset(&sc->sc_tmo_rhsc, hz, (void *)&ohci_rhsc_enable, sc); } } @@ -1436,7 +1436,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpointno), - xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + xfer->sumlen, usb_get_speed(xfer->xroot->udev)); temp.average = xfer->max_hc_frame_size; temp.max_frame_size = xfer->max_frame_size; @@ -2385,7 +2385,7 @@ OWRITE4(sc, port, UPS_RESET); for (v = 0;; v++) { if (v < 12) { - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_PORT_ROOT_RESET_DELAY)); if ((OREAD4(sc, port) & UPS_RESET) == 0) { ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uhci.c#9 (text+ko) ==== @@ -298,7 +298,7 @@ /* wait 10 milliseconds */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); /* check that controller has started */ @@ -328,7 +328,7 @@ /* wait */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_BUS_RESET_DELAY)); /* terminate all transfers */ @@ -341,7 +341,7 @@ while (n--) { /* wait one millisecond */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); if (!(UREAD2(sc, UHCI_CMD) & UHCI_CMD_HCRESET)) { goto done_1; @@ -357,7 +357,7 @@ while (n--) { /* wait one millisecond */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); /* check if HC is stopped */ if (UREAD2(sc, UHCI_STS) & UHCI_STS_HCH) { @@ -377,7 +377,7 @@ USB_BUS_UNLOCK(&sc->sc_bus); /* stop root interrupt */ - usb2_callout_drain(&sc->sc_root_intr); + usb_callout_drain(&sc->sc_root_intr); USB_BUS_LOCK(&sc->sc_bus); } @@ -453,7 +453,7 @@ DPRINTF("start\n"); - usb2_callout_init_mtx(&sc->sc_root_intr, &sc->sc_bus.bus_mtx, 0); + usb_callout_init_mtx(&sc->sc_root_intr, &sc->sc_bus.bus_mtx, 0); #ifdef USB_DEBUG if (uhcidebug > 2) { @@ -682,7 +682,7 @@ UHCICMD(sc, UHCI_CMD_EGSM); - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_RESUME_WAIT)); USB_BUS_UNLOCK(&sc->sc_bus); @@ -701,7 +701,7 @@ UHCICMD(sc, UHCI_CMD_FGR); - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_RESUME_DELAY)); /* and start traffic again */ @@ -1704,7 +1704,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpointno), - xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + xfer->sumlen, usb_get_speed(xfer->xroot->udev)); temp.average = xfer->max_frame_size; temp.max_frame_size = xfer->max_frame_size; @@ -2435,7 +2435,7 @@ x = URWMASK(UREAD2(sc, port)); UWRITE2(sc, port, x | UHCI_PORTSC_PR); - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_PORT_ROOT_RESET_DELAY)); DPRINTFN(4, "uhci port %d reset, status0 = 0x%04x\n", @@ -2463,7 +2463,7 @@ for (lim = 0; lim < 12; lim++) { - usb2_pause_mtx(&sc->sc_bus.bus_mtx, + usb_pause_mtx(&sc->sc_bus.bus_mtx, USB_MS_TO_TICKS(USB_PORT_RESET_DELAY)); x = UREAD2(sc, port); @@ -2758,14 +2758,14 @@ UWRITE2(sc, port, URWMASK(x)); /* wait 20ms for resume sequence to complete */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 50); /* clear suspend and resume detect */ UWRITE2(sc, port, URWMASK(x) & ~(UHCI_PORTSC_RD | UHCI_PORTSC_SUSP)); /* wait a little bit */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 500); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 500); sc->sc_isresumed |= (1 << index); @@ -2857,7 +2857,7 @@ } /* restart timer */ - usb2_callout_reset(&sc->sc_root_intr, hz, + usb_callout_reset(&sc->sc_root_intr, hz, (void *)&uhci_root_intr, sc); if (sc->sc_hub_idata[0] != 0) { ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/usb_controller.c#8 (text+ko) ==== @@ -160,7 +160,7 @@ return (0); } /* Stop power watchdog */ - usb2_callout_drain(&bus->power_wdog); + usb_callout_drain(&bus->power_wdog); /* Let the USB explore process detach all devices. */ if (bus->bus_roothold != NULL) { @@ -291,7 +291,7 @@ USB_BUS_LOCK_ASSERT(bus, MA_OWNED); - usb2_callout_reset(&bus->power_wdog, + usb_callout_reset(&bus->power_wdog, 4 * hz, usb2_power_wdog, arg); USB_BUS_UNLOCK(bus); @@ -386,7 +386,7 @@ if (err) { device_printf(bus->bdev, "Root HUB problem, error=%s\n", - usb2_errstr(err)); + usb_errstr(err)); } /* set softc - we are ready */ @@ -563,7 +563,7 @@ mtx_init(&bus->bus_mtx, device_get_nameunit(bus->parent), NULL, MTX_DEF | MTX_RECURSE); - usb2_callout_init_mtx(&bus->power_wdog, + usb_callout_init_mtx(&bus->power_wdog, &bus->bus_mtx, 0); TAILQ_INIT(&bus->intr_q.head); ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/uss820dci.c#9 (text+ko) ==== @@ -849,7 +849,7 @@ DPRINTFN(9, "addr=%d endpt=%d sumlen=%d speed=%d\n", xfer->address, UE_GET_ADDR(xfer->endpointno), - xfer->sumlen, usb2_get_speed(xfer->xroot->udev)); + xfer->sumlen, usb_get_speed(xfer->xroot->udev)); temp.max_frame_size = xfer->max_frame_size; @@ -1360,7 +1360,7 @@ uss820dci_pull_down(sc); /* wait 10ms for pulldown to stabilise */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); + usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 100); /* check hardware revision */ temp = USS820_READ_1(sc, USS820_REV); ==== //depot/projects/usb_buf/src/sys/dev/usb/input/uhid.c#8 (text+ko) ==== @@ -631,7 +631,7 @@ DPRINTFN(10, "sc=%p\n", sc); - device_set_usb2_desc(dev); + device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "uhid lock", NULL, MTX_DEF | MTX_RECURSE); @@ -645,7 +645,7 @@ UHID_N_TRANSFER, sc, &sc->sc_mtx); if (error) { - DPRINTF("error=%s\n", usb2_errstr(error)); + DPRINTF("error=%s\n", usb_errstr(error)); goto detach; } if (uaa->info.idVendor == USB_VENDOR_WACOM) { @@ -673,7 +673,7 @@ if (error) { DPRINTF("set report failed, error=%s (ignored)\n", - usb2_errstr(error)); + usb_errstr(error)); } sc->sc_repdesc_size = sizeof(uhid_graphire3_4x5_report_descr); sc->sc_repdesc_ptr = USB_ADD_BYTES(uhid_graphire3_4x5_report_descr, 0); @@ -704,7 +704,7 @@ if (error) { DPRINTF("set idle failed, error=%s (ignored)\n", - usb2_errstr(error)); + usb_errstr(error)); } sc->sc_isize = hid_report_size (sc->sc_repdesc_ptr, sc->sc_repdesc_size, hid_input, &sc->sc_iid); ==== //depot/projects/usb_buf/src/sys/dev/usb/input/ukbd.c#9 (text+ko) ==== @@ -453,7 +453,7 @@ } ukbd_interrupt(sc); - usb2_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc); + usb_callout_reset(&sc->sc_callout, hz / 40, &ukbd_timeout, sc); } static uint8_t @@ -574,7 +574,7 @@ break; default: /* Error */ - DPRINTF("error=%s\n", usb2_errstr(xfer->error)); + DPRINTF("error=%s\n", usb_errstr(xfer->error)); if (xfer->error != USB_ERR_CANCELLED) { /* try to clear stall first */ @@ -627,7 +627,7 @@ return; default: /* Error */ - DPRINTFN(0, "error=%s\n", usb2_errstr(xfer->error)); + DPRINTFN(0, "error=%s\n", usb_errstr(xfer->error)); return; } } @@ -698,7 +698,7 @@ kbd->kb_data = (void *)sc; - device_set_usb2_desc(dev); + device_set_usb_desc(dev); sc->sc_udev = uaa->device; sc->sc_iface = uaa->iface; @@ -706,14 +706,14 @@ sc->sc_iface_no = uaa->info.bIfaceNum; sc->sc_mode = K_XLATE; - usb2_callout_init_mtx(&sc->sc_callout, &Giant, 0); + usb_callout_init_mtx(&sc->sc_callout, &Giant, 0); err = usb2_transfer_setup(uaa->device, &uaa->info.bIfaceIndex, sc->sc_xfer, ukbd_config, UKBD_N_TRANSFER, sc, &Giant); if (err) { - DPRINTF("error=%s\n", usb2_errstr(err)); + DPRINTF("error=%s\n", usb_errstr(err)); goto detach; } /* setup default keyboard maps */ @@ -835,7 +835,7 @@ } sc->sc_flags |= UKBD_FLAG_GONE; - usb2_callout_stop(&sc->sc_callout); + usb_callout_stop(&sc->sc_callout); ukbd_disable(&sc->sc_kbd); @@ -861,7 +861,7 @@ usb2_transfer_unsetup(sc->sc_xfer, UKBD_N_TRANSFER); - usb2_callout_drain(&sc->sc_callout); + usb_callout_drain(&sc->sc_callout); DPRINTF("%s: disconnected\n", device_get_nameunit(dev)); ==== //depot/projects/usb_buf/src/sys/dev/usb/input/ums.c#8 (text+ko) ==== @@ -286,11 +286,11 @@ (dx == 0) && (dy == 0) && (dz == 0) && (dt == 0) && (dw == 0) && (buttons == 0)) { - usb2_callout_reset(&sc->sc_callout, hz / 20, + usb_callout_reset(&sc->sc_callout, hz / 20, &ums_put_queue_timeout, sc); } else { - usb2_callout_stop(&sc->sc_callout); + usb_callout_stop(&sc->sc_callout); ums_put_queue(sc, dx, dy, dz, dt, buttons); } @@ -341,7 +341,7 @@ if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); - id = usb2_get_interface_descriptor(uaa->iface); + id = usb_get_interface_descriptor(uaa->iface); if ((id == NULL) || (id->bInterfaceClass != UICLASS_HID)) @@ -478,11 +478,11 @@ DPRINTFN(11, "sc=%p\n", sc); - device_set_usb2_desc(dev); + device_set_usb_desc(dev); mtx_init(&sc->sc_mtx, "ums lock", NULL, MTX_DEF | MTX_RECURSE); - usb2_callout_init_mtx(&sc->sc_callout, &sc->sc_mtx, 0); + usb_callout_init_mtx(&sc->sc_callout, &sc->sc_mtx, 0); /* * Force the report (non-boot) protocol. @@ -498,7 +498,7 @@ UMS_N_TRANSFER, sc, &sc->sc_mtx); if (err) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 5 21:25:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF20E1065672; Fri, 5 Jun 2009 21:25: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 8DFF9106566B for ; Fri, 5 Jun 2009 21:25:54 +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 7AFC38FC12 for ; Fri, 5 Jun 2009 21:25:54 +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 n55LPsYi070791 for ; Fri, 5 Jun 2009 21:25:54 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55LPsof070789 for perforce@freebsd.org; Fri, 5 Jun 2009 21:25:54 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 5 Jun 2009 21:25:54 GMT Message-Id: <200906052125.n55LPsof070789@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 163611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 21:25:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=163611 Change 163611 by thompsa@thompsa_burger on 2009/06/05 21:24:55 First crack at a driver with the urb api, not complete. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#8 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#4 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#8 (text+ko) ==== @@ -69,19 +69,15 @@ #define USB_DEBUG_VAR rum_debug #include -#include -#include +#include #include -#include -#include -#include #include "usbdevs.h" #include #include #include -#if USB_DEBUG +#ifdef USB_DEBUG static int rum_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, rum, CTLFLAG_RW, 0, "USB rum"); @@ -417,7 +413,7 @@ if (uaa->info.bIfaceIndex != RT2573_IFACE_INDEX) return (ENXIO); - return (usb2_lookup_id_by_uaa(rum_devs, sizeof(rum_devs), uaa)); + return (usb_lookup_id_by_uaa(rum_devs, sizeof(rum_devs), uaa)); } static int @@ -431,7 +427,7 @@ uint32_t tmp; int error, ntries; - device_set_usb2_desc(self); + device_set_usb_desc(self); sc->sc_udev = uaa->device; sc->sc_dev = self; @@ -439,11 +435,11 @@ MTX_NETWORK_LOCK, MTX_DEF); iface_index = RT2573_IFACE_INDEX; - error = usb2_transfer_setup(uaa->device, &iface_index, - sc->sc_xfer, rum_config, RUM_N_TRANSFER, sc, &sc->sc_mtx); + error = usb_pipe_open(uaa->device, &iface_index, + sc->sc_xfer, rum_config, RUM_N_TRANSFER, sc); if (error) { device_printf(self, "could not allocate USB transfers, " - "err=%s\n", usb2_errstr(error)); + "err=%s\n", usb_errstr(error)); goto detach; } @@ -546,7 +542,7 @@ struct ieee80211com *ic; /* stop all USB transfers */ - usb2_transfer_unsetup(sc->sc_xfer, RUM_N_TRANSFER); + usb_pipe_close(sc->sc_xfer, RUM_N_TRANSFER); /* free TX list, if any */ RUM_LOCK(sc); @@ -571,13 +567,13 @@ int ntries = 10; while (ntries--) { - err = usb2_do_request_flags(sc->sc_udev, &sc->sc_mtx, + err = usb_do_request_flags(sc->sc_udev, &sc->sc_mtx, req, data, 0, NULL, 250 /* ms */); if (err == 0) break; DPRINTFN(1, "Control request failed, %s (retrying)\n", - usb2_errstr(err)); + usb_errstr(err)); if (rum_pause(sc, hz / 100)) break; } @@ -609,7 +605,7 @@ rvp->newstate = vap->iv_newstate; vap->iv_newstate = rum_newstate; - usb2_callout_init_mtx(&rvp->amrr_ch, &sc->sc_mtx, 0); + usb_callout_init_mtx(&rvp->amrr_ch, &sc->sc_mtx, 0); TASK_INIT(&rvp->amrr_task, 0, rum_amrr_task, rvp); ieee80211_amrr_init(&rvp->amrr, vap, IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD, @@ -628,7 +624,7 @@ struct rum_vap *rvp = RUM_VAP(vap); struct ieee80211com *ic = vap->iv_ic; - usb2_callout_drain(&rvp->amrr_ch); + usb_callout_drain(&rvp->amrr_ch); ieee80211_draintask(ic, &rvp->amrr_task); ieee80211_amrr_cleanup(&rvp->amrr); ieee80211_vap_detach(vap); @@ -650,6 +646,7 @@ ieee80211_free_node(data->ni); data->ni = NULL; } + usb_init_urb(data->urb); /* reset state */ STAILQ_INSERT_TAIL(&sc->tx_free, data, next); sc->tx_nfree++; } @@ -661,13 +658,15 @@ int i; sc->tx_nfree = 0; - STAILQ_INIT(&sc->tx_q); STAILQ_INIT(&sc->tx_free); for (i = 0; i < RUM_TX_LIST_COUNT; i++) { data = &sc->tx_data[i]; data->sc = sc; + data->urb = usb_get_urb(sc->sc_xfer[RUM_BULK_WR], 0); + KASSERT(data->urb != NULL, ("usb_get_urb failed")); + urb_set_priv(data->urb, &data); STAILQ_INSERT_TAIL(&sc->tx_free, data, next); sc->tx_nfree++; } @@ -681,7 +680,6 @@ /* make sure any subsequent use of the queues will fail */ sc->tx_nfree = 0; - STAILQ_INIT(&sc->tx_q); STAILQ_INIT(&sc->tx_free); /* free up all node references and mbufs */ @@ -696,6 +694,10 @@ ieee80211_free_node(data->ni); data->ni = NULL; } + if (data->urb != NULL) { + usb_free_urb(data->urb); + data->urb = NULL; + } } } @@ -717,7 +719,7 @@ IEEE80211_UNLOCK(ic); RUM_LOCK(sc); - usb2_callout_stop(&rvp->amrr_ch); + usb_callout_stop(&rvp->amrr_ch); switch (nstate) { case IEEE80211_S_INIT: @@ -763,194 +765,113 @@ } static void -rum_bulk_write_callback(struct usb_xfer *xfer) +rum_bulk_write_callback(struct usb_urb *urb, usb_error_t error) { - struct rum_softc *sc = xfer->priv_sc; + struct rum_softc *sc = urb_get_softc(urb); struct ifnet *ifp = sc->sc_ifp; - struct ieee80211vap *vap; struct rum_tx_data *data; - struct mbuf *m; - unsigned int len; + int len; - switch (USB_GET_STATE(xfer)) { - case USB_ST_TRANSFERRED: - DPRINTFN(11, "transfer complete, %d bytes\n", xfer->actlen); + printf("rum_bulk_write_callback(%p, %d)\n", urb, error); - /* free resources */ - data = xfer->priv_fifo; - rum_tx_free(data, 0); - xfer->priv_fifo = NULL; + urb_get_status(urb, NULL, NULL, &len, NULL); + DPRINTFN(11, "transfer complete, %d bytes\n", len); - ifp->if_opackets++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + /* free resources */ + data = urb_get_priv(urb); + rum_tx_free(data, 0); + usb_free_urb(urb); - /* FALLTHROUGH */ - case USB_ST_SETUP: -tr_setup: - data = STAILQ_FIRST(&sc->tx_q); - if (data) { - STAILQ_REMOVE_HEAD(&sc->tx_q, next); - m = data->m; - - if (m->m_pkthdr.len > (MCLBYTES + RT2573_TX_DESC_SIZE)) { - DPRINTFN(0, "data overflow, %u bytes\n", - m->m_pkthdr.len); - m->m_pkthdr.len = (MCLBYTES + RT2573_TX_DESC_SIZE); - } - usb2_copy_in(xfer->frbuffers, 0, &data->desc, - RT2573_TX_DESC_SIZE); - usb2_m_copy_in(xfer->frbuffers, RT2573_TX_DESC_SIZE, m, - 0, m->m_pkthdr.len); - - vap = data->ni->ni_vap; - if (ieee80211_radiotap_active_vap(vap)) { - struct rum_tx_radiotap_header *tap = &sc->sc_txtap; - - tap->wt_flags = 0; - tap->wt_rate = data->rate; - tap->wt_antenna = sc->tx_ant; - - ieee80211_radiotap_tx(vap, m); - } - - /* align end on a 4-bytes boundary */ - len = (RT2573_TX_DESC_SIZE + m->m_pkthdr.len + 3) & ~3; - if ((len % 64) == 0) - len += 4; - - DPRINTFN(11, "sending frame len=%u xferlen=%u\n", - m->m_pkthdr.len, len); - - xfer->frlengths[0] = len; - xfer->priv_fifo = data; - - usb_submit_urb(xfer); - } - break; - - default: /* Error */ - DPRINTFN(11, "transfer error, %s\n", - usb2_errstr(xfer->error)); - + if (error) { + if (error == USB_ERR_CANCELLED) + return; ifp->if_oerrors++; - data = xfer->priv_fifo; - if (data != NULL) { - rum_tx_free(data, xfer->error); - xfer->priv_fifo = NULL; - } + } else + ifp->if_opackets++; - if (xfer->error == USB_ERR_STALLED) { - /* try to clear stall first */ - xfer->flags.stall_pipe = 1; - goto tr_setup; - } - if (xfer->error == USB_ERR_TIMEOUT) - device_printf(sc->sc_dev, "device timeout\n"); - break; - } + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; + rum_start(ifp); } static void -rum_bulk_read_callback(struct usb_xfer *xfer) +rum_bulk_read_callback(struct usb_urb *urb, usb_error_t error) { - struct rum_softc *sc = xfer->priv_sc; + struct rum_softc *sc = urb_get_softc(urb); struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ieee80211_node *ni; struct mbuf *m = NULL; + struct rum_rx_desc *desc; uint32_t flags; uint8_t rssi = 0; - unsigned int len; + int actlen; - switch (USB_GET_STATE(xfer)) { - case USB_ST_TRANSFERRED: - - DPRINTFN(15, "rx done, actlen=%d\n", xfer->actlen); - - len = xfer->actlen; - if (len < RT2573_RX_DESC_SIZE + IEEE80211_MIN_LEN) { - DPRINTF("%s: xfer too short %d\n", - device_get_nameunit(sc->sc_dev), len); - ifp->if_ierrors++; - goto tr_setup; + if (error) { + if (error == USB_ERR_CANCELLED) { + usb_free_urb(urb); + return; } + goto skip; + } - len -= RT2573_RX_DESC_SIZE; - usb2_copy_out(xfer->frbuffers, 0, &sc->sc_rx_desc, - RT2573_RX_DESC_SIZE); + urb_get_status(urb, (void **)&desc, NULL, &actlen, NULL); + DPRINTFN(0, "rx done, actlen=%d\n", actlen); - rssi = rum_get_rssi(sc, sc->sc_rx_desc.rssi); - flags = le32toh(sc->sc_rx_desc.flags); - if (flags & RT2573_RX_CRC_ERROR) { - /* - * This should not happen since we did not - * request to receive those frames when we - * filled RUM_TXRX_CSR2: - */ - DPRINTFN(5, "PHY or CRC error\n"); - ifp->if_ierrors++; - goto tr_setup; - } + if (actlen < RT2573_RX_DESC_SIZE + IEEE80211_MIN_LEN) { + DPRINTF("%s: xfer too short %d\n", + device_get_nameunit(sc->sc_dev), actlen); + ifp->if_ierrors++; + goto skip; + } - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - if (m == NULL) { - DPRINTF("could not allocate mbuf\n"); - ifp->if_ierrors++; - goto tr_setup; - } - usb2_copy_out(xfer->frbuffers, RT2573_RX_DESC_SIZE, - mtod(m, uint8_t *), len); + actlen -= RT2573_RX_DESC_SIZE; - /* finalize mbuf */ - m->m_pkthdr.rcvif = ifp; - m->m_pkthdr.len = m->m_len = (flags >> 16) & 0xfff; + rssi = rum_get_rssi(sc, desc->rssi); + flags = le32toh(desc->flags); + if (flags & RT2573_RX_CRC_ERROR) { + /* + * This should not happen since we did not + * request to receive those frames when we + * filled RUM_TXRX_CSR2: + */ + DPRINTFN(5, "PHY or CRC error\n"); + ifp->if_ierrors++; + goto skip; + } - if (ieee80211_radiotap_active(ic)) { - struct rum_rx_radiotap_header *tap = &sc->sc_rxtap; + m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (m == NULL) { + DPRINTF("could not allocate mbuf\n"); + ifp->if_ierrors++; + goto skip; + } - /* XXX read tsf */ - tap->wr_flags = 0; - tap->wr_rate = ieee80211_plcp2rate(sc->sc_rx_desc.rate, - (flags & RT2573_RX_OFDM) ? - IEEE80211_T_OFDM : IEEE80211_T_CCK); - tap->wr_antsignal = RT2573_NOISE_FLOOR + rssi; - tap->wr_antnoise = RT2573_NOISE_FLOOR; - tap->wr_antenna = sc->rx_ant; - } - /* FALLTHROUGH */ - case USB_ST_SETUP: -tr_setup: - xfer->frlengths[0] = xfer->max_data_length; - usb_submit_urb(xfer); + /* finalize mbuf */ + m->m_pkthdr.rcvif = ifp; + bcopy((caddr_t)(desc + 1), mtod(m, uint8_t *), actlen); + m->m_pkthdr.len = m->m_len = (flags >> 16) & 0xfff; - /* - * At the end of a USB callback it is always safe to unlock - * the private mutex of a device! That is why we do the - * "ieee80211_input" here, and not some lines up! - */ - if (m) { - RUM_UNLOCK(sc); - ni = ieee80211_find_rxnode(ic, - mtod(m, struct ieee80211_frame_min *)); - if (ni != NULL) { - (void) ieee80211_input(ni, m, rssi, - RT2573_NOISE_FLOOR); - ieee80211_free_node(ni); - } else - (void) ieee80211_input_all(ic, m, rssi, - RT2573_NOISE_FLOOR); - RUM_LOCK(sc); - } - return; + if (ieee80211_radiotap_active(ic)) { + struct rum_rx_radiotap_header *tap = &sc->sc_rxtap; - default: /* Error */ - if (xfer->error != USB_ERR_CANCELLED) { - /* try to clear stall first */ - xfer->flags.stall_pipe = 1; - goto tr_setup; - } - return; + /* XXX read tsf */ + tap->wr_flags = 0; + tap->wr_rate = ieee80211_plcp2rate(desc->rate, + (flags & RT2573_RX_OFDM) ? + IEEE80211_T_OFDM : IEEE80211_T_CCK); + tap->wr_antsignal = RT2573_NOISE_FLOOR + rssi; + tap->wr_antnoise = RT2573_NOISE_FLOOR; + tap->wr_antenna = sc->rx_ant; } + ni = ieee80211_find_rxnode(ic, mtod(m, struct ieee80211_frame_min *)); + if (ni != NULL) { + (void) ieee80211_input(ni, m, rssi, RT2573_NOISE_FLOOR); + ieee80211_free_node(ni); + } else + (void) ieee80211_input_all(ic, m, rssi, RT2573_NOISE_FLOOR); +skip: + usb_init_urb(urb); + usb_submit_urb(urb); } static uint8_t @@ -1025,10 +946,12 @@ const struct mbuf *m, struct ieee80211_node *ni, int prot, int rate) { struct ieee80211com *ic = ni->ni_ic; + struct ieee80211vap *vap; const struct ieee80211_frame *wh; struct rum_tx_data *data; + struct rum_tx_desc *desc; struct mbuf *mprot; - int protrate, ackrate, pktlen, flags, isshort; + int protrate, ackrate, pktlen, flags, isshort, xferlen; uint16_t dur; RUM_LOCK_ASSERT(sc, MA_OWNED); @@ -1061,13 +984,37 @@ STAILQ_REMOVE_HEAD(&sc->tx_free, next); sc->tx_nfree--; + urb_get_status(data->urb, (void **)&data->buf, &xferlen, NULL, NULL); + if (xferlen < m->m_pkthdr.len + RT2573_TX_DESC_SIZE) { + //m_freem(m); /* XXX data leak */ + return EINVAL; + } + + desc = (struct rum_tx_desc *)data->buf; data->m = mprot; data->ni = ieee80211_ref_node(ni); - data->rate = protrate; - rum_setup_tx_desc(sc, &data->desc, flags, 0, mprot->m_pkthdr.len, protrate); + + vap = data->ni->ni_vap; + if (ieee80211_radiotap_active_vap(vap)) { + struct rum_tx_radiotap_header *tap = &sc->sc_txtap; + + tap->wt_flags = 0; + tap->wt_rate = protrate; + tap->wt_antenna = sc->tx_ant; + + ieee80211_radiotap_tx(vap, mprot); + } + + m_copydata(mprot, 0, mprot->m_pkthdr.len, + data->buf + RT2573_TX_DESC_SIZE); + rum_setup_tx_desc(sc, desc, flags, 0, mprot->m_pkthdr.len, protrate); + + DPRINTFN(10, "sending prot frame len=%d rate=%d\n", + m->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, rate); - STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); + /* NB: no roundup necessary */ + urb_set_framelen(data->urb, 0, RT2573_TX_DESC_SIZE + mprot->m_pkthdr.len); + usb_submit_urb(data->urb); return 0; } @@ -1079,11 +1026,13 @@ struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct rum_tx_data *data; + struct rum_tx_desc *desc; struct ieee80211_frame *wh; const struct ieee80211_txparam *tp; struct ieee80211_key *k; uint32_t flags = 0; uint16_t dur; + int xferlen; RUM_LOCK_ASSERT(sc, MA_OWNED); @@ -1117,17 +1066,45 @@ flags |= RT2573_TX_TIMESTAMP; } + urb_get_status(data->urb, (void **)&data->buf, &xferlen, NULL, NULL); + if (xferlen < m0->m_pkthdr.len + RT2573_TX_DESC_SIZE) { + m_freem(m0); /* XXX data leak */ + return EINVAL; + } + + desc = (struct rum_tx_desc *)data->buf; data->m = m0; data->ni = ni; - data->rate = tp->mgmtrate; + + vap = data->ni->ni_vap; + if (ieee80211_radiotap_active_vap(vap)) { + struct rum_tx_radiotap_header *tap = &sc->sc_txtap; + + tap->wt_flags = 0; + tap->wt_rate = tp->mgmtrate; + tap->wt_antenna = sc->tx_ant; + + ieee80211_radiotap_tx(vap, m0); + } + + m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RT2573_TX_DESC_SIZE); + rum_setup_tx_desc(sc, desc, flags, 0, m0->m_pkthdr.len, tp->mgmtrate); + + /* align end on a 4-bytes boundary */ + xferlen = (RT2573_TX_DESC_SIZE + m0->m_pkthdr.len + 3) & ~3; - rum_setup_tx_desc(sc, &data->desc, flags, 0, m0->m_pkthdr.len, tp->mgmtrate); + /* + * No space left in the last URB to store the extra 4 bytes, force + * sending of another URB. + */ + if ((xferlen % 64) == 0) + xferlen += 4; - DPRINTFN(10, "sending mgt frame len=%d rate=%d\n", - m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, tp->mgmtrate); + DPRINTFN(10, "sending mgt frame len=%d rate=%d xfer len=%d\n", + m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, tp->mgmtrate, xferlen); - STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); + urb_set_framelen(data->urb, 0, xferlen); + usb_submit_urb(data->urb); return (0); } @@ -1137,9 +1114,11 @@ const struct ieee80211_bpf_params *params) { struct ieee80211com *ic = ni->ni_ic; + struct ieee80211vap *vap; struct rum_tx_data *data; + struct rum_tx_desc *desc; uint32_t flags; - int rate, error; + int rate, error, xferlen; RUM_LOCK_ASSERT(sc, MA_OWNED); KASSERT(params != NULL, ("no raw xmit params")); @@ -1168,18 +1147,46 @@ STAILQ_REMOVE_HEAD(&sc->tx_free, next); sc->tx_nfree--; + urb_get_status(data->urb, (void **)&data->buf, &xferlen, NULL, NULL); + if (xferlen < m0->m_pkthdr.len + RT2573_TX_DESC_SIZE) { + m_freem(m0); /* XXX data leak */ + return EINVAL; + } + + vap = data->ni->ni_vap; + if (ieee80211_radiotap_active_vap(vap)) { + struct rum_tx_radiotap_header *tap = &sc->sc_txtap; + + tap->wt_flags = 0; + tap->wt_rate = rate; + tap->wt_antenna = sc->tx_ant; + + ieee80211_radiotap_tx(vap, m0); + } + + desc = (struct rum_tx_desc *)data->buf; data->m = m0; data->ni = ni; - data->rate = rate; + m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RT2573_TX_DESC_SIZE); /* XXX need to setup descriptor ourself */ - rum_setup_tx_desc(sc, &data->desc, flags, 0, m0->m_pkthdr.len, rate); + rum_setup_tx_desc(sc, desc, flags, 0, m0->m_pkthdr.len, rate); + + /* align end on a 4-bytes boundary */ + xferlen = (RT2573_TX_DESC_SIZE + m0->m_pkthdr.len + 3) & ~3; + + /* + * No space left in the last URB to store the extra 4 bytes, force + * sending of another URB. + */ + if ((xferlen % 64) == 0) + xferlen += 4; - DPRINTFN(10, "sending raw frame len=%u rate=%u\n", - m0->m_pkthdr.len, rate); + DPRINTFN(10, "sending raw frame len=%u rate=%u xfer len=%u\n", + m0->m_pkthdr.len, rate, xferlen); - STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); + urb_set_framelen(data->urb, 0, xferlen); + usb_submit_urb(data->urb); return 0; } @@ -1191,12 +1198,13 @@ struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct rum_tx_data *data; + struct rum_tx_desc *desc; struct ieee80211_frame *wh; const struct ieee80211_txparam *tp; struct ieee80211_key *k; uint32_t flags = 0; uint16_t dur; - int error, rate; + int error, rate, xferlen; RUM_LOCK_ASSERT(sc, MA_OWNED); @@ -1242,9 +1250,15 @@ STAILQ_REMOVE_HEAD(&sc->tx_free, next); sc->tx_nfree--; + urb_get_status(data->urb, (void **)&data->buf, &xferlen, NULL, NULL); + if (xferlen < m0->m_pkthdr.len + RT2573_TX_DESC_SIZE) { + m_freem(m0); /* XXX data leak */ + return EINVAL; + } + + desc = (struct rum_tx_desc *)data->buf; data->m = m0; data->ni = ni; - data->rate = rate; if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2573_TX_NEED_ACK; @@ -1255,13 +1269,29 @@ *(uint16_t *)wh->i_dur = htole16(dur); } - rum_setup_tx_desc(sc, &data->desc, flags, 0, m0->m_pkthdr.len, rate); + vap = data->ni->ni_vap; + if (ieee80211_radiotap_active_vap(vap)) { + struct rum_tx_radiotap_header *tap = &sc->sc_txtap; + + tap->wt_flags = 0; + tap->wt_rate = rate; + tap->wt_antenna = sc->tx_ant; + + ieee80211_radiotap_tx(vap, m0); + } + + m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RT2573_TX_DESC_SIZE); + rum_setup_tx_desc(sc, desc, flags, 0, m0->m_pkthdr.len, rate); - DPRINTFN(10, "sending frame len=%d rate=%d\n", - m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, rate); + /* align end on a 4-bytes boundary */ + xferlen = (RT2573_TX_DESC_SIZE + m0->m_pkthdr.len + 3) & ~3; + if ((xferlen % 64) == 0) + xferlen += 4; + DPRINTFN(10, "sending frame len=%d rate=%d xfer len=%d\n", + m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, rate, xferlen); - STAILQ_INSERT_TAIL(&sc->tx_q, data, next); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); + urb_set_framelen(data->urb, 0, xferlen); + usb_submit_urb(data->urb); return 0; } @@ -1350,7 +1380,7 @@ error = rum_do_request(sc, &req, buf); if (error != 0) { device_printf(sc->sc_dev, "could not read EEPROM: %s\n", - usb2_errstr(error)); + usb_errstr(error)); } } @@ -1380,7 +1410,7 @@ if (error != 0) { device_printf(sc->sc_dev, "could not multi read MAC register: %s\n", - usb2_errstr(error)); + usb_errstr(error)); } } @@ -1408,7 +1438,7 @@ if (error != 0) { device_printf(sc->sc_dev, "could not multi write MAC register: %s\n", - usb2_errstr(error)); + usb_errstr(error)); } return (error); } @@ -1943,6 +1973,7 @@ #define N(a) (sizeof (a) / sizeof ((a)[0])) struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; + struct usb_urb *urb; uint32_t tmp; usb_error_t error; int i, ntries; @@ -2008,10 +2039,16 @@ } rum_write(sc, RT2573_TXRX_CSR0, tmp); + /* + * Start up the receive pipe. + */ + urb = usb_get_urb(sc->sc_xfer[RUM_BULK_RD], 0); + usb_submit_urb(urb); + ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; - usb2_transfer_set_stall(sc->sc_xfer[RUM_BULK_WR]); - usb2_transfer_start(sc->sc_xfer[RUM_BULK_RD]); + usb_pipe_ready(sc->sc_xfer[RUM_BULK_WR]); + usb_pipe_ready(sc->sc_xfer[RUM_BULK_RD]); return; fail: rum_stop(sc); @@ -2043,16 +2080,12 @@ ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); - RUM_UNLOCK(sc); - /* * Drain the USB transfers, if not already drained: */ - usb_pipe_drain(sc->sc_xfer[RUM_BULK_WR]); - usb_pipe_drain(sc->sc_xfer[RUM_BULK_RD]); + usb_pipe_halt(sc->sc_xfer[RUM_BULK_WR]); + usb_pipe_halt(sc->sc_xfer[RUM_BULK_RD]); - RUM_LOCK(sc); - rum_unsetup_tx_list(sc); /* disable Rx */ @@ -2091,7 +2124,7 @@ err = rum_do_request(sc, &req, NULL); if (err != 0) { device_printf(sc->sc_dev, "could not run firmware: %s\n", - usb2_errstr(err)); + usb_errstr(err)); } /* give the chip some time to boot */ @@ -2188,7 +2221,7 @@ ieee80211_amrr_node_init(&rvp->amrr, &RUM_NODE(ni)->amn, ni); - usb2_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); + usb_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); } static void @@ -2226,7 +2259,7 @@ ifp->if_oerrors += fail; /* count TX retry-fail as Tx errors */ - usb2_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); + usb_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); RUM_UNLOCK(sc); } @@ -2338,7 +2371,7 @@ rum_pause(struct rum_softc *sc, int timeout) { - usb2_pause_mtx(&sc->sc_mtx, timeout); + usb_pause_mtx(&sc->sc_mtx, timeout); return (0); } ==== //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#4 (text+ko) ==== @@ -17,8 +17,8 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RUM_TX_LIST_COUNT 8 -#define RUM_TX_MINFREE 2 +#define RUM_TX_LIST_COUNT 1 +#define RUM_TX_MINFREE 0 struct rum_rx_radiotap_header { struct ieee80211_radiotap_header wr_ihdr; @@ -60,10 +60,11 @@ struct rum_tx_data { STAILQ_ENTRY(rum_tx_data) next; struct rum_softc *sc; - struct rum_tx_desc desc; + struct usb_urb *urb; struct mbuf *m; struct ieee80211_node *ni; - int rate; + uint8_t *buf; + //int rate; }; typedef STAILQ_HEAD(, rum_tx_data) rum_txdhead; @@ -96,13 +97,12 @@ device_t sc_dev; struct usb_device *sc_udev; - struct usb_xfer *sc_xfer[RUM_N_TRANSFER]; + struct usb_pipe *sc_xfer[RUM_N_TRANSFER]; uint8_t rf_rev; uint8_t rffreq; struct rum_tx_data tx_data[RUM_TX_LIST_COUNT]; - rum_txdhead tx_q; rum_txdhead tx_free; int tx_nfree; struct rum_rx_desc sc_rx_desc; From owner-p4-projects@FreeBSD.ORG Fri Jun 5 22:06:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CB1B1065675; Fri, 5 Jun 2009 22:06:36 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BE41106566B for ; Fri, 5 Jun 2009 22:06:36 +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 190A08FC1B for ; Fri, 5 Jun 2009 22:06:36 +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 n55M6aZB076169 for ; Fri, 5 Jun 2009 22:06:36 GMT (envelope-from truncs@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n55M6ZcX076167 for perforce@freebsd.org; Fri, 5 Jun 2009 22:06:35 GMT (envelope-from truncs@FreeBSD.org) Date: Fri, 5 Jun 2009 22:06:35 GMT Message-Id: <200906052206.n55M6ZcX076167@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 163613 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 05 Jun 2009 22:06:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=163613 Change 163613 by truncs@aditya on 2009/06/05 22:06:31 - Fixed typos - Removed ext2_fs_sb.h, it is not needed - Fixed other bugs related to the new in-memory structure Affected files ... .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#5 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_balloc.c#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_bitops.h#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_bmap.c#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_extern.h#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#7 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode.c#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_lookup.c#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_mount.h#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_readwrite.c#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_subr.c#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#7 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/fs.h#4 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/i386-bitops.h#3 edit .. //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/inode.h#4 edit Differences ... ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/COPYRIGHT.INFO#5 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_alloc.c#4 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #include #include ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_balloc.c#3 (text+ko) ==== @@ -46,7 +46,6 @@ #include #include -#include #include #include ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_bitops.h#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_bmap.c#3 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include -#include #include #include ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_extern.h#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h#7 (text+ko) ==== @@ -52,14 +52,12 @@ #define umode_t mode_t #define loff_t off_t ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_fs.h#3 -==== THEIRS //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_fs.h#4 #define cpu_to_le32(x) htole32(x) -==== YOURS //aditya/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h + #define MAXMNTLEN 512 #define EXT2_MAX_GROUP_LOADED 8 -<<<< +#define buffer_head buf /* * The second extended filesystem constants/structures */ @@ -141,21 +139,21 @@ #define EXT2_MAX_BLOCK_SIZE 4096 #define EXT2_MIN_BLOCK_LOG_SIZE 10 #if defined(__KERNEL__) || defined(_KERNEL) -# define EXT2_BLOCK_SIZE(s) ((s)->s_blocksize) +# define EXT2_BLOCK_SIZE(s) ((s)->e2fs_bsize) #else # define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size) #endif #define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (__u32)) #if defined(__KERNEL__) || defined(_KERNEL) -# define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_blocksize_bits) +# define EXT2_BLOCK_SIZE_BITS(s) ((s)->e2fs_blocksize_bits) #else # define EXT2_BLOCK_SIZE_BITS(s) ((s)->s_log_block_size + 10) #endif #if defined(__KERNEL__) || defined(_KERNEL) #define EXT2_ADDR_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_addr_per_block_bits) -#define EXT2_INODE_SIZE(s) (EXT2_SB(s)->s_inode_size) -#define EXT2_FIRST_INO(s) (EXT2_SB(s)->s_first_ino) -#define EXT2_INODES_PER_BLOCK(s) ((s)->s_inodes_per_block) +#define EXT2_INODE_SIZE(s) (EXT2_SB(s)->e2fs_isize) +#define EXT2_FIRST_INO(s) (EXT2_SB(s)->e2fs_first_inode) +#define EXT2_INODES_PER_BLOCK(s) ((s)->e2fs_ipb) #else #define EXT2_INODE_SIZE(s) (((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \ EXT2_GOOD_OLD_INODE_SIZE : \ @@ -172,8 +170,8 @@ #define EXT2_MAX_FRAG_SIZE 4096 #define EXT2_MIN_FRAG_LOG_SIZE 10 #if defined(__KERNEL__) || defined(_KERNEL) -# define EXT2_FRAG_SIZE(s) (EXT2_SB(s)->s_frag_size) -# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_SB(s)->s_frags_per_block) +# define EXT2_FRAG_SIZE(s) (EXT2_SB(s)->e2fs_fsize) +# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_SB(s)->e2fs_fpb) #else # define EXT2_FRAG_SIZE(s) (EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size) # define EXT2_FRAGS_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s)) @@ -220,14 +218,14 @@ * Macro-instructions used to manage group descriptors */ #if defined(__KERNEL__) || defined(_KERNEL) -# define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->s_blocks_per_group) -# define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->s_desc_per_block) -# define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->s_inodes_per_group) +# define EXT2_BLOCKS_PER_GROUP(s) (EXT2_SB(s)->e2fs_bpg) +# define EXT2_DESC_PER_BLOCK(s) (EXT2_SB(s)->e2fs_descpb) +# define EXT2_INODES_PER_GROUP(s) (EXT2_SB(s)->e2fs_ipg) # define EXT2_DESC_PER_BLOCK_BITS(s) (EXT2_SB(s)->s_desc_per_block_bits) #else -# define EXT2_BLOCKS_PER_GROUP(s) ((s)->s_blocks_per_group) +# define EXT2_BLOCKS_PER_GROUP(s) ((s)->e2fs_bpg) # define EXT2_DESC_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc)) -# define EXT2_INODES_PER_GROUP(s) ((s)->s_inodes_per_group) +# define EXT2_INODES_PER_GROUP(s) ((s)->s_ipg) #endif /* @@ -373,7 +371,7 @@ #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt #define set_opt(o, opt) o |= EXT2_MOUNT_##opt -#define test_opt(sb, opt) (EXT2_SB(sb)->s_mount_opt & \ +#define test_opt(sb, opt) (EXT2_SB(sb)->e2fs_mount_opt & \ EXT2_MOUNT_##opt) /* * Maximal mount counts between two filesystem checks @@ -451,7 +449,7 @@ __u32 s_reserved[204]; /* Padding to the end of the block */ }; ->>>> ORIGINAL //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_fs.h#3 + #ifdef __KERNEL__ #define EXT2_SB(sb) (&((sb)->u.ext2_sb)) #else @@ -461,8 +459,8 @@ #define EXT2_SB(sb) (sb) #endif -==== THEIRS //depot/vendor/freebsd/src/sys/gnu/fs/ext2fs/ext2_fs.h#4 -==== YOURS //aditya/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_fs.h + + /* * In-Memory Superblock */ @@ -478,8 +476,8 @@ uint32_t e2fs_bshift; /* calc of logical block no */ int32_t e2fs_bmask; /* calc of block offset */ int32_t e2fs_bpg; /* Number of blocks per group */ - int64_t e2fs_qmask; /* = s_blocksize -1 */ - uint32_t e2fs_fstodb; /* Shift to get disk block */ + int64_t e2fs_qbmask; /* = s_blocksize -1 */ + uint32_t e2fs_fsbtodb; /* Shift to get disk block */ uint32_t e2fs_ipg; /* Number of inodes per group */ uint32_t e2fs_ipb; /* Number of inodes per block */ uint32_t e2fs_itpg; /* Number of inode table per group */ @@ -501,7 +499,7 @@ uint32_t e2fs_mount_opt; uint32_t e2fs_blocksize_bits; char e2fs_wasvalid; /* valid at mount time */ - off_t maxfilesize; + off_t e2fs_maxfilesize; }; @@ -514,7 +512,7 @@ #define EXT2_SB(sb) (sb) #endif -<<<< + /* * Codes for operating systems */ @@ -540,11 +538,11 @@ */ #define EXT2_HAS_COMPAT_FEATURE(sb,mask) \ - ( EXT2_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) ) + ( EXT2_SB(sb)->e2fs->s_feature_compat & cpu_to_le32(mask) ) #define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask) \ - ( EXT2_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) ) + ( EXT2_SB(sb)->e2fs->s_feature_ro_compat & cpu_to_le32(mask) ) #define EXT2_HAS_INCOMPAT_FEATURE(sb,mask) \ - ( EXT2_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) ) + ( EXT2_SB(sb)->e2fs->s_feature_incompat & cpu_to_le32(mask) ) #define EXT2_FEATURE_COMPAT_DIR_PREALLOC 0x0001 ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode.c#3 (text+ko) ==== @@ -50,7 +50,6 @@ #include #include #include -#include #include #include @@ -264,7 +263,7 @@ blocksreleased += count; if (lastiblock[level] < 0) { oip->i_ib[level] = 0; - ext2_blkfree(oip, bn, fs->s_frag_size); + ext2_blkfree(oip, bn, fs->e2fs_fsize); blocksreleased += nblocks; } } ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#4 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_balloc.c#4 (text+ko) ==== @@ -53,7 +53,6 @@ #include #include #include -#include #include #ifdef __i386__ @@ -111,7 +110,7 @@ if (block_group >= sb->e2fs_gcount) panic ( "load_block_bitmap: " "block_group >= groups_count - " - "block_group = %d, groups_count = %lu", + "block_group = %d, groups_count = %d", block_group, sb->e2fs_gcount); if (sb->e2fs_gcount <= EXT2_MAX_GROUP_LOADED) { @@ -222,9 +221,9 @@ (in_range (gdp->bg_block_bitmap, block, count) || in_range (gdp->bg_inode_bitmap, block, count) || in_range (block, gdp->bg_inode_table, - sb->s_itb_per_group) || + sb->e2fs_itpg) || in_range (block + count - 1, gdp->bg_inode_table, - sb->s_itb_per_group))) + sb->e2fs_itpg))) panic ( "ext2_free_blocks: " "Freeing blocks in system zones - " "Block = %lu, count = %lu", @@ -406,7 +405,7 @@ if (/* test_opt (sb, CHECK_STRICT) && we are always strict. */ (tmp == gdp->bg_block_bitmap || tmp == gdp->bg_inode_bitmap || - in_range (tmp, gdp->bg_inode_table, sb->s_itb_per_group))) + in_range (tmp, gdp->bg_inode_table, sb->e2fs_itpg))) panic ( "ext2_new_block: " "Allocating block in system zone - " "%dth block = %u in group %u", j, tmp, i); ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c#4 (text+ko) ==== @@ -54,7 +54,6 @@ #include #include #include -#include #include #include @@ -87,7 +86,7 @@ if (block_group >= sb->e2fs_gcount) panic ("get_group_desc: " "block_group >= groups_count - " - "block_group = %d, groups_count = %lu", + "block_group = %d, groups_count = %d", block_group, sb->e2fs_gcount); group_desc = block_group / EXT2_DESC_PER_BLOCK(sb); @@ -149,7 +148,7 @@ if (block_group >= sb->e2fs_gcount) panic ("load_inode_bitmap:" "block_group >= groups_count - " - "block_group = %d, groups_count = %lu", + "block_group = %d, groups_count = %d", block_group, sb->e2fs_gcount); if (sb->e2fs_lib > 0 && sb->e2fs_ibn[0] == block_group) ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_lookup.c#4 (text+ko) ==== @@ -59,7 +59,6 @@ #include #include #include -#include #ifdef DIAGNOSTIC static int dirchk = 1; @@ -150,7 +149,7 @@ struct uio auio; struct iovec aiov; caddr_t dirbuf; - int DIRBLKSIZ = VTOI(ap->a_vp)->i_e2fs->s_blocksize; + int DIRBLKSIZ = VTOI(ap->a_vp)->i_e2fs->e2fs_bsize; int readcnt; off_t startoffset = uio->uio_offset; @@ -321,7 +320,7 @@ int nameiop = cnp->cn_nameiop; ino_t saved_ino; - int DIRBLKSIZ = VTOI(ap->a_dvp)->i_e2fs->s_blocksize; + int DIRBLKSIZ = VTOI(ap->a_dvp)->i_e2fs->e2fs_bsize; bp = NULL; slotoffset = -1; @@ -713,7 +712,7 @@ struct ext2_dir_entry_2 *de; int entryoffsetinblock; { - int DIRBLKSIZ = VTOI(dp)->i_e2fs->s_blocksize; + int DIRBLKSIZ = VTOI(dp)->i_e2fs->e2fs_bsize; char * error_msg = NULL; @@ -762,7 +761,7 @@ u_int dsize; int error, loc, newentrysize, spacefree; char *dirbuf; - int DIRBLKSIZ = ip->i_e2fs->s_blocksize; + int DIRBLKSIZ = ip->i_e2fs->e2fs_bsize; #ifdef DIAGNOSTIC ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_mount.h#4 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_readwrite.c#4 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_subr.c#4 (text+ko) ==== @@ -48,7 +48,7 @@ #include #include -#include +#include #include #ifdef KDB ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#5 (text+ko) ==== @@ -78,7 +78,6 @@ #include #include -#include #include static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td); @@ -176,7 +175,7 @@ fs->e2fs->s_state |= EXT2_VALID_FS; ext2_sbupdate(ump, MNT_WAIT); } - fs->s_rd_only = 1; + fs->e2fs_ronly = 1; vfs_flagopt(opts, "ro", &mp->mnt_flag, MNT_RDONLY); DROP_GIANT(); g_topology_lock(); @@ -189,7 +188,7 @@ if (error) return (error); devvp = ump->um_devvp; - if (fs->s_rd_only && !vfs_flagopt(opts, "ro", NULL, 0)) { + if (fs->e2fs_ronly && !vfs_flagopt(opts, "ro", NULL, 0)) { if (ext2_check_sb_compat(fs->e2fs, devvp->v_rdev, 0)) return (EPERM); @@ -334,7 +333,7 @@ return (0); } if (gdp->bg_inode_table < block || - gdp->bg_inode_table + sb->s_itb_per_group >= + gdp->bg_inode_table + sb->e2fs_itpg >= block + EXT2_BLOCKS_PER_GROUP(sb)) { printf ("ext2_check_descriptors: " "Inode table for group %d" @@ -388,7 +387,7 @@ fs->e2fs_bsize = EXT2_MIN_BLOCK_SIZE << es->s_log_block_size; fs->e2fs_bshift = EXT2_MIN_BLOCK_LOG_SIZE + es->s_log_block_size; fs->e2fs_fsbtodb = es->s_log_block_size + 1; - fs->e2fs_qbmask = fs->s_blocksize - 1; + fs->e2fs_qbmask = fs->e2fs_bsize - 1; fs->e2fs_blocksize_bits = es->s_log_block_size + 10; fs->e2fs_fsize = EXT2_MIN_FRAG_SIZE << es->s_log_frag_size; if (fs->e2fs_fsize) @@ -415,8 +414,8 @@ } } fs->e2fs_ipb = fs->e2fs_bsize / EXT2_INODE_SIZE(fs); - fs->e2fs_itbg = fs->e2fs_ipg /fs->e2fs_ipb; - fs->e2fs_desc_per_block = fs->e2fs_bsize / sizeof (struct ext2_group_desc); + fs->e2fs_itpg = fs->e2fs_ipg /fs->e2fs_ipb; + fs->e2fs_descpb = fs->e2fs_bsize / sizeof (struct ext2_group_desc); /* s_resuid / s_resgid ? */ fs->e2fs_gcount = (es->s_blocks_count - es->s_first_data_block + EXT2_BLOCKS_PER_GROUP(fs) - 1) / EXT2_BLOCKS_PER_GROUP(fs); ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/ext2_vnops.c#7 (text+ko) ==== @@ -76,7 +76,6 @@ #include #include -#include #include #include #include ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/fs.h#4 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/i386-bitops.h#3 (text+ko) ==== ==== //depot/projects/soc2009/soc_ext2fs/src/sys/gnu/fs/ext2fs/inode.h#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Jun 6 03:43:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D7D01065675; Sat, 6 Jun 2009 03:43: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 C8B9C1065674 for ; Sat, 6 Jun 2009 03:43:19 +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 B4EC08FC0A for ; Sat, 6 Jun 2009 03:43:19 +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 n563hJsH022999 for ; Sat, 6 Jun 2009 03:43:19 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n563hJ0T022997 for perforce@freebsd.org; Sat, 6 Jun 2009 03:43:19 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Sat, 6 Jun 2009 03:43:19 GMT Message-Id: <200906060343.n563hJ0T022997@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 163624 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 03:43:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=163624 Change 163624 by zhaoshuai@zhaoshuai on 2009/06/06 03:42:55 add generic_pipe_close() Affected files ... .. //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#6 edit .. //depot/projects/soc2009/fifo/sys/kern/subr_pipe.c#3 edit .. //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#6 edit .. //depot/projects/soc2009/fifo/sys/sys/pipe.h#5 edit Differences ... ==== //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#6 (text+ko) ==== @@ -3,9 +3,6 @@ * The Regents of the University of California. * Copyright (c) 2005 Robert N. M. Watson * All rights reserved. - * - * Copyright (c) 2009 Zhao Shuai - * Google Summer of Code project * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,39 +29,50 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * + * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.149 2009/04/10 10:52:19 rwatson Exp $ */ #include +#include #include #include #include #include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include #include -static fo_rdwr_t fifo_read_f; -static fo_rdwr_t fifo_write_f; -static fo_ioctl_t fifo_ioctl_f; -static fo_poll_t fifo_poll_f; -static fo_kqfilter_t fifo_kqfilter_f; -static fo_stat_t fifo_stat_f; -static fo_close_t fifo_close_f; -static fo_truncate_t fifo_truncate_f; +static fo_rdwr_t fifo_read_f; +static fo_rdwr_t fifo_write_f; +static fo_ioctl_t fifo_ioctl_f; +static fo_poll_t fifo_poll_f; +static fo_kqfilter_t fifo_kqfilter_f; +static fo_stat_t fifo_stat_f; +static fo_close_t fifo_close_f; +static fo_truncate_t fifo_truncate_f; struct fileops fifo_ops_f = { - .fo_read = fifo_read_f, - .fo_write = fifo_write_f, - .fo_truncate = fifo_truncate_f, - .fo_ioctl = fifo_ioctl_f, - .fo_poll = fifo_poll_f, - .fo_kqfilter = fifo_kqfilter_f, - .fo_stat = fifo_stat_f, - .fo_close = fifo_close_f, - .fo_flags = DFLAG_PASSABLE + .fo_read = fifo_read_f, + .fo_write = fifo_write_f, + .fo_truncate = fifo_truncate_f, + .fo_ioctl = fifo_ioctl_f, + .fo_poll = fifo_poll_f, + .fo_kqfilter = fifo_kqfilter_f, + .fo_stat = fifo_stat_f, + .fo_close = fifo_close_f, + .fo_flags = DFLAG_PASSABLE }; /* @@ -72,26 +80,44 @@ * the state associated with the FIFO. */ struct fifoinfo { - struct pipepair *fi_pp; - long fi_readers; - long fi_writers; + struct socket *fi_readsock; + struct socket *fi_writesock; + long fi_readers; + long fi_writers; }; static vop_print_t fifo_print; static vop_open_t fifo_open; static vop_close_t fifo_close; +static vop_ioctl_t fifo_ioctl; +static vop_kqfilter_t fifo_kqfilter; static vop_pathconf_t fifo_pathconf; static vop_advlock_t fifo_advlock; +static void filt_fifordetach(struct knote *kn); +static int filt_fiforead(struct knote *kn, long hint); +static void filt_fifowdetach(struct knote *kn); +static int filt_fifowrite(struct knote *kn, long hint); +static void filt_fifodetach_notsup(struct knote *kn); +static int filt_fifo_notsup(struct knote *kn, long hint); + +static struct filterops fiforead_filtops = + { 1, NULL, filt_fifordetach, filt_fiforead }; +static struct filterops fifowrite_filtops = + { 1, NULL, filt_fifowdetach, filt_fifowrite }; +static struct filterops fifo_notsup_filtops = + { 1, NULL, filt_fifodetach_notsup, filt_fifo_notsup }; + struct vop_vector fifo_specops = { .vop_default = &default_vnodeops, + .vop_access = VOP_EBADF, .vop_advlock = fifo_advlock, .vop_close = fifo_close, .vop_create = VOP_PANIC, .vop_getattr = VOP_EBADF, - .vop_ioctl = VOP_PANIC, - .vop_kqfilter = VOP_PANIC, + .vop_ioctl = fifo_ioctl, + .vop_kqfilter = fifo_kqfilter, .vop_link = VOP_PANIC, .vop_mkdir = VOP_PANIC, .vop_mknod = VOP_PANIC, @@ -111,7 +137,27 @@ .vop_write = VOP_PANIC, }; +struct mtx fifo_mtx; +MTX_SYSINIT(fifo, &fifo_mtx, "fifo mutex", MTX_DEF); + /* + * Dispose of fifo resources. + */ +static void +fifo_cleanup(struct vnode *vp) +{ + struct fifoinfo *fip = vp->v_fifoinfo; + + ASSERT_VOP_ELOCKED(vp, "fifo_cleanup"); + if (fip->fi_readers == 0 && fip->fi_writers == 0) { + vp->v_fifoinfo = NULL; + (void)soclose(fip->fi_readsock); + (void)soclose(fip->fi_writesock); + free(fip, M_VNODE); + } +} + +/* * Open called to set up a new instance of a fifo or * to find an active instance of a fifo. */ @@ -128,36 +174,126 @@ { struct vnode *vp = ap->a_vp; struct fifoinfo *fip; + struct thread *td = ap->a_td; + struct ucred *cred = ap->a_cred; struct file *fp = ap->a_fp; - struct pipepair *pp; + struct socket *rso, *wso; + int error; ASSERT_VOP_ELOCKED(vp, "fifo_open"); if (fp == NULL) return (EINVAL); if ((fip = vp->v_fifoinfo) == NULL) { fip = malloc(sizeof(*fip), M_VNODE, M_WAITOK); - if ((pp = pipepair_create()) == NULL) { + error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0, cred, td); + if (error) + goto fail1; + fip->fi_readsock = rso; + error = socreate(AF_LOCAL, &wso, SOCK_STREAM, 0, cred, td); + if (error) + goto fail2; + fip->fi_writesock = wso; + error = soconnect2(wso, rso); + if (error) { + (void)soclose(wso); +fail2: + (void)soclose(rso); +fail1: free(fip, M_VNODE); - return (ENOMEM); + return (error); } - fip->fi_pp = pp; fip->fi_readers = fip->fi_writers = 0; - KASSERT(vp->v_fifoinfo == NULL, ("fifo_open: v_fifoinfo race")); + wso->so_snd.sb_lowat = PIPE_BUF; + SOCKBUF_LOCK(&rso->so_rcv); + rso->so_rcv.sb_state |= SBS_CANTRCVMORE; + SOCKBUF_UNLOCK(&rso->so_rcv); + KASSERT(vp->v_fifoinfo == NULL, + ("fifo_open: v_fifoinfo race")); vp->v_fifoinfo = fip; } /* * General access to fi_readers and fi_writers is protected using * the vnode lock. + * + * Protect the increment of fi_readers and fi_writers and the + * associated calls to wakeup() with the fifo mutex in addition + * to the vnode lock. This allows the vnode lock to be dropped + * for the msleep() calls below, and using the fifo mutex with + * msleep() prevents the wakeup from being missed. */ - if (ap->a_mode & FREAD) + mtx_lock(&fifo_mtx); + if (ap->a_mode & FREAD) { fip->fi_readers++; + if (fip->fi_readers == 1) { + SOCKBUF_LOCK(&fip->fi_writesock->so_snd); + fip->fi_writesock->so_snd.sb_state &= ~SBS_CANTSENDMORE; + SOCKBUF_UNLOCK(&fip->fi_writesock->so_snd); + if (fip->fi_writers > 0) { + wakeup(&fip->fi_writers); + sowwakeup(fip->fi_writesock); + } + } + } if (ap->a_mode & FWRITE) { - if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) + if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) { + mtx_unlock(&fifo_mtx); return (ENXIO); - fip->fi_writers++; + } + fip->fi_writers++; + if (fip->fi_writers == 1) { + SOCKBUF_LOCK(&fip->fi_readsock->so_rcv); + fip->fi_readsock->so_rcv.sb_state &= ~SBS_CANTRCVMORE; + SOCKBUF_UNLOCK(&fip->fi_readsock->so_rcv); + if (fip->fi_readers > 0) { + wakeup(&fip->fi_readers); + sorwakeup(fip->fi_readsock); + } + } + } + if ((ap->a_mode & O_NONBLOCK) == 0) { + if ((ap->a_mode & FREAD) && fip->fi_writers == 0) { + VOP_UNLOCK(vp, 0); + error = msleep(&fip->fi_readers, &fifo_mtx, + PDROP | PCATCH | PSOCK, "fifoor", 0); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + if (error) { + fip->fi_readers--; + if (fip->fi_readers == 0) { + socantsendmore(fip->fi_writesock); + fifo_cleanup(vp); + } + return (error); + } + mtx_lock(&fifo_mtx); + /* + * We must have got woken up because we had a writer. + * That (and not still having one) is the condition + * that we must wait for. + */ + } + if ((ap->a_mode & FWRITE) && fip->fi_readers == 0) { + VOP_UNLOCK(vp, 0); + error = msleep(&fip->fi_writers, &fifo_mtx, + PDROP | PCATCH | PSOCK, "fifoow", 0); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + if (error) { + fip->fi_writers--; + if (fip->fi_writers == 0) { + socantrcvmore(fip->fi_readsock); + fifo_cleanup(vp); + } + return (error); + } + /* + * We must have got woken up because we had + * a reader. That (and not still having one) + * is the condition that we must wait for. + */ + mtx_lock(&fifo_mtx); + } } - + mtx_unlock(&fifo_mtx); KASSERT(fp != NULL, ("can't fifo/vnode bypass")); KASSERT(fp->f_ops == &badfileops, ("not badfileops in fifo_open")); finit(fp, fp->f_flag, DTYPE_FIFO, fip, &fifo_ops_f); @@ -165,6 +301,111 @@ } /* + * Now unused vnode ioctl routine. + */ +/* ARGSUSED */ +static int +fifo_ioctl(ap) + struct vop_ioctl_args /* { + struct vnode *a_vp; + u_long a_command; + caddr_t a_data; + int a_fflag; + struct ucred *a_cred; + struct thread *a_td; + } */ *ap; +{ + + printf("WARNING: fifo_ioctl called unexpectedly\n"); + return (ENOTTY); +} + +/* + * Now unused vnode kqfilter routine. + */ +/* ARGSUSED */ +static int +fifo_kqfilter(ap) + struct vop_kqfilter_args /* { + struct vnode *a_vp; + struct knote *a_kn; + } */ *ap; +{ + + printf("WARNING: fifo_kqfilter called unexpectedly\n"); + return (EINVAL); +} + +static void +filt_fifordetach(struct knote *kn) +{ + struct socket *so = (struct socket *)kn->kn_hook; + + SOCKBUF_LOCK(&so->so_rcv); + knlist_remove(&so->so_rcv.sb_sel.si_note, kn, 1); + if (knlist_empty(&so->so_rcv.sb_sel.si_note)) + so->so_rcv.sb_flags &= ~SB_KNOTE; + SOCKBUF_UNLOCK(&so->so_rcv); +} + +static int +filt_fiforead(struct knote *kn, long hint) +{ + struct socket *so = (struct socket *)kn->kn_hook; + + SOCKBUF_LOCK_ASSERT(&so->so_rcv); + kn->kn_data = so->so_rcv.sb_cc; + if (so->so_rcv.sb_state & SBS_CANTRCVMORE) { + kn->kn_flags |= EV_EOF; + return (1); + } else { + kn->kn_flags &= ~EV_EOF; + return (kn->kn_data > 0); + } +} + +static void +filt_fifowdetach(struct knote *kn) +{ + struct socket *so = (struct socket *)kn->kn_hook; + + SOCKBUF_LOCK(&so->so_snd); + knlist_remove(&so->so_snd.sb_sel.si_note, kn, 1); + if (knlist_empty(&so->so_snd.sb_sel.si_note)) + so->so_snd.sb_flags &= ~SB_KNOTE; + SOCKBUF_UNLOCK(&so->so_snd); +} + +static int +filt_fifowrite(struct knote *kn, long hint) +{ + struct socket *so = (struct socket *)kn->kn_hook; + + SOCKBUF_LOCK_ASSERT(&so->so_snd); + kn->kn_data = sbspace(&so->so_snd); + if (so->so_snd.sb_state & SBS_CANTSENDMORE) { + kn->kn_flags |= EV_EOF; + return (1); + } else { + kn->kn_flags &= ~EV_EOF; + return (kn->kn_data >= so->so_snd.sb_lowat); + } +} + +static void +filt_fifodetach_notsup(struct knote *kn) +{ + +} + +static int +filt_fifo_notsup(struct knote *kn, long hint) +{ + + return (0); +} + +/* * Device close routine */ /* ARGSUSED */ @@ -172,7 +413,7 @@ fifo_close(ap) struct vop_close_args /* { struct vnode *a_vp; - int a_fflag; + int a_fflag; struct ucred *a_cred; struct thread *a_td; } */ *ap; @@ -181,33 +422,39 @@ struct fifoinfo *fip = vp->v_fifoinfo; ASSERT_VOP_ELOCKED(vp, "fifo_close"); - if (ap->a_fflag & FREAD) + if (fip == NULL) { + printf("fifo_close: no v_fifoinfo %p\n", vp); + return (0); + } + if (ap->a_fflag & FREAD) { fip->fi_readers--; - if (ap->a_fflag & FWRITE) + if (fip->fi_readers == 0) + socantsendmore(fip->fi_writesock); + } + if (ap->a_fflag & FWRITE) { fip->fi_writers--; - if (fip->fi_readers == 0 && fip->fi_writers == 0) { - vp->v_fifoinfo = NULL; - pipeclose(&fip->fi_pp->pp_rpipe); - pipeclose(&fip->fi_pp->pp_wpipe); - free(fip, M_VNODE); + if (fip->fi_writers == 0) + socantrcvmore(fip->fi_readsock); } + fifo_cleanup(vp); return (0); } /* - * Print out internel contents of a fifo vnode + * Print out internal contents of a fifo vnode. */ int -fifo_printinfo(struct vnode *vp) +fifo_printinfo(vp) + struct vnode *vp; { - struct fifoinfo *fip = vp->v_fifoinfo; + register struct fifoinfo *fip = vp->v_fifoinfo; - if (fip == NULL) { + if (fip == NULL){ printf(", NULL v_fifoinfo"); return (0); } printf(", fifo with %ld readers and %ld writers", - fip->fi_readers, fip->fi_writers); + fip->fi_readers, fip->fi_writers); return (0); } @@ -220,7 +467,7 @@ struct vnode *a_vp; } */ *ap; { - printf(" "); + printf(" "); fifo_printinfo(ap->a_vp); printf("\n"); return (0); @@ -237,83 +484,262 @@ int *a_retval; } */ *ap; { - return (0); + + switch (ap->a_name) { + case _PC_LINK_MAX: + *ap->a_retval = LINK_MAX; + return (0); + case _PC_PIPE_BUF: + *ap->a_retval = PIPE_BUF; + return (0); + case _PC_CHOWN_RESTRICTED: + *ap->a_retval = 1; + return (0); + default: + return (EINVAL); + } + /* NOTREACHED */ } /* - * FIFO advisory byte-level locks. + * Fifo advisory byte-level locks. */ +/* ARGSUSED */ static int fifo_advlock(ap) struct vop_advlock_args /* { struct vnode *a_vp; - caddr_t a_id; - int a_op; + caddr_t a_id; + int a_op; struct flock *a_fl; - int a_flags; + int a_flags; } */ *ap; { + return (ap->a_flags & F_FLOCK ? EOPNOTSUPP : EINVAL); } static int -fifo_read_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) +fifo_close_f(struct file *fp, struct thread *td) { - int error; - struct fifoinfo *fip = fp->f_data; - fp->f_data = &fip->fi_pp->pp_rpipe; - error = pipe_read(fp, uio, cred, flags, td); - fp->f_data = fip; - return (error); + return (vnops.fo_close(fp, td)); } +/* + * The implementation of ioctl() for named fifos is complicated by the fact + * that we permit O_RDWR fifo file descriptors, meaning that the actions of + * ioctls may have to be applied to both the underlying sockets rather than + * just one. The original implementation simply forward the ioctl to one + * or both sockets based on fp->f_flag. We now consider each ioctl + * separately, as the composition effect requires careful ordering. + * + * We do not blindly pass all ioctls through to the socket in order to avoid + * providing unnecessary ioctls that might be improperly depended on by + * applications (such as socket-specific, routing, and interface ioctls). + * + * Unlike sys_pipe.c, fifos do not implement the deprecated TIOCSPGRP and + * TIOCGPGRP ioctls. Earlier implementations of fifos did forward SIOCSPGRP + * and SIOCGPGRP ioctls, so we might need to re-add those here. + */ static int -fifo_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) +fifo_ioctl_f(struct file *fp, u_long com, void *data, struct ucred *cred, + struct thread *td) { + struct fifoinfo *fi; + struct file filetmp; /* Local, so need not be locked. */ int error; - struct fifoinfo *fip = fp->f_data; - fp->f_data = &fip->fi_pp->pp_wpipe; - error = pipe_write(fp, uio, cred, flags, td); - fp->f_data = fip; + + error = ENOTTY; + fi = fp->f_data; + + switch (com) { + case FIONBIO: + /* + * Non-blocking I/O is implemented at the fifo layer using + * MSG_NBIO, so does not need to be forwarded down the stack. + */ + return (0); + + case FIOASYNC: + case FIOSETOWN: + case FIOGETOWN: + /* + * These socket ioctls don't have any ordering requirements, + * so are called in an arbitrary order, and only on the + * sockets indicated by the file descriptor rights. + * + * XXXRW: If O_RDWR and the read socket accepts an ioctl but + * the write socket doesn't, the socketpair is left in an + * inconsistent state. + */ + if (fp->f_flag & FREAD) { + filetmp.f_data = fi->fi_readsock; + filetmp.f_cred = cred; + error = soo_ioctl(&filetmp, com, data, cred, td); + if (error) + return (error); + } + if (fp->f_flag & FWRITE) { + filetmp.f_data = fi->fi_writesock; + filetmp.f_cred = cred; + error = soo_ioctl(&filetmp, com, data, cred, td); + } + return (error); + + case FIONREAD: + /* + * FIONREAD will return 0 for non-readable descriptors, and + * the results of FIONREAD on the read socket for readable + * descriptors. + */ + if (!(fp->f_flag & FREAD)) { + *(int *)data = 0; + return (0); + } + filetmp.f_data = fi->fi_readsock; + filetmp.f_cred = cred; + return (soo_ioctl(&filetmp, com, data, cred, td)); - return (error); + default: + return (ENOTTY); + } } +/* + * Because fifos are now a file descriptor layer object, EVFILT_VNODE is not + * implemented. Likely, fifo_kqfilter() should be removed, and + * fifo_kqfilter_f() should know how to forward the request to the underling + * vnode using f_vnode in the file descriptor here. + */ static int -fifo_stat_f(struct file *fp, struct stat *sb, struct ucred *cred, struct thread *td) +fifo_kqfilter_f(struct file *fp, struct knote *kn) { - return (vnops.fo_stat(fp, sb, cred, td)); + struct fifoinfo *fi; + struct socket *so; + struct sockbuf *sb; + + fi = fp->f_data; + + /* + * If a filter is requested that is not supported by this file + * descriptor, don't return an error, but also don't ever generate an + * event. + */ + if ((kn->kn_filter == EVFILT_READ) && !(fp->f_flag & FREAD)) { + kn->kn_fop = &fifo_notsup_filtops; + return (0); + } + + if ((kn->kn_filter == EVFILT_WRITE) && !(fp->f_flag & FWRITE)) { + kn->kn_fop = &fifo_notsup_filtops; + return (0); + } + + switch (kn->kn_filter) { + case EVFILT_READ: + kn->kn_fop = &fiforead_filtops; + so = fi->fi_readsock; + sb = &so->so_rcv; + break; + case EVFILT_WRITE: + kn->kn_fop = &fifowrite_filtops; + so = fi->fi_writesock; + sb = &so->so_snd; + break; + default: + return (EINVAL); + } + + kn->kn_hook = (caddr_t)so; + + SOCKBUF_LOCK(sb); + knlist_add(&sb->sb_sel.si_note, kn, 1); + sb->sb_flags |= SB_KNOTE; + SOCKBUF_UNLOCK(sb); + + return (0); } static int -fifo_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td) +fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td) { - return (vnops.fo_truncate(fp, length, cred, td)); + struct fifoinfo *fip; + struct file filetmp; + int levents, revents = 0; + + fip = fp->f_data; + levents = events & + (POLLIN | POLLINIGNEOF | POLLPRI | POLLRDNORM | POLLRDBAND); + if ((fp->f_flag & FREAD) && levents) { + /* + * If POLLIN or POLLRDNORM is requested and POLLINIGNEOF is + * not, then convert the first two to the last one. This + * tells the socket poll function to ignore EOF so that we + * block if there is no writer (and no data). Callers can + * set POLLINIGNEOF to get non-blocking behavior. + */ + if (levents & (POLLIN | POLLRDNORM) && + !(levents & POLLINIGNEOF)) { + levents &= ~(POLLIN | POLLRDNORM); + levents |= POLLINIGNEOF; + } + + filetmp.f_data = fip->fi_readsock; + filetmp.f_cred = cred; + revents |= soo_poll(&filetmp, levents, cred, td); + + /* Reverse the above conversion. */ + if ((revents & POLLINIGNEOF) && !(events & POLLINIGNEOF)) { + revents |= (events & (POLLIN | POLLRDNORM)); + revents &= ~POLLINIGNEOF; + } + } + levents = events & (POLLOUT | POLLWRNORM | POLLWRBAND); + if ((fp->f_flag & FWRITE) && levents) { + filetmp.f_data = fip->fi_writesock; + filetmp.f_cred = cred; + revents |= soo_poll(&filetmp, levents, cred, td); + } + return (revents); } static int -fifo_close_f(struct file *fp, struct thread *td) +fifo_read_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) { - return (vnops.fo_close(fp, td)); + struct fifoinfo *fip; + int sflags; + + fip = fp->f_data; + KASSERT(uio->uio_rw == UIO_READ,("fifo_read mode")); + if (uio->uio_resid == 0) + return (0); + sflags = (fp->f_flag & FNONBLOCK) ? MSG_NBIO : 0; + return (soreceive(fip->fi_readsock, NULL, uio, NULL, NULL, &sflags)); } static int -fifo_ioctl_f(struct file *fp, u_long com, void *data, struct ucred *cred, - struct thread *td) +fifo_stat_f(struct file *fp, struct stat *sb, struct ucred *cred, struct thread *td) { - return (0); + + return (vnops.fo_stat(fp, sb, cred, td)); } static int -fifo_kqfilter_f(struct file *fp, struct knote *kn) +fifo_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td) { - return (0); + + return (vnops.fo_truncate(fp, length, cred, td)); } -static int -fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td) +static int +fifo_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) { - return (0); + struct fifoinfo *fip; + int sflags; + + fip = fp->f_data; + KASSERT(uio->uio_rw == UIO_WRITE,("fifo_write mode")); + sflags = (fp->f_flag & FNONBLOCK) ? MSG_NBIO : 0; + return (sosend(fip->fi_writesock, NULL, uio, 0, NULL, sflags, td)); } - ==== //depot/projects/soc2009/fifo/sys/kern/subr_pipe.c#3 (text+ko) ==== @@ -1128,6 +1128,7 @@ return (EINVAL); } + /* * we implement a very minimal set of ioctls for compatibility with sockets. */ @@ -1321,12 +1322,12 @@ * shutdown the pipe */ void -pipeclose(struct pipe *cpipe) +generic_pipe_close(struct pipe *cpipe) { struct pipepair *pp; struct pipe *ppipe; - KASSERT(cpipe != NULL, ("pipeclose: cpipe == NULL")); + KASSERT(cpipe != NULL, ("generic_pipe_close: cpipe == NULL")); PIPE_LOCK(cpipe); pipelock(cpipe, 0); @@ -1347,7 +1348,6 @@ pipelock(cpipe, 0); } - /* * Disconnect from peer, if any. */ @@ -1380,6 +1380,9 @@ knlist_clear(&cpipe->pipe_sel.si_note, 1); cpipe->pipe_present = PIPE_FINALIZED; knlist_destroy(&cpipe->pipe_sel.si_note); + + /* XXX: is it OK to put is here? */ + funsetown(&cpipe->pipe_sigio); /* * If both endpoints are now closed, release the memory for the @@ -1505,8 +1508,8 @@ if ((error = pipe_create(rpipe, 1)) != 0 || (error = pipe_create(wpipe, 0)) != 0) { - pipeclose(rpipe); - pipeclose(wpipe); + generic_pipe_close(rpipe); + generic_pipe_close(wpipe); return (error); } ==== //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#6 (text+ko) ==== @@ -67,7 +67,7 @@ /* * The pipe system call for the DTYPE_PIPE type of pipes. If we fail, let - * the zone pick up the pieces via pipeclose(). + * the zone pick up the pieces via generic_pipe_close(). */ int kern_pipe(struct thread *td, int fildes[2]) @@ -82,8 +82,8 @@ error = falloc(td, &rf, &fd); if (error) { - pipeclose(rpipe); - pipeclose(wpipe); + generic_pipe_close(rpipe); + generic_pipe_close(wpipe); return (error); } /* An extra reference on `rf' has been held for us by falloc(). */ @@ -101,7 +101,7 @@ fdclose(fdp, rf, fildes[0], td); fdrop(rf, td); /* rpipe has been closed by fdrop(). */ - pipeclose(wpipe); + generic_pipe_close(wpipe); return (error); } /* An extra reference on `wf' has been held for us by falloc(). */ @@ -185,8 +185,7 @@ fp->f_ops = &badfileops; fp->f_data = NULL; - funsetown(&cpipe->pipe_sigio); - pipeclose(cpipe); + generic_pipe_close(cpipe); return (0); } ==== //depot/projects/soc2009/fifo/sys/sys/pipe.h#5 (text+ko) ==== @@ -139,7 +139,6 @@ #define PIPE_UNLOCK(pipe) mtx_unlock(PIPE_MTX(pipe)) #define PIPE_LOCK_ASSERT(pipe, type) mtx_assert(PIPE_MTX(pipe), (type)) -void pipeclose(struct pipe *cpipe); int generic_pipe_read(struct file *fp, struct uio *uio, struct ucred *active_cred, int flags, struct thread *td); int generic_pipe_write(struct file *fp, struct uio *uio, struct ucred *active_cred, @@ -154,5 +153,6 @@ struct thread *td); int generic_pipe_kqfilter(struct file *fp, struct knote *kn); int generic_pipe_create(struct thread *td, struct pipe **p_rpipe, struct pipe **p_wpipe); +void generic_pipe_close(struct pipe *cpipe); #endif /* !_SYS_PIPE_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Jun 6 04:27:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C2101065670; Sat, 6 Jun 2009 04: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 2C0A6106566C for ; Sat, 6 Jun 2009 04:27:04 +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 197808FC14 for ; Sat, 6 Jun 2009 04:27:04 +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 n564R3hG028132 for ; Sat, 6 Jun 2009 04:27:03 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n564R3G0028130 for perforce@freebsd.org; Sat, 6 Jun 2009 04:27:03 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 6 Jun 2009 04:27:03 GMT Message-Id: <200906060427.n564R3G0028130@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 163626 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 04:27:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=163626 Change 163626 by thompsa@thompsa_burger on 2009/06/06 04:26:45 - assert locks on load - remove printf - remove double queue Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#12 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/controller/ehci.c#12 (text+ko) ==== @@ -2201,10 +2201,9 @@ /* dequeue transfer */ usb2_transfer_done(urb, error); - /* Load next */ + /* load next */ urb = TAILQ_FIRST(&pipe->urb_hc_q); if (error == 0 && urb != NULL) { - printf("LOAD NEXT %p\n", urb); TAILQ_REMOVE(&pipe->urb_hc_q, urb, ub_hcnext); error = (pipe->methods->load)(urb); if (error) @@ -2276,12 +2275,11 @@ ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); uint32_t temp; + USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + /* setup TD's and QH */ ehci_setup_standard_chain(urb, &sc->sc_async_p_last); - /* put transfer on interrupt queue */ - ehci_transfer_intr_enqueue(urb); - /* XXX Performance quirk: Some Host Controllers have a too low * interrupt rate. Issue an IAAD to stimulate the Host * Controller after queueing the BULK transfer. @@ -2327,6 +2325,8 @@ struct usb_pipe *pipe = urb->ub_pipe; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); + USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + /* setup TD's and QH */ ehci_setup_standard_chain(urb, &sc->sc_async_p_last); @@ -2425,6 +2425,8 @@ struct usb_pipe *pipe = urb->ub_pipe; ehci_softc_t *sc = EHCI_BUS2SC(pipe->xroot->bus); + USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + /* setup TD's and QH */ ehci_setup_standard_chain(urb, &sc->sc_intr_p_last[pipe->qh_pos]); @@ -2524,6 +2526,8 @@ #endif + USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + DPRINTFN(6, "urb=%p next=%d nframes=%d\n", urb, pipe->endpoint->isoc_next, urb->nframes); @@ -2814,6 +2818,8 @@ #endif + USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); + DPRINTFN(6, "urb=%p next=%d nframes=%d\n", urb, pipe->endpoint->isoc_next, urb->nframes); From owner-p4-projects@FreeBSD.ORG Sat Jun 6 04:32:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C09A01065670; Sat, 6 Jun 2009 04:32: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 807F4106564A for ; Sat, 6 Jun 2009 04:32:09 +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 63C5D8FC08 for ; Sat, 6 Jun 2009 04:32:09 +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 n564W9Qb028493 for ; Sat, 6 Jun 2009 04:32:09 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n564W9IF028491 for perforce@freebsd.org; Sat, 6 Jun 2009 04:32:09 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 6 Jun 2009 04:32:09 GMT Message-Id: <200906060432.n564W9IF028491@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 163627 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 04:32:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=163627 Change 163627 by thompsa@thompsa_burger on 2009/06/06 04:31:39 Cleanups and some function renames. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#15 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#14 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#10 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_core.h#15 (text+ko) ==== @@ -136,6 +136,7 @@ * are waiting on */ struct usb_page *dma_page_ptr; void *local_buffer; + int ub_buflen; usb_frlength_t *frlengths; struct usb_page_cache *frbuffers; @@ -152,9 +153,11 @@ * transferred */ usb_error_t error; + /* XXX make these proper flags, these are mainly testing */ int do_sync; int is_done; int is_pending; + int on_queue; void *priv; /* device driver data pointer 2 */ }; @@ -209,7 +212,6 @@ struct usb_pipe_flags flags; struct usb_xfer_flags_int flags_int; - struct usb_urb urb0; }; /* external variables */ @@ -229,9 +231,9 @@ usb_error_t usb2_set_alt_interface_index(struct usb_device *udev, uint8_t iface_index, uint8_t alt_index); uint32_t usb2_get_isoc_fps(struct usb_device *udev); -void usb2_set_frame_data(struct usb_pipe *pipe, void *ptr, +void usb2_set_frame_data(struct usb_urb *urb, void *ptr, usb_frcount_t frindex); -void usb2_set_frame_offset(struct usb_pipe *pipe, usb_frlength_t offset, +void usb2_set_frame_offset(struct usb_urb *urb, usb_frlength_t offset, usb_frcount_t frindex); void usb2_transfer_clear_stall(struct usb_pipe *pipe); void usb2_transfer_set_stall(struct usb_pipe *pipe); ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_debug.c#9 (text+ko) ==== @@ -129,8 +129,8 @@ if (pipe == NULL) { return; } - printf(" nurb=%d nfree=%d urb0=%p\n", - pipe->urb_nurb, pipe->urb_nfree, &pipe->urb0); + printf(" nurb=%d nfree=%d\n", + pipe->urb_nurb, pipe->urb_nfree); } /*------------------------------------------------------------------------* ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_generic.c#14 (text+ko) ==== @@ -1042,7 +1042,7 @@ return (error); } /* reset first frame */ - usb2_set_frame_offset(pipe, 0, 0); + usb2_set_frame_offset(urb, 0, 0); if (pipe->flags_int.control_xfr) { @@ -1145,7 +1145,7 @@ kaddr = USB_ADD_BYTES(kaddr, offset); } else { /* set current frame offset */ - usb2_set_frame_offset(pipe, offset, n); + usb2_set_frame_offset(urb, offset, n); /* get kernel buffer address */ kaddr = urb->frbuffers[n].buffer; ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#10 (text+ko) ==== @@ -463,8 +463,8 @@ urb->frlengths[0] = 0; - usb2_set_frame_offset(pipe, 0, 0); - usb2_set_frame_offset(pipe, sizeof(req), 1); + usb2_set_frame_offset(urb, 0, 0); + usb2_set_frame_offset(urb, sizeof(req), 1); /* get the current request, if any */ @@ -738,7 +738,7 @@ usb2_copy_in(urb->frbuffers + 1, 0, src_mcopy, max_len); } else { - usb2_set_frame_data(pipe, + usb2_set_frame_data(urb, USB_ADD_BYTES(src_zcopy, off), 1); } urb->frlengths[1] = max_len; From owner-p4-projects@FreeBSD.ORG Sat Jun 6 04:33:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C94741065674; Sat, 6 Jun 2009 04:33:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 88FE3106564A for ; Sat, 6 Jun 2009 04:33:10 +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 7592B8FC17 for ; Sat, 6 Jun 2009 04:33:10 +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 n564XAJE028570 for ; Sat, 6 Jun 2009 04:33:10 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n564XA1A028568 for perforce@freebsd.org; Sat, 6 Jun 2009 04:33:10 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 6 Jun 2009 04:33:10 GMT Message-Id: <200906060433.n564XA1A028568@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 163628 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 04:33:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=163628 Change 163628 by thompsa@thompsa_burger on 2009/06/06 04:32:19 - Allocate multiple urbs - Add urb list functions Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#14 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#5 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#14 (text+ko) ==== @@ -61,6 +61,11 @@ #include #include +enum { + REQ_SIZE = 8, + MIN_PKT = 8, +}; + struct usb2_std_packet_size { struct { uint16_t min; /* inclusive */ @@ -114,6 +119,9 @@ static void usb2_get_std_packet_size(struct usb2_std_packet_size *ptr, uint8_t type, enum usb_dev_speed speed); static void usb_submit_urb_flags(struct usb_urb *, int); +static struct usb_urb *urb_alloc(struct usb_pipe *, struct usb_setup_params *, + uint8_t, usb_frcount_t, usb_frcount_t); +static void urb_free(struct usb_urb *); /*------------------------------------------------------------------------* @@ -297,6 +305,101 @@ } #endif +static struct usb_urb * +urb_alloc(struct usb_pipe *pipe, struct usb_setup_params *parm, + uint8_t type, usb_frcount_t n_frlengths, usb_frcount_t n_frbuffers) +{ + const struct usb_config *setup = parm->curr_setup; + struct usb_urb *urb; + usb_frlength_t bufsiz; + usb_frcount_t x; + + bufsiz = setup->flags.ext_buffer == 1 ? 0 : parm->bufsize; + + urb = malloc(sizeof(struct usb_urb) + bufsiz, M_USB, + M_WAITOK | M_ZERO); + urb->ub_pipe = pipe; + urb->ub_buflen = bufsiz; + urb->local_buffer = urb + 1; + + urb->frlengths = malloc(sizeof(usb_frlength_t) * n_frlengths, + M_USB, M_WAITOK | M_ZERO); + urb->frbuffers = malloc(sizeof(struct usb_page_cache) * n_frbuffers, + M_USB, M_WAITOK | M_ZERO); + +#if USB_HAVE_BUSDMA + if (pipe->flags_int.bdma_enable) { + /* + * Setup "dma_page_ptr". + * + * Proof for formula below: + * + * Assume there are three USB frames having length "a", + * "b" and "c". These USB frames will at maximum need + * "z" "usb_page" structures. "z" is given by: + * + * z = ((a / USB_PAGE_SIZE) + 2) + + * ((b / USB_PAGE_SIZE) + 2) + + * ((c / USB_PAGE_SIZE) + 2); + * + * Constraining "a", "b" and "c" like this: + * + * (a + b + c) <= parm->bufsize + * + * We know that: + * + * z <= ((parm->bufsize / USB_PAGE_SIZE) + (3*2)); + * + * Here is the general formula: + */ + urb->dma_page_ptr = malloc(sizeof(struct usb_page) * + ((2 * n_frbuffers) + (parm->bufsize / USB_PAGE_SIZE)), + M_USB, M_WAITOK | M_ZERO); + } +#endif + /* initialize frame buffers */ + for (x = 0; x < n_frbuffers; x++) { + urb->frbuffers[x].tag_parent = + &pipe->xroot->dma_parent_tag; +#if USB_HAVE_BUSDMA + if (pipe->flags_int.bdma_enable && + (parm->bufsize_max > 0)) { + + if (usb2_pc_dmamap_create( + urb->frbuffers + x, + parm->bufsize_max)) { + goto error; + } + } +#endif + } + + if (bufsiz > 0) { + usb2_set_frame_offset(urb, 0, 0); + if ((type == UE_CONTROL) && (n_frbuffers > 1)) + usb2_set_frame_offset(urb, REQ_SIZE, 1); + } + /* initialize max frame count */ + urb->max_frame_count = pipe->nframes; + urb->nframes = pipe->nframes; + + return (urb); + +error: + urb_free(urb); + return (NULL); +} + +static void +urb_free(struct usb_urb *urb) +{ + + free(urb->dma_page_ptr, M_USB); + free(urb->frbuffers, M_USB); + free(urb->frlengths, M_USB); + free(urb, M_USB); +} + /*------------------------------------------------------------------------* * usb2_transfer_setup_sub - transfer setup subroutine * @@ -309,10 +412,6 @@ void usb2_transfer_setup_sub(struct usb_setup_params *parm) { - enum { - REQ_SIZE = 8, - MIN_PKT = 8, - }; struct usb_pipe *pipe = parm->curr_pipe; const struct usb_config *setup = parm->curr_setup; struct usb_endpoint_descriptor *edesc; @@ -320,9 +419,9 @@ struct usb_urb *urb; usb_frcount_t n_frlengths; usb_frcount_t n_frbuffers; - usb_frcount_t x; uint8_t type; uint8_t zmps; + int i; /* * Sanity check. The following parameters must be initialized before @@ -338,15 +437,9 @@ type = (edesc->bmAttributes & UE_XFERTYPE); - /* XXX */ TAILQ_INIT(&pipe->urb_hc_q); TAILQ_INIT(&pipe->urb_pending_q); TAILQ_INIT(&pipe->urb_free_q); - urb = &pipe->urb0; - urb->ub_pipe = pipe; - TAILQ_INSERT_TAIL(&pipe->urb_free_q, urb, ub_next); - pipe->urb_nfree = 1; - pipe->urb_nurb = 1; pipe->flags = setup->flags; pipe->nframes = setup->frames; @@ -602,80 +695,30 @@ } pipe->max_data_length -= REQ_SIZE; } - /* setup "frlengths" */ - - pipe->urb0.frlengths = parm->xfer_length_ptr; - parm->xfer_length_ptr += n_frlengths; - - /* setup "frbuffers" */ - - pipe->urb0.frbuffers = parm->xfer_page_cache_ptr; - - parm->xfer_page_cache_ptr += n_frbuffers; - /* - * check if we need to setup - * a local buffer: + * Compute maximum buffer size */ - if (!pipe->flags.ext_buffer) { + if (parm->bufsize_max < parm->bufsize) { + parm->bufsize_max = parm->bufsize; + } - /* align data */ - parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); - - if (parm->buf) { - - pipe->urb0.local_buffer = - USB_ADD_BYTES(parm->buf, parm->size[0]); - - usb2_set_frame_offset(pipe, 0, 0); - - if ((type == UE_CONTROL) && (n_frbuffers > 1)) { - usb2_set_frame_offset(pipe, REQ_SIZE, 1); + /* Allocate the URBs */ + if (parm->buf) { + pipe->urb_nurb = setup->urb_count ? setup->urb_count : 1; + for (i = 0; i < pipe->urb_nurb; i++) { + urb = urb_alloc(pipe, parm, type, n_frlengths, + n_frbuffers); + if (urb == NULL) { + parm->err = USB_ERR_NOMEM; + goto done; } + TAILQ_INSERT_TAIL(&pipe->urb_free_q, urb, ub_next); + pipe->urb_nfree++; } - parm->size[0] += parm->bufsize; - - /* align data again */ - parm->size[0] += ((-parm->size[0]) & (USB_HOST_ALIGN - 1)); } - /* - * Compute maximum buffer size - */ - if (parm->bufsize_max < parm->bufsize) { - parm->bufsize_max = parm->bufsize; - } -#if USB_HAVE_BUSDMA - if (pipe->flags_int.bdma_enable) { - /* - * Setup "dma_page_ptr". - * - * Proof for formula below: - * - * Assume there are three USB frames having length "a", "b" and - * "c". These USB frames will at maximum need "z" - * "usb_page" structures. "z" is given by: - * - * z = ((a / USB_PAGE_SIZE) + 2) + ((b / USB_PAGE_SIZE) + 2) + - * ((c / USB_PAGE_SIZE) + 2); - * - * Constraining "a", "b" and "c" like this: - * - * (a + b + c) <= parm->bufsize - * - * We know that: - * - * z <= ((parm->bufsize / USB_PAGE_SIZE) + (3*2)); - * - * Here is the general formula: - */ - pipe->urb0.dma_page_ptr = parm->dma_page_ptr; - parm->dma_page_ptr += (2 * n_frbuffers); - parm->dma_page_ptr += (parm->bufsize / USB_PAGE_SIZE); - } -#endif if (zmps) { /* correct maximum data length */ pipe->max_data_length = 0; @@ -690,31 +733,7 @@ parm->err = USB_ERR_INVAL; goto done; } - /* initialize max frame count */ - pipe->urb0.max_frame_count = pipe->nframes; - - /* initialize frame buffers */ - - if (parm->buf) { - for (x = 0; x != n_frbuffers; x++) { - pipe->urb0.frbuffers[x].tag_parent = - &pipe->xroot->dma_parent_tag; -#if USB_HAVE_BUSDMA - if (pipe->flags_int.bdma_enable && - (parm->bufsize_max > 0)) { - - if (usb2_pc_dmamap_create( - pipe->urb0.frbuffers + x, - parm->bufsize_max)) { - parm->err = USB_ERR_NOMEM; - goto done; - } - } -#endif - } - } - pipe->urb0.nframes = pipe->nframes; done: if (parm->err) { /* @@ -724,8 +743,6 @@ pipe->max_frame_size = 1; pipe->max_packet_size = 1; pipe->max_data_length = 0; - pipe->urb0.nframes = 0; - pipe->urb0.max_frame_count = 0; } } @@ -783,6 +800,10 @@ parm.err = USB_ERR_BAD_BUFSIZE; DPRINTF("invalid bufsize\n"); } + if (setup->urb_count > 4) { + parm.err = USB_ERR_BAD_BUFSIZE; + DPRINTF("too many urbs requested\n"); + } if (setup->callback == NULL) { parm.err = USB_ERR_NO_CALLBACK; DPRINTF("no callback\n"); @@ -1128,6 +1149,7 @@ usb_pipe_close(struct usb_pipe **pxfer, int n_setup) { struct usb_pipe *pipe; + struct usb_urb *urb; struct usb_xfer_root *info; uint8_t needs_delay = 0; @@ -1171,6 +1193,11 @@ KASSERT (pipe->urb_nfree == pipe->urb_nurb, ("leaked %d urbs", pipe->urb_nurb - pipe->urb_nfree)); + while ((urb = TAILQ_FIRST(&pipe->urb_free_q)) != NULL) { + TAILQ_REMOVE(&pipe->urb_free_q, urb, ub_next); + urb_free(urb); + } + #if USB_HAVE_BUSDMA if (pipe->flags_int.bdma_enable) needs_delay = 1; @@ -1421,8 +1448,6 @@ printf("pipe halted, queuing %p\n", urb); TAILQ_INSERT_TAIL(&pipe->urb_pending_q, urb, ub_next); return; - } else { - KASSERT(TAILQ_FIRST(&pipe->urb_pending_q) == NULL, ("odd")); } /* Only open the USB transfer once! */ @@ -1657,6 +1682,10 @@ usb_pipe_halt(struct usb_pipe *pipe) { + if (pipe == NULL) { + printf("%s: null pipe!!?!\n", __func__); + return; + } USB_PIPE_LOCK(pipe); pipe->flags_int.halted = 1; @@ -1742,10 +1771,10 @@ * than zero gives undefined results! *------------------------------------------------------------------------*/ void -usb2_set_frame_data(struct usb_pipe *pipe, void *ptr, usb_frcount_t frindex) +usb2_set_frame_data(struct usb_urb *urb, void *ptr, usb_frcount_t frindex) { /* set virtual address to load and length */ - (&pipe->urb0)->frbuffers[frindex].buffer = ptr; + urb->frbuffers[frindex].buffer = ptr; } /*------------------------------------------------------------------------* @@ -1755,15 +1784,19 @@ * of the USB DMA buffer allocated for this USB transfer. *------------------------------------------------------------------------*/ void -usb2_set_frame_offset(struct usb_pipe *pipe, usb_frlength_t offset, +usb2_set_frame_offset(struct usb_urb *urb, usb_frlength_t offset, usb_frcount_t frindex) { + struct usb_pipe *pipe = urb->ub_pipe; + USB_ASSERT(!pipe->flags.ext_buffer, ("Cannot offset data frame " "when the USB buffer is external!\n")); + /* USB_ASSERT(offset < urb->ub_buflen, + ("frame overflow %d > %d", offset, urb->ub_buflen)); */ /* set virtual address to load */ - (&pipe->urb0)->frbuffers[frindex].buffer = - USB_ADD_BYTES((&pipe->urb0)->local_buffer, offset); + urb->frbuffers[frindex].buffer = + USB_ADD_BYTES(urb->local_buffer, offset); } /*------------------------------------------------------------------------* @@ -2743,15 +2776,14 @@ USB_PIPE_LOCK(pipe); urb = TAILQ_FIRST(&pipe->urb_free_q); - if (urb == NULL) - panic("out of urbs"); + if (urb != NULL) { + TAILQ_REMOVE(&pipe->urb_free_q, urb, ub_next); + pipe->urb_nfree--; + KASSERT(pipe->urb_nfree >= 0, ("negative count")); - TAILQ_REMOVE(&pipe->urb_free_q, urb, ub_next); - pipe->urb_nfree--; - KASSERT(pipe->urb_nfree >= 0, ("negative count")); + usb_init_urb(urb); + } USB_PIPE_UNLOCK(pipe); - - usb_init_urb(urb); return (urb); } @@ -2808,7 +2840,7 @@ if (ptr != NULL) *ptr = urb->frbuffers->buffer; if (len != NULL) - *len = urb->sumlen; + *len = urb->ub_pipe->max_data_length; if (alen != NULL) *alen = urb->actlen; if (err != NULL) @@ -2816,8 +2848,52 @@ } void -urb_set_framelen(struct usb_urb *urb, int frame, int len) +urb_set_framelen(struct usb_urb *urb, usb_frcount_t frame, usb_frlength_t len) { - /* XXX checking */ + KASSERT(len <= urb->ub_pipe->max_data_length, + ("%s: urb buffer overflow", __func__)); urb->frlengths[frame] = len; } + +void +urb_list_init(usb_urb_list *list) +{ + + TAILQ_INIT(&list->head); + list->count = 0; +} + +void +urb_list_insert(usb_urb_list *list, struct usb_urb *urb) +{ + + KASSERT(urb->on_queue == 0, ("urb already qeueued")); + TAILQ_INSERT_TAIL(&list->head, urb, ub_next); + list->count++; + urb->on_queue = 1; +} + +void +urb_list_remove(usb_urb_list *list, struct usb_urb *urb) +{ + + KASSERT(urb->on_queue == 1, ("urb not on qeueue")); + KASSERT(list->count > 0, ("list count corrupt")); + TAILQ_REMOVE(&list->head, urb, ub_next); + list->count--; + urb->on_queue = 0; +} + +struct usb_urb * +urb_list_dequeue(usb_urb_list *list) +{ + struct usb_urb *urb; + + urb = TAILQ_FIRST(&list->head); + if (urb != NULL) + urb_list_remove(list, urb); + + KASSERT(urb != NULL || list->count == 0, ("list count corrupt")); + + return (urb); +} ==== //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#5 (text+ko) ==== @@ -93,6 +93,11 @@ typedef usb_error_t (usb_handle_req_t)(struct usb_device *, struct usb_device_request *, const void **, uint16_t *); +typedef struct { + TAILQ_HEAD(, usb_urb) head; + int count; +} usb_urb_list; + /* * The following structure defines a set of USB transfer flags. */ @@ -132,6 +137,7 @@ uint8_t direction; /* pipe direction */ uint8_t ep_index; /* pipe index match to use */ uint8_t if_index; /* "ifaces" index to use */ + uint8_t urb_count; /* number if urbs avaialble */ }; /* @@ -300,7 +306,13 @@ void *urb_get_softc(struct usb_urb *urb); void *urb_get_priv(struct usb_urb *urb); void urb_set_priv(struct usb_urb *urb, void *); -void urb_set_framelen(struct usb_urb *urb, int frame, int len); +void urb_set_framelen(struct usb_urb *urb, usb_frcount_t frame, + usb_frlength_t len); + +void urb_list_init(usb_urb_list *); +void urb_list_insert(usb_urb_list *, struct usb_urb *); +void urb_list_remove(usb_urb_list *, struct usb_urb *); +struct usb_urb *urb_list_dequeue(usb_urb_list *); void device_set_usb_desc(device_t dev); void usb_pause_mtx(struct mtx *mtx, int _ticks); From owner-p4-projects@FreeBSD.ORG Sat Jun 6 04:34:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F72D1065673; Sat, 6 Jun 2009 04:34:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F33AD106564A for ; Sat, 6 Jun 2009 04:34:11 +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 D73728FC1B for ; Sat, 6 Jun 2009 04:34:11 +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 n564YBSB028664 for ; Sat, 6 Jun 2009 04:34:11 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n564YBwc028662 for perforce@freebsd.org; Sat, 6 Jun 2009 04:34:11 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 6 Jun 2009 04:34:11 GMT Message-Id: <200906060434.n564YBwc028662@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 163629 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 04:34:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=163629 Change 163629 by thompsa@thompsa_burger on 2009/06/06 04:33:41 - Use multiple urbs for tx and rx - Use urb list functions Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#9 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#5 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#9 (text+ko) ==== @@ -387,6 +387,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .bufsize = (MCLBYTES + RT2573_TX_DESC_SIZE + 8), + .urb_count = RUM_TX_LIST_COUNT, .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, .callback = rum_bulk_write_callback, .timeout = 5000, /* ms */ @@ -396,6 +397,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .bufsize = (MCLBYTES + RT2573_RX_DESC_SIZE), + .urb_count = RUM_RX_LIST_COUNT, .flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, .callback = rum_bulk_read_callback, }, @@ -541,6 +543,10 @@ struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic; + RUM_LOCK(sc); + rum_stop(sc); + RUM_UNLOCK(sc); + /* stop all USB transfers */ usb_pipe_close(sc->sc_xfer, RUM_N_TRANSFER); @@ -647,8 +653,7 @@ data->ni = NULL; } usb_init_urb(data->urb); /* reset state */ - STAILQ_INSERT_TAIL(&sc->tx_free, data, next); - sc->tx_nfree++; + urb_list_insert(&sc->tx_free, data->urb); } static void @@ -657,8 +662,7 @@ struct rum_tx_data *data; int i; - sc->tx_nfree = 0; - STAILQ_INIT(&sc->tx_free); + urb_list_init(&sc->tx_free); for (i = 0; i < RUM_TX_LIST_COUNT; i++) { data = &sc->tx_data[i]; @@ -666,8 +670,8 @@ data->sc = sc; data->urb = usb_get_urb(sc->sc_xfer[RUM_BULK_WR], 0); KASSERT(data->urb != NULL, ("usb_get_urb failed")); - urb_set_priv(data->urb, &data); - STAILQ_INSERT_TAIL(&sc->tx_free, data, next); + urb_set_priv(data->urb, data); + urb_list_insert(&sc->tx_free, data->urb); sc->tx_nfree++; } } @@ -678,10 +682,6 @@ struct rum_tx_data *data; int i; - /* make sure any subsequent use of the queues will fail */ - sc->tx_nfree = 0; - STAILQ_INIT(&sc->tx_free); - /* free up all node references and mbufs */ for (i = 0; i < RUM_TX_LIST_COUNT; i++) { data = &sc->tx_data[i]; @@ -695,10 +695,13 @@ data->ni = NULL; } if (data->urb != NULL) { + urb_list_remove(&sc->tx_free, data->urb); usb_free_urb(data->urb); data->urb = NULL; } } + if (sc->tx_free.count != 0) + printf("leaked %d urbs\n", sc->tx_free.count); } static int @@ -772,15 +775,14 @@ struct rum_tx_data *data; int len; - printf("rum_bulk_write_callback(%p, %d)\n", urb, error); - urb_get_status(urb, NULL, NULL, &len, NULL); DPRINTFN(11, "transfer complete, %d bytes\n", len); /* free resources */ data = urb_get_priv(urb); + RUM_LOCK(sc); rum_tx_free(data, 0); - usb_free_urb(urb); + RUM_UNLOCK(sc); if (error) { if (error == USB_ERR_CANCELLED) @@ -815,7 +817,7 @@ } urb_get_status(urb, (void **)&desc, NULL, &actlen, NULL); - DPRINTFN(0, "rx done, actlen=%d\n", actlen); + DPRINTFN(5, "rx done, urb=%p actlen=%d\n", urb, actlen); if (actlen < RT2573_RX_DESC_SIZE + IEEE80211_MIN_LEN) { DPRINTF("%s: xfer too short %d\n", @@ -950,6 +952,7 @@ const struct ieee80211_frame *wh; struct rum_tx_data *data; struct rum_tx_desc *desc; + struct usb_urb *urb; struct mbuf *mprot; int protrate, ackrate, pktlen, flags, isshort, xferlen; uint16_t dur; @@ -980,13 +983,12 @@ /* XXX stat + msg */ return (ENOBUFS); } - data = STAILQ_FIRST(&sc->tx_free); - STAILQ_REMOVE_HEAD(&sc->tx_free, next); - sc->tx_nfree--; + urb = urb_list_dequeue(&sc->tx_free); + data = urb_get_priv(urb); - urb_get_status(data->urb, (void **)&data->buf, &xferlen, NULL, NULL); + urb_get_status(urb, (void **)&data->buf, &xferlen, NULL, NULL); if (xferlen < m->m_pkthdr.len + RT2573_TX_DESC_SIZE) { - //m_freem(m); /* XXX data leak */ + urb_list_insert(&sc->tx_free, urb); return EINVAL; } @@ -994,7 +996,7 @@ data->m = mprot; data->ni = ieee80211_ref_node(ni); - vap = data->ni->ni_vap; + vap = ni->ni_vap; if (ieee80211_radiotap_active_vap(vap)) { struct rum_tx_radiotap_header *tap = &sc->sc_txtap; @@ -1013,8 +1015,8 @@ m->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, rate); /* NB: no roundup necessary */ - urb_set_framelen(data->urb, 0, RT2573_TX_DESC_SIZE + mprot->m_pkthdr.len); - usb_submit_urb(data->urb); + urb_set_framelen(urb, 0, RT2573_TX_DESC_SIZE + mprot->m_pkthdr.len); + usb_submit_urb(urb); return 0; } @@ -1027,6 +1029,7 @@ struct ieee80211com *ic = ifp->if_l2com; struct rum_tx_data *data; struct rum_tx_desc *desc; + struct usb_urb *urb; struct ieee80211_frame *wh; const struct ieee80211_txparam *tp; struct ieee80211_key *k; @@ -1036,9 +1039,8 @@ RUM_LOCK_ASSERT(sc, MA_OWNED); - data = STAILQ_FIRST(&sc->tx_free); - STAILQ_REMOVE_HEAD(&sc->tx_free, next); - sc->tx_nfree--; + urb = urb_list_dequeue(&sc->tx_free); + data = urb_get_priv(urb); wh = mtod(m0, struct ieee80211_frame *); if (wh->i_fc[1] & IEEE80211_FC1_WEP) { @@ -1066,9 +1068,10 @@ flags |= RT2573_TX_TIMESTAMP; } - urb_get_status(data->urb, (void **)&data->buf, &xferlen, NULL, NULL); + urb_get_status(urb, (void **)&data->buf, &xferlen, NULL, NULL); if (xferlen < m0->m_pkthdr.len + RT2573_TX_DESC_SIZE) { - m_freem(m0); /* XXX data leak */ + urb_list_insert(&sc->tx_free, urb); + m_freem(m0); return EINVAL; } @@ -1076,7 +1079,6 @@ data->m = m0; data->ni = ni; - vap = data->ni->ni_vap; if (ieee80211_radiotap_active_vap(vap)) { struct rum_tx_radiotap_header *tap = &sc->sc_txtap; @@ -1103,8 +1105,8 @@ DPRINTFN(10, "sending mgt frame len=%d rate=%d xfer len=%d\n", m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, tp->mgmtrate, xferlen); - urb_set_framelen(data->urb, 0, xferlen); - usb_submit_urb(data->urb); + urb_set_framelen(urb, 0, xferlen); + usb_submit_urb(urb); return (0); } @@ -1117,6 +1119,7 @@ struct ieee80211vap *vap; struct rum_tx_data *data; struct rum_tx_desc *desc; + struct usb_urb *urb; uint32_t flags; int rate, error, xferlen; @@ -1136,24 +1139,24 @@ params->ibp_flags & IEEE80211_BPF_RTS ? IEEE80211_PROT_RTSCTS : IEEE80211_PROT_CTSONLY, rate); - if (error || sc->tx_nfree == 0) { + if (error || sc->tx_free.count == 0) { m_freem(m0); return ENOBUFS; } flags |= RT2573_TX_LONG_RETRY | RT2573_TX_IFS_SIFS; } - data = STAILQ_FIRST(&sc->tx_free); - STAILQ_REMOVE_HEAD(&sc->tx_free, next); - sc->tx_nfree--; + urb = urb_list_dequeue(&sc->tx_free); + data = urb_get_priv(urb); - urb_get_status(data->urb, (void **)&data->buf, &xferlen, NULL, NULL); + urb_get_status(urb, (void **)&data->buf, &xferlen, NULL, NULL); if (xferlen < m0->m_pkthdr.len + RT2573_TX_DESC_SIZE) { - m_freem(m0); /* XXX data leak */ + urb_list_insert(&sc->tx_free, urb); + m_freem(m0); return EINVAL; } - vap = data->ni->ni_vap; + vap = ni->ni_vap; if (ieee80211_radiotap_active_vap(vap)) { struct rum_tx_radiotap_header *tap = &sc->sc_txtap; @@ -1185,8 +1188,8 @@ DPRINTFN(10, "sending raw frame len=%u rate=%u xfer len=%u\n", m0->m_pkthdr.len, rate, xferlen); - urb_set_framelen(data->urb, 0, xferlen); - usb_submit_urb(data->urb); + urb_set_framelen(urb, 0, xferlen); + usb_submit_urb(urb); return 0; } @@ -1199,6 +1202,7 @@ struct ieee80211com *ic = ifp->if_l2com; struct rum_tx_data *data; struct rum_tx_desc *desc; + struct usb_urb *urb; struct ieee80211_frame *wh; const struct ieee80211_txparam *tp; struct ieee80211_key *k; @@ -1238,7 +1242,7 @@ prot = ic->ic_protmode; if (prot != IEEE80211_PROT_NONE) { error = rum_sendprot(sc, m0, ni, prot, rate); - if (error || sc->tx_nfree == 0) { + if (error || sc->tx_free.count == 0) { m_freem(m0); return ENOBUFS; } @@ -1246,13 +1250,13 @@ } } - data = STAILQ_FIRST(&sc->tx_free); - STAILQ_REMOVE_HEAD(&sc->tx_free, next); - sc->tx_nfree--; + urb = urb_list_dequeue(&sc->tx_free); + data = urb_get_priv(urb); - urb_get_status(data->urb, (void **)&data->buf, &xferlen, NULL, NULL); + urb_get_status(urb, (void **)&data->buf, &xferlen, NULL, NULL); if (xferlen < m0->m_pkthdr.len + RT2573_TX_DESC_SIZE) { - m_freem(m0); /* XXX data leak */ + urb_list_insert(&sc->tx_free, urb); + m_freem(m0); return EINVAL; } @@ -1269,7 +1273,6 @@ *(uint16_t *)wh->i_dur = htole16(dur); } - vap = data->ni->ni_vap; if (ieee80211_radiotap_active_vap(vap)) { struct rum_tx_radiotap_header *tap = &sc->sc_txtap; @@ -1290,8 +1293,8 @@ DPRINTFN(10, "sending frame len=%d rate=%d xfer len=%d\n", m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, rate, xferlen); - urb_set_framelen(data->urb, 0, xferlen); - usb_submit_urb(data->urb); + urb_set_framelen(urb, 0, xferlen); + usb_submit_urb(urb); return 0; } @@ -1312,7 +1315,7 @@ IFQ_DRV_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; - if (sc->tx_nfree < RUM_TX_MINFREE) { + if (sc->tx_free.count < RUM_TX_MINFREE) { IFQ_DRV_PREPEND(&ifp->if_snd, m); ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; @@ -2042,8 +2045,9 @@ /* * Start up the receive pipe. */ - urb = usb_get_urb(sc->sc_xfer[RUM_BULK_RD], 0); - usb_submit_urb(urb); + while ((urb = usb_get_urb(sc->sc_xfer[RUM_BULK_RD], 0)) != NULL) { + usb_submit_urb(urb); + } ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; ifp->if_drv_flags |= IFF_DRV_RUNNING; @@ -2175,7 +2179,7 @@ ieee80211_free_node(ni); return ENETDOWN; } - if (sc->tx_nfree < RUM_TX_MINFREE) { + if (sc->tx_free.count < RUM_TX_MINFREE) { ifp->if_drv_flags |= IFF_DRV_OACTIVE; RUM_UNLOCK(sc); m_freem(m); ==== //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#5 (text+ko) ==== @@ -17,8 +17,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RUM_TX_LIST_COUNT 1 -#define RUM_TX_MINFREE 0 +#define RUM_RX_LIST_COUNT 2 +#define RUM_TX_LIST_COUNT 4 +#define RUM_TX_MINFREE 2 struct rum_rx_radiotap_header { struct ieee80211_radiotap_header wr_ihdr; @@ -103,7 +104,8 @@ uint8_t rffreq; struct rum_tx_data tx_data[RUM_TX_LIST_COUNT]; - rum_txdhead tx_free; + usb_urb_list tx_free; + usb_urb_list rx_free; int tx_nfree; struct rum_rx_desc sc_rx_desc; From owner-p4-projects@FreeBSD.ORG Sat Jun 6 05:33:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5C8A91065672; Sat, 6 Jun 2009 05:33:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DABFC106566B for ; Sat, 6 Jun 2009 05:33:11 +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 C7F0A8FC0A for ; Sat, 6 Jun 2009 05:33:11 +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 n565XBxb044115 for ; Sat, 6 Jun 2009 05:33:11 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n565XBUm044096 for perforce@freebsd.org; Sat, 6 Jun 2009 05:33:11 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 6 Jun 2009 05:33:11 GMT Message-Id: <200906060533.n565XBUm044096@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 163630 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 05:33:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=163630 Change 163630 by thompsa@thompsa_burger on 2009/06/06 05:32:25 Transfer the data directly into the rx mbuf. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#15 edit .. //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#6 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#10 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#6 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_handle_request.c#11 (text+ko) ==== @@ -738,8 +738,8 @@ usb2_copy_in(urb->frbuffers + 1, 0, src_mcopy, max_len); } else { - usb2_set_frame_data(urb, - USB_ADD_BYTES(src_zcopy, off), 1); + urb_set_framedata(urb, 1, + USB_ADD_BYTES(src_zcopy, off), max_len); } urb->frlengths[1] = max_len; } else { ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#15 (text+ko) ==== @@ -1631,6 +1631,7 @@ struct usb_pipe *pipe = urb->ub_pipe; USB_PIPE_LOCK(pipe); + urb->do_sync = 0; usb_submit_urb_flags(urb, 0); USB_PIPE_UNLOCK(pipe); } @@ -1763,21 +1764,6 @@ } /*------------------------------------------------------------------------* - * usb2_set_frame_data - * - * This function sets the pointer of the buffer that should - * loaded directly into DMA for the given USB frame. Passing "ptr" - * equal to NULL while the corresponding "frlength" is greater - * than zero gives undefined results! - *------------------------------------------------------------------------*/ -void -usb2_set_frame_data(struct usb_urb *urb, void *ptr, usb_frcount_t frindex) -{ - /* set virtual address to load and length */ - urb->frbuffers[frindex].buffer = ptr; -} - -/*------------------------------------------------------------------------* * usb2_set_frame_offset * * This function sets the frame data buffer offset relative to the beginning @@ -2765,8 +2751,6 @@ struct usb_pipe *pipe = urb->ub_pipe; urb->frlengths[0] = pipe->max_data_length; - urb->do_sync = 0; - urb->is_done = 0; } struct usb_urb * @@ -2847,6 +2831,23 @@ *err = urb->error; } +/*------------------------------------------------------------------------* + * usb_set_frame_data + * + * This function sets the pointer of the buffer that should + * loaded directly into DMA for the given USB frame. Passing "ptr" + * equal to NULL while the corresponding "frlength" is greater + * than zero gives undefined results! + *------------------------------------------------------------------------*/ +void +urb_set_framedata(struct usb_urb *urb, usb_frcount_t frame, void *ptr, + usb_frlength_t len) +{ + /* set virtual address to load and length */ + urb->frbuffers[frame].buffer = ptr; + urb_set_framelen(urb, frame, len); +} + void urb_set_framelen(struct usb_urb *urb, usb_frcount_t frame, usb_frlength_t len) { ==== //depot/projects/usb_buf/src/sys/dev/usb/usbdi.h#6 (text+ko) ==== @@ -306,6 +306,8 @@ void *urb_get_softc(struct usb_urb *urb); void *urb_get_priv(struct usb_urb *urb); void urb_set_priv(struct usb_urb *urb, void *); +void urb_set_framedata(struct usb_urb *urb, usb_frcount_t frame, void *ptr, + usb_frlength_t len); void urb_set_framelen(struct usb_urb *urb, usb_frcount_t frame, usb_frlength_t len); ==== //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#10 (text+ko) ==== @@ -155,8 +155,8 @@ const uint8_t mac[IEEE80211_ADDR_LEN]); static void rum_vap_delete(struct ieee80211vap *); static void rum_tx_free(struct rum_tx_data *, int); -static void rum_setup_tx_list(struct rum_softc *); -static void rum_unsetup_tx_list(struct rum_softc *); +static void rum_alloc_tx_list(struct rum_softc *); +static void rum_free_tx_list(struct rum_softc *); static int rum_newstate(struct ieee80211vap *, enum ieee80211_state, int); static void rum_setup_tx_desc(struct rum_softc *, @@ -398,7 +398,7 @@ .direction = UE_DIR_IN, .bufsize = (MCLBYTES + RT2573_RX_DESC_SIZE), .urb_count = RUM_RX_LIST_COUNT, - .flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .flags = {.ext_buffer = 1,.pipe_bof = 1,.short_xfer_ok = 1,}, .callback = rum_bulk_read_callback, }, }; @@ -552,7 +552,7 @@ /* free TX list, if any */ RUM_LOCK(sc); - rum_unsetup_tx_list(sc); + rum_free_tx_list(sc); RUM_UNLOCK(sc); if (ifp) { @@ -657,7 +657,7 @@ } static void -rum_setup_tx_list(struct rum_softc *sc) +rum_alloc_tx_list(struct rum_softc *sc) { struct rum_tx_data *data; int i; @@ -672,12 +672,11 @@ KASSERT(data->urb != NULL, ("usb_get_urb failed")); urb_set_priv(data->urb, data); urb_list_insert(&sc->tx_free, data->urb); - sc->tx_nfree++; } } static void -rum_unsetup_tx_list(struct rum_softc *sc) +rum_free_tx_list(struct rum_softc *sc) { struct rum_tx_data *data; int i; @@ -802,7 +801,7 @@ struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ieee80211_node *ni; - struct mbuf *m = NULL; + struct mbuf *m, *mnew; struct rum_rx_desc *desc; uint32_t flags; uint8_t rssi = 0; @@ -816,6 +815,7 @@ goto skip; } + m = urb_get_priv(urb); urb_get_status(urb, (void **)&desc, NULL, &actlen, NULL); DPRINTFN(5, "rx done, urb=%p actlen=%d\n", urb, actlen); @@ -826,8 +826,6 @@ goto skip; } - actlen -= RT2573_RX_DESC_SIZE; - rssi = rum_get_rssi(sc, desc->rssi); flags = le32toh(desc->flags); if (flags & RT2573_RX_CRC_ERROR) { @@ -841,16 +839,20 @@ goto skip; } - m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); - if (m == NULL) { + mnew = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (mnew == NULL) { DPRINTF("could not allocate mbuf\n"); ifp->if_ierrors++; goto skip; } + /* load up new mbuf in hardware */ + urb_set_framedata(urb, 0, mtod(mnew, uint8_t *), MCLBYTES); + urb_set_priv(urb, mnew); + /* finalize mbuf */ m->m_pkthdr.rcvif = ifp; - bcopy((caddr_t)(desc + 1), mtod(m, uint8_t *), actlen); + m->m_data = (caddr_t)(desc + 1); m->m_pkthdr.len = m->m_len = (flags >> 16) & 0xfff; if (ieee80211_radiotap_active(ic)) { @@ -872,7 +874,6 @@ } else (void) ieee80211_input_all(ic, m, rssi, RT2573_NOISE_FLOOR); skip: - usb_init_urb(urb); usb_submit_urb(urb); } @@ -1977,6 +1978,7 @@ struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct usb_urb *urb; + struct mbuf *m; uint32_t tmp; usb_error_t error; int i, ntries; @@ -2026,7 +2028,7 @@ /* * Allocate Tx and Rx xfer queues. */ - rum_setup_tx_list(sc); + rum_alloc_tx_list(sc); /* update Rx filter */ tmp = rum_read(sc, RT2573_TXRX_CSR0) & 0xffff; @@ -2045,7 +2047,16 @@ /* * Start up the receive pipe. */ - while ((urb = usb_get_urb(sc->sc_xfer[RUM_BULK_RD], 0)) != NULL) { + for (i = 0; i < RUM_RX_LIST_COUNT; i++) { + urb = usb_get_urb(sc->sc_xfer[RUM_BULK_RD], 0); + m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR); + if (m == NULL) { + device_printf(sc->sc_dev, + "could not allocate rx mbuf\n"); + goto fail; + } + urb_set_framedata(urb, 0, mtod(m, uint8_t *), MCLBYTES); + urb_set_priv(urb, m); usb_submit_urb(urb); } @@ -2090,7 +2101,7 @@ usb_pipe_halt(sc->sc_xfer[RUM_BULK_WR]); usb_pipe_halt(sc->sc_xfer[RUM_BULK_RD]); - rum_unsetup_tx_list(sc); + rum_free_tx_list(sc); /* disable Rx */ tmp = rum_read(sc, RT2573_TXRX_CSR0); ==== //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#6 (text+ko) ==== @@ -105,9 +105,6 @@ struct rum_tx_data tx_data[RUM_TX_LIST_COUNT]; usb_urb_list tx_free; - usb_urb_list rx_free; - int tx_nfree; - struct rum_rx_desc sc_rx_desc; struct mtx sc_mtx; From owner-p4-projects@FreeBSD.ORG Sat Jun 6 05:36:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B2A641065679; Sat, 6 Jun 2009 05:36: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 6D58D106566B for ; Sat, 6 Jun 2009 05:36:15 +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 40C298FC14 for ; Sat, 6 Jun 2009 05:36:15 +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 n565aENm044362 for ; Sat, 6 Jun 2009 05:36:14 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n565aEUu044360 for perforce@freebsd.org; Sat, 6 Jun 2009 05:36:14 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 6 Jun 2009 05:36:14 GMT Message-Id: <200906060536.n565aEUu044360@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 163631 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 05:36:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=163631 Change 163631 by thompsa@thompsa_burger on 2009/06/06 05:36:05 Cast the pointer. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#16 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#16 (text+ko) ==== @@ -320,7 +320,7 @@ M_WAITOK | M_ZERO); urb->ub_pipe = pipe; urb->ub_buflen = bufsiz; - urb->local_buffer = urb + 1; + urb->local_buffer = (caddr_t)(urb + 1); urb->frlengths = malloc(sizeof(usb_frlength_t) * n_frlengths, M_USB, M_WAITOK | M_ZERO); From owner-p4-projects@FreeBSD.ORG Sat Jun 6 06:28:08 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 40DD51065672; Sat, 6 Jun 2009 06:28:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 00B34106564A for ; Sat, 6 Jun 2009 06:28:08 +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 E2E758FC1B for ; Sat, 6 Jun 2009 06:28:07 +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 n566S798049626 for ; Sat, 6 Jun 2009 06:28:07 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n566S7DL049624 for perforce@freebsd.org; Sat, 6 Jun 2009 06:28:07 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 6 Jun 2009 06:28:07 GMT Message-Id: <200906060628.n566S7DL049624@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 163632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 06:28:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=163632 Change 163632 by thompsa@thompsa_burger on 2009/06/06 06:27:37 Kill debug printfs. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#17 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/usb_transfer.c#17 (text+ko) ==== @@ -1445,7 +1445,7 @@ } if (pipe->flags_int.halted) { - printf("pipe halted, queuing %p\n", urb); + /* The pipe can not be used yet, defer */ TAILQ_INSERT_TAIL(&pipe->urb_pending_q, urb, ub_next); return; } @@ -1665,7 +1665,6 @@ pipe->flags_int.halted = 0; while ((urb = TAILQ_FIRST(&pipe->urb_pending_q)) != NULL) { TAILQ_REMOVE(&pipe->urb_pending_q, urb, ub_next); - printf("pipe unhalted, dequeuing %p\n", urb); usb_submit_urb_flags(urb, 0); } USB_PIPE_UNLOCK(pipe); @@ -2751,6 +2750,7 @@ struct usb_pipe *pipe = urb->ub_pipe; urb->frlengths[0] = pipe->max_data_length; + urb->priv = NULL; } struct usb_urb * From owner-p4-projects@FreeBSD.ORG Sat Jun 6 06:29:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6ABD61065676; Sat, 6 Jun 2009 06:29: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 0D75C1065673 for ; Sat, 6 Jun 2009 06:29:09 +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 EE28C8FC28 for ; Sat, 6 Jun 2009 06:29:08 +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 n566T89f049689 for ; Sat, 6 Jun 2009 06:29:08 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n566T8CJ049687 for perforce@freebsd.org; Sat, 6 Jun 2009 06:29:08 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 6 Jun 2009 06:29:08 GMT Message-Id: <200906060629.n566T8CJ049687@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 163633 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 06:29:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=163633 Change 163633 by thompsa@thompsa_burger on 2009/06/06 06:28:30 Remove rum_tx_data and the tx array, it is no longer needed. Affected files ... .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#11 edit .. //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#7 edit Differences ... ==== //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rum.c#11 (text+ko) ==== @@ -154,9 +154,6 @@ int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]); static void rum_vap_delete(struct ieee80211vap *); -static void rum_tx_free(struct rum_tx_data *, int); -static void rum_alloc_tx_list(struct rum_softc *); -static void rum_free_tx_list(struct rum_softc *); static int rum_newstate(struct ieee80211vap *, enum ieee80211_state, int); static void rum_setup_tx_desc(struct rum_softc *, @@ -168,7 +165,7 @@ struct ieee80211_node *, const struct ieee80211_bpf_params *); static int rum_tx_data(struct rum_softc *, struct mbuf *, - struct ieee80211_node *); + struct ieee80211_node *, struct usb_urb *); static void rum_start(struct ifnet *); static int rum_ioctl(struct ifnet *, u_long, caddr_t); static void rum_eeprom_read(struct rum_softc *, uint16_t, void *, @@ -550,11 +547,6 @@ /* stop all USB transfers */ usb_pipe_close(sc->sc_xfer, RUM_N_TRANSFER); - /* free TX list, if any */ - RUM_LOCK(sc); - rum_free_tx_list(sc); - RUM_UNLOCK(sc); - if (ifp) { ic = ifp->if_l2com; ieee80211_ifdetach(ic); @@ -637,72 +629,6 @@ free(rvp, M_80211_VAP); } -static void -rum_tx_free(struct rum_tx_data *data, int txerr) -{ - struct rum_softc *sc = data->sc; - - if (data->m != NULL) { - if (data->m->m_flags & M_TXCB) - ieee80211_process_callback(data->ni, data->m, - txerr ? ETIMEDOUT : 0); - m_freem(data->m); - data->m = NULL; - - ieee80211_free_node(data->ni); - data->ni = NULL; - } - usb_init_urb(data->urb); /* reset state */ - urb_list_insert(&sc->tx_free, data->urb); -} - -static void -rum_alloc_tx_list(struct rum_softc *sc) -{ - struct rum_tx_data *data; - int i; - - urb_list_init(&sc->tx_free); - - for (i = 0; i < RUM_TX_LIST_COUNT; i++) { - data = &sc->tx_data[i]; - - data->sc = sc; - data->urb = usb_get_urb(sc->sc_xfer[RUM_BULK_WR], 0); - KASSERT(data->urb != NULL, ("usb_get_urb failed")); - urb_set_priv(data->urb, data); - urb_list_insert(&sc->tx_free, data->urb); - } -} - -static void -rum_free_tx_list(struct rum_softc *sc) -{ - struct rum_tx_data *data; - int i; - - /* free up all node references and mbufs */ - for (i = 0; i < RUM_TX_LIST_COUNT; i++) { - data = &sc->tx_data[i]; - - if (data->m != NULL) { - m_freem(data->m); - data->m = NULL; - } - if (data->ni != NULL) { - ieee80211_free_node(data->ni); - data->ni = NULL; - } - if (data->urb != NULL) { - urb_list_remove(&sc->tx_free, data->urb); - usb_free_urb(data->urb); - data->urb = NULL; - } - } - if (sc->tx_free.count != 0) - printf("leaked %d urbs\n", sc->tx_free.count); -} - static int rum_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { @@ -771,17 +697,21 @@ { struct rum_softc *sc = urb_get_softc(urb); struct ifnet *ifp = sc->sc_ifp; - struct rum_tx_data *data; + struct ieee80211_node *ni; + struct mbuf *m; int len; urb_get_status(urb, NULL, NULL, &len, NULL); DPRINTFN(11, "transfer complete, %d bytes\n", len); /* free resources */ - data = urb_get_priv(urb); - RUM_LOCK(sc); - rum_tx_free(data, 0); - RUM_UNLOCK(sc); + m = urb_get_priv(urb); + ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; + if (m->m_flags & M_TXCB) + ieee80211_process_callback(ni, m, error ? ETIMEDOUT : 0); + m_freem(m); + ieee80211_free_node(ni); + usb_free_urb(urb); if (error) { if (error == USB_ERR_CANCELLED) @@ -951,7 +881,6 @@ struct ieee80211com *ic = ni->ni_ic; struct ieee80211vap *vap; const struct ieee80211_frame *wh; - struct rum_tx_data *data; struct rum_tx_desc *desc; struct usb_urb *urb; struct mbuf *mprot; @@ -984,19 +913,19 @@ /* XXX stat + msg */ return (ENOBUFS); } - urb = urb_list_dequeue(&sc->tx_free); - data = urb_get_priv(urb); + urb = usb_get_urb(sc->sc_xfer[RUM_BULK_WR], 0); + if (urb == NULL) { + m_freem(mprot); + return EINVAL; + } - urb_get_status(urb, (void **)&data->buf, &xferlen, NULL, NULL); - if (xferlen < m->m_pkthdr.len + RT2573_TX_DESC_SIZE) { - urb_list_insert(&sc->tx_free, urb); + urb_get_status(urb, (void **)&desc, &xferlen, NULL, NULL); + if (xferlen < mprot->m_pkthdr.len + RT2573_TX_DESC_SIZE) { + usb_free_urb(urb); return EINVAL; } - desc = (struct rum_tx_desc *)data->buf; - data->m = mprot; - data->ni = ieee80211_ref_node(ni); - + ni = ieee80211_ref_node(ni); vap = ni->ni_vap; if (ieee80211_radiotap_active_vap(vap)) { struct rum_tx_radiotap_header *tap = &sc->sc_txtap; @@ -1008,15 +937,16 @@ ieee80211_radiotap_tx(vap, mprot); } - m_copydata(mprot, 0, mprot->m_pkthdr.len, - data->buf + RT2573_TX_DESC_SIZE); + m_copydata(mprot, 0, mprot->m_pkthdr.len, (caddr_t)(desc + 1)); rum_setup_tx_desc(sc, desc, flags, 0, mprot->m_pkthdr.len, protrate); DPRINTFN(10, "sending prot frame len=%d rate=%d\n", - m->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, rate); + mprot->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, rate); /* NB: no roundup necessary */ urb_set_framelen(urb, 0, RT2573_TX_DESC_SIZE + mprot->m_pkthdr.len); + urb_set_priv(urb, mprot); + mprot->m_pkthdr.rcvif = (void *)ni; usb_submit_urb(urb); return 0; @@ -1028,7 +958,6 @@ struct ieee80211vap *vap = ni->ni_vap; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; - struct rum_tx_data *data; struct rum_tx_desc *desc; struct usb_urb *urb; struct ieee80211_frame *wh; @@ -1040,9 +969,6 @@ RUM_LOCK_ASSERT(sc, MA_OWNED); - urb = urb_list_dequeue(&sc->tx_free); - data = urb_get_priv(urb); - wh = mtod(m0, struct ieee80211_frame *); if (wh->i_fc[1] & IEEE80211_FC1_WEP) { k = ieee80211_crypto_encap(ni, m0); @@ -1069,17 +995,19 @@ flags |= RT2573_TX_TIMESTAMP; } - urb_get_status(urb, (void **)&data->buf, &xferlen, NULL, NULL); + urb = usb_get_urb(sc->sc_xfer[RUM_BULK_WR], 0); + if (urb == NULL) { + m_freem(m0); + return EINVAL; + } + + urb_get_status(urb, (void **)&desc, &xferlen, NULL, NULL); if (xferlen < m0->m_pkthdr.len + RT2573_TX_DESC_SIZE) { - urb_list_insert(&sc->tx_free, urb); + usb_free_urb(urb); m_freem(m0); return EINVAL; } - desc = (struct rum_tx_desc *)data->buf; - data->m = m0; - data->ni = ni; - if (ieee80211_radiotap_active_vap(vap)) { struct rum_tx_radiotap_header *tap = &sc->sc_txtap; @@ -1090,7 +1018,7 @@ ieee80211_radiotap_tx(vap, m0); } - m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RT2573_TX_DESC_SIZE); + m_copydata(m0, 0, m0->m_pkthdr.len, (caddr_t)(desc + 1)); rum_setup_tx_desc(sc, desc, flags, 0, m0->m_pkthdr.len, tp->mgmtrate); /* align end on a 4-bytes boundary */ @@ -1107,6 +1035,8 @@ m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, tp->mgmtrate, xferlen); urb_set_framelen(urb, 0, xferlen); + urb_set_priv(urb, m0); + m0->m_pkthdr.rcvif = (void *)ni; usb_submit_urb(urb); return (0); @@ -1118,7 +1048,6 @@ { struct ieee80211com *ic = ni->ni_ic; struct ieee80211vap *vap; - struct rum_tx_data *data; struct rum_tx_desc *desc; struct usb_urb *urb; uint32_t flags; @@ -1140,19 +1069,22 @@ params->ibp_flags & IEEE80211_BPF_RTS ? IEEE80211_PROT_RTSCTS : IEEE80211_PROT_CTSONLY, rate); - if (error || sc->tx_free.count == 0) { + if (error) { m_freem(m0); return ENOBUFS; } flags |= RT2573_TX_LONG_RETRY | RT2573_TX_IFS_SIFS; } - urb = urb_list_dequeue(&sc->tx_free); - data = urb_get_priv(urb); + urb = usb_get_urb(sc->sc_xfer[RUM_BULK_WR], 0); + if (urb == NULL) { + m_freem(m0); + return EINVAL; + } - urb_get_status(urb, (void **)&data->buf, &xferlen, NULL, NULL); + urb_get_status(urb, (void **)&desc, &xferlen, NULL, NULL); if (xferlen < m0->m_pkthdr.len + RT2573_TX_DESC_SIZE) { - urb_list_insert(&sc->tx_free, urb); + usb_free_urb(urb); m_freem(m0); return EINVAL; } @@ -1168,12 +1100,7 @@ ieee80211_radiotap_tx(vap, m0); } - desc = (struct rum_tx_desc *)data->buf; - data->m = m0; - data->ni = ni; - - m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RT2573_TX_DESC_SIZE); - /* XXX need to setup descriptor ourself */ + m_copydata(m0, 0, m0->m_pkthdr.len, (caddr_t)(desc + 1)); rum_setup_tx_desc(sc, desc, flags, 0, m0->m_pkthdr.len, rate); /* align end on a 4-bytes boundary */ @@ -1190,20 +1117,21 @@ m0->m_pkthdr.len, rate, xferlen); urb_set_framelen(urb, 0, xferlen); + urb_set_priv(urb, m0); + m0->m_pkthdr.rcvif = (void *)ni; usb_submit_urb(urb); return 0; } static int -rum_tx_data(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni) +rum_tx_data(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni, + struct usb_urb *urb) { struct ieee80211vap *vap = ni->ni_vap; struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; - struct rum_tx_data *data; struct rum_tx_desc *desc; - struct usb_urb *urb; struct ieee80211_frame *wh; const struct ieee80211_txparam *tp; struct ieee80211_key *k; @@ -1243,7 +1171,7 @@ prot = ic->ic_protmode; if (prot != IEEE80211_PROT_NONE) { error = rum_sendprot(sc, m0, ni, prot, rate); - if (error || sc->tx_free.count == 0) { + if (error) { m_freem(m0); return ENOBUFS; } @@ -1251,20 +1179,12 @@ } } - urb = urb_list_dequeue(&sc->tx_free); - data = urb_get_priv(urb); - - urb_get_status(urb, (void **)&data->buf, &xferlen, NULL, NULL); + urb_get_status(urb, (void **)&desc, &xferlen, NULL, NULL); if (xferlen < m0->m_pkthdr.len + RT2573_TX_DESC_SIZE) { - urb_list_insert(&sc->tx_free, urb); m_freem(m0); return EINVAL; } - desc = (struct rum_tx_desc *)data->buf; - data->m = m0; - data->ni = ni; - if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) { flags |= RT2573_TX_NEED_ACK; flags |= RT2573_TX_MORE_FRAG; @@ -1284,7 +1204,7 @@ ieee80211_radiotap_tx(vap, m0); } - m_copydata(m0, 0, m0->m_pkthdr.len, data->buf + RT2573_TX_DESC_SIZE); + m_copydata(m0, 0, m0->m_pkthdr.len, (caddr_t)(desc + 1)); rum_setup_tx_desc(sc, desc, flags, 0, m0->m_pkthdr.len, rate); /* align end on a 4-bytes boundary */ @@ -1295,6 +1215,7 @@ m0->m_pkthdr.len + (int)RT2573_TX_DESC_SIZE, rate, xferlen); urb_set_framelen(urb, 0, xferlen); + urb_set_priv(urb, m0); usb_submit_urb(urb); return 0; @@ -1304,6 +1225,7 @@ rum_start(struct ifnet *ifp) { struct rum_softc *sc = ifp->if_softc; + struct usb_urb *urb; struct ieee80211_node *ni; struct mbuf *m; @@ -1316,13 +1238,15 @@ IFQ_DRV_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; - if (sc->tx_free.count < RUM_TX_MINFREE) { + urb = usb_get_urb(sc->sc_xfer[RUM_BULK_WR], 0); + if (urb == NULL) { IFQ_DRV_PREPEND(&ifp->if_snd, m); ifp->if_drv_flags |= IFF_DRV_OACTIVE; break; } ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; - if (rum_tx_data(sc, m, ni) != 0) { + if (rum_tx_data(sc, m, ni, urb) != 0) { + usb_free_urb(urb); ieee80211_free_node(ni); ifp->if_oerrors++; break; @@ -2025,11 +1949,6 @@ /* initialize ASIC */ rum_write(sc, RT2573_MAC_CSR1, 4); - /* - * Allocate Tx and Rx xfer queues. - */ - rum_alloc_tx_list(sc); - /* update Rx filter */ tmp = rum_read(sc, RT2573_TXRX_CSR0) & 0xffff; @@ -2101,8 +2020,6 @@ usb_pipe_halt(sc->sc_xfer[RUM_BULK_WR]); usb_pipe_halt(sc->sc_xfer[RUM_BULK_RD]); - rum_free_tx_list(sc); - /* disable Rx */ tmp = rum_read(sc, RT2573_TXRX_CSR0); rum_write(sc, RT2573_TXRX_CSR0, tmp | RT2573_DISABLE_RX); @@ -2190,13 +2107,6 @@ ieee80211_free_node(ni); return ENETDOWN; } - if (sc->tx_free.count < RUM_TX_MINFREE) { - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - RUM_UNLOCK(sc); - m_freem(m); - ieee80211_free_node(ni); - return EIO; - } ifp->if_opackets++; ==== //depot/projects/usb_buf/src/sys/dev/usb/wlan/if_rumvar.h#7 (text+ko) ==== @@ -58,17 +58,6 @@ struct rum_softc; -struct rum_tx_data { - STAILQ_ENTRY(rum_tx_data) next; - struct rum_softc *sc; - struct usb_urb *urb; - struct mbuf *m; - struct ieee80211_node *ni; - uint8_t *buf; - //int rate; -}; -typedef STAILQ_HEAD(, rum_tx_data) rum_txdhead; - struct rum_node { struct ieee80211_node ni; struct ieee80211_amrr_node amn; @@ -97,17 +86,14 @@ struct ifnet *sc_ifp; device_t sc_dev; struct usb_device *sc_udev; + struct mtx sc_mtx; + - struct usb_pipe *sc_xfer[RUM_N_TRANSFER]; + struct usb_pipe *sc_xfer[RUM_N_TRANSFER]; uint8_t rf_rev; uint8_t rffreq; - struct rum_tx_data tx_data[RUM_TX_LIST_COUNT]; - usb_urb_list tx_free; - - struct mtx sc_mtx; - uint32_t sta[6]; uint32_t rf_regs[4]; uint8_t txpow[44]; From owner-p4-projects@FreeBSD.ORG Sat Jun 6 09:03:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ECA61065670; Sat, 6 Jun 2009 09:03: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 0ED94106566B for ; Sat, 6 Jun 2009 09:03:46 +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 EF7138FC16 for ; Sat, 6 Jun 2009 09:03:45 +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 n5693jOb074286 for ; Sat, 6 Jun 2009 09:03:45 GMT (envelope-from dforsyth@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5693jcV074284 for perforce@freebsd.org; Sat, 6 Jun 2009 09:03:45 GMT (envelope-from dforsyth@FreeBSD.org) Date: Sat, 6 Jun 2009 09:03:45 GMT Message-Id: <200906060903.n5693jcV074284@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 163636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 09:03:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=163636 Change 163636 by dforsyth@squirrel on 2009/06/06 09:03:23 Added incomplete parsing mechanism. Data is not organized in pkg_plist yet. Affected files ... .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#8 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#8 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.c#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.h#3 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_private.h#4 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#9 edit .. //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#6 edit .. //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#3 edit Differences ... ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ } p->ident = new_ident; p->comment = NULL; - p->contents = NULL; + p->plist = NULL; return (p); } @@ -65,15 +65,17 @@ return (p); } -#if 0 struct pkg * -pkg_set_pkg_plist(struct pkg *p, struct pkg_plist *pc) +pkg_set_pkg_plist(struct pkg *p, struct pkg_plist *pl) { + if (p == NULL) + return (NULL); + + p->plist = pl; return (p); } -#endif - +/* ident and name are different, even though they might be the same. */ char * pkg_ident(struct pkg *p) { @@ -92,9 +94,43 @@ return (p->comment); } -/* TODO: Make an explicit note in the manual for libpkg that pkg_free - * should NOT be called called on pkgs that are not explicitly created by - * the user. */ +/* Function to access information stored in the pkg_plist. */ +char * +pkg_name(struct pkg *p) +{ + char *name; + name = pkg_plist_name(p->plist); + + return (name); +} + +/* Temporarily void. */ +void +pkg_pkg_plist_init(struct pkg *p) +{ + if (p == NULL) + return; + + pkg_plist_init(p->plist); + return; +} + +/* Temporarily char. */ +char * +pkg_pkg_plist_next(struct pkg *p) +{ + char *file_name; + + if (p == NULL) + return (NULL); + + file_name = pkg_plist_next(p->plist); + + return (file_name); +} + +/* TODO: Make an note in the manual for libpkg that pkg_free should not be + * called on pkgs that are not explicitly created by the client. */ void pkg_free(struct pkg *p) ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg.h#8 (text+ko) ==== @@ -11,12 +11,18 @@ struct pkg *pkg_set_comment(struct pkg *p, const char *comment); +struct pkg *pkg_set_pkg_plist(struct pkg *p, struct pkg_plist *pl); + char *pkg_ident(struct pkg *p); char *pkg_name(struct pkg *p); char *pkg_comment(struct pkg *p); +void pkg_pkg_plist_init(struct pkg *p); + +char *pkg_pkg_plist_next(struct pkg *p); + void pkg_free(struct pkg *p); /* pkgdb */ @@ -25,7 +31,7 @@ struct pkgdb *pkgdb_read_db_hierdb(const char *db_root); -int pkgdb_refresh_db_hierdb(struct pkgdb *db); +int pkgdb_init_db_hierdb(struct pkgdb *db); struct pkg *pkgdb_read_pkg_hierdb(struct pkgdb *db, const char *ident); ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.c#3 (text+ko) ==== @@ -13,6 +13,20 @@ #include "pkgdb.h" #include "pkg.h" +/* For tracking mode, if the last file needs an MD5, owner, and group. */ + +struct file_state { + int last_needs_md5; + char *mode; + char *owner; + char *group; +}; + +struct pl_file { + /* Need a specific type for files because there so much stuff I can + * set... */ +}; + struct pl_entry { enum plist_elem type; char *info; @@ -23,13 +37,31 @@ struct pkg_plist { int rev; + char *cwd; + char *srcdir; char *name; char *orgin; - char *cwd; - char *conflicts; + char *display; + char *mtree_file; + + char *text; /* The entire plist */ + + struct file_state f_s; + + struct pl_entry *file_curr; + + /* Use these lists here so that appending to our list doesnt need a + * bunch of realloc procedures. This will be convenient for clients + * that want to build plists on the fly, modify plists, etc. */ + + TAILQ_HEAD(file_head, pl_entry) file_head; /* File list. */ - char *text; - TAILQ_HEAD(pl_head, pl_entry) pl_head; + /* This list organization needs to be sorted out... */ + + TAILQ_HEAD(exex_head, pl_entry) exec_head; /* Exec list. */ + TAILQ_HEAD(unexex_head, pl_entry) unexec_head; /* Unexec/dirrm list. */ + TAILQ_HEAD(cfl_head, pl_entry) cfl_head; /* Conflict list. */ + TAILQ_HEAD(opt_head, pl_entry) opt_head; /* Options list (for all 2) */ }; struct pkg_plist * @@ -50,6 +82,21 @@ return (pl); } +struct pl_entry * +pl_entry_new(enum plist_elem elem, char *info, char *option) +{ + struct pl_entry *ent; + + ent = calloc(1, sizeof(*ent)); + if (ent != NULL) { + ent->type = elem; + ent->info = info; + ent->option = option; + } + + return (ent); +} + struct pkg_plist * pkg_plist_parse_contents_from_text(const char *text) { @@ -80,7 +127,8 @@ if (*p == '\n') { line = textp; line[p - textp] = '\0'; - ent = pkg_plist_parse_line(line); + ent = pkg_plist_parse_line(pl, line); + /* For now, just shove everything onto the main list. */ if (ent != NULL) pkg_plist_plist_append(pl, ent); textp = p + 1; @@ -90,45 +138,142 @@ return (pl); } +/* Parse a command sequence and and entry based on the findings. */ struct pl_entry * -pkg_plist_parse_line(char *line) { +pkg_plist_parse_line(struct pkg_plist *pl, char *line) { + char *command; + char *argument; + char *sep; struct pl_entry *ent; if (line == NULL) return (NULL); + /* ent = calloc(1, sizeof(*ent)); if (ent == NULL) return (NULL); - - if (line[0] == '@') { - ent->type = PLIST_CWD; /* Just set this to something */ + */ + if (*line == '@') { + sep = strchr(line, ' '); + if (sep == NULL) + sep = strchr(line, '\0'); + *sep = '\0'; /* chop. */ + command = line + 1; + argument = sep + 1; + // ent->option = NULL; + /* Until I have the list organization sorted, just return entries + * and plop them on the main list. */ + if (strcmp(command, PLIST_CMD_CWD) == 0 || + strcmp(command, PLIST_CMD_CD) == 0) + pl->cwd = argument; + else if (strcmp(command, PLIST_CMD_SRCDIR) == 0) + pl->srcdir = argument; + else if (strcmp(command, PLIST_CMD_EXEC) == 0) + ent = pl_entry_new(PLIST_EXEC, argument, NULL); + else if (strcmp(command, PLIST_CMD_UNEXEC) == 0) + ent = pl_entry_new(PLIST_UNEXEC, argument, NULL); + else if (strcmp(command, PLIST_CMD_MODE) == 0) + ent = pl_entry_new(PLIST_MODE, argument, NULL); + else if (strcmp(command, PLIST_CMD_OPTION) == 0) + ent = pl_entry_new(PLIST_OPTION, argument, NULL); + else if (strcmp(command, PLIST_CMD_OWNER) == 0) + ent = pl_entry_new(PLIST_OWNER, argument, NULL); + else if (strcmp(command, PLIST_CMD_GROUP) == 0) + ent = pl_entry_new(PLIST_GROUP, argument, NULL); + else if (strcmp(command, PLIST_CMD_COMMENT) == 0) + ent = pl_entry_new(PLIST_COMMENT, argument, NULL); + else if (strcmp(command, PLIST_CMD_NOINST) == 0) { + if ((sep = strchr(argument, ' ')) != NULL) + *sep = '\0'; + ent = pl_entry_new(PLIST_NOINST, argument, sep + 1); + } else if (strcmp(command, PLIST_CMD_IGNORE) == 0) + ent = pl_entry_new(PLIST_IGNORE, argument, NULL); + else if (strcmp(command, PLIST_CMD_IGNORE_INST) == 0) + ent = pl_entry_new(PLIST_IGNORE_INST, argument, NULL); + else if (strcmp(command, PLIST_CMD_NAME) == 0) + pl->name = argument; + else if (strcmp(command, PLIST_CMD_DIRRM) == 0) + ent = pl_entry_new(PLIST_DIRRM, argument, NULL); + else if (strcmp(command, PLIST_CMD_MTREE) == 0) + pl->mtree_file = argument; + else if (strcmp(command, PLIST_CMD_DISPLAY) == 0) + pl->display = argument; + else { + /* If we cant identify the command, set it unknown and gather + * whatever information we can. */ + /* + ent->type = PLIST_UNKNOWN; + ent->info = command; + */ + ent = pl_entry_new(PLIST_UNKNOWN, argument, NULL); + } } else { - ent->type = PLIST_FILE; - ent->info = line; + ent = pl_entry_new(PLIST_FILE, argument, NULL); } return (ent); } +/* Temporarily void. */ +void +pkg_plist_init(struct pkg_plist *pl) +{ + /* Available to the client. */ + pkg_plist_plist_init(pl); + pl->file_curr = NULL; +} + +/* Temporarily char. At this point, only return file names of PLIST_FILE + * entries, just for some basic testing. */ +char * +pkg_plist_next(struct pkg_plist *pl) +{ + struct pl_entry *ent; + + if (pl == NULL) + return (NULL); + + if (pl->file_curr == NULL) + ent = pkg_plist_plist_first(pl); + else + ent = TAILQ_NEXT(pl->file_curr, next); + + if (ent != NULL) { + pl->file_curr = ent; + return (ent->info); + } + + return (NULL); +} + +char * +pkg_plist_name(struct pkg_plist *pl) +{ + if (pl == NULL) + return (NULL); + + return (pl->name); +} + +/* Don't know if I'll be sticking with this, so... */ + void pkg_plist_plist_init(struct pkg_plist *pl) { if (pl == NULL) return; - TAILQ_INIT(&pl->pl_head); + TAILQ_INIT(&pl->file_head); } struct pl_entry * pkg_plist_plist_first(struct pkg_plist *pl) { - struct pl_entry *ent; if (pl == NULL) return (NULL); - ent = TAILQ_FIRST(&pl->pl_head); - return (ent); + return (TAILQ_FIRST(&pl->file_head)); } void @@ -137,5 +282,6 @@ if (pl == NULL || ent == NULL) return; - TAILQ_INSERT_TAIL(&pl->pl_head, ent, next); + TAILQ_INSERT_TAIL(&pl->file_head, ent, next); } + ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_plist.h#3 (text+ko) ==== @@ -1,13 +1,14 @@ #ifndef __PKG_INFO_H__ #define __PKG_INFO_H__ -#define COMMENT_FILE "+COMMENT" -#define CONTENTS_FILE "+CONTENTS" -#define DESC_FILE "+DESC" -#define DISPLAY_FILE "+DISPLAY" -#define MTREE_DIRS_FILE "+MTREE_DIRS" -#define REQUIRED_BY_FILE "+REQUIRED_BY" +#define COMMENT_FILE "+COMMENT" +#define CONTENTS_FILE "+CONTENTS" +#define DESC_FILE "+DESC" +#define DISPLAY_FILE "+DISPLAY" +#define MTREE_DIRS_FILE "+MTREE_DIRS" +#define REQUIRED_BY_FILE "+REQUIRED_BY" +/* Make these visible to the client. */ enum plist_elem { PLIST_CWD, PLIST_SRCDIR, @@ -27,13 +28,39 @@ PLIST_DISPLAY, PLIST_PKGDEP, PLIST_CONLICTS, - PLIST_FILE + PLIST_FILE, + PLIST_UNKNOWN }; +#define PLIST_CMD_CWD "cwd" +#define PLIST_CMD_CD "cd" +#define PLIST_CMD_SRCDIR "srcdir" +#define PLIST_CMD_EXEC "exec" +#define PLIST_CMD_UNEXEC "unexec" +#define PLIST_CMD_MODE "mode" +#define PLIST_CMD_OPTION "option" +#define PLIST_CMD_OWNER "owner" +#define PLIST_CMD_GROUP "group" +#define PLIST_CMD_COMMENT "comment" +#define PLIST_CMD_NOINST "noinst" +#define PLIST_CMD_IGNORE "ignore" +#define PLIST_CMD_IGNORE_INST "ignore_inst" +#define PLIST_CMD_NAME "name" +#define PLIST_CMD_DIRRM "dirrm" +#define PLIST_CMD_MTREE "mtree" +#define PLIST_CMD_DISPLAY "display" +#define PLIST_CMD_PKGDEG "pkgdep" +#define PLIST_CMD_CONFLICTS "conflicts" + struct pl_entry; struct pkg_plist *pkg_plist_parse_contents_from_text(const char *text); -struct pl_entry *pkg_plist_parse_line(char *line); +struct pl_entry *pkg_plist_parse_line(struct pkg_plist *pl, char *line); + +void pkg_plist_init(struct pkg_plist *pl); +char *pkg_plist_next(struct pkg_plist *pl); + +char *pkg_plist_name(struct pkg_plist *pl); void pkg_plist_plist_init(struct pkg_plist *pl); struct pl_entry *pkg_plist_plist_first(struct pkg_plist *pl); ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkg_private.h#4 (text+ko) ==== @@ -7,7 +7,7 @@ char *ident; /* User given name for this pkg. */ char *comment; /* Mmmmm, should be 70 or less, right? */ - struct pkg_plist *contents; + struct pkg_plist *plist; }; #endif ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.c#9 (text+ko) ==== @@ -49,7 +49,7 @@ } db->db_root = new_db_root; - db->p_count = 0; + db->pkg_count = 0; db->dirty = 1; /* Set the callbacks for database access */ @@ -63,32 +63,32 @@ * number of subdirectories in the database. */ int -pkgdb_refresh_db_hierdb(struct pkgdb *db) +pkgdb_init_db_hierdb(struct pkgdb *db) { int i; - int p_count; + int pkg_count; struct pkg *p; struct dirent **ents; if (db == NULL) return (-1); - pkgdb_pkg_list_init(db); if (db->dirty == 0) { /* No changes since the last init, don't bother walking the * database again. */ - db->p_curr = pkgdb_pkg_list_first(db);; - return (db->p_count); + db->pkg_curr = pkgdb_pkg_list_first(db);; + return (db->pkg_count); } - p_count = scandir(db->db_root, &ents, subdir_sel, alphasort); + pkg_count = scandir(db->db_root, &ents, subdir_sel, alphasort); /* Clear out old list. */ pkgdb_free_pkg_list(db); /* Later on I should look into inserting changes into the existing * list, rather than just bombing the whole thing. */ - for (i = 0; i < p_count; ++i) { + pkgdb_pkg_list_init(db); + for (i = 0; i < pkg_count; ++i) { p = pkgdb_read_pkg_hierdb(db, ents[i]->d_name); if (p == NULL) { pkgdb_free_pkg_list(db); @@ -100,11 +100,12 @@ } free(ents); - db->p_curr = pkgdb_pkg_list_first(db); - db->p_count = p_count; + /* db->pkg_curr = pkgdb_pkg_list_first(db); */ + db->pkg_curr = NULL; + db->pkg_count = pkg_count; db->dirty = 0; - return (db->p_count); + return (db->pkg_count); } /* Read in all the package information we can right here. */ @@ -117,7 +118,7 @@ char *text; struct stat sb; struct pkg *p; - struct pkg_plist *pc; + struct pkg_plist *pl; p = pkg_new(ident); path = pkgdb_pkg_path(db, p); @@ -137,7 +138,8 @@ pkg_set_comment(p, text); free(text); text = pkgdb_read_file_to_text(db, p, CONTENTS_FILE); - pc = pkg_plist_parse_contents_from_text(text); + pl = pkg_plist_parse_contents_from_text(text); + pkg_set_pkg_plist(p, pl); free(text); return (p); @@ -194,10 +196,15 @@ if (db == NULL) return (NULL); - if ((p = db->p_curr) == NULL) - return (NULL); + /* If we're at the end of the list, pkg_curr will remain as the last + * element. */ + if (db->pkg_curr == NULL) + p = pkgdb_pkg_list_first(db); + else + p = TAILQ_NEXT(db->pkg_curr, next); + if (p != NULL) + db->pkg_curr = p; - db->p_curr = TAILQ_NEXT(db->p_curr, next); return (p); } @@ -257,7 +264,7 @@ if (db == NULL) return; - TAILQ_INIT(&db->p_head); + TAILQ_INIT(&db->pkg_head); } struct pkg * @@ -265,7 +272,7 @@ if (db == NULL) return (NULL); - return (TAILQ_FIRST(&db->p_head)); + return (TAILQ_FIRST(&db->pkg_head)); } void @@ -273,7 +280,7 @@ if (db == NULL || p == NULL) return; - TAILQ_INSERT_TAIL(&db->p_head, p, next); + TAILQ_INSERT_TAIL(&db->pkg_head, p, next); } /* Free a hierdb. */ @@ -295,11 +302,11 @@ struct pkg *p; struct pkg *pn; - p = TAILQ_FIRST(&db->p_head); + p = TAILQ_FIRST(&db->pkg_head); while (p != NULL) { pn = TAILQ_NEXT(p, next); pkg_free(p); p = pn; } - TAILQ_INIT(&db->p_head); + TAILQ_INIT(&db->pkg_head); } ==== //depot/projects/soc2009/dforsyth_libpkg/libpkg/pkgdb.h#6 (text+ko) ==== @@ -10,10 +10,11 @@ char *db_root; - int p_count; - struct pkg *p_curr; + int pkg_count; + struct pkg *pkg_curr; - TAILQ_HEAD(pkg_head, pkg) p_head; + /* TODO: Convert to an array. */ + TAILQ_HEAD(pkg_head, pkg) pkg_head; /* Callbacks */ }; ==== //depot/projects/soc2009/dforsyth_libpkg/pkg_info/main.c#3 (text+ko) ==== @@ -3,6 +3,7 @@ #include #include "pkg.h" +#include "pkg_info.h" #define PKG_DBDIR_DEFAULT "/var/db/pkg" /* Move this. */ @@ -23,11 +24,6 @@ /* Mock pkg_info for testing, */ -void perform_on_db(struct pkgdb *db); -void print_pkg_information(struct pkg *p); -void parse_opts(int argc, char **argv); -void usage(int exit_val); - int main (int argc, char **argv) { @@ -37,8 +33,9 @@ if (argc == 1 && argv != NULL /* Giving argv something to do */) { opt_all = 1; } - - /* parse_opts(argc, argv); */ + + /* Just check for any argument to trigger file list vomit. */ + parse_opts(argc, argv); db_root = getenv("PKG_DBDIR"); /* User set it */ if (db_root == NULL) @@ -62,14 +59,16 @@ exit(exit_val); } -#if 0 void parse_opts(int argc, char **argv) { - /* Ehh... Worthless to write this at this point. */ + /* pointlessly set this. */ opt_all = 1; + + if (argc == 1) + return; + opt_show_all_info = 1; } -#endif void perform_on_db(struct pkgdb *db) @@ -81,7 +80,7 @@ /* There will be cases where an init is useless, but since I haven't * written that much yet, init regardless. */ - count = pkgdb_refresh_db_hierdb(db); + count = pkgdb_init_db_hierdb(db); if (count < 0) exit(1); @@ -98,9 +97,19 @@ void print_pkg_information(struct pkg *p) { + char *file_name; + /* Just print the basic PKGNAME COMMENT scheme right now. Other * information isn't collected by the library yet. */ - if (!opt_show_all_info) - printf("%s %s\n", pkg_ident(p), pkg_comment(p)); + if (!opt_show_all_info) + printf("%s %s\n", pkg_name(p), pkg_comment(p)); + else { + /* Testing plist interaction. */ + printf("Package %s contains:\n", pkg_name(p)); + pkg_pkg_plist_init(p); + while ((file_name = pkg_pkg_plist_next(p)) != NULL) { + printf("\t%s\n", file_name); + } + } } From owner-p4-projects@FreeBSD.ORG Sat Jun 6 10:14:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 80CF91065674; Sat, 6 Jun 2009 10:14: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 3DC0C106564A for ; Sat, 6 Jun 2009 10:14:58 +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 286428FC0C for ; Sat, 6 Jun 2009 10:14:58 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n56AEwxO081156 for ; Sat, 6 Jun 2009 10:14:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56AEwv8081154 for perforce@freebsd.org; Sat, 6 Jun 2009 10:14:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 10:14:58 GMT Message-Id: <200906061014.n56AEwv8081154@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 163640 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 10:14:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=163640 Change 163640 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 10:14:40 Regenerate system call tables. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_proto.h#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_syscall.h#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysent.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#12 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#12 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#12 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#12 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscall.h#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscallnames.c#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_sysent.c#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_proto.h#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_syscall.h#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_sysent.c#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_proto.h#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_syscall.h#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysent.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#30 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#30 edit .. //depot/projects/trustedbsd/capabilities/src/sys/kern/systrace_args.c#30 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.h#30 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/syscall.mk#30 edit .. //depot/projects/trustedbsd/capabilities/src/sys/sys/sysproto.h#30 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_syscall.h,v 1.39 2008/11/29 14:57:58 kib Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/trustedbsd/capabilities/src/sys/amd64/linux32/linux32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_sysent.c,v 1.40 2009/06/01 16:14:38 rwatson Exp $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib + * $FreeBSD$ + * created from FreeBSD: src/sys/amd64/linux32/syscalls.master,v 1.36 2008/11/29 14:55:24 kib Exp */ #include "opt_compat.h" ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_proto.h#12 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.100 2009/04/29 21:50:13 jamie Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.115 2009/04/29 21:14:15 jamie Exp */ #ifndef _FREEBSD32_SYSPROTO_H_ @@ -453,6 +453,20 @@ char iovcnt_l_[PADL_(unsigned int)]; unsigned int iovcnt; char iovcnt_r_[PADR_(unsigned int)]; char flags_l_[PADL_(int)]; int flags; char flags_r_[PADR_(int)]; }; +struct cap_new_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char rights_l_[PADL_(u_int64_t)]; u_int64_t rights; char rights_r_[PADR_(u_int64_t)]; +}; +struct cap_getrights_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char rightsp_l_[PADL_(u_int64_t *)]; u_int64_t * rightsp; char rightsp_r_[PADR_(u_int64_t *)]; +}; +struct cap_enter_args { + register_t dummy; +}; +struct cap_getmode_args { + char modep_l_[PADL_(u_int *)]; u_int * modep; char modep_r_[PADR_(u_int *)]; +}; int freebsd32_wait4(struct thread *, struct freebsd32_wait4_args *); int freebsd32_recvmsg(struct thread *, struct freebsd32_recvmsg_args *); int freebsd32_sendmsg(struct thread *, struct freebsd32_sendmsg_args *); @@ -536,6 +550,10 @@ int freebsd32_futimesat(struct thread *, struct freebsd32_futimesat_args *); int freebsd32_jail_get(struct thread *, struct freebsd32_jail_get_args *); int freebsd32_jail_set(struct thread *, struct freebsd32_jail_set_args *); +int cap_new(struct thread *, struct cap_new_args *); +int cap_getrights(struct thread *, struct cap_getrights_args *); +int cap_enter(struct thread *, struct cap_enter_args *); +int cap_getmode(struct thread *, struct cap_getmode_args *); #ifdef COMPAT_43 @@ -765,6 +783,10 @@ #define FREEBSD32_SYS_AUE_freebsd32_futimesat AUE_FUTIMESAT #define FREEBSD32_SYS_AUE_freebsd32_jail_get AUE_NULL #define FREEBSD32_SYS_AUE_freebsd32_jail_set AUE_NULL +#define FREEBSD32_SYS_AUE_cap_new AUE_CAP_NEW +#define FREEBSD32_SYS_AUE_cap_getrights AUE_CAP_GETRIGHTS +#define FREEBSD32_SYS_AUE_cap_enter AUE_CAP_ENTER +#define FREEBSD32_SYS_AUE_cap_getmode AUE_CAP_GETMODE #undef PAD_ #undef PADL_ ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscall.h#12 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.99 2009/04/29 21:50:13 jamie Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.115 2009/04/29 21:14:15 jamie Exp */ #define FREEBSD32_SYS_syscall 0 @@ -371,4 +371,8 @@ #define FREEBSD32_SYS_freebsd32_jail_get 506 #define FREEBSD32_SYS_freebsd32_jail_set 507 #define FREEBSD32_SYS_jail_remove 508 -#define FREEBSD32_SYS_MAXSYSCALL 509 +#define FREEBSD32_SYS_cap_new 509 +#define FREEBSD32_SYS_cap_getrights 510 +#define FREEBSD32_SYS_cap_enter 511 +#define FREEBSD32_SYS_cap_getmode 512 +#define FREEBSD32_SYS_MAXSYSCALL 513 ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_syscalls.c#12 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.90 2009/04/29 21:50:13 jamie Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.115 2009/04/29 21:14:15 jamie Exp */ const char *freebsd32_syscallnames[] = { @@ -516,4 +516,8 @@ "freebsd32_jail_get", /* 506 = freebsd32_jail_get */ "freebsd32_jail_set", /* 507 = freebsd32_jail_set */ "jail_remove", /* 508 = jail_remove */ + "cap_new", /* 509 = cap_new */ + "cap_getrights", /* 510 = cap_getrights */ + "cap_enter", /* 511 = cap_enter */ + "cap_getmode", /* 512 = cap_getmode */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/freebsd32/freebsd32_sysent.c#12 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.101 2009/06/01 16:14:38 rwatson Exp $ - * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.115 2009/04/29 21:14:15 jamie Exp */ #include "opt_compat.h" @@ -547,4 +547,8 @@ { AS(freebsd32_jail_get_args), (sy_call_t *)freebsd32_jail_get, AUE_NULL, NULL, 0, 0, 0 }, /* 506 = freebsd32_jail_get */ { AS(freebsd32_jail_set_args), (sy_call_t *)freebsd32_jail_set, AUE_NULL, NULL, 0, 0, 0 }, /* 507 = freebsd32_jail_set */ { AS(jail_remove_args), (sy_call_t *)jail_remove, AUE_NULL, NULL, 0, 0, 0 }, /* 508 = jail_remove */ + { AS(cap_new_args), (sy_call_t *)cap_new, AUE_CAP_NEW, NULL, 0, 0, 0 }, /* 509 = cap_new */ + { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_CAP_GETRIGHTS, NULL, 0, 0, 0 }, /* 510 = cap_getrights */ + { 0, (sy_call_t *)cap_enter, AUE_CAP_ENTER, NULL, 0, 0, 0 }, /* 511 = cap_enter */ + { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, 0 }, /* 512 = cap_getmode */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscall.h,v 1.27 2009/05/08 20:16:04 ed Exp $ - * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp */ #define SVR4_SYS_exit 1 ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_syscallnames.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_syscallnames.c,v 1.27 2009/05/08 20:16:04 ed Exp $ - * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp */ const char *svr4_syscallnames[] = { ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_sysent.c,v 1.29 2009/06/01 16:14:38 rwatson Exp $ - * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp */ #include ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_proto.h,v 1.32 2009/05/08 20:08:43 ed Exp $ - * created from FreeBSD: head/sys/i386/ibcs2/syscalls.master 191919 2009-05-08 20:06:37Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.29 2009/05/08 20:06:37 ed Exp */ #ifndef _IBCS2_SYSPROTO_H_ ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_syscall.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_syscall.h,v 1.28 2009/05/08 20:08:43 ed Exp $ - * created from FreeBSD: head/sys/i386/ibcs2/syscalls.master 191919 2009-05-08 20:06:37Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.29 2009/05/08 20:06:37 ed Exp */ #define IBCS2_SYS_syscall 0 ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/ibcs2/ibcs2_sysent.c#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/ibcs2/ibcs2_sysent.c,v 1.34 2009/06/01 16:14:38 rwatson Exp $ - * created from FreeBSD: head/sys/i386/ibcs2/syscalls.master 191919 2009-05-08 20:06:37Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/ibcs2/syscalls.master,v 1.29 2009/05/08 20:06:37 ed Exp */ #include ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_proto.h,v 1.100 2008/11/09 10:48:06 ed Exp $ - * created from FreeBSD: head/sys/i386/linux/syscalls.master 184789 2008-11-09 10:45:13Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.94 2008/11/09 10:45:13 ed Exp */ #ifndef _LINUX_SYSPROTO_H_ ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_syscall.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_syscall.h,v 1.92 2008/11/09 10:48:06 ed Exp $ - * created from FreeBSD: head/sys/i386/linux/syscalls.master 184789 2008-11-09 10:45:13Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.94 2008/11/09 10:45:13 ed Exp */ #define LINUX_SYS_exit 1 ==== //depot/projects/trustedbsd/capabilities/src/sys/i386/linux/linux_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/i386/linux/linux_sysent.c,v 1.100 2009/06/01 16:14:38 rwatson Exp $ - * created from FreeBSD: head/sys/i386/linux/syscalls.master 184789 2008-11-09 10:45:13Z ed + * $FreeBSD$ + * created from FreeBSD: src/sys/i386/linux/syscalls.master,v 1.94 2008/11/09 10:45:13 ed Exp */ #include ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/init_sysent.c#30 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.248 2009/06/01 16:14:38 rwatson Exp $ - * created from FreeBSD: head/sys/kern/syscalls.master 191673 2009-04-29 21:14:15Z jamie + * $FreeBSD$ + * created from FreeBSD: src/sys/kern/syscalls.master,v 1.250 2009/04/29 21:14:15 jamie Exp */ #include "opt_compat.h" @@ -29,12 +29,12 @@ /* The casts are bogus but will do for now. */ struct sysent sysent[] = { { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 0 = syscall */ - { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, 0 }, /* 1 = exit */ + { AS(sys_exit_args), (sy_call_t *)sys_exit, AUE_EXIT, NULL, 0, 0, SYF_CAPENABLED }, /* 1 = exit */ { 0, (sy_call_t *)fork, AUE_FORK, NULL, 0, 0, 0 }, /* 2 = fork */ - { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, 0 }, /* 3 = read */ - { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, 0 }, /* 4 = write */ + { AS(read_args), (sy_call_t *)read, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 3 = read */ + { AS(write_args), (sy_call_t *)write, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 4 = write */ { AS(open_args), (sy_call_t *)open, AUE_OPEN_RWTC, NULL, 0, 0, 0 }, /* 5 = open */ - { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, 0 }, /* 6 = close */ + { AS(close_args), (sy_call_t *)close, AUE_CLOSE, NULL, 0, 0, SYF_CAPENABLED }, /* 6 = close */ { AS(wait_args), (sy_call_t *)wait4, AUE_WAIT4, NULL, 0, 0, 0 }, /* 7 = wait4 */ { compat(AS(ocreat_args),creat), AUE_CREAT, NULL, 0, 0, 0 }, /* 8 = old creat */ { AS(link_args), (sy_call_t *)link, AUE_LINK, NULL, 0, 0, 0 }, /* 9 = link */ @@ -45,199 +45,199 @@ { AS(mknod_args), (sy_call_t *)mknod, AUE_MKNOD, NULL, 0, 0, 0 }, /* 14 = mknod */ { AS(chmod_args), (sy_call_t *)chmod, AUE_CHMOD, NULL, 0, 0, 0 }, /* 15 = chmod */ { AS(chown_args), (sy_call_t *)chown, AUE_CHOWN, NULL, 0, 0, 0 }, /* 16 = chown */ - { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0, 0 }, /* 17 = break */ + { AS(obreak_args), (sy_call_t *)obreak, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 17 = break */ { compat4(AS(freebsd4_getfsstat_args),getfsstat), AUE_GETFSSTAT, NULL, 0, 0, 0 }, /* 18 = old getfsstat */ - { compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0, 0 }, /* 19 = old lseek */ - { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0, 0 }, /* 20 = getpid */ + { compat(AS(olseek_args),lseek), AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED }, /* 19 = old lseek */ + { 0, (sy_call_t *)getpid, AUE_GETPID, NULL, 0, 0, SYF_CAPENABLED }, /* 20 = getpid */ { AS(mount_args), (sy_call_t *)mount, AUE_MOUNT, NULL, 0, 0, 0 }, /* 21 = mount */ { AS(unmount_args), (sy_call_t *)unmount, AUE_UMOUNT, NULL, 0, 0, 0 }, /* 22 = unmount */ - { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, 0 }, /* 23 = setuid */ - { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0, 0 }, /* 24 = getuid */ - { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, 0 }, /* 25 = geteuid */ + { AS(setuid_args), (sy_call_t *)setuid, AUE_SETUID, NULL, 0, 0, SYF_CAPENABLED }, /* 23 = setuid */ + { 0, (sy_call_t *)getuid, AUE_GETUID, NULL, 0, 0, SYF_CAPENABLED }, /* 24 = getuid */ + { 0, (sy_call_t *)geteuid, AUE_GETEUID, NULL, 0, 0, SYF_CAPENABLED }, /* 25 = geteuid */ { AS(ptrace_args), (sy_call_t *)ptrace, AUE_PTRACE, NULL, 0, 0, 0 }, /* 26 = ptrace */ - { AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG, NULL, 0, 0, 0 }, /* 27 = recvmsg */ - { AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG, NULL, 0, 0, 0 }, /* 28 = sendmsg */ - { AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM, NULL, 0, 0, 0 }, /* 29 = recvfrom */ - { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0, 0 }, /* 30 = accept */ - { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0, 0 }, /* 31 = getpeername */ - { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0, 0 }, /* 32 = getsockname */ + { AS(recvmsg_args), (sy_call_t *)recvmsg, AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 27 = recvmsg */ + { AS(sendmsg_args), (sy_call_t *)sendmsg, AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 28 = sendmsg */ + { AS(recvfrom_args), (sy_call_t *)recvfrom, AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED }, /* 29 = recvfrom */ + { AS(accept_args), (sy_call_t *)accept, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED }, /* 30 = accept */ + { AS(getpeername_args), (sy_call_t *)getpeername, AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 31 = getpeername */ + { AS(getsockname_args), (sy_call_t *)getsockname, AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 32 = getsockname */ { AS(access_args), (sy_call_t *)access, AUE_ACCESS, NULL, 0, 0, 0 }, /* 33 = access */ { AS(chflags_args), (sy_call_t *)chflags, AUE_CHFLAGS, NULL, 0, 0, 0 }, /* 34 = chflags */ - { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0, 0 }, /* 35 = fchflags */ - { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, 0 }, /* 36 = sync */ + { AS(fchflags_args), (sy_call_t *)fchflags, AUE_FCHFLAGS, NULL, 0, 0, SYF_CAPENABLED }, /* 35 = fchflags */ + { 0, (sy_call_t *)sync, AUE_SYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 36 = sync */ { AS(kill_args), (sy_call_t *)kill, AUE_KILL, NULL, 0, 0, 0 }, /* 37 = kill */ { compat(AS(ostat_args),stat), AUE_STAT, NULL, 0, 0, 0 }, /* 38 = old stat */ - { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0, 0 }, /* 39 = getppid */ + { 0, (sy_call_t *)getppid, AUE_GETPPID, NULL, 0, 0, SYF_CAPENABLED }, /* 39 = getppid */ { compat(AS(olstat_args),lstat), AUE_LSTAT, NULL, 0, 0, 0 }, /* 40 = old lstat */ - { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, 0 }, /* 41 = dup */ - { 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0, 0 }, /* 42 = pipe */ - { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, 0 }, /* 43 = getegid */ - { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0, 0 }, /* 44 = profil */ + { AS(dup_args), (sy_call_t *)dup, AUE_DUP, NULL, 0, 0, SYF_CAPENABLED }, /* 41 = dup */ + { 0, (sy_call_t *)pipe, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED }, /* 42 = pipe */ + { 0, (sy_call_t *)getegid, AUE_GETEGID, NULL, 0, 0, SYF_CAPENABLED }, /* 43 = getegid */ + { AS(profil_args), (sy_call_t *)profil, AUE_PROFILE, NULL, 0, 0, SYF_CAPENABLED }, /* 44 = profil */ { AS(ktrace_args), (sy_call_t *)ktrace, AUE_KTRACE, NULL, 0, 0, 0 }, /* 45 = ktrace */ - { compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, 0 }, /* 46 = old sigaction */ - { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0, 0 }, /* 47 = getgid */ - { compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, 0 }, /* 48 = old sigprocmask */ - { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, 0 }, /* 49 = getlogin */ + { compat(AS(osigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED }, /* 46 = old sigaction */ + { 0, (sy_call_t *)getgid, AUE_GETGID, NULL, 0, 0, SYF_CAPENABLED }, /* 47 = getgid */ + { compat(AS(osigprocmask_args),sigprocmask), AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 48 = old sigprocmask */ + { AS(getlogin_args), (sy_call_t *)getlogin, AUE_GETLOGIN, NULL, 0, 0, SYF_CAPENABLED }, /* 49 = getlogin */ { AS(setlogin_args), (sy_call_t *)setlogin, AUE_SETLOGIN, NULL, 0, 0, 0 }, /* 50 = setlogin */ { AS(acct_args), (sy_call_t *)acct, AUE_ACCT, NULL, 0, 0, 0 }, /* 51 = acct */ - { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, 0 }, /* 52 = old sigpending */ - { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, 0 }, /* 53 = sigaltstack */ + { compat(0,sigpending), AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 52 = old sigpending */ + { AS(sigaltstack_args), (sy_call_t *)sigaltstack, AUE_SIGALTSTACK, NULL, 0, 0, SYF_CAPENABLED }, /* 53 = sigaltstack */ { AS(ioctl_args), (sy_call_t *)ioctl, AUE_IOCTL, NULL, 0, 0, 0 }, /* 54 = ioctl */ { AS(reboot_args), (sy_call_t *)reboot, AUE_REBOOT, NULL, 0, 0, 0 }, /* 55 = reboot */ { AS(revoke_args), (sy_call_t *)revoke, AUE_REVOKE, NULL, 0, 0, 0 }, /* 56 = revoke */ { AS(symlink_args), (sy_call_t *)symlink, AUE_SYMLINK, NULL, 0, 0, 0 }, /* 57 = symlink */ { AS(readlink_args), (sy_call_t *)readlink, AUE_READLINK, NULL, 0, 0, 0 }, /* 58 = readlink */ { AS(execve_args), (sy_call_t *)execve, AUE_EXECVE, NULL, 0, 0, 0 }, /* 59 = execve */ - { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, 0 }, /* 60 = umask */ + { AS(umask_args), (sy_call_t *)umask, AUE_UMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 60 = umask */ { AS(chroot_args), (sy_call_t *)chroot, AUE_CHROOT, NULL, 0, 0, 0 }, /* 61 = chroot */ - { compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0, 0 }, /* 62 = old fstat */ + { compat(AS(ofstat_args),fstat), AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED }, /* 62 = old fstat */ { compat(AS(getkerninfo_args),getkerninfo), AUE_NULL, NULL, 0, 0, 0 }, /* 63 = old getkerninfo */ - { compat(0,getpagesize), AUE_NULL, NULL, 0, 0, 0 }, /* 64 = old getpagesize */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0 }, /* 65 = msync */ + { compat(0,getpagesize), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 64 = old getpagesize */ + { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 65 = msync */ { 0, (sy_call_t *)vfork, AUE_VFORK, NULL, 0, 0, 0 }, /* 66 = vfork */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 67 = obsolete vread */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 68 = obsolete vwrite */ - { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0, 0 }, /* 69 = sbrk */ - { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0, 0 }, /* 70 = sstk */ - { compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, 0 }, /* 71 = old mmap */ + { AS(sbrk_args), (sy_call_t *)sbrk, AUE_SBRK, NULL, 0, 0, SYF_CAPENABLED }, /* 69 = sbrk */ + { AS(sstk_args), (sy_call_t *)sstk, AUE_SSTK, NULL, 0, 0, SYF_CAPENABLED }, /* 70 = sstk */ + { compat(AS(ommap_args),mmap), AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 71 = old mmap */ { AS(ovadvise_args), (sy_call_t *)ovadvise, AUE_O_VADVISE, NULL, 0, 0, 0 }, /* 72 = vadvise */ - { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, 0 }, /* 73 = munmap */ - { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0, 0 }, /* 74 = mprotect */ - { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, 0 }, /* 75 = madvise */ + { AS(munmap_args), (sy_call_t *)munmap, AUE_MUNMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 73 = munmap */ + { AS(mprotect_args), (sy_call_t *)mprotect, AUE_MPROTECT, NULL, 0, 0, SYF_CAPENABLED }, /* 74 = mprotect */ + { AS(madvise_args), (sy_call_t *)madvise, AUE_MADVISE, NULL, 0, 0, SYF_CAPENABLED }, /* 75 = madvise */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 76 = obsolete vhangup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 77 = obsolete vlimit */ - { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0, 0 }, /* 78 = mincore */ - { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0, 0 }, /* 79 = getgroups */ + { AS(mincore_args), (sy_call_t *)mincore, AUE_MINCORE, NULL, 0, 0, SYF_CAPENABLED }, /* 78 = mincore */ + { AS(getgroups_args), (sy_call_t *)getgroups, AUE_GETGROUPS, NULL, 0, 0, SYF_CAPENABLED }, /* 79 = getgroups */ { AS(setgroups_args), (sy_call_t *)setgroups, AUE_SETGROUPS, NULL, 0, 0, 0 }, /* 80 = setgroups */ - { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, 0 }, /* 81 = getpgrp */ + { 0, (sy_call_t *)getpgrp, AUE_GETPGRP, NULL, 0, 0, SYF_CAPENABLED }, /* 81 = getpgrp */ { AS(setpgid_args), (sy_call_t *)setpgid, AUE_SETPGRP, NULL, 0, 0, 0 }, /* 82 = setpgid */ - { AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0, 0 }, /* 83 = setitimer */ + { AS(setitimer_args), (sy_call_t *)setitimer, AUE_SETITIMER, NULL, 0, 0, SYF_CAPENABLED }, /* 83 = setitimer */ { compat(0,wait), AUE_WAIT4, NULL, 0, 0, 0 }, /* 84 = old wait */ { AS(swapon_args), (sy_call_t *)swapon, AUE_SWAPON, NULL, 0, 0, 0 }, /* 85 = swapon */ - { AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0, 0 }, /* 86 = getitimer */ - { compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 87 = old gethostname */ + { AS(getitimer_args), (sy_call_t *)getitimer, AUE_GETITIMER, NULL, 0, 0, SYF_CAPENABLED }, /* 86 = getitimer */ + { compat(AS(gethostname_args),gethostname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 87 = old gethostname */ { compat(AS(sethostname_args),sethostname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 88 = old sethostname */ { 0, (sy_call_t *)getdtablesize, AUE_GETDTABLESIZE, NULL, 0, 0, 0 }, /* 89 = getdtablesize */ - { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, 0 }, /* 90 = dup2 */ + { AS(dup2_args), (sy_call_t *)dup2, AUE_DUP2, NULL, 0, 0, SYF_CAPENABLED }, /* 90 = dup2 */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 91 = getdopt */ - { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0, 0 }, /* 92 = fcntl */ - { AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0, 0 }, /* 93 = select */ + { AS(fcntl_args), (sy_call_t *)fcntl, AUE_FCNTL, NULL, 0, 0, SYF_CAPENABLED }, /* 92 = fcntl */ + { AS(select_args), (sy_call_t *)select, AUE_SELECT, NULL, 0, 0, SYF_CAPENABLED }, /* 93 = select */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 94 = setdopt */ - { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, 0 }, /* 95 = fsync */ - { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, 0 }, /* 96 = setpriority */ + { AS(fsync_args), (sy_call_t *)fsync, AUE_FSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 95 = fsync */ + { AS(setpriority_args), (sy_call_t *)setpriority, AUE_SETPRIORITY, NULL, 0, 0, SYF_CAPENABLED }, /* 96 = setpriority */ { AS(socket_args), (sy_call_t *)socket, AUE_SOCKET, NULL, 0, 0, 0 }, /* 97 = socket */ - { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0, 0 }, /* 98 = connect */ - { compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, 0 }, /* 99 = old accept */ - { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0, 0 }, /* 100 = getpriority */ - { compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0, 0 }, /* 101 = old send */ - { compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0, 0 }, /* 102 = old recv */ - { compat(AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 103 = old sigreturn */ - { AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0, 0 }, /* 104 = bind */ - { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, 0 }, /* 105 = setsockopt */ - { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0, 0 }, /* 106 = listen */ + { AS(connect_args), (sy_call_t *)connect, AUE_CONNECT, NULL, 0, 0, SYF_CAPENABLED }, /* 98 = connect */ + { compat(AS(accept_args),accept), AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED }, /* 99 = old accept */ + { AS(getpriority_args), (sy_call_t *)getpriority, AUE_GETPRIORITY, NULL, 0, 0, SYF_CAPENABLED }, /* 100 = getpriority */ + { compat(AS(osend_args),send), AUE_SEND, NULL, 0, 0, SYF_CAPENABLED }, /* 101 = old send */ + { compat(AS(orecv_args),recv), AUE_RECV, NULL, 0, 0, SYF_CAPENABLED }, /* 102 = old recv */ + { compat(AS(osigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED }, /* 103 = old sigreturn */ + { AS(bind_args), (sy_call_t *)bind, AUE_BIND, NULL, 0, 0, SYF_CAPENABLED }, /* 104 = bind */ + { AS(setsockopt_args), (sy_call_t *)setsockopt, AUE_SETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED }, /* 105 = setsockopt */ + { AS(listen_args), (sy_call_t *)listen, AUE_LISTEN, NULL, 0, 0, SYF_CAPENABLED }, /* 106 = listen */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 107 = obsolete vtimes */ - { compat(AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0, 0 }, /* 108 = old sigvec */ - { compat(AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0, 0 }, /* 109 = old sigblock */ - { compat(AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0, 0 }, /* 110 = old sigsetmask */ - { compat(AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0, 0 }, /* 111 = old sigsuspend */ - { compat(AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0, 0 }, /* 112 = old sigstack */ - { compat(AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0, 0 }, /* 113 = old recvmsg */ - { compat(AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0, 0 }, /* 114 = old sendmsg */ + { compat(AS(osigvec_args),sigvec), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 108 = old sigvec */ + { compat(AS(osigblock_args),sigblock), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 109 = old sigblock */ + { compat(AS(osigsetmask_args),sigsetmask), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 110 = old sigsetmask */ + { compat(AS(osigsuspend_args),sigsuspend), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 111 = old sigsuspend */ + { compat(AS(osigstack_args),sigstack), AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 112 = old sigstack */ + { compat(AS(orecvmsg_args),recvmsg), AUE_RECVMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 113 = old recvmsg */ + { compat(AS(osendmsg_args),sendmsg), AUE_SENDMSG, NULL, 0, 0, SYF_CAPENABLED }, /* 114 = old sendmsg */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 115 = obsolete vtrace */ - { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, 0 }, /* 116 = gettimeofday */ - { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0, 0 }, /* 117 = getrusage */ - { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, 0 }, /* 118 = getsockopt */ + { AS(gettimeofday_args), (sy_call_t *)gettimeofday, AUE_GETTIMEOFDAY, NULL, 0, 0, SYF_CAPENABLED }, /* 116 = gettimeofday */ + { AS(getrusage_args), (sy_call_t *)getrusage, AUE_GETRUSAGE, NULL, 0, 0, SYF_CAPENABLED }, /* 117 = getrusage */ + { AS(getsockopt_args), (sy_call_t *)getsockopt, AUE_GETSOCKOPT, NULL, 0, 0, SYF_CAPENABLED }, /* 118 = getsockopt */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 119 = resuba */ - { AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0, 0 }, /* 120 = readv */ - { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0, 0 }, /* 121 = writev */ + { AS(readv_args), (sy_call_t *)readv, AUE_READV, NULL, 0, 0, SYF_CAPENABLED }, /* 120 = readv */ + { AS(writev_args), (sy_call_t *)writev, AUE_WRITEV, NULL, 0, 0, SYF_CAPENABLED }, /* 121 = writev */ { AS(settimeofday_args), (sy_call_t *)settimeofday, AUE_SETTIMEOFDAY, NULL, 0, 0, 0 }, /* 122 = settimeofday */ - { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, 0 }, /* 123 = fchown */ - { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, 0 }, /* 124 = fchmod */ - { compat(AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0, 0 }, /* 125 = old recvfrom */ - { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, 0 }, /* 126 = setreuid */ - { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, 0 }, /* 127 = setregid */ + { AS(fchown_args), (sy_call_t *)fchown, AUE_FCHOWN, NULL, 0, 0, SYF_CAPENABLED }, /* 123 = fchown */ + { AS(fchmod_args), (sy_call_t *)fchmod, AUE_FCHMOD, NULL, 0, 0, SYF_CAPENABLED }, /* 124 = fchmod */ + { compat(AS(recvfrom_args),recvfrom), AUE_RECVFROM, NULL, 0, 0, SYF_CAPENABLED }, /* 125 = old recvfrom */ + { AS(setreuid_args), (sy_call_t *)setreuid, AUE_SETREUID, NULL, 0, 0, SYF_CAPENABLED }, /* 126 = setreuid */ + { AS(setregid_args), (sy_call_t *)setregid, AUE_SETREGID, NULL, 0, 0, SYF_CAPENABLED }, /* 127 = setregid */ { AS(rename_args), (sy_call_t *)rename, AUE_RENAME, NULL, 0, 0, 0 }, /* 128 = rename */ { compat(AS(otruncate_args),truncate), AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 129 = old truncate */ - { compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 130 = old ftruncate */ - { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, 0 }, /* 131 = flock */ + { compat(AS(oftruncate_args),ftruncate), AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED }, /* 130 = old ftruncate */ + { AS(flock_args), (sy_call_t *)flock, AUE_FLOCK, NULL, 0, 0, SYF_CAPENABLED }, /* 131 = flock */ { AS(mkfifo_args), (sy_call_t *)mkfifo, AUE_MKFIFO, NULL, 0, 0, 0 }, /* 132 = mkfifo */ - { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0, 0 }, /* 133 = sendto */ - { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0, 0 }, /* 134 = shutdown */ - { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0, 0 }, /* 135 = socketpair */ + { AS(sendto_args), (sy_call_t *)sendto, AUE_SENDTO, NULL, 0, 0, SYF_CAPENABLED }, /* 133 = sendto */ + { AS(shutdown_args), (sy_call_t *)shutdown, AUE_SHUTDOWN, NULL, 0, 0, SYF_CAPENABLED }, /* 134 = shutdown */ + { AS(socketpair_args), (sy_call_t *)socketpair, AUE_SOCKETPAIR, NULL, 0, 0, SYF_CAPENABLED }, /* 135 = socketpair */ { AS(mkdir_args), (sy_call_t *)mkdir, AUE_MKDIR, NULL, 0, 0, 0 }, /* 136 = mkdir */ { AS(rmdir_args), (sy_call_t *)rmdir, AUE_RMDIR, NULL, 0, 0, 0 }, /* 137 = rmdir */ { AS(utimes_args), (sy_call_t *)utimes, AUE_UTIMES, NULL, 0, 0, 0 }, /* 138 = utimes */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 139 = obsolete 4.2 sigreturn */ { AS(adjtime_args), (sy_call_t *)adjtime, AUE_ADJTIME, NULL, 0, 0, 0 }, /* 140 = adjtime */ - { compat(AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0, 0 }, /* 141 = old getpeername */ - { compat(0,gethostid), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 142 = old gethostid */ + { compat(AS(ogetpeername_args),getpeername), AUE_GETPEERNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 141 = old getpeername */ + { compat(0,gethostid), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 142 = old gethostid */ { compat(AS(osethostid_args),sethostid), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 143 = old sethostid */ - { compat(AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 144 = old getrlimit */ - { compat(AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0, 0 }, /* 145 = old setrlimit */ + { compat(AS(ogetrlimit_args),getrlimit), AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 144 = old getrlimit */ + { compat(AS(osetrlimit_args),setrlimit), AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 145 = old setrlimit */ { compat(AS(okillpg_args),killpg), AUE_KILLPG, NULL, 0, 0, 0 }, /* 146 = old killpg */ - { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, 0 }, /* 147 = setsid */ + { 0, (sy_call_t *)setsid, AUE_SETSID, NULL, 0, 0, SYF_CAPENABLED }, /* 147 = setsid */ { AS(quotactl_args), (sy_call_t *)quotactl, AUE_QUOTACTL, NULL, 0, 0, 0 }, /* 148 = quotactl */ { compat(0,quota), AUE_O_QUOTA, NULL, 0, 0, 0 }, /* 149 = old quota */ - { compat(AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0, 0 }, /* 150 = old getsockname */ + { compat(AS(getsockname_args),getsockname), AUE_GETSOCKNAME, NULL, 0, 0, SYF_CAPENABLED }, /* 150 = old getsockname */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 151 = sem_lock */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 152 = sem_wakeup */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 153 = asyncdaemon */ { AS(nlm_syscall_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 154 = nlm_syscall */ { AS(nfssvc_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 155 = nfssvc */ - { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 156 = old getdirentries */ + { compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED }, /* 156 = old getdirentries */ { compat4(AS(freebsd4_statfs_args),statfs), AUE_STATFS, NULL, 0, 0, 0 }, /* 157 = old statfs */ - { compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, 0 }, /* 158 = old fstatfs */ + { compat4(AS(freebsd4_fstatfs_args),fstatfs), AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED }, /* 158 = old fstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 159 = nosys */ { AS(lgetfh_args), (sy_call_t *)lgetfh, AUE_LGETFH, NULL, 0, 0, 0 }, /* 160 = lgetfh */ { AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0, 0 }, /* 161 = getfh */ - { compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 162 = old getdomainname */ + { compat4(AS(freebsd4_getdomainname_args),getdomainname), AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 162 = old getdomainname */ { compat4(AS(freebsd4_setdomainname_args),setdomainname), AUE_SYSCTL, NULL, 0, 0, 0 }, /* 163 = old setdomainname */ { compat4(AS(freebsd4_uname_args),uname), AUE_NULL, NULL, 0, 0, 0 }, /* 164 = old uname */ - { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, 0 }, /* 165 = sysarch */ - { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0, 0 }, /* 166 = rtprio */ + { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0, SYF_CAPENABLED }, /* 165 = sysarch */ + { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED }, /* 166 = rtprio */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 167 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 168 = nosys */ { AS(semsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 169 = semsys */ { AS(msgsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 170 = msgsys */ { AS(shmsys_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 171 = shmsys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 172 = nosys */ - { AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0, 0 }, /* 173 = freebsd6_pread */ - { AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0, 0 }, /* 174 = freebsd6_pwrite */ + { AS(freebsd6_pread_args), (sy_call_t *)freebsd6_pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED }, /* 173 = freebsd6_pread */ + { AS(freebsd6_pwrite_args), (sy_call_t *)freebsd6_pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED }, /* 174 = freebsd6_pwrite */ { AS(setfib_args), (sy_call_t *)setfib, AUE_NULL, NULL, 0, 0, 0 }, /* 175 = setfib */ { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0, 0 }, /* 176 = ntp_adjtime */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 177 = sfork */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 178 = getdescriptor */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 179 = setdescriptor */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 180 = nosys */ - { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, 0 }, /* 181 = setgid */ - { AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0, 0 }, /* 182 = setegid */ - { AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0, 0 }, /* 183 = seteuid */ + { AS(setgid_args), (sy_call_t *)setgid, AUE_SETGID, NULL, 0, 0, SYF_CAPENABLED }, /* 181 = setgid */ + { AS(setegid_args), (sy_call_t *)setegid, AUE_SETEGID, NULL, 0, 0, SYF_CAPENABLED }, /* 182 = setegid */ + { AS(seteuid_args), (sy_call_t *)seteuid, AUE_SETEUID, NULL, 0, 0, SYF_CAPENABLED }, /* 183 = seteuid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 184 = lfs_bmapv */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 185 = lfs_markv */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 186 = lfs_segclean */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 187 = lfs_segwait */ { AS(stat_args), (sy_call_t *)stat, AUE_STAT, NULL, 0, 0, 0 }, /* 188 = stat */ - { AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 189 = fstat */ + { AS(fstat_args), (sy_call_t *)fstat, AUE_FSTAT, NULL, 0, 0, SYF_CAPENABLED }, /* 189 = fstat */ { AS(lstat_args), (sy_call_t *)lstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 190 = lstat */ { AS(pathconf_args), (sy_call_t *)pathconf, AUE_PATHCONF, NULL, 0, 0, 0 }, /* 191 = pathconf */ - { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, 0 }, /* 192 = fpathconf */ + { AS(fpathconf_args), (sy_call_t *)fpathconf, AUE_FPATHCONF, NULL, 0, 0, SYF_CAPENABLED }, /* 192 = fpathconf */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 193 = nosys */ - { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, 0 }, /* 194 = getrlimit */ - { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, 0 }, /* 195 = setrlimit */ - { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, 0 }, /* 196 = getdirentries */ - { AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0, 0 }, /* 197 = freebsd6_mmap */ + { AS(__getrlimit_args), (sy_call_t *)getrlimit, AUE_GETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 194 = getrlimit */ + { AS(__setrlimit_args), (sy_call_t *)setrlimit, AUE_SETRLIMIT, NULL, 0, 0, SYF_CAPENABLED }, /* 195 = setrlimit */ + { AS(getdirentries_args), (sy_call_t *)getdirentries, AUE_GETDIRENTRIES, NULL, 0, 0, SYF_CAPENABLED }, /* 196 = getdirentries */ + { AS(freebsd6_mmap_args), (sy_call_t *)freebsd6_mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 197 = freebsd6_mmap */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 198 = __syscall */ - { AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 199 = freebsd6_lseek */ + { AS(freebsd6_lseek_args), (sy_call_t *)freebsd6_lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED }, /* 199 = freebsd6_lseek */ { AS(freebsd6_truncate_args), (sy_call_t *)freebsd6_truncate, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 200 = freebsd6_truncate */ - { AS(freebsd6_ftruncate_args), (sy_call_t *)freebsd6_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 201 = freebsd6_ftruncate */ - { AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL, NULL, 0, 0, 0 }, /* 202 = __sysctl */ - { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, 0 }, /* 203 = mlock */ - { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, 0 }, /* 204 = munlock */ + { AS(freebsd6_ftruncate_args), (sy_call_t *)freebsd6_ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED }, /* 201 = freebsd6_ftruncate */ + { AS(sysctl_args), (sy_call_t *)__sysctl, AUE_SYSCTL, NULL, 0, 0, SYF_CAPENABLED }, /* 202 = __sysctl */ + { AS(mlock_args), (sy_call_t *)mlock, AUE_MLOCK, NULL, 0, 0, SYF_CAPENABLED }, /* 203 = mlock */ + { AS(munlock_args), (sy_call_t *)munlock, AUE_MUNLOCK, NULL, 0, 0, SYF_CAPENABLED }, /* 204 = munlock */ { AS(undelete_args), (sy_call_t *)undelete, AUE_UNDELETE, NULL, 0, 0, 0 }, /* 205 = undelete */ - { AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES, NULL, 0, 0, 0 }, /* 206 = futimes */ - { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, 0 }, /* 207 = getpgid */ + { AS(futimes_args), (sy_call_t *)futimes, AUE_FUTIMES, NULL, 0, 0, SYF_CAPENABLED }, /* 206 = futimes */ + { AS(getpgid_args), (sy_call_t *)getpgid, AUE_GETPGID, NULL, 0, 0, SYF_CAPENABLED }, /* 207 = getpgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 208 = newreboot */ - { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, 0 }, /* 209 = poll */ + { AS(poll_args), (sy_call_t *)poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED }, /* 209 = poll */ { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 210 = lkmnosys */ { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 211 = lkmnosys */ { AS(nosys_args), (sy_call_t *)lkmnosys, AUE_NULL, NULL, 0, 0, 0 }, /* 212 = lkmnosys */ @@ -260,15 +260,15 @@ { AS(shmctl_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 229 = shmctl */ { AS(shmdt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 230 = shmdt */ { AS(shmget_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 231 = shmget */ - { AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 232 = clock_gettime */ + { AS(clock_gettime_args), (sy_call_t *)clock_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 232 = clock_gettime */ { AS(clock_settime_args), (sy_call_t *)clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0 }, /* 233 = clock_settime */ - { AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL, NULL, 0, 0, 0 }, /* 234 = clock_getres */ - { AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL, NULL, 0, 0, 0 }, /* 235 = ktimer_create */ - { AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL, NULL, 0, 0, 0 }, /* 236 = ktimer_delete */ - { AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL, NULL, 0, 0, 0 }, /* 237 = ktimer_settime */ - { AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 238 = ktimer_gettime */ - { AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL, NULL, 0, 0, 0 }, /* 239 = ktimer_getoverrun */ - { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0, 0 }, /* 240 = nanosleep */ + { AS(clock_getres_args), (sy_call_t *)clock_getres, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 234 = clock_getres */ + { AS(ktimer_create_args), (sy_call_t *)ktimer_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 235 = ktimer_create */ + { AS(ktimer_delete_args), (sy_call_t *)ktimer_delete, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 236 = ktimer_delete */ + { AS(ktimer_settime_args), (sy_call_t *)ktimer_settime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 237 = ktimer_settime */ + { AS(ktimer_gettime_args), (sy_call_t *)ktimer_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 238 = ktimer_gettime */ + { AS(ktimer_getoverrun_args), (sy_call_t *)ktimer_getoverrun, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 239 = ktimer_getoverrun */ + { AS(nanosleep_args), (sy_call_t *)nanosleep, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 240 = nanosleep */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 241 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 242 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 243 = nosys */ @@ -276,12 +276,12 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 245 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 246 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 247 = nosys */ - { AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0, 0 }, /* 248 = ntp_gettime */ + { AS(ntp_gettime_args), (sy_call_t *)ntp_gettime, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 248 = ntp_gettime */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 249 = nosys */ - { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0, 0 }, /* 250 = minherit */ + { AS(minherit_args), (sy_call_t *)minherit, AUE_MINHERIT, NULL, 0, 0, SYF_CAPENABLED }, /* 250 = minherit */ { AS(rfork_args), (sy_call_t *)rfork, AUE_RFORK, NULL, 0, 0, 0 }, /* 251 = rfork */ - { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0, 0 }, /* 252 = openbsd_poll */ - { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0, 0 }, /* 253 = issetugid */ + { AS(openbsd_poll_args), (sy_call_t *)openbsd_poll, AUE_POLL, NULL, 0, 0, SYF_CAPENABLED }, /* 252 = openbsd_poll */ + { 0, (sy_call_t *)issetugid, AUE_ISSETUGID, NULL, 0, 0, SYF_CAPENABLED }, /* 253 = issetugid */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 254 = lchown */ { AS(aio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 255 = aio_read */ { AS(aio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 256 = aio_write */ @@ -300,12 +300,12 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 269 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 270 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 271 = nosys */ - { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, 0 }, /* 272 = getdents */ + { AS(getdents_args), (sy_call_t *)getdents, AUE_O_GETDENTS, NULL, 0, 0, SYF_CAPENABLED }, /* 272 = getdents */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 273 = nosys */ { AS(lchmod_args), (sy_call_t *)lchmod, AUE_LCHMOD, NULL, 0, 0, 0 }, /* 274 = lchmod */ { AS(lchown_args), (sy_call_t *)lchown, AUE_LCHOWN, NULL, 0, 0, 0 }, /* 275 = netbsd_lchown */ { AS(lutimes_args), (sy_call_t *)lutimes, AUE_LUTIMES, NULL, 0, 0, 0 }, /* 276 = lutimes */ - { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, 0 }, /* 277 = netbsd_msync */ + { AS(msync_args), (sy_call_t *)msync, AUE_MSYNC, NULL, 0, 0, SYF_CAPENABLED }, /* 277 = netbsd_msync */ { AS(nstat_args), (sy_call_t *)nstat, AUE_STAT, NULL, 0, 0, 0 }, /* 278 = nstat */ { AS(nfstat_args), (sy_call_t *)nfstat, AUE_FSTAT, NULL, 0, 0, 0 }, /* 279 = nfstat */ { AS(nlstat_args), (sy_call_t *)nlstat, AUE_LSTAT, NULL, 0, 0, 0 }, /* 280 = nlstat */ @@ -317,8 +317,8 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 286 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 287 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 288 = nosys */ - { AS(preadv_args), (sy_call_t *)preadv, AUE_PREADV, NULL, 0, 0, 0 }, /* 289 = preadv */ - { AS(pwritev_args), (sy_call_t *)pwritev, AUE_PWRITEV, NULL, 0, 0, 0 }, /* 290 = pwritev */ + { AS(preadv_args), (sy_call_t *)preadv, AUE_PREADV, NULL, 0, 0, SYF_CAPENABLED }, /* 289 = preadv */ + { AS(pwritev_args), (sy_call_t *)pwritev, AUE_PWRITEV, NULL, 0, 0, SYF_CAPENABLED }, /* 290 = pwritev */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 291 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 292 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 293 = nosys */ @@ -338,9 +338,9 @@ { AS(kldnext_args), (sy_call_t *)kldnext, AUE_NULL, NULL, 0, 0, 0 }, /* 307 = kldnext */ { AS(kldstat_args), (sy_call_t *)kldstat, AUE_NULL, NULL, 0, 0, 0 }, /* 308 = kldstat */ { AS(kldfirstmod_args), (sy_call_t *)kldfirstmod, AUE_NULL, NULL, 0, 0, 0 }, /* 309 = kldfirstmod */ - { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0, 0 }, /* 310 = getsid */ - { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, 0 }, /* 311 = setresuid */ - { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, 0 }, /* 312 = setresgid */ + { AS(getsid_args), (sy_call_t *)getsid, AUE_GETSID, NULL, 0, 0, SYF_CAPENABLED }, /* 310 = getsid */ + { AS(setresuid_args), (sy_call_t *)setresuid, AUE_SETRESUID, NULL, 0, 0, SYF_CAPENABLED }, /* 311 = setresuid */ + { AS(setresgid_args), (sy_call_t *)setresgid, AUE_SETRESGID, NULL, 0, 0, SYF_CAPENABLED }, /* 312 = setresgid */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 313 = obsolete signanosleep */ { AS(aio_return_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 314 = aio_return */ { AS(aio_suspend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 315 = aio_suspend */ @@ -349,49 +349,49 @@ { AS(oaio_read_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 318 = oaio_read */ { AS(oaio_write_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 319 = oaio_write */ { AS(olio_listio_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 320 = olio_listio */ - { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0, 0 }, /* 321 = yield */ + { 0, (sy_call_t *)yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 321 = yield */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 322 = obsolete thr_sleep */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 323 = obsolete thr_wakeup */ - { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, 0 }, /* 324 = mlockall */ - { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, 0 }, /* 325 = munlockall */ + { AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0, SYF_CAPENABLED }, /* 324 = mlockall */ + { 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0, SYF_CAPENABLED }, /* 325 = munlockall */ { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0, 0 }, /* 326 = __getcwd */ - { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0, 0 }, /* 327 = sched_setparam */ - { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0, 0 }, /* 328 = sched_getparam */ - { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0, 0 }, /* 329 = sched_setscheduler */ - { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0, 0 }, /* 330 = sched_getscheduler */ - { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, 0 }, /* 331 = sched_yield */ - { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0, 0 }, /* 332 = sched_get_priority_max */ - { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, 0 }, /* 333 = sched_get_priority_min */ + { AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 327 = sched_setparam */ + { AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 328 = sched_getparam */ + { AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 329 = sched_setscheduler */ + { AS(sched_getscheduler_args), (sy_call_t *)sched_getscheduler, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 330 = sched_getscheduler */ + { 0, (sy_call_t *)sched_yield, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 331 = sched_yield */ + { AS(sched_get_priority_max_args), (sy_call_t *)sched_get_priority_max, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 332 = sched_get_priority_max */ + { AS(sched_get_priority_min_args), (sy_call_t *)sched_get_priority_min, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 333 = sched_get_priority_min */ { AS(sched_rr_get_interval_args), (sy_call_t *)sched_rr_get_interval, AUE_NULL, NULL, 0, 0, 0 }, /* 334 = sched_rr_get_interval */ - { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0, 0 }, /* 335 = utrace */ - { compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, 0 }, /* 336 = old sendfile */ + { AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 335 = utrace */ + { compat4(AS(freebsd4_sendfile_args),sendfile), AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED }, /* 336 = old sendfile */ { AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0, 0 }, /* 337 = kldsym */ { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0, 0 }, /* 338 = jail */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 339 = pioctl */ - { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0 }, /* 340 = sigprocmask */ - { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, 0 }, /* 341 = sigsuspend */ - { compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, 0 }, /* 342 = old sigaction */ - { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0, 0 }, /* 343 = sigpending */ - { compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 344 = old sigreturn */ - { AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, 0 }, /* 345 = sigtimedwait */ - { AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL, NULL, 0, 0, 0 }, /* 346 = sigwaitinfo */ + { AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, SYF_CAPENABLED }, /* 340 = sigprocmask */ + { AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0, SYF_CAPENABLED }, /* 341 = sigsuspend */ + { compat4(AS(freebsd4_sigaction_args),sigaction), AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED }, /* 342 = old sigaction */ + { AS(sigpending_args), (sy_call_t *)sigpending, AUE_SIGPENDING, NULL, 0, 0, SYF_CAPENABLED }, /* 343 = sigpending */ + { compat4(AS(freebsd4_sigreturn_args),sigreturn), AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED }, /* 344 = old sigreturn */ + { AS(sigtimedwait_args), (sy_call_t *)sigtimedwait, AUE_SIGWAIT, NULL, 0, 0, SYF_CAPENABLED }, /* 345 = sigtimedwait */ + { AS(sigwaitinfo_args), (sy_call_t *)sigwaitinfo, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 346 = sigwaitinfo */ { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0, 0 }, /* 347 = __acl_get_file */ { AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0, 0 }, /* 348 = __acl_set_file */ - { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 349 = __acl_get_fd */ - { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 350 = __acl_set_fd */ + { AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 349 = __acl_get_fd */ + { AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 350 = __acl_set_fd */ { AS(__acl_delete_file_args), (sy_call_t *)__acl_delete_file, AUE_NULL, NULL, 0, 0, 0 }, /* 351 = __acl_delete_file */ - { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 352 = __acl_delete_fd */ + { AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 352 = __acl_delete_fd */ { AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0, 0 }, /* 353 = __acl_aclcheck_file */ - { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 354 = __acl_aclcheck_fd */ + { AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 354 = __acl_aclcheck_fd */ { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0, 0 }, /* 355 = extattrctl */ { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0, 0 }, /* 356 = extattr_set_file */ { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0, 0 }, /* 357 = extattr_get_file */ { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0, 0 }, /* 358 = extattr_delete_file */ { AS(aio_waitcomplete_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 359 = aio_waitcomplete */ - { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0, 0 }, /* 360 = getresuid */ - { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0, 0 }, /* 361 = getresgid */ - { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0, 0 }, /* 362 = kqueue */ - { AS(kevent_args), (sy_call_t *)kevent, AUE_NULL, NULL, 0, 0, 0 }, /* 363 = kevent */ + { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0, SYF_CAPENABLED }, /* 360 = getresuid */ + { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0, SYF_CAPENABLED }, /* 361 = getresgid */ + { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0, SYF_CAPENABLED }, /* 362 = kqueue */ + { AS(kevent_args), (sy_call_t *)kevent, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 363 = kevent */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 364 = __cap_get_proc */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 365 = __cap_set_proc */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 366 = __cap_get_fd */ @@ -399,9 +399,9 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 368 = __cap_set_fd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 369 = __cap_set_file */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 370 = nosys */ - { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, 0 }, /* 371 = extattr_set_fd */ - { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, 0 }, /* 372 = extattr_get_fd */ - { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, 0 }, /* 373 = extattr_delete_fd */ + { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 371 = extattr_set_fd */ + { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 372 = extattr_get_fd */ + { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 373 = extattr_delete_fd */ { AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0, 0 }, /* 374 = __setugid */ { AS(nfsclnt_args), (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 375 = nfsclnt */ { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0, 0 }, /* 376 = eaccess */ @@ -412,20 +412,20 @@ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 381 = kse_create */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 382 = kse_thr_interrupt */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 383 = kse_release */ - { AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL, NULL, 0, 0, 0 }, /* 384 = __mac_get_proc */ - { AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL, NULL, 0, 0, 0 }, /* 385 = __mac_set_proc */ - { AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 386 = __mac_get_fd */ + { AS(__mac_get_proc_args), (sy_call_t *)__mac_get_proc, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 384 = __mac_get_proc */ + { AS(__mac_set_proc_args), (sy_call_t *)__mac_set_proc, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 385 = __mac_set_proc */ + { AS(__mac_get_fd_args), (sy_call_t *)__mac_get_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 386 = __mac_get_fd */ { AS(__mac_get_file_args), (sy_call_t *)__mac_get_file, AUE_NULL, NULL, 0, 0, 0 }, /* 387 = __mac_get_file */ - { AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL, NULL, 0, 0, 0 }, /* 388 = __mac_set_fd */ + { AS(__mac_set_fd_args), (sy_call_t *)__mac_set_fd, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 388 = __mac_set_fd */ { AS(__mac_set_file_args), (sy_call_t *)__mac_set_file, AUE_NULL, NULL, 0, 0, 0 }, /* 389 = __mac_set_file */ { AS(kenv_args), (sy_call_t *)kenv, AUE_NULL, NULL, 0, 0, 0 }, /* 390 = kenv */ { AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS, NULL, 0, 0, 0 }, /* 391 = lchflags */ - { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0, 0 }, /* 392 = uuidgen */ - { AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE, NULL, 0, 0, 0 }, /* 393 = sendfile */ + { AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 392 = uuidgen */ + { AS(sendfile_args), (sy_call_t *)sendfile, AUE_SENDFILE, NULL, 0, 0, SYF_CAPENABLED }, /* 393 = sendfile */ { AS(mac_syscall_args), (sy_call_t *)mac_syscall, AUE_NULL, NULL, 0, 0, 0 }, /* 394 = mac_syscall */ { AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0, 0 }, /* 395 = getfsstat */ { AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0, 0 }, /* 396 = statfs */ - { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, 0 }, /* 397 = fstatfs */ + { AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0, SYF_CAPENABLED }, /* 397 = fstatfs */ { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0, 0 }, /* 398 = fhstatfs */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 399 = nosys */ { AS(ksem_close_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 400 = ksem_close */ @@ -444,13 +444,13 @@ { AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_EXTATTR_GET_LINK, NULL, 0, 0, 0 }, /* 413 = extattr_get_link */ { AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_EXTATTR_DELETE_LINK, NULL, 0, 0, 0 }, /* 414 = extattr_delete_link */ { AS(__mac_execve_args), (sy_call_t *)__mac_execve, AUE_NULL, NULL, 0, 0, 0 }, /* 415 = __mac_execve */ - { AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION, NULL, 0, 0, 0 }, /* 416 = sigaction */ - { AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 417 = sigreturn */ + { AS(sigaction_args), (sy_call_t *)sigaction, AUE_SIGACTION, NULL, 0, 0, SYF_CAPENABLED }, /* 416 = sigaction */ + { AS(sigreturn_args), (sy_call_t *)sigreturn, AUE_SIGRETURN, NULL, 0, 0, SYF_CAPENABLED }, /* 417 = sigreturn */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 418 = __xstat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 419 = __xfstat */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 420 = __xlstat */ - { AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL, NULL, 0, 0, 0 }, /* 421 = getcontext */ - { AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL, NULL, 0, 0, 0 }, /* 422 = setcontext */ + { AS(getcontext_args), (sy_call_t *)getcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 421 = getcontext */ + { AS(setcontext_args), (sy_call_t *)setcontext, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 422 = setcontext */ { AS(swapcontext_args), (sy_call_t *)swapcontext, AUE_NULL, NULL, 0, 0, 0 }, /* 423 = swapcontext */ { AS(swapoff_args), (sy_call_t *)swapoff, AUE_SWAPOFF, NULL, 0, 0, 0 }, /* 424 = swapoff */ { AS(__acl_get_link_args), (sy_call_t *)__acl_get_link, AUE_NULL, NULL, 0, 0, 0 }, /* 425 = __acl_get_link */ @@ -458,59 +458,59 @@ { AS(__acl_delete_link_args), (sy_call_t *)__acl_delete_link, AUE_NULL, NULL, 0, 0, 0 }, /* 427 = __acl_delete_link */ { AS(__acl_aclcheck_link_args), (sy_call_t *)__acl_aclcheck_link, AUE_NULL, NULL, 0, 0, 0 }, /* 428 = __acl_aclcheck_link */ { AS(sigwait_args), (sy_call_t *)sigwait, AUE_SIGWAIT, NULL, 0, 0, 0 }, /* 429 = sigwait */ - { AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0, 0 }, /* 430 = thr_create */ - { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0, 0 }, /* 431 = thr_exit */ - { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0, 0 }, /* 432 = thr_self */ - { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0, 0 }, /* 433 = thr_kill */ - { AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL, NULL, 0, 0, 0 }, /* 434 = _umtx_lock */ - { AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL, NULL, 0, 0, 0 }, /* 435 = _umtx_unlock */ + { AS(thr_create_args), (sy_call_t *)thr_create, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 430 = thr_create */ + { AS(thr_exit_args), (sy_call_t *)thr_exit, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 431 = thr_exit */ + { AS(thr_self_args), (sy_call_t *)thr_self, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 432 = thr_self */ + { AS(thr_kill_args), (sy_call_t *)thr_kill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 433 = thr_kill */ + { AS(_umtx_lock_args), (sy_call_t *)_umtx_lock, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 434 = _umtx_lock */ + { AS(_umtx_unlock_args), (sy_call_t *)_umtx_unlock, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 435 = _umtx_unlock */ { AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL, NULL, 0, 0, 0 }, /* 436 = jail_attach */ - { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, 0 }, /* 437 = extattr_list_fd */ + { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, SYF_CAPENABLED }, /* 437 = extattr_list_fd */ { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0 }, /* 438 = extattr_list_file */ { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0 }, /* 439 = extattr_list_link */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 440 = kse_switchin */ { AS(ksem_timedwait_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 441 = ksem_timedwait */ - { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0, 0 }, /* 442 = thr_suspend */ - { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0, 0 }, /* 443 = thr_wake */ + { AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 442 = thr_suspend */ + { AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 443 = thr_wake */ { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0, 0 }, /* 444 = kldunloadf */ { AS(audit_args), (sy_call_t *)audit, AUE_AUDIT, NULL, 0, 0, 0 }, /* 445 = audit */ { AS(auditon_args), (sy_call_t *)auditon, AUE_AUDITON, NULL, 0, 0, 0 }, /* 446 = auditon */ - { AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID, NULL, 0, 0, 0 }, /* 447 = getauid */ - { AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID, NULL, 0, 0, 0 }, /* 448 = setauid */ - { AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT, NULL, 0, 0, 0 }, /* 449 = getaudit */ - { AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT, NULL, 0, 0, 0 }, /* 450 = setaudit */ - { AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, 0 }, /* 451 = getaudit_addr */ - { AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, 0 }, /* 452 = setaudit_addr */ + { AS(getauid_args), (sy_call_t *)getauid, AUE_GETAUID, NULL, 0, 0, SYF_CAPENABLED }, /* 447 = getauid */ + { AS(setauid_args), (sy_call_t *)setauid, AUE_SETAUID, NULL, 0, 0, SYF_CAPENABLED }, /* 448 = setauid */ + { AS(getaudit_args), (sy_call_t *)getaudit, AUE_GETAUDIT, NULL, 0, 0, SYF_CAPENABLED }, /* 449 = getaudit */ + { AS(setaudit_args), (sy_call_t *)setaudit, AUE_SETAUDIT, NULL, 0, 0, SYF_CAPENABLED }, /* 450 = setaudit */ + { AS(getaudit_addr_args), (sy_call_t *)getaudit_addr, AUE_GETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED }, /* 451 = getaudit_addr */ + { AS(setaudit_addr_args), (sy_call_t *)setaudit_addr, AUE_SETAUDIT_ADDR, NULL, 0, 0, SYF_CAPENABLED }, /* 452 = setaudit_addr */ { AS(auditctl_args), (sy_call_t *)auditctl, AUE_AUDITCTL, NULL, 0, 0, 0 }, /* 453 = auditctl */ - { AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL, NULL, 0, 0, 0 }, /* 454 = _umtx_op */ - { AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL, NULL, 0, 0, 0 }, /* 455 = thr_new */ - { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0, 0 }, /* 456 = sigqueue */ + { AS(_umtx_op_args), (sy_call_t *)_umtx_op, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 454 = _umtx_op */ + { AS(thr_new_args), (sy_call_t *)thr_new, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 455 = thr_new */ + { AS(sigqueue_args), (sy_call_t *)sigqueue, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 456 = sigqueue */ { AS(kmq_open_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 457 = kmq_open */ { AS(kmq_setattr_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 458 = kmq_setattr */ { AS(kmq_timedreceive_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 459 = kmq_timedreceive */ { AS(kmq_timedsend_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 460 = kmq_timedsend */ { AS(kmq_notify_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 461 = kmq_notify */ { AS(kmq_unlink_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 462 = kmq_unlink */ - { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0, 0 }, /* 463 = abort2 */ - { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0, 0 }, /* 464 = thr_set_name */ + { AS(abort2_args), (sy_call_t *)abort2, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 463 = abort2 */ + { AS(thr_set_name_args), (sy_call_t *)thr_set_name, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 464 = thr_set_name */ { AS(aio_fsync_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0 }, /* 465 = aio_fsync */ - { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0, 0 }, /* 466 = rtprio_thread */ + { AS(rtprio_thread_args), (sy_call_t *)rtprio_thread, AUE_RTPRIO, NULL, 0, 0, SYF_CAPENABLED }, /* 466 = rtprio_thread */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 467 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 468 = nosys */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 469 = __getpath_fromfd */ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 470 = __getpath_fromaddr */ - { AS(sctp_peeloff_args), (sy_call_t *)sctp_peeloff, AUE_NULL, NULL, 0, 0, 0 }, /* 471 = sctp_peeloff */ - { AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0, 0 }, /* 472 = sctp_generic_sendmsg */ - { AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0, 0 }, /* 473 = sctp_generic_sendmsg_iov */ - { AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0, 0 }, /* 474 = sctp_generic_recvmsg */ - { AS(pread_args), (sy_call_t *)pread, AUE_PREAD, NULL, 0, 0, 0 }, /* 475 = pread */ - { AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE, NULL, 0, 0, 0 }, /* 476 = pwrite */ - { AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP, NULL, 0, 0, 0 }, /* 477 = mmap */ - { AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK, NULL, 0, 0, 0 }, /* 478 = lseek */ + { AS(sctp_peeloff_args), (sy_call_t *)sctp_peeloff, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 471 = sctp_peeloff */ + { AS(sctp_generic_sendmsg_args), (sy_call_t *)sctp_generic_sendmsg, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 472 = sctp_generic_sendmsg */ + { AS(sctp_generic_sendmsg_iov_args), (sy_call_t *)sctp_generic_sendmsg_iov, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 473 = sctp_generic_sendmsg_iov */ + { AS(sctp_generic_recvmsg_args), (sy_call_t *)sctp_generic_recvmsg, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 474 = sctp_generic_recvmsg */ + { AS(pread_args), (sy_call_t *)pread, AUE_PREAD, NULL, 0, 0, SYF_CAPENABLED }, /* 475 = pread */ + { AS(pwrite_args), (sy_call_t *)pwrite, AUE_PWRITE, NULL, 0, 0, SYF_CAPENABLED }, /* 476 = pwrite */ + { AS(mmap_args), (sy_call_t *)mmap, AUE_MMAP, NULL, 0, 0, SYF_CAPENABLED }, /* 477 = mmap */ + { AS(lseek_args), (sy_call_t *)lseek, AUE_LSEEK, NULL, 0, 0, SYF_CAPENABLED }, /* 478 = lseek */ { AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE, NULL, 0, 0, 0 }, /* 479 = truncate */ - { AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0, 0 }, /* 480 = ftruncate */ + { AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0, SYF_CAPENABLED }, /* 480 = ftruncate */ { AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0, 0 }, /* 481 = thr_kill2 */ - { AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0, 0 }, /* 482 = shm_open */ + { AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0, SYF_CAPENABLED }, /* 482 = shm_open */ { AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_SHMUNLINK, NULL, 0, 0, 0 }, /* 483 = shm_unlink */ { AS(cpuset_args), (sy_call_t *)cpuset, AUE_NULL, NULL, 0, 0, 0 }, /* 484 = cpuset */ { AS(cpuset_setid_args), (sy_call_t *)cpuset_setid, AUE_NULL, NULL, 0, 0, 0 }, /* 485 = cpuset_setid */ @@ -520,7 +520,7 @@ { AS(faccessat_args), (sy_call_t *)faccessat, AUE_FACCESSAT, NULL, 0, 0, 0 }, /* 489 = faccessat */ { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_FCHMODAT, NULL, 0, 0, 0 }, /* 490 = fchmodat */ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_FCHOWNAT, NULL, 0, 0, 0 }, /* 491 = fchownat */ - { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, 0 }, /* 492 = fexecve */ + { AS(fexecve_args), (sy_call_t *)fexecve, AUE_FEXECVE, NULL, 0, 0, SYF_CAPENABLED }, /* 492 = fexecve */ { AS(fstatat_args), (sy_call_t *)fstatat, AUE_FSTATAT, NULL, 0, 0, 0 }, /* 493 = fstatat */ { AS(futimesat_args), (sy_call_t *)futimesat, AUE_FUTIMESAT, NULL, 0, 0, 0 }, /* 494 = futimesat */ { AS(linkat_args), (sy_call_t *)linkat, AUE_LINKAT, NULL, 0, 0, 0 }, /* 495 = linkat */ @@ -537,4 +537,13 @@ { AS(jail_get_args), (sy_call_t *)jail_get, AUE_NULL, NULL, 0, 0, 0 }, /* 506 = jail_get */ { AS(jail_set_args), (sy_call_t *)jail_set, AUE_NULL, NULL, 0, 0, 0 }, /* 507 = jail_set */ { AS(jail_remove_args), (sy_call_t *)jail_remove, AUE_NULL, NULL, 0, 0, 0 }, /* 508 = jail_remove */ + { AS(cap_new_args), (sy_call_t *)cap_new, AUE_CAP_NEW, NULL, 0, 0, SYF_CAPENABLED }, /* 509 = cap_new */ + { AS(cap_getrights_args), (sy_call_t *)cap_getrights, AUE_CAP_GETRIGHTS, NULL, 0, 0, SYF_CAPENABLED }, /* 510 = cap_getrights */ + { 0, (sy_call_t *)cap_enter, AUE_CAP_ENTER, NULL, 0, 0, SYF_CAPENABLED }, /* 511 = cap_enter */ + { AS(cap_getmode_args), (sy_call_t *)cap_getmode, AUE_CAP_GETMODE, NULL, 0, 0, SYF_CAPENABLED }, /* 512 = cap_getmode */ + { AS(pdfork_args), (sy_call_t *)pdfork, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 513 = pdfork */ + { AS(pdkill_args), (sy_call_t *)pdkill, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 514 = pdkill */ + { AS(pdgetpid_args), (sy_call_t *)pdgetpid, AUE_NULL, NULL, 0, 0, SYF_CAPENABLED }, /* 515 = pdgetpid */ + { AS(pdwait_args), (sy_call_t *)pdwait, AUE_NULL, NULL, 0, 0, 0 }, /* 516 = pdwait */ + { AS(closefrom_args), (sy_call_t *)closefrom, AUE_CLOSEFROM, NULL, 0, 0, 0 }, /* 517 = closefrom */ }; ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/syscalls.c#30 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 6 10:15:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1BB7106568E; Sat, 6 Jun 2009 10:15: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 69CE510656DC for ; Sat, 6 Jun 2009 10:15:59 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 555788FC17 for ; Sat, 6 Jun 2009 10:15:59 +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 n56AFx7U081276 for ; Sat, 6 Jun 2009 10:15:59 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 n56AFxaC081272 for perforce@freebsd.org; Sat, 6 Jun 2009 10:15:59 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 10:15:59 GMT Message-Id: <200906061015.n56AFxaC081272@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 163641 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 10:16:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=163641 Change 163641 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 10:15:29 Update for missing capability.h includes, in one or two cases update new calls to fget() to take a capability mask. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_fcntl.c#7 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_ioctl.c#4 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#3 edit .. //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_stream.c#5 edit .. //depot/projects/trustedbsd/capabilities/src/sys/dev/ipmi/ipmi_linux.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfs/nfsport.h#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clport.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsserver/nfs_nfsdport.c#2 edit .. //depot/projects/trustedbsd/capabilities/src/sys/security/mac/mac_syscalls.c#6 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_fcntl.c#7 (text+ko) ==== @@ -33,6 +33,7 @@ __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.48 2009/06/05 14:55:22 rwatson Exp $"); #include +#include #include #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_ioctl.c#4 (text+ko) ==== @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ioctl.c,v 1.26 2009/05/29 05:58:46 delphij Exp $"); #include +#include #include #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_proto.h#3 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.29 2009/05/08 20:16:04 ed Exp $ - * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb + * $FreeBSD$ + * created from FreeBSD: src/sys/compat/svr4/syscalls.master,v 1.28 2006/07/28 19:05:27 jhb Exp */ #ifndef _SVR4_SYSPROTO_H_ ==== //depot/projects/trustedbsd/capabilities/src/sys/compat/svr4/svr4_stream.c#5 (text+ko) ==== @@ -42,6 +42,7 @@ #include "opt_ktrace.h" #include +#include #include #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/dev/ipmi/ipmi_linux.c#2 (text+ko) ==== @@ -32,6 +32,7 @@ */ #include +#include #include #include #include @@ -92,7 +93,7 @@ u_long cmd; int error; - if ((error = fget(td, args->fd, &fp)) != 0) + if ((error = fget(td, args->fd, CAP_IOCTL, &fp)) != 0) return (error); cmd = args->cmd; ==== //depot/projects/trustedbsd/capabilities/src/sys/fs/nfs/nfsport.h#2 (text+ko) ==== @@ -42,6 +42,7 @@ #ifdef _KERNEL #include #include +#include #include #include #include ==== //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsclient/nfs_clport.c#2 (text+ko) ==== @@ -1184,7 +1184,8 @@ error = copyin(uap->argp, (caddr_t)&nfscbdarg, sizeof(nfscbdarg)); if (error) return (error); - if ((error = fget(td, nfscbdarg.sock, &fp)) != 0) { + if ((error = fget(td, nfscbdarg.sock, CAP_SOCK_ALL, &fp)) + != 0) { return (error); } if (fp->f_type != DTYPE_SOCKET) { ==== //depot/projects/trustedbsd/capabilities/src/sys/fs/nfsserver/nfs_nfsdport.c#2 (text+ko) ==== @@ -2928,7 +2928,8 @@ error = copyin(uap->argp, (caddr_t)&sockarg, sizeof (sockarg)); if (error) return (error); - if ((error = fget(td, sockarg.sock, &fp)) != 0) { + if ((error = fget(td, sockarg.sock, CAP_SOCK_ALL, &fp)) + != 0) { return (error); } if (fp->f_type != DTYPE_SOCKET) { ==== //depot/projects/trustedbsd/capabilities/src/sys/security/mac/mac_syscalls.c#6 (text+ko) ==== @@ -48,6 +48,7 @@ #include "opt_mac.h" #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Jun 6 12:51:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 03B711065674; Sat, 6 Jun 2009 12:51: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 A9E05106564A for ; Sat, 6 Jun 2009 12:51:40 +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 979B18FC18 for ; Sat, 6 Jun 2009 12:51:40 +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 n56Cpeus005114 for ; Sat, 6 Jun 2009 12:51:40 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56Cpe74005112 for perforce@freebsd.org; Sat, 6 Jun 2009 12:51:40 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Sat, 6 Jun 2009 12:51:40 GMT Message-Id: <200906061251.n56Cpe74005112@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 163646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 12:51:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=163646 Change 163646 by zhaoshuai@zhaoshuai on 2009/06/06 12:50:52 a minor fix in sys/pipe.h Affected files ... .. //depot/projects/soc2009/fifo/sys/kern/subr_pipe.c#4 edit .. //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#7 edit .. //depot/projects/soc2009/fifo/sys/sys/pipe.h#6 edit Differences ... ==== //depot/projects/soc2009/fifo/sys/kern/subr_pipe.c#4 (text+ko) ==== ==== //depot/projects/soc2009/fifo/sys/kern/sys_pipe.c#7 (text+ko) ==== ==== //depot/projects/soc2009/fifo/sys/sys/pipe.h#6 (text+ko) ==== @@ -56,7 +56,7 @@ #define PIPENPAGES (BIG_PIPE_SIZE / PAGE_SIZE + 1) /* - * See sys_pipe.c for info on what these limits mean. + * See subr_pipe.c for info on what these limits mean. */ extern long maxpipekva; From owner-p4-projects@FreeBSD.ORG Sat Jun 6 12:55:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2CFC1065672; Sat, 6 Jun 2009 12:55:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62BE8106566B for ; Sat, 6 Jun 2009 12:55:45 +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 37D0D8FC16 for ; Sat, 6 Jun 2009 12:55:45 +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 n56Ctjkq005439 for ; Sat, 6 Jun 2009 12:55:45 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56CtirD005437 for perforce@freebsd.org; Sat, 6 Jun 2009 12:55:44 GMT (envelope-from zec@fer.hr) Date: Sat, 6 Jun 2009 12:55:44 GMT Message-Id: <200906061255.n56CtirD005437@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 163647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 12:55:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=163647 Change 163647 by zec@zec_tpx32 on 2009/06/06 12:55:39 vimage(8) is in svn/head in tools/tools/vimage now, so no need to maintain another copy in p4. Affected files ... .. //depot/projects/vimage-commit2/src/usr.sbin/vimage/Makefile#2 delete .. //depot/projects/vimage-commit2/src/usr.sbin/vimage/vimage.8#3 delete .. //depot/projects/vimage-commit2/src/usr.sbin/vimage/vimage.c#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 6 12:56:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB4FC1065674; Sat, 6 Jun 2009 12:56: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 8B443106566B for ; Sat, 6 Jun 2009 12:56:46 +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 608CE8FC0A for ; Sat, 6 Jun 2009 12:56:46 +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 n56CukbD005502 for ; Sat, 6 Jun 2009 12:56:46 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56CukcB005500 for perforce@freebsd.org; Sat, 6 Jun 2009 12:56:46 GMT (envelope-from zec@fer.hr) Date: Sat, 6 Jun 2009 12:56:46 GMT Message-Id: <200906061256.n56CukcB005500@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 163648 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 12:56:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=163648 Change 163648 by zec@zec_tpx32 on 2009/06/06 12:56:22 vimage(8) is in svn/head in tools/tools/vimage now, so no need to maintain another copy in p4. Affected files ... .. //depot/projects/vimage/src/usr.sbin/vimage/Makefile#4 delete .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.8#4 delete .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#11 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sat Jun 6 13:15:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 41D5F1065673; Sat, 6 Jun 2009 13:15: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 F3D74106566C for ; Sat, 6 Jun 2009 13:15:04 +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 E0C048FC15 for ; Sat, 6 Jun 2009 13:15:04 +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 n56DF4gd007863 for ; Sat, 6 Jun 2009 13:15:04 GMT (envelope-from zhaoshuai@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56DF4cB007861 for perforce@freebsd.org; Sat, 6 Jun 2009 13:15:04 GMT (envelope-from zhaoshuai@FreeBSD.org) Date: Sat, 6 Jun 2009 13:15:04 GMT Message-Id: <200906061315.n56DF4cB007861@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 163649 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 13:15:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=163649 Change 163649 by zhaoshuai@zhaoshuai on 2009/06/06 13:14:10 fifoinfo now contains rpipe and wpipe fix a bug in fifo_close Affected files ... .. //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#7 edit Differences ... ==== //depot/projects/soc2009/fifo/sys/fs/fifofs/fifo_vnops.c#7 (text+ko) ==== @@ -3,6 +3,9 @@ * The Regents of the University of California. * Copyright (c) 2005 Robert N. M. Watson * All rights reserved. + * + * Copyright (c) 2009 Zhao Shuai + * Google Summer of Code project * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,50 +32,39 @@ * SUCH DAMAGE. * * @(#)fifo_vnops.c 8.10 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/fifofs/fifo_vnops.c,v 1.149 2009/04/10 10:52:19 rwatson Exp $ + * */ #include -#include #include #include #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include #include -static fo_rdwr_t fifo_read_f; -static fo_rdwr_t fifo_write_f; -static fo_ioctl_t fifo_ioctl_f; -static fo_poll_t fifo_poll_f; -static fo_kqfilter_t fifo_kqfilter_f; -static fo_stat_t fifo_stat_f; -static fo_close_t fifo_close_f; -static fo_truncate_t fifo_truncate_f; +static fo_rdwr_t fifo_read_f; +static fo_rdwr_t fifo_write_f; +static fo_ioctl_t fifo_ioctl_f; +static fo_poll_t fifo_poll_f; +static fo_kqfilter_t fifo_kqfilter_f; +static fo_stat_t fifo_stat_f; +static fo_close_t fifo_close_f; +static fo_truncate_t fifo_truncate_f; struct fileops fifo_ops_f = { - .fo_read = fifo_read_f, - .fo_write = fifo_write_f, - .fo_truncate = fifo_truncate_f, - .fo_ioctl = fifo_ioctl_f, - .fo_poll = fifo_poll_f, - .fo_kqfilter = fifo_kqfilter_f, - .fo_stat = fifo_stat_f, - .fo_close = fifo_close_f, - .fo_flags = DFLAG_PASSABLE + .fo_read = fifo_read_f, + .fo_write = fifo_write_f, + .fo_truncate = fifo_truncate_f, + .fo_ioctl = fifo_ioctl_f, + .fo_poll = fifo_poll_f, + .fo_kqfilter = fifo_kqfilter_f, + .fo_stat = fifo_stat_f, + .fo_close = fifo_close_f, + .fo_flags = DFLAG_PASSABLE }; /* @@ -80,8 +72,8 @@ * the state associated with the FIFO. */ struct fifoinfo { - struct socket *fi_readsock; - struct socket *fi_writesock; + struct pipe *fi_rpipe; + struct pipe *fi_wpipe; long fi_readers; long fi_writers; }; @@ -94,23 +86,8 @@ static vop_pathconf_t fifo_pathconf; static vop_advlock_t fifo_advlock; -static void filt_fifordetach(struct knote *kn); -static int filt_fiforead(struct knote *kn, long hint); -static void filt_fifowdetach(struct knote *kn); -static int filt_fifowrite(struct knote *kn, long hint); -static void filt_fifodetach_notsup(struct knote *kn); -static int filt_fifo_notsup(struct knote *kn, long hint); - -static struct filterops fiforead_filtops = - { 1, NULL, filt_fifordetach, filt_fiforead }; -static struct filterops fifowrite_filtops = - { 1, NULL, filt_fifowdetach, filt_fifowrite }; -static struct filterops fifo_notsup_filtops = - { 1, NULL, filt_fifodetach_notsup, filt_fifo_notsup }; - struct vop_vector fifo_specops = { .vop_default = &default_vnodeops, - .vop_access = VOP_EBADF, .vop_advlock = fifo_advlock, .vop_close = fifo_close, @@ -137,27 +114,7 @@ .vop_write = VOP_PANIC, }; -struct mtx fifo_mtx; -MTX_SYSINIT(fifo, &fifo_mtx, "fifo mutex", MTX_DEF); - /* - * Dispose of fifo resources. - */ -static void -fifo_cleanup(struct vnode *vp) -{ - struct fifoinfo *fip = vp->v_fifoinfo; - - ASSERT_VOP_ELOCKED(vp, "fifo_cleanup"); - if (fip->fi_readers == 0 && fip->fi_writers == 0) { - vp->v_fifoinfo = NULL; - (void)soclose(fip->fi_readsock); - (void)soclose(fip->fi_writesock); - free(fip, M_VNODE); - } -} - -/* * Open called to set up a new instance of a fifo or * to find an active instance of a fifo. */ @@ -173,11 +130,10 @@ } */ *ap; { struct vnode *vp = ap->a_vp; + struct file *fp = ap->a_fp; + struct thread *td = ap->a_td; struct fifoinfo *fip; - struct thread *td = ap->a_td; - struct ucred *cred = ap->a_cred; - struct file *fp = ap->a_fp; - struct socket *rso, *wso; + struct pipe *rpipe, *wpipe; int error; ASSERT_VOP_ELOCKED(vp, "fifo_open"); @@ -185,115 +141,29 @@ return (EINVAL); if ((fip = vp->v_fifoinfo) == NULL) { fip = malloc(sizeof(*fip), M_VNODE, M_WAITOK); - error = socreate(AF_LOCAL, &rso, SOCK_STREAM, 0, cred, td); - if (error) - goto fail1; - fip->fi_readsock = rso; - error = socreate(AF_LOCAL, &wso, SOCK_STREAM, 0, cred, td); - if (error) - goto fail2; - fip->fi_writesock = wso; - error = soconnect2(wso, rso); - if (error) { - (void)soclose(wso); -fail2: - (void)soclose(rso); -fail1: + if (( error = generic_pipe_create(td, &rpipe, &wpipe)) != 0) { free(fip, M_VNODE); return (error); } + fip->fi_rpipe = rpipe; + fip->fi_wpipe = wpipe; fip->fi_readers = fip->fi_writers = 0; - wso->so_snd.sb_lowat = PIPE_BUF; - SOCKBUF_LOCK(&rso->so_rcv); - rso->so_rcv.sb_state |= SBS_CANTRCVMORE; - SOCKBUF_UNLOCK(&rso->so_rcv); - KASSERT(vp->v_fifoinfo == NULL, - ("fifo_open: v_fifoinfo race")); + KASSERT(vp->v_fifoinfo == NULL, ("fifo_open: v_fifoinfo race")); vp->v_fifoinfo = fip; } /* * General access to fi_readers and fi_writers is protected using * the vnode lock. - * - * Protect the increment of fi_readers and fi_writers and the - * associated calls to wakeup() with the fifo mutex in addition - * to the vnode lock. This allows the vnode lock to be dropped - * for the msleep() calls below, and using the fifo mutex with - * msleep() prevents the wakeup from being missed. */ - mtx_lock(&fifo_mtx); - if (ap->a_mode & FREAD) { + if (ap->a_mode & FREAD) fip->fi_readers++; - if (fip->fi_readers == 1) { - SOCKBUF_LOCK(&fip->fi_writesock->so_snd); - fip->fi_writesock->so_snd.sb_state &= ~SBS_CANTSENDMORE; - SOCKBUF_UNLOCK(&fip->fi_writesock->so_snd); - if (fip->fi_writers > 0) { - wakeup(&fip->fi_writers); - sowwakeup(fip->fi_writesock); - } - } - } if (ap->a_mode & FWRITE) { - if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) { - mtx_unlock(&fifo_mtx); + if ((ap->a_mode & O_NONBLOCK) && fip->fi_readers == 0) return (ENXIO); - } - fip->fi_writers++; - if (fip->fi_writers == 1) { - SOCKBUF_LOCK(&fip->fi_readsock->so_rcv); - fip->fi_readsock->so_rcv.sb_state &= ~SBS_CANTRCVMORE; - SOCKBUF_UNLOCK(&fip->fi_readsock->so_rcv); - if (fip->fi_readers > 0) { - wakeup(&fip->fi_readers); - sorwakeup(fip->fi_readsock); - } - } + fip->fi_writers++; } - if ((ap->a_mode & O_NONBLOCK) == 0) { - if ((ap->a_mode & FREAD) && fip->fi_writers == 0) { - VOP_UNLOCK(vp, 0); - error = msleep(&fip->fi_readers, &fifo_mtx, - PDROP | PCATCH | PSOCK, "fifoor", 0); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - if (error) { - fip->fi_readers--; - if (fip->fi_readers == 0) { - socantsendmore(fip->fi_writesock); - fifo_cleanup(vp); - } - return (error); - } - mtx_lock(&fifo_mtx); - /* - * We must have got woken up because we had a writer. - * That (and not still having one) is the condition - * that we must wait for. - */ - } - if ((ap->a_mode & FWRITE) && fip->fi_readers == 0) { - VOP_UNLOCK(vp, 0); - error = msleep(&fip->fi_writers, &fifo_mtx, - PDROP | PCATCH | PSOCK, "fifoow", 0); - vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); - if (error) { - fip->fi_writers--; - if (fip->fi_writers == 0) { - socantrcvmore(fip->fi_readsock); - fifo_cleanup(vp); - } - return (error); - } - /* - * We must have got woken up because we had - * a reader. That (and not still having one) - * is the condition that we must wait for. - */ - mtx_lock(&fifo_mtx); - } - } - mtx_unlock(&fifo_mtx); + KASSERT(fp != NULL, ("can't fifo/vnode bypass")); KASSERT(fp->f_ops == &badfileops, ("not badfileops in fifo_open")); finit(fp, fp->f_flag, DTYPE_FIFO, fip, &fifo_ops_f); @@ -301,6 +171,40 @@ } /* + * Device close routine + */ +/* ARGSUSED */ +static int +fifo_close(ap) + struct vop_close_args /* { + struct vnode *a_vp; + int a_fflag; + struct ucred *a_cred; + struct thread *a_td; + } */ *ap; +{ + struct vnode *vp = ap->a_vp; + struct fifoinfo *fip = vp->v_fifoinfo; + + ASSERT_VOP_ELOCKED(vp, "fifo_close"); + if (ap->a_fflag & FREAD) { + fip->fi_readers--; + if (fip->fi_readers == 0) + generic_pipe_close(fip->fi_rpipe); + } + if (ap->a_fflag & FWRITE) { + fip->fi_writers--; + if (fip->fi_writers == 0) + generic_pipe_close(fip->fi_wpipe); + } + if (fip->fi_readers == 0 && fip->fi_writers == 0) { + vp->v_fifoinfo = NULL; + free(fip, M_VNODE); + } + return (0); +} + +/* * Now unused vnode ioctl routine. */ /* ARGSUSED */ @@ -336,125 +240,20 @@ return (EINVAL); } -static void -filt_fifordetach(struct knote *kn) -{ - struct socket *so = (struct socket *)kn->kn_hook; - - SOCKBUF_LOCK(&so->so_rcv); - knlist_remove(&so->so_rcv.sb_sel.si_note, kn, 1); - if (knlist_empty(&so->so_rcv.sb_sel.si_note)) - so->so_rcv.sb_flags &= ~SB_KNOTE; - SOCKBUF_UNLOCK(&so->so_rcv); -} - -static int -filt_fiforead(struct knote *kn, long hint) -{ - struct socket *so = (struct socket *)kn->kn_hook; - - SOCKBUF_LOCK_ASSERT(&so->so_rcv); - kn->kn_data = so->so_rcv.sb_cc; - if (so->so_rcv.sb_state & SBS_CANTRCVMORE) { - kn->kn_flags |= EV_EOF; - return (1); - } else { - kn->kn_flags &= ~EV_EOF; - return (kn->kn_data > 0); - } -} - -static void -filt_fifowdetach(struct knote *kn) -{ - struct socket *so = (struct socket *)kn->kn_hook; - - SOCKBUF_LOCK(&so->so_snd); - knlist_remove(&so->so_snd.sb_sel.si_note, kn, 1); - if (knlist_empty(&so->so_snd.sb_sel.si_note)) - so->so_snd.sb_flags &= ~SB_KNOTE; - SOCKBUF_UNLOCK(&so->so_snd); -} - -static int -filt_fifowrite(struct knote *kn, long hint) -{ - struct socket *so = (struct socket *)kn->kn_hook; - - SOCKBUF_LOCK_ASSERT(&so->so_snd); - kn->kn_data = sbspace(&so->so_snd); - if (so->so_snd.sb_state & SBS_CANTSENDMORE) { - kn->kn_flags |= EV_EOF; - return (1); - } else { - kn->kn_flags &= ~EV_EOF; - return (kn->kn_data >= so->so_snd.sb_lowat); - } -} - -static void -filt_fifodetach_notsup(struct knote *kn) -{ - -} - -static int -filt_fifo_notsup(struct knote *kn, long hint) -{ - - return (0); -} - /* - * Device close routine + * Print out internel contents of a fifo vnode */ -/* ARGSUSED */ -static int -fifo_close(ap) - struct vop_close_args /* { - struct vnode *a_vp; - int a_fflag; - struct ucred *a_cred; - struct thread *a_td; - } */ *ap; +int +fifo_printinfo(struct vnode *vp) { - struct vnode *vp = ap->a_vp; struct fifoinfo *fip = vp->v_fifoinfo; - ASSERT_VOP_ELOCKED(vp, "fifo_close"); if (fip == NULL) { - printf("fifo_close: no v_fifoinfo %p\n", vp); - return (0); - } - if (ap->a_fflag & FREAD) { - fip->fi_readers--; - if (fip->fi_readers == 0) - socantsendmore(fip->fi_writesock); - } - if (ap->a_fflag & FWRITE) { - fip->fi_writers--; - if (fip->fi_writers == 0) - socantrcvmore(fip->fi_readsock); - } - fifo_cleanup(vp); - return (0); -} - -/* - * Print out internal contents of a fifo vnode. - */ -int -fifo_printinfo(vp) - struct vnode *vp; -{ - register struct fifoinfo *fip = vp->v_fifoinfo; - - if (fip == NULL){ printf(", NULL v_fifoinfo"); return (0); } printf(", fifo with %ld readers and %ld writers", - fip->fi_readers, fip->fi_writers); + fip->fi_readers, fip->fi_writers); return (0); } @@ -467,7 +266,7 @@ struct vnode *a_vp; } */ *ap; { - printf(" "); + printf(" "); fifo_printinfo(ap->a_vp); printf("\n"); return (0); @@ -485,261 +284,90 @@ } */ *ap; { - switch (ap->a_name) { - case _PC_LINK_MAX: - *ap->a_retval = LINK_MAX; - return (0); - case _PC_PIPE_BUF: - *ap->a_retval = PIPE_BUF; - return (0); - case _PC_CHOWN_RESTRICTED: - *ap->a_retval = 1; - return (0); - default: - return (EINVAL); - } - /* NOTREACHED */ + return (0); } /* - * Fifo advisory byte-level locks. + * FIFO advisory byte-level locks. */ -/* ARGSUSED */ static int fifo_advlock(ap) struct vop_advlock_args /* { struct vnode *a_vp; - caddr_t a_id; - int a_op; + caddr_t a_id; + int a_op; struct flock *a_fl; - int a_flags; + int a_flags; } */ *ap; { - return (ap->a_flags & F_FLOCK ? EOPNOTSUPP : EINVAL); } static int -fifo_close_f(struct file *fp, struct thread *td) +fifo_read_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) { + int error; + struct fifoinfo *fip = fp->f_data; - return (vnops.fo_close(fp, td)); + fp->f_data = fip->fi_rpipe; + error = generic_pipe_read(fp, uio, cred, flags, td); + fp->f_data = fip; + + return (error); } -/* - * The implementation of ioctl() for named fifos is complicated by the fact - * that we permit O_RDWR fifo file descriptors, meaning that the actions of - * ioctls may have to be applied to both the underlying sockets rather than - * just one. The original implementation simply forward the ioctl to one - * or both sockets based on fp->f_flag. We now consider each ioctl - * separately, as the composition effect requires careful ordering. - * - * We do not blindly pass all ioctls through to the socket in order to avoid - * providing unnecessary ioctls that might be improperly depended on by - * applications (such as socket-specific, routing, and interface ioctls). - * - * Unlike sys_pipe.c, fifos do not implement the deprecated TIOCSPGRP and - * TIOCGPGRP ioctls. Earlier implementations of fifos did forward SIOCSPGRP - * and SIOCGPGRP ioctls, so we might need to re-add those here. - */ static int -fifo_ioctl_f(struct file *fp, u_long com, void *data, struct ucred *cred, - struct thread *td) +fifo_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) { - struct fifoinfo *fi; - struct file filetmp; /* Local, so need not be locked. */ int error; + struct fifoinfo *fip = fp->f_data; - error = ENOTTY; - fi = fp->f_data; + fp->f_data = fip->fi_wpipe; + error = generic_pipe_write(fp, uio, cred, flags, td); + fp->f_data = fip; - switch (com) { - case FIONBIO: - /* - * Non-blocking I/O is implemented at the fifo layer using - * MSG_NBIO, so does not need to be forwarded down the stack. - */ - return (0); - - case FIOASYNC: - case FIOSETOWN: - case FIOGETOWN: - /* - * These socket ioctls don't have any ordering requirements, - * so are called in an arbitrary order, and only on the - * sockets indicated by the file descriptor rights. - * - * XXXRW: If O_RDWR and the read socket accepts an ioctl but - * the write socket doesn't, the socketpair is left in an - * inconsistent state. - */ - if (fp->f_flag & FREAD) { - filetmp.f_data = fi->fi_readsock; - filetmp.f_cred = cred; - error = soo_ioctl(&filetmp, com, data, cred, td); - if (error) - return (error); - } - if (fp->f_flag & FWRITE) { - filetmp.f_data = fi->fi_writesock; - filetmp.f_cred = cred; - error = soo_ioctl(&filetmp, com, data, cred, td); - } - return (error); - - case FIONREAD: - /* - * FIONREAD will return 0 for non-readable descriptors, and - * the results of FIONREAD on the read socket for readable - * descriptors. - */ - if (!(fp->f_flag & FREAD)) { - *(int *)data = 0; - return (0); - } - filetmp.f_data = fi->fi_readsock; - filetmp.f_cred = cred; - return (soo_ioctl(&filetmp, com, data, cred, td)); - - default: - return (ENOTTY); - } + return (error); } -/* - * Because fifos are now a file descriptor layer object, EVFILT_VNODE is not - * implemented. Likely, fifo_kqfilter() should be removed, and - * fifo_kqfilter_f() should know how to forward the request to the underling - * vnode using f_vnode in the file descriptor here. - */ static int -fifo_kqfilter_f(struct file *fp, struct knote *kn) +fifo_stat_f(struct file *fp, struct stat *sb, struct ucred *cred, struct thread *td) { - struct fifoinfo *fi; - struct socket *so; - struct sockbuf *sb; - fi = fp->f_data; - - /* - * If a filter is requested that is not supported by this file - * descriptor, don't return an error, but also don't ever generate an - * event. - */ - if ((kn->kn_filter == EVFILT_READ) && !(fp->f_flag & FREAD)) { - kn->kn_fop = &fifo_notsup_filtops; - return (0); - } - - if ((kn->kn_filter == EVFILT_WRITE) && !(fp->f_flag & FWRITE)) { - kn->kn_fop = &fifo_notsup_filtops; - return (0); - } - - switch (kn->kn_filter) { - case EVFILT_READ: - kn->kn_fop = &fiforead_filtops; - so = fi->fi_readsock; - sb = &so->so_rcv; - break; - case EVFILT_WRITE: - kn->kn_fop = &fifowrite_filtops; - so = fi->fi_writesock; - sb = &so->so_snd; - break; - default: - return (EINVAL); - } - - kn->kn_hook = (caddr_t)so; - - SOCKBUF_LOCK(sb); - knlist_add(&sb->sb_sel.si_note, kn, 1); - sb->sb_flags |= SB_KNOTE; - SOCKBUF_UNLOCK(sb); - - return (0); + return (vnops.fo_stat(fp, sb, cred, td)); } static int -fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td) +fifo_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td) { - struct fifoinfo *fip; - struct file filetmp; - int levents, revents = 0; - - fip = fp->f_data; - levents = events & - (POLLIN | POLLINIGNEOF | POLLPRI | POLLRDNORM | POLLRDBAND); - if ((fp->f_flag & FREAD) && levents) { - /* - * If POLLIN or POLLRDNORM is requested and POLLINIGNEOF is - * not, then convert the first two to the last one. This - * tells the socket poll function to ignore EOF so that we - * block if there is no writer (and no data). Callers can - * set POLLINIGNEOF to get non-blocking behavior. - */ - if (levents & (POLLIN | POLLRDNORM) && - !(levents & POLLINIGNEOF)) { - levents &= ~(POLLIN | POLLRDNORM); - levents |= POLLINIGNEOF; - } - - filetmp.f_data = fip->fi_readsock; - filetmp.f_cred = cred; - revents |= soo_poll(&filetmp, levents, cred, td); - - /* Reverse the above conversion. */ - if ((revents & POLLINIGNEOF) && !(events & POLLINIGNEOF)) { - revents |= (events & (POLLIN | POLLRDNORM)); - revents &= ~POLLINIGNEOF; - } - } - levents = events & (POLLOUT | POLLWRNORM | POLLWRBAND); - if ((fp->f_flag & FWRITE) && levents) { - filetmp.f_data = fip->fi_writesock; - filetmp.f_cred = cred; - revents |= soo_poll(&filetmp, levents, cred, td); - } - return (revents); + + return (vnops.fo_truncate(fp, length, cred, td)); } static int -fifo_read_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) +fifo_close_f(struct file *fp, struct thread *td) { - struct fifoinfo *fip; - int sflags; - - fip = fp->f_data; - KASSERT(uio->uio_rw == UIO_READ,("fifo_read mode")); - if (uio->uio_resid == 0) - return (0); - sflags = (fp->f_flag & FNONBLOCK) ? MSG_NBIO : 0; - return (soreceive(fip->fi_readsock, NULL, uio, NULL, NULL, &sflags)); + return (vnops.fo_close(fp, td)); } static int -fifo_stat_f(struct file *fp, struct stat *sb, struct ucred *cred, struct thread *td) +fifo_ioctl_f(struct file *fp, u_long com, void *data, struct ucred *cred, + struct thread *td) { - return (vnops.fo_stat(fp, sb, cred, td)); + return (0); } static int -fifo_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct thread *td) +fifo_kqfilter_f(struct file *fp, struct knote *kn) { - return (vnops.fo_truncate(fp, length, cred, td)); + return (0); } -static int -fifo_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td) +static int +fifo_poll_f(struct file *fp, int events, struct ucred *cred, struct thread *td) { - struct fifoinfo *fip; - int sflags; - fip = fp->f_data; - KASSERT(uio->uio_rw == UIO_WRITE,("fifo_write mode")); - sflags = (fp->f_flag & FNONBLOCK) ? MSG_NBIO : 0; - return (sosend(fip->fi_writesock, NULL, uio, 0, NULL, sflags, td)); + return (0); } + From owner-p4-projects@FreeBSD.ORG Sat Jun 6 16:36:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89B2C1065676; Sat, 6 Jun 2009 16:36: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 4623D1065674 for ; Sat, 6 Jun 2009 16:36:31 +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 3254B8FC19 for ; Sat, 6 Jun 2009 16:36:31 +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 n56GaUO2028338 for ; Sat, 6 Jun 2009 16:36:30 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 n56GaUXG028336 for perforce@freebsd.org; Sat, 6 Jun 2009 16:36:30 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 16:36:30 GMT Message-Id: <200906061636.n56GaUXG028336@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 163654 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 16:36:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=163654 Change 163654 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 16:36:06 Fix capability name spelling. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#13 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/vfs_syscalls.c#13 (text+ko) ==== @@ -3961,8 +3961,8 @@ /* XXX arbitrary sanity limit on `count'. */ if (uap->count > 64 * 1024) return (EINVAL); - if ((error = getvnode_cap(td->td_proc->p_fd, uap->fd, CAP_GETREAD, - &fp)) != 0) + if ((error = getvnode_cap(td->td_proc->p_fd, uap->fd, CAP_READ, &fp)) + != 0) return (error); if ((fp->f_flag & FREAD) == 0) { fdrop(fp, td); From owner-p4-projects@FreeBSD.ORG Sat Jun 6 16:37:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CC161065694; Sat, 6 Jun 2009 16:37: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 39C84106568A for ; Sat, 6 Jun 2009 16:37:32 +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 25D7F8FC1B for ; Sat, 6 Jun 2009 16:37:32 +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 n56GbWTD028401 for ; Sat, 6 Jun 2009 16:37:32 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 n56GbWJW028399 for perforce@freebsd.org; Sat, 6 Jun 2009 16:37:32 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 16:37:32 GMT Message-Id: <200906061637.n56GbWJW028399@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 163655 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 16:37:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=163655 Change 163655 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 16:36:49 Include opt_procdesc.h to conditionally implement reporting of process descriptors to procstat. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#21 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#21 (text+ko) ==== @@ -40,6 +40,7 @@ #include "opt_compat.h" #include "opt_ddb.h" #include "opt_ktrace.h" +#include "opt_procdesc.h" #include #include @@ -3118,10 +3119,12 @@ tp = fp->f_data; break; +#ifdef PROCDESC case DTYPE_PROCDESC: kif->kf_type = KF_TYPE_PROCDESC; kif->kf_pid = procdesc_pid(fp); break; +#endif default: kif->kf_type = KF_TYPE_UNKNOWN; From owner-p4-projects@FreeBSD.ORG Sat Jun 6 17:43:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A2C681065670; Sat, 6 Jun 2009 17:43:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62441106564A for ; Sat, 6 Jun 2009 17:43:39 +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 4E6968FC17 for ; Sat, 6 Jun 2009 17:43:39 +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 n56HhdRC044523 for ; Sat, 6 Jun 2009 17:43:39 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 n56Hhdr1044521 for perforce@freebsd.org; Sat, 6 Jun 2009 17:43:39 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 17:43:39 GMT Message-Id: <200906061743.n56Hhdr1044521@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 163658 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 17:43:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=163658 Change 163658 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 17:42:51 Fix merge error in map_object.c. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#4 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/map_object.c#4 (text+ko) ==== @@ -153,7 +153,7 @@ mapsize = base_vlimit - base_vaddr; base_addr = hdr->e_type == ET_EXEC ? (caddr_t) base_vaddr : NULL; - mmap_flags = MAP_ANONY | MAP_PRIVATE | MAP_NOCORE; + mmap_flags = MAP_ANON | MAP_PRIVATE | MAP_NOCORE; if (base_addr != NULL) mmap_flags |= MAP_FIXED; mapbase = mmap(base_addr, mapsize, PROT_NONE, mmap_flags, -1, 0); From owner-p4-projects@FreeBSD.ORG Sat Jun 6 19:38:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 366A81065688; Sat, 6 Jun 2009 19:38: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 DED3B1065676 for ; Sat, 6 Jun 2009 19:38:36 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC6F88FC0C for ; Sat, 6 Jun 2009 19:38:36 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n56JcZxQ055247 for ; Sat, 6 Jun 2009 19:38:35 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56JcZsV055245 for perforce@freebsd.org; Sat, 6 Jun 2009 19:38:35 GMT (envelope-from mav@freebsd.org) Date: Sat, 6 Jun 2009 19:38:35 GMT Message-Id: <200906061938.n56JcZsV055245@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 19:38:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=163659 Change 163659 by mav@mav_mavbook on 2009/06/06 19:38:30 Add new port typs SATA and teach AHCI controller report it's real data rate, and XPT to print it. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#17 edit .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#89 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#12 edit .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#5 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#17 (text+ko) ==== @@ -228,6 +228,7 @@ XPORT_PPB, /* Parallel Port Bus */ XPORT_ATA, /* AT Attachment */ XPORT_SAS, /* Serial Attached SCSI */ + XPORT_SATA, /* Serial AT Attachment */ } cam_xport; #define PROTO_VERSION_UNKNOWN (UINT_MAX - 1) @@ -778,6 +779,11 @@ u_int32_t bitrate; /* Mbps */ }; +struct ccb_trans_settings_sata { + u_int valid; /* Which fields to honor */ +#define CTS_SATA_VALID_SPEED 0x1000 + u_int32_t bitrate; /* Mbps */ +}; /* Get/Set transfer rate/width/disconnection/tag queueing settings */ struct ccb_trans_settings { @@ -796,6 +802,7 @@ struct ccb_trans_settings_spi spi; struct ccb_trans_settings_fc fc; struct ccb_trans_settings_sas sas; + struct ccb_trans_settings_sata sata; } xport_specific; }; ==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#89 (text+ko) ==== @@ -1080,19 +1080,20 @@ if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0) speed *= (0x01 << spi->bus_width); } - if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_FC) { struct ccb_trans_settings_fc *fc = &cts.xport_specific.fc; - if (fc->valid & CTS_FC_VALID_SPEED) { + if (fc->valid & CTS_FC_VALID_SPEED) speed = fc->bitrate; - } } - if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SAS) { struct ccb_trans_settings_sas *sas = &cts.xport_specific.sas; - if (sas->valid & CTS_SAS_VALID_SPEED) { + if (sas->valid & CTS_SAS_VALID_SPEED) speed = sas->bitrate; - } + } + if (cts.ccb_h.status == CAM_REQ_CMP && cts.transport == XPORT_SATA) { + struct ccb_trans_settings_sata *sata = &cts.xport_specific.sata; + if (sata->valid & CTS_SATA_VALID_SPEED) + speed = sata->bitrate; } mb = speed / 1000; @@ -3802,6 +3803,7 @@ new_bus->xport = scsi_get_xport(); break; case XPORT_ATA: + case XPORT_SATA: new_bus->xport = ata_get_xport(); break; default: ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#12 (text+ko) ==== @@ -109,9 +109,6 @@ if (pci_get_progif(dev) != PCIP_STORAGE_SATA_AHCI_1_0) return (ENXIO); - if (pci_get_devid(dev) != 0x2363197b) - return (ENXIO); - device_set_desc_copy(dev, "AHCI controller"); return (BUS_PROBE_VENDOR); } @@ -1694,14 +1691,26 @@ /* Get default/user set transfer settings for the target */ { struct ccb_trans_settings *cts = &ccb->cts; + uint32_t status; cts->protocol = PROTO_ATA; cts->protocol_version = SCSI_REV_2; - cts->transport = XPORT_ATA; + cts->transport = XPORT_SATA; cts->transport_version = 2; cts->proto_specific.valid = 0; - cts->xport_specific.valid = 0; - + cts->xport_specific.sata.valid = CTS_SATA_VALID_SPEED; + if (cts->type == CTS_TYPE_CURRENT_SETTINGS) + status = ATA_IDX_INL(ch, ATA_SSTATUS) & ATA_SS_SPD_MASK; + else + status = ATA_IDX_INL(ch, ATA_SCONTROL) & ATA_SC_SPD_MASK; + if (status & ATA_SS_SPD_GEN3) + cts->xport_specific.sata.bitrate = 600000; + else if (status & ATA_SS_SPD_GEN2) + cts->xport_specific.sata.bitrate = 300000; + else if (status & ATA_SS_SPD_GEN1) + cts->xport_specific.sata.bitrate = 150000; + else + cts->xport_specific.sata.valid = 0; ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(ccb); break; @@ -1764,7 +1773,7 @@ strncpy(cpi->hba_vid, "AHCI", HBA_IDLEN); strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN); cpi->unit_number = cam_sim_unit(sim); - cpi->transport = XPORT_ATA; + cpi->transport = XPORT_SATA; cpi->transport_version = 2; if ((ATA_ATAPI_MASTER << ccb->ccb_h.target_id) & ch->devices) cpi->protocol = PROTO_SCSI; ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#5 (text+ko) ==== @@ -97,6 +97,7 @@ #define ATA_SS_SPD_NO_SPEED 0x00000000 #define ATA_SS_SPD_GEN1 0x00000010 #define ATA_SS_SPD_GEN2 0x00000020 +#define ATA_SS_SPD_GEN3 0x00000040 #define ATA_SS_IPM_MASK 0x00000f00 #define ATA_SS_IPM_NO_DEVICE 0x00000000 @@ -139,6 +140,7 @@ #define ATA_SC_SPD_NO_SPEED 0x00000000 #define ATA_SC_SPD_SPEED_GEN1 0x00000010 #define ATA_SC_SPD_SPEED_GEN2 0x00000020 +#define ATA_SC_SPD_SPEED_GEN3 0x00000040 #define ATA_SC_IPM_MASK 0x00000f00 #define ATA_SC_IPM_NONE 0x00000000 From owner-p4-projects@FreeBSD.ORG Sat Jun 6 20:07:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BDBD1065672; Sat, 6 Jun 2009 20:07: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 E78BA1065670 for ; Sat, 6 Jun 2009 20:07:05 +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 D38738FC0A for ; Sat, 6 Jun 2009 20:07:05 +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 n56K74Nd058355 for ; Sat, 6 Jun 2009 20:07:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56K74U1058353 for perforce@freebsd.org; Sat, 6 Jun 2009 20:07:04 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 20:07:04 GMT Message-Id: <200906062007.n56K74U1058353@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 163661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 20:07:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=163661 Change 163661 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 20:06:37 Expand coverage of !IN_RTLD_CAP sections -- things we don't need to do in capability mode, such as library path processing. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#12 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#12 (text+ko) ==== @@ -92,9 +92,9 @@ static bool donelist_check(DoneList *, const Obj_Entry *); static void errmsg_restore(char *); static char *errmsg_save(void); +#ifndef IN_RTLD_CAP static void *fill_search_info(const char *, size_t, void *); static char *find_library(const char *, const Obj_Entry *); -#ifndef IN_RTLD_CAP static const char *gethints(void); #endif static void init_dag(Obj_Entry *); @@ -118,12 +118,16 @@ static void objlist_push_tail(Objlist *, Obj_Entry *); static void objlist_remove(Objlist *, Obj_Entry *); static void objlist_remove_unref(Objlist *); +#ifndef IN_RTLD_CAP static void *path_enumerate(const char *, path_enum_proc, void *); +#endif static int relocate_objects(Obj_Entry *, bool, Obj_Entry *); static int rtld_dirname(const char *, char *); static int rtld_dirname_abs(const char *, char *); static void rtld_exit(void); +#ifndef IN_RTLD_CAP static char *search_library_path(const char *, const char *); +#endif static const void **get_program_var_addr(const char *); static void set_program_var(const char *, const void *); static const Elf_Sym *symlook_default(const char *, unsigned long, @@ -1153,6 +1157,7 @@ * ldconfig hints * /lib:/usr/lib */ +#ifndef IN_RTLD_CAP static char * find_library(const char *xname, const Obj_Entry *refobj) { @@ -1160,35 +1165,27 @@ char *name; if (strchr(xname, '/') != NULL) { /* Hard coded pathname */ -#ifndef IN_RTLD_CAP if (xname[0] != '/' && !trust) { -#endif _rtld_error("Absolute pathname required for shared object \"%s\"", xname); return NULL; -#ifndef IN_RTLD_CAP } if (refobj != NULL && refobj->z_origin) return origin_subst(xname, refobj->origin_path); else return xstrdup(xname); -#endif } -#ifndef IN_RTLD_CAP if (libmap_disable || (refobj == NULL) || (name = lm_find(refobj->path, xname)) == NULL) name = (char *)xname; -#endif dbg(" Searching for \"%s\"", name); if ((pathname = search_library_path(name, ld_library_path)) != NULL || (refobj != NULL && (pathname = search_library_path(name, refobj->rpath)) != NULL) || -#ifndef IN_RTLD_CAP (pathname = search_library_path(name, gethints())) != NULL || -#endif (pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL) return pathname; @@ -1200,6 +1197,7 @@ } return NULL; } +#endif /* * Given a symbol number in a referencing object, find the corresponding @@ -1537,9 +1535,17 @@ if (object_match_name(obj, name)) return obj; +#ifdef IN_RTLD_CAP + if (strchr(name, '/') != NULL) { + _rtld_error("Paths to shared objects not supported \"%s\"", name); + return NULL; + } + path = xstrdup(name); +#else path = find_library(name, refobj); if (path == NULL) return NULL; +#endif /* * If we didn't find a match by pathname, open the file and check @@ -1872,6 +1878,7 @@ wlock_release(rtld_bind_lock, lockstate); } +#ifndef IN_RTLD_CAP static void * path_enumerate(const char *path, path_enum_proc callback, void *arg) { @@ -1959,6 +1966,7 @@ return (p); } +#endif int dlclose(void *handle) @@ -2389,6 +2397,7 @@ char *strspace; }; +#ifndef IN_RTLD_CAP static void * fill_search_info(const char *dir, size_t dirlen, void *param) { @@ -2415,24 +2424,26 @@ return (NULL); } +#endif static int do_search_info(const Obj_Entry *obj, int request, struct dl_serinfo *info) { struct dl_serinfo _info; +#ifndef IN_RTLD_CAP struct fill_search_info_args args; args.request = RTLD_DI_SERINFOSIZE; args.serinfo = &_info; +#endif _info.dls_size = __offsetof(struct dl_serinfo, dls_serpath); _info.dls_cnt = 0; +#ifndef IN_RTLD_CAP path_enumerate(ld_library_path, fill_search_info, &args); path_enumerate(obj->rpath, fill_search_info, &args); -#ifndef IN_RTLD_CAP path_enumerate(gethints(), fill_search_info, &args); -#endif path_enumerate(STANDARD_LIBRARY_PATH, fill_search_info, &args); @@ -2441,12 +2452,14 @@ info->dls_cnt = _info.dls_cnt; return (0); } +#endif if (info->dls_cnt != _info.dls_cnt || info->dls_size != _info.dls_size) { _rtld_error("Uninitialized Dl_serinfo struct passed to dlinfo()"); return (-1); } +#ifndef IN_RTLD_CAP args.request = RTLD_DI_SERINFO; args.serinfo = info; args.serpath = &info->dls_serpath[0]; @@ -2460,15 +2473,14 @@ if (path_enumerate(obj->rpath, fill_search_info, &args) != NULL) return (-1); -#ifndef IN_RTLD_CAP args.flags = LA_SER_CONFIG; if (path_enumerate(gethints(), fill_search_info, &args) != NULL) return (-1); -#endif args.flags = LA_SER_DEFAULT; if (path_enumerate(STANDARD_LIBRARY_PATH, fill_search_info, &args) != NULL) return (-1); +#endif return (0); } From owner-p4-projects@FreeBSD.ORG Sat Jun 6 21:02:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA9DC1065674; Sat, 6 Jun 2009 21:02: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 657571065670 for ; Sat, 6 Jun 2009 21:02:00 +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 524C78FC13 for ; Sat, 6 Jun 2009 21:02:00 +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 n56L20V6072707 for ; Sat, 6 Jun 2009 21:02:00 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 n56L204N072705 for perforce@freebsd.org; Sat, 6 Jun 2009 21:02:00 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 21:02:00 GMT Message-Id: <200906062102.n56L204N072705@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 163663 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 21:02:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=163663 Change 163663 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 21:01:32 Add process descriptor kernel option to NOTES. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/conf/NOTES#10 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/conf/NOTES#10 (text+ko) ==== @@ -1084,6 +1084,9 @@ options NTFS_ICONV options UDF_ICONV +# Support for process descriptors +options PROCDESC + ##################################################################### # POSIX P1003.1B From owner-p4-projects@FreeBSD.ORG Sat Jun 6 21:13:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78BC31065679; Sat, 6 Jun 2009 21:13:12 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EEC41065678 for ; Sat, 6 Jun 2009 21:13:12 +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 0CB748FC12 for ; Sat, 6 Jun 2009 21:13:12 +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 n56LDBJl074553 for ; Sat, 6 Jun 2009 21:13:11 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56LDBHC074551 for perforce@freebsd.org; Sat, 6 Jun 2009 21:13:11 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 6 Jun 2009 21:13:11 GMT Message-Id: <200906062113.n56LDBHC074551@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 163664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 21:13:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=163664 Change 163664 by pgj@petymeg-current on 2009/06/06 21:12:40 - Refine definition of socket_type: - Add address_type as an abstraction for addresses of a socket - Remove st_type, because st_family and st_protocol is possibly enough for socket type identification - Add some "mixed properties", purely for experimentation - Fix definitions for some internal functions - Add some accessor functions for socket_type - Add netstat.c (missed from the last submit): - Add netstat_socket() for socket information retrieval: - It is planned to be a common interface, and it can be used to extract information via KVM (by using the NETSTAT_SOCKET_KVM flag) -- tries to hide sysctl calls, so they can be replaced by some direct access for live monitoring - Parameters are similar to socket()'s (domain/type/protocol), so there can be different type of sockets can be queried in one call (suggested by: rwatson) Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#1 add .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#4 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#4 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#4 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#4 (text+ko) ==== @@ -13,23 +13,26 @@ #define NETSTAT_ERROR_KVM_NOSYMBOL 4 #define NETSTAT_ERROR_KVM_SHORTREAD 5 +/* Flags for netstat_socket(): */ +#define NETSTAT_SOCKET_KVM 1 /* Use KVM. */ + struct socket_type; struct socket_type_list; __BEGIN_DECLS -const char *netstat_strerror(int); +const char *netstat_strerror(int); struct socket_type_list *netstat_stl_alloc(void); -struct socket_type *netstat_stl_first(struct socket_type_list *); -struct socket_type *netstat_stl_next(struct socket_type *); -struct socket_type *netstat_stl_find(struct socket_type_list *, - int, const char *); +struct socket_type *netstat_stl_first(struct socket_type_list *list); +struct socket_type *netstat_stl_next(struct socket_type *list); +struct socket_type *netstat_stl_find(struct socket_type_list *list, + unsigned short family, const char *name); -void netstat_stl_free(struct socket_type_list *); -int netstat_stl_geterror(struct socket_type_list *); +void netstat_stl_free(struct socket_type_list *list); +int netstat_stl_geterror(struct socket_type_list *list); -int netstat_sysctl_socket(struct socket_type_list *, int); -int netstat_kvm_socket(struct socket_type_list *, void *); +int netstat_socket(int domain, int type, int protocol, + struct socket_type_list *, int flags, void *kvm_handle); __END_DECLS #endif /* !_NETSTAT_H_ */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_internal.h#4 (text+ko) ==== @@ -3,26 +3,41 @@ #define _NETSTAT_INTERNAL_H_ #include +#include #include +#include +#include +#include #include +/* Address type: + * local, foreign, node (Netgraph), raw (domain) + */ +struct address_type { + int at_type; + struct sockaddr_storage at_address; +}; + +/* Socket (PCB) type: a connection. */ struct socket_type { - /* static properties */ + /* Static properties. */ unsigned short st_family; unsigned short st_protocol; - int st_type; int st_flags; char st_name[SOCKTYPE_MAXNAME]; - struct sockaddr_storage *st_local_address; - /* local address count, XXX: SCTP */ - int st_la_cnt; - struct sockaddr_storage *st_remote_address; - /* remote address count */ - int st_ra_cnt; + /* Mixed properties, needed for different reasons, to be refined + * continuously. + */ + struct address_type *st_address; /* address(es) */ + int st_addrcnt; /* address count */ struct sockcred st_credentials; + struct xsockbuf st_rcv; /* receive queue */ + struct xsockbuf st_snd; /* send queue */ + struct xunpcb xup; /* xun */ + /* list of types */ LIST_ENTRY(socket_type) st_list; }; @@ -32,12 +47,15 @@ int stl_error; }; -int kread(kvm_t *, void *, void *, size_t, size_t); -int kread_string(kvm_t *, void *, char *, int); +int kread(kvm_t *kvm, u_long kvm_pointer, void *address, size_t size); +int kread_string(kvm_t *kvm, u_long kvm_pointer, char *buffer, int buflen); + +void _netstat_stl_empty(struct socket_type_list *list); +struct socket_type *_netstat_st_allocate(struct socket_type_list *list, + unsigned short family, unsigned short protocol, + const char *name); +void _netstat_st_reset_stats(struct socket_type *list); -void _netstat_stl_empty(struct socket_type_list *); -struct socket_type *_netstat_st_allocate(struct socket_type_list *, - int, const char *); -void _netstat_ns_reset_stats(struct socket_type *); +int sotoxsocket(struct socket *, struct xsocket *); #endif /* !_NETSTAT_INTERNAL_H_ */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#4 (text+ko) ==== @@ -1,5 +1,6 @@ #include +#include #include #include #include @@ -9,13 +10,11 @@ #include "netstat_internal.h" int -kread(kvm_t *kvm, void *kvm_pointer, void *address, size_t size, - size_t offset) +kread(kvm_t *kvm, u_long kvm_pointer, void *address, size_t size) { ssize_t ret; - ret = kvm_read(kvm, (unsigned long)kvm_pointer + offset, address, - size); + ret = kvm_read(kvm, kvm_pointer, address, size); if (ret < 0) return (NETSTAT_ERROR_KVM); if ((size_t)ret != size) @@ -24,14 +23,14 @@ } int -kread_string(kvm_t *kvm, void *kvm_pointer, char *buffer, int buflen) +kread_string(kvm_t *kvm, u_long kvm_pointer, char *buffer, int buflen) { ssize_t ret; int i; for (i = 0; i < buflen; i++) { - ret = kvm_read(kvm, (unsigned long)kvm_pointer + i, - &(buffer[i]), sizeof(char)); + ret = kvm_read(kvm, kvm_pointer + i, &(buffer[i]), + sizeof(char)); if (ret < 0) return (NETSTAT_ERROR_KVM); if ((size_t)ret != sizeof(char)) @@ -114,14 +113,14 @@ } struct socket_type * -netstat_stl_find(struct socket_type_list *list, int st_type, +netstat_stl_find(struct socket_type_list *list, unsigned short family, const char *name) { struct socket_type *stp; - /* XXX: no "any" */ LIST_FOREACH(stp, &list->stl_list, st_list) { - if ((stp->st_type == st_type) && + if ((stp->st_family == family || + family == PF_UNSPEC) && strcmp(stp->st_name, name) == 0) return (stp); } @@ -129,8 +128,8 @@ } struct socket_type * -_netstat_st_allocate(struct socket_type_list *list, int st_type, - const char *name) +_netstat_st_allocate(struct socket_type_list *list, unsigned short family, + unsigned short protocol, const char *name) { struct socket_type *stp; @@ -140,7 +139,9 @@ bzero(stp, sizeof(*stp)); - stp->st_type = st_type; + stp->st_family = family; + stp->st_protocol = protocol; + stp->st_flags = 0; strlcpy(stp->st_name, name, SOCKTYPE_MAXNAME); LIST_INSERT_HEAD(&list->stl_list, stp, st_list); return (stp); @@ -149,6 +150,20 @@ void _netstat_st_reset_stats(struct socket_type *stp) { + /* XXX: empty */ +} + +/* Accessor functions. */ +int +netstat_st_get_family(const struct socket_type *stp) +{ + return (stp->st_family); +} + +int +netstat_st_get_protocol(const struct socket_type *stp) +{ + return (stp->st_protocol); } const char * @@ -157,9 +172,9 @@ return (stp->st_name); } -int -netstat_st_get_type(const struct socket_type *stp) +/* XXX: hack alert :) */ +void * +netstat_st_get_pcb(const struct socket_type *stp) { - return (stp->st_type); + return (void *)(&stp->xup); } - From owner-p4-projects@FreeBSD.ORG Sat Jun 6 21:21:20 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9E251065676; Sat, 6 Jun 2009 21:21: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 75B6A1065670 for ; Sat, 6 Jun 2009 21:21:20 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 636F98FC23 for ; Sat, 6 Jun 2009 21:21:20 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n56LLK1g075166 for ; Sat, 6 Jun 2009 21:21:20 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56LLK1Y075164 for perforce@freebsd.org; Sat, 6 Jun 2009 21:21:20 GMT (envelope-from mav@freebsd.org) Date: Sat, 6 Jun 2009 21:21:20 GMT Message-Id: <200906062121.n56LLK1Y075164@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 21:21:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=163665 Change 163665 by mav@mav_mavbook on 2009/06/06 21:20:54 Add minimal SATA PHY events handling. Affected files ... .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#13 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#13 (text+ko) ==== @@ -638,6 +638,30 @@ DRIVER_MODULE(ahcich, ahci, ahcich_driver, ahci_devclass, 0, 0); static void +ahci_phy_check_events(device_t dev) +{ + struct ahci_channel *ch = device_get_softc(dev); + u_int32_t error = ATA_IDX_INL(ch, ATA_SERROR); + + /* clear error bits/interrupt */ + ATA_IDX_OUTL(ch, ATA_SERROR, error); + + /* if we have a connection event deal with it */ + if ((error & ATA_SE_PHY_CHANGED) && (ch->pm_level == 0)) { + if (bootverbose) { + u_int32_t status = ATA_IDX_INL(ch, ATA_SSTATUS); + if (((status & ATA_SS_DET_MASK) == ATA_SS_DET_PHY_ONLINE) && + ((status & ATA_SS_SPD_MASK) != ATA_SS_SPD_NO_SPEED) && + ((status & ATA_SS_IPM_MASK) == ATA_SS_IPM_ACTIVE)) { + device_printf(dev, "CONNECT requested\n"); + } else + device_printf(dev, "DISCONNECT requested\n"); + } +// taskqueue_enqueue(taskqueue_thread, &ch->conntask); + } +} + +static void ahci_ch_intr(void *data) { device_t dev = (device_t)data; @@ -657,8 +681,8 @@ ATA_OUTL(ch->r_mem, AHCI_P_IS, istatus); /* Process PHY events */ -// if (istatus & (AHCI_P_IX_PRC | AHCI_P_IX_PC)) -// ata_sata_phy_check_events(dev); + if (istatus & (AHCI_P_IX_PRC | AHCI_P_IX_PC)) + ahci_phy_check_events(dev); #define AHCI_STATBITS \ (AHCI_P_IX_IF|AHCI_P_IX_HBD|AHCI_P_IX_HBF|AHCI_P_IX_TFE) @@ -1581,75 +1605,72 @@ static int ata_sata_connect(struct ahci_channel *ch) { - u_int32_t status; - int timeout; + u_int32_t status; + int timeout; - /* wait up to 1 second for "connect well" */ - for (timeout = 0; timeout < 100 ; timeout++) { - status = ATA_IDX_INL(ch, ATA_SSTATUS); - if ((status & ATA_SS_CONWELL_MASK) == ATA_SS_CONWELL_GEN1 || - (status & ATA_SS_CONWELL_MASK) == ATA_SS_CONWELL_GEN2) - break; - DELAY(10000); - } - if (timeout >= 100) { + /* wait up to 1 second for "connect well" */ + for (timeout = 0; timeout < 100 ; timeout++) { + status = ATA_IDX_INL(ch, ATA_SSTATUS); + if (((status & ATA_SS_DET_MASK) == ATA_SS_DET_PHY_ONLINE) && + ((status & ATA_SS_SPD_MASK) != ATA_SS_SPD_NO_SPEED) && + ((status & ATA_SS_IPM_MASK) == ATA_SS_IPM_ACTIVE)) + break; + DELAY(10000); + } + if (timeout >= 100) { + if (bootverbose) { + device_printf(ch->dev, "SATA connect timeout status=%08x\n", + status); + } + return (0); + } if (bootverbose) { - device_printf(ch->dev, "SATA connect timeout status=%08x\n", - status); + device_printf(ch->dev, "SATA connect time=%dms status=%08x\n", + timeout * 10, status); } - return 0; - } - if (bootverbose) { - device_printf(ch->dev, "SATA connect time=%dms status=%08x\n", - timeout * 10, status); - } - /* clear SATA error register */ - ATA_IDX_OUTL(ch, ATA_SERROR, 0xffffffff); - - return 1; + /* clear SATA error register */ + ATA_IDX_OUTL(ch, ATA_SERROR, 0xffffffff); + return (1); } static int ata_sata_phy_reset(device_t dev, int quick) { - struct ahci_channel *ch = device_get_softc(dev); - int loop, retry; - uint32_t val; + struct ahci_channel *ch = device_get_softc(dev); + int loop, retry; + uint32_t val; - if (quick) { - val = ATA_IDX_INL(ch, ATA_SCONTROL); - return (0); - if ((val & ATA_SC_DET_MASK) == ATA_SC_DET_IDLE) - return ata_sata_connect(ch); - } + if (quick) { + val = ATA_IDX_INL(ch, ATA_SCONTROL); + if ((val & ATA_SC_DET_MASK) == ATA_SC_DET_IDLE) + return (ata_sata_connect(ch)); + } - if (bootverbose) { - device_printf(dev, "hardware reset ...\n"); - } - for (retry = 0; retry < 10; retry++) { - for (loop = 0; loop < 10; loop++) { - ATA_IDX_OUTL(ch, ATA_SCONTROL, ATA_SC_DET_RESET); - DELAY(100); - val = ATA_IDX_INL(ch, ATA_SCONTROL); - if ((val & ATA_SC_DET_MASK) == ATA_SC_DET_RESET) - break; + if (bootverbose) + device_printf(dev, "hardware reset ...\n"); + for (retry = 0; retry < 10; retry++) { + for (loop = 0; loop < 10; loop++) { + ATA_IDX_OUTL(ch, ATA_SCONTROL, ATA_SC_DET_RESET); + DELAY(100); + val = ATA_IDX_INL(ch, ATA_SCONTROL); + if ((val & ATA_SC_DET_MASK) == ATA_SC_DET_RESET) + break; + } + DELAY(5000); + for (loop = 0; loop < 10; loop++) { + ATA_IDX_OUTL(ch, ATA_SCONTROL, + ATA_SC_DET_IDLE | ((ch->pm_level > 0) ? 0 : + ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER)); + DELAY(100); + val = ATA_IDX_INL(ch, ATA_SCONTROL); + if ((val & ATA_SC_DET_MASK) == 0) + return (ata_sata_connect(ch)); + } } - DELAY(5000); - for (loop = 0; loop < 10; loop++) { - ATA_IDX_OUTL(ch, ATA_SCONTROL, - ATA_SC_DET_IDLE | ((ch->pm_level > 0) ? 0 : - ATA_SC_IPM_DIS_PARTIAL | ATA_SC_IPM_DIS_SLUMBER)); - DELAY(100); - val = ATA_IDX_INL(ch, ATA_SCONTROL); - if ((val & ATA_SC_DET_MASK) == 0) - return ata_sata_connect(ch); - } - } - return 0; + return (0); } - static void ahciaction(struct cam_sim *sim, union ccb *ccb) { From owner-p4-projects@FreeBSD.ORG Sat Jun 6 21:23:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B57491065675; Sat, 6 Jun 2009 21:23:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E6BE106567B for ; Sat, 6 Jun 2009 21:23:22 +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 5C84D8FC1A for ; Sat, 6 Jun 2009 21:23:22 +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 n56LNMo3075303 for ; Sat, 6 Jun 2009 21:23:22 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56LNMer075301 for perforce@freebsd.org; Sat, 6 Jun 2009 21:23:22 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 6 Jun 2009 21:23:22 GMT Message-Id: <200906062123.n56LNMer075301@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 163666 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 21:23:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=163666 Change 163666 by pgj@petymeg-current on 2009/06/06 21:23:05 Add NETSTAT_ERROR_UNSUPPORTED for unsupported operations Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#2 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#5 edit .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#5 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.c#2 (text+ko) ==== @@ -181,11 +181,11 @@ return (net_local_pcblist_sysctl(type, list)); } default: - list->stl_error = NETSTAT_ERROR_UNDEFINED; + list->stl_error = NETSTAT_ERROR_UNSUPPORTED; return (-1); } default: - list->stl_error = NETSTAT_ERROR_UNDEFINED; + list->stl_error = NETSTAT_ERROR_UNSUPPORTED; return (-1); } ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#5 (text+ko) ==== @@ -12,6 +12,7 @@ #define NETSTAT_ERROR_KVM 3 #define NETSTAT_ERROR_KVM_NOSYMBOL 4 #define NETSTAT_ERROR_KVM_SHORTREAD 5 +#define NETSTAT_ERROR_UNSUPPORTED 6 /* Flags for netstat_socket(): */ #define NETSTAT_SOCKET_KVM 1 /* Use KVM. */ ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat_util.c#5 (text+ko) ==== @@ -56,6 +56,8 @@ return ("KVM unable to find symbol"); case NETSTAT_ERROR_KVM_SHORTREAD: return ("KVM short read"); + case NETSTAT_ERROR_UNSUPPORTED: + return ("Unsupported operation"); case NETSTAT_ERROR_UNDEFINED: default: return ("Unknown error"); From owner-p4-projects@FreeBSD.ORG Sat Jun 6 21:42:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FBE2106566C; Sat, 6 Jun 2009 21:42:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F9B6106564A for ; Sat, 6 Jun 2009 21:42:42 +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 4E27B8FC0A for ; Sat, 6 Jun 2009 21:42:42 +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 n56Lggtw076778 for ; Sat, 6 Jun 2009 21:42:42 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56LggBw076776 for perforce@freebsd.org; Sat, 6 Jun 2009 21:42:42 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 6 Jun 2009 21:42:42 GMT Message-Id: <200906062142.n56LggBw076776@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 163669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 21:42:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=163669 Change 163669 by pgj@petymeg-current on 2009/06/06 21:41:48 Add public prototypes for socket_type accessor functions Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#6 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/lib/libnetstat/netstat.h#6 (text+ko) ==== @@ -23,6 +23,7 @@ __BEGIN_DECLS const char *netstat_strerror(int); +/* "Socket" */ struct socket_type_list *netstat_stl_alloc(void); struct socket_type *netstat_stl_first(struct socket_type_list *list); struct socket_type *netstat_stl_next(struct socket_type *list); @@ -34,6 +35,13 @@ int netstat_socket(int domain, int type, int protocol, struct socket_type_list *, int flags, void *kvm_handle); + +/* Accessor functions: */ +int netstat_st_get_family(const struct socket_type *stp); +int netstat_st_get_protocol(const struct socket_type *stp); +const char *netstat_st_get_name(const struct socket_type *stp); +void *netstat_st_get_pcb(const struct socket_type *stp); + __END_DECLS #endif /* !_NETSTAT_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Jun 6 21:45:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D866A1065679; Sat, 6 Jun 2009 21:45:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 961E71065672 for ; Sat, 6 Jun 2009 21:45:45 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 83BE88FC1D for ; Sat, 6 Jun 2009 21:45:45 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n56Ljj75077030 for ; Sat, 6 Jun 2009 21:45:45 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56Ljjj7077028 for perforce@freebsd.org; Sat, 6 Jun 2009 21:45:45 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 6 Jun 2009 21:45:45 GMT Message-Id: <200906062145.n56Ljjj7077028@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 163670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 21:45:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=163670 Change 163670 by pgj@petymeg-current on 2009/06/06 21:45:37 Theoretically, unixpr() now uses libnetstat for getting information on active UNIX domain sockets :) Practically, it needs some testing and further refinements. Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/Makefile#2 edit .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/main.c#2 edit .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/netstat.h#2 edit .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/unix.c#2 edit Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/Makefile#2 (text+ko) ==== @@ -20,8 +20,12 @@ BINGRP= kmem BINMODE=2555 -DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL} -LDADD= -lkvm -lmemstat -lutil +DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL} ${LIBNETSTAT} +LDADD= -lkvm -lmemstat -lutil -lnetstat + +# XXX: temp. solution +CFLAGS+= -I../../lib/libnetstat +LDFLAGS+= -L../../lib/libnetstat .if ${MK_NETGRAPH_SUPPORT} != "no" SRCS+= netgraph.c ==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/main.c#2 (text+ko) ==== @@ -596,8 +596,7 @@ printproto(tp, tp->pr_name); #endif /* NETGRAPH */ if ((af == AF_UNIX || af == AF_UNSPEC) && !sflag) - unixpr(nl[N_UNP_COUNT].n_value, nl[N_UNP_GENCNT].n_value, - nl[N_UNP_DHEAD].n_value, nl[N_UNP_SHEAD].n_value); + unixpr(kvmd); exit(0); } ==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/netstat.h#2 (text+ko) ==== @@ -149,7 +149,7 @@ void netgraphprotopr(u_long, const char *, int, int); #endif -void unixpr(u_long, u_long, u_long, u_long); +void unixpr(void *); void esis_stats(u_long, const char *, int, int); void clnp_stats(u_long, const char *, int, int); ==== //depot/projects/soc2009/pgj_libstat/src/usr.bin/netstat/unix.c#2 (text+ko) ==== @@ -63,6 +63,7 @@ #include #include #include +#include /* libnetstat */ #include "netstat.h" static void unixdomainpr(struct xunpcb *, struct xsocket *); @@ -70,174 +71,51 @@ static const char *const socktype[] = { "#0", "stream", "dgram", "raw", "rdm", "seqpacket" }; -static int -pcblist_sysctl(int type, char **bufp) +void +unixpr(void *kvmd) { - char *buf; - size_t len; - char mibvar[sizeof "net.local.seqpacket.pcblist"]; + int ret, type; + struct xsocket *so; + struct socket_type_list *stlp; + struct socket_type *stp; + struct xunpcb *xunp; + int error; + kvm_t *kvm; - sprintf(mibvar, "net.local.%s.pcblist", socktype[type]); - - len = 0; - if (sysctlbyname(mibvar, 0, &len, 0, 0) < 0) { - if (errno != ENOENT) - warn("sysctl: %s", mibvar); - return (-1); - } - if ((buf = malloc(len)) == 0) { - warnx("malloc %lu bytes", (u_long)len); - return (-2); - } - if (sysctlbyname(mibvar, buf, &len, 0, 0) < 0) { - warn("sysctl: %s", mibvar); - free(buf); - return (-2); - } - *bufp = buf; - return (0); -} - -static int -pcblist_kvm(u_long count_off, u_long gencnt_off, u_long head_off, char **bufp) -{ - struct unp_head head; - struct unpcb *unp, unp_conn; - u_char sun_len; - struct socket so; - struct xunpgen xug; - struct xunpcb xu; - unp_gen_t unp_gencnt; - u_int unp_count; - char *buf, *p; - size_t len; - - if (count_off == 0 || gencnt_off == 0) - return (-2); - if (head_off == 0) - return (-1); - kread(count_off, &unp_count, sizeof(unp_count)); - len = 2 * sizeof(xug) + (unp_count + unp_count / 8) * sizeof(xu); - if ((buf = malloc(len)) == 0) { - warnx("malloc %lu bytes", (u_long)len); - return (-2); - } - p = buf; - -#define COPYOUT(obj, size) do { \ - if (len < (size)) { \ - warnx("buffer size exceeded"); \ - goto fail; \ - } \ - bcopy((obj), p, (size)); \ - len -= (size); \ - p += (size); \ -} while (0) - -#define KREAD(off, buf, len) do { \ - if (kread((uintptr_t)(off), (buf), (len)) != 0) \ - goto fail; \ -} while (0) - - /* Write out header. */ - kread(gencnt_off, &unp_gencnt, sizeof(unp_gencnt)); - xug.xug_len = sizeof xug; - xug.xug_count = unp_count; - xug.xug_gen = unp_gencnt; - xug.xug_sogen = 0; - COPYOUT(&xug, sizeof xug); - - /* Walk the PCB list. */ - xu.xu_len = sizeof xu; - KREAD(head_off, &head, sizeof(head)); - LIST_FOREACH(unp, &head, unp_link) { - xu.xu_unpp = unp; - KREAD(unp, &xu.xu_unp, sizeof (*unp)); - unp = &xu.xu_unp; - - if (unp->unp_gencnt > unp_gencnt) - continue; - if (unp->unp_addr != NULL) { - KREAD(unp->unp_addr, &sun_len, sizeof(sun_len)); - KREAD(unp->unp_addr, &xu.xu_addr, sun_len); - } - if (unp->unp_conn != NULL) { - KREAD(unp->unp_conn, &unp_conn, sizeof(unp_conn)); - if (unp_conn.unp_addr != NULL) { - KREAD(unp_conn.unp_addr, &sun_len, - sizeof(sun_len)); - KREAD(unp_conn.unp_addr, &xu.xu_caddr, sun_len); - } - } - KREAD(unp->unp_socket, &so, sizeof(so)); - if (sotoxsocket(&so, &xu.xu_socket) != 0) - goto fail; - COPYOUT(&xu, sizeof(xu)); + kvm = (kvm_t *)kvmd; + stlp = netstat_stl_alloc(); + if (stlp == NULL) { + warn("netstat_stl_alloc"); + return; } - /* Reread the counts and write the footer. */ - kread(count_off, &unp_count, sizeof(unp_count)); - kread(gencnt_off, &unp_gencnt, sizeof(unp_gencnt)); - xug.xug_count = unp_count; - xug.xug_gen = unp_gencnt; - COPYOUT(&xug, sizeof xug); - - *bufp = buf; - return (0); - -fail: - free(buf); - return (-1); -#undef COPYOUT -#undef KREAD -} - -void -unixpr(u_long count_off, u_long gencnt_off, u_long dhead_off, u_long shead_off) -{ - char *buf; - int ret, type; - struct xsocket *so; - struct xunpgen *xug, *oxug; - struct xunpcb *xunp; - for (type = SOCK_STREAM; type <= SOCK_SEQPACKET; type++) { - if (live) - ret = pcblist_sysctl(type, &buf); - else - ret = pcblist_kvm(count_off, gencnt_off, - type == SOCK_STREAM ? shead_off : - (type == SOCK_DGRAM ? dhead_off : 0), &buf); - if (ret == -1) + ret = netstat_socket(PF_LOCAL, type, 0, stlp, + live ? 0 : NETSTAT_SOCKET_KVM, kvm); + if (ret < 0 && + netstat_stl_geterror(stlp) == NETSTAT_ERROR_UNSUPPORTED) continue; - if (ret < 0) + if (ret < 0) { + error = netstat_stl_geterror(stlp); + if (error == NETSTAT_ERROR_KVM) + warnx("netstat_socket: %s", kvm_geterr(kvm)); + else + warnx("netstat_socket: %s", + netstat_strerror(error)); return; + } - oxug = xug = (struct xunpgen *)buf; - for (xug = (struct xunpgen *)((char *)xug + xug->xug_len); - xug->xug_len > sizeof(struct xunpgen); - xug = (struct xunpgen *)((char *)xug + xug->xug_len)) { - xunp = (struct xunpcb *)xug; - so = &xunp->xu_socket; - - /* Ignore PCBs which were freed during copyout. */ - if (xunp->xu_unp.unp_gencnt > oxug->xug_gen) - continue; - unixdomainpr(xunp, so); - } - if (xug != oxug && xug->xug_gen != oxug->xug_gen) { - if (oxug->xug_count > xug->xug_count) { - printf("Some %s sockets may have been deleted.\n", - socktype[type]); - } else if (oxug->xug_count < xug->xug_count) { - printf("Some %s sockets may have been created.\n", - socktype[type]); - } else { - printf("Some %s sockets may have been created or deleted", - socktype[type]); - } + /* + * It should be guaranteed that only active PCBs are + * returned. + */ + for (stp = netstat_stl_first(stlp); + stp != NULL; + stp = netstat_stl_next(stp)) { + xunp = (struct xunpcb *)netstat_st_get_pcb(stp); + so = &xunp->xu_socket; + unixdomainpr(xunp, so); } - free(buf); } } From owner-p4-projects@FreeBSD.ORG Sat Jun 6 21:50:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60A7E1065670; Sat, 6 Jun 2009 21:50: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 20C0B106564A for ; Sat, 6 Jun 2009 21:50:51 +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 0D5E48FC12 for ; Sat, 6 Jun 2009 21:50:51 +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 n56Loo0G077397 for ; Sat, 6 Jun 2009 21:50:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56LooXR077395 for perforce@freebsd.org; Sat, 6 Jun 2009 21:50:50 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 21:50:50 GMT Message-Id: <200906062150.n56LooXR077395@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 163671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 21:50:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=163671 Change 163671 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 21:50:07 Update cap_fextract_mmap() for the !CAPABILITIES case following work to properly implement capability interpretation for mmap(2). Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#23 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#23 (text+ko) ==== @@ -50,7 +50,7 @@ #include "opt_capabilities.h" #include -__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#22 $"); +__FBSDID("$P4: //depot/projects/trustedbsd/capabilities/src/sys/kern/sys_capability.c#23 $"); #include #include @@ -481,7 +481,8 @@ } int -cap_fextract_mmap(struct file *fp_cap, u_char *maxprotp, struct file **fpp) +cap_fextract_mmap(struct file *fp_cap, cap_rights_t rights, u_char *maxprotp, + struct file **fpp) { KASSERT(fp_cap->f_type != DTYPE_CAPABILITY, @@ -489,7 +490,7 @@ *fpp = fp_cap; *maxprotp = VM_PROT_ALL; - return (0: + return (0); } int From owner-p4-projects@FreeBSD.ORG Sat Jun 6 21:53:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 972FD1065675; Sat, 6 Jun 2009 21:53: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 574B81065673 for ; Sat, 6 Jun 2009 21:53:54 +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 440B58FC15 for ; Sat, 6 Jun 2009 21:53:54 +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 n56Lrs5F077576 for ; Sat, 6 Jun 2009 21:53:54 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 n56LrsaK077574 for perforce@freebsd.org; Sat, 6 Jun 2009 21:53:54 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 21:53:54 GMT Message-Id: <200906062153.n56LrsaK077574@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 163672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 21:53:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=163672 Change 163672 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 21:53:02 Properly #ifdef CAPABILITIES various capability-related monitoring parts in kern_descript.c. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#22 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#22 (text+ko) ==== @@ -37,6 +37,7 @@ #include __FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.353 2009/06/02 06:55:32 jeff Exp $"); +#include "opt_capabilities.h" #include "opt_compat.h" #include "opt_ddb.h" #include "opt_ktrace.h" @@ -2794,6 +2795,7 @@ tp = NULL; kif->kf_fd = i; +#ifdef CAPABILITIES /* * When reporting a capability, most fields will be from the * underlying object, but do mark as a capability. With @@ -2804,6 +2806,10 @@ kif->kf_flags |= KF_FLAG_CAPABILITY; (void)cap_fextract(fp, 0, &fp); } +#else + KASSERT(fp->f_type != DTYPE_CAPABILITY, + ("sysctl_kern_proc_filedesc: saw capability")); +#endif switch (fp->f_type) { case DTYPE_VNODE: kif->kf_type = KF_TYPE_VNODE; @@ -3063,6 +3069,7 @@ tp = NULL; kif->kf_fd = i; +#ifdef CAPABILITIES /* * When reporting a capability, most fields will be from the * underlying object, but do mark as a capability and export @@ -3073,6 +3080,10 @@ kif->kf_cap_rights = cap_rights(fp); (void)cap_fextract(fp, 0, &fp); } +#else + KASSERT(fp->f_type != DTYPE_CAPABILITY, + ("sysctl_kern_proc_filedesc: saw capability")); +#endif switch (fp->f_type) { case DTYPE_VNODE: kif->kf_type = KF_TYPE_VNODE; From owner-p4-projects@FreeBSD.ORG Sat Jun 6 22:08:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F7E91065675; Sat, 6 Jun 2009 22:08:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EBE991065673 for ; Sat, 6 Jun 2009 22:08:08 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C10C58FC0A for ; Sat, 6 Jun 2009 22:08:08 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n56M88lg079597 for ; Sat, 6 Jun 2009 22:08:08 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56M88pD079595 for perforce@freebsd.org; Sat, 6 Jun 2009 22:08:08 GMT (envelope-from mav@freebsd.org) Date: Sat, 6 Jun 2009 22:08:08 GMT Message-Id: <200906062208.n56M88pD079595@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Cc: Subject: PERFORCE change 163673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 22:08:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=163673 Change 163673 by mav@mav_mavbook on 2009/06/06 22:07:22 Clean ATA command structure before use. Affected files ... .. //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#18 edit Differences ... ==== //depot/projects/scottl-camlock/src/sys/cam/cam_ccb.h#18 (text+ko) ==== @@ -1027,6 +1027,11 @@ ataio->data_ptr = data_ptr; ataio->dxfer_len = dxfer_len; ataio->tag_action = tag_action; + ataio->cmd.command = 0; + ataio->cmd.flags = 0; + ataio->cmd.feature = 0; + ataio->cmd.count = 0; + ataio->cmd.lba = 0; } void cam_calc_geometry(struct ccb_calc_geometry *ccg, int extended); From owner-p4-projects@FreeBSD.ORG Sat Jun 6 22:41:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3FB2E106566C; Sat, 6 Jun 2009 22:41: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 F3FDE106564A for ; Sat, 6 Jun 2009 22:41:42 +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 C634D8FC08 for ; Sat, 6 Jun 2009 22:41:42 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n56MfgEV082588 for ; Sat, 6 Jun 2009 22:41:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n56MfgNH082586 for perforce@freebsd.org; Sat, 6 Jun 2009 22:41:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 6 Jun 2009 22:41:42 GMT Message-Id: <200906062241.n56MfgNH082586@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 163674 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 06 Jun 2009 22:41:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=163674 Change 163674 by rwatson@rwatson_freebsd_capabilities on 2009/06/06 22:40:45 Complete merge of new file descriptor referencing and locking into the capabilities version of _fget(). Improve ifdefing. Affected files ... .. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#23 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_descrip.c#23 (text+ko) ==== @@ -2155,7 +2155,10 @@ { struct filedesc *fdp; struct file *fp; +#ifdef CAPABILITIES + struct file *fp_fromcap; int error; +#endif /* * Validate the file descriptor number and find the struct file. @@ -2170,6 +2173,7 @@ return (EBADF); } +#ifdef CAPABILITIES /* * If a capability has been requested, return the capability * directly. Otherwise, check capability rights, extract the @@ -2177,30 +2181,40 @@ */ if (fget_flags & FGET_GETCAP) { if (fp->f_type != DTYPE_CAPABILITY) { - FILEDESC_SUNLOCK(fdp); + fdrop(fp, td); return (EINVAL); } } else { /* * If a capability hasn't been requested, then validate the - * capability and find the underlying object. From now on - * 'fp' refers to the actual object of interest. + * capability and find the underlying object. */ if (maxprotp != NULL) - error = cap_fextract_mmap(fp, rights, maxprotp, &fp); + error = cap_fextract_mmap(fp, rights, maxprotp, + &fp_fromcap); else - error = cap_fextract(fp, rights, &fp); + error = cap_fextract(fp, rights, &fp_fromcap); if (error) { - FILEDESC_SUNLOCK(fdp); + fdrop(fp, td); return (error); } + /* + * Hold the new file descriptor and drop the capability file + * descriptor; after this point fp refers to the new object. + */ + fhold(fp_fromcap); + fdrop(fp, td); + fp = fp_fromcap; +#endif if ((flags == FREAD && (fp->f_flag & FREAD) == 0) || (flags == FWRITE && (fp->f_flag & FWRITE) == 0)) { fdrop(fp, td); return (EBADF); } +#ifdef CAPABILITIES } +#endif *fpp = fp; return (0); } @@ -2224,7 +2238,7 @@ fget_read(struct thread *td, int fd, cap_rights_t rights, struct file **fpp) { - return(_fget(td, fd, fpp, FWRITE, rights, NULL, 0)); + return(_fget(td, fd, fpp, FREAD, rights, NULL, 0)); } int