From owner-p4-projects@FreeBSD.ORG Sun Feb 22 00:11:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89FAE106570C; Sun, 22 Feb 2009 00:11: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 450841065703 for ; Sun, 22 Feb 2009 00:11:38 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3205F8FC34 for ; Sun, 22 Feb 2009 00:11:38 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1M0Bco2004208 for ; Sun, 22 Feb 2009 00:11:38 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1M0Bbf6004205 for perforce@freebsd.org; Sun, 22 Feb 2009 00:11:37 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 22 Feb 2009 00:11:37 GMT Message-Id: <200902220011.n1M0Bbf6004205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 158044 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 00:11:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=158044 Change 158044 by nwhitehorn@nwhitehorn_trantor on 2009/02/22 00:11:36 Make the hippo dance: after some wrangling, arrive at a working PPC64 toolchain. Affected files ... .. //depot/projects/ppc-g5/contrib/gcc/config/rs6000/freebsd.h#4 edit .. //depot/projects/ppc-g5/gnu/usr.bin/cc/cc_tools/Makefile#4 edit Differences ... ==== //depot/projects/ppc-g5/contrib/gcc/config/rs6000/freebsd.h#4 (text+ko) ==== @@ -36,8 +36,8 @@ /* On 64-bit systems, use the AIX ABI like Linux and NetBSD */ -#undef DEFAULT_ABI -#define DEFAULT_ABI (TARGET_64BIT ? ABI_AIX : ABI_V4) +#undef DEFAULT_ABI +#define DEFAULT_ABI (TARGET_64BIT ? ABI_AIX : ABI_V4) #undef TARGET_AIX #define TARGET_AIX TARGET_64BIT @@ -46,8 +46,7 @@ #undef CPP_OS_FREEBSD_SPEC #define CPP_OS_FREEBSD_SPEC "\ - -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__ \ - -Acpu=powerpc -Amachine=powerpc " + -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__" #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ @@ -59,10 +58,57 @@ builtin_define ("__ppc64__"); \ builtin_define ("__powerpc64__"); \ builtin_define ("__arch64__"); \ + builtin_assert ("cpu=powerpc64"); \ + builtin_assert ("machine=powerpc64"); \ + } else { \ + builtin_assert ("cpu=powerpc"); \ + builtin_assert ("machine=powerpc"); \ } \ } \ while (0) +#define INVALID_64BIT "-m%s not supported in this configuration" +#define INVALID_32BIT INVALID_64BIT + +#undef SUBSUBTARGET_OVERRIDE_OPTIONS +#define SUBSUBTARGET_OVERRIDE_OPTIONS \ + do \ + { \ + if (!rs6000_explicit_options.alignment) \ + rs6000_alignment_flags = MASK_ALIGN_NATURAL; \ + if (TARGET_64BIT) \ + { \ + if (DEFAULT_ABI != ABI_AIX) \ + { \ + rs6000_current_abi = ABI_AIX; \ + error (INVALID_64BIT, "call"); \ + } \ + dot_symbols = !strcmp (rs6000_abi_name, "aixdesc"); \ + if (target_flags & MASK_RELOCATABLE) \ + { \ + target_flags &= ~MASK_RELOCATABLE; \ + error (INVALID_64BIT, "relocatable"); \ + } \ + if (target_flags & MASK_EABI) \ + { \ + target_flags &= ~MASK_EABI; \ + error (INVALID_64BIT, "eabi"); \ + } \ + if (target_flags & MASK_PROTOTYPE) \ + { \ + target_flags &= ~MASK_PROTOTYPE; \ + error (INVALID_64BIT, "prototype"); \ + } \ + if ((target_flags & MASK_POWERPC64) == 0) \ + { \ + target_flags |= MASK_POWERPC64; \ + error ("32-bit PowerPC unavailable on ppc64"); \ + } \ + } \ + } \ + while (0) + + #undef STARTFILE_DEFAULT_SPEC #define STARTFILE_DEFAULT_SPEC "%(startfile_freebsd)" @@ -78,6 +124,9 @@ #undef LINK_OS_DEFAULT_SPEC #define LINK_OS_DEFAULT_SPEC "%(link_os_freebsd)" +#undef ASM_DEFAULT_SPEC +#define ASM_DEFAULT_SPEC (TARGET_64BIT ? "-mppc64" : "-mppc") + /* XXX: This is wrong for many platforms in sysv4.h. We should work on getting that definition fixed. */ #undef LINK_SHLIB_SPEC ==== //depot/projects/ppc-g5/gnu/usr.bin/cc/cc_tools/Makefile#4 (text+ko) ==== @@ -37,12 +37,12 @@ TARGET_INC+= elfos.h TARGET_INC+= freebsd-native.h TARGET_INC+= freebsd-spec.h -TARGET_INC+= freebsd.h .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" . if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h) TARGET_INC+= ${GCC_CPU}/sysv4.h . endif .endif +TARGET_INC+= freebsd.h .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/x86-64.h .endif @@ -56,6 +56,9 @@ .if ${TARGET_ARCH} == "amd64" TARGET_INC+= ${GCC_CPU}/freebsd64.h .endif +.if ${TARGET_ARCH} == "ppc64" +TARGET_INC+= ${GCC_CPU}/default64.h +.endif .if ${TARGET_ARCH} == "arm" TARGET_INC+= ${GCC_CPU}/arm.h .endif From owner-p4-projects@FreeBSD.ORG Sun Feb 22 01:19:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8C661065673; Sun, 22 Feb 2009 01:19: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 88CE41065670 for ; Sun, 22 Feb 2009 01:19:47 +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 5CD2D8FC0A for ; Sun, 22 Feb 2009 01:19:47 +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 n1M1Jl4b020107 for ; Sun, 22 Feb 2009 01:19:47 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1M1JljJ020105 for perforce@freebsd.org; Sun, 22 Feb 2009 01:19:47 GMT (envelope-from gabor@freebsd.org) Date: Sun, 22 Feb 2009 01:19:47 GMT Message-Id: <200902220119.n1M1JljJ020105@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 158046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 01:19:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=158046 Change 158046 by gabor@gabor_server on 2009/02/22 01:19:13 - Add support for GREP_OPTIONS Requested by: obrien Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#81 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#81 (text+ko) ==== @@ -293,6 +293,8 @@ int c, lastc, prevoptind, newarg, i, needpattern; char *ep; unsigned long long l; + char **eargv, **aargv, *eopts; + int eargc, aargc; setlocale(LC_ALL, ""); @@ -333,8 +335,45 @@ newarg = 1; prevoptind = 1; needpattern = 1; - while ((c = getopt_long(argc, argv, optstr, - long_options, NULL)) != -1) { + + eopts = getenv("GREP_OPTIONS"); + + eargc = 1; + if (eopts != NULL) { + char *str; + + for(i = 0; i < strlen(eopts); i++) + if (eopts[i] == ' ') + eargc++; + + eargv = (char **)grep_malloc(sizeof(char *) * (eargc + 1)); + + str = strtok(eopts, " "); + eargc = 0; + + while(str != NULL) { + eargv[++eargc] = (char *)grep_malloc(sizeof(char) * (strlen(str) + 1)); + strlcpy(eargv[eargc], str, strlen(str) + 1); + str = strtok(NULL, " "); + } + eargv[++eargc] = NULL; + + aargv = (char **)grep_malloc(sizeof(char *) * (eargc + argc + 1)); + aargv[0] = argv[0]; + + for(i = 1; i < eargc; i++) + aargv[i] = eargv[i]; + for(int j = 1; j < argc; j++) + aargv[i++] = argv[j]; + + aargc = eargc + argc - 1; + + } else { + aargv = argv; + aargc = argc; + } + + while (((c = getopt_long(aargc, aargv, optstr, long_options, NULL)) != -1)) { switch (c) { case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': @@ -536,18 +575,18 @@ newarg = optind != prevoptind; prevoptind = optind; } - argc -= optind; - argv += optind; + aargc -= optind; + aargv += optind; /* Fail if we don't have any pattern */ - if (argc == 0 && needpattern) + if (aargc == 0 && needpattern) usage(); /* Process patterns from command line */ - if (argc != 0 && needpattern) { - add_pattern(*argv, strlen(*argv)); - --argc; - ++argv; + if (aargc != 0 && needpattern) { + add_pattern(*aargv, strlen(*aargv)); + --aargc; + ++aargv; } switch (grepbehave) { @@ -588,17 +627,19 @@ if (lbflag) setlinebuf(stdout); - if ((argc == 0 || argc == 1) && !Hflag) + if ((aargc == 0 || aargc == 1) && !Hflag) hflag = 1; - if (argc == 0) + if (aargc == 0) exit(!procfile("-")); if (dirbehave == DIR_RECURSE) - c = grep_tree(argv); + c = grep_tree(aargv); else - for (c = 0; argc--; ++argv) - c+= procfile(*argv); + for (c = 0; aargc--; ++aargv) { + printf("aargc: %d\n", aargc); + c+= procfile(*aargv); + } #ifndef WITHOUT_NLS catclose(catalog); From owner-p4-projects@FreeBSD.ORG Sun Feb 22 02:15:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37D1B1065673; Sun, 22 Feb 2009 02:15: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 E9D64106566B; Sun, 22 Feb 2009 02:15:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id AA85E8FC0C; Sun, 22 Feb 2009 02:15:38 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id n1M1w2NE008579 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 21 Feb 2009 17:58:02 -0800 (PST) (envelope-from sam@freebsd.org) Message-ID: <49A0B129.6030308@freebsd.org> Date: Sat, 21 Feb 2009 17:58:01 -0800 From: Sam Leffler Organization: FreeBSD Project User-Agent: Thunderbird 2.0.0.18 (X11/20081209) MIME-Version: 1.0 To: Gabor Kovesdan References: <200902220119.n1M1JljJ020105@repoman.freebsd.org> In-Reply-To: <200902220119.n1M1JljJ020105@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-DCC-CollegeOfNewCaledonia-Metrics: ebb.errno.com; whitelist Cc: Perforce Change Reviews Subject: Re: PERFORCE change 158046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 02:15:40 -0000 Gabor Kovesdan wrote: > http://perforce.freebsd.org/chv.cgi?CH=158046 > > Change 158046 by gabor@gabor_server on 2009/02/22 01:19:13 > > - Add support for GREP_OPTIONS > > How many apps take options via the environment? Not sure I like this--I can imagine very confusing situations caused by unseen/unnoticed environment variables. Sam From owner-p4-projects@FreeBSD.ORG Sun Feb 22 02:36:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 823BC1065672; Sun, 22 Feb 2009 02:36: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 41805106564A; Sun, 22 Feb 2009 02:36:42 +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 EC3DA8FC14; Sun, 22 Feb 2009 02:36:41 +0000 (UTC) (envelope-from gabor@FreeBSD.org) Received: from localhost (localhost [127.0.0.1]) by server.mypc.hu (Postfix) with ESMTP id 749AE14D8655; Sun, 22 Feb 2009 03:21:34 +0100 (CET) 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 Ne1ZHy2wIfWo; Sun, 22 Feb 2009 03:21:33 +0100 (CET) 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 99FA414D8651; Sun, 22 Feb 2009 03:21:33 +0100 (CET) Message-ID: <49A0B6AC.9000303@FreeBSD.org> Date: Sun, 22 Feb 2009 03:21:32 +0100 From: =?ISO-8859-1?Q?G=E1bor_K=F6vesd=E1n?= User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: Sam Leffler References: <200902220119.n1M1JljJ020105@repoman.freebsd.org> <49A0B129.6030308@freebsd.org> In-Reply-To: <49A0B129.6030308@freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Cc: Perforce Change Reviews , "David E. O'Brien" Subject: Re: PERFORCE change 158046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 02:36:43 -0000 Sam Leffler escribió: > Gabor Kovesdan wrote: >> http://perforce.freebsd.org/chv.cgi?CH=158046 >> >> Change 158046 by gabor@gabor_server on 2009/02/22 01:19:13 >> >> - Add support for GREP_OPTIONS >> >> > > How many apps take options via the environment? Not sure I like > this--I can imagine very confusing situations caused by > unseen/unnoticed environment variables. You're right, it might by dangerous if it is misused, but GNU grep uses it so we should support this to maintain compatibility. And in some cases, it can be really useful, imagine that you always want to colorize the output, you can just set GREP_OPTIONS="--color". I'd say that those who don't like it, can just ignore this and don't use it all, while others who have been using it can keep using it, that's fair enough. (CC'd obrien@ as he was the proposer, who reminded me of this missing feature.) -- Gabor Kovesdan EMAIL: gabor@FreeBSD.org WWW: http://www.kovesdan.org From owner-p4-projects@FreeBSD.ORG Sun Feb 22 02:40:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF7FF1065673; Sun, 22 Feb 2009 02:40: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 8C822106564A; Sun, 22 Feb 2009 02:40:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from ebb.errno.com (ebb.errno.com [69.12.149.25]) by mx1.freebsd.org (Postfix) with ESMTP id 5DE318FC1D; Sun, 22 Feb 2009 02:40:34 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from trouble.errno.com (trouble.errno.com [10.0.0.248]) (authenticated bits=0) by ebb.errno.com (8.13.6/8.12.6) with ESMTP id n1M2eXEp008758 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 21 Feb 2009 18:40:34 -0800 (PST) (envelope-from sam@freebsd.org) Message-ID: <49A0BB21.1090706@freebsd.org> Date: Sat, 21 Feb 2009 18:40:33 -0800 From: Sam Leffler Organization: FreeBSD Project User-Agent: Thunderbird 2.0.0.18 (X11/20081209) MIME-Version: 1.0 To: =?ISO-8859-1?Q?G=E1bor_K=F6vesd=E1n?= References: <200902220119.n1M1JljJ020105@repoman.freebsd.org> <49A0B129.6030308@freebsd.org> <49A0B6AC.9000303@FreeBSD.org> In-Reply-To: <49A0B6AC.9000303@FreeBSD.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit X-DCC-CollegeOfNewCaledonia-Metrics: ebb.errno.com; whitelist Cc: Perforce Change Reviews , "David E. O'Brien" Subject: Re: PERFORCE change 158046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 02:40:35 -0000 Gábor Kövesdán wrote: > Sam Leffler escribió: >> Gabor Kovesdan wrote: >>> http://perforce.freebsd.org/chv.cgi?CH=158046 >>> >>> Change 158046 by gabor@gabor_server on 2009/02/22 01:19:13 >>> >>> - Add support for GREP_OPTIONS >>> >> >> How many apps take options via the environment? Not sure I like >> this--I can imagine very confusing situations caused by >> unseen/unnoticed environment variables. > You're right, it might by dangerous if it is misused, but GNU grep > uses it so we should support this to maintain compatibility. And in > some cases, it can be really useful, imagine that you always want to > colorize the output, you can just set GREP_OPTIONS="--color". I'd say > that those who don't like it, can just ignore this and don't use it > all, while others who have been using it can keep using it, that's > fair enough. > (CC'd obrien@ as he was the proposer, who reminded me of this missing > feature.) > I looked at ls(1); it has env variables for specific features (like colors). I can buy that more than an arbitrary set of options. If we want apps to take cmd line args from the environ then imo we should have all apps work like that; this seems prone to errors and confusion. The gnu argument doesn't work on me. But then again I'm old school... Sam From owner-p4-projects@FreeBSD.ORG Sun Feb 22 08:28:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 87A0A1065673; Sun, 22 Feb 2009 08:28: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 44FF41065670 for ; Sun, 22 Feb 2009 08:28:25 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3299E8FC1A for ; Sun, 22 Feb 2009 08:28:25 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1M8SPwo081571 for ; Sun, 22 Feb 2009 08:28:25 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1M8SPpC081569 for perforce@freebsd.org; Sun, 22 Feb 2009 08:28:25 GMT (envelope-from andrew@freebsd.org) Date: Sun, 22 Feb 2009 08:28:25 GMT Message-Id: <200902220828.n1M8SPpC081569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 158057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 08:28:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=158057 Change 158057 by andrew@andrew_bender on 2009/02/22 08:27:50 Cleanup unmasking of interrupts to only unmask the requested interrupt. Have arm_get_next_irq return the uart interrupt rather than the subinterrupt as we are only interested in this. Call rman_activate_resource in s3c24x0_activate_resource. Get the uart driver working well enough to ask for the single user shell. Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#6 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#6 (text+ko) ==== @@ -247,7 +247,7 @@ s3c24x0_activate_resource(device_t bus, device_t child, int type, int rid, struct resource *r) { - return (0); + return (rman_activate_resource(r)); } static int @@ -502,17 +502,17 @@ arm_get_next_irq(void) { uint32_t intpnd; - int irq; + int irq, subirq; if ((irq = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTOFFSET)) != 0) { /* Clear the pending bit */ - bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, - INTCTL_SRCPND, (1 << irq)); intpnd = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTPND); bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, + INTCTL_SRCPND, intpnd); + bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTPND, intpnd); switch (irq) { @@ -521,22 +521,26 @@ case S3C24X0_INT_UART1: case S3C24X0_INT_UART2: /* Find the sub IRQ */ - irq = 0x7ff; - irq &= bus_space_read_4(&s3c2xx0_bs_tag, + subirq = 0x7ff; + subirq &= bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_SUBSRCPND); - irq &= ~(bus_space_read_4(&s3c2xx0_bs_tag, + subirq &= ~(bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK)); - if (irq == 0) - return (-1); + if (subirq == 0) + return (irq); - irq = ffs(irq); + subirq = ffs(subirq); /* Clear the sub irq pending bit */ bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_SUBSRCPND, - (1 << irq)); + (1 << subirq)); + + /* Return the parent IRQ for UART as that is all we ever need */ + if (subirq <= 8) + return (irq); - return (S3C24X0_SUBIRQ_MIN + irq); + return (S3C24X0_SUBIRQ_MIN + subirq); } return (irq); @@ -569,46 +573,17 @@ { u_int32_t mask; - if (irq >= S3C24X0_SUBIRQ_MIN) { + if (irq < S3C24X0_SUBIRQ_MIN) { + mask = bus_space_read_4(&s3c2xx0_bs_tag, + s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTMSK); + mask &= ~(1 << irq); + bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, + INTCTL_INTMSK, mask); + } else { mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK); mask &= ~(1 << (irq - S3C24X0_SUBIRQ_MIN)); bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, INTCTL_INTSUBMSK, mask); - - /* Find the other irq to unmask */ - switch (irq) { - case S3C24X0_INT_ADC: - case S3C24X0_INT_TC: - irq = S3C24X0_INT_ADCTC; - break; - case S3C24X0_INT_RXD0: - case S3C24X0_INT_TXD0: - case S3C24X0_INT_ERR0: - irq = S3C24X0_INT_UART0; - break; - - case S3C24X0_INT_RXD1: - case S3C24X0_INT_TXD1: - case S3C24X0_INT_ERR1: - irq = S3C24X0_INT_UART1; - break; - - case S3C24X0_INT_RXD2: - case S3C24X0_INT_TXD2: - case S3C24X0_INT_ERR2: - irq = S3C24X0_INT_UART2; - break; - default: - /* We don't know which other IRQ to unmask */ - return; - } - arm_mask_irq(irq); - return; } - mask = bus_space_read_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, - INTCTL_INTMSK); - mask &= ~(1 << irq); - bus_space_write_4(&s3c2xx0_bs_tag, s3c2xx0_softc->sc_intctl_ioh, - INTCTL_INTMSK, mask); } ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#9 (text+ko) ==== @@ -1,6 +1,6 @@ /* * Copyright (c) 2003 Marcel Moolenaar - * Copyright (c) 2007 Andrew Turner + * Copyright (c) 2007-2009 Andrew Turner * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -34,7 +34,9 @@ #include #include #include +#include #include +#include #include #include @@ -46,6 +48,15 @@ #define DEFAULT_RCLK 3686400 +/* Finds the subirq from the parent */ +#define get_sub_irq(parent, offset) \ + ((parent == S3C24X0_INT_UART0) ? S3C24X0_SUBIRQ_MIN + offset : \ + ((parent == S3C24X0_INT_UART1) ? S3C24X0_SUBIRQ_MIN + 3 + offset : \ + S3C24X0_SUBIRQ_MIN + 6 + offset)) +#define RX_OFF 0 +#define TX_OFF 1 +#define ERR_OFF 2 + static int sscomspeed(long, long); static int s3c24x0_uart_param(struct uart_bas *, int, int, int, int); @@ -163,7 +174,8 @@ s3c24x0_uart_param(bas, baudrate, databits, stopbits, parity); /* Enable UART. */ - uart_setreg(bas, SSCOM_UCON, UCON_TXMODE_INT|UCON_RXMODE_INT|UCON_TOINT); + uart_setreg(bas, SSCOM_UCON, UCON_TXMODE_INT | UCON_RXMODE_INT | + UCON_TOINT); uart_setreg(bas, SSCOM_UMCON, UMCON_RTS); } @@ -176,7 +188,8 @@ static void s3c2410_putc(struct uart_bas *bas, int c) { - while (!(uart_getreg(bas, SSCOM_UTRSTAT) & UTRSTAT_TXEMPTY)) + while ((bus_space_read_4(bas->bst, bas->bsh, SSCOM_UFSTAT) & + UFSTAT_TXFULL) == UFSTAT_TXFULL) continue; uart_setreg(bas, SSCOM_UTXH, c); @@ -233,6 +246,8 @@ static int s3c2410_bus_attach(struct uart_softc *sc) { + uintptr_t irq; + bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); /* @@ -243,19 +258,34 @@ sc->sc_rxfifosz = 16; sc->sc_hwiflow = 0; sc->sc_hwoflow = 0; + + irq = rman_get_start(sc->sc_ires); + arm_unmask_irq(irq); + arm_unmask_irq(get_sub_irq(irq, RX_OFF)); + arm_unmask_irq(get_sub_irq(irq, TX_OFF)); + arm_unmask_irq(get_sub_irq(irq, ERR_OFF)); return (0); } static int s3c2410_bus_transmit(struct uart_softc *sc) { + uintptr_t irq; + uart_lock(sc->sc_hwmtx); + for (int i = 0; i < sc->sc_txdatasz; i++) { s3c2410_putc(&sc->sc_bas, sc->sc_txbuf[i]); uart_barrier(&sc->sc_bas); } + + sc->sc_txbusy = 1; + uart_unlock(sc->sc_hwmtx); + irq = rman_get_start(sc->sc_ires); + arm_unmask_irq(get_sub_irq(irq, TX_OFF)); + return (0); } @@ -290,17 +320,22 @@ static int s3c2410_bus_ipend(struct uart_softc *sc) { - uint32_t utrstat; + uintptr_t irq; + uint32_t ufstat; int ipend = 0; uart_lock(sc->sc_hwmtx); - utrstat = uart_getreg(&sc->sc_bas, SSCOM_UTRSTAT); + ufstat = bus_space_read_4(sc->sc_bas.bst, sc->sc_bas.bsh, SSCOM_UFSTAT); uart_unlock(sc->sc_hwmtx); - if ((utrstat & UTRSTAT_TXEMPTY) == UTRSTAT_TXEMPTY && sc->sc_txbusy != 0) { - ipend |= SER_INT_TXIDLE; + /* XXX: The register values are incorrect on the s3c244x */ + if ((ufstat & UFSTAT_TXCOUNT) == 0) { + if (sc->sc_txbusy != 0) + ipend |= SER_INT_TXIDLE; + irq = rman_get_start(sc->sc_ires); + arm_mask_irq(get_sub_irq(irq, TX_OFF)); } - if ((utrstat & UTRSTAT_RXREADY) == UTRSTAT_RXREADY) { + if ((ufstat & UFSTAT_RXCOUNT) > 0) { ipend |= SER_INT_RXREADY; } From owner-p4-projects@FreeBSD.ORG Sun Feb 22 08:29:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C56531065673; Sun, 22 Feb 2009 08:29: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 8692D1065670 for ; Sun, 22 Feb 2009 08:29:26 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5ABBC8FC13 for ; Sun, 22 Feb 2009 08:29:26 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1M8TQkr081635 for ; Sun, 22 Feb 2009 08:29:26 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1M8TQCB081633 for perforce@freebsd.org; Sun, 22 Feb 2009 08:29:26 GMT (envelope-from andrew@freebsd.org) Date: Sun, 22 Feb 2009 08:29:26 GMT Message-Id: <200902220829.n1M8TQCB081633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 158058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 08:29:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=158058 Change 158058 by andrew@andrew_bender on 2009/02/22 08:29:04 The console gets confused when we have all 3 uart's enabled so only enable uart0 for now Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#7 (text+ko) ==== @@ -385,7 +385,7 @@ S3C2410_SDI_SIZE); /* Add the uart and set it's irq and registers */ - for (i = 0; i < 3; i++) { + for (i = 0; i < 1; i++) { child = s3c24x0_add_child(dev, 0, "uart", i); irq = 0; From owner-p4-projects@FreeBSD.ORG Sun Feb 22 08:32:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E072E1065670; Sun, 22 Feb 2009 08:32: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 A171C106566B for ; Sun, 22 Feb 2009 08:32:29 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8FC938FC13 for ; Sun, 22 Feb 2009 08:32:29 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1M8WT7n081881 for ; Sun, 22 Feb 2009 08:32:29 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1M8WTnY081879 for perforce@freebsd.org; Sun, 22 Feb 2009 08:32:29 GMT (envelope-from andrew@freebsd.org) Date: Sun, 22 Feb 2009 08:32:29 GMT Message-Id: <200902220832.n1M8WTnY081879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 158059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 08:32:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=158059 Change 158059 by andrew@andrew_bender on 2009/02/22 08:31:40 Fix the name of the pmap devmap Map the clock management registers Add a comment to show all onboard devices are mapped PA == VA Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#3 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#3 (text+ko) ==== @@ -141,7 +141,11 @@ #define _S(s) (((s) + L1_S_SIZE - 1) & ~(L1_S_SIZE-1)) /* Static device mappings. */ -static const struct pmap_devmap neo1973_devmap[] = { +static const struct pmap_devmap s3c24x0_devmap[] = { + /* + * Map the on-board devices VA == PA so that we can access them + * with the MMU on or off. + */ { /* * Map the IRQ Controller @@ -153,6 +157,13 @@ PTE_NOCACHE, }, { + _A(S3C24X0_CLKMAN_BASE), + _A(S3C24X0_CLKMAN_BASE), + _S(S3C24X0_CLKMAN_SIZE), + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { /* * Map the UART to VA == PA */ @@ -336,7 +347,7 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); } - pmap_devmap_bootstrap(l1pagetable, neo1973_devmap); + pmap_devmap_bootstrap(l1pagetable, s3c24x0_devmap); cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT); setttb(kernel_l1pt.pv_pa); From owner-p4-projects@FreeBSD.ORG Sun Feb 22 11:26:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21CDB1065677; Sun, 22 Feb 2009 11:26: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 D3DA61065670 for ; Sun, 22 Feb 2009 11:26:25 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C263C8FC13 for ; Sun, 22 Feb 2009 11:26:25 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MBQPuI011918 for ; Sun, 22 Feb 2009 11:26:25 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1MBQPpK011916 for perforce@freebsd.org; Sun, 22 Feb 2009 11:26:25 GMT (envelope-from andrew@freebsd.org) Date: Sun, 22 Feb 2009 11:26:25 GMT Message-Id: <200902221126.n1MBQPpK011916@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 158062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 11:26:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=158062 Change 158062 by andrew@andrew_bender on 2009/02/22 11:26:05 Assign the parent uart irq not the sub irq's Fix an off by 1 error in arm_get_next_irq Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#8 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#8 (text+ko) ==== @@ -193,18 +193,6 @@ start = S3C24X0_INT_TC; end = S3C24X0_INT_ADC; break; - case S3C24X0_INT_UART0: - start = S3C24X0_INT_RXD0; - end = S3C24X0_INT_ERR0; - break; - case S3C24X0_INT_UART1: - start = S3C24X0_INT_RXD1; - end = S3C24X0_INT_ERR1; - break; - case S3C24X0_INT_UART2: - start = S3C24X0_INT_RXD2; - end = S3C24X0_INT_ERR2; - break; default: break; } @@ -529,7 +517,7 @@ if (subirq == 0) return (irq); - subirq = ffs(subirq); + subirq = ffs(subirq) - 1; /* Clear the sub irq pending bit */ bus_space_write_4(&s3c2xx0_bs_tag, From owner-p4-projects@FreeBSD.ORG Sun Feb 22 11:28:28 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99F511065670; Sun, 22 Feb 2009 11: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 582D2106566B for ; Sun, 22 Feb 2009 11:28:28 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 46C0F8FC12 for ; Sun, 22 Feb 2009 11:28:28 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MBSSwi012748 for ; Sun, 22 Feb 2009 11:28:28 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1MBSStw012746 for perforce@freebsd.org; Sun, 22 Feb 2009 11:28:28 GMT (envelope-from andrew@freebsd.org) Date: Sun, 22 Feb 2009 11:28:28 GMT Message-Id: <200902221128.n1MBSStw012746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 158063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 11:28:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=158063 Change 158063 by andrew@andrew_bender on 2009/02/22 11:27:39 Only build s3c24x0_mci.c with mmc Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/files.s3c2xx0#7 (text+ko) ==== @@ -5,7 +5,7 @@ arm/s3c2xx0/s3c24x0.c standard arm/s3c2xx0/s3c2xx0_space.c standard arm/s3c2xx0/s3c24x0_clk.c standard -arm/s3c2xx0/s3c24x0_mci.c standard +arm/s3c2xx0/s3c24x0_mci.c optional mmc arm/s3c2xx0/s3c24x0_nand.c optional nand arm/s3c2xx0/uart_bus_s3c2410.c optional uart arm/s3c2xx0/uart_cpu_s3c2410.c optional uart From owner-p4-projects@FreeBSD.ORG Sun Feb 22 16:53:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC8211065676; Sun, 22 Feb 2009 16:52: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 857F01065674 for ; Sun, 22 Feb 2009 16:52:59 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 58DDF8FC0A for ; Sun, 22 Feb 2009 16:52:59 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MGqxHi066545 for ; Sun, 22 Feb 2009 16:52:59 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1MGqxZ5066543 for perforce@freebsd.org; Sun, 22 Feb 2009 16:52:59 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 22 Feb 2009 16:52:59 GMT Message-Id: <200902221652.n1MGqxZ5066543@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 158075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 16:53:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=158075 Change 158075 by nwhitehorn@nwhitehorn_trantor on 2009/02/22 16:52:45 Remove unnecessary include. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#4 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/mp_cpudep.c#4 (text+ko) ==== @@ -35,7 +35,6 @@ #include #include -#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sun Feb 22 18:12:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D60C31065675; Sun, 22 Feb 2009 18:12: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 950EE106566B for ; Sun, 22 Feb 2009 18:12:20 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 680928FC17 for ; Sun, 22 Feb 2009 18:12:20 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MICKBu074378 for ; Sun, 22 Feb 2009 18:12:20 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1MICKj0074376 for perforce@freebsd.org; Sun, 22 Feb 2009 18:12:20 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 22 Feb 2009 18:12:20 GMT Message-Id: <200902221812.n1MICKj0074376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 158078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 18:12:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=158078 Change 158078 by nwhitehorn@nwhitehorn_trantor on 2009/02/22 18:11:21 A few more compiler nits: make -m32 almost work. It still does not pass the appropriate -a{32,64} to the assembler because of the stupid way GCC chooses how to do this, but the compiler at least is doing the right thing. Affected files ... .. //depot/projects/ppc-g5/contrib/gcc/config/rs6000/freebsd.h#5 edit .. //depot/projects/ppc-g5/gnu/usr.bin/binutils/libbfd/Makefile.ppc64#2 edit Differences ... ==== //depot/projects/ppc-g5/contrib/gcc/config/rs6000/freebsd.h#5 (text+ko) ==== @@ -21,10 +21,6 @@ /* Override the defaults, which exist to force the proper definition. */ -#undef TARGET_64BIT -#define TARGET_64BIT (TARGET_CPU_DEFAULT != NULL && strcmp(TARGET_CPU_DEFAULT, \ - "powerpc64") == 0) - #ifdef IN_LIBGCC2 #undef TARGET_64BIT #ifdef __ppc64__ @@ -41,17 +37,14 @@ #undef TARGET_AIX #define TARGET_AIX TARGET_64BIT -#undef CPP_OS_DEFAULT_SPEC -#define CPP_OS_DEFAULT_SPEC "%(cpp_os_freebsd)" - -#undef CPP_OS_FREEBSD_SPEC -#define CPP_OS_FREEBSD_SPEC "\ - -D__PPC__ -D__ppc__ -D__PowerPC__ -D__powerpc__" - #undef FBSD_TARGET_CPU_CPP_BUILTINS #define FBSD_TARGET_CPU_CPP_BUILTINS() \ do \ { \ + builtin_define ("__PPC__"); \ + builtin_define ("__ppc__"); \ + builtin_define ("__PowerPC__"); \ + builtin_define ("__powerpc__"); \ if (TARGET_64BIT) \ { \ builtin_define ("__LP64__"); \ @@ -102,7 +95,7 @@ if ((target_flags & MASK_POWERPC64) == 0) \ { \ target_flags |= MASK_POWERPC64; \ - error ("32-bit PowerPC unavailable on ppc64"); \ + error ("64 bit CPU required"); \ } \ } \ } \ @@ -124,9 +117,6 @@ #undef LINK_OS_DEFAULT_SPEC #define LINK_OS_DEFAULT_SPEC "%(link_os_freebsd)" -#undef ASM_DEFAULT_SPEC -#define ASM_DEFAULT_SPEC (TARGET_64BIT ? "-mppc64" : "-mppc") - /* XXX: This is wrong for many platforms in sysv4.h. We should work on getting that definition fixed. */ #undef LINK_SHLIB_SPEC @@ -142,6 +132,9 @@ #undef SIZE_TYPE #define SIZE_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int") +#undef PTRDIFF_TYPE +#define PTRDIFF_TYPE (TARGET_64BIT ? "long int" : "int") + /* rs6000.h gets this wrong for FreeBSD. We use the GCC defaults instead. */ #undef WCHAR_TYPE ==== //depot/projects/ppc-g5/gnu/usr.bin/binutils/libbfd/Makefile.ppc64#2 (text+ko) ==== @@ -6,6 +6,11 @@ SRCS+= cpu-powerpc.c \ cpu-rs6000.c \ + elf32.c \ + elf32-gen.c \ + elf32-ppc.c \ + elf32-target.h \ + elflink.c \ elf64.c \ elf64-gen.c \ elf64-ppc.c \ @@ -16,4 +21,5 @@ VECS+= ${DEFAULT_VECTOR} \ bfd_elf64_powerpcle_vec \ - ppcboot_vec + bfd_elf32_powerpc_vec \ + bfd_elf32_powerpcle_vec From owner-p4-projects@FreeBSD.ORG Sun Feb 22 19:40:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0B8C106566B; Sun, 22 Feb 2009 19:40: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 3AFB91065674 for ; Sun, 22 Feb 2009 19:40:01 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 25BC88FC0A for ; Sun, 22 Feb 2009 19:40:01 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MJe14P082567 for ; Sun, 22 Feb 2009 19:40:01 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1MJdsFX082547 for perforce@freebsd.org; Sun, 22 Feb 2009 19:39:54 GMT (envelope-from julian@freebsd.org) Date: Sun, 22 Feb 2009 19:39:54 GMT Message-Id: <200902221939.n1MJdsFX082547@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 158085 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 19:40:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=158085 Change 158085 by julian@julian_trafmon1 on 2009/02/22 19:39:29 IFC@158084 Affected files ... .. //depot/projects/vimage/src/share/man/man4/geom.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/iwi.4#2 integrate .. //depot/projects/vimage/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/vimage/src/share/man/man9/Makefile#2 integrate .. //depot/projects/vimage/src/share/man/man9/disk.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#16 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#16 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#12 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/vimage/src/sys/boot/Makefile#8 integrate .. //depot/projects/vimage/src/sys/boot/Makefile.inc#2 integrate .. //depot/projects/vimage/src/sys/boot/ficl/mips/sysdep.c#1 branch .. //depot/projects/vimage/src/sys/boot/ficl/mips/sysdep.h#1 branch .. //depot/projects/vimage/src/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/vimage/src/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/powerpc/ofw/Makefile#4 integrate .. //depot/projects/vimage/src/sys/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/vimage/src/sys/conf/files#55 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#18 integrate .. //depot/projects/vimage/src/sys/conf/kern.mk#7 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac.c#8 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_debug.c#4 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#10 integrate .. //depot/projects/vimage/src/sys/dev/aac/aacreg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/aac/aacvar.h#5 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#9 integrate .. //depot/projects/vimage/src/sys/dev/arcmsr/arcmsr.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#12 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#20 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-raid-ddf.h#1 branch .. //depot/projects/vimage/src/sys/dev/ata/ata-raid.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-usb.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cd.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-fd.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acard.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-highpoint.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-netcell.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-via.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.h#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah_internal.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#29 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#17 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_bus_ixp4xx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#15 integrate .. //depot/projects/vimage/src/sys/dev/cx/if_cx.c#7 integrate .. //depot/projects/vimage/src/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#10 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.h#6 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.h#6 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#15 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#10 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_mcp.h#8 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_eth_z8e.h#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/rss_ethp_z8e.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_bus.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/image/uscanner2.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/Makefile#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devid.h#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devtable.h#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_standard.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/input/uhid2.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/input/ums2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/misc/ufm2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/u3g2.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uark2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ubsa2.c#8 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uchcom2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ucycom2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ufoma2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#9 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uipaq2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/ulpt2.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/umct2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/umodem2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/umoscom2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uplcom2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uslcom2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uvisor2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/uvscom2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/ata-usb2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/umass2.c#7 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/urio2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/storage/ustorage2_fs.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2.c#6 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#12 integrate .. //depot/projects/vimage/src/sys/geom/geom_dev.c#9 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#15 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#10 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_if.m#5 integrate .. //depot/projects/vimage/src/sys/i386/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#16 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_osd.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_proc.c#23 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#12 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#19 integrate .. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#23 integrate .. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_fw/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_ng/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/core/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_aue/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_axe/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cdce/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cue/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_dav/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_kue/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_rue/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/input_hid/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/input_kbd/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/input_ms/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/misc_dbp/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/misc_fm/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/quirk/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/scanner/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_3g/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_ark/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_bsa/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_bser/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_chcom/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_cycom/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_foma/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_ftdi/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_gensa/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_ipaq/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_lpt/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_mct/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_modem/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_moscom/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_plcom/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_slcom/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_visor/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/serial_vscom/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/sound/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/storage_ata/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/storage_fs/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/storage_mass/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/storage_rio/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/template/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/wlan_ral/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/wlan_rum/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/wlan_zyd/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net80211/_ieee80211.h#13 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#29 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#20 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#19 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_phy.c#4 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_regdomain.c#9 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#12 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_tdma.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#27 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_header.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.h#14 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#19 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#21 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#36 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#28 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfsnode.h#6 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#8 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/swtch.S#4 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/trap.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/trap_subr.S#4 integrate .. //depot/projects/vimage/src/sys/powerpc/include/altivec.h#1 branch .. //depot/projects/vimage/src/sys/powerpc/include/pcb.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pcpu.h#7 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/altivec.c#1 branch .. //depot/projects/vimage/src/sys/powerpc/powerpc/genassym.c#7 integrate .. //depot/projects/vimage/src/sys/sys/disk.h#4 integrate .. //depot/projects/vimage/src/sys/sys/osd.h#2 integrate .. //depot/projects/vimage/src/sys/sys/param.h#41 integrate .. //depot/projects/vimage/src/sys/sys/syscallsubr.h#8 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#18 integrate .. //depot/projects/vimage/src/sys/vm/swap_pager.c#16 integrate .. //depot/projects/vimage/src/sys/vm/vm_object.c#20 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/geom.4#2 (text+ko) ==== @@ -32,7 +32,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/geom.4,v 1.16 2006/05/25 13:39:27 ceri Exp $ +.\" $FreeBSD: src/share/man/man4/geom.4,v 1.17 2009/02/22 13:37:22 trasz Exp $ .\" .Dd May 25, 2006 .Os @@ -249,7 +249,7 @@ which will propagate all the way down through the mesh. It will then detach and destroy its geom. .It -The geom whose provider is now attached will destroy the provider, +The geom whose provider is now detached will destroy the provider, detach and destroy its consumer and destroy its geom. .It This process percolates all the way down through the mesh, until @@ -431,6 +431,18 @@ .It 0x80 Pq Dv G_F_CTLDUMP Dump contents of gctl requests. .El +.Sh SEE ALSO +.Xr disk 9 , +.Xr DECLARE_GEOM_CLASS 9 , +.Xr g_access 9 , +.Xr g_attach 9 , +.Xr g_bio 9 , +.Xr g_consumer 9 , +.Xr g_data 9 , +.Xr g_event 9 , +.Xr g_geom 9 , +.Xr g_provider 9 , +.Xr g_provider_by_name 9 .Sh HISTORY This software was developed for the .Fx ==== //depot/projects/vimage/src/share/man/man4/iwi.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/iwi.4,v 1.20 2008/04/20 20:35:45 sam Exp $ +.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.21 2009/02/22 12:40:58 rpaulo Exp $ .\" -.Dd Apri 13, 2008 +.Dd April 13, 2008 .Os .Dt IWI 4 .Sh NAME ==== //depot/projects/vimage/src/share/man/man5/src.conf.5#2 (text) ==== @@ -1,6 +1,6 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 174548 2007-12-12 16:39:32Z ru -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.31 2008/09/23 16:18:15 sam Exp $ +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.32 2009/02/19 13:45:25 mtm Exp $ .Dd September 23, 2008 .Dt SRC.CONF 5 .Os @@ -62,7 +62,7 @@ .Fl D option of .Xr make 1 -or in environment; see +or in its environment; see .Xr environ 7 . .Pp The values of variables are ignored regardless of their setting; @@ -463,13 +463,10 @@ runtime linker. .It Va WITHOUT_LIBPTHREAD .\" from FreeBSD: head/tools/build/options/WITHOUT_LIBPTHREAD 172498 2007-10-09 17:53:33Z obrien -Set to not build either of the +Set to not build the .Nm libpthread -providing libraries -.Nm ( libthr -(1:1) & -.Nm libkse -(M:N)). +providing library, +.Nm libthr . When set, it also enforces the following options: .Pp .Bl -item -compact ==== //depot/projects/vimage/src/share/man/man9/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.345 2008/12/12 01:08:28 marcus Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.346 2009/02/22 13:38:16 trasz Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -575,7 +575,9 @@ devstat.9 devstat_end_transaction.9 \ devstat.9 devstat_remove_entry.9 \ devstat.9 devstat_start_transaction.9 -MLINKS+=disk.9 disk_create.9 \ +MLINKS+=disk.9 disk_alloc.9 \ + disk.9 disk_create.9 \ + disk.9 disk_gone.9 \ disk.9 disk_destroy.9 MLINKS+=domain.9 DOMAIN_SET.9 \ domain.9 net_add_domain.9 \ ==== //depot/projects/vimage/src/share/man/man9/disk.9#2 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/disk.9,v 1.10 2007/05/05 17:12:15 pjd Exp $ +.\" $FreeBSD: src/share/man/man9/disk.9,v 1.11 2009/02/22 13:38:16 trasz Exp $ .\" .Dd February 18, 2004 .Dt DISK 9 @@ -40,6 +40,8 @@ .Ft void .Fn disk_create "struct disk *disk" "int version" .Ft void +.Fn disk_gone "struct disk *disk" +.Ft void .Fn disk_destroy "struct disk *disk" .Sh DESCRIPTION The disk storage API permits kernel device drivers providing access to @@ -65,6 +67,11 @@ fill in the fields and call .Fn disk_create when the device is ready to service requests. +.Fn disk_gone +orphans all of the providers associated with the drive, setting an error +condition of ENXIO in each one. +In addition, it prevents a re-taste on last close for writing if an error +condition has been set in the provider. After calling .Fn disk_destroy , the device driver is not allowed to access the contents of ==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#16 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.51 2009/01/29 09:22:56 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.52 2009/02/21 23:15:34 jeff Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -900,7 +900,13 @@ KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); KASSERT(ioint_handlers[vector / 32] != NULL, ("No ISR handler for vector %u", vector)); +#ifdef notyet + /* + * We can not currently clear the idt entry because other cpus + * may have a valid vector at this offset. + */ setidt(vector, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); +#endif } /* Release an APIC vector when it's no longer in use. */ @@ -924,9 +930,11 @@ if (sched_is_bound(td)) panic("apic_free_vector: Thread already bound.\n"); sched_bind(td, apic_cpuid(apic_id)); + thread_unlock(td); mtx_lock_spin(&icu_lock); lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0; mtx_unlock_spin(&icu_lock); + thread_lock(td); sched_unbind(td); thread_unlock(td); ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.51 2008/11/29 14:55:24 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.52 2009/02/18 16:11:39 kib Exp $"); #include #include @@ -560,7 +560,7 @@ /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); while (p2->p_flag & P_PPWAIT) - msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); + cv_wait(&p2->p_pwait, &p2->p_mtx); PROC_UNLOCK(p2); return (0); @@ -749,7 +749,7 @@ /* wait for the children to exit, ie. emulate vfork */ PROC_LOCK(p2); while (p2->p_flag & P_PPWAIT) - msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0); + cv_wait(&p2->p_pwait, &p2->p_mtx); PROC_UNLOCK(p2); } ==== //depot/projects/vimage/src/sys/arm/conf/AVILA#12 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.22 2009/02/03 19:16:04 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.23 2009/02/18 01:37:57 sam Exp $ ident AVILA @@ -88,7 +88,7 @@ device npe_fw device firmware device qmgr # Q Manager (required by npe) -device miibus # NB: required by npe +device mii # NB: required by npe device ether device bpf ==== //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.2 2008/12/27 19:02:01 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.3 2009/02/18 01:37:57 sam Exp $ ident CAMBRIA @@ -87,7 +87,7 @@ device npe_fw device firmware device qmgr # Q Manager (required by npe) -device miibus # NB: required by npe +device mii # NB: required by npe device ether device bpf ==== //depot/projects/vimage/src/sys/boot/Makefile#8 (text+ko) ==== @@ -1,11 +1,7 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.38 2008/12/14 02:57:41 nyan Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.39 2009/02/19 18:53:08 imp Exp $ .include -.if ${MACHINE_ARCH} == "mips" -MK_FORTH=no # not yet -.endif - .if ${MK_FORTH} != "no" # Build the add-in FORTH interpreter. SUBDIR+= ficl ==== //depot/projects/vimage/src/sys/boot/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/sys/boot/Makefile.inc,v 1.1 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/Makefile.inc,v 1.2 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= +SSP_CFLAGS= ==== //depot/projects/vimage/src/sys/boot/i386/loader/Makefile#5 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.88 2008/11/18 03:55:55 ache Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.89 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader.sym INTERNALPROG= ==== //depot/projects/vimage/src/sys/boot/ia64/common/Makefile#3 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.2 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.3 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no LIB= ia64 INTERNALLIB= ==== //depot/projects/vimage/src/sys/boot/ia64/efi/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.30 2009/02/21 15:04:31 ru Exp $ NO_MAN= -WITHOUT_SSP= .include +MK_SSP= no PROG= loader.sym INTERNALPROG= ==== //depot/projects/vimage/src/sys/boot/ia64/ski/Makefile#3 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.21 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $ NO_MAN= -WITHOUT_SSP= .include +MK_SSP= no PROG= skiload STRIP= # We must not strip skiload at install time. ==== //depot/projects/vimage/src/sys/boot/pc98/loader/Makefile#3 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.42 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.43 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader.sym INTERNALPROG= ==== //depot/projects/vimage/src/sys/boot/powerpc/ofw/Makefile#4 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.24 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.25 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH} ==== //depot/projects/vimage/src/sys/boot/sparc64/loader/Makefile#3 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.21 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader NEWVERSWHAT= "bootstrap loader" sparc64 ==== //depot/projects/vimage/src/sys/compat/linux/linux_stats.c#11 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.94 2009/01/28 17:57:16 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.95 2009/02/20 13:05:29 ed Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -62,6 +62,44 @@ #include +static void +translate_vnhook_major_minor(struct vnode *vp, struct stat *sb) +{ + int major, minor; + + if (vp->v_type == VCHR && vp->v_rdev != NULL && + linux_driver_get_major_minor(vp->v_rdev->si_name, + &major, &minor) == 0) { + sb->st_rdev = (major << 8 | minor); + } +} + +static int +linux_kern_statat(struct thread *td, int flag, int fd, char *path, + enum uio_seg pathseg, struct stat *sbp) +{ + + return (kern_statat_vnhook(td, flag, fd, path, pathseg, sbp, + translate_vnhook_major_minor)); +} + +static int +linux_kern_stat(struct thread *td, char *path, enum uio_seg pathseg, + struct stat *sbp) +{ + + return (linux_kern_statat(td, 0, AT_FDCWD, path, pathseg, sbp)); +} + +static int +linux_kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, + struct stat *sbp) +{ + + return (linux_kern_statat(td, AT_SYMLINK_NOFOLLOW, AT_FDCWD, path, + pathseg, sbp)); +} + /* * XXX: This was removed from newstat_copyout(), and almost identical * XXX: code was in stat64_copyout(). findcdev() needs to be replaced @@ -102,14 +140,15 @@ translate_fd_major_minor(struct thread *td, int fd, struct stat *buf) { struct file *fp; + struct vnode *vp; int major, minor; if ((!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) || fget(td, fd, &fp) != 0) return; - if (fp->f_vnode != NULL && - fp->f_vnode->v_un.vu_cdev != NULL && - linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name, + vp = fp->f_vnode; + if (vp != NULL && vp->v_rdev != NULL && + linux_driver_get_major_minor(vp->v_rdev->si_name, &major, &minor) == 0) { buf->st_rdev = (major << 8 | minor); } else if (fp->f_type == DTYPE_PTS) { @@ -124,32 +163,6 @@ fdrop(fp, td); } -static void -translate_path_major_minor_at(struct thread *td, char *path, - struct stat *buf, int dfd) -{ - struct proc *p = td->td_proc; - struct filedesc *fdp = p->p_fd; - int fd; - int temp; - - if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) - return; - temp = td->td_retval[0]; - if (kern_openat(td, dfd, path, UIO_SYSSPACE, O_RDONLY, 0) != 0) - return; - fd = td->td_retval[0]; - td->td_retval[0] = temp; - translate_fd_major_minor(td, fd, buf); - fdclose(fdp, fdp->fd_ofiles[fd], fd, td); -} - -static inline void -translate_path_major_minor(struct thread *td, char *path, struct stat *buf) -{ - translate_path_major_minor_at(td, path, buf, AT_FDCWD); -} - static int newstat_copyout(struct stat *buf, void *ubuf) { @@ -187,9 +200,7 @@ printf(ARGS(newstat, "%s, *"), path); #endif - error = kern_stat(td, path, UIO_SYSSPACE, &buf); - if (!error) - translate_path_major_minor(td, path, &buf); + error = linux_kern_stat(td, path, UIO_SYSSPACE, &buf); LFREEPATH(path); if (error) return (error); @@ -210,9 +221,7 @@ printf(ARGS(newlstat, "%s, *"), path); #endif - error = kern_lstat(td, path, UIO_SYSSPACE, &sb); - if (!error) - translate_path_major_minor(td, path, &sb); + error = linux_kern_lstat(td, path, UIO_SYSSPACE, &sb); LFREEPATH(path); if (error) return (error); @@ -279,12 +288,11 @@ if (ldebug(stat)) printf(ARGS(stat, "%s, *"), path); #endif - error = kern_stat(td, path, UIO_SYSSPACE, &buf); + error = linux_kern_stat(td, path, UIO_SYSSPACE, &buf); if (error) { LFREEPATH(path); return (error); } - translate_path_major_minor(td, path, &buf); LFREEPATH(path); return(stat_copyout(&buf, args->up)); } @@ -302,12 +310,11 @@ if (ldebug(lstat)) printf(ARGS(lstat, "%s, *"), path); #endif - error = kern_lstat(td, path, UIO_SYSSPACE, &buf); + error = linux_kern_lstat(td, path, UIO_SYSSPACE, &buf); if (error) { LFREEPATH(path); return (error); } - translate_path_major_minor(td, path, &buf); LFREEPATH(path); return(stat_copyout(&buf, args->up)); } @@ -526,9 +533,7 @@ printf(ARGS(stat64, "%s, *"), filename); #endif - error = kern_stat(td, filename, UIO_SYSSPACE, &buf); - if (!error) - translate_path_major_minor(td, filename, &buf); + error = linux_kern_stat(td, filename, UIO_SYSSPACE, &buf); LFREEPATH(filename); if (error) return (error); @@ -549,9 +554,7 @@ printf(ARGS(lstat64, "%s, *"), args->filename); #endif - error = kern_lstat(td, filename, UIO_SYSSPACE, &sb); - if (!error) - translate_path_major_minor(td, filename, &sb); + error = linux_kern_lstat(td, filename, UIO_SYSSPACE, &sb); LFREEPATH(filename); if (error) return (error); @@ -597,8 +600,7 @@ printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, path, args->flag); #endif - error = kern_statat(td, flag, dfd, path, UIO_SYSSPACE, &buf); - translate_path_major_minor_at(td, args->pathname, &buf, dfd); + error = linux_kern_statat(td, flag, dfd, path, UIO_SYSSPACE, &buf); if (!error) error = stat64_copyout(&buf, args->statbuf); LFREEPATH(path); ==== //depot/projects/vimage/src/sys/conf/files#55 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1370 2009/02/15 03:50:27 marcel Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1371 2009/02/18 06:33:10 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -80,12 +80,12 @@ compile-with "${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \ no-obj no-implicit-rule before-depend \ clean "teken_state.h" -usbdevs.h optional usb \ +usbdevs.h optional usb | usb2_core \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \ no-obj no-implicit-rule before-depend \ clean "usbdevs.h" -usbdevs_data.h optional usb \ +usbdevs_data.h optional usb | usb2_core \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \ no-obj no-implicit-rule before-depend \ ==== //depot/projects/vimage/src/sys/conf/files.powerpc#18 (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.92 2009/01/25 18:20:15 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.93 2009/02/21 02:15:08 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -126,6 +126,7 @@ powerpc/powermac/cuda.c optional powermac cuda powerpc/powermac/pmu.c optional powermac pmu powerpc/powermac/macgpio.c optional powermac pci +powerpc/powerpc/altivec.c optional aim powerpc/powerpc/atomic.S standard powerpc/powerpc/autoconf.c standard powerpc/powerpc/bcopy.c standard ==== //depot/projects/vimage/src/sys/conf/kern.mk#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.57 2008/07/23 06:16:34 imp Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.58 2009/02/22 18:45:30 nwhitehorn Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -78,9 +78,10 @@ # # For PowerPC we tell gcc to use floating point emulation. This avoids using # floating point registers for integer operations which it has a tendency to do. +# Also explicitly disable Altivec instructions inside the kernel. # .if ${MACHINE_ARCH} == "powerpc" -CFLAGS+= -msoft-float +CFLAGS+= -msoft-float -mno-altivec INLINE_LIMIT?= 15000 .endif ==== //depot/projects/vimage/src/sys/dev/aac/aac.c#8 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.138 2008/06/24 03:26:41 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.140 2009/02/21 15:40:03 attilio Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -71,6 +71,7 @@ static void aac_add_container(struct aac_softc *sc, struct aac_mntinforesp *mir, int f); static void aac_get_bus_info(struct aac_softc *sc); +static void aac_daemon(void *arg); /* Command Processing */ static void aac_timeout(struct aac_softc *sc); @@ -292,6 +293,9 @@ TAILQ_INIT(&sc->aac_container_tqh); TAILQ_INIT(&sc->aac_ev_cmfree); + /* Initialize the clock daemon callout. */ + callout_init_mtx(&sc->aac_daemontime, &sc->aac_io_lock, 0); + /* * Initialize the adapter. */ @@ -349,9 +353,34 @@ aac_get_bus_info(sc); } + mtx_lock(&sc->aac_io_lock); + callout_reset(&sc->aac_daemontime, 30 * 60 * hz, aac_daemon, sc); + mtx_unlock(&sc->aac_io_lock); + return(0); } +static void +aac_daemon(void *arg) +{ + struct timeval tv; + struct aac_softc *sc; + struct aac_fib *fib; + + sc = arg; + mtx_assert(&sc->aac_io_lock, MA_OWNED); + + if (callout_pending(&sc->aac_daemontime) || + callout_active(&sc->aac_daemontime) == 0) + return; + getmicrotime(&tv); + aac_alloc_sync_fib(sc, &fib); + *(uint32_t *)fib->data = tv.tv_sec; + aac_sync_fib(sc, SendHostTime, 0, fib, sizeof(uint32_t)); + aac_release_sync_fib(sc); + callout_schedule(&sc->aac_daemontime, 30 * 60 * hz); +} + void aac_add_event(struct aac_softc *sc, struct aac_event *event) { @@ -632,9 +661,12 @@ bus_dma_tag_destroy(sc->aac_parent_dmat); /* release the register window mapping */ - if (sc->aac_regs_resource != NULL) + if (sc->aac_regs_res0 != NULL) + bus_release_resource(sc->aac_dev, SYS_RES_MEMORY, + sc->aac_regs_rid0, sc->aac_regs_res0); + if (sc->aac_hwif == AAC_HWIF_NARK && sc->aac_regs_res1 != NULL) bus_release_resource(sc->aac_dev, SYS_RES_MEMORY, - sc->aac_regs_rid, sc->aac_regs_resource); + sc->aac_regs_rid1, sc->aac_regs_res1); } /* @@ -654,6 +686,8 @@ if (sc->aac_state & AAC_STATE_OPEN) return(EBUSY); + callout_drain(&sc->aac_daemontime); + /* Remove the child containers */ while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) { error = device_delete_child(dev, co->co_disk); @@ -834,7 +868,7 @@ } index &= ~2; for (i = 0; i < sizeof(struct aac_fib)/4; ++i) - ((u_int32_t *)fib)[i] = AAC_GETREG4(sc, index + i*4); + ((u_int32_t *)fib)[i] = AAC_MEM1_GETREG4(sc, index + i*4); aac_handle_aif(sc, fib); free(fib, M_AACBUF); @@ -1754,26 +1788,33 @@ /* Remap mem. resource, if required */ if ((sc->flags & AAC_FLAGS_NEW_COMM) && - atu_size > rman_get_size(sc->aac_regs_resource)) { + atu_size > rman_get_size(sc->aac_regs_res1)) { bus_release_resource( sc->aac_dev, SYS_RES_MEMORY, - sc->aac_regs_rid, sc->aac_regs_resource); - sc->aac_regs_resource = bus_alloc_resource( - sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid, + sc->aac_regs_rid1, sc->aac_regs_res1); + sc->aac_regs_res1 = bus_alloc_resource( + sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid1, 0ul, ~0ul, atu_size, RF_ACTIVE); - if (sc->aac_regs_resource == NULL) { - sc->aac_regs_resource = bus_alloc_resource_any( + if (sc->aac_regs_res1 == NULL) { + sc->aac_regs_res1 = bus_alloc_resource_any( sc->aac_dev, SYS_RES_MEMORY, - &sc->aac_regs_rid, RF_ACTIVE); - if (sc->aac_regs_resource == NULL) { + &sc->aac_regs_rid1, RF_ACTIVE); + if (sc->aac_regs_res1 == NULL) { device_printf(sc->aac_dev, "couldn't allocate register window\n"); return (ENXIO); } sc->flags &= ~AAC_FLAGS_NEW_COMM; } - sc->aac_btag = rman_get_bustag(sc->aac_regs_resource); - sc->aac_bhandle = rman_get_bushandle(sc->aac_regs_resource); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 22 22:20:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF5C2106566C; Sun, 22 Feb 2009 22:20: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 7EE95106564A for ; Sun, 22 Feb 2009 22:20:44 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6CE908FC13 for ; Sun, 22 Feb 2009 22:20:44 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MMKiWh009050 for ; Sun, 22 Feb 2009 22:20:44 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1MMKiBp009048 for perforce@freebsd.org; Sun, 22 Feb 2009 22:20:44 GMT (envelope-from julian@freebsd.org) Date: Sun, 22 Feb 2009 22:20:44 GMT Message-Id: <200902222220.n1MMKiBp009048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 158089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 22:20:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=158089 Change 158089 by julian@julian_trafmon1 on 2009/02/22 22:20:34 Small whitespace fix. (problem visible in diff output) Affected files ... .. //depot/projects/vimage/src/sys/netinet/vinet.h#47 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/vinet.h#47 (text+ko) ==== @@ -293,7 +293,7 @@ #define V_rtq_timeout VNET_INET(rtq_timeout) #define V_rtq_timer VNET_INET(rtq_timer) #define V_rtq_toomany VNET_INET(rtq_toomany) -#define V_sack_hole_zone VNET_INET(sack_hole_zone) +#define V_sack_hole_zone VNET_INET(sack_hole_zone) #define V_sameprefixcarponly VNET_INET(sameprefixcarponly) #define V_ss_fltsz VNET_INET(ss_fltsz) #define V_ss_fltsz_local VNET_INET(ss_fltsz_local) @@ -325,7 +325,7 @@ #define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh) #define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab) #define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) -#define V_tcp_ipi_zone VNET_INET(tcp_ipi_zone) +#define V_tcp_ipi_zone VNET_INET(tcp_ipi_zone) #define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval) #define V_tcp_minmss VNET_INET(tcp_minmss) #define V_tcp_mssdflt VNET_INET(tcp_mssdflt) @@ -342,8 +342,8 @@ #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_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) From owner-p4-projects@FreeBSD.ORG Sun Feb 22 22:37:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ACF45106566C; Sun, 22 Feb 2009 22:37: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 67BD1106564A for ; Sun, 22 Feb 2009 22:37:01 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3AC458FC08 for ; Sun, 22 Feb 2009 22:37:01 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1MMb0uD010279 for ; Sun, 22 Feb 2009 22:37:00 GMT (envelope-from julian@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1MMb0TA010277 for perforce@freebsd.org; Sun, 22 Feb 2009 22:37:00 GMT (envelope-from julian@freebsd.org) Date: Sun, 22 Feb 2009 22:37:00 GMT Message-Id: <200902222237.n1MMb0TA010277@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to julian@freebsd.org using -f From: Julian Elischer To: Perforce Change Reviews Cc: Subject: PERFORCE change 158090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 22 Feb 2009 22:37:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=158090 Change 158090 by julian@julian_trafmon1 on 2009/02/22 22:36:06 Fix typos in comment Affected files ... .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#14 edit Differences ... ==== //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#14 (text+ko) ==== @@ -395,7 +395,7 @@ printf("\n"); } -/* XXX we are only goin gto look at intefaces in the base vimage */ +/* XXX we are only going to look at interfaces in the base vimage */ void bootpboot_p_iflist(void) { From owner-p4-projects@FreeBSD.ORG Mon Feb 23 09:41:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A32E61065676; Mon, 23 Feb 2009 09:41: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 608C81065674 for ; Mon, 23 Feb 2009 09:41:17 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4E5CD8FC08 for ; Mon, 23 Feb 2009 09:41:17 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1N9fHv6010026 for ; Mon, 23 Feb 2009 09:41:17 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1N9fHM0010024 for perforce@freebsd.org; Mon, 23 Feb 2009 09:41:17 GMT (envelope-from andrew@freebsd.org) Date: Mon, 23 Feb 2009 09:41:17 GMT Message-Id: <200902230941.n1N9fHM0010024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 158109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 09:41:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=158109 Change 158109 by andrew@andrew_bender on 2009/02/23 09:41:04 Calculate the value of pclk before cninit to use in uart In uart_cpu_getdev return an error when we are looking for anything other than a console Increase the uart baud rate to 115200 Fix sscomspeed to return the correct value Remove the error calculation from sscomspeed as it wasn't used Replace DEFAULT_RCLK with s3c2410_pclk Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#4 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#4 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#10 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#4 (text+ko) ==== @@ -109,6 +109,8 @@ #define ABT_STACK_SIZE 1 #define UND_STACK_SIZE 1 +extern int s3c2410_pclk; + extern u_int data_abort_handler_address; extern u_int prefetch_abort_handler_address; extern u_int undefined_handler_address; @@ -386,10 +388,11 @@ /* Disable all peripheral interrupts */ ioreg_write32(S3C24X0_INTCTL_BASE + INTCTL_INTMSK, ~0); memsize = board_init(); + /* Find pclk for uart */ + s3c24x0_clock_freq2(S3C24X0_CLKMAN_BASE, NULL, NULL, &s3c2410_pclk); cninit(); /* Set stack for exception handlers */ - data_abort_handler_address = (u_int)data_abort_handler; prefetch_abort_handler_address = (u_int)prefetch_abort_handler; undefined_handler_address = (u_int)undefinedinstruction_bounce; ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_cpu_s3c2410.c#4 (text+ko) ==== @@ -42,6 +42,11 @@ bus_space_tag_t uart_bus_space_io; bus_space_tag_t uart_bus_space_mem; +extern struct uart_ops uart_s3c2410_ops; + +vm_offset_t s3c2410_uart_vaddr; +unsigned int s3c2410_pclk; + extern struct uart_class uart_s3c2410_class; int @@ -50,20 +55,19 @@ return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0); } -extern struct uart_ops uart_s3c2410_ops; - -vm_offset_t s3c2410_uart_vaddr; - int uart_cpu_getdev(int devtype, struct uart_devinfo *di) { + if (devtype != UART_DEV_CONSOLE) + return (ENXIO); + di->ops = uart_getops(&uart_s3c2410_class); di->bas.chan = 0; di->bas.bst = &s3c2xx0_bs_tag; di->bas.bsh = s3c2410_uart_vaddr; di->bas.regshft = 0; - di->bas.rclk = 0; - di->baudrate = 9600; + di->bas.rclk = s3c2410_pclk; + di->baudrate = 115200; di->databits = 8; di->stopbits = 1; di->parity = UART_PARITY_NONE; ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#10 (text+ko) ==== @@ -46,8 +46,6 @@ #include #include "uart_if.h" -#define DEFAULT_RCLK 3686400 - /* Finds the subirq from the parent */ #define get_sub_irq(parent, offset) \ ((parent == S3C24X0_INT_UART0) ? S3C24X0_SUBIRQ_MIN + offset : \ @@ -57,6 +55,8 @@ #define TX_OFF 1 #define ERR_OFF 2 +extern unsigned int s3c2410_pclk; + static int sscomspeed(long, long); static int s3c24x0_uart_param(struct uart_bas *, int, int, int, int); @@ -75,21 +75,12 @@ static int sscomspeed(long speed, long frequency) { -#define divrnd(n, q) (((n)*2/(q)+1)/2) /* divide and round off */ + int x; - int x, err; - - if (speed <= 0) + if (speed <= 0 || frequency <= 0) return -1; - x = divrnd(frequency / 16, speed); - if (x <= 0) - return -1; - err = divrnd(((quad_t)frequency) * 1000 / 16, speed * x) - 1000; - if (err < 0) - err = -err; + x = (frequency / 16) / speed; return x-1; - -#undef divrnd } static int @@ -164,7 +155,8 @@ int parity) { if (bas->rclk == 0) - bas->rclk = DEFAULT_RCLK; + bas->rclk = s3c2410_pclk; + KASSERT(bas->rclk != 0, ("s3c2410_init: Invalid rclk")); uart_setreg(bas, SSCOM_UCON, 0); uart_setreg(bas, SSCOM_UFCON, @@ -309,6 +301,10 @@ { int error; + if (sc->sc_bas.rclk == 0) + sc->sc_bas.rclk = s3c2410_pclk; + KASSERT(sc->sc_bas.rclk != 0, ("s3c2410_init: Invalid rclk")); + uart_lock(sc->sc_hwmtx); error = s3c24x0_uart_param(&sc->sc_bas, baudrate, databits, stopbits, parity); @@ -366,5 +362,5 @@ 1, .uc_ops = &uart_s3c2410_ops, .uc_range = 8, - .uc_rclk = DEFAULT_RCLK + .uc_rclk = 0, }; From owner-p4-projects@FreeBSD.ORG Mon Feb 23 14:31:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C50761065673; Mon, 23 Feb 2009 14:31: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 6EAC4106564A for ; Mon, 23 Feb 2009 14:31: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 58AE08FC0C for ; Mon, 23 Feb 2009 14:31: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 n1NEVKWc052817 for ; Mon, 23 Feb 2009 14:31:20 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NEVJTd052815 for perforce@freebsd.org; Mon, 23 Feb 2009 14:31:19 GMT (envelope-from antab@FreeBSD.org) Date: Mon, 23 Feb 2009 14:31:19 GMT Message-Id: <200902231431.n1NEVJTd052815@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 158117 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 14:31:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=158117 Change 158117 by antab@antab_farm on 2009/02/23 14:31:15 Get ddb/kdb working Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#6 edit .. //depot/projects/avr32/src/sys/avr32/avr32/db_disasm.c#3 edit .. //depot/projects/avr32/src/sys/avr32/avr32/db_interface.c#4 edit .. //depot/projects/avr32/src/sys/avr32/avr32/db_trace.c#2 edit .. //depot/projects/avr32/src/sys/avr32/avr32/exception.S#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/machdep.c#7 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#6 edit .. //depot/projects/avr32/src/sys/avr32/avr32/support.S#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/switch.S#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/trap.c#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#6 edit .. //depot/projects/avr32/src/sys/avr32/include/asm.h#2 edit .. //depot/projects/avr32/src/sys/avr32/include/db_disasm.h#1 add .. //depot/projects/avr32/src/sys/avr32/include/db_machdep.h#4 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#6 (text+ko) ==== @@ -73,7 +73,7 @@ sysreg_write(EVBA, (uint32_t)&_evba); __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_EM)); -#if 0 // defined(DDB) +#if defined(DDB) /* * Enable Debug mode in monitor mode. Allow peripherals to run * while in debug mode so we can report tru uart. ==== //depot/projects/avr32/src/sys/avr32/avr32/db_disasm.c#3 (text+ko) ==== @@ -34,15 +34,1083 @@ #include #include - #include #include #include -#include +#include + +static void avr32_reglist16_output(avr32_inst_t); + +/* + * Branch instruction conditions + */ +static char *avr32_cond[] = { + "eq", "ne", "cc", "cs", + "ge", "lt", "mi", "pl", + "ls", "gt", "le", "hi", + "vs", "vc", "qs", "al" +}; + +/** + * Reglist8 + */ +static char *avr32_reglist8[] = { + "r0-r3", "r4-r7", "r8-r9", "r10", + "r11", "r12", "lr", "pc" +}; + +/** + * Reglist16 + */ +static char *avr32_reglist16[] = { + "r0", "r1", "r2", "r3", + "r4", "r5", "r6", "r7", + "r8", "r9", "r10", "r11", + "r12", "sp", "lr", "pc" +}; + +/** + * Halfword select + */ +static char *avr32_halfword_sel[] = { + "b", "t" +}; + +/** + * Byte select + */ +static char *avr32_byte_sel[] = { + "b", "l", "u", "t" +}; + +/** + * Co-processor double list + */ +static char *avr32_cr_double[] = { + "cr0-cr1", "cr2-cr3", "cr4-cr5", "cr6-cr7", + "cr8-cr9", "cr10-cr11", "cr12-cr13", "cr14-cr15" +}; + +/** + * Co-processor high list + */ +static char *avr32_cr_high[] = { + "cr8", "cr9", "cr10", "cr11", + "cr12", "cr13", "cr14", "cr15" +}; + +/** + * Co-procesor low list + */ +static char *avr32_cr_low[] = { + "cr0", "cr1", "cr2", "cr3", + "cr4", "cr5", "cr6", "cr7" +}; + +static struct avr32_inst_info avr32_instructions[] = { + { "abs", 2, 0xFFF00000, 0x5C400000, avr32_inst_1reg, }, + { "acall", 2, 0xF00F0000, 0xD0000000, avr32_inst_k8 }, + { "acr", 2, 0xFFF00000, 0x5C000000, avr32_inst_1reg }, + { "adc", 4, 0xE1F0FFF0, 0xE0000040, avr32_inst_3reg }, + { "add", 2, 0xE1F00000, 0x00000000, avr32_inst_2reg }, + { "add", 4, 0xE1F0FFC0, 0xE0000000, avr32_inst_3reg_2shift, INST_SHIFT_LEFT }, + { "add", 4, 0xE1F0F0F0, 0xE1D0E000, avr32_inst_3reg, 0, avr32_inst_cond4, 8 }, + { "addabs", 4, 0xE1F0FFF0, 0xE0000E40, avr32_inst_3reg }, + { "addhh.w", 4, 0xE1F0FFC0, 0XE0000E00, avr32_inst_dsp_hw }, + { "and", 2, 0xE1F00000, 0x00600000, avr32_inst_2reg }, + { "and", 4, 0xE1F0FE00, 0xE1E00000, avr32_inst_3reg_5shift, INST_SHIFT_LEFT }, + { "and", 4, 0xE1F0FE00, 0xE1E00200, avr32_inst_3reg_5shift, INST_SHIFT_RIGHT }, + { "and", 4, 0xE1F0F0F0, 0xE1D0E020, avr32_inst_3reg, 0, avr32_inst_cond4, 8 }, + { "andh", 4, 0xFDF00000, 0xE4100000, avr32_inst_andlh }, + { "andl", 4, 0xFDF00000, 0xE0100000, avr32_inst_andlh }, + { "andn", 2, 0xE1F00000, 0x00800000, avr32_inst_2reg }, + { "asr", 4, 0xE1F0FFF0, 0xE0000840, avr32_inst_3reg }, + { "asr", 2, 0xE1E00000, 0xA1400000, avr32_inst_1reg_5bit }, + { "asr", 4, 0xE1F0FFE0, 0xE0001400, avr32_inst_2reg_k5 }, + { "bfexts", 4, 0xE1F0FC00, 0xE1D0B000, avr32_inst_2reg_2k5 }, + { "bfextu", 4, 0xE1F0FC00, 0xE1D0C000, avr32_inst_2reg_2k5 }, + { "bfins", 4, 0xE1F0FC00, 0xE1D0D000, avr32_inst_2reg_2k5 }, + { "bld", 4, 0xFFF0FFE0, 0xEDB00000, avr32_inst_1reg_5bite }, + { "br", 2, 0xF0080000, 0xC0000000, avr32_inst_disp8, 0, avr32_inst_cond3 }, + { "br", 4, 0xE1E00000, 0xE0800000, avr32_inst_disp21, 0, avr32_inst_cond4, 16 }, + { "breakpoint", 2, 0xFFFF0000, 0xD6730000, }, + { "brev", 2, 0xFFF00000, 0x5C900000, avr32_inst_1reg }, + { "bst", 4, 0xFFF0FFE0, 0xEFB00000, avr32_inst_1reg_5bite }, + { "cache", 4, 0xFFF00000, 0xF4100000, avr32_inst_cache }, + { "casts.h", 2, 0xFFF00000, 0x5C800000, avr32_inst_1reg }, + { "casts.b", 2, 0xFFF00000, 0x5C600000, avr32_inst_1reg }, + { "castu.h", 2, 0xFFF00000, 0x5C800000, avr32_inst_1reg }, + { "castu.b", 2, 0xFFF00000, 0x5C500000, avr32_inst_1reg }, + { "cbr", 2, 0xE1E00000, 0xA1C00000, avr32_inst_1reg_5bit }, + { "clz", 4, 0xE1F0FFFF, 0xE0001200, avr32_inst_2reg }, + { "com", 2, 0xFFF00000, 0x5CD00000, avr32_inst_1reg }, + { "cop", 4, 0xF9F00000, 0xE1A00000, avr32_inst_co_op }, + { "cp.b", 4, 0xE1F0FFFF, 0xE0001800, avr32_inst_2reg }, + { "cp.h", 4, 0xE1F0FFFF, 0xE0001900, avr32_inst_2reg }, + { "cp.w", 2, 0xE1F00000, 0x00300000, avr32_inst_2reg }, + { "cp.w", 2, 0xFC000000, 0x58000000, avr32_inst_1reg_k6 }, + { "cp.w", 4, 0xE1E00000, 0xE0400000, avr32_inst_1reg_imm21 }, + { "cpc", 4, 0xE1F0FFFF, 0xE0001300, avr32_inst_2reg }, + { "cpc", 2, 0xFFF00000, 0x5C200000, avr32_inst_1reg }, + { "csrf", 2, 0xFE0F0000, 0xD4030000, avr32_inst_sreg }, + { "csrfcz", 2, 0xFE0F0000, 0xD0030000, avr32_inst_sreg }, + { "divs", 4, 0xE1F0FFC0, 0xE0000C00, avr32_inst_3reg }, + { "divu", 4, 0xE1F0FFC0, 0xE0000D00, avr32_inst_3reg }, + { "eor", 2, 0xE1F00000, 0x00500000, avr32_inst_2reg }, + { "eor", 4, 0xE1F0FE00, 0xE1E02000, avr32_inst_3reg_5shift, INST_SHIFT_LEFT }, + { "eor", 4, 0xE1F0FE00, 0xE1E02200, avr32_inst_3reg_5shift, INST_SHIFT_RIGHT }, + { "eor", 4, 0xE1F0F0F0, 0xE1D0E040, avr32_inst_3reg, 0, avr32_inst_cond4, 8 }, + { "eorh", 4, 0xFFF00000, 0xEE100000, avr32_inst_1reg_k16 }, + { "eorl", 4, 0xFFF00000, 0xEC100000, avr32_inst_1reg_k16 }, + { "frs", 2, 0xFFFF0000, 0xD7430000, }, + { "icall", 2, 0xFFF00000, 0x5D100000, avr32_inst_1reg }, + { "incjosp", 2, 0xFF8F0000, 0xD6830000, avr32_inst_imm3 }, + { "ld.d", 2, 0xE1F10000, 0xA1010000, avr32_inst_2reg, INST_PTR2_INC }, + { "ld.d", 2, 0xE1F10000, 0xA1100000, avr32_inst_2reg, INST_PTR2_DEC }, + { "ld.d", 2, 0xE1F10000, 0xA1000000, avr32_inst_2reg }, + { "ld.d", 4, 0xE1F10000, 0xE0E00000, avr32_inst_2reg_disp16_load }, + { "ld.d", 4, 0xE1F0FFC1, 0xE0000200, avr32_inst_3reg_disp_2shift_load }, + { "ld.sb", 4, 0xE1F00000, 0xE1200000, avr32_inst_2reg_disp16_load }, + { "ld.sb", 4, 0xE1F0FFC0, 0xE0000600, avr32_inst_3reg_disp_2shift_load }, + { "ld.sb", 4, 0xE1F00E00, 0xE1F00600, avr32_inst_2reg_disp9_load, 0, avr32_inst_cond4, 12 }, + { "ld.ub", 2, 0xE1F00000, 0x01300000, avr32_inst_2reg, INST_PTR2_INC }, + { "ld.ub", 2, 0xE1F00000, 0x01700000, avr32_inst_2reg, INST_PTR2_DEC }, + { "ld.ub", 2, 0xE1800000, 0x01800000, avr32_inst_2reg_disp3_load, 0 }, + { "ld.ub", 4, 0xE1F00000, 0xE1300000, avr32_inst_2reg_disp16_load }, + { "ld.ub", 4, 0xE1F0FFC0, 0xE0000700, avr32_inst_3reg_disp_2shift_load }, + { "ld.ub", 4, 0XE1F00E00, 0xE1F00800, avr32_inst_2reg_disp9_load, 0, avr32_inst_cond4, 12 }, + { "ld.sh", 2, 0xE1F00000, 0x01100000, avr32_inst_2reg, INST_PTR2_INC }, + { "ld.sh", 2, 0xE1F00000, 0x01500000, avr32_inst_2reg, INST_PTR2_DEC }, + { "ld.sh", 2, 0xE1800000, 0x80000000, avr32_inst_2reg_disp3_load, 1 }, + { "ld.sh", 4, 0xE1F00000, 0xE1000000, avr32_inst_2reg_disp16_load }, + { "ld.sh", 4, 0xE1F0FFC0, 0xE0000400, avr32_inst_3reg_disp_2shift_load }, + { "ld.sh", 4, 0xE1F00E00, 0xE1F00200, avr32_inst_2reg_disp9_load, 1, avr32_inst_cond4, 12 }, + { "ld.uh", 2, 0xE1F00000, 0x01200000, avr32_inst_2reg, INST_PTR2_INC }, + { "ld.uh", 2, 0xE1F00000, 0x01600000, avr32_inst_2reg, INST_PTR2_DEC }, + { "ld.uh", 2, 0xE1800000, 0x80800000, avr32_inst_2reg_disp3_load, 1 }, + { "ld.uh", 4, 0xE1F00000, 0xE1100000, avr32_inst_2reg_disp16_load }, + { "ld.uh", 4, 0xE1F0FFC0, 0xE0000500, avr32_inst_3reg_disp_2shift_load }, + { "ld.uh", 4, 0xE1F00E00, 0xE1F00400, avr32_inst_2reg_disp9_load, 1, avr32_inst_cond4, 12 }, + { "ld.w", 2, 0xE1F00000, 0x01000000, avr32_inst_2reg, INST_PTR2_INC }, + { "ld.w", 2, 0xE1F00000, 0x01400000, avr32_inst_2reg, INST_PTR2_DEC }, + { "ld.w", 2, 0xE0000000, 0x60000000, avr32_inst_2reg_disp3_load, 2 }, + { "ld.w", 4, 0xE1F00000, 0xE0F00000, avr32_inst_2reg_disp16_load }, + { "ld.w", 4, 0xE1F0FFC0, 0xE0000300, avr32_inst_3reg_disp_2shift_load }, + { "ld.w", 4, 0xE1F0FFC0, 0xE0000F80, avr32_inst_2reg_disp_part_load }, + { "ld.w", 4, 0xE1F00E00, 0xE1F00000, avr32_inst_2reg_disp9_load, 2, avr32_inst_cond4, 12 }, + { "ldc.d", 4, 0xFFF01100, 0xE9A01000, avr32_inst_co_disp8_load }, + { "ldc.d", 4, 0xFFF011FF, 0xEFA00050, avr32_inst_co_load }, + { "ldc.d", 4, 0xFFF011C0, 0xEFA01040, avr32_inst_co_disp_2shift_load }, + { "ldc.w", 4, 0xFFF01000, 0xE9A00000, avr32_inst_co_disp8_load }, + { "ldc.w", 4, 0xFFF010FF, 0xEFA00040, avr32_inst_co_load }, + { "ldc.w", 4, 0xFFF010C0, 0xEFA01000, avr32_inst_co_disp_2shift_load }, + { "ldc0.d", 4, 0xFFF00100, 0xF3A00000, avr32_inst_co0_load }, + { "ldc0.w", 4, 0XFFF00000, 0xF1A00000, avr32_inst_co0_load }, + { "ldcm.d", 4, 0xFFF00F00, 0xEDA00400, avr32_inst_co_load_many, (int)avr32_cr_double }, + { "ldcm.w", 4, 0xFFF00F00, 0xEDA00100, avr32_inst_co_load_many, (int)avr32_cr_high }, + { "ldcm.w", 4, 0xFFF00F00, 0xEDA00000, avr32_inst_co_load_many, (int)avr32_cr_low }, + { "lddpc", 2, 0xF8000000, 0x48000000, avr32_inst_rel_load }, + { "lddsp", 2, 0xF8000000, 0x40000000, avr32_inst_rel_load }, + { "ldins.b", 4, 0xE1F0C000, 0xE1D04000, avr32_inst_2reg_k12_byte }, + { "ldins.h", 4, 0xE1F0E000, 0xE1D00000, avr32_inst_2reg_k12_halfword }, + { "ldm", 4, 0xFDF00000, 0xE1C00000, avr32_inst_load_many }, + { "ldmts", 4, 0xFDF00000, 0xE5C00000, avr32_inst_load_many }, + { "ldswp.sh", 4, 0xE1F0F000, 0xE1D02000, avr32_inst_2reg_disp12_load, 1 }, + { "ldswp.uh", 4, 0xE1F0F000, 0xE1D03000, avr32_inst_2reg_disp12_load, 1 }, + { "ldswp.w", 4, 0xE1F0F000, 0xE1D08000, avr32_inst_2reg_disp12_load, 2 }, + { "lsl", 4, 0xE1F0FFF0, 0xE0000940, avr32_inst_3reg }, + { "lsl", 2, 0xE1E00000, 0xA1600000, avr32_inst_1reg_5bit }, + { "lsl", 4, 0xE1F0FFE0, 0xE0001500, avr32_inst_2reg_k5, }, + { "lsr", 4, 0xE1F0FFF0, 0xE0000A40, avr32_inst_3reg }, + { "lsr", 2, 0xE1E00000, 0xA1800000, avr32_inst_1reg_5bit }, + { "lsr", 4, 0XE1F0FFE0, 0xE0001600, avr32_inst_2reg_k5, }, + { "mac", 4, 0xE1F0FFF0, 0xE0000340, avr32_inst_3reg }, + { "machh.d", 4, 0xE1F0FFC0, 0xE0000580, avr32_inst_dsp_hw }, + { "machh.w", 4, 0xE1F0FFC0, 0xE0000480, avr32_inst_dsp_hw }, + { "macs.d", 4, 0xE1F0FFF0, 0xE0000540, avr32_inst_3reg }, + { "macsathh.w", 4, 0xE1F0FFC0, 0xE0000680, avr32_inst_dsp_hw }, + { "macu.d", 4, 0xE1F0FFF0, 0xE0000740, avr32_inst_3reg }, + { "macwh.d", 4, 0xE1F0FFE0, 0xE0000C80, avr32_inst_dsp_w }, + { "max", 4, 0xE1F0FFF0, 0xE0000C40, avr32_inst_3reg }, + { "mcall", 4, 0xFFF00000, 0xF0100000, avr32_inst_1reg_disp16s2 }, + { "memc", 4, 0xFFF00000, 0xF6100000, avr32_inst_addr15_b5 }, + { "mems", 4, 0xFFF00000, 0xF8100000, avr32_inst_addr15_b5 }, + { "memt", 4, 0xFFF00000, 0xFA100000, avr32_inst_addr15_b5 }, + { "mfdr", 4, 0xFFF0FF00, 0xE5B00000, avr32_inst_st_reg }, + { "mfsr", 4, 0xFFF0FF00, 0xE1B00000, avr32_inst_st_reg }, + { "min", 4, 0xE1F0FFF0, 0xE0000D40, avr32_inst_3reg }, + { "mov", 2, 0xF0000000, 0x30000000, avr32_inst_1reg_imm8 }, + { "mov", 4, 0xE1E00000, 0xE0600000, avr32_inst_1reg_imm21 }, + { "mov", 2, 0xE1F00000, 0x00900000, avr32_inst_2reg }, + { "mov", 4, 0xE1F0FF0F, 0xE0001700, avr32_inst_2reg, 0, avr32_inst_cond4, 4 }, + { "mov", 4, 0xFFF0F000, 0xF9B00000, avr32_inst_1reg_imm8_ext , 0, avr32_inst_cond4, 8 }, + { "movhi", 4, 0xFFF00000, 0xFC100000, avr32_inst_1reg_k16 }, + { "mtdr", 4, 0xFFF0FF00, 0xE7B00000, avr32_inst_reg_st }, + { "mtsr", 4, 0xFFF0FF00, 0xE3B00000, avr32_inst_reg_st }, + { "mul", 2, 0xE1F00000, 0xA1300000, avr32_inst_2reg }, + { "mul", 4, 0xE1F0FFF0, 0xE0000240, avr32_inst_3reg }, + { "mul", 4, 0xE1F0FF00, 0xE0001000, avr32_inst_2reg_imm8 }, + { "mulhh.w", 4, 0xE1F0FFC0, 0xE0000780, avr32_inst_dsp_hw }, + { "mulnhh.w", 4, 0xE1F0FFC0, 0xE0000180, avr32_inst_dsp_hw }, + { "mulnwh.d", 4, 0xE1F0FFE1, 0xE0000280, avr32_inst_dsp_w }, + { "muls.d", 4, 0xE1F0FFF0, 0xE0000440, avr32_inst_3reg }, + { "mulsathh.h", 4, 0xE1F0FFC0, 0xE0000880, avr32_inst_dsp_hw }, + { "mulsathh.w", 4, 0xE1F0FFC0, 0xE0000980, avr32_inst_dsp_hw }, + { "mulsatrndhh.h", 4, 0xE1F0FFC0, 0xE0000A80, avr32_inst_dsp_hw }, + { "mulsatrndwh.h", 4, 0xE1F0FFE0, 0xE0000B80, avr32_inst_dsp_w }, + { "mulsatwh.w", 4, 0xE1F0FFE0, 0xE0000E80, avr32_inst_dsp_w }, + { "mulu.d", 4, 0xE1F0FFF0, 0xE0000640, avr32_inst_3reg }, + { "mulwh.d", 4, 0xE1F0FFE0, 0xE0000D80, avr32_inst_dsp_w }, + { "musfr", 2, 0xFFF00000, 0x5D300000, avr32_inst_1reg }, + { "mustr", 2, 0xFFF00000, 0x5D200000, avr32_inst_1reg }, + { "mvcr.d", 4, 0xFFF111FF, 0xEFA00010, avr32_inst_co_to_reg }, + { "mvcr.w", 4, 0xFFF010FF, 0xEFA00000, avr32_inst_co_to_reg }, + { "mvrc.d", 4, 0xFFF111FF, 0xEFA00030, avr32_inst_reg_to_co }, + { "mvrc.w", 4, 0xFFF010FF, 0xEFA00020, avr32_inst_reg_to_co }, + { "neg", 2, 0xFFF00000, 0x5C300000, avr32_inst_1reg }, + { "nop", 2, 0xFFFF0000, 0xD7030000, }, + { "or", 2, 0xE1F00000, 0x00400000, avr32_inst_2reg }, + { "or", 4, 0xE1F0FE00, 0xE1E01000, avr32_inst_3reg_5shift, INST_SHIFT_LEFT }, + { "or", 4, 0xE1F0FE00, 0xE1E01200, avr32_inst_3reg_5shift, INST_SHIFT_RIGHT }, + { "or", 4, 0xE1F0F0F0, 0xE1D0E030, avr32_inst_3reg, 0, avr32_inst_cond4, 8 }, + { "orh", 4, 0xFFF00000, 0xEA100000, avr32_inst_1reg_k16 }, + { "orl", 4, 0xFFF00000, 0xE8100000, avr32_inst_1reg_k16 }, + { "pabs.sb", 4, 0xFFF0FFF0, 0xE00023E0, avr32_inst_2reg_ext }, + { "pabs.sh", 4, 0xFFF0FFF0, 0xE00023F0, avr32_inst_2reg_ext }, + { "packsh.ub", 4, 0xE1F0FFF0, 0xE00024C0, avr32_inst_3reg }, + { "packsh.sb", 4, 0xE1F0FFF0, 0xE00024D0, avr32_inst_3reg }, + { "packw.sh", 4, 0xE1F0FFF0, 0xE0002470, avr32_inst_3reg }, + { "padd.b", 4, 0xE1F0FFF0, 0xE0002300, avr32_inst_3reg }, + { "padd.h", 4, 0xE1F0FFF0, 0xE0002000, avr32_inst_3reg }, + { "paddh.ub", 4, 0xE1F0FFF0, 0xE0002360, avr32_inst_3reg }, + { "paddh.sh", 4, 0xE1F0FFF0, 0xE00020C0, avr32_inst_3reg }, + { "padds.ub", 4, 0xE1F0FFF0, 0xE0002340, avr32_inst_3reg }, + { "padds.sb", 4, 0xE1F0FFF0, 0xE0002320, avr32_inst_3reg }, + { "padds.uh", 4, 0xE1F0FFF0, 0xE0002080, avr32_inst_3reg }, + { "padds.sh", 4, 0xE1F0FFF0, 0xe0002040, avr32_inst_3reg }, + { "paddsub.h", 4, 0xE1F0FFC0, 0xE0002100, avr32_inst_dsp_hw }, + { "paddsubh.sh",4, 0xE1F0FFC0, 0xE0002280, avr32_inst_dsp_hw }, + { "paddsubs.uh",4, 0xE1F0FFC0, 0xE0002200, avr32_inst_dsp_hw }, + { "paddsubs.sh",4, 0xE1F0FFC0, 0xE0002180, avr32_inst_dsp_hw }, + { "paddx.h", 4, 0xE1F0FFF0, 0xE0002020, avr32_inst_3reg }, + { "paddxh.sh", 4, 0xE1F0FFF0, 0xE00020E0, avr32_inst_3reg }, + { "paddxs.uh", 4, 0xE1F0FFF0, 0xE00020A0, avr32_inst_3reg }, + { "paddxs.sh", 4, 0xE1F0FFF0, 0xE0002060, avr32_inst_3reg }, + { "pasr.b", 4, 0xE1F8FFF0, 0xE0002410, avr32_inst_2reg_k3 }, + { "pasr.h", 4, 0xE1F0FFF0, 0xE0002440, avr32_inst_2reg_k4 }, + { "pavg.ub", 4, 0xE1F0FFF0, 0xE00023C0, avr32_inst_3reg }, + { "pavg.sh", 4, 0xE1F0FFF0, 0xE00023D0, avr32_inst_3reg }, + { "plsl.b", 4, 0xE1F8FFF0, 0xE0002420, avr32_inst_2reg_k3 }, + { "plsl.h", 4, 0xE1F0FFF0, 0xE0002450, avr32_inst_2reg_k4 }, + { "plsr.b", 4, 0xE1F8FFF0, 0xE0002430, avr32_inst_2reg_k3 }, + { "plsr.h", 4, 0xE1F0FFF0, 0xE0002460, avr32_inst_2reg_k4 }, + { "pmax.ub", 4, 0xE1F0FFF0, 0xE0002380, avr32_inst_3reg }, + { "pmax.sh", 4, 0xE1F0FFF0, 0xE0002390, avr32_inst_3reg }, + { "pmin.ub", 4, 0xE1F0FFF0, 0xE00023A0, avr32_inst_3reg }, + { "pmin.sh", 4, 0xE1F0FFF0, 0xE00023B0, avr32_inst_3reg }, + { "popjc", 2, 0xFFFF0000, 0xD7130000, }, + { "popm", 2, 0xF0070000, 0xD0020000, avr32_inst_mreg }, + { "pref", 4, 0xFFF00000, 0xF2100000, avr32_inst_1reg_disp16 }, + { "psad", 4, 0xE1F0FFF0, 0xE0002400, avr32_inst_3reg }, + { "psub.b", 4, 0xE1F0FFF0, 0xE0002310, avr32_inst_3reg }, + { "psub.h", 4, 0xE1F0FFF0, 0xe0002010, avr32_inst_3reg }, + { "psubadd.h", 4, 0xE1F0FFC0, 0xE0002140, avr32_inst_dsp_hw }, + { "psubaddh.sh",4, 0xE1F0FFC0, 0xE00022C0, avr32_inst_dsp_hw }, + { "psubadds.uh",4, 0xE1F0FFC0, 0xE0002240, avr32_inst_dsp_hw }, + { "psubadds.sh",4, 0xE1F0FFC0, 0xE00021C0, avr32_inst_dsp_hw }, + { "psubh.ub", 4, 0xE1F0FFF0, 0xE0002370, avr32_inst_3reg }, + { "psubh.sh", 4, 0xE1F0FFF0, 0xE00020D0, avr32_inst_3reg }, + { "psubs.ub", 4, 0xE1F0FFF0, 0xE0002350, avr32_inst_3reg }, + { "psubs.sb", 4, 0xE1F0FFF0, 0xE0002330, avr32_inst_3reg }, + { "psubs.uh", 4, 0xE1F0FFF0, 0xe0002090, avr32_inst_3reg }, + { "psbus.sh", 4, 0xE1F0FFF0, 0xE0002050, avr32_inst_3reg }, + { "psubx.h", 4, 0xE1F0FFF0, 0xE0002030, avr32_inst_3reg }, + { "psubxh.sh", 4, 0xE1F0FFF0, 0xE00020F0, avr32_inst_3reg }, + { "psubxs.uh", 4, 0xE1F0FFF0, 0xE00020B0, avr32_inst_3reg }, + { "psubxs.sh", 4, 0xE1F0FFF0, 0xE0002070, avr32_inst_3reg }, + { "punpcksb.h", 4, 0xE1FFFFE0, 0xE00024A0, avr32_inst_2reg_sel }, + { "punpckub.h", 4, 0xE1FFFFE0, 0xE0002480, avr32_inst_2reg_sel }, + { "pushjc", 2, 0xFFFF0000, 0xD7230000, }, + { "pushm", 2, 0xF00F0000, 0xD0010000, avr32_inst_mreg }, + { "rcall", 2, 0xF00C0000, 0xC00C0000, avr32_inst_disp10 }, + { "rcall", 4, 0xE1EF0000, 0xE0A00000, avr32_inst_k21 }, + { "ret", 2, 0xFF000000, 0x5E000000, avr32_inst_1reg, 0, avr32_inst_cond4, 20 }, + { "retd", 2, 0xFFFF0000, 0xD6230000, }, + { "rete", 2, 0xFFFF0000, 0xD6030000, }, + { "retj", 2, 0xFFFF0000, 0xD6330000, }, + { "rets", 2, 0xFFFF0000, 0xD6130000, }, + { "rjmp", 2, 0xF00C0000, 0xC0080000, avr32_inst_disp10 }, + { "rol", 2, 0xFFF00000, 0x5CF00000, avr32_inst_1reg }, + { "ror", 2, 0xFFF00000, 0x5D000000, avr32_inst_1reg }, + { "rsub", 2, 0xE1F00000, 0x00200000, avr32_inst_2reg }, + { "rsub", 4, 0xE1F0FF00, 0xE0001100, avr32_inst_2reg_imm8 }, + { "rsub", 4, 0xFFF0F000, 0xFBB00000, avr32_inst_1reg_imm8_ext, 0, avr32_inst_cond4, 8 }, + { "satadd.h", 4, 0xE1F0FFF0, 0xE00002C0, avr32_inst_3reg }, + { "satadd.w", 4, 0xE1F0FFF0, 0xE00000C0, avr32_inst_3reg }, + { "satrnds", 4, 0xFFF0FC00, 0xF3B00000, avr32_inst_saturate }, + { "satrndu", 4, 0xFFF0FC00, 0xF3B00400, avr32_inst_saturate }, + { "sats", 4, 0xFFF0FC00, 0xF1B00000, avr32_inst_saturate }, + { "satsub.h", 4, 0xE1F0FFF0, 0xE00003C0, avr32_inst_3reg }, + { "satsub.w", 4, 0xE1F0FFF0, 0xE00001C0, avr32_inst_3reg }, + { "satsub.w", 4, 0xE1F00000, 0xE0D00000, avr32_inst_2reg_imm16 }, + { "satu", 4, 0xFFF0FC00, 0xF1B00400, avr32_inst_saturate }, + { "sbc", 4, 0xE1F0FFF0, 0xE0000140, avr32_inst_3reg }, + { "sbr", 2, 0xE1E00000, 0xA1A00000, avr32_inst_1reg_5bit }, + { "scall", 2, 0xFFFF0000, 0xD7330000, }, + { "scr", 2, 0xFFF00000, 0x5C100000, avr32_inst_1reg }, + { "sleep", 4, 0xFFFFFF00, 0xE9B00000, avr32_inst_ss }, + { "sr", 2, 0xFF000000, 0x5F000000, avr32_inst_1reg, 0, avr32_inst_cond4, 20 }, + { "ssrf", 2, 0xFE0F0000, 0xD2030000, avr32_inst_sreg }, + { "st.b", 2, 0xE1F00000, 0x00C00000, avr32_inst_2reg, INST_REG_FLIP | INST_PTR1_INC }, + { "st.b", 2, 0xE1F00000, 0x00F00000, avr32_inst_2reg, INST_REG_FLIP | INST_PTR1_DEC }, + { "st.b", 2, 0xE1800000, 0xA0800000, avr32_inst_2reg_disp3_store }, + { "st.b", 4, 0xE1F00000, 0xE1600000, avr32_inst_2reg_disp16_store, }, + { "st.b", 4, 0xE1F0FFC0, 0xE0000B00, avr32_inst_3reg_disp_2shift_store }, + { "st.b", 4, 0xE1F00E00, 0xE1F00E00, avr32_inst_2reg_disp9_store, 0, avr32_inst_cond4, 12 }, + { "st.d", 2, 0xE1F10000, 0xA1200000, avr32_inst_2reg, INST_REG_DOUBLE | INST_REG_FLIP | INST_PTR1_INC }, + { "st.d", 2, 0xE1F10000, 0xA1210000, avr32_inst_2reg, INST_REG_DOUBLE | INST_REG_FLIP | INST_PTR1_DEC }, + { "st.d", 2, 0xE1F10000, 0xA1110000, avr32_inst_2reg, INST_REG_DOUBLE | INST_REG_FLIP }, + { "st.d", 4, 0xE1F10000, 0xE0E10000, avr32_inst_2reg_disp16_store, INST_REG_DOUBLE }, + { "st.d", 4, 0xE1F0FFC1, 0xE0000800, avr32_inst_3reg_disp_2shift_store, INST_REG_DOUBLE }, + { "st.h", 2, 0xE1F00000, 0x00B00000, avr32_inst_2reg, INST_REG_FLIP | INST_PTR1_INC }, + { "st.h", 2, 0xE1F00000, 0x00E00000, avr32_inst_2reg, INST_REG_FLIP | INST_PTR1_DEC }, + { "st.h", 2, 0xE1800000, 0xA0000000, avr32_inst_2reg_disp3_store, 1 }, + { "st.h", 4, 0xE1F00000, 0xE1500000, avr32_inst_2reg_disp16_store }, + { "st.h", 4, 0xE1F0FFC0, 0xE0000A00, avr32_inst_3reg_disp_2shift_store }, + { "st.h", 4, 0xE1F00E00, 0xE1F00C00, avr32_inst_2reg_disp9_store, 1, avr32_inst_cond4, 12 }, + { "st.w", 2, 0xE1F00000, 0x00A00000, avr32_inst_2reg, INST_REG_FLIP | INST_PTR1_INC }, + { "st.w", 2, 0xE1F00000, 0x00D00000, avr32_inst_2reg, INST_REG_FLIP | INST_PTR1_DEC }, + { "st.w", 2, 0xE1000000, 0x81000000, avr32_inst_2reg_disp4_store, 2 }, + { "st.w", 4, 0xE1F00000, 0xE1400000, avr32_inst_2reg_disp16_store }, + { "st.w", 4, 0xE1F0FFC0, 0xE0000900, avr32_inst_3reg_disp_2shift_store }, + { "st.w", 4, 0xE1F00E00, 0xE1F00A00, avr32_inst_2reg_disp9_store, 2, avr32_inst_cond4, 12 }, + { "stc.d", 4, 0xFFF01100, 0xEBA01000, avr32_inst_co_disp8_store }, + { "stc.d", 4, 0xFFF011F0, 0xEFA00070, avr32_inst_co_store, INST_PTR1_INC }, + { "stc.d", 4, 0xFFF011C0, 0xEFA010C0, avr32_inst_co_disp_2shift_store }, + { "stc.w", 4, 0xFFF01000, 0xEBA00000, avr32_inst_co_disp8_store }, + { "stc.w", 4, 0xFFF010FF, 0xEFA00060, avr32_inst_co_store, INST_PTR1_INC }, + { "stc.w", 4, 0xFFF010C0, 0xEFA01080, avr32_inst_co_disp_2shift_store }, + { "stc0.d", 4, 0xFFF00000, 0xF7A00000, avr32_inst_co0_store }, + { "stc0.w", 4, 0xFFF00000, 0xF5A00000, avr32_inst_co0_store }, + { "stcm.d", 4, 0xFFF00F00, 0xEDA00500, avr32_inst_co_store_many, (int)avr32_cr_double }, + { "stcm.w", 4, 0xFFF00F00, 0xEDA00300, avr32_inst_co_store_many, (int)avr32_cr_high }, + { "stcm.w", 4, 0xFFF00F00, 0xEDA00200, avr32_inst_co_store_many, (int)avr32_cr_low }, + { "stcond", 4, 0xE1F00000, 0xE1700000, avr32_inst_2reg_disp16_store }, + { "stdsp", 2, 0xF8000000, 0x50000000, avr32_inst_rel_store, 13 }, + { "sthh.w", 4, 0xE1F0C000, 0xE1E0C000, avr32_inst_3reg_k8 }, + { "sthh.w", 4, 0xE1F0C0C0, 0xE1E08000, avr32_inst_4reg_k2 }, + { "stm", 4, 0xFDF00000, 0xE9C00000, avr32_inst_store_many }, + { "stmts", 4, 0xFDF00000, 0xEDC00000, avr32_inst_store_many }, + { "stswp.h", 4, 0xE1F0F000, 0xE1D09000, avr32_inst_2reg_disp12_store, 1 }, + { "stswp.w", 4, 0xE1F0F000, 0xE1D0A000, avr32_inst_2reg_disp12_store, 2 }, + { "sub", 2, 0xE1F00000, 0x00100000, avr32_inst_2reg }, + { "sub", 4, 0xE1F0FFC0, 0xE0000100, avr32_inst_3reg_2shift, INST_SHIFT_LEFT }, + { "sub", 2, 0xF0000000, 0x20000000, avr32_inst_1reg_imm8 }, + { "sub", 4, 0xE1E00000, 0xE0200000, avr32_inst_1reg_imm21 }, + { "sub", 4, 0xE1F00000, 0xE0C00000, avr32_inst_2reg_imm16 }, + { "sub", 4, 0xFDF0F000, 0xF5B00000, avr32_inst_1reg_imm8_ext, 0, avr32_inst_cond4f }, + { "sub", 4, 0xE1F0F0F0, 0xE1D0E010, avr32_inst_3reg, 0, avr32_inst_cond4, 8 }, + { "subhh.w", 4, 0xE1F0FFC0, 0xE0000F00, avr32_inst_dsp_hw }, + { "swap.b", 2, 0xFFF00000, 0x5CB00000, avr32_inst_1reg }, + { "swap.bh", 2, 0xFFF00000, 0x5CC00000, avr32_inst_1reg }, + { "swap.h", 2, 0xFFF00000, 0x5CA00000, avr32_inst_1reg }, + { "sync", 4, 0xFFFFFF00, 0xEBB00000, avr32_inst_ss }, + { "tlbr", 2, 0xFFFF0000, 0xD6430000, }, + { "tlbs", 2, 0xFFFF0000, 0xD6530000, }, + { "tlbw", 2, 0xFFFF0000, 0xD6630000, }, + { "tnbz", 2, 0xFFF00000, 0x5CE00000, avr32_inst_1reg }, + { "tst", 2, 0xE1F00000, 0x00700000, avr32_inst_1reg }, + { "xchg", 4, 0xE1F0FFF0, 0xE0000B40, avr32_inst_3reg }, + { NULL } +}; db_addr_t db_disasm(db_addr_t loc, boolean_t altfmt) { - avr32_impl(); - return (0); + struct avr32_inst_info *walker; + avr32_inst_t inst; + + db_read_bytes(loc, sizeof(avr32_inst_t), (char *)&inst); + + walker = avr32_instructions; + while (walker->name) { + if (walker->mask != 0 && (inst & walker->mask) == walker->opcode) { + goto found; + } + walker++; + } + db_printf("UNKNOWN"); + return (loc + 2); + +found: + db_printf("%s", walker->name); + if (walker->cond != NULL) { + walker->cond(inst, walker->cond_arg); + } + db_printf("\t"); + if (walker->operand != NULL) { + walker->operand(inst, walker->operand_arg); + } + return (loc + walker->size); +} + +static void +avr32_reglist16_output(avr32_inst_t inst) +{ + int i, set, at; + + for (i = set = at = 0; i < 16; i++) { + if (inst & (1 << i)) { + if (!at) { + if (set) { + db_printf(","); + } + db_printf("%s", avr32_reglist16[i]); + set++; + at = 0; + } + at++; + } + else if (at > 1) { + db_printf("-%s", avr32_reglist16[i - 1]); + at = 0; + } + else { + at = 0; + } + } + if (at > 1) { + db_printf("-pc"); + } +} + +/*** Only reg */ +AVR32_INST_FORMAT(avr32_inst_1reg) { + db_printf("%s", EXTRACT_REG(inst, RY)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg) { + char *r1, *r2; + + if (arg & INST_REG_DOUBLE) { + inst &= ~ 0x00010000; + } + + if (arg & INST_REG_FLIP) { + r1 = EXTRACT_REG(inst, RX); + r2 = EXTRACT_REG(inst, RY); + } else { + r1 = EXTRACT_REG(inst, RY); + r2 = EXTRACT_REG(inst, RX); + } + + if (arg & INST_PTR1_DEC) { + db_printf("--"); + } + db_printf("%s", r1); + if (arg & INST_PTR1_INC) { + db_printf("++"); + } + db_printf(", "); + if (arg & INST_PTR2_DEC) { + db_printf("--"); + } + db_printf("%s", r2); + if (arg & INST_PTR2_INC) { + db_printf("++"); + } +} + +AVR32_INST_FORMAT(avr32_inst_2reg_ext) { + db_printf("%s, %s", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RY)); +} + +AVR32_INST_FORMAT(avr32_inst_3reg) { + db_printf("%s, %s, %s", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RX), + EXTRACT_REG(inst, RY)); +} + +/*** Reg + K */ +AVR32_INST_FORMAT(avr32_inst_1reg_k6) { + db_printf("%s, %d", + EXTRACT_REG(inst, RY), + EXTRACT_IMM(inst, 6, 20)); +} +AVR32_INST_FORMAT(avr32_inst_1reg_k16) { + db_printf("%s, %d", + EXTRACT_REG(inst, RY), + EXTRACT(inst, 0x0000FFFF, 0)); +} +AVR32_INST_FORMAT(avr32_inst_2reg_k3) { + db_printf("%s, %s, %d", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x00070000, 16)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_k4) { + db_printf("%s, %s, %d", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x000F0000, 16)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_k5) { + db_printf("%s, %s, %d", + EXTRACT_REG(inst, RY), + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x0000001F, 0)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_2k5) { + db_printf("%s, %s, %d, %d", + EXTRACT_REG(inst, RX), + EXTRACT_REG(inst, RY), + EXTRACT(inst, 0x000003E0, 5), + EXTRACT(inst, 0x0000001F, 0)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_k12_byte) { + db_printf("%s:%s, %s[%d]", + EXTRACT_REG(inst, RY), + EXTRACT_BYTE(inst, PART), + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x00000FFF, 0)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_k12_halfword) { + db_printf("%s:%s, %s[%d]", + EXTRACT_REG(inst, RY), + EXTRACT_HALFWORD(inst, PART), + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x00000FFF, 0) << 1); +} + +AVR32_INST_FORMAT(avr32_inst_3reg_k8) { + db_printf("%s[0x%x] %s:%s %s:%s", + EXTRACT_REG(inst, RD), + EXTRACT(inst, 0x00000FF0, 4) << 2, + EXTRACT_REG(inst, RX), + EXTRACT_HALFWORD(inst, X), + EXTRACT_REG(inst, RY), + EXTRACT_HALFWORD(inst, Y)); +} + +AVR32_INST_FORMAT(avr32_inst_4reg_k2) { + db_printf("%s[%s << %d] %s:%s %s:%s", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RI), + EXTRACT(inst, 0x00000030, 4), + EXTRACT_REG(inst, RX), + EXTRACT_HALFWORD(inst, X), + EXTRACT_REG(inst, RY), + EXTRACT_HALFWORD(inst, Y)); +} + +/*** Reg + imm */ +AVR32_INST_FORMAT(avr32_inst_1reg_imm8) { + db_printf("%s, %d", + EXTRACT_REG(inst, RY), + EXTRACT_IMM(inst, 8, 20)); +} + +AVR32_INST_FORMAT(avr32_inst_1reg_imm8_ext) { + db_printf("%s, %d", + EXTRACT_REG(inst, RY), + EXTRACT_IMM(inst, 8, 0)); +} + +AVR32_INST_FORMAT(avr32_inst_1reg_imm21) { + db_printf("%s, %d", + EXTRACT_REG(inst, RY), + SE( ((inst & 0x1E000000) >> 8) | + ((inst & 0x00100000) >> 4) | + (inst & 0x0000FFFF), 21)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_imm8) { + db_printf("%s, %s, %d", + EXTRACT_REG(inst, RY), + EXTRACT_REG(inst, RX), + EXTRACT_IMM(inst, 8, 0)); +} + +/*** Reg + disp */ +AVR32_INST_FORMAT(avr32_inst_1reg_disp16) { + db_printf("%s[%d]", + EXTRACT_REG(inst, RY), + EXTRACT_IMM(inst, 16, 0)); +} +AVR32_INST_FORMAT(avr32_inst_1reg_disp16s2) { + db_printf("%s[%d]", + EXTRACT_REG(inst, RY), + EXTRACT_IMM(inst, 16, 0) << 2); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp_part_load) { + db_printf("%s, %s[%s:%s << 2]", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RX), + EXTRACT_REG(inst, RY), + EXTRACT_BYTE(inst, XY)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp3_load) { + db_printf("%s, %s[0x%x]", + EXTRACT_REG(inst, RY), + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x00700000, 20) << arg); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp3_store) { + db_printf("%s[0x%x], %s", + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x00700000, 20) << arg, + EXTRACT_REG(inst, RY)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp4_store) { + db_printf("%s[0x%x], %s", + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x00F00000, 20) << arg, + EXTRACT_REG(inst, RY)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp9_load) { + db_printf("%s, %s[0x%x]", + EXTRACT_REG(inst, RY), + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x000001FF, 0) << arg); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp9_store) { + db_printf("%s[0x%x], %s", + EXTRACT_REG(inst, RX), + EXTRACT(inst, 0x000001FF, 0) << arg, + EXTRACT_REG(inst, RY)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp12_load) { + db_printf("%s, %s[%d]", + EXTRACT_REG(inst, RY), + EXTRACT_REG(inst, RX), + EXTRACT_IMM(inst, 12, 0) << arg); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp12_store) { + db_printf("%s[%d], %s", + EXTRACT_REG(inst, RX), + EXTRACT_IMM(inst, 12, 0) << arg, + EXTRACT_REG(inst, RY)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp16_load) { + db_printf("%s, %s[%d]", + EXTRACT_REG(inst, RY), + EXTRACT_REG(inst, RX), + EXTRACT_IMM(inst, 16, 0)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_disp16_store) { + if (arg & INST_REG_DOUBLE) { + inst &= ~0x00010000; + } + + db_printf("%s[%d], %s", + EXTRACT_REG(inst, RX), + EXTRACT_IMM(inst, 16, 0), + EXTRACT_REG(inst, RY)); +} + +AVR32_INST_FORMAT(avr32_inst_2reg_imm16) { + db_printf("%s, %s, %d", + EXTRACT_REG(inst, RY), + EXTRACT_REG(inst, RX), + EXTRACT_IMM(inst, 16, 0)); +} + + +/*** Reg + shift */ +AVR32_INST_FORMAT(avr32_inst_3reg_2shift) { + char *dir; + + if (arg & INST_SHIFT_LEFT) { + dir = "<<"; + } else { + dir = ">>"; + } + + db_printf("%s, %s, %s %s %d", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RX), + EXTRACT_REG(inst, RY), + dir, + EXTRACT(inst, 0x0000030, 4)); +} + +AVR32_INST_FORMAT(avr32_inst_3reg_disp_2shift_load) { + db_printf("%s, %s[%s << %d]", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RX), + EXTRACT_REG(inst, RY), + EXTRACT(inst, 0x0000030, 4)); +} + +AVR32_INST_FORMAT(avr32_inst_3reg_disp_2shift_store) { + if (arg & INST_REG_DOUBLE) { + inst &= ~0x00010000; + } + + db_printf("%s[%s << %d], %s", + EXTRACT_REG(inst, RX), + EXTRACT_REG(inst, RY), + EXTRACT(inst, 0x0000030, 4), + EXTRACT_REG(inst, RD)); +} + +AVR32_INST_FORMAT(avr32_inst_3reg_5shift) { + char *dir; + + if (arg & INST_SHIFT_LEFT) { + dir = "<<"; + } else { + dir = ">>"; + } + + db_printf("%s, %s, %s %s %d", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RX), + EXTRACT_REG(inst, RY), + dir, + EXTRACT(inst, 0x000001F0, 4)); +} + +/*** Reg + bit */ +AVR32_INST_FORMAT(avr32_inst_1reg_5bit) { + db_printf("%s, %d", + EXTRACT_REG(inst, RY), + ((inst >> 24) & 0x1E) | ((inst >> 20) & 0x01)); +} + +AVR32_INST_FORMAT(avr32_inst_1reg_5bite) { + db_printf("%s, %d", + EXTRACT_REG(inst, RY), + EXTRACT(inst, 0x0000001F, 0)); +} + +/*** DSP */ +AVR32_INST_FORMAT(avr32_inst_dsp_hw) { + db_printf("%s, %s:%s, %s:%s", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RX), + EXTRACT_HALFWORD(inst, X), + EXTRACT_REG(inst, RY), + EXTRACT_HALFWORD(inst, Y)); +} + +AVR32_INST_FORMAT(avr32_inst_dsp_w) { + db_printf("%s, %s, %s:%s", + EXTRACT_REG(inst, RD), + EXTRACT_REG(inst, RX), + EXTRACT_REG(inst, RY), + EXTRACT_HALFWORD(inst, Y)); +} + +/*** Only Imm, K or disp */ +AVR32_INST_FORMAT(avr32_inst_imm3) { + db_printf("%d", EXTRACT_IMM(inst, 3, 20)); +} + +AVR32_INST_FORMAT(avr32_inst_disp8) { + db_printf("%d", EXTRACT_IMM(inst, 8, 20) << 1); +} + +AVR32_INST_FORMAT(avr32_inst_disp10) { + db_printf("%d",SE( + ((inst & 0x0FF00000) >> 20) | + ((inst & 0x00030000) >> 8), 10) << 1); +} + +AVR32_INST_FORMAT(avr32_inst_disp21) { + db_printf("%d", + SE(((inst & 0x1E000000) >> 8) | + ((inst & 0x00100000) >> 4) | + (inst & 0x0000FFFF), 21) << 1); +} + +AVR32_INST_FORMAT(avr32_inst_k8) { + db_printf("0x%x", EXTRACT(inst, 0x0FF00000, 20) << 2); +} + +AVR32_INST_FORMAT(avr32_inst_k21) { + db_printf("0x%x", + ((inst & 0x1E000000) >> 8) | + ((inst & 0x00100000) >> 4) | + (inst & 0x0000FFFF)); +} + +/*** Co-Processor ops */ +AVR32_INST_FORMAT(avr32_inst_co_op) { + db_printf("cp%d, cr%d, cr%d, cr%d, 0x%x", + EXTRACT_CP(inst), + EXTRACT_CR(inst, CRD), + EXTRACT_CR(inst, CRX), + EXTRACT_CR(inst, CRY), + (inst & 0x06000000) >> 20 | + (inst & 0x000F0000) >> 15 | + (inst & 0x00001000) >> 12); +} + +AVR32_INST_FORMAT(avr32_inst_co0_load) { + db_printf("cr%d, %s[0x%x]", + EXTRACT_CR(inst, CRD), + EXTRACT_REG(inst, RY), + ((inst & 0x0000F000) >> 12 | (inst & 0x000000FF)) << 2); +} + +AVR32_INST_FORMAT(avr32_inst_co0_store) { + db_printf("%s[0x%x], cr%d", + EXTRACT_REG(inst, RY), + ((inst & 0x0000F000) >> 12 | (inst & 0x000000FF)) << 2, + EXTRACT_CR(inst, CRD)); +} + +AVR32_INST_FORMAT(avr32_inst_co_to_reg) { + db_printf("cp%d, %s, cr%d", + EXTRACT_CP(inst), + EXTRACT_REG(inst, RY), + EXTRACT_CR(inst, CRD)); +} + +AVR32_INST_FORMAT(avr32_inst_reg_to_co) { + db_printf("cp%d, cr%d, %s", + EXTRACT_CP(inst), + EXTRACT_CR(inst, CRD), + EXTRACT_REG(inst, RY)); +} + +AVR32_INST_FORMAT(avr32_inst_co_load) { + db_printf("cp%d, cr%d, --%s", + EXTRACT_CP(inst), + EXTRACT_CR(inst, CRD), + EXTRACT_REG(inst, RY)); +} + +AVR32_INST_FORMAT(avr32_inst_co_store) { + db_printf("cp%d, %s++, cr%d", + EXTRACT_CP(inst), + EXTRACT_REG(inst, RY), + EXTRACT_CR(inst, CRD)); +} + +AVR32_INST_FORMAT(avr32_inst_co_disp_2shift_load) { + db_printf("cp%d, cr%d, %s[%s << %d]", + EXTRACT_CP(inst), + EXTRACT_CR(inst, CRD), + EXTRACT_REG(inst, RY), + EXTRACT_REG(inst, RD), + EXTRACT(inst, 0x00000030, 4)); +} + +AVR32_INST_FORMAT(avr32_inst_co_disp_2shift_store) { + db_printf("cp%d, %s[%s << %d], cr%d", + EXTRACT_CP(inst), + EXTRACT_REG(inst, RY), + EXTRACT_REG(inst, RD), + EXTRACT(inst, 0x00000030, 4), + EXTRACT_CR(inst, CRD)); +} + +AVR32_INST_FORMAT(avr32_inst_co_disp8_load) { + db_printf("cp%d, cr%d, %s[0x%x]", + EXTRACT_CP(inst), + EXTRACT_CR(inst, CRD), + EXTRACT_REG(inst, RY), + EXTRACT(inst, 0x000000FF, 0) << 2); + +} + +AVR32_INST_FORMAT(avr32_inst_co_disp8_store) { + db_printf("cp%d, %s[0x%x], cr%d", + EXTRACT_CP(inst), + EXTRACT_REG(inst, RY), + EXTRACT(inst, 0x000000FF, 0) << 2, + EXTRACT_CR(inst, CRD)); +} + +AVR32_INST_FORMAT(avr32_inst_co_load_many) { + char **list = (char **)arg; + int i, set; + + db_printf("cp%d, %s%s, ", + EXTRACT_CP(inst), + EXTRACT_REG(inst, RY), + (inst & 0x00001000) ? "++" : ""); + + for (i = set = 0; i < 8; i++) { + if (inst & (1 << i)) { + if (set) { + db_printf(","); + } + db_printf("%s", list[i]); + set = 1; + } + } +} + +AVR32_INST_FORMAT(avr32_inst_co_store_many) { + char **list = (char **)arg; + int i, set; + + db_printf("cp%d, %s%s, ", + EXTRACT_CP(inst), + (inst & 0x00001000) ? "--" : "", + EXTRACT_REG(inst, RY)); + + for (i = set = 0; i < 8; i++) { + if (inst & (1 << i)) { + if (set) { + db_printf(","); + } + db_printf("%s", list[i]); + set = 1; + } + } +} + +/*** Other */ +AVR32_INST_FORMAT(avr32_inst_sreg) { + db_printf("%d", EXTRACT(inst, 0x01F00000, 20)); +} + +AVR32_INST_FORMAT(avr32_inst_st_reg) { + db_printf("%s, 0x%x", >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 23 16:30:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E98AE1065672; Mon, 23 Feb 2009 16:30: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 8E125106564A for ; Mon, 23 Feb 2009 16:30:21 +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 7B9E68FC19 for ; Mon, 23 Feb 2009 16:30:21 +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 n1NGULAb069018 for ; Mon, 23 Feb 2009 16:30:21 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NGULKC069016 for perforce@freebsd.org; Mon, 23 Feb 2009 16:30:21 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 23 Feb 2009 16:30:21 GMT Message-Id: <200902231630.n1NGULKC069016@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 158122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 16:30:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=158122 Change 158122 by pgj@beehive on 2009/02/23 16:29:30 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#21 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#6 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/avg.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/brd.key#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/marck.key#2 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/mva.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#15 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#15 integrate .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#7 integrate .. //depot/projects/docproj_hu/www/en/cgi/cgi-style.pl#3 integrate .. //depot/projects/docproj_hu/www/en/copyright/freebsd-doc-license.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/copyright/freebsd-license.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#17 integrate .. //depot/projects/docproj_hu/www/en/docproj/translations.sgml#6 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#13 integrate .. //depot/projects/docproj_hu/www/en/platforms/ppc.sgml#3 integrate .. //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#12 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#9 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#13 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#38 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.oldnewsflash.xsl#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/templates.oldpress.xsl#3 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#21 (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.469 2009/01/30 22:09:36 jamie Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.471 2009/02/19 22:04:29 mva Exp $ --> aaron@FreeBSD.org"> @@ -94,6 +94,8 @@ avatar@FreeBSD.org"> +avg@FreeBSD.org"> + awebster@pubnix.net"> az@FreeBSD.org"> @@ -748,6 +750,8 @@ mux@FreeBSD.org"> +mva@FreeBSD.org"> + mwlucas@FreeBSD.org"> naddy@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#6 (text+ko) ==== @@ -1,5 +1,5 @@ + uid Brad Davis -uid Brad Davis -sub 2048g/1F29D404 2005-05-14 [expires: 2007-05-14] +sub 2048g/1F29D404 2005-05-14 [expires: 2014-02-21] ]]> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/marck.key#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -49,25 +49,40 @@ CSYSliA69FbO91G6e0uIRgQQEQIABgUCQ6Z5cwAKCRBEidDtZ5uBGa29AJ47BnH1 jsRMs1Az3/qXw+OID0GdIwCbBgpLoBudHg4tZ9v2mnPel8huOFOIRgQQEQIABgUC RJMPyAAKCRCpF+nMmW4UXgVsAJ48LTkwJc7H59xQE6xCH38czbBHrQCfXirFC4WS -rbLTvdyenUWrlQh5Hse0JURtaXRyeSBNb3Jvem92c2t5IDxtYXJja0BGcmVlQlNE -Lm9yZz6IXgQTEQIAHgUCQRh3SwIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCF -1FBFa2kbAxEQAJ9p3vcTJCOwssNVA//wiyUximGelgCggaS4vscpI4GjDjz/5MAb -pZdk7kGIRgQQEQIABgUCQzlXOAAKCRDs8OkLLBcgg/fwAJ9sGQoHHykSPO9rFmiF -fspjyPgLmACffJ3+Z4wJXNKlmY6D3fqVTB4vkHKIRgQSEQIABgUCQ6G3KQAKCRCF -t2wt19VfGhdOAKC2gfth4x25oDhO5YKZuJRwTRIgUQCgnXHO5/rWDoYeKDxRsWze -zczDh4WIRgQQEQIABgUCQ6MnOgAKCRBNyUvYtx9gXX9kAKCR06Nt1BSKyMd07wSl -sWc4mq+N3ACdGLm3hFxWV5NhgjJyE/VRVPUAseyIRgQQEQIABgUCQ6O8OQAKCRCv -ItzveM4QX35KAJ4jsBq83Vo1/brrQn6h8njUoSe7PACdGW13bPB3zu7QEyL3Ur/K -86q8IsuIRgQQEQIABgUCQ6PrYgAKCRBd5Nf+GUncgAPQAJ9l3qLexbzF4JMoxoEo -flkuHwXpCQCbBK6bS0nJnmfoNGXDpRRo8qAEFSWIRgQQEQIABgUCQ6M/3QAKCRBC -sZN8yFUPTBYeAKCf1oHL86oyiPTxopWjzQY0G2v9oQCcCd5tbZrhAuo87Q2G7sS1 -ALHyUPuIRgQQEQIABgUCQ5xbHgAKCRDGBDxWcgdxNxpLAJwMZnLXTD2xOMaUbEWF -dfl0/YFUUwCfSAtJPGN9T5cP5Zy7cWvlNqt3UHqIRgQQEQIABgUCQ5xg5gAKCRB5 -4pxgsAY/54NzAKCsNx3hhz2XmW99A2dGRQPLx/v2LQCdENVtUKrjb61O8spFe6uR -QQ0CFvSIRgQQEQIABgUCQ6Z5dgAKCRBEidDtZ5uBGYTwAJ4vw7oifyiZ8Y2AgZhV -Z+kVTIf2IACcC1REuI07XJzwO9yiIZOsk+dvLOaIRgQQEQIABgUCRJMPzgAKCRCp -F+nMmW4UXkIhAJsG3I2+u3s9FxBlcS2swNLS3aPqeACfSOHu7LH2vZhZ83h4ctGr -Rq8tmoG5Ag0EO1hObhAIANX5TO/cDWaKqIaSRz4NyjTpHgtIDQpzT8D94KOnRmaP +rbLTvdyenUWrlQh5HseIRgQTEQIABgUCRJjuWgAKCRCZIuOb12P/ohUuAKCYHNqv +3IllO6KH2p2YVKyJE4ck0wCbBpPj4fmsWK60C7E8LS3Ao0wZOFWIRgQQEQIABgUC +RKMAZwAKCRBsA3Jjrf1cmtk8AKCV0MXR0SdAe24yKM4NASCB+OspkACfTZYJUESS +IMgzDbf2znuR5zrRZF2IRgQQEQIABgUCR5ZXewAKCRC3jomRJHtd3XmJAJ9SCvz7 +oY1sF5XePs7jBtc8HuQ5RwCgpfpzfsH9F16M41eM3DAPWbLpM8+IRgQQEQIABgUC +R5ZYAAAKCRBZxqJbrEANAufLAJ4lqSYjzrYabYUEG19D+B6ZlP3doACfVnkEb3T+ +bIJNiPP9e0HXQ9gdo9iIRgQQEQIABgUCSHJXhAAKCRA96g22+4pu9M5rAJ96Flw/ +ggrRWZH08gtU+yb8ObzHxQCcCDAzVaAJtOA9RG3TRXoHBDy4Ua+0JURtaXRyeSBN +b3Jvem92c2t5IDxtYXJja0BGcmVlQlNELm9yZz6IXgQTEQIAHgUCQRh3SwIbAwYL +CQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCF1FBFa2kbAxEQAJ9p3vcTJCOwssNVA//w +iyUximGelgCggaS4vscpI4GjDjz/5MAbpZdk7kGIRgQQEQIABgUCQzlXOAAKCRDs +8OkLLBcgg/fwAJ9sGQoHHykSPO9rFmiFfspjyPgLmACffJ3+Z4wJXNKlmY6D3fqV +TB4vkHKIRgQSEQIABgUCQ6G3KQAKCRCFt2wt19VfGhdOAKC2gfth4x25oDhO5YKZ +uJRwTRIgUQCgnXHO5/rWDoYeKDxRsWzezczDh4WIRgQQEQIABgUCQ6MnOgAKCRBN +yUvYtx9gXX9kAKCR06Nt1BSKyMd07wSlsWc4mq+N3ACdGLm3hFxWV5NhgjJyE/VR +VPUAseyIRgQQEQIABgUCQ6O8OQAKCRCvItzveM4QX35KAJ4jsBq83Vo1/brrQn6h +8njUoSe7PACdGW13bPB3zu7QEyL3Ur/K86q8IsuIRgQQEQIABgUCQ6PrYgAKCRBd +5Nf+GUncgAPQAJ9l3qLexbzF4JMoxoEoflkuHwXpCQCbBK6bS0nJnmfoNGXDpRRo +8qAEFSWIRgQQEQIABgUCQ6M/3QAKCRBCsZN8yFUPTBYeAKCf1oHL86oyiPTxopWj +zQY0G2v9oQCcCd5tbZrhAuo87Q2G7sS1ALHyUPuIRgQQEQIABgUCQ5xbHgAKCRDG +BDxWcgdxNxpLAJwMZnLXTD2xOMaUbEWFdfl0/YFUUwCfSAtJPGN9T5cP5Zy7cWvl +Nqt3UHqIRgQQEQIABgUCQ5xg5gAKCRB54pxgsAY/54NzAKCsNx3hhz2XmW99A2dG +RQPLx/v2LQCdENVtUKrjb61O8spFe6uRQQ0CFvSIRgQQEQIABgUCQ6Z5dgAKCRBE +idDtZ5uBGYTwAJ4vw7oifyiZ8Y2AgZhVZ+kVTIf2IACcC1REuI07XJzwO9yiIZOs +k+dvLOaIRgQQEQIABgUCRJMPzgAKCRCpF+nMmW4UXkIhAJsG3I2+u3s9FxBlcS2s +wNLS3aPqeACfSOHu7LH2vZhZ83h4ctGrRq8tmoGIRgQTEQIABgUCRJjuXwAKCRCZ +IuOb12P/ol4FAJ9FaVLCtB/NmZwWjVT6ueGbpcsYIACfZe3LGC1iPQ7NvD8RNzGE +RN0NiMaIRgQQEQIABgUCRKMAcwAKCRBsA3Jjrf1cmnAjAJ48nosDD382QDoL9tYM +fiiNMsZIxgCcCoFh8aox6DYdM4dvu2TZgDZKQ7iIRgQQEQIABgUCR5ZXewAKCRC3 +jomRJHtd3QxeAJ0Q14bA+TDYg055FVCpskOYUVo4HgCfXvGbQz1RzSxF7qsbCTvG +x4EQJ+mIRgQQEQIABgUCR5ZYAgAKCRBZxqJbrEANAhg6AJ4nm2EzjE/SDAh4H+LF ++BKMOw2xGwCeOWOm7pr3bShpwsVtE8Os3NimZ/iIRgQQEQIABgUCSHJXhAAKCRA9 +6g22+4pu9KAzAJ0cfSUFB4HhdLve85oDa3m94RcPjACdGs+PIT5+jAX1O7Te/g7t +wu/j4kS5Ag0EO1hObhAIANX5TO/cDWaKqIaSRz4NyjTpHgtIDQpzT8D94KOnRmaP 0B46pcNxP62+zRXIP3iHFKTGits2EoGqsw/2Y+S4RxtL/669ykxb4W7TtBwHG9mX EsgoiEol5eylKhNHOe2ZUwm5BIq3PTPywueehMMB7A4cqg+k+PDLyibzz6lvYKrp oVvaXezfX8k6vOmiRIWyazhEG3KOjiS3fnzI+qYXHUiiWjGx/CM+DcBzcuvebW5e @@ -80,6 +95,6 @@ 0ETdYPy/t6AfbJ+avbIbH8rJUd6ifblrKUqGyrc+gJ5435T3YowGVGpVVRZQyyfg uRP+CIOIRgQYEQIABgUCO1hObgAKCRCF1FBFa2kbA5t6AJ9B0laWrFnyRvVGo/NV QHmv6xkKhwCbBo5yKzSSgAUpfzjAw5PKW481T6g= -=Zfaq +=nJcP -----END PGP PUBLIC KEY BLOCK----- ]]> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#15 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -376,6 +376,11 @@ &pgpkey.billf; + + &a.avg; + &pgpkey.avg; + + &a.beat; &pgpkey.beat; @@ -1401,3 +1406,8 @@ &pgpkey.sson; + + &a.mva; + &pgpkey.mva; + + ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#15 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -22,6 +22,7 @@ + @@ -194,6 +195,7 @@ + ==== //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#7 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.77 2009/01/29 14:20:25 pav Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.78 2009/02/23 12:27:32 pgj Exp $ @@ -850,7 +850,7 @@ cvsup.hu.FreeBSD.org - janos.mohacsi@bsd.hu + hostmaster@hu.FreeBSD.org ==== //depot/projects/docproj_hu/www/en/cgi/cgi-style.pl#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.37 2008/09/21 10:24:01 wosch Exp $ +# $FreeBSD: www/en/cgi/cgi-style.pl,v 1.38 2009/02/14 21:14:27 miwi Exp $ # # Perl routines to encapsulate various elements of HTML page style. @@ -188,7 +188,7 @@ return qq` ==== //depot/projects/docproj_hu/www/en/copyright/freebsd-doc-license.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

Copyright 1994-2008 +

Copyright 1994-2009 The FreeBSD Project. All rights reserved.

==== //depot/projects/docproj_hu/www/en/copyright/freebsd-license.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

Copyright 1994-2008 +

Copyright 1994-2009 The FreeBSD Project. All rights reserved.

==== //depot/projects/docproj_hu/www/en/developers.sgml#17 (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.211 2009/01/30 22:09:36 jamie Exp $ +$FreeBSD: www/en/developers.sgml,v 1.213 2009/02/19 22:11:01 mva Exp $ --> @@ -50,6 +50,7 @@ + @@ -375,6 +376,7 @@ + ==== //depot/projects/docproj_hu/www/en/docproj/translations.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -210,6 +210,7 @@
Documents available
Web, + developers-handbook, FAQ, FDP Primer, Handbook, @@ -218,7 +219,6 @@
Documents currently being worked on
- developers-handbook, arch-handbook.
==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#13 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2547,6 +2547,12 @@ Received + + Colin Jensen + 4.4BSD Manuals from O'Reilly + marcel + Received + &footer; ==== //depot/projects/docproj_hu/www/en/platforms/ppc.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -167,30 +167,11 @@
  • No AltiVec support yet.
  • G5 CPUs are unsupported.
    • -
  • SMP is not yet supported.
    • -
  • On-board BMAC+ ethernet does not work. There is a work-in-progress - bm(4) driver available on Peter Grehan's personal page - here (see if_bm.c and - if_bmreg.h).
    • -
  • There is no graphical mouse cursor on console.
    • +
  • SMP is available only in -CURRENT.
  • Fdisk does not work.
    • -
  • Only USB keyboards are supported.
    • -
  • If you have Bluetooth, there is a 'fake' OHCI port and devices - created that can be used to access a wireless keyboard or mouse. - Problem is, it gets probed before the fixed keyboard/mouse and is - first in line to syscons. To get around this, the PCI slot associated - with the problematic ohci2 can be disabled at the loader prompt: - 
    OK set hint.pcib.1.skipslot=26
    • -
  • For ATI Radeon-based machines: -
      -
    • A ofw syscons range check needs to be relaxed using the sysctl - hw.ofwfb.relax_mmap.
      • -
    • A special radeon - driver - is needed. You must add the following your xorg.conf into the - Section "Device": 
      Option "iBookHacks" "on"
      • -
    -
    • +
  • ADB keyboards (as in Apple laptops) are supported only in -CURRENT
    • +
  • For ATI Radeon-based machines, a ofw syscons range check needs to be + relaxed using the sysctl hw.ofwfb.relax_mmap.
  • There is a known bug in the boot-loader, that prevents you from loading an alternate kernel, so testing your kernel is a bit risky. When booting the loader from the Open Firmware prompt, give it a ==== //depot/projects/docproj_hu/www/hu/community/mailinglists.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ - + ]> ==== //depot/projects/docproj_hu/www/share/sgml/advisories.xml#9 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.226 2009/01/13 22:36:03 simon Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.227 2009/02/16 22:04:13 cperciva Exp $ @@ -10,6 +10,18 @@ 2009 + 2 + + + 16 + + + FreeBSD-SA-09:05.telnetd + + + + + 1 ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#13 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.67 2009/01/24 19:07:08 danger Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.68 2009/02/22 02:10:57 jkoshy Exp $ @@ -113,6 +113,33 @@ from commercial vendors. + + BSDday Argentina 2009 + http://www.bsdday.com.ar/ + + 2009 + 5 + 29 + + + 2009 + 5 + 30 + + + Argentina + Buenos Aires + + + BSDday Argentina is a conference for users and developers + on BSD based systems. The conference is for anyone developing, + deploying and using systems based on FreeBSD, NetBSD, OpenBSD, + DragonFlyBSD and others *BSD. BSDday Argentina is a technical conference + and aims to collect the best technical papers and presentations available + to ensure that the latest developments in our open source community are + shared with the widest possible audience. + + FreeBSD Kernel Internals: Intensive Evening Course http://www.mckusick.com/courses/adveveclass.html ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#38 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.224 2009/02/11 17:15:28 pgj Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.228 2009/02/19 22:15:41 miwi Exp $ @@ -33,6 +33,43 @@ 2009 + 2 + + + 19 + + +

    New committer: Marcus von + Appen (ports)

    +     +     + + + 18 + + +

    New committer: Andriy Gapon + (src)

    +     +     + + + 14 + + + KDE 4.2.0 available for FreeBSD + +

    KDE 4.2.0 has been merged into the ports tree. For a + detailed list of improvements, please refer to the + + announcement. For general information about KDE on + FreeBSD, please see the + KDE on FreeBSD project page.

    +     +     +     + + 1 ==== //depot/projects/docproj_hu/www/share/sgml/templates.oldnewsflash.xsl#3 (text+ko) ==== @@ -6,7 +6,7 @@ ]> - + @@ -64,6 +64,7 @@

    Other project news: + 2008, 2007, 2006, 2005, ==== //depot/projects/docproj_hu/www/share/sgml/templates.oldpress.xsl#3 (text+ko) ==== @@ -6,7 +6,7 @@ ]> - + @@ -47,6 +47,7 @@

    Other press publications: + 2008, 2007, 2006, 2005, From owner-p4-projects@FreeBSD.ORG Mon Feb 23 16:49:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDFB3106566C; Mon, 23 Feb 2009 16:49: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 7C4E21065729 for ; Mon, 23 Feb 2009 16:49:44 +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 5C4758FC0C for ; Mon, 23 Feb 2009 16:49:44 +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 n1NGni6i080231 for ; Mon, 23 Feb 2009 16:49:44 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NGniRc080229 for perforce@freebsd.org; Mon, 23 Feb 2009 16:49:44 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 23 Feb 2009 16:49:44 GMT Message-Id: <200902231649.n1NGniRc080229@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 158124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 16:49:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=158124 Change 158124 by pgj@beehive on 2009/02/23 16:49:11 MFen (doc): 1.69 -> 1.70 hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml 1.127 -> 1.128 hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#12 edit .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#10 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/boot/chapter.sgml#12 (text+ko) ==== @@ -7,7 +7,7 @@ The FreeBSD Hungarian Documentation Project Translated by: PALI, Gabor %SOURCE% en_US.ISO8859-1/books/handbook/boot/chapter.sgml - %SRCID% 1.69 + %SRCID% 1.70 --> @@ -894,7 +894,8 @@ rendszerbetöltõ képernyõ használata során is meg fog jelenni. - A + A http://artwork.freebsdgr.org címen találhatunk néhány ilyen betöltõképernyõt. A sysutils/bsd-splash-changer port ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/l10n/chapter.sgml#10 (text+ko) ==== @@ -6,7 +6,7 @@ @@ -1186,21 +1186,24 @@ XkbDisable ki van kapcsolva (ki van kommentezve) ebben a szakaszban. - A grp:caps_toggle + A grp:toggle beállítás esetén az orosz/latin (RUS/LAT) átkapcsolás gombja a jobb Alt lesz, míg a grp:ctrl_shift_toggle beállításnál a CtrlShift. - A megszokott CapsLock funkció - továbbra is elréhetõ a grp:caps_toggle esetén az + orosz/latin váltás a + CapsLock billentyûvel + történik. Ilyenkor (de csak latin + módban) a megszokott CapsLock + funkció továbbra is elérhetõ a + ShiftCapsLock - kombinációval (csak latin módban). A - grp:toggle esetén az orosz/latin - átkapcsolás gombja a jobb - Alt lesz. A grp:caps_toggle - valamiért nem mûködik az + kombinációval. A + grp:caps_toggle valamiért nem + mûködik az &xorg;ban. Ha van &windows; billentyûnk a From owner-p4-projects@FreeBSD.ORG Mon Feb 23 16:49:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D463D106573C; Mon, 23 Feb 2009 16:49: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 9D58C106572A for ; Mon, 23 Feb 2009 16:49:44 +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 7DD3C8FC13 for ; Mon, 23 Feb 2009 16:49:44 +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 n1NGniuw080236 for ; Mon, 23 Feb 2009 16:49:44 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NGniLJ080234 for perforce@freebsd.org; Mon, 23 Feb 2009 16:49:44 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 23 Feb 2009 16:49:44 GMT Message-Id: <200902231649.n1NGniLJ080234@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 158125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 16:49:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=158125 Change 158125 by pgj@beehive on 2009/02/23 16:49:37 MFen (www): 1.21 -> 1.22 hu/platforms/ppc.sgml Affected files ... .. //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#11 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/platforms/ppc.sgml#11 (text+ko) ==== @@ -10,7 +10,7 @@ @@ -185,43 +185,17 @@

    • Nincs AltiVec támogatás.
    • A G5 processzorokat nem támogatjuk.
      • -
    • Nincs SMP támogatás.
      • -
    • Az alaplapi BMAC+ Ethernet nem mûködik. &a.grehan; - személyes oldalán - van egy fejlesztés alatt álló bm(4) - meghajtó (keressük meg az if_bm.c és if_bmreg.h - állományokat).
      • -
    • Nincs grafikus egérkurzor a konzol alatt.
      • +
    • Az SMP támogatása egyelõre csak a -CURRENT + ágban érhetõ el.
    • Az fdisk nem mûködik.
      • -
    • Csak USB billentyûzet támogatott.
      • -
    • Bluetooth esetén feltûnik egy 'hamis' OHCI port - és a vezet@eacute;knélküli billentyûzet - vagy egér eléréséhez - szükséges eszközök létrejönnek. - A probléma az, hogy ezek a normál - billentyûzet/egér elõtt - aktiválódnak és a syscons-ban elsõ - helyre kerülnek. Ennek - kiküszöböléséhez a - problémás ohci2 port letiltható a - rendszertöltõ parancssorában: - 
      OK set hint.pcib.1.skipslot=26
      • -
    • Az ATI Radeon alapú - számítógépek esetén: -
        -
      • Az ofw syscons tartomány - ellenõrzését relaxed-re kell - állítani az hw.ofwfb.relax_mmap sysctl - segítségével.
        • -
      • Egy speciális Radeon meghajtó - szükséges. A következõt kell - hozzáadnunk az xorg.conf fájl Section "Device" - részéhez: - 
        Option "iBookHacks" "on"
        • -
      -
      • +
    • Az ADB billentyûzetek (hasonlóan az Apple + laptopokéhoz) jelenleg csak a -CURRENT ágban + támogatottak.
      • +
    • Az ATI kártyás gépek esetén vissza + kell fogni az ofw syscons mûködéséhez + kötõdõ ellenõrzéseket a + hw.ofwfb.relax_mmap sysctl változó + segítségével.
    • A rendszertöltõben van egy olyan hiba, amely megakadályozza abban, hogy betöltsön egy alternatív rendszermagot, így a rendszermag From owner-p4-projects@FreeBSD.ORG Mon Feb 23 18:47:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 031E010659DF; Mon, 23 Feb 2009 18:47: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 9137F10659C3 for ; Mon, 23 Feb 2009 18:47:04 +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 7B7A68FC1B for ; Mon, 23 Feb 2009 18:47:04 +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 n1NIl42l096953 for ; Mon, 23 Feb 2009 18:47:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NIl4Zw096951 for perforce@freebsd.org; Mon, 23 Feb 2009 18:47:04 GMT (envelope-from jhb@freebsd.org) Date: Mon, 23 Feb 2009 18:47:04 GMT Message-Id: <200902231847.n1NIl4Zw096951@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 158136 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 18:47:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=158136 Change 158136 by jhb@jhb_jhbbsd on 2009/02/23 18:46:27 IFC @158130 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/local_apic.c#39 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#88 integrate .. //depot/projects/smpng/sys/boot/Makefile.inc#2 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#26 integrate .. //depot/projects/smpng/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/ia64/efi/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/ia64/ski/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#20 integrate .. //depot/projects/smpng/sys/boot/powerpc/ofw/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#19 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#41 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#9 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#47 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#47 integrate .. //depot/projects/smpng/sys/conf/kern.mk#22 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#64 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#20 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#50 integrate .. //depot/projects/smpng/sys/dev/aac/aacreg.h#21 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#94 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#60 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#70 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#62 integrate .. //depot/projects/smpng/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#70 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#39 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#5 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#5 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#51 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#10 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#6 integrate .. //depot/projects/smpng/sys/dev/md/md.c#87 integrate .. //depot/projects/smpng/sys/dev/usb/FILES#7 delete .. //depot/projects/smpng/sys/dev/usb/dsbr100io.h#4 delete .. //depot/projects/smpng/sys/dev/usb/ehci.c#37 delete .. //depot/projects/smpng/sys/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/smpng/sys/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/smpng/sys/dev/usb/ehci_mbus.c#3 delete .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#30 delete .. //depot/projects/smpng/sys/dev/usb/ehcireg.h#12 delete .. //depot/projects/smpng/sys/dev/usb/ehcivar.h#18 delete .. //depot/projects/smpng/sys/dev/usb/hid.c#14 delete .. //depot/projects/smpng/sys/dev/usb/hid.h#5 delete .. //depot/projects/smpng/sys/dev/usb/if_aue.c#53 delete .. //depot/projects/smpng/sys/dev/usb/if_auereg.h#15 delete .. //depot/projects/smpng/sys/dev/usb/if_axe.c#35 delete .. //depot/projects/smpng/sys/dev/usb/if_axereg.h#11 delete .. //depot/projects/smpng/sys/dev/usb/if_cdce.c#11 delete .. //depot/projects/smpng/sys/dev/usb/if_cdcereg.h#6 delete .. //depot/projects/smpng/sys/dev/usb/if_cue.c#35 delete .. //depot/projects/smpng/sys/dev/usb/if_cuereg.h#11 delete .. //depot/projects/smpng/sys/dev/usb/if_kue.c#32 delete .. //depot/projects/smpng/sys/dev/usb/if_kuereg.h#12 delete .. //depot/projects/smpng/sys/dev/usb/if_rue.c#23 delete .. //depot/projects/smpng/sys/dev/usb/if_ruereg.h#8 delete .. //depot/projects/smpng/sys/dev/usb/if_rum.c#9 delete .. //depot/projects/smpng/sys/dev/usb/if_rumreg.h#3 delete .. //depot/projects/smpng/sys/dev/usb/if_rumvar.h#4 delete .. //depot/projects/smpng/sys/dev/usb/if_udav.c#22 delete .. //depot/projects/smpng/sys/dev/usb/if_udavreg.h#8 delete .. //depot/projects/smpng/sys/dev/usb/if_upgt.c#3 delete .. //depot/projects/smpng/sys/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/smpng/sys/dev/usb/if_ural.c#30 delete .. //depot/projects/smpng/sys/dev/usb/if_uralreg.h#5 delete .. //depot/projects/smpng/sys/dev/usb/if_uralvar.h#10 delete .. //depot/projects/smpng/sys/dev/usb/if_urtw.c#3 delete .. //depot/projects/smpng/sys/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/smpng/sys/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/smpng/sys/dev/usb/if_zyd.c#10 delete .. //depot/projects/smpng/sys/dev/usb/if_zydfw.h#2 delete .. //depot/projects/smpng/sys/dev/usb/if_zydreg.h#5 delete .. //depot/projects/smpng/sys/dev/usb/kue_fw.h#4 delete .. //depot/projects/smpng/sys/dev/usb/ohci.c#48 delete .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#23 delete .. //depot/projects/smpng/sys/dev/usb/ohcireg.h#9 delete .. //depot/projects/smpng/sys/dev/usb/ohcivar.h#19 delete .. //depot/projects/smpng/sys/dev/usb/rio500_usb.h#5 delete .. //depot/projects/smpng/sys/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/smpng/sys/dev/usb/sl811hs.c#7 delete .. //depot/projects/smpng/sys/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/smpng/sys/dev/usb/sl811hsvar.h#5 delete .. //depot/projects/smpng/sys/dev/usb/slhci_pccard.c#6 delete .. //depot/projects/smpng/sys/dev/usb/u3g.c#7 delete .. //depot/projects/smpng/sys/dev/usb/uark.c#5 delete .. //depot/projects/smpng/sys/dev/usb/ubsa.c#28 delete .. //depot/projects/smpng/sys/dev/usb/ubser.c#15 delete .. //depot/projects/smpng/sys/dev/usb/ubser.h#4 delete .. //depot/projects/smpng/sys/dev/usb/uchcom.c#2 delete .. //depot/projects/smpng/sys/dev/usb/ucom.c#35 delete .. //depot/projects/smpng/sys/dev/usb/ucomvar.h#15 delete .. //depot/projects/smpng/sys/dev/usb/ucycom.c#5 delete .. //depot/projects/smpng/sys/dev/usb/udbp.c#18 delete .. //depot/projects/smpng/sys/dev/usb/udbp.h#5 delete .. //depot/projects/smpng/sys/dev/usb/ufm.c#18 delete .. //depot/projects/smpng/sys/dev/usb/ufoma.c#8 delete .. //depot/projects/smpng/sys/dev/usb/uftdi.c#25 delete .. //depot/projects/smpng/sys/dev/usb/uftdireg.h#4 delete .. //depot/projects/smpng/sys/dev/usb/ugen.c#42 delete .. //depot/projects/smpng/sys/dev/usb/ugraphire_rdesc.h#4 delete .. //depot/projects/smpng/sys/dev/usb/uhci.c#46 delete .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#22 delete .. //depot/projects/smpng/sys/dev/usb/uhcireg.h#7 delete .. //depot/projects/smpng/sys/dev/usb/uhcivar.h#17 delete .. //depot/projects/smpng/sys/dev/usb/uhid.c#34 delete .. //depot/projects/smpng/sys/dev/usb/uhub.c#30 delete .. //depot/projects/smpng/sys/dev/usb/uipaq.c#7 delete .. //depot/projects/smpng/sys/dev/usb/ukbd.c#28 delete .. //depot/projects/smpng/sys/dev/usb/ulpt.c#26 delete .. //depot/projects/smpng/sys/dev/usb/umass.c#70 delete .. //depot/projects/smpng/sys/dev/usb/umct.c#13 delete .. //depot/projects/smpng/sys/dev/usb/umodem.c#29 delete .. //depot/projects/smpng/sys/dev/usb/ums.c#33 delete .. //depot/projects/smpng/sys/dev/usb/uplcom.c#33 delete .. //depot/projects/smpng/sys/dev/usb/urio.c#25 delete .. //depot/projects/smpng/sys/dev/usb/usb.c#40 delete .. //depot/projects/smpng/sys/dev/usb/usb.h#14 delete .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.c#17 delete .. //depot/projects/smpng/sys/dev/usb/usb_ethersubr.h#8 delete .. //depot/projects/smpng/sys/dev/usb/usb_if.m#3 delete .. //depot/projects/smpng/sys/dev/usb/usb_mem.c#11 delete .. //depot/projects/smpng/sys/dev/usb/usb_mem.h#8 delete .. //depot/projects/smpng/sys/dev/usb/usb_port.h#29 delete .. //depot/projects/smpng/sys/dev/usb/usb_quirks.c#30 delete .. //depot/projects/smpng/sys/dev/usb/usb_quirks.h#10 delete .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#43 delete .. //depot/projects/smpng/sys/dev/usb/usbcdc.h#5 delete .. //depot/projects/smpng/sys/dev/usb/usbdevs#127 delete .. //depot/projects/smpng/sys/dev/usb/usbdi.c#31 delete .. //depot/projects/smpng/sys/dev/usb/usbdi.h#24 delete .. //depot/projects/smpng/sys/dev/usb/usbdi_util.c#15 delete .. //depot/projects/smpng/sys/dev/usb/usbdi_util.h#11 delete .. //depot/projects/smpng/sys/dev/usb/usbdivar.h#20 delete .. //depot/projects/smpng/sys/dev/usb/usbhid.h#5 delete .. //depot/projects/smpng/sys/dev/usb/uscanner.c#41 delete .. //depot/projects/smpng/sys/dev/usb/uslcom.c#2 delete .. //depot/projects/smpng/sys/dev/usb/uvisor.c#22 delete .. //depot/projects/smpng/sys/dev/usb/uvscom.c#23 delete .. //depot/projects/smpng/sys/dev/usb/uxb360gp_rdesc.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_bus.h#3 integrate .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.c#4 integrate .. //depot/projects/smpng/sys/dev/usb2/include/usb2_standard.h#4 integrate .. //depot/projects/smpng/sys/fs/tmpfs/tmpfs_vnops.c#10 integrate .. //depot/projects/smpng/sys/geom/part/g_part_bsd.c#11 integrate .. //depot/projects/smpng/sys/geom/part/g_part_ebr.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/local_apic.c#61 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#129 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_sysi86.c#13 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_osd.c#2 integrate .. //depot/projects/smpng/sys/legacy/dev/usb/FILES#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/dsbr100io.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_pci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehcireg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ehcivar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/hid.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/hid.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_aue.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_auereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_axe.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_axereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_cdce.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_cdcereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_cue.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_cuereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_kue.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_kuereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_rue.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_ruereg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_rum.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_rumreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_rumvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_udav.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_udavreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_upgt.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_ural.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_uralreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_uralvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_urtw.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_zyd.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_zydfw.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/if_zydreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/kue_fw.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ohci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ohci_pci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ohcireg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ohcivar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/rio500_usb.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/sl811hs.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/sl811hsreg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/sl811hsvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/slhci_pccard.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/u3g.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uark.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ubsa.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ubser.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ubser.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uchcom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ucom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ucomvar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ucycom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/udbp.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/udbp.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ufm.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ufoma.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uftdi.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uftdireg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ugen.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ugraphire_rdesc.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhci_pci.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhcireg.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhcivar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhid.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uhub.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uipaq.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ukbd.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ulpt.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/umass.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/umct.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/umodem.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/ums.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uplcom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/urio.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_ethersubr.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_ethersubr.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_if.m#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_mem.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_mem.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_port.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_quirks.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_quirks.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usb_subr.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbcdc.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdevs#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi_util.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdi_util.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbdivar.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/usbhid.h#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uscanner.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uslcom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uvisor.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uvscom.c#1 branch .. //depot/projects/smpng/sys/legacy/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/smpng/sys/modules/Makefile#155 integrate .. //depot/projects/smpng/sys/modules/aue/Makefile#4 delete .. //depot/projects/smpng/sys/modules/axe/Makefile#4 delete .. //depot/projects/smpng/sys/modules/cdce/Makefile#3 delete .. //depot/projects/smpng/sys/modules/cue/Makefile#4 delete .. //depot/projects/smpng/sys/modules/ehci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/kue/Makefile#4 delete .. //depot/projects/smpng/sys/modules/ohci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/rue/Makefile#4 delete .. //depot/projects/smpng/sys/modules/rum/Makefile#2 delete .. //depot/projects/smpng/sys/modules/slhci/Makefile#4 delete .. //depot/projects/smpng/sys/modules/u3g/Makefile#3 delete .. //depot/projects/smpng/sys/modules/uark/Makefile#2 delete .. //depot/projects/smpng/sys/modules/ubsa/Makefile#5 delete .. //depot/projects/smpng/sys/modules/ucom/Makefile#5 delete .. //depot/projects/smpng/sys/modules/udav/Makefile#4 delete .. //depot/projects/smpng/sys/modules/udbp/Makefile#5 delete .. //depot/projects/smpng/sys/modules/ufm/Makefile#4 delete .. //depot/projects/smpng/sys/modules/ufoma/Makefile#2 delete .. //depot/projects/smpng/sys/modules/uftdi/Makefile#5 delete .. //depot/projects/smpng/sys/modules/ugen/Makefile#6 delete .. //depot/projects/smpng/sys/modules/uhci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/uhid/Makefile#6 delete .. //depot/projects/smpng/sys/modules/uipaq/Makefile#2 delete .. //depot/projects/smpng/sys/modules/ukbd/Makefile#10 delete .. //depot/projects/smpng/sys/modules/ulpt/Makefile#6 delete .. //depot/projects/smpng/sys/modules/umass/Makefile#5 delete .. //depot/projects/smpng/sys/modules/umct/Makefile#5 delete .. //depot/projects/smpng/sys/modules/umodem/Makefile#6 delete .. //depot/projects/smpng/sys/modules/ums/Makefile#6 delete .. //depot/projects/smpng/sys/modules/upgt/Makefile#2 delete .. //depot/projects/smpng/sys/modules/uplcom/Makefile#6 delete .. //depot/projects/smpng/sys/modules/ural/Makefile#3 delete .. //depot/projects/smpng/sys/modules/urio/Makefile#5 delete .. //depot/projects/smpng/sys/modules/urtw/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb/Makefile#12 delete .. //depot/projects/smpng/sys/modules/uscanner/Makefile#7 delete .. //depot/projects/smpng/sys/modules/uslcom/Makefile#3 delete .. //depot/projects/smpng/sys/modules/uvisor/Makefile#5 delete .. //depot/projects/smpng/sys/modules/uvscom/Makefile#6 delete .. //depot/projects/smpng/sys/modules/zyd/Makefile#2 delete .. //depot/projects/smpng/sys/net80211/ieee80211_node.c#42 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_proto.c#31 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_tdma.c#6 integrate .. //depot/projects/smpng/sys/powerpc/aim/machdep.c#9 integrate .. //depot/projects/smpng/sys/powerpc/aim/swtch.S#5 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap.c#4 integrate .. //depot/projects/smpng/sys/powerpc/aim/trap_subr.S#5 integrate .. //depot/projects/smpng/sys/powerpc/include/altivec.h#1 branch .. //depot/projects/smpng/sys/powerpc/include/pcb.h#10 integrate .. //depot/projects/smpng/sys/powerpc/include/pcpu.h#13 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/altivec.c#1 branch .. //depot/projects/smpng/sys/powerpc/powerpc/genassym.c#32 integrate .. //depot/projects/smpng/sys/sys/osd.h#2 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#78 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#105 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#12 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.160 2009/01/28 20:35:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.161 2009/02/23 15:39:24 jhb Exp $"); #include #include @@ -98,10 +98,8 @@ static void fpu_clean_state(void); -int hw_float = 1; -SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, - CTLFLAG_RD, &hw_float, 0, - "Floatingpoint instructions executed in hardware"); +SYSCTL_INT(_hw, HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, + NULL, 1, "Floating point instructions executed in hardware"); static struct savefpu fpu_cleanstate; static bool_t fpu_cleanstate_ready; ==== //depot/projects/smpng/sys/amd64/amd64/local_apic.c#39 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.51 2009/01/29 09:22:56 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.52 2009/02/21 23:15:34 jeff Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -900,7 +900,13 @@ KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); KASSERT(ioint_handlers[vector / 32] != NULL, ("No ISR handler for vector %u", vector)); +#ifdef notyet + /* + * We can not currently clear the idt entry because other cpus + * may have a valid vector at this offset. + */ setidt(vector, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); +#endif } /* Release an APIC vector when it's no longer in use. */ @@ -924,9 +930,11 @@ if (sched_is_bound(td)) panic("apic_free_vector: Thread already bound.\n"); sched_bind(td, apic_cpuid(apic_id)); + thread_unlock(td); mtx_lock_spin(&icu_lock); lapics[apic_id].la_ioint_irqs[vector - APIC_IO_INTS] = 0; mtx_unlock_spin(&icu_lock); + thread_lock(td); sched_unbind(td); thread_unlock(td); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#88 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.647 2009/02/14 18:23:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.648 2009/02/23 06:00:24 alc Exp $"); /* * Manages physical address maps. @@ -1932,15 +1932,15 @@ pc->pc_map[field] |= 1ul << bit; /* move to head of list */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); - TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || - pc->pc_map[2] != PC_FREE2) + pc->pc_map[2] != PC_FREE2) { + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); return; + } PV_STAT(pv_entry_spare -= _NPCPV); PV_STAT(pc_chunk_count--); PV_STAT(pc_chunk_frees++); /* entire chunk is free, return it */ - TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); dump_drop_page(m->phys_addr); vm_page_unwire(m, 0); ==== //depot/projects/smpng/sys/boot/Makefile.inc#2 (text+ko) ==== @@ -1,3 +1,3 @@ -# $FreeBSD: src/sys/boot/Makefile.inc,v 1.1 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/Makefile.inc,v 1.2 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= +SSP_CFLAGS= ==== //depot/projects/smpng/sys/boot/i386/loader/Makefile#26 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.88 2008/11/18 03:55:55 ache Exp $ +# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.89 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader.sym INTERNALPROG= ==== //depot/projects/smpng/sys/boot/ia64/common/Makefile#3 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.2 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/common/Makefile,v 1.3 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no LIB= ia64 INTERNALLIB= ==== //depot/projects/smpng/sys/boot/ia64/efi/Makefile#7 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.29 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/efi/Makefile,v 1.30 2009/02/21 15:04:31 ru Exp $ NO_MAN= -WITHOUT_SSP= .include +MK_SSP= no PROG= loader.sym INTERNALPROG= ==== //depot/projects/smpng/sys/boot/ia64/ski/Makefile#6 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.21 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/ia64/ski/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $ NO_MAN= -WITHOUT_SSP= .include +MK_SSP= no PROG= skiload STRIP= # We must not strip skiload at install time. ==== //depot/projects/smpng/sys/boot/pc98/loader/Makefile#20 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.42 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.43 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader.sym INTERNALPROG= ==== //depot/projects/smpng/sys/boot/powerpc/ofw/Makefile#5 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.24 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/powerpc/ofw/Makefile,v 1.25 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader NEWVERSWHAT= "Open Firmware loader" ${MACHINE_ARCH} ==== //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#19 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.21 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.22 2009/02/21 15:04:31 ru Exp $ -WITHOUT_SSP= - .include +MK_SSP= no PROG= loader NEWVERSWHAT= "bootstrap loader" sparc64 ==== //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#41 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.100 2008/12/27 09:42:17 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.101 2009/02/23 18:16:17 thompsa Exp $"); #include #include @@ -65,8 +65,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#9 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.16 2008/12/28 13:50:58 ganbold Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_windrv.c,v 1.17 2009/02/23 18:16:17 thompsa Exp $"); #include #include @@ -56,8 +56,8 @@ #include #endif -#include -#include +#include +#include #include #include ==== //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#47 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.115 2008/12/27 08:03:32 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.116 2009/02/23 18:16:17 thompsa Exp $"); /* * This file implements a translation layer between the BSD networking @@ -95,8 +95,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.4 2008/12/27 08:03:32 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_usbd.c,v 1.5 2009/02/23 18:16:17 thompsa Exp $"); #include #include @@ -56,11 +56,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "usbdevs.h" #include ==== //depot/projects/smpng/sys/conf/files.powerpc#47 (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.92 2009/01/25 18:20:15 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.93 2009/02/21 02:15:08 nwhitehorn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -126,6 +126,7 @@ powerpc/powermac/cuda.c optional powermac cuda powerpc/powermac/pmu.c optional powermac pmu powerpc/powermac/macgpio.c optional powermac pci +powerpc/powerpc/altivec.c optional aim powerpc/powerpc/atomic.S standard powerpc/powerpc/autoconf.c standard powerpc/powerpc/bcopy.c standard ==== //depot/projects/smpng/sys/conf/kern.mk#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.57 2008/07/23 06:16:34 imp Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.58 2009/02/22 18:45:30 nwhitehorn Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -78,9 +78,10 @@ # # For PowerPC we tell gcc to use floating point emulation. This avoids using # floating point registers for integer operations which it has a tendency to do. +# Also explicitly disable Altivec instructions inside the kernel. # .if ${MACHINE_ARCH} == "powerpc" -CFLAGS+= -msoft-float +CFLAGS+= -msoft-float -mno-altivec INLINE_LIMIT?= 15000 .endif ==== //depot/projects/smpng/sys/dev/aac/aac.c#64 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.139 2009/02/18 01:36:20 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.141 2009/02/23 18:22:06 emaste Exp $"); /* * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters. @@ -71,6 +71,7 @@ static void aac_add_container(struct aac_softc *sc, struct aac_mntinforesp *mir, int f); static void aac_get_bus_info(struct aac_softc *sc); +static void aac_daemon(void *arg); /* Command Processing */ static void aac_timeout(struct aac_softc *sc); @@ -292,6 +293,9 @@ TAILQ_INIT(&sc->aac_container_tqh); TAILQ_INIT(&sc->aac_ev_cmfree); + /* Initialize the clock daemon callout. */ + callout_init_mtx(&sc->aac_daemontime, &sc->aac_io_lock, 0); + /* * Initialize the adapter. */ @@ -349,9 +353,34 @@ aac_get_bus_info(sc); } + mtx_lock(&sc->aac_io_lock); + callout_reset(&sc->aac_daemontime, 30 * 60 * hz, aac_daemon, sc); + mtx_unlock(&sc->aac_io_lock); + return(0); } +static void +aac_daemon(void *arg) +{ + struct timeval tv; + struct aac_softc *sc; + struct aac_fib *fib; + + sc = arg; + mtx_assert(&sc->aac_io_lock, MA_OWNED); + + if (callout_pending(&sc->aac_daemontime) || + callout_active(&sc->aac_daemontime) == 0) + return; + getmicrotime(&tv); + aac_alloc_sync_fib(sc, &fib); + *(uint32_t *)fib->data = tv.tv_sec; + aac_sync_fib(sc, SendHostTime, 0, fib, sizeof(uint32_t)); + aac_release_sync_fib(sc); + callout_schedule(&sc->aac_daemontime, 30 * 60 * hz); +} + void aac_add_event(struct aac_softc *sc, struct aac_event *event) { @@ -632,9 +661,12 @@ bus_dma_tag_destroy(sc->aac_parent_dmat); /* release the register window mapping */ - if (sc->aac_regs_resource != NULL) + if (sc->aac_regs_res0 != NULL) + bus_release_resource(sc->aac_dev, SYS_RES_MEMORY, + sc->aac_regs_rid0, sc->aac_regs_res0); + if (sc->aac_hwif == AAC_HWIF_NARK && sc->aac_regs_res1 != NULL) bus_release_resource(sc->aac_dev, SYS_RES_MEMORY, - sc->aac_regs_rid, sc->aac_regs_resource); + sc->aac_regs_rid1, sc->aac_regs_res1); } /* @@ -654,6 +686,8 @@ if (sc->aac_state & AAC_STATE_OPEN) return(EBUSY); + callout_drain(&sc->aac_daemontime); + /* Remove the child containers */ while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) { error = device_delete_child(dev, co->co_disk); @@ -834,7 +868,7 @@ } index &= ~2; for (i = 0; i < sizeof(struct aac_fib)/4; ++i) - ((u_int32_t *)fib)[i] = AAC_GETREG4(sc, index + i*4); + ((u_int32_t *)fib)[i] = AAC_MEM1_GETREG4(sc, index + i*4); aac_handle_aif(sc, fib); free(fib, M_AACBUF); @@ -1754,26 +1788,33 @@ /* Remap mem. resource, if required */ if ((sc->flags & AAC_FLAGS_NEW_COMM) && - atu_size > rman_get_size(sc->aac_regs_resource)) { + atu_size > rman_get_size(sc->aac_regs_res1)) { bus_release_resource( sc->aac_dev, SYS_RES_MEMORY, - sc->aac_regs_rid, sc->aac_regs_resource); - sc->aac_regs_resource = bus_alloc_resource( - sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid, + sc->aac_regs_rid1, sc->aac_regs_res1); + sc->aac_regs_res1 = bus_alloc_resource( + sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid1, 0ul, ~0ul, atu_size, RF_ACTIVE); - if (sc->aac_regs_resource == NULL) { - sc->aac_regs_resource = bus_alloc_resource_any( + if (sc->aac_regs_res1 == NULL) { + sc->aac_regs_res1 = bus_alloc_resource_any( sc->aac_dev, SYS_RES_MEMORY, - &sc->aac_regs_rid, RF_ACTIVE); - if (sc->aac_regs_resource == NULL) { + &sc->aac_regs_rid1, RF_ACTIVE); + if (sc->aac_regs_res1 == NULL) { device_printf(sc->aac_dev, "couldn't allocate register window\n"); return (ENXIO); } sc->flags &= ~AAC_FLAGS_NEW_COMM; } - sc->aac_btag = rman_get_bustag(sc->aac_regs_resource); - sc->aac_bhandle = rman_get_bushandle(sc->aac_regs_resource); + sc->aac_btag1 = rman_get_bustag(sc->aac_regs_res1); + sc->aac_bhandle1 = rman_get_bushandle(sc->aac_regs_res1); + + if (sc->aac_hwif == AAC_HWIF_NARK) { + sc->aac_regs_res0 = sc->aac_regs_res1; + sc->aac_regs_rid0 = sc->aac_regs_rid1; + sc->aac_btag0 = sc->aac_btag1; + sc->aac_bhandle0 = sc->aac_bhandle1; + } } /* Read preferred settings */ @@ -1944,10 +1985,10 @@ */ switch (sc->aac_hwif) { case AAC_HWIF_I960RX: - AAC_SETREG4(sc, AAC_RX_ODBR, ~0); + AAC_MEM0_SETREG4(sc, AAC_RX_ODBR, ~0); break; case AAC_HWIF_RKT: - AAC_SETREG4(sc, AAC_RKT_ODBR, ~0); + AAC_MEM0_SETREG4(sc, AAC_RKT_ODBR, ~0); break; default: break; @@ -2367,7 +2408,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_SA_FWSTATUS)); + return(AAC_MEM0_GETREG4(sc, AAC_SA_FWSTATUS)); } static int @@ -2375,7 +2416,8 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_RX_OMR0)); + return(AAC_MEM0_GETREG4(sc, sc->flags & AAC_FLAGS_NEW_COMM ? + AAC_RX_OMR0 : AAC_RX_FWSTATUS)); } static int @@ -2385,7 +2427,7 @@ fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - val = AAC_GETREG4(sc, AAC_FA_FWSTATUS); + val = AAC_MEM0_GETREG4(sc, AAC_FA_FWSTATUS); return (val); } @@ -2394,7 +2436,8 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_RKT_OMR0)); + return(AAC_MEM0_GETREG4(sc, sc->flags & AAC_FLAGS_NEW_COMM ? + AAC_RKT_OMR0 : AAC_RKT_FWSTATUS)); } /* @@ -2406,7 +2449,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG2(sc, AAC_SA_DOORBELL1_SET, qbit); + AAC_MEM0_SETREG2(sc, AAC_SA_DOORBELL1_SET, qbit); } static void @@ -2414,7 +2457,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RX_IDBR, qbit); + AAC_MEM0_SETREG4(sc, AAC_RX_IDBR, qbit); } static void @@ -2422,7 +2465,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG2(sc, AAC_FA_DOORBELL1, qbit); + AAC_MEM0_SETREG2(sc, AAC_FA_DOORBELL1, qbit); AAC_FA_HACK(sc); } @@ -2431,7 +2474,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RKT_IDBR, qbit); + AAC_MEM0_SETREG4(sc, AAC_RKT_IDBR, qbit); } /* @@ -2442,7 +2485,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG2(sc, AAC_SA_DOORBELL0)); + return(AAC_MEM0_GETREG2(sc, AAC_SA_DOORBELL0)); } static int @@ -2450,7 +2493,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_RX_ODBR)); + return(AAC_MEM0_GETREG4(sc, AAC_RX_ODBR)); } static int @@ -2460,7 +2503,7 @@ fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - val = AAC_GETREG2(sc, AAC_FA_DOORBELL0); + val = AAC_MEM0_GETREG2(sc, AAC_FA_DOORBELL0); return (val); } @@ -2469,7 +2512,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - return(AAC_GETREG4(sc, AAC_RKT_ODBR)); + return(AAC_MEM0_GETREG4(sc, AAC_RKT_ODBR)); } /* @@ -2480,7 +2523,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG2(sc, AAC_SA_DOORBELL0_CLEAR, mask); + AAC_MEM0_SETREG2(sc, AAC_SA_DOORBELL0_CLEAR, mask); } static void @@ -2488,7 +2531,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RX_ODBR, mask); + AAC_MEM0_SETREG4(sc, AAC_RX_ODBR, mask); } static void @@ -2496,7 +2539,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG2(sc, AAC_FA_DOORBELL0_CLEAR, mask); + AAC_MEM0_SETREG2(sc, AAC_FA_DOORBELL0_CLEAR, mask); AAC_FA_HACK(sc); } @@ -2505,7 +2548,7 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RKT_ODBR, mask); + AAC_MEM0_SETREG4(sc, AAC_RKT_ODBR, mask); } /* @@ -2517,11 +2560,11 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_SA_MAILBOX, command); - AAC_SETREG4(sc, AAC_SA_MAILBOX + 4, arg0); - AAC_SETREG4(sc, AAC_SA_MAILBOX + 8, arg1); - AAC_SETREG4(sc, AAC_SA_MAILBOX + 12, arg2); - AAC_SETREG4(sc, AAC_SA_MAILBOX + 16, arg3); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX, command); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 4, arg0); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 8, arg1); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 12, arg2); + AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 16, arg3); } static void @@ -2530,11 +2573,11 @@ { fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, ""); - AAC_SETREG4(sc, AAC_RX_MAILBOX, command); - AAC_SETREG4(sc, AAC_RX_MAILBOX + 4, arg0); - AAC_SETREG4(sc, AAC_RX_MAILBOX + 8, arg1); - AAC_SETREG4(sc, AAC_RX_MAILBOX + 12, arg2); - AAC_SETREG4(sc, AAC_RX_MAILBOX + 16, arg3); + AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX, command); + AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX + 4, arg0); + AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX + 8, arg1); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 23 18:51:09 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5080210656DD; Mon, 23 Feb 2009 18:51: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 E4D4210656D0 for ; Mon, 23 Feb 2009 18:51:08 +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 D000F8FC1E for ; Mon, 23 Feb 2009 18:51:08 +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 n1NIp8RP097270 for ; Mon, 23 Feb 2009 18:51:08 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NIp8Ed097268 for perforce@freebsd.org; Mon, 23 Feb 2009 18:51:08 GMT (envelope-from jhb@freebsd.org) Date: Mon, 23 Feb 2009 18:51:08 GMT Message-Id: <200902231851.n1NIp8Ed097268@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 158138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 18:51:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=158138 Change 158138 by jhb@jhb_jhbbsd on 2009/02/23 18:50:42 IFC @158135 Affected files ... .. //depot/projects/smpng/sys/amd64/conf/GENERIC#73 integrate .. //depot/projects/smpng/sys/amd64/conf/USB2#2 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#14 integrate .. //depot/projects/smpng/sys/arm/conf/BWCT#7 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/smpng/sys/arm/conf/HL200#7 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X#14 integrate .. //depot/projects/smpng/sys/arm/conf/NSLU#6 integrate .. //depot/projects/smpng/sys/conf/files#229 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#71 integrate .. //depot/projects/smpng/sys/dev/usb/README.TXT#1 branch .. //depot/projects/smpng/sys/dev/usb/bluetooth/TODO.TXT#1 branch .. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt.c#1 branch .. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt_var.h#1 branch .. //depot/projects/smpng/sys/dev/usb/bluetooth/ubtbcmfw.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/at91dci.h#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/at91dci_atmelarm.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci.h#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ehci.h#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ehci_ixp4xx.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ehci_mbus.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg_atmelarm.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ohci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ohci.h#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ohci_atmelarm.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/uhci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/uhci.h#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/uhci_pci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/usb_controller.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.c#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci.h#1 branch .. //depot/projects/smpng/sys/dev/usb/controller/uss820dci_atmelarm.c#1 branch .. //depot/projects/smpng/sys/dev/usb/image/uscanner.c#1 branch .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#1 branch .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#1 branch .. //depot/projects/smpng/sys/dev/usb/input/ums.c#1 branch .. //depot/projects/smpng/sys/dev/usb/input/usb_rdesc.h#1 branch .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#1 branch .. //depot/projects/smpng/sys/dev/usb/misc/udbp.h#1 branch .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_auereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_axereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_cdcereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_cuereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_kuefw.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_kuereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_ruereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/if_udavreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#1 branch .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.h#1 branch .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#1 branch .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.h#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uftdi_reg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/usb_serial.h#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#1 branch .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#1 branch .. //depot/projects/smpng/sys/dev/usb/sound/uaudio.c#1 branch .. //depot/projects/smpng/sys/dev/usb/sound/uaudio.h#1 branch .. //depot/projects/smpng/sys/dev/usb/sound/uaudio_pcm.c#1 branch .. //depot/projects/smpng/sys/dev/usb/sound/uaudio_reg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/storage/ata-usb.c#1 branch .. //depot/projects/smpng/sys/dev/usb/storage/rio500_usb.h#1 branch .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#1 branch .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#1 branch .. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#1 branch .. //depot/projects/smpng/sys/dev/usb/template/usb_template.c#1 branch .. //depot/projects/smpng/sys/dev/usb/template/usb_template.h#1 branch .. //depot/projects/smpng/sys/dev/usb/template/usb_template_cdce.c#1 branch .. //depot/projects/smpng/sys/dev/usb/template/usb_template_msc.c#1 branch .. //depot/projects/smpng/sys/dev/usb/template/usb_template_mtp.c#1 branch .. //depot/projects/smpng/sys/dev/usb/ufm_ioctl.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb.h#15 branch .. //depot/projects/smpng/sys/dev/usb/usb_bus.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_busdma.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_busdma.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_cdc.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_controller.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_core.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_core.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_debug.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_debug.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_defs.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_dev.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_device.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_device.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_endian.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_error.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_error.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_generic.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_handle_request.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_handle_request.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_hid.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_hub.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_if.m#4 branch .. //depot/projects/smpng/sys/dev/usb/usb_ioctl.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_lookup.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_lookup.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_mbuf.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_mbuf.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_mfunc.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_msctest.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_msctest.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_parse.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_parse.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_pci.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_process.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_process.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_request.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_request.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_revision.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_sw_transfer.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_sw_transfer.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_transfer.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_transfer.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_util.c#1 branch .. //depot/projects/smpng/sys/dev/usb/usb_util.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usbdevs#128 branch .. //depot/projects/smpng/sys/dev/usb/usbhid.h#6 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_rumfw.h#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_rumreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_rumvar.h#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_uralreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_uralvar.h#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_zydfw.h#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/if_zydreg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/wlan/usb_wlan.h#1 branch .. //depot/projects/smpng/sys/dev/usb2/bluetooth/TODO.TXT#2 delete .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ng_ubt2_var.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/bluetooth/ubtbcmfw2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/bluetooth/usb2_bluetooth.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/bluetooth/usb2_bluetooth.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/controller/at91dci.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/controller/at91dci.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/controller/at91dci_atmelarm.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/controller/atmegadci.c#3 delete .. //depot/projects/smpng/sys/dev/usb2/controller/atmegadci.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/controller/atmegadci_atmelarm.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/controller/ehci2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/controller/ehci2.h#5 delete .. //depot/projects/smpng/sys/dev/usb2/controller/ehci2_ixp4xx.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/controller/ehci2_mbus.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/controller/ehci2_pci.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/controller/musb2_otg_atmelarm.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/controller/ohci2.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/controller/ohci2.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/controller/ohci2_atmelarm.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/controller/ohci2_pci.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/controller/uhci2.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/controller/uhci2_pci.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_bus.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_controller.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/controller/usb2_pci.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/controller/uss820dci_atmelarm.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/core/README.TXT#2 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_busdma.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_busdma.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_compat_linux.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_compat_linux.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_core.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_core.h#6 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_debug.c#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_debug.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_dev.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_dev.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_device.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_device.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_dynamic.c#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_dynamic.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_error.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_generic.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_generic.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_handle_request.c#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_handle_request.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_hid.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_hid.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_hub.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_hub.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_if.m#2 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_lookup.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_lookup.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_mbuf.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_mbuf.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_msctest.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_msctest.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_parse.c#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_parse.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_process.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_process.h#5 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_request.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_request.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_sw_transfer.c#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_sw_transfer.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_transfer.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_transfer.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_util.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/core/usb2_util.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_aue2.c#8 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_auereg.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axe2.c#8 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_axereg.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdce2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cdcereg.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cue2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_cuereg.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kue2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kuefw.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_kuereg.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_rue2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_ruereg.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udav2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/if_udavreg.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/usb2_ethernet.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/ethernet/usb2_ethernet.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/image/usb2_image.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/image/usb2_image.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/image/uscanner2.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/include/ufm2_ioctl.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/include/usb2_cdc.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/include/usb2_defs.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/include/usb2_endian.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/include/usb2_error.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/include/usb2_hid.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/include/usb2_ioctl.h#6 delete .. //depot/projects/smpng/sys/dev/usb2/include/usb2_mfunc.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/include/usb2_revision.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/include/usb2_standard.h#5 delete .. //depot/projects/smpng/sys/dev/usb2/input/uhid2.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/input/ukbd2.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/input/ums2.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/input/usb2_input.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/input/usb2_input.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/input/usb2_rdesc.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/misc/udbp2.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/misc/udbp2.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/misc/ufm2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/misc/usb2_misc.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/misc/usb2_misc.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/ndis/if_ndis_usb2.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/ndis/usb2_ndis.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/ndis/usb2_ndis.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/quirk/usb2_quirk.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/quirk/usb2_quirk.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/serial/u3g2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/serial/uark2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/ubsa2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/serial/ubser2.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/serial/uchcom2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/ucycom2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/ufoma2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/serial/uftdi2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/uftdi2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/serial/ugensa2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/serial/uipaq2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/ulpt2.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/serial/umct2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/umodem2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/umoscom2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/uplcom2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/usb2_serial.c#4 delete .. //depot/projects/smpng/sys/dev/usb2/serial/usb2_serial.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/serial/uslcom2.c#3 delete .. //depot/projects/smpng/sys/dev/usb2/serial/uvisor2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/serial/uvscom2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2_pcm.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/sound/uaudio2_reg.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/sound/usb2_sound.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/sound/usb2_sound.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/storage/ata-usb2.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/storage/umass2.c#8 delete .. //depot/projects/smpng/sys/dev/usb2/storage/urio2.c#6 delete .. //depot/projects/smpng/sys/dev/usb2/storage/usb2_storage.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/storage/usb2_storage.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/storage/ustorage2_fs.c#5 delete .. //depot/projects/smpng/sys/dev/usb2/template/usb2_template.c#3 delete .. //depot/projects/smpng/sys/dev/usb2/template/usb2_template.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/template/usb2_template_cdce.c#3 delete .. //depot/projects/smpng/sys/dev/usb2/template/usb2_template_msc.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/template/usb2_template_mtp.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rum2.c#8 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumfw.h#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumreg.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_rumvar.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_ural2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_uralreg.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_uralvar.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zyd2.c#7 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zydfw.h#3 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/if_zydreg.h#4 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/usb2_wlan.c#2 delete .. //depot/projects/smpng/sys/dev/usb2/wlan/usb2_wlan.h#2 delete .. //depot/projects/smpng/sys/i386/conf/GENERIC#105 integrate .. //depot/projects/smpng/sys/i386/conf/USB2#2 integrate .. //depot/projects/smpng/sys/i386/conf/XBOX#11 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#65 integrate .. //depot/projects/smpng/sys/modules/Makefile#156 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubt/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/sound/driver/uaudio/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/usb/Makefile#13 branch .. //depot/projects/smpng/sys/modules/usb/at91dci/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/atmegadci/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/aue/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/axe/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/cdce/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/cue/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ehci/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/kue/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/musb/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ohci/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/quirk/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/rue/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/rum/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/template/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/u3g/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uark/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ubsa/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ubser/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uchcom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ucom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ucycom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/udav/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/udbp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uether/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ufm/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ufoma/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uftdi/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ugensa/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uhci/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uhid/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uipaq/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ukbd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ulpt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/umass/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/umct/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/umodem/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/umoscom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ums/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uplcom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/ural/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/urio/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/usb/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uscanner/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/usfs/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uslcom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uss820dci/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uvisor/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/uvscom/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb/zyd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/usb2/Makefile#6 delete .. //depot/projects/smpng/sys/modules/usb2/bluetooth/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/bluetooth_fw/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/bluetooth_ng/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/controller/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/controller_at91dci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/controller_atmegadci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/controller_ehci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/controller_musb/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/controller_ohci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/controller_uhci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/controller_uss820dci/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/core/Makefile#4 delete .. //depot/projects/smpng/sys/modules/usb2/ethernet/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/ethernet_aue/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/ethernet_axe/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/ethernet_cdce/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/ethernet_cue/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/ethernet_dav/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/ethernet_kue/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/ethernet_rue/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/image/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/input/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/input_hid/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/input_kbd/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/input_ms/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/misc/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/misc_dbp/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/misc_fm/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/ndis/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/quirk/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/scanner/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/serial_3g/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_ark/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_bsa/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_bser/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_chcom/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_cycom/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_foma/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_ftdi/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_gensa/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_ipaq/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_lpt/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_mct/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_modem/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_moscom/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_plcom/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_slcom/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_visor/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/serial_vscom/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/sound/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/storage/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/storage_ata/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/storage_fs/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/storage_mass/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/storage_rio/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/template/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/wlan/Makefile#2 delete .. //depot/projects/smpng/sys/modules/usb2/wlan_ral/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/wlan_rum/Makefile#3 delete .. //depot/projects/smpng/sys/modules/usb2/wlan_zyd/Makefile#3 delete .. //depot/projects/smpng/sys/pc98/conf/GENERIC#81 integrate .. //depot/projects/smpng/sys/powerpc/conf/GENERIC#55 integrate .. //depot/projects/smpng/sys/powerpc/conf/MPC85XX#5 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#89 integrate .. //depot/projects/smpng/sys/sun4v/conf/GENERIC#14 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#73 (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.520 2009/02/15 23:40:37 svn Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.521 2009/02/23 18:34:56 thompsa Exp $ cpu HAMMER ident GENERIC @@ -281,97 +281,38 @@ # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter -# USB core support -device usb2_core -# USB controller support -device usb2_controller -device usb2_controller_ehci -device usb2_controller_ohci -device usb2_controller_uhci -# USB mass storage support -device usb2_storage -device usb2_storage_mass -# USB ethernet support, requires miibus -device usb2_ethernet -device usb2_ethernet_aue -device usb2_ethernet_axe -device usb2_ethernet_cdce -device usb2_ethernet_cue -device usb2_ethernet_kue -device usb2_ethernet_rue -device usb2_ethernet_dav -# USB wireless LAN support -device usb2_wlan -device usb2_wlan_rum -device usb2_wlan_ral -device usb2_wlan_zyd -# USB serial device support -device usb2_serial -device usb2_serial_ark -device usb2_serial_bsa -device usb2_serial_bser -device usb2_serial_chcom -device usb2_serial_cycom -device usb2_serial_foma -device usb2_serial_ftdi -device usb2_serial_gensa -device usb2_serial_ipaq -device usb2_serial_lpt -device usb2_serial_mct -device usb2_serial_modem -device usb2_serial_moscom -device usb2_serial_plcom -device usb2_serial_slcom -device usb2_serial_visor -device usb2_serial_vscom -# USB bluetooth support -#device usb2_bluetooth -#device usb2_bluetooth_ng -# USB input device support -device usb2_input -device usb2_input_hid -device usb2_input_kbd -device usb2_input_ms -# USB sound and MIDI device support -#device usb2_sound -# USB scanner support -device usb2_image -device usb2_scanner - -# USB support (deprecated) -#device uhci # UHCI PCI->USB interface -#device ohci # OHCI PCI->USB interface -#device ehci # EHCI PCI->USB interface (USB 2.0) -#device usb # USB Bus (required) +# USB support +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) +device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices -#device ugen # Generic -#device uhid # "Human Interface Devices" -#device ukbd # Keyboard -#device ulpt # Printer -#device umass # Disks/Mass storage - Requires scbus and da -#device ums # Mouse -#device ural # Ralink Technology RT2500USB wireless NICs -#device rum # Ralink Technology RT2501USB wireless NICs -#device urio # Diamond Rio 500 MP3 player -#device uscanner # Scanners +device uhid # "Human Interface Devices" +device ukbd # Keyboard +device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ums # Mouse +device ural # Ralink Technology RT2500USB wireless NICs +device rum # Ralink Technology RT2501USB wireless NICs +device urio # Diamond Rio 500 MP3 player +device uscanner # Scanners # USB Serial devices -#device ucom # Generic com ttys -#device uark # Technologies ARK3116 based serial adapters -#device ubsa # Belkin F5U103 and compatible serial adapters -#device uftdi # For FTDI usb serial adapters -#device uipaq # Some WinCE based devices -#device uplcom # Prolific PL-2303 serial adapters -#device uslcom # SI Labs CP2101/CP2102 serial adapters -#device uvisor # Visor and Palm devices -#device uvscom # USB serial support for DDI pocket's PHS +device uark # Technologies ARK3116 based serial adapters +device ubsa # Belkin F5U103 and compatible serial adapters +device uftdi # For FTDI usb serial adapters +device uipaq # Some WinCE based devices +device uplcom # Prolific PL-2303 serial adapters +device uslcom # SI Labs CP2101/CP2102 serial adapters +device uvisor # Visor and Palm devices +device uvscom # USB serial support for DDI pocket's PHS # USB Ethernet, requires miibus -#device aue # ADMtek USB Ethernet -#device axe # ASIX Electronics USB Ethernet -#device cdce # Generic USB over Ethernet -#device cue # CATC USB Ethernet -#device kue # Kawasaki LSI USB Ethernet -#device rue # RealTek RTL8150 USB Ethernet -#device udav # Davicom DM9601E USB +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cdce # Generic USB over Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet +device rue # RealTek RTL8150 USB Ethernet +device udav # Davicom DM9601E USB # FireWire support device firewire # FireWire bus code ==== //depot/projects/smpng/sys/amd64/conf/USB2#2 (text+ko) ==== @@ -2,7 +2,7 @@ # USB2 -- Generic kernel configuration file for FreeBSD/amd64 with USBng # stack. # -# $FreeBSD: src/sys/amd64/conf/USB2,v 1.3 2009/01/13 19:05:10 thompsa Exp $ +# $FreeBSD: src/sys/amd64/conf/USB2,v 1.4 2009/02/23 18:34:56 thompsa Exp $ include GENERIC @@ -13,7 +13,6 @@ nodevice ohci nodevice ehci nodevice usb -nodevice ugen nodevice uhid nodevice ukbd nodevice ulpt @@ -25,7 +24,6 @@ nodevice urio nodevice uscanner # USB Serial devices -nodevice ucom nodevice u3g nodevice uark nodevice ubsa ==== //depot/projects/smpng/sys/arm/conf/AVILA#14 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.23 2009/02/18 01:37:57 sam Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.24 2009/02/23 18:34:56 thompsa Exp $ ident AVILA @@ -133,7 +133,6 @@ #options USB_DEBUG device ohci device ehci -device ugen #device umass #device scbus # SCSI bus (required for SCSI) #device da # Direct Access (disks) ==== //depot/projects/smpng/sys/arm/conf/BWCT#7 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.8 2008/11/30 17:53:19 sam Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.9 2009/02/23 18:34:56 thompsa Exp $ ident BWCT @@ -108,7 +108,6 @@ #options USB_DEBUG #device ohci #device usb -#device ugen #device umass # Disks/Mass storage - Requires scbus and da #device at91_qdmmc ==== //depot/projects/smpng/sys/arm/conf/CAMBRIA#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.3 2009/02/18 01:37:57 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.4 2009/02/23 18:34:56 thompsa Exp $ ident CAMBRIA @@ -103,7 +103,6 @@ options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order #options USB_DEBUG device ehci -device ugen device umass device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) ==== //depot/projects/smpng/sys/arm/conf/HL200#7 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/HL200,v 1.8 2008/12/27 19:03:57 bz Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.9 2009/02/23 18:34:56 thompsa Exp $ ident HL200 @@ -97,7 +97,6 @@ device ohci # OHCI localbus->USB interface device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices -device ugen # Generic device uhid # "Human Interface Devices" device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da @@ -115,7 +114,6 @@ device rue # RealTek RTL8150 USB Ethernet device udav # usb serial -device ucom device uark device ubsa #device ubser # not yet converted. ==== //depot/projects/smpng/sys/arm/conf/KB920X#14 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/KB920X,v 1.21 2008/11/30 17:53:19 sam Exp $ +# $FreeBSD: src/sys/arm/conf/KB920X,v 1.22 2009/02/23 18:34:56 thompsa Exp $ ident KB920X @@ -98,7 +98,6 @@ device ohci # OHCI localbus->USB interface device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices -device ugen # Generic device uhid # "Human Interface Devices" device ulpt # Printer device umass # Disks/Mass storage - Requires scbus and da @@ -116,7 +115,6 @@ device rue # RealTek RTL8150 USB Ethernet device udav # usb serial -device ucom device uark device ubsa device uftdi ==== //depot/projects/smpng/sys/arm/conf/NSLU#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/NSLU,v 1.5 2008/12/28 11:04:24 bz Exp $ +# $FreeBSD: src/sys/arm/conf/NSLU,v 1.6 2009/02/23 18:34:56 thompsa Exp $ ident NSLU @@ -112,7 +112,6 @@ options USB_DEBUG device ohci device ehci -device ugen device umass device scbus # SCSI bus (required for SCSI) device da # Direct Access (disks) ==== //depot/projects/smpng/sys/conf/files#229 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1371 2009/02/18 06:33:10 thompsa Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1372 2009/02/23 18:34:56 thompsa Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -80,12 +80,12 @@ compile-with "${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \ no-obj no-implicit-rule before-depend \ clean "teken_state.h" -usbdevs.h optional usb | usb2_core \ +usbdevs.h optional usb | ousb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \ no-obj no-implicit-rule before-depend \ clean "usbdevs.h" -usbdevs_data.h optional usb | usb2_core \ +usbdevs_data.h optional usb | ousb \ dependency "$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \ compile-with "${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \ no-obj no-implicit-rule before-depend \ @@ -502,7 +502,7 @@ dev/ata/chipsets/ata-via.c optional ata pci | atavia dev/ata/ata-disk.c optional atadisk dev/ata/ata-raid.c optional ataraid -dev/ata/ata-usb.c optional atausb +dev/ata/ata-usb.c optional atausb ousb dev/ata/atapi-cd.c optional atapicd dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist @@ -1393,9 +1393,9 @@ dev/sound/pcm/sndstat.c optional sound dev/sound/pcm/sound.c optional sound dev/sound/pcm/vchan.c optional sound -#dev/sound/usb/upcm.c optional snd_upcm usb -dev/sound/usb/uaudio.c optional snd_uaudio usb -dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb +#dev/sound/usb/upcm.c optional snd_upcm ousb +dev/sound/usb/uaudio.c optional snd_uaudio ousb +dev/sound/usb/uaudio_pcm.c optional snd_uaudio ousb dev/sound/midi/midi.c optional sound dev/sound/midi/mpu401.c optional sound dev/sound/midi/mpu_if.m optional sound @@ -1478,200 +1478,188 @@ dev/ubsec/ubsec.c optional ubsec # # USB support -dev/usb/ehci.c optional ehci -dev/usb/ehci_ddb.c optional ehci -dev/usb/ehci_pci.c optional ehci pci -dev/usb/hid.c optional usb -dev/usb/if_aue.c optional aue -dev/usb/if_axe.c optional axe -dev/usb/if_cdce.c optional cdce -dev/usb/if_cue.c optional cue -dev/usb/if_kue.c optional kue -dev/usb/if_ural.c optional ural -dev/usb/if_rue.c optional rue -dev/usb/if_rum.c optional rum -dev/usb/if_udav.c optional udav -dev/usb/if_zyd.c optional zyd -dev/usb/ohci.c optional ohci -dev/usb/ohci_pci.c optional ohci pci -dev/usb/sl811hs.c optional slhci -dev/usb/slhci_pccard.c optional slhci pccard -dev/usb/uark.c optional uark -dev/usb/u3g.c optional u3g -dev/usb/ubsa.c optional ubsa -dev/usb/ubser.c optional ubser -dev/usb/ucom.c optional ucom -dev/usb/ucycom.c optional ucycom -dev/usb/udbp.c optional udbp -dev/usb/ufoma.c optional ufoma -dev/usb/ufm.c optional ufm -dev/usb/uftdi.c optional uftdi -dev/usb/ugen.c optional ugen -dev/usb/uhci.c optional uhci -dev/usb/uhci_pci.c optional uhci pci -dev/usb/uhid.c optional uhid -dev/usb/uhub.c optional usb -dev/usb/uipaq.c optional uipaq -dev/usb/ukbd.c optional ukbd -dev/usb/ulpt.c optional ulpt -dev/usb/umass.c optional umass -dev/usb/umct.c optional umct -dev/usb/umodem.c optional umodem -dev/usb/ums.c optional ums -dev/usb/uplcom.c optional uplcom -dev/usb/urio.c optional urio -dev/usb/usb.c optional usb -dev/usb/usb_ethersubr.c optional usb -dev/usb/usb_if.m optional usb -dev/usb/usb_mem.c optional usb -dev/usb/usb_quirks.c optional usb -dev/usb/usb_subr.c optional usb -dev/usb/usbdi.c optional usb -dev/usb/usbdi_util.c optional usb -dev/usb/uscanner.c optional uscanner -dev/usb/uslcom.c optional uslcom -dev/usb/uvisor.c optional uvisor -dev/usb/uvscom.c optional uvscom +legacy/dev/usb/ehci.c optional oehci +legacy/dev/usb/ehci_ddb.c optional oehci +legacy/dev/usb/ehci_pci.c optional oehci pci +legacy/dev/usb/hid.c optional ousb +legacy/dev/usb/if_aue.c optional oaue +legacy/dev/usb/if_axe.c optional oaxe +legacy/dev/usb/if_cdce.c optional ocdce +legacy/dev/usb/if_cue.c optional ocue +legacy/dev/usb/if_kue.c optional okue +legacy/dev/usb/if_ural.c optional oural +legacy/dev/usb/if_rue.c optional orue +legacy/dev/usb/if_rum.c optional orum +legacy/dev/usb/if_udav.c optional oudav +legacy/dev/usb/if_zyd.c optional ozyd +legacy/dev/usb/ohci.c optional oohci +legacy/dev/usb/ohci_pci.c optional oohci pci +legacy/dev/usb/sl811hs.c optional oslhci +legacy/dev/usb/slhci_pccard.c optional oslhci pccard +legacy/dev/usb/uark.c optional ouark +legacy/dev/usb/u3g.c optional ou3g +legacy/dev/usb/ubsa.c optional oubsa +legacy/dev/usb/ubser.c optional oubser +legacy/dev/usb/ucom.c optional oucom +legacy/dev/usb/ucycom.c optional oucycom +legacy/dev/usb/udbp.c optional oudbp +legacy/dev/usb/ufoma.c optional oufoma +legacy/dev/usb/ufm.c optional oufm +legacy/dev/usb/uftdi.c optional ouftdi +legacy/dev/usb/ugen.c optional ougen +legacy/dev/usb/uhci.c optional ouhci +legacy/dev/usb/uhci_pci.c optional ouhci pci +legacy/dev/usb/uhid.c optional ouhid +legacy/dev/usb/uhub.c optional ousb +legacy/dev/usb/uipaq.c optional ouipaq +legacy/dev/usb/ukbd.c optional oukbd +legacy/dev/usb/ulpt.c optional oulpt +legacy/dev/usb/umass.c optional oumass +legacy/dev/usb/umct.c optional oumct +legacy/dev/usb/umodem.c optional oumodem +legacy/dev/usb/ums.c optional oums +legacy/dev/usb/uplcom.c optional ouplcom +legacy/dev/usb/urio.c optional ourio +legacy/dev/usb/usb.c optional ousb +legacy/dev/usb/usb_ethersubr.c optional ousb +legacy/dev/usb/usb_if.m optional ousb +legacy/dev/usb/usb_mem.c optional ousb +legacy/dev/usb/usb_quirks.c optional ousb +legacy/dev/usb/usb_subr.c optional ousb +legacy/dev/usb/usbdi.c optional ousb +legacy/dev/usb/usbdi_util.c optional ousb +legacy/dev/usb/uscanner.c optional ouscanner +legacy/dev/usb/uslcom.c optional ouslcom +legacy/dev/usb/uvisor.c optional ouvisor +legacy/dev/usb/uvscom.c optional ouvscom # -# USB2 controller drivers +# USB controller drivers # -dev/usb2/controller/at91dci.c optional usb2_core usb2_controller usb2_controller_at91dci -dev/usb2/controller/at91dci_atmelarm.c optional usb2_core usb2_controller usb2_controller_at91dci at91rm9200 -dev/usb2/controller/musb2_otg.c optional usb2_core usb2_controller usb2_controller_musb -dev/usb2/controller/musb2_otg_atmelarm.c optional usb2_core usb2_controller usb2_controller_musb at91rm9200 -dev/usb2/controller/ehci2.c optional usb2_core usb2_controller usb2_controller_ehci -dev/usb2/controller/ehci2_pci.c optional usb2_core usb2_controller usb2_controller_ehci pci -dev/usb2/controller/ohci2.c optional usb2_core usb2_controller usb2_controller_ohci -dev/usb2/controller/ohci2_atmelarm.c optional usb2_core usb2_controller usb2_controller_ohci at91rm9200 -dev/usb2/controller/ohci2_pci.c optional usb2_core usb2_controller usb2_controller_ohci pci -dev/usb2/controller/uhci2.c optional usb2_core usb2_controller usb2_controller_uhci -dev/usb2/controller/uhci2_pci.c optional usb2_core usb2_controller usb2_controller_uhci pci -dev/usb2/controller/uss820dci.c optional usb2_core usb2_controller usb2_controller_uss820dci -dev/usb2/controller/uss820dci_atmelarm.c optional usb2_core usb2_controller usb2_controller_uss820dci at91rm9200 -dev/usb2/controller/usb2_controller.c optional usb2_core usb2_controller +dev/usb/controller/at91dci.c optional at91dci +dev/usb/controller/at91dci_atmelarm.c optional at91dci at91rm9200 +dev/usb/controller/musb_otg.c optional musb +dev/usb/controller/musb_otg_atmelarm.c optional musb at91rm9200 +dev/usb/controller/ehci.c optional ehci +dev/usb/controller/ehci_pci.c optional ehci pci +dev/usb/controller/ohci.c optional ohci +dev/usb/controller/ohci_atmelarm.c optional ohci at91rm9200 +dev/usb/controller/ohci_pci.c optional ohci pci +dev/usb/controller/uhci.c optional uhci +dev/usb/controller/uhci_pci.c optional uhci pci +dev/usb/controller/uss820dci.c optional uss820dci +dev/usb/controller/uss820dci_atmelarm.c optional uss820dci at91rm9200 +dev/usb/controller/usb_controller.c optional usb # -# USB2 storage drivers +# USB storage drivers # -dev/usb2/storage/ata-usb2.c optional usb2_core usb2_storage usb2_storage_ata -dev/usb2/storage/umass2.c optional usb2_core usb2_storage usb2_storage_mass -dev/usb2/storage/urio2.c optional usb2_core usb2_storage usb2_storage_rio -dev/usb2/storage/usb2_storage.c optional usb2_core usb2_storage -dev/usb2/storage/ustorage2_fs.c optional usb2_core usb2_storage usb2_storage_fs +dev/usb/storage/ata-usb.c optional atausb +dev/usb/storage/umass.c optional umass +dev/usb/storage/urio.c optional urio +dev/usb/storage/ustorage_fs.c optional usfs # -# USB2 NDIS driver +# USB core # -dev/usb2/ndis/if_ndis_usb2.c optional usb2_core usb2_ndis -dev/usb2/ndis/usb2_ndis.c optional usb2_core usb2_ndis +dev/usb/usb_busdma.c optional usb +dev/usb/usb_compat_linux.c optional usb +dev/usb/usb_core.c optional usb +dev/usb/usb_debug.c optional usb +dev/usb/usb_dev.c optional usb +dev/usb/usb_device.c optional usb +dev/usb/usb_dynamic.c optional usb +dev/usb/usb_error.c optional usb +dev/usb/usb_generic.c optional usb +dev/usb/usb_handle_request.c optional usb +dev/usb/usb_hid.c optional usb +dev/usb/usb_hub.c optional usb +dev/usb/usb_if.m optional usb >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 23 20:23:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66EA8106568C; Mon, 23 Feb 2009 20:23: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 1A9B81065673 for ; Mon, 23 Feb 2009 20:23:47 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E20C08FC0C for ; Mon, 23 Feb 2009 20:23:46 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NKNkYn008572 for ; Mon, 23 Feb 2009 20:23:46 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NKNkep008570 for perforce@freebsd.org; Mon, 23 Feb 2009 20:23:46 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 23 Feb 2009 20:23:46 GMT Message-Id: <200902232023.n1NKNkep008570@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158149 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 20:23:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=158149 Change 158149 by lulf@lulf_carrot on 2009/02/23 20:23:17 - Point PTBR to the actual pmap instead of the directory. This allows code referring to the PRBR to become a bit simpler, allowing tlb_miss to call pmap_pte for retrieving page. - Simplify restorectx a bit, removing a few unneeded instructions, using register+offset addressing directly, and free one register. - Allocate memory for msgbufp. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#7 edit .. //depot/projects/avr32/src/sys/avr32/avr32/switch.S#6 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#7 (text+ko) ==== @@ -96,11 +96,14 @@ kernel_pmap->pm_pd[j] = (pd_entry_t)(pagetables + (i * NPTEPG)); } + msgbufp = (struct msgbuf *)pmap_steal_memory(MSGBUF_SIZE); + msgbufinit(msgbufp, MSGBUF_SIZE); + kernel_vm_end = VM_MAX_KERNEL_ADDRESS; /* Enable paging */ tlb_flush(); - sysreg_write(PTBR, (uint32_t)kernel_pmap->pm_pd); + sysreg_write(PTBR, (uint32_t)kernel_pmap); sysreg_write(MMUCR, bit_offset(SYS, MMUCR, S) | bit_offset(SYS, MMUCR, E) | @@ -817,15 +820,11 @@ */ static int tlb_at = KSTACK_PAGES; void pmap_tlb_miss(uint32_t ecr, uint32_t tlbear, uint32_t tlbehi) { - pd_entry_t* pd = (pd_entry_t *)sysreg_read(PTBR); + pmap_t pmap = (pmap_t)sysreg_read(PTBR); pt_entry_t *ent; register_t mmucr; - ent = (pt_entry_t *)pd[pd_index_from_va(tlbear)]; - if (ent) { - ent += pt_index_from_va(tlbear); - } - + ent = pmap_pte(pmap, tlbear); if (!ent || !*ent) { breakpoint(); /* printf("\nTLB miss: %x\n", ecr); ==== //depot/projects/avr32/src/sys/avr32/avr32/switch.S#6 (text+ko) ==== @@ -55,7 +55,6 @@ retal sp /* return 0 */ END(savectx) - /** * r12: Pointer struct thread * r11: Pmap @@ -73,26 +72,20 @@ * r4: Misc * r3: tlbehi save * r2: Address of PCB - * r1: Pointer to PD */ /* Load PCB and PD address */ ld.w r2, r12[TD_PCB] - sub r1, r11, -(PMAP_PD) - ld.w r1, r1 - - /* Check if stack is in stack is is P3 */ - sub r10, r12, -(TD_KSTACK) - ld.w r10, r10 + /* Check if stack is in P3 */ + ld.w r10, r12[TD_KSTACK] mov r9, r10 lsr r9, 29 cp r9, 0x6 brne restore_finish /* Add ASID and V flag to kstack value */ - sub r4, r11, -(PMAP_ASID) - ld.w r4, r4 + ld.w r4, r11[PMAP_ASID] add r10, r4 sbr r10, AT32_SYS_TLBEHI_V @@ -140,7 +133,7 @@ brne 1b /* Or not */ restore_finish: - mtsr AT32_SYS_PTBR, r1 /* Point lookups to new pmap */ + mtsr AT32_SYS_PTBR, r11 /* Point lookups to new pmap */ mtsr AT32_SYS_TLBEHI, r10 /* Set TLBEHI (ASID for new td) */ nop /* Wait for mtsr */ ld.w r4, r2++ /* Load status register */ From owner-p4-projects@FreeBSD.ORG Mon Feb 23 20:32:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B5261065672; Mon, 23 Feb 2009 20:32: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 5B058106564A for ; Mon, 23 Feb 2009 20:32:56 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4952E8FC17 for ; Mon, 23 Feb 2009 20:32:56 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NKWuh8010353 for ; Mon, 23 Feb 2009 20:32:56 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NKWuKM010351 for perforce@freebsd.org; Mon, 23 Feb 2009 20:32:56 GMT (envelope-from nwhitehorn@freebsd.org) Date: Mon, 23 Feb 2009 20:32:56 GMT Message-Id: <200902232032.n1NKWuKM010351@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 158150 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 20:32:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=158150 Change 158150 by nwhitehorn@nwhitehorn_trantor on 2009/02/23 20:32:05 Fix mismerge. We should use 'trapsize' not 'vectrapsize' now that vectrap is no longer with us. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#10 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#10 (text+ko) ==== @@ -421,7 +421,7 @@ bcopy(&trapcode, (void *)(EXC_SC + trap_offset), (size_t)&trapsize); bcopy(&trapcode, (void *)(EXC_TRC + trap_offset), (size_t)&trapsize); bcopy(&trapcode, (void *)(EXC_FPA + trap_offset), (size_t)&trapsize); - bcopy(&trapcode, (void *)(EXC_VEC + trap_offset), (size_t)&vectrapsize); + bcopy(&trapcode, (void *)(EXC_VEC + trap_offset), (size_t)&trapsize); bcopy(&trapcode, (void *)(EXC_VECAST + trap_offset), (size_t)&trapsize); bcopy(&trapcode, (void *)(EXC_THRM + trap_offset), (size_t)&trapsize); bcopy(&trapcode, (void *)(EXC_BPT + trap_offset), (size_t)&trapsize); From owner-p4-projects@FreeBSD.ORG Mon Feb 23 21:29:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BFD201065677; Mon, 23 Feb 2009 21:29: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 2CC02106566B for ; Mon, 23 Feb 2009 21:29:56 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 192E48FC0C for ; Mon, 23 Feb 2009 21:29:56 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NLTugw026194 for ; Mon, 23 Feb 2009 21:29:56 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NLTtk9026192 for perforce@freebsd.org; Mon, 23 Feb 2009 21:29:55 GMT (envelope-from zec@icir.org) Date: Mon, 23 Feb 2009 21:29:55 GMT Message-Id: <200902232129.n1NLTtk9026192@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 21:29:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=158158 Change 158158 by zec@zec_tpx32 on 2009/02/23 21:29:18 IFC @ 158157 Affected files ... .. //depot/projects/vimage/src/share/man/man7/hier.7#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#24 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#26 integrate .. //depot/projects/vimage/src/sys/amd64/conf/USB2#2 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#13 integrate .. //depot/projects/vimage/src/sys/arm/conf/BWCT#7 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/HL200#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/KB920X#10 integrate .. //depot/projects/vimage/src/sys/arm/conf/NSLU#6 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#8 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_windrv.c#4 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#11 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/vimage/src/sys/conf/files#56 integrate .. //depot/projects/vimage/src/sys/conf/kmod.mk#10 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-usb.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#20 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pccard.c#4 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.h#3 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio_pcm.c#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/FILES#2 delete .. //depot/projects/vimage/src/sys/dev/usb/README.TXT#1 branch .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/TODO.TXT#1 branch .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt_var.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ubtbcmfw.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci_atmelarm.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_mbus.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_atmelarm.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci_atmelarm.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/dsbr100io.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/ehci.c#12 delete .. //depot/projects/vimage/src/sys/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb/ehci_mbus.c#3 delete .. //depot/projects/vimage/src/sys/dev/usb/ehci_pci.c#12 delete .. //depot/projects/vimage/src/sys/dev/usb/ehcireg.h#5 delete .. //depot/projects/vimage/src/sys/dev/usb/ehcivar.h#7 delete .. //depot/projects/vimage/src/sys/dev/usb/hid.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/hid.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/if_aue.c#10 delete .. //depot/projects/vimage/src/sys/dev/usb/if_auereg.h#5 delete .. //depot/projects/vimage/src/sys/dev/usb/if_axe.c#12 delete .. //depot/projects/vimage/src/sys/dev/usb/if_axereg.h#8 delete .. //depot/projects/vimage/src/sys/dev/usb/if_cdce.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb/if_cdcereg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/if_cue.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/if_cuereg.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/if_kue.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/if_kuereg.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/if_rue.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb/if_ruereg.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/if_rum.c#15 delete .. //depot/projects/vimage/src/sys/dev/usb/if_rumreg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/if_rumvar.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/if_udav.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb/if_udavreg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/if_upgt.c#3 delete .. //depot/projects/vimage/src/sys/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/if_ural.c#17 delete .. //depot/projects/vimage/src/sys/dev/usb/if_uralreg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/if_uralvar.h#5 delete .. //depot/projects/vimage/src/sys/dev/usb/if_urtw.c#3 delete .. //depot/projects/vimage/src/sys/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#15 delete .. //depot/projects/vimage/src/sys/dev/usb/if_zydfw.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/if_zydreg.h#7 delete .. //depot/projects/vimage/src/sys/dev/usb/image/uscanner.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/input/usb_rdesc.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/kue_fw.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/misc/ufm.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_aue.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_auereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_axereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdcereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_cue.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_cuereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_kue.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_kuefw.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_kuereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_rue.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_ruereg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_udav.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/if_udavreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/ohci.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb/ohci_pci.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb/ohcireg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/ohcivar.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/rio500_usb.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/uark.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/ubsa.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/uchcom.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi_reg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/uipaq.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/umoscom.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/uslcom.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/serial/uvscom.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/sl811hs.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/sl811hsvar.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/slhci_pccard.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/storage/rio500_usb.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_cdce.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_msc.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_mtp.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/u3g.c#9 delete .. //depot/projects/vimage/src/sys/dev/usb/uark.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#14 delete .. //depot/projects/vimage/src/sys/dev/usb/ubser.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb/ubser.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/uchcom.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb/ucom.c#12 delete .. //depot/projects/vimage/src/sys/dev/usb/ucomvar.h#8 delete .. //depot/projects/vimage/src/sys/dev/usb/ucycom.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb/udbp.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb/udbp.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/ufm.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/ufm_ioctl.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/ufoma.c#10 delete .. //depot/projects/vimage/src/sys/dev/usb/uftdi.c#9 delete .. //depot/projects/vimage/src/sys/dev/usb/uftdireg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/ugen.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/uhci.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb/uhci_pci.c#10 delete .. //depot/projects/vimage/src/sys/dev/usb/uhcireg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/uhcivar.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/uhid.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb/uhub.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/uipaq.c#9 delete .. //depot/projects/vimage/src/sys/dev/usb/ukbd.c#10 delete .. //depot/projects/vimage/src/sys/dev/usb/ulpt.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/umass.c#16 delete .. //depot/projects/vimage/src/sys/dev/usb/umct.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb/umodem.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb/ums.c#11 delete .. //depot/projects/vimage/src/sys/dev/usb/uplcom.c#9 delete .. //depot/projects/vimage/src/sys/dev/usb/urio.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/usb.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb/usb.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_cdc.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_core.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_defs.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_endian.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_error.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_error.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_ethersubr.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_ethersubr.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_if.m#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_ioctl.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_mem.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_mem.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_mfunc.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_pci.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_port.h#6 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_process.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_process.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_quirks.c#12 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_quirks.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_request.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_revision.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_subr.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_util.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_util.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/usbcdc.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#41 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdi.c#9 delete .. //depot/projects/vimage/src/sys/dev/usb/usbdi.h#7 delete .. //depot/projects/vimage/src/sys/dev/usb/usbdi_util.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb/usbdi_util.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/usbdivar.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/uscanner.c#11 delete .. //depot/projects/vimage/src/sys/dev/usb/uslcom.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb/uvisor.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb/uvscom.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb/uxb360gp_rdesc.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumfw.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydfw.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/usb_wlan.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/TODO.TXT#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/at91dci_atmelarm.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/atmegadci.c#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/atmegadci.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/atmegadci_atmelarm.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2.h#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2_ixp4xx.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2_mbus.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/ehci2_pci.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_atmelarm.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/ohci2_pci.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/uhci2_pci.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_bus.h#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_controller.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/usb2_pci.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/README.TXT#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_busdma.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_compat_linux.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_core.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_core.h#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_debug.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_debug.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dev.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dev.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.c#9 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_dynamic.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_error.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_handle_request.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_handle_request.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hid.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hid.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_hub.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_if.m#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_lookup.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_lookup.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_mbuf.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_mbuf.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.h#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_parse.c#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_parse.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_process.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_process.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.h#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_sw_transfer.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_transfer.h#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_util.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_util.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_auereg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axe2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_axereg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdce2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cdcereg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cue2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_cuereg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kue2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kuefw.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_kuereg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_rue2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_ruereg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udav2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_udavreg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/usb2_ethernet.c#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/usb2_ethernet.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb2/image/usb2_image.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/image/usb2_image.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/image/uscanner2.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/ufm2_ioctl.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_cdc.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_defs.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_endian.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_error.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_hid.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_ioctl.h#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_mfunc.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_revision.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_standard.h#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/input/uhid2.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/input/ukbd2.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/input/ums2.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/input/usb2_input.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/input/usb2_input.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/input/usb2_rdesc.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.c#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/misc/udbp2.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/misc/ufm2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/misc/usb2_misc.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/misc/usb2_misc.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ndis/if_ndis_usb2.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ndis/usb2_ndis.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/ndis/usb2_ndis.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/u3g2.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/uark2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/ubsa2.c#9 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/ubser2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/uchcom2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/ucycom2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/ufoma2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/uftdi2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#10 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/uipaq2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/ulpt2.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/umct2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/umodem2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/umoscom2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/uplcom2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/usb2_serial.h#5 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/uslcom2.c#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/uvisor2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/serial/uvscom2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2_pcm.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/sound/uaudio2_reg.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/sound/usb2_sound.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/sound/usb2_sound.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/storage/ata-usb2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/storage/umass2.c#8 delete .. //depot/projects/vimage/src/sys/dev/usb2/storage/urio2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/storage/usb2_storage.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/storage/usb2_storage.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/storage/ustorage2_fs.c#6 delete .. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template.c#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template_cdce.c#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template_msc.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/template/usb2_template_mtp.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rum2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rumfw.h#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rumreg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_rumvar.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_ural2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_uralreg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_uralvar.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zyd2.c#7 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zydfw.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/if_zydreg.h#3 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/usb2_wlan.c#2 delete .. //depot/projects/vimage/src/sys/dev/usb2/wlan/usb2_wlan.h#2 delete .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#17 integrate .. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#17 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#30 integrate .. //depot/projects/vimage/src/sys/i386/conf/USB2#2 integrate .. //depot/projects/vimage/src/sys/i386/conf/XBOX#8 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#23 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_sysi86.c#3 integrate .. //depot/projects/vimage/src/sys/i386/isa/npx.c#6 integrate .. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#13 integrate .. //depot/projects/vimage/src/sys/legacy/dev/ata/ata-usb.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/sound/usb/uaudio.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/sound/usb/uaudio.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/sound/usb/uaudioreg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/FILES#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/dsbr100io.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_pci.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehcireg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehcivar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/hid.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/hid.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_aue.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_auereg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_axe.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_axereg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_cdce.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_cdcereg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_cue.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_cuereg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_kue.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_kuereg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_rue.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_ruereg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_rum.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_rumreg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_rumvar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_udav.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_udavreg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_upgt.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_ural.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_uralreg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_uralvar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_urtw.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_zyd.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_zydfw.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/if_zydreg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/kue_fw.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohci.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohci_pci.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohcireg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohcivar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/rio500_usb.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/sl811hs.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/sl811hsreg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/sl811hsvar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/slhci_pccard.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/u3g.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uark.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ubsa.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ubser.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ubser.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uchcom.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ucom.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ucomvar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ucycom.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/udbp.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/udbp.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ufm.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ufoma.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uftdi.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uftdireg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ugen.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ugraphire_rdesc.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhci.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhci_pci.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhcireg.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhcivar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhid.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhub.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uipaq.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ukbd.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ulpt.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/umass.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/umct.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/umodem.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/ums.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uplcom.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/urio.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_ethersubr.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_ethersubr.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_if.m#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_mem.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_mem.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_port.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_quirks.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_quirks.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usb_subr.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbcdc.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdevs#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdi.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdi.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdi_util.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdi_util.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbdivar.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/usbhid.h#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uscanner.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uslcom.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uvisor.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uvscom.c#1 branch .. //depot/projects/vimage/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/vimage/src/sys/modules/Makefile#40 integrate .. //depot/projects/vimage/src/sys/modules/ata/atausb/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/aue/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/axe/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/cdce/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/cue/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ehci/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/kue/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/ohci/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/rue/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/rum/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/slhci/Makefile#4 delete .. //depot/projects/vimage/src/sys/modules/sound/driver/uaudio/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/u3g/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/uark/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ubsa/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ucom/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/udav/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/udbp/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ufm/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ufoma/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/uftdi/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ugen/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/uhci/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/uhid/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/uipaq/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ukbd/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ulpt/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/umass/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/umct/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/umodem/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ums/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/upgt/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/uplcom/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ural/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/urio/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/urtw/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb/Makefile#4 integrate .. //depot/projects/vimage/src/sys/modules/usb/at91dci/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/atmegadci/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/aue/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/axe/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/cdce/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/cue/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ehci/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/kue/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/musb/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ohci/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/quirk/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/rue/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/rum/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/template/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/u3g/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uark/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ubsa/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ubser/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uchcom/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ucom/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ucycom/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/udav/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/udbp/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uether/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ufm/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ufoma/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uftdi/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ugensa/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uhci/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uhid/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uipaq/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ukbd/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ulpt/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/umass/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/umct/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/umodem/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/umoscom/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ums/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uplcom/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/ural/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/urio/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/usb/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uscanner/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/usfs/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uslcom/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uss820dci/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uvisor/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/uvscom/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb/zyd/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/usb2/Makefile#6 delete .. //depot/projects/vimage/src/sys/modules/usb2/bluetooth/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_fw/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/bluetooth_ng/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/controller/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/controller_at91dci/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/controller_atmegadci/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/controller_ehci/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/controller_musb/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/controller_ohci/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/controller_uhci/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/controller_uss820dci/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/core/Makefile#4 delete .. //depot/projects/vimage/src/sys/modules/usb2/ethernet/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_aue/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_axe/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cdce/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_cue/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_dav/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_kue/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/ethernet_rue/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/image/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/input/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/input_hid/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/input_kbd/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/input_ms/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/misc/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/misc_dbp/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/misc_fm/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/ndis/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/quirk/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/scanner/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_3g/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_ark/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_bsa/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_bser/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_chcom/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_cycom/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_foma/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_ftdi/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_gensa/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_ipaq/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_lpt/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_mct/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_modem/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_moscom/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_plcom/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_slcom/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_visor/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/serial_vscom/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/sound/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/storage/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/storage_ata/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/storage_fs/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/storage_mass/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/storage_rio/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/template/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/wlan/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/usb2/wlan_ral/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/wlan_rum/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/usb2/wlan_zyd/Makefile#3 delete .. //depot/projects/vimage/src/sys/modules/uscanner/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/uslcom/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/uvisor/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/uvscom/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/zyd/Makefile#2 delete .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#19 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/trap_subr.S#5 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#19 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/MPC85XX#4 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#18 integrate .. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#16 integrate .. //depot/projects/vimage/src/sys/sys/param.h#42 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#19 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man7/hier.7#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.132 2008/11/19 08:56:35 alfred Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.133 2009/02/23 18:36:54 thompsa Exp $ .\" .Dd May 25, 2008 .Dt HIER 7 @@ -232,8 +232,6 @@ .Xr ppbus 4 .It Pa usb/ The USB subsystem -.It Pa usb2/include -The USB subsystem .It Pa utopia/ Physical chip driver for ATM interfaces; see ==== //depot/projects/vimage/src/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.160 2009/01/28 20:35:16 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.161 2009/02/23 15:39:24 jhb Exp $"); #include #include @@ -98,10 +98,8 @@ static void fpu_clean_state(void); -int hw_float = 1; -SYSCTL_INT(_hw,HW_FLOATINGPT, floatingpoint, - CTLFLAG_RD, &hw_float, 0, - "Floatingpoint instructions executed in hardware"); +SYSCTL_INT(_hw, HW_FLOATINGPT, floatingpoint, CTLFLAG_RD, + NULL, 1, "Floating point instructions executed in hardware"); static struct savefpu fpu_cleanstate; static bool_t fpu_cleanstate_ready; ==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#24 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.647 2009/02/14 18:23:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.648 2009/02/23 06:00:24 alc Exp $"); /* * Manages physical address maps. @@ -1932,15 +1932,15 @@ pc->pc_map[field] |= 1ul << bit; /* move to head of list */ TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); - TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); if (pc->pc_map[0] != PC_FREE0 || pc->pc_map[1] != PC_FREE1 || - pc->pc_map[2] != PC_FREE2) + pc->pc_map[2] != PC_FREE2) { + TAILQ_INSERT_HEAD(&pmap->pm_pvchunk, pc, pc_list); return; + } PV_STAT(pv_entry_spare -= _NPCPV); PV_STAT(pc_chunk_count--); PV_STAT(pc_chunk_frees++); /* entire chunk is free, return it */ - TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list); m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc)); dump_drop_page(m->phys_addr); vm_page_unwire(m, 0); ==== //depot/projects/vimage/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.520 2009/02/15 23:40:37 svn Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.521 2009/02/23 18:34:56 thompsa Exp $ cpu HAMMER ident GENERIC @@ -281,97 +281,38 @@ # Note that 'bpf' is required for DHCP. device bpf # Berkeley packet filter -# USB core support -device usb2_core -# USB controller support -device usb2_controller -device usb2_controller_ehci -device usb2_controller_ohci -device usb2_controller_uhci -# USB mass storage support -device usb2_storage -device usb2_storage_mass -# USB ethernet support, requires miibus -device usb2_ethernet -device usb2_ethernet_aue -device usb2_ethernet_axe -device usb2_ethernet_cdce -device usb2_ethernet_cue -device usb2_ethernet_kue -device usb2_ethernet_rue -device usb2_ethernet_dav -# USB wireless LAN support -device usb2_wlan -device usb2_wlan_rum -device usb2_wlan_ral -device usb2_wlan_zyd -# USB serial device support -device usb2_serial -device usb2_serial_ark -device usb2_serial_bsa -device usb2_serial_bser -device usb2_serial_chcom -device usb2_serial_cycom -device usb2_serial_foma -device usb2_serial_ftdi -device usb2_serial_gensa -device usb2_serial_ipaq -device usb2_serial_lpt -device usb2_serial_mct -device usb2_serial_modem -device usb2_serial_moscom -device usb2_serial_plcom -device usb2_serial_slcom -device usb2_serial_visor -device usb2_serial_vscom -# USB bluetooth support -#device usb2_bluetooth -#device usb2_bluetooth_ng -# USB input device support -device usb2_input -device usb2_input_hid -device usb2_input_kbd -device usb2_input_ms -# USB sound and MIDI device support -#device usb2_sound -# USB scanner support -device usb2_image -device usb2_scanner - -# USB support (deprecated) -#device uhci # UHCI PCI->USB interface -#device ohci # OHCI PCI->USB interface -#device ehci # EHCI PCI->USB interface (USB 2.0) -#device usb # USB Bus (required) +# USB support +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) +device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices -#device ugen # Generic -#device uhid # "Human Interface Devices" -#device ukbd # Keyboard -#device ulpt # Printer -#device umass # Disks/Mass storage - Requires scbus and da -#device ums # Mouse -#device ural # Ralink Technology RT2500USB wireless NICs -#device rum # Ralink Technology RT2501USB wireless NICs -#device urio # Diamond Rio 500 MP3 player -#device uscanner # Scanners +device uhid # "Human Interface Devices" +device ukbd # Keyboard +device ulpt # Printer +device umass # Disks/Mass storage - Requires scbus and da +device ums # Mouse +device ural # Ralink Technology RT2500USB wireless NICs +device rum # Ralink Technology RT2501USB wireless NICs +device urio # Diamond Rio 500 MP3 player +device uscanner # Scanners # USB Serial devices -#device ucom # Generic com ttys -#device uark # Technologies ARK3116 based serial adapters -#device ubsa # Belkin F5U103 and compatible serial adapters -#device uftdi # For FTDI usb serial adapters -#device uipaq # Some WinCE based devices -#device uplcom # Prolific PL-2303 serial adapters -#device uslcom # SI Labs CP2101/CP2102 serial adapters -#device uvisor # Visor and Palm devices -#device uvscom # USB serial support for DDI pocket's PHS +device uark # Technologies ARK3116 based serial adapters +device ubsa # Belkin F5U103 and compatible serial adapters +device uftdi # For FTDI usb serial adapters +device uipaq # Some WinCE based devices +device uplcom # Prolific PL-2303 serial adapters +device uslcom # SI Labs CP2101/CP2102 serial adapters +device uvisor # Visor and Palm devices +device uvscom # USB serial support for DDI pocket's PHS # USB Ethernet, requires miibus -#device aue # ADMtek USB Ethernet -#device axe # ASIX Electronics USB Ethernet -#device cdce # Generic USB over Ethernet -#device cue # CATC USB Ethernet -#device kue # Kawasaki LSI USB Ethernet -#device rue # RealTek RTL8150 USB Ethernet -#device udav # Davicom DM9601E USB +device aue # ADMtek USB Ethernet +device axe # ASIX Electronics USB Ethernet +device cdce # Generic USB over Ethernet +device cue # CATC USB Ethernet +device kue # Kawasaki LSI USB Ethernet +device rue # RealTek RTL8150 USB Ethernet +device udav # Davicom DM9601E USB # FireWire support device firewire # FireWire bus code ==== //depot/projects/vimage/src/sys/amd64/conf/USB2#2 (text+ko) ==== @@ -2,7 +2,7 @@ # USB2 -- Generic kernel configuration file for FreeBSD/amd64 with USBng # stack. # -# $FreeBSD: src/sys/amd64/conf/USB2,v 1.3 2009/01/13 19:05:10 thompsa Exp $ +# $FreeBSD: src/sys/amd64/conf/USB2,v 1.4 2009/02/23 18:34:56 thompsa Exp $ include GENERIC @@ -13,7 +13,6 @@ nodevice ohci nodevice ehci nodevice usb -nodevice ugen nodevice uhid nodevice ukbd nodevice ulpt @@ -25,7 +24,6 @@ nodevice urio nodevice uscanner # USB Serial devices -nodevice ucom nodevice u3g nodevice uark nodevice ubsa ==== //depot/projects/vimage/src/sys/arm/conf/AVILA#13 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 23 22:09:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 928B0106566C; Mon, 23 Feb 2009 22:09: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 4F251106564A for ; Mon, 23 Feb 2009 22:09:45 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3B43E8FC14 for ; Mon, 23 Feb 2009 22:09:45 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1NM9jxn030976 for ; Mon, 23 Feb 2009 22:09:45 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1NM9aH6030966 for perforce@freebsd.org; Mon, 23 Feb 2009 22:09:36 GMT (envelope-from zec@icir.org) Date: Mon, 23 Feb 2009 22:09:36 GMT Message-Id: <200902232209.n1NM9aH6030966@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158161 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 23 Feb 2009 22:09:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=158161 Change 158161 by zec@zec_amdx2 on 2009/02/23 22:09:21 IFC @ 158157 Affected files ... .. //depot/projects/vimage-commit2/src/sys/Makefile#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/busdma_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/io_apic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/DEFAULTS#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/USB2#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_sigtramp.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/cpufunc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/elf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/intr_machdep.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/legacyvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/specialreg.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_locore.s#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/vimage-commit2/src/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/arm/dump_machdep.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/genassym.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/uart_dev_at91usart.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA.hints#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/BWCT#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/HL200#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/KB920X#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/NSLU#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/armreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/elf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/ieee.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/intr.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/proc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/sysarch.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/db78xxx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/discovery.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/files.mv#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/db88f6xxx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/kirkwood.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mvvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/obio.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/db88f5xxx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/orion.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/i8134x/i81342_mcu.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_ata.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_led.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.avila#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npereg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_iic.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_intr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_wdog.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425reg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/std.avila#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/vimage-commit2/src/sys/boot/Makefile#7 integrate .. //depot/projects/vimage-commit2/src/sys/boot/Makefile.inc#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/common/load.c#2 delete .. //depot/projects/vimage-commit2/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/common/module.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/ficl/mips/sysdep.c#1 branch .. //depot/projects/vimage-commit2/src/sys/boot/ficl/mips/sysdep.h#1 branch .. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.4th#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#9 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/pnp.4th#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/forth/support.4th#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/boot0/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/bootinfo64.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/loader/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/ia64/efi/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/ia64/ski/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/pc98/loader/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/powerpc/uboot/conf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/common/main.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/zfs/zfsimpl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_domain.h#1 branch .. //depot/projects/vimage-commit2/src/sys/bsm/audit_errno.h#1 branch .. //depot/projects/vimage-commit2/src/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_record.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/vimage-commit2/src/sys/cam/cam_periph.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_periph.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_sim.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_sim.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/cam_xpt_sim.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_all.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_file.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_stats.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/kern_ndis.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/kern_windrv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/ndis_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/usbd_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/winx32_wrap.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_types.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#15 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#22 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#7 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#12 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.ia64#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.pc98#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#7 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sparc64#7 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kern.mk#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kern.post.mk#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#20 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.amd64#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.arm#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.i386#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.ia64#2 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.mips#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.pc98#3 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#2 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/crypto/rc4/rc4.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/crypto/via/padlock_hash.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aac/aac.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aac/aacvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_panasonic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_battery.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_kbd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/adb/adb_mouse.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ae/if_ae.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_amd64.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agppriv.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-card.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-cbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-disk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-raid-ddf.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-raid.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-raid.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-cam.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-cd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-fd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-highpoint.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-netcell.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-via.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar2316.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar2317.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar2413.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/atkbdc/atkbdc_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bm/if_bm.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbus_device.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfe/cfe_console.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_bus_ixp4xx.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_core.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_dev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_reg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cm/smc90cx6.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cx/if_cx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/de/if_de.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/digi/con.CX-IBM.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/digi/con.CX.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/digi/con.EPCX.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/digi/con.MBank.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_scatter.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_irq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/exca/exca.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/fwohcivar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/if_fwip.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/sbp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hifn/hifn7751.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_core.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_intel.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_logging.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/pmc_events.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_pccard.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ad7418.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/icee.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/if_ic.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iic.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iicbb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iicbus/iicsmb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmi_acpi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/isc_subr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/isp/isp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/kbdmux/kbdmux.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/lmc/if_lmc.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/md/md.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mge.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mgevar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcreg.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mpt/mpt.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mpt/mpt_raid.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mpt/mpt_user.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_msk.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_eth_z8e.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_ethp_z8e.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/my/if_my.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nve/if_nve.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_bus_subr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_if.m#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_iicbus.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_standard.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofwvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/openfirmio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/card_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccardvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccardvarp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbbvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pcn/if_pcn.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/if_plip.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/immio.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/lpbb.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/lpt.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/pcfclock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/ppb_1284.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/ppb_base.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/ppb_msq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/ppbconf.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/ppbconf.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/ppi.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/pps.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/vpo.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/vpoio.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc_acpi.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc_isa.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppcreg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/safe/safe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/scc/scc_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sdhci/sdhci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/si/si.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sis/if_sis.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smbus/smb.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/snp/snp.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/aoa.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/aoa.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/davbus.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/davbusreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/i2s.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/snapper.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/macio/tumbler.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/au88x0.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/au88x0.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/envy24.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/envy24ht.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/spicds.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/mixer.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/speaker/spkr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/streams/streams.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-dumb.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-sc.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-teken.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/sctermvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/gensequences#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/sequences#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_demo.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_scs.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_stress.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_subr.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_subr_compat.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_wcwidth.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/tl/if_tl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec_ocp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsecreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_cpu_mv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/FILES#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/README.TXT#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/TODO.TXT#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ng_ubt.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ng_ubt_var.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ubtbcmfw.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci_atmelarm.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_ixp4xx.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_mbus.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_pci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg_atmelarm.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_atmelarm.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_pci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci_pci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci_atmelarm.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/dsbr100io.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci_mbus.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehci_pci.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehcireg.h#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ehcivar.h#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/hid.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/hid.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_aue.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_auereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_axe.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_axereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_cdce.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_cdcereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_cue.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_cuereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_kue.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_kuereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_rue.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_ruereg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_rum.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_rumreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_rumvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_udav.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_udavreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_upgt.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_ural.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_uralreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_uralvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_zyd.c#7 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_zydfw.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_zydreg.h#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/image/uscanner.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/uhid.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/usb_rdesc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/kue_fw.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/ufm.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_aue.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_auereg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axereg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdcereg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cue.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cuereg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kue.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kuefw.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kuereg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_rue.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_ruereg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udav.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udavreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/ohci.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ohci_pci.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ohcireg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ohcivar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/quirk/usb_quirk.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/quirk/usb_quirk.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/rio500_usb.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/rt2573_ucode.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uark.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubsa.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubser.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uchcom.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ucycom.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ufoma.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi_reg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uipaq.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umoscom.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uslcom.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvisor.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvscom.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/sl811hs.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/sl811hsreg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/sl811hsvar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/slhci_pccard.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/rio500_usb.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/urio.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_cdce.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_msc.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_mtp.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/u3g.c#6 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uark.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ubsa.c#7 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ubser.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ubser.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uchcom.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucom.c#7 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucomvar.h#6 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ucycom.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/udbp.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/udbp.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ufm.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ufm_ioctl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/ufoma.c#6 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uftdi.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uftdireg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ugen.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ugraphire_rdesc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uhci.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uhci_pci.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uhcireg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uhcivar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uhid.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uhub.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uipaq.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ukbd.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ulpt.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/umass.c#6 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/umct.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/umodem.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/ums.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uplcom.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/urio.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_cdc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_debug.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_defs.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dynamic.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_endian.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_error.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_error.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_ethersubr.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_ethersubr.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_if.m#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_ioctl.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_lookup.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mbuf.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mem.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mem.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_mfunc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_msctest.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_parse.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_pci.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_port.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_process.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_quirks.c#6 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_quirks.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_revision.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_subr.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_sw_transfer.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_sw_transfer.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_util.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbcdc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdi.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdi.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdi_util.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdi_util.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdivar.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbhid.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/uscanner.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uslcom.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uvisor.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uvscom.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/uxb360gp_rdesc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumfw.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uralreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uralvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydfw.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydreg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/usb_wlan.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/TODO.TXT#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/ng_ubt2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/at91dci.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/at91dci.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/at91dci_atmelarm.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ehci2.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ehci2.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ehci2_pci.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/musb2_otg.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/musb2_otg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ohci2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ohci2.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ohci2_atmelarm.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/ohci2_pci.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uhci2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uhci2.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uhci2_pci.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/usb2_bus.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/usb2_controller.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/usb2_controller.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/usb2_pci.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uss820dci.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uss820dci.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/README.TXT#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_busdma.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_busdma.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_compat_linux.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_compat_linux.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_config_td.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_config_td.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_core.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_core.h#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_debug.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_debug.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dev.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dev.h#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_device.c#6 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_device.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dynamic.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_dynamic.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_error.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_generic.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_generic.h#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_handle_request.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_handle_request.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hid.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hid.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hub.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_hub.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_if.m#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_lookup.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_lookup.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_mbuf.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_mbuf.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_msctest.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_msctest.h#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_parse.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_parse.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_process.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_process.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_request.c#6 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_request.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_sw_transfer.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_sw_transfer.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_transfer.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_transfer.h#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_util.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_util.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_aue2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_aue2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_axe2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_axe2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cdce2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cdce2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cue2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_cue2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_kue2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_kue2_fw.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_kue2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_rue2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_rue2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_udav2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_udav2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/usb2_ethernet.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/usb2_ethernet.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/image/usb2_image.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/image/usb2_image.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/image/uscanner2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/Makefile#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/ufm2_ioctl.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_cdc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_defs.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_devid.h#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_devtable.h#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_endian.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_error.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_hid.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_ioctl.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_mfunc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_revision.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_standard.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/uhid2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/ukbd2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/ums2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/usb2_input.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/usb2_input.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/input/usb2_rdesc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/udbp2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/udbp2.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/ufm2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/usb2_misc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/misc/usb2_misc.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ndis/if_ndis_usb2.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ndis/usb2_ndis.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ndis/usb2_ndis.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/quirk/usb2_quirk.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/quirk/usb2_quirk.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/u3g2.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uark2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ubsa2.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ubser2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uchcom2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ucycom2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ufoma2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uftdi2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uftdi2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ugensa2.c#6 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uipaq2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ulpt2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/umct2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/umodem2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/umoscom2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uplcom2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/usb2_serial.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/usb2_serial.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uvisor2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/uvscom2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2.h#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2_pcm.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/uaudio2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/usb2_sound.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/sound/usb2_sound.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/ata-usb2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/umass2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/urio2.c#4 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/usb2_storage.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/usb2_storage.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/storage/ustorage2_fs.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template_cdce.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template_msc.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/template/usb2_template_mtp.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_rum2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_rum2_fw.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_rum2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_rum2_var.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_ural2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_ural2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_ural2_var.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_zyd2.c#3 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_zyd2_fw.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/if_zyd2_reg.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/usb2_wlan.c#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/usb2/wlan/usb2_wlan.h#2 delete .. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpi.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkback/blkback.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/blkfront.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/netback/netback.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_lookup.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_node.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_vfsops.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_devs.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/hpfs/hpfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/hpfs/hpfs_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_conv.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_denode.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/ntfs/ntfs_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nwfs/nwfs_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nwfs/nwfs_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vncache.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/ecma167-udf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_dev.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_subr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_vfs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/label/g_label_msdosfs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_apm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_bsd.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_ebr.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 24 09:53:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8480410656C3; Tue, 24 Feb 2009 09:53: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 353A810656BE for ; Tue, 24 Feb 2009 09:53:55 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2282A8FC18 for ; Tue, 24 Feb 2009 09:53:55 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1O9rtaT039272 for ; Tue, 24 Feb 2009 09:53:55 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1O9rtCu039270 for perforce@freebsd.org; Tue, 24 Feb 2009 09:53:55 GMT (envelope-from andrew@freebsd.org) Date: Tue, 24 Feb 2009 09:53:55 GMT Message-Id: <200902240953.n1O9rtCu039270@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 158191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Feb 2009 09:53:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=158191 Change 158191 by andrew@andrew_bender on 2009/02/24 09:53:24 Correctly calculate the clock speeds on s3c244x Fix the console so it will only appear on the uart the kernel sends it's output to. Support the UART in both s3c241x and s3c244x. Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2440reg.h#1 add .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#9 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#5 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0reg.h#4 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0var.h#4 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#5 edit .. //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0.c#9 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include @@ -334,6 +335,11 @@ S3C24X0_TIMER_SIZE, 0, &sc->sc_timer_ioh)) panic("cannot map TIMER"); + /* + * Identify the CPU + */ + s3c24x0_identify_cpu(dev); + /* calculate current clock frequency */ s3c24x0_clock_freq(&sc->sc_sx); printf(": fclk %d MHz hclk %d MHz pclk %d MHz", @@ -342,11 +348,6 @@ printf("\n"); /* - * Identify the CPU - */ - s3c24x0_identify_cpu(dev); - - /* * Attach children devices */ s3c2xx0_softc->s3c2xx0_irq_rman.rm_type = RMAN_ARRAY; @@ -373,7 +374,7 @@ S3C2410_SDI_SIZE); /* Add the uart and set it's irq and registers */ - for (i = 0; i < 1; i++) { + for (i = 0; i < 3; i++) { child = s3c24x0_add_child(dev, 0, "uart", i); irq = 0; @@ -425,11 +426,11 @@ /* * fill sc_pclk, sc_hclk, sc_fclk from values of clock controller register. * - * s3c24x0_clock_freq2() is meant to be called from kernel startup routines. + * s3c24{1,4}0_clock_freq2() is meant to be called from kernel startup routines. * s3c24x0_clock_freq() is for after kernel initialization is done. */ void -s3c24x0_clock_freq2(vm_offset_t clkman_base, int *fclk, int *hclk, int *pclk) +s3c2410_clock_freq2(vm_offset_t clkman_base, int *fclk, int *hclk, int *pclk) { uint32_t pllcon, divn; int mdiv, pdiv, sdiv; @@ -444,7 +445,7 @@ f = ((mdiv + 8) * S3C2XX0_XTAL_CLK) / ((pdiv + 2) * (1 << sdiv)); h = f; - if (divn & CLKDIVN_HDIVN) + if (divn & S3C2410_CLKDIVN_HDIVN) h /= 2; p = h; if (divn & CLKDIVN_PDIVN) @@ -453,7 +454,53 @@ if (fclk) *fclk = f; if (hclk) *hclk = h; if (pclk) *pclk = p; +} + +void +s3c2440_clock_freq2(vm_offset_t clkman_base, int *fclk, int *hclk, int *pclk) +{ + uint32_t pllcon, divn, camdivn; + int mdiv, pdiv, sdiv; + int f, h, p; + + pllcon = *(volatile uint32_t *)(clkman_base + CLKMAN_MPLLCON); + divn = *(volatile uint32_t *)(clkman_base + CLKMAN_CLKDIVN); + camdivn = *(volatile uint32_t *)(clkman_base + S3C2440_CLKMAN_CAMDIVN); + + mdiv = (pllcon & PLLCON_MDIV_MASK) >> PLLCON_MDIV_SHIFT; + pdiv = (pllcon & PLLCON_PDIV_MASK) >> PLLCON_PDIV_SHIFT; + sdiv = (pllcon & PLLCON_SDIV_MASK) >> PLLCON_SDIV_SHIFT; + + f = (2 * (mdiv + 8) * S3C2XX0_XTAL_CLK) / ((pdiv + 2) * (1 << sdiv)); + h = f; + switch((divn >> 1) & 3) { + case 0: + break; + case 1: + h /= 2; + break; + case 2: + if ((camdivn & S3C2440_CAMDIVN_HCLK4_HALF) == + S3C2440_CAMDIVN_HCLK4_HALF) + h /= 8; + else + h /= 4; + break; + case 3: + if ((camdivn & S3C2440_CAMDIVN_HCLK3_HALF) == + S3C2440_CAMDIVN_HCLK3_HALF) + h /= 6; + else + h /= 3; + break; + } + p = h; + if (divn & CLKDIVN_PDIVN) + p /= 2; + if (fclk) *fclk = f; + if (hclk) *hclk = h; + if (pclk) *pclk = p; } void @@ -462,7 +509,16 @@ vm_offset_t va; va = sc->sc_clkman_ioh; - s3c24x0_clock_freq2(va, &sc->sc_fclk, &sc->sc_hclk, &sc->sc_pclk); + switch(sc->sc_cpu) { + case CPU_S3C2410: + s3c2410_clock_freq2(va, &sc->sc_fclk, &sc->sc_hclk, + &sc->sc_pclk); + break; + case CPU_S3C2440: + s3c2440_clock_freq2(va, &sc->sc_fclk, &sc->sc_hclk, + &sc->sc_pclk); + break; + } } void ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0_machdep.c#5 (text+ko) ==== @@ -149,36 +149,34 @@ * with the MMU on or off. */ { - /* - * Map the IRQ Controller - */ - _A(S3C24X0_INTCTL_BASE), - _A(S3C24X0_INTCTL_BASE), - _S(S3C24X0_INTCTL_SIZE), + _A(S3C24X0_CLKMAN_BASE), + _A(S3C24X0_CLKMAN_BASE), + _S(S3C24X0_CLKMAN_SIZE), VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { - _A(S3C24X0_CLKMAN_BASE), - _A(S3C24X0_CLKMAN_BASE), - _S(S3C24X0_CLKMAN_SIZE), - VM_PROT_READ|VM_PROT_WRITE, + _A(S3C24X0_GPIO_BASE), + _A(S3C24X0_GPIO_BASE), + _S(S3C2410_GPIO_SIZE), + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { - /* - * Map the UART to VA == PA - */ - _A(S3C24X0_UART0_BASE), - _A(S3C24X0_UART0_BASE), - _S(S3C24X0_UART_BASE(3) - S3C24X0_UART0_BASE), + _A(S3C24X0_IIC_BASE), + _A(S3C24X0_IIC_BASE), + _S(S3C24X0_IIC_SIZE), VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { - /* - * Map the LCD to VA == PA - */ + _A(S3C24X0_INTCTL_BASE), + _A(S3C24X0_INTCTL_BASE), + _S(S3C24X0_INTCTL_SIZE), + VM_PROT_READ|VM_PROT_WRITE, + PTE_NOCACHE, + }, + { _A(S3C24X0_LCDC_BASE), _A(S3C24X0_LCDC_BASE), _S(S3C24X0_LCDC_SIZE), @@ -186,9 +184,6 @@ PTE_NOCACHE, }, { - /* - * Map the MMC/SD to VA == PA - */ _A(S3C24X0_SDI_BASE), _A(S3C24X0_SDI_BASE), _S(S3C2410_SDI_SIZE), @@ -196,12 +191,9 @@ PTE_NOCACHE, }, { - /* - * Map the IIC to VA == PA - */ - _A(S3C24X0_IIC_BASE), - _A(S3C24X0_IIC_BASE), - _S(S3C24X0_IIC_SIZE), + _A(S3C24X0_UART0_BASE), + _A(S3C24X0_UART0_BASE), + _S(S3C24X0_UART_BASE(3) - S3C24X0_UART0_BASE), VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, @@ -217,6 +209,7 @@ #undef _A #undef _S +#define ioreg_read32(a) (*(volatile uint32_t *)(a)) #define ioreg_write32(a,v) (*(volatile uint32_t *)(a)=(v)) #ifdef DDB @@ -389,7 +382,16 @@ ioreg_write32(S3C24X0_INTCTL_BASE + INTCTL_INTMSK, ~0); memsize = board_init(); /* Find pclk for uart */ - s3c24x0_clock_freq2(S3C24X0_CLKMAN_BASE, NULL, NULL, &s3c2410_pclk); + switch(ioreg_read32(S3C24X0_GPIO_BASE + GPIO_GSTATUS1) >> 16) { + case 0x3241: + s3c2410_clock_freq2(S3C24X0_CLKMAN_BASE, NULL, NULL, + &s3c2410_pclk); + break; + case 0x3244: + s3c2440_clock_freq2(S3C24X0_CLKMAN_BASE, NULL, NULL, + &s3c2410_pclk); + break; + } cninit(); /* Set stack for exception handlers */ ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0reg.h#4 (text+ko) ==== @@ -230,7 +230,6 @@ #define CLKSLOW_VAL_MASK 0x0f /* divider value for slow clock */ #define CLKMAN_CLKDIVN 0x14 /* Software reset control */ -#define CLKDIVN_HDIVN (1<<1) #define CLKDIVN_PDIVN (1<<0) #define S3C24X0_CLKMAN_SIZE 0x18 ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c24x0var.h#4 (text+ko) ==== @@ -42,7 +42,8 @@ }; void s3c24x0_clock_freq(struct s3c2xx0_softc *); -void s3c24x0_clock_freq2(vm_offset_t, int *, int *, int *); +void s3c2410_clock_freq2(vm_offset_t, int *, int *, int *); +void s3c2440_clock_freq2(vm_offset_t, int *, int *, int *); void s3c24x0_sleep(int); ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_bus_s3c2410.c#5 (text+ko) ==== @@ -15,6 +15,8 @@ #include #include +#include + #include "uart_if.h" static int uart_s3c2410_probe(device_t dev); @@ -38,14 +40,20 @@ static int uart_s3c2410_probe(device_t dev) { + struct uart_devinfo *sysdev; struct uart_softc *sc; + int unit; sc = device_get_softc(dev); - sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs); sc->sc_class = &uart_s3c2410_class; - bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); - return(uart_bus_probe(dev, 0, 0, 0, 0)); - return (0); + + unit = device_get_unit(dev); + sysdev = SLIST_FIRST(&uart_sysdevs); + if (S3C24X0_UART_BASE(unit) == sysdev->bas.bsh) { + sc->sc_sysdev = sysdev; + bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); + } + return(uart_bus_probe(dev, 0, 0, 0, unit)); } DRIVER_MODULE(uart, s3c24x0, uart_s3c2410_driver, uart_devclass, 0, 0); ==== //depot/projects/arm/src/sys/arm/s3c2xx0/uart_dev_s3c2410.c#11 (text+ko) ==== @@ -41,9 +41,10 @@ #include #include #include -#include +#include #include #include +#include #include "uart_if.h" /* Finds the subirq from the parent */ @@ -240,14 +241,19 @@ { uintptr_t irq; - bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas)); - - /* - * TODO: The S3C2410 has a 16 byte fifo, the s3c2440 has a - * 64 byte fifo. figure out which CPU we are on to set this - */ - sc->sc_txfifosz = 16; - sc->sc_rxfifosz = 16; + switch(s3c2xx0_softc->sc_cpu) { + case CPU_S3C2410: + sc->sc_txfifosz = 16; + sc->sc_rxfifosz = 16; + break; + case CPU_S3C2440: + sc->sc_txfifosz = 64; + sc->sc_rxfifosz = 64; + break; + default: + return (ENXIO); + } + sc->sc_hwiflow = 0; sc->sc_hwoflow = 0; @@ -256,6 +262,7 @@ arm_unmask_irq(get_sub_irq(irq, RX_OFF)); arm_unmask_irq(get_sub_irq(irq, TX_OFF)); arm_unmask_irq(get_sub_irq(irq, ERR_OFF)); + return (0); } @@ -316,22 +323,32 @@ static int s3c2410_bus_ipend(struct uart_softc *sc) { + uint32_t ufstat, txmask, rxmask; uintptr_t irq; - uint32_t ufstat; int ipend = 0; uart_lock(sc->sc_hwmtx); ufstat = bus_space_read_4(sc->sc_bas.bst, sc->sc_bas.bsh, SSCOM_UFSTAT); uart_unlock(sc->sc_hwmtx); - /* XXX: The register values are incorrect on the s3c244x */ - if ((ufstat & UFSTAT_TXCOUNT) == 0) { + txmask = rxmask = 0; + switch (s3c2xx0_softc->sc_cpu) { + case CPU_S3C2410: + txmask = UFSTAT_TXCOUNT; + rxmask = UFSTAT_RXCOUNT; + break; + case CPU_S3C2440: + txmask = S3C2440_UFSTAT_TXCOUNT; + rxmask = S3C2440_UFSTAT_RXCOUNT; + break; + } + if ((ufstat & txmask) == 0) { if (sc->sc_txbusy != 0) ipend |= SER_INT_TXIDLE; irq = rman_get_start(sc->sc_ires); arm_mask_irq(get_sub_irq(irq, TX_OFF)); } - if ((ufstat & UFSTAT_RXCOUNT) > 0) { + if ((ufstat & rxmask) > 0) { ipend |= SER_INT_RXREADY; } From owner-p4-projects@FreeBSD.ORG Tue Feb 24 10:17:19 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EDF01065670; Tue, 24 Feb 2009 10:17: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 3BCFD106564A for ; Tue, 24 Feb 2009 10:17:19 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A2008FC0A for ; Tue, 24 Feb 2009 10:17:19 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1OAHIYO041999 for ; Tue, 24 Feb 2009 10:17:18 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1OAHIeq041997 for perforce@freebsd.org; Tue, 24 Feb 2009 10:17:18 GMT (envelope-from andrew@freebsd.org) Date: Tue, 24 Feb 2009 10:17:18 GMT Message-Id: <200902241017.n1OAHIeq041997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 158192 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Feb 2009 10:17:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=158192 Change 158192 by andrew@andrew_bender on 2009/02/24 10:16:52 Fix the name of some s3c2410 registers missed in change 158191 Affected files ... .. //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#7 edit Differences ... ==== //depot/projects/arm/src/sys/arm/s3c2xx0/s3c2410reg.h#7 (text+ko) ==== @@ -55,9 +55,9 @@ /* Clock control */ /* CLKMAN_CLKCON */ -#define CLKCON_STOP (1<<0) /* 1=transition to STOP mode */ +#define S3C2410_CLKCON_SM (1<<0) /* 1=transition to SPECIAL mode */ /* CLKMAN_CLKDIVN */ -#define CLKDIVN_HDIVN (1<<1) /* hclk=fclk/2 */ +#define S3C2410_CLKDIVN_HDIVN (1<<1) /* hclk=fclk/2 */ /* NAND Flash controller */ #define S3C2410_NANDFC_SIZE 0x18 From owner-p4-projects@FreeBSD.ORG Tue Feb 24 18:11:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 014DA1065678; Tue, 24 Feb 2009 18:11: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 9A5B01065670 for ; Tue, 24 Feb 2009 18:11:29 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 861328FC1D for ; Tue, 24 Feb 2009 18:11:29 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1OIBTE4009783 for ; Tue, 24 Feb 2009 18:11:29 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1OIBMXl009777 for perforce@freebsd.org; Tue, 24 Feb 2009 18:11:22 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 24 Feb 2009 18:11:22 GMT Message-Id: <200902241811.n1OIBMXl009777@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 158214 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Feb 2009 18:11:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=158214 Change 158214 by thompsa@thompsa_burger on 2009/02/24 18:11:02 IFC @158210 Affected files ... .. //depot/projects/usb/src/sys/Makefile#10 integrate .. //depot/projects/usb/src/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#13 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#15 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#15 integrate .. //depot/projects/usb/src/sys/amd64/conf/USB2#4 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#12 integrate .. //depot/projects/usb/src/sys/arm/arm/genassym.c#7 integrate .. //depot/projects/usb/src/sys/arm/arm/machdep.c#8 integrate .. //depot/projects/usb/src/sys/arm/arm/swtch.S#6 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#12 integrate .. //depot/projects/usb/src/sys/arm/conf/BWCT#7 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#3 integrate .. //depot/projects/usb/src/sys/arm/conf/HL200#7 integrate .. //depot/projects/usb/src/sys/arm/conf/KB920X#17 integrate .. //depot/projects/usb/src/sys/arm/conf/NSLU#6 integrate .. //depot/projects/usb/src/sys/arm/include/proc.h#2 integrate .. //depot/projects/usb/src/sys/arm/include/sysarch.h#3 integrate .. //depot/projects/usb/src/sys/arm/mv/files.mv#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#11 integrate .. //depot/projects/usb/src/sys/boot/Makefile#10 integrate .. //depot/projects/usb/src/sys/boot/Makefile.inc#2 integrate .. //depot/projects/usb/src/sys/boot/common/loader.8#8 integrate .. //depot/projects/usb/src/sys/boot/common/module.c#3 integrate .. //depot/projects/usb/src/sys/boot/ficl/mips/sysdep.c#1 branch .. //depot/projects/usb/src/sys/boot/ficl/mips/sysdep.h#1 branch .. //depot/projects/usb/src/sys/boot/i386/loader/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/ia64/common/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/ia64/efi/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/ia64/ski/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/sparc64/loader/main.c#7 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#15 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#9 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#13 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#15 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_file.c#11 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_getcwd.c#7 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_stats.c#10 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#9 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#5 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#12 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_misc.c#9 integrate .. //depot/projects/usb/src/sys/conf/NOTES#29 integrate .. //depot/projects/usb/src/sys/conf/files#53 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#16 integrate .. //depot/projects/usb/src/sys/conf/files.i386#18 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#10 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#15 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#17 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#12 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#9 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#12 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#6 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_debug.c#4 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_pci.c#9 integrate .. //depot/projects/usb/src/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/aac/aacvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#7 integrate .. //depot/projects/usb/src/sys/dev/arcmsr/arcmsr.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-card.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-isa.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#15 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid-ddf.h#1 branch .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.h#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-highpoint.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-netcell.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah.h#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#5 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#4 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#2 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#2 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#17 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athioctl.h#7 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#13 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#15 integrate .. //depot/projects/usb/src/sys/dev/ce/if_ce.c#7 integrate .. //depot/projects/usb/src/sys/dev/cfi/cfi_bus_ixp4xx.c#2 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#13 integrate .. //depot/projects/usb/src/sys/dev/cm/smc90cx6.c#5 integrate .. //depot/projects/usb/src/sys/dev/cp/if_cp.c#7 integrate .. //depot/projects/usb/src/sys/dev/ctau/if_ct.c#7 integrate .. //depot/projects/usb/src/sys/dev/cx/if_cx.c#6 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewire.h#4 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwohci.c#7 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwphyreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/firewire/sbp.c#8 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#17 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#11 integrate .. //depot/projects/usb/src/sys/dev/iicbus/if_ic.c#5 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbb.c#6 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#9 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicsmb.c#6 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/isc_subr.c#3 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/usb/src/sys/dev/kbdmux/kbdmux.c#9 integrate .. //depot/projects/usb/src/sys/dev/md/md.c#10 integrate .. //depot/projects/usb/src/sys/dev/mmc/mmcsd.c#7 integrate .. //depot/projects/usb/src/sys/dev/mxge/eth_z8e.h#4 integrate .. //depot/projects/usb/src/sys/dev/mxge/ethp_z8e.h#4 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#10 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#10 integrate .. //depot/projects/usb/src/sys/dev/mxge/mxge_mcp.h#8 integrate .. //depot/projects/usb/src/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/usb/src/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb_pci.c#9 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbbvar.h#8 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#10 integrate .. //depot/projects/usb/src/sys/dev/ppbus/lpt.c#8 integrate .. //depot/projects/usb/src/sys/dev/ppc/ppc_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/puc/pucdata.c#10 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#15 integrate .. //depot/projects/usb/src/sys/dev/sdhci/sdhci.c#4 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#4 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#7 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#6 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#23 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/spicds.c#4 integrate .. //depot/projects/usb/src/sys/dev/streams/streams.c#7 integrate .. //depot/projects/usb/src/sys/dev/tl/if_tl.c#2 integrate .. //depot/projects/usb/src/sys/dev/tsec/if_tsec.c#3 integrate .. //depot/projects/usb/src/sys/dev/tsec/if_tsec.h#3 integrate .. //depot/projects/usb/src/sys/dev/tsec/if_tsec_ocp.c#2 integrate .. //depot/projects/usb/src/sys/dev/tsec/if_tsecreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/tx/if_tx.c#5 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/FILES#4 delete .. //depot/projects/usb/src/sys/dev/usb/README.TXT#1 branch .. //depot/projects/usb/src/sys/dev/usb/bluetooth/TODO.TXT#1 branch .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt_var.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/at91dci_atmelarm.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_mbus.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_atmelarm.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/controller/uss820dci_atmelarm.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/dsbr100io.h#8 delete .. //depot/projects/usb/src/sys/dev/usb/ehci.c#86 delete .. //depot/projects/usb/src/sys/dev/usb/ehci_ddb.c#2 delete .. //depot/projects/usb/src/sys/dev/usb/ehci_ixp4xx.c#2 delete .. //depot/projects/usb/src/sys/dev/usb/ehci_mbus.c#4 delete .. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#42 delete .. //depot/projects/usb/src/sys/dev/usb/ehcireg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb/ehcivar.h#7 delete .. //depot/projects/usb/src/sys/dev/usb/hid.c#7 delete .. //depot/projects/usb/src/sys/dev/usb/hid.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#50 delete .. //depot/projects/usb/src/sys/dev/usb/if_auereg.h#16 delete .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#52 delete .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#20 delete .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#52 delete .. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#19 delete .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#45 delete .. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#15 delete .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#47 delete .. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#14 delete .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#44 delete .. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#15 delete .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#38 delete .. //depot/projects/usb/src/sys/dev/usb/if_rumreg.h#7 delete .. //depot/projects/usb/src/sys/dev/usb/if_rumvar.h#9 delete .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#48 delete .. //depot/projects/usb/src/sys/dev/usb/if_udavreg.h#13 delete .. //depot/projects/usb/src/sys/dev/usb/if_upgt.c#3 delete .. //depot/projects/usb/src/sys/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#63 delete .. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#18 delete .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#24 delete .. //depot/projects/usb/src/sys/dev/usb/if_urtw.c#3 delete .. //depot/projects/usb/src/sys/dev/usb/if_urtwreg.h#2 delete .. //depot/projects/usb/src/sys/dev/usb/if_urtwvar.h#2 delete .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#48 delete .. //depot/projects/usb/src/sys/dev/usb/if_zydfw.h#8 delete .. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#20 delete .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/input/usb_rdesc.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/kue_fw.h#6 delete .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_auereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_axereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_cdcereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_cuereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_kuefw.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_kuereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_ruereg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/if_udavreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/ohci.c#67 delete .. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#34 delete .. //depot/projects/usb/src/sys/dev/usb/ohcireg.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/ohcivar.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/rio500_usb.h#11 delete .. //depot/projects/usb/src/sys/dev/usb/rt2573_ucode.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi_reg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/usb_serial.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/sl811hs.c#9 delete .. //depot/projects/usb/src/sys/dev/usb/sl811hsreg.h#5 delete .. //depot/projects/usb/src/sys/dev/usb/sl811hsvar.h#7 delete .. //depot/projects/usb/src/sys/dev/usb/slhci_pccard.c#9 delete .. //depot/projects/usb/src/sys/dev/usb/storage/rio500_usb.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/template/usb_template_cdce.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/template/usb_template_msc.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/template/usb_template_mtp.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/u3g.c#5 delete .. //depot/projects/usb/src/sys/dev/usb/uark.c#26 delete .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#47 delete .. //depot/projects/usb/src/sys/dev/usb/ubser.c#32 delete .. //depot/projects/usb/src/sys/dev/usb/ubser.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#25 delete .. //depot/projects/usb/src/sys/dev/usb/ucom.c#35 delete .. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#20 delete .. //depot/projects/usb/src/sys/dev/usb/ucycom.c#36 delete .. //depot/projects/usb/src/sys/dev/usb/udbp.c#29 delete .. //depot/projects/usb/src/sys/dev/usb/udbp.h#10 delete .. //depot/projects/usb/src/sys/dev/usb/ufm.c#22 delete .. //depot/projects/usb/src/sys/dev/usb/ufm_ioctl.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#45 delete .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#42 delete .. //depot/projects/usb/src/sys/dev/usb/uftdireg.h#9 delete .. //depot/projects/usb/src/sys/dev/usb/ugen.c#47 delete .. //depot/projects/usb/src/sys/dev/usb/ugraphire_rdesc.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/uhci.c#64 delete .. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#37 delete .. //depot/projects/usb/src/sys/dev/usb/uhcireg.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/uhcivar.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/uhid.c#36 delete .. //depot/projects/usb/src/sys/dev/usb/uhub.c#35 delete .. //depot/projects/usb/src/sys/dev/usb/uipaq.c#29 delete .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#46 delete .. //depot/projects/usb/src/sys/dev/usb/ulpt.c#47 delete .. //depot/projects/usb/src/sys/dev/usb/umass.c#54 delete .. //depot/projects/usb/src/sys/dev/usb/umct.c#35 delete .. //depot/projects/usb/src/sys/dev/usb/umodem.c#45 delete .. //depot/projects/usb/src/sys/dev/usb/ums.c#48 delete .. //depot/projects/usb/src/sys/dev/usb/uplcom.c#46 delete .. //depot/projects/usb/src/sys/dev/usb/urio.c#29 delete .. //depot/projects/usb/src/sys/dev/usb/usb.c#38 delete .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#10 branch .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#28 branch .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#10 branch .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_core.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_debug.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_debug.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_defs.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_endian.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_error.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_error.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_ethersubr.c#8 delete .. //depot/projects/usb/src/sys/dev/usb/usb_ethersubr.h#6 delete .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_generic.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_handle_request.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#17 branch .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#12 branch .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_lookup.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_mbuf.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_mem.c#4 delete .. //depot/projects/usb/src/sys/dev/usb/usb_mem.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/usb_mfunc.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_msctest.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_parse.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_parse.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_pci.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#28 delete .. //depot/projects/usb/src/sys/dev/usb/usb_process.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_process.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#23 delete .. //depot/projects/usb/src/sys/dev/usb/usb_quirks.h#9 delete .. //depot/projects/usb/src/sys/dev/usb/usb_request.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_request.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_revision.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#110 delete .. //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_sw_transfer.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#128 branch .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_util.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/usb_util.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/usbcdc.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/usbdi.c#7 delete .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#6 delete .. //depot/projects/usb/src/sys/dev/usb/usbdi_util.c#4 delete .. //depot/projects/usb/src/sys/dev/usb/usbdi_util.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/usbdivar.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/uscanner.c#34 delete .. //depot/projects/usb/src/sys/dev/usb/uslcom.c#5 delete .. //depot/projects/usb/src/sys/dev/usb/uvisor.c#39 delete .. //depot/projects/usb/src/sys/dev/usb/uvscom.c#42 delete .. //depot/projects/usb/src/sys/dev/usb/uxb360gp_rdesc.h#4 delete .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumfw.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralvar.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydfw.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydreg.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/wlan/usb_wlan.h#1 branch .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/TODO.TXT#6 delete .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2.c#22 delete .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#9 delete .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#15 delete .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#5 delete .. //depot/projects/usb/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.h#10 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci_atmelarm.c#22 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.h#16 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_pci.c#26 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.h#14 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#17 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.h#10 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_atmelarm.c#18 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2_pci.c#19 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.h#12 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2_pci.c#21 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_bus.h#14 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.c#27 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.h#9 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#11 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#21 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.c#17 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_compat_linux.h#10 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.c#8 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.c#9 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_debug.h#9 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.h#19 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.c#9 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dynamic.h#9 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_error.c#7 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.h#12 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.h#9 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_if.m#6 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.c#10 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_lookup.h#12 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.c#5 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_mbuf.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#19 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.h#10 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.c#8 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_parse.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.c#12 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_sw_transfer.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.c#13 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_util.h#9 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_aue2.c#23 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_auereg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axe2.c#23 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_axereg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdce2.c#21 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cdcereg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cue2.c#22 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_cuereg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kue2.c#22 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kuereg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_rue2.c#22 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_ruereg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udav2.c#22 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_udavreg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.c#13 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/usb2_ethernet.h#11 delete .. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.c#5 delete .. //depot/projects/usb/src/sys/dev/usb2/image/usb2_image.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/image/uscanner2.c#16 delete .. //depot/projects/usb/src/sys/dev/usb2/include/Makefile#7 delete .. //depot/projects/usb/src/sys/dev/usb2/include/ufm2_ioctl.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_cdc.h#9 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_defs.h#10 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_endian.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_error.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_hid.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_mfunc.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_revision.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_standard.h#16 delete .. //depot/projects/usb/src/sys/dev/usb2/input/uhid2.c#17 delete .. //depot/projects/usb/src/sys/dev/usb2/input/ukbd2.c#16 delete .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.c#6 delete .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_input.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/input/usb2_rdesc.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.c#13 delete .. //depot/projects/usb/src/sys/dev/usb2/misc/udbp2.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/misc/ufm2.c#13 delete .. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.c#5 delete .. //depot/projects/usb/src/sys/dev/usb2/misc/usb2_misc.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/ndis/if_ndis_usb2.c#8 delete .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.c#5 delete .. //depot/projects/usb/src/sys/dev/usb2/ndis/usb2_ndis.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/uark2.c#18 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/ubsa2.c#24 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/ubser2.c#18 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/uchcom2.c#21 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/ucycom2.c#19 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/ufoma2.c#24 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2.c#22 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/ugensa2.c#25 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/uipaq2.c#21 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/ulpt2.c#17 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/umct2.c#18 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/umodem2.c#21 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/umoscom2.c#19 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/uplcom2.c#21 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.c#29 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/usb2_serial.h#17 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/uvisor2.c#19 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/uvscom2.c#21 delete .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#30 delete .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.h#7 delete .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_pcm.c#7 delete .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2_reg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.c#5 delete .. //depot/projects/usb/src/sys/dev/usb2/sound/usb2_sound.h#5 delete .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#16 delete .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#29 delete .. //depot/projects/usb/src/sys/dev/usb2/storage/urio2.c#16 delete .. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.c#5 delete .. //depot/projects/usb/src/sys/dev/usb2/storage/usb2_storage.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#17 delete .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.c#15 delete .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template.h#8 delete .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_cdce.c#12 delete .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_msc.c#9 delete .. //depot/projects/usb/src/sys/dev/usb2/template/usb2_template_mtp.c#9 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumreg.h#4 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralreg.h#4 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zydfw.h#4 delete .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#8 integrate .. //depot/projects/usb/src/sys/fs/cd9660/cd9660_vfsops.c#7 integrate .. //depot/projects/usb/src/sys/fs/coda/coda_vnops.c#6 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs.c#6 integrate .. //depot/projects/usb/src/sys/fs/pseudofs/pseudofs_vnops.c#11 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#12 integrate .. //depot/projects/usb/src/sys/geom/geom_dev.c#10 integrate .. //depot/projects/usb/src/sys/geom/label/g_label_msdosfs.c#4 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#14 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.h#8 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_bsd.c#9 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_ebr.c#2 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_if.m#4 integrate .. //depot/projects/usb/src/sys/i386/acpica/acpi_wakeup.c#5 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#21 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#18 integrate .. //depot/projects/usb/src/sys/i386/conf/USB2#4 integrate .. //depot/projects/usb/src/sys/i386/conf/XBOX#6 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#13 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_misc.c#7 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysi86.c#4 integrate .. //depot/projects/usb/src/sys/i386/isa/npx.c#7 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_machdep.c#10 integrate .. //depot/projects/usb/src/sys/i386/xen/clock.c#5 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#5 integrate .. //depot/projects/usb/src/sys/ia64/conf/GENERIC#11 integrate .. //depot/projects/usb/src/sys/ia64/ia64/mp_machdep.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_osd.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#17 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#17 integrate .. //depot/projects/usb/src/sys/kern/subr_disk.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_taskqueue.c#8 integrate .. //depot/projects/usb/src/sys/kern/tty.c#17 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#10 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#17 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#17 integrate .. //depot/projects/usb/src/sys/legacy/dev/ata/ata-usb.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/sound/usb/uaudio.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/sound/usb/uaudio.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/sound/usb/uaudio_pcm.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/sound/usb/uaudioreg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/FILES#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/dsbr100io.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_ddb.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_ixp4xx.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_pci.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ehcireg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ehcivar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/hid.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/hid.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_aue.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_auereg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_axe.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_axereg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_cdce.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_cdcereg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_cue.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_cuereg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_kue.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_kuereg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_rue.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_ruereg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_rum.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_rumreg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_rumvar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_udav.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_udavreg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_upgt.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_upgtvar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_ural.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_uralreg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_uralvar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_urtw.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_urtwreg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_urtwvar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_zyd.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_zydfw.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/if_zydreg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/kue_fw.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ohci.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ohci_pci.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ohcireg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ohcivar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/rio500_usb.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/sl811hs.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/sl811hsreg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/sl811hsvar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/slhci_pccard.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/u3g.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uark.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ubsa.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ubser.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ubser.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uchcom.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ucom.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ucomvar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ucycom.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/udbp.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/udbp.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ufm.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ufoma.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uftdi.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uftdireg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ugen.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ugraphire_rdesc.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uhci.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uhci_pci.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uhcireg.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uhcivar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uhid.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uhub.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uipaq.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ukbd.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ulpt.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/umass.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/umct.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/umodem.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/ums.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uplcom.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/urio.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_ethersubr.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_ethersubr.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_if.m#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_mem.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_mem.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_port.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_quirks.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_quirks.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usb_subr.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usbcdc.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdi.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdi.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdi_util.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdi_util.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usbdivar.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/usbhid.h#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uscanner.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uslcom.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uvisor.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uvscom.c#1 branch .. //depot/projects/usb/src/sys/legacy/dev/usb/uxb360gp_rdesc.h#1 branch .. //depot/projects/usb/src/sys/libkern/crc32.c#2 integrate .. //depot/projects/usb/src/sys/mips/include/fpu.h#2 integrate .. //depot/projects/usb/src/sys/mips/include/frame.h#2 integrate .. //depot/projects/usb/src/sys/mips/mips/busdma_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#6 integrate .. //depot/projects/usb/src/sys/modules/Makefile#27 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/agp/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/ata/atausb/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/aue/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/axe/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/cdce/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/cue/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/dtrace/dtrace/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/ehci/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/kue/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/linux/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/netgraph/bluetooth/ubt/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/ohci/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/rue/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/rum/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/slhci/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/sound/driver/uaudio/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/svr4/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/u3g/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/uark/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/ubsa/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/ucom/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/udav/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/udbp/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/ufm/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/ufoma/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/uftdi/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/ugen/Makefile#8 delete .. //depot/projects/usb/src/sys/modules/uhci/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/uhid/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/uipaq/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/ukbd/Makefile#8 delete .. //depot/projects/usb/src/sys/modules/ulpt/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/umass/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/umct/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/umodem/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/ums/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/upgt/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/uplcom/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/ural/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/urio/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/urtw/Makefile#2 delete .. //depot/projects/usb/src/sys/modules/usb/at91dci/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/atmegadci/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/aue/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/axe/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/cdce/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/cue/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ehci/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/kue/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/musb/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ohci/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/quirk/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/rue/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/rum/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/template/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/u3g/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uark/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ubsa/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ubser/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uchcom/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ucom/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ucycom/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/udav/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/udbp/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uether/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ufm/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ufoma/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uftdi/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ugensa/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uhci/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uhid/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uipaq/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ukbd/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ulpt/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/umass/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/umct/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/umodem/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/umoscom/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ums/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uplcom/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/ural/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/urio/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/usb/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uscanner/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/usfs/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uslcom/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uss820dci/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uvisor/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/uvscom/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb/zyd/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/usb2/Makefile#13 delete .. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#9 delete .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#12 delete .. //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/controller_atmegadci/Makefile#3 delete .. //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#14 delete .. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#10 delete .. //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#9 delete .. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#10 delete .. //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#9 delete .. //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#9 delete .. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#9 delete .. //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#9 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_3g/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#9 delete .. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#9 delete .. //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#9 delete .. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#10 delete .. //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#6 delete .. //depot/projects/usb/src/sys/modules/uscanner/Makefile#5 delete .. //depot/projects/usb/src/sys/modules/uslcom/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/uvisor/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/uvscom/Makefile#4 delete .. //depot/projects/usb/src/sys/modules/zyd/Makefile#4 delete .. //depot/projects/usb/src/sys/net/if.h#8 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#12 integrate .. //depot/projects/usb/src/sys/net/if_spppsubr.c#9 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#11 integrate .. //depot/projects/usb/src/sys/net/vnet.h#3 integrate .. //depot/projects/usb/src/sys/net80211/_ieee80211.h#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211.c#16 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ioctl.c#18 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_node.c#17 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_phy.c#3 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_proto.c#15 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_regdomain.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan.c#6 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_tdma.c#4 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#16 integrate .. //depot/projects/usb/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#7 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.h#4 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#12 integrate .. //depot/projects/usb/src/sys/netinet/in_systm.h#2 integrate .. //depot/projects/usb/src/sys/netinet/ip.h#6 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.c#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#17 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw_pfil.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_icmp.c#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_icmp.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.c#10 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_sctp.c#2 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.c#7 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.h#5 integrate .. //depot/projects/usb/src/sys/netinet/sctp_header.h#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#11 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#17 integrate .. //depot/projects/usb/src/sys/netinet/tcp_debug.h#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#5 integrate .. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#11 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/usb/src/sys/nfsclient/nfsnode.h#6 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#13 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_syscalls.c#11 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#16 integrate .. //depot/projects/usb/src/sys/pccard/cardinfo.h#2 delete .. //depot/projects/usb/src/sys/pccard/cis.h#2 delete .. //depot/projects/usb/src/sys/pci/if_rlreg.h#14 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/aim/swtch.S#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap_subr.S#4 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#16 integrate .. //depot/projects/usb/src/sys/powerpc/conf/MPC85XX#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/altivec.h#1 branch .. //depot/projects/usb/src/sys/powerpc/include/pcb.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/pcpu.h#8 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/altivec.c#1 branch .. //depot/projects/usb/src/sys/powerpc/powerpc/genassym.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#14 integrate .. //depot/projects/usb/src/sys/sparc64/include/bus_private.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/include/vmparam.h#8 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/iommu.c#7 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#11 integrate .. //depot/projects/usb/src/sys/sun4v/include/vmparam.h#7 integrate .. //depot/projects/usb/src/sys/sys/conf.h#15 integrate .. //depot/projects/usb/src/sys/sys/disk.h#4 integrate .. //depot/projects/usb/src/sys/sys/jail.h#10 integrate .. //depot/projects/usb/src/sys/sys/kobj.h#5 integrate .. //depot/projects/usb/src/sys/sys/libkern.h#8 integrate .. //depot/projects/usb/src/sys/sys/osd.h#2 integrate .. //depot/projects/usb/src/sys/sys/param.h#20 integrate .. //depot/projects/usb/src/sys/sys/syscallsubr.h#8 integrate .. //depot/projects/usb/src/sys/sys/tty.h#9 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#16 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#15 integrate .. //depot/projects/usb/src/sys/vm/swap_pager.c#13 integrate .. //depot/projects/usb/src/sys/vm/vm_kern.c#10 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#14 integrate Differences ... ==== //depot/projects/usb/src/sys/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.53 2008/08/15 14:11:30 philip Exp $ +# $FreeBSD: src/sys/Makefile,v 1.54 2009/02/15 18:19:24 imp Exp $ .include @@ -12,7 +12,7 @@ geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ - pccard pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} + pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v .else ==== //depot/projects/usb/src/sys/amd64/amd64/fpu.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 24 18:17:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 388FD10656CB; Tue, 24 Feb 2009 18:17: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 D5A3610656E1 for ; Tue, 24 Feb 2009 18:17:35 +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 C20B68FC08 for ; Tue, 24 Feb 2009 18:17:35 +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 n1OIHZKY010259 for ; Tue, 24 Feb 2009 18:17:35 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1OIHZpx010257 for perforce@freebsd.org; Tue, 24 Feb 2009 18:17:35 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 24 Feb 2009 18:17:35 GMT Message-Id: <200902241817.n1OIHZpx010257@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 158215 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Feb 2009 18:17:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=158215 Change 158215 by thompsa@thompsa_burger on 2009/02/24 18:17:28 Restore the last of the unmerged P4 changes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumfw.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumreg.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumvar.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralreg.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralvar.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydfw.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydreg.h#2 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/usb_wlan.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#2 (text+ko) ==== @@ -1,9 +1,9 @@ -/* $FreeBSD: src/sys/dev/usb/wlan/if_rum.c,v 1.3 2009/02/24 17:15:29 ed Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/wlan/if_rum2.c,v 1.12 2009/02/09 22:18:11 thompsa Exp $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini * Copyright (c) 2006 Niall O'Higgins - * Copyright (c) 2007-2008 Hans Petter Selasky + * Copyright (c) 2007-2008 Hans Petter Selasky * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -19,32 +19,32 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_rum.c,v 1.3 2009/02/24 17:15:29 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb2/wlan/if_rum2.c,v 1.12 2009/02/09 22:18:11 thompsa Exp $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver * http://www.ralinktech.com.tw/ */ -#include "usbdevs.h" -#include -#include -#include +#include +#include +#include +#include #define USB_DEBUG_VAR rum_debug -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #if USB_DEBUG static int rum_debug = 0; @@ -54,9 +54,6 @@ "Debug level"); #endif -#define rum_do_request(sc,req,data) \ - usb2_do_request_proc((sc)->sc_udev, &(sc)->sc_tq, req, data, 0, NULL, 5000) - static const struct usb2_device_id rum_devs[] = { { USB_VP(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_HWU54DM) }, { USB_VP(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_2) }, @@ -109,7 +106,8 @@ MODULE_DEPEND(rum, wlan, 1, 1, 1); MODULE_DEPEND(rum, wlan_amrr, 1, 1, 1); -MODULE_DEPEND(rum, usb, 1, 1, 1); +MODULE_DEPEND(rum, usb2_wlan, 1, 1, 1); +MODULE_DEPEND(rum, usb2_core, 1, 1, 1); static device_probe_t rum_match; static device_attach_t rum_attach; @@ -118,6 +116,7 @@ static usb2_callback_t rum_bulk_read_callback; static usb2_callback_t rum_bulk_write_callback; +static usb2_proc_callback_t rum_command_wrapper; static usb2_proc_callback_t rum_attach_post; static usb2_proc_callback_t rum_task; static usb2_proc_callback_t rum_scantask; @@ -125,7 +124,10 @@ static usb2_proc_callback_t rum_amrr_task; static usb2_proc_callback_t rum_init_task; static usb2_proc_callback_t rum_stop_task; +static usb2_proc_callback_t rum_flush_task; +static usb2_error_t rum_do_request(struct rum_softc *sc, + struct usb2_device_request *req, void *data); static struct ieee80211vap *rum_vap_create(struct ieee80211com *, const char name[IFNAMSIZ], int unit, int opmode, int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], @@ -153,8 +155,8 @@ static uint32_t rum_read(struct rum_softc *, uint16_t); static void rum_read_multi(struct rum_softc *, uint16_t, void *, int); -static void rum_write(struct rum_softc *, uint16_t, uint32_t); -static void rum_write_multi(struct rum_softc *, uint16_t, void *, +static usb2_error_t rum_write(struct rum_softc *, uint16_t, uint32_t); +static usb2_error_t rum_write_multi(struct rum_softc *, uint16_t, void *, size_t); static void rum_bbp_write(struct rum_softc *, uint8_t, uint8_t); static uint8_t rum_bbp_read(struct rum_softc *, uint8_t); @@ -171,11 +173,13 @@ static void rum_update_slot(struct ifnet *); static void rum_set_bssid(struct rum_softc *, const uint8_t *); static void rum_set_macaddr(struct rum_softc *, const uint8_t *); +static void rum_update_mcast(struct ifnet *); +static void rum_update_promisc(struct ifnet *); static const char *rum_get_rf(int); static void rum_read_eeprom(struct rum_softc *); static int rum_bbp_init(struct rum_softc *); static void rum_init(void *); -static int rum_load_microcode(struct rum_softc *, const u_char *, +static void rum_load_microcode(struct rum_softc *, const uint8_t *, size_t); static int rum_prepare_beacon(struct rum_softc *, struct ieee80211vap *); @@ -191,7 +195,7 @@ static void rum_amrr_start(struct rum_softc *, struct ieee80211_node *); static void rum_amrr_timeout(void *); -static int rum_pause(struct rum_softc *, int); +static uint8_t rum_pause(struct rum_softc *, unsigned int); static void rum_queue_command(struct rum_softc *, usb2_proc_callback_t *, struct usb2_proc_msg *, struct usb2_proc_msg *); @@ -405,6 +409,8 @@ mtx_init(&sc->sc_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, MTX_DEF); + cv_init(&sc->sc_cmd_cv, "wtxdone"); + 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); @@ -441,12 +447,11 @@ struct ifnet *ifp; struct ieee80211com *ic; unsigned int ntries; - int error; uint32_t tmp; uint8_t bands; /* retrieve RT2573 rev. no */ - for (ntries = 0; ntries < 100; ntries++) { + for (ntries = 0; ntries != 100; ntries++) { if ((tmp = rum_read(sc, RT2573_MAC_CSR0)) != 0) break; if (rum_pause(sc, hz / 100)) @@ -463,12 +468,12 @@ device_printf(sc->sc_dev, "MAC/BBP RT2573 (rev 0x%05x), RF %s\n", tmp, rum_get_rf(sc->rf_rev)); - error = rum_load_microcode(sc, rt2573_ucode, sizeof(rt2573_ucode)); - if (error != 0) { - RUM_UNLOCK(sc); - device_printf(sc->sc_dev, "could not load 8051 microcode\n"); + rum_load_microcode(sc, rt2573_ucode, sizeof(rt2573_ucode)); + + /* XXX WLAN race --hps */ + if (usb2_proc_is_gone(&sc->sc_tq)) return; - } + RUM_UNLOCK(sc); ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); @@ -514,6 +519,8 @@ ieee80211_init_channels(ic, NULL, &bands); ieee80211_ifattach(ic); + ic->ic_update_mcast = rum_update_mcast; + ic->ic_update_promisc = rum_update_promisc; ic->ic_newassoc = rum_newassoc; ic->ic_raw_xmit = rum_raw_xmit; ic->ic_node_alloc = rum_node_alloc; @@ -569,11 +576,31 @@ if_free(ifp); } + cv_destroy(&sc->sc_cmd_cv); + mtx_destroy(&sc->sc_mtx); return (0); } +static usb2_error_t +rum_do_request(struct rum_softc *sc, + struct usb2_device_request *req, void *data) +{ + usb2_error_t err; +retry: + err = usb2_do_request_proc(sc->sc_udev, &sc->sc_tq, + req, data, 0, NULL, 250 /* ms */); + + if (err) { + DPRINTFN(1, "Control request failed, " + "%s! (ignored)\n", usb2_errstr(err)); + if ((sc->sc_ifp != NULL) && (!rum_pause(sc, hz / 100))) + goto retry; + } + return (err); +} + static struct ieee80211vap * rum_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit, int opmode, int flags, @@ -613,10 +640,32 @@ } static void +rum_flush_task(struct usb2_proc_msg *pm) +{ + struct rum_task *task = (struct rum_task *)pm; + struct rum_softc *sc = task->sc; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic = ifp->if_l2com; + struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); + struct rum_vap *rvp = RUM_VAP(vap); + + /* callout it stopped */ + usb2_callout_stop(&rvp->amrr_ch); +} + +static void rum_vap_delete(struct ieee80211vap *vap) { struct rum_vap *rvp = RUM_VAP(vap); + struct rum_softc *sc = rvp->sc; + RUM_LOCK(sc); + /* wait for any pending tasks to complete */ + rum_queue_command(sc, rum_flush_task, + &sc->sc_synctask[0].hdr, + &sc->sc_synctask[1].hdr); + RUM_UNLOCK(sc); + usb2_callout_drain(&rvp->amrr_ch); ieee80211_amrr_cleanup(&rvp->amrr); ieee80211_vap_detach(vap); @@ -639,7 +688,6 @@ data->ni = NULL; } STAILQ_INSERT_TAIL(&sc->tx_free, data, next); - sc->tx_nfree++; } static void @@ -648,7 +696,6 @@ struct rum_tx_data *data; int i; - sc->tx_nfree = 0; STAILQ_INIT(&sc->tx_q); STAILQ_INIT(&sc->tx_free); @@ -657,7 +704,6 @@ data->sc = sc; STAILQ_INSERT_TAIL(&sc->tx_free, data, next); - sc->tx_nfree++; } } @@ -668,7 +714,6 @@ int i; /* make sure any subsequent use of the queues will fail */ - sc->tx_nfree = 0; STAILQ_INIT(&sc->tx_q); STAILQ_INIT(&sc->tx_free); @@ -698,12 +743,19 @@ struct rum_vap *rvp = RUM_VAP(vap); const struct ieee80211_txparam *tp; enum ieee80211_state ostate; + enum ieee80211_state nstate; struct ieee80211_node *ni; + int arg; uint32_t tmp; ostate = vap->iv_state; + nstate = sc->sc_state; + arg = sc->sc_arg; + + /* callout it stopped */ + usb2_callout_stop(&rvp->amrr_ch); - switch (sc->sc_state) { + switch (nstate) { case IEEE80211_S_INIT: if (ostate == IEEE80211_S_RUN) { /* abort TSF synchronization */ @@ -740,11 +792,17 @@ break; } + /* sanity checks */ + if (nstate == IEEE80211_S_INIT) + return; + if (nstate != sc->sc_state) + return; + RUM_UNLOCK(sc); IEEE80211_LOCK(ic); - rvp->newstate(vap, sc->sc_state, sc->sc_arg); + rvp->newstate(vap, nstate, arg); if (vap->iv_newstate_cb != NULL) - vap->iv_newstate_cb(vap, sc->sc_state, sc->sc_arg); + vap->iv_newstate_cb(vap, nstate, arg); IEEE80211_UNLOCK(ic); RUM_LOCK(sc); } @@ -761,23 +819,19 @@ ieee80211_state_name[nstate]); RUM_LOCK(sc); - usb2_callout_stop(&rvp->amrr_ch); - /* do it in a process context */ sc->sc_state = nstate; sc->sc_arg = arg; + rum_queue_command(sc, rum_task, + &sc->sc_task[0].hdr, + &sc->sc_task[1].hdr); RUM_UNLOCK(sc); if (nstate == IEEE80211_S_INIT) { rvp->newstate(vap, nstate, arg); return 0; - } else { - RUM_LOCK(sc); - rum_queue_command(sc, rum_task, &sc->sc_task[0].hdr, - &sc->sc_task[1].hdr); - RUM_UNLOCK(sc); - return EINPROGRESS; } + return (EINPROGRESS); } static void @@ -791,6 +845,10 @@ struct mbuf *m; unsigned int len; + /* wakeup waiting command, if any */ + if (sc->sc_last_task != NULL) + cv_signal(&sc->sc_cmd_cv); + switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: DPRINTFN(11, "transfer complete, %d bytes\n", xfer->actlen); @@ -801,11 +859,14 @@ xfer->priv_fifo = NULL; ifp->if_opackets++; - ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; /* FALLTHROUGH */ case USB_ST_SETUP: tr_setup: + /* wait for command to complete, if any */ + if (sc->sc_last_task != NULL) + break; + data = STAILQ_FIRST(&sc->tx_q); if (data) { STAILQ_REMOVE_HEAD(&sc->tx_q, next); @@ -1042,8 +1103,6 @@ } } -#define RUM_TX_TIMEOUT 5000 - static int rum_sendprot(struct rum_softc *sc, const struct mbuf *m, struct ieee80211_node *ni, int prot, int rate) @@ -1079,11 +1138,14 @@ } if (mprot == NULL) { /* XXX stat + msg */ - return ENOBUFS; + return (ENOBUFS); } data = STAILQ_FIRST(&sc->tx_free); + if (data == NULL) { + m_freem(mprot); + return (ENOBUFS); + } STAILQ_REMOVE_HEAD(&sc->tx_free, next); - sc->tx_nfree--; data->m = mprot; data->ni = ieee80211_ref_node(ni); @@ -1112,8 +1174,11 @@ RUM_LOCK_ASSERT(sc, MA_OWNED); data = STAILQ_FIRST(&sc->tx_free); + if (data == NULL) { + m_freem(m0); + return (ENOBUFS); + } STAILQ_REMOVE_HEAD(&sc->tx_free, next); - sc->tx_nfree--; wh = mtod(m0, struct ieee80211_frame *); if (wh->i_fc[1] & IEEE80211_FC1_WEP) { @@ -1153,7 +1218,7 @@ STAILQ_INSERT_TAIL(&sc->tx_q, data, next); usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); - return 0; + return (0); } static int @@ -1167,6 +1232,13 @@ RUM_LOCK_ASSERT(sc, MA_OWNED); KASSERT(params != NULL, ("no raw xmit params")); + data = STAILQ_FIRST(&sc->tx_free); + if (data == NULL) { + m_freem(m0); + return (ENOBUFS); + } + STAILQ_REMOVE_HEAD(&sc->tx_free, next); + rate = params->ibp_rate0 & IEEE80211_RATE_VAL; /* XXX validate */ if (rate == 0) { @@ -1181,17 +1253,13 @@ params->ibp_flags & IEEE80211_BPF_RTS ? IEEE80211_PROT_RTSCTS : IEEE80211_PROT_CTSONLY, rate); - if (error || sc->tx_nfree == 0) { + if (error) { m_freem(m0); - return ENOBUFS; + return error; } 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--; - data->m = m0; data->ni = ni; data->rate = rate; @@ -1254,17 +1322,20 @@ 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) { m_freem(m0); - return ENOBUFS; + return error; } flags |= RT2573_TX_LONG_RETRY | RT2573_TX_IFS_SIFS; } } data = STAILQ_FIRST(&sc->tx_free); + if (data == NULL) { + m_freem(m0); + return (ENOBUFS); + } STAILQ_REMOVE_HEAD(&sc->tx_free, next); - sc->tx_nfree--; data->m = m0; data->ni = ni; @@ -1295,6 +1366,7 @@ { struct rum_softc *sc = ifp->if_softc; struct ieee80211_node *ni; + struct rum_tx_data *data; struct mbuf *m; RUM_LOCK(sc); @@ -1306,15 +1378,19 @@ IFQ_DRV_DEQUEUE(&ifp->if_snd, m); if (m == NULL) break; - if (sc->tx_nfree < RUM_TX_MINFREE) { - IFQ_DRV_PREPEND(&ifp->if_snd, m); - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - break; + ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; + data = STAILQ_FIRST(&sc->tx_free); + if ((data == NULL) || (STAILQ_NEXT(data, next) == NULL)) { + /* last slot is reserved for mgt frame */ + m_freem(m); + ieee80211_free_node(ni); + ifp->if_oerrors++; + continue; } - ni = (struct ieee80211_node *) m->m_pkthdr.rcvif; m = ieee80211_encap(ni, m); if (m == NULL) { ieee80211_free_node(ni); + ifp->if_oerrors++; continue; } if (rum_tx_data(sc, m, ni) != 0) { @@ -1375,7 +1451,6 @@ rum_eeprom_read(struct rum_softc *sc, uint16_t addr, void *buf, int len) { struct usb2_device_request req; - usb2_error_t error; req.bmRequestType = UT_READ_VENDOR_DEVICE; req.bRequest = RT2573_READ_EEPROM; @@ -1383,11 +1458,7 @@ USETW(req.wIndex, addr); USETW(req.wLength, len); - error = rum_do_request(sc, &req, buf); - if (error != 0) { - device_printf(sc->sc_dev, "could not read EEPROM: %s\n", - usb2_errstr(error)); - } + rum_do_request(sc, &req, buf); } static uint32_t @@ -1404,7 +1475,6 @@ rum_read_multi(struct rum_softc *sc, uint16_t reg, void *buf, int len) { struct usb2_device_request req; - usb2_error_t error; req.bmRequestType = UT_READ_VENDOR_DEVICE; req.bRequest = RT2573_READ_MULTI_MAC; @@ -1412,27 +1482,21 @@ USETW(req.wIndex, reg); USETW(req.wLength, len); - error = rum_do_request(sc, &req, buf); - if (error != 0) { - device_printf(sc->sc_dev, - "could not multi read MAC register: %s\n", - usb2_errstr(error)); - } + rum_do_request(sc, &req, buf); } -static void +static usb2_error_t rum_write(struct rum_softc *sc, uint16_t reg, uint32_t val) { uint32_t tmp = htole32(val); - rum_write_multi(sc, reg, &tmp, sizeof tmp); + return (rum_write_multi(sc, reg, &tmp, sizeof tmp)); } -static void +static usb2_error_t rum_write_multi(struct rum_softc *sc, uint16_t reg, void *buf, size_t len) { struct usb2_device_request req; - usb2_error_t error; req.bmRequestType = UT_WRITE_VENDOR_DEVICE; req.bRequest = RT2573_WRITE_MULTI_MAC; @@ -1440,12 +1504,7 @@ USETW(req.wIndex, reg); USETW(req.wLength, len); - error = rum_do_request(sc, &req, buf); - if (error != 0) { - device_printf(sc->sc_dev, - "could not multi write MAC register: %s\n", - usb2_errstr(error)); - } + return (rum_do_request(sc, &req, buf)); } static void @@ -1454,7 +1513,9 @@ uint32_t tmp; int ntries; - for (ntries = 0; ntries < 100; ntries++) { + DPRINTFN(2, "reg=0x%08x\n", reg); + + for (ntries = 0; ntries != 100; ntries++) { if (!(rum_read(sc, RT2573_PHY_CSR3) & RT2573_BBP_BUSY)) break; if (rum_pause(sc, hz / 100)) @@ -1475,7 +1536,9 @@ uint32_t val; int ntries; - for (ntries = 0; ntries < 100; ntries++) { + DPRINTFN(2, "reg=0x%08x\n", reg); + + for (ntries = 0; ntries != 100; ntries++) { if (!(rum_read(sc, RT2573_PHY_CSR3) & RT2573_BBP_BUSY)) break; if (rum_pause(sc, hz / 100)) @@ -1489,7 +1552,7 @@ val = RT2573_BBP_BUSY | RT2573_BBP_READ | reg << 8; rum_write(sc, RT2573_PHY_CSR3, val); - for (ntries = 0; ntries < 100; ntries++) { + for (ntries = 0; ntries != 100; ntries++) { val = rum_read(sc, RT2573_PHY_CSR3); if (!(val & RT2573_BBP_BUSY)) return val & 0xff; @@ -1507,7 +1570,7 @@ uint32_t tmp; int ntries; - for (ntries = 0; ntries < 100; ntries++) { + for (ntries = 0; ntries != 100; ntries++) { if (!(rum_read(sc, RT2573_PHY_CSR4) & RT2573_RF_BUSY)) break; if (rum_pause(sc, hz / 100)) @@ -1660,7 +1723,8 @@ const struct rfprog *rfprog; uint8_t bbp3, bbp94 = RT2573_BBPR94_DEFAULT; int8_t power; - int i, chan; + unsigned int i; + unsigned int chan; chan = ieee80211_chan2ieee(ic, c); if (chan == 0 || chan == IEEE80211_CHAN_ANY) @@ -1707,7 +1771,7 @@ rum_rf_write(sc, RT2573_RF3, rfprog[i].r3 | power << 7); rum_rf_write(sc, RT2573_RF4, rfprog[i].r4 | sc->rffreq << 10); - rum_pause(sc, hz / 100); + (void)rum_pause(sc, hz / 100); /* enable smart mode for MIMO-capable RFs */ bbp3 = rum_bbp_read(sc, 3); @@ -1720,6 +1784,9 @@ if (bbp94 != RT2573_BBPR94_DEFAULT) rum_bbp_write(sc, 94, bbp94); + + /* give the chip some extra time to do the switchover */ + (void)rum_pause(sc, hz / 100); } /* @@ -1817,6 +1884,27 @@ "entering" : "leaving"); } +static void +rum_update_mcast(struct ifnet *ifp) +{ + /* not supported */ +} + +static void +rum_update_promisc(struct ifnet *ifp) +{ + struct rum_softc *sc = ifp->if_softc; + + if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) + return; + + RUM_LOCK(sc); + rum_queue_command(sc, rum_promisctask, + &sc->sc_promisctask[0].hdr, + &sc->sc_promisctask[1].hdr); + RUM_UNLOCK(sc); +} + static const char * rum_get_rf(int rev) { @@ -1919,7 +2007,7 @@ int i, ntries; /* wait for BBP to be ready */ - for (ntries = 0; ntries < 100; ntries++) { + for (ntries = 0; ntries != 100; ntries++) { const uint8_t val = rum_bbp_read(sc, 0); if (val != 0 && val != 0xff) break; @@ -1971,7 +2059,7 @@ rum_write(sc, RT2573_MAC_CSR1, 0); /* wait for BBP/RF to wakeup */ - for (ntries = 0; ntries < 100; ntries++) { + for (ntries = 0; ntries != 100; ntries++) { if (rum_read(sc, RT2573_MAC_CSR12) & 8) break; rum_write(sc, RT2573_MAC_CSR12, 4); /* force wakeup */ @@ -2020,8 +2108,8 @@ } rum_write(sc, RT2573_TXRX_CSR0, tmp); - 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]); return; @@ -2057,7 +2145,7 @@ RUM_LOCK_ASSERT(sc, MA_OWNED); - ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; RUM_UNLOCK(sc); @@ -2080,16 +2168,23 @@ rum_write(sc, RT2573_MAC_CSR1, 0); } -static int -rum_load_microcode(struct rum_softc *sc, const u_char *ucode, size_t size) +static void +rum_load_microcode(struct rum_softc *sc, const uint8_t *ucode, size_t size) { struct usb2_device_request req; uint16_t reg = RT2573_MCU_CODE_BASE; - usb2_error_t error; + usb2_error_t err; /* copy firmware image into NIC */ - for (; size >= 4; reg += 4, ucode += 4, size -= 4) - rum_write(sc, reg, UGETDW(ucode)); + for (; size >= 4; reg += 4, ucode += 4, size -= 4) { + err = rum_write(sc, reg, UGETDW(ucode)); + if (err) { + /* firmware already loaded ? */ + device_printf(sc->sc_dev, "Firmware load " + "failure! (ignored)\n"); + break; + } + } req.bmRequestType = UT_WRITE_VENDOR_DEVICE; req.bRequest = RT2573_MCU_CNTL; @@ -2097,12 +2192,10 @@ USETW(req.wIndex, 0); USETW(req.wLength, 0); - error = rum_do_request(sc, &req, NULL); - if (error != 0) { - device_printf(sc->sc_dev, "could not run firmware: %s\n", - usb2_errstr(error)); - } - return error; + rum_do_request(sc, &req, NULL); + + /* give the chip some time to boot */ + rum_pause(sc, hz / 8); } static int @@ -2149,13 +2242,6 @@ ieee80211_free_node(ni); return ENETDOWN; } - if (sc->tx_nfree < 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++; @@ -2195,7 +2281,9 @@ ieee80211_amrr_node_init(&rvp->amrr, &RUM_NODE(ni)->amn, ni); - usb2_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); + /* XXX WLAN race --hps */ + if (sc->sc_state == IEEE80211_S_RUN) + usb2_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); } static void @@ -2204,8 +2292,15 @@ struct rum_vap *rvp = arg; struct rum_softc *sc = rvp->sc; + /* XXX WLAN race --hps */ + if (sc->sc_state != IEEE80211_S_RUN) + return; + rum_queue_command(sc, rum_amrr_task, &rvp->amrr_task[0].hdr, &rvp->amrr_task[1].hdr); + + /* to avoid sync-issues we need to reset the callout here */ + usb2_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); } static void @@ -2216,7 +2311,6 @@ struct ifnet *ifp = sc->sc_ifp; struct ieee80211com *ic = ifp->if_l2com; struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps); - struct rum_vap *rvp = RUM_VAP(vap); struct ieee80211_node *ni = vap->iv_bss; int ok, fail; @@ -2227,13 +2321,15 @@ (le32toh(sc->sta[5]) & 0xffff); /* TX ok w/ retry */ fail = (le32toh(sc->sta[5]) >> 16); /* TX retry-fail count */ + /* XXX WLAN race --hps */ + if (sc->sc_state != IEEE80211_S_RUN) + return; + ieee80211_amrr_tx_update(&RUM_NODE(ni)->amn, ok+fail, ok, (le32toh(sc->sta[5]) & 0xffff) + fail); (void) ieee80211_amrr_choose(ni, &RUM_NODE(ni)->amn); ifp->if_oerrors += fail; /* count TX retry-fail as Tx errors */ - - usb2_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp); } /* ARGUSED */ @@ -2374,8 +2470,8 @@ return rssi; } -static int -rum_pause(struct rum_softc *sc, int timeout) +static uint8_t +rum_pause(struct rum_softc *sc, unsigned int timeout) { if (usb2_proc_is_gone(&sc->sc_tq)) return (1); @@ -2385,6 +2481,33 @@ } static void +rum_command_wrapper(struct usb2_proc_msg *pm) +{ + struct rum_task *task = (struct rum_task *)pm; + struct rum_softc *sc = task->sc; + struct ifnet *ifp; + + /* wait for pending transfer, if any */ + while (usb2_transfer_pending(sc->sc_xfer[RUM_BULK_WR])) + cv_wait(&sc->sc_cmd_cv, &sc->sc_mtx); + + /* make sure any hardware buffers are emptied */ + rum_pause(sc, hz / 1000); + + /* execute task */ + task->func(pm); + + /* check if this is the last task executed */ + if (sc->sc_last_task == task) { + sc->sc_last_task = NULL; + ifp = sc->sc_ifp; + /* re-start TX, if any */ + if ((ifp != NULL) && (ifp->if_drv_flags & IFF_DRV_RUNNING)) + usb2_transfer_start(sc->sc_xfer[RUM_BULK_WR]); + } +} + +static void rum_queue_command(struct rum_softc *sc, usb2_proc_callback_t *fn, struct usb2_proc_msg *t0, struct usb2_proc_msg *t1) { @@ -2392,10 +2515,6 @@ RUM_LOCK_ASSERT(sc, MA_OWNED); - if (usb2_proc_is_gone(&sc->sc_tq)) { - DPRINTF("proc is gone\n"); - return; /* nothing to do */ - } /* * NOTE: The task cannot get executed before we drop the * "sc_mtx" mutex. It is safe to update fields in the message @@ -2405,14 +2524,19 @@ usb2_proc_msignal(&sc->sc_tq, t0, t1); /* Setup callback and softc pointers */ - task->hdr.pm_callback = fn; + task->hdr.pm_callback = rum_command_wrapper; + task->func = fn; task->sc = sc; - /* - * Init and stop must be synchronous! - */ - if ((fn == rum_init_task) || (fn == rum_stop_task)) - usb2_proc_mwait(&sc->sc_tq, t0, t1); + /* Make sure that any TX operation will stop */ + sc->sc_last_task = task; + + /* + * Init, stop and flush must be synchronous! + */ + if ((fn == rum_init_task) || (fn == rum_stop_task) || + (fn == rum_flush_task)) + usb2_proc_mwait(&sc->sc_tq, t0, t1); } static device_method_t rum_methods[] = { ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rumfw.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/wlan/if_rumfw.h,v 1.1 2009/02/23 18:31:00 thompsa Exp $ */ +/* $FreeBSD: user/thompsa/usb/sys/dev/usb2/wlan/if_rumfw.h 187190 2009-01-13 21:08:43Z thompsa $ */ /*- * Copyright (c) 2005-2006, Ralink Technology, Corp. ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rumreg.h#2 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rumvar.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/wlan/if_rumvar.h,v 1.2 2009/02/23 23:46:56 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb2/wlan/if_rumvar.h,v 1.6 2009/02/09 22:18:11 thompsa Exp $ */ /*- * Copyright (c) 2005, 2006 Damien Bergamini @@ -18,7 +18,6 @@ */ #define RUM_TX_LIST_COUNT 8 -#define RUM_TX_MINFREE 2 struct rum_rx_radiotap_header { struct ieee80211_radiotap_header wr_ihdr; @@ -56,6 +55,7 @@ struct rum_task { struct usb2_proc_msg hdr; + usb2_proc_callback_t *func; struct rum_softc *sc; }; @@ -102,6 +102,7 @@ const struct ieee80211_rate_table *sc_rates; struct usb2_xfer *sc_xfer[RUM_N_TRANSFER]; + struct rum_task *sc_last_task; uint8_t rf_rev; uint8_t rffreq; @@ -120,9 +121,9 @@ 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; + struct cv sc_cmd_cv; struct mtx sc_mtx; uint32_t sta[6]; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 24 18:32:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B83971065678; Tue, 24 Feb 2009 18:32: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 6DCAE106567D for ; Tue, 24 Feb 2009 18:32: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 5AF688FC08 for ; Tue, 24 Feb 2009 18:32: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 n1OIWpKG011381 for ; Tue, 24 Feb 2009 18:32:51 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1OIWpKZ011379 for perforce@freebsd.org; Tue, 24 Feb 2009 18:32:51 GMT (envelope-from thompsa@freebsd.org) Date: Tue, 24 Feb 2009 18:32:51 GMT Message-Id: <200902241832.n1OIWpKZ011379@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 158216 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Feb 2009 18:32:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=158216 Change 158216 by thompsa@thompsa_burger on 2009/02/24 18:32:31 Fix integration errors. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb.h#36 edit .. //depot/projects/usb/src/sys/dev/usb/usb_if.m#6 edit .. //depot/projects/usb/src/sys/dev/usb/usbhid.h#6 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#3 edit .. //depot/projects/usb/src/sys/modules/usb/Makefile#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb.h#36 (text+ko) ==== @@ -1,14 +1,9 @@ -/* $NetBSD: usb.h,v 1.69 2002/09/22 23:20:50 augustss Exp $ */ -/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.49 2008/11/13 21:34:34 n_hibma Exp $ */ - +/* $FreeBSD: head/sys/dev/usb/usb.h 188947 2009-02-23 19:06:47Z thompsa $ */ /*- - * 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: @@ -17,692 +12,632 @@ * 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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * This file contains standard definitions for the following USB + * protocol versions: * - * 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. + * USB v1.0 + * USB v1.1 + * USB v2.0 + * USB v3.0 */ +#ifndef _USB2_STANDARD_H_ +#define _USB2_STANDARD_H_ -#ifndef _USB_H_ -#define _USB_H_ +#include -#include -#include +/* + * Minimum time a device needs to be powered down to go through a + * power cycle. These values are not in the USB specification. + */ +#define USB_POWER_DOWN_TIME 200 /* ms */ +#define USB_PORT_POWER_DOWN_TIME 100 /* ms */ -#if defined(_KERNEL) -#include "opt_usb.h" +/* Definition of software USB power modes */ +#define USB_POWER_MODE_OFF 0 /* turn off device */ +#define USB_POWER_MODE_ON 1 /* always on */ +#define USB_POWER_MODE_SAVE 2 /* automatic suspend and resume */ +#define USB_POWER_MODE_SUSPEND 3 /* force suspend */ +#define USB_POWER_MODE_RESUME 4 /* force resume */ -#ifdef SYSCTL_DECL -SYSCTL_DECL(_hw_usb); +#if 0 +/* These are the values from the USB specification. */ +#define USB_PORT_RESET_DELAY 10 /* ms */ +#define USB_PORT_ROOT_RESET_DELAY 50 /* ms */ +#define USB_PORT_RESET_RECOVERY 10 /* ms */ +#define USB_PORT_POWERUP_DELAY 100 /* ms */ +#define USB_PORT_RESUME_DELAY 20 /* ms */ +#define USB_SET_ADDRESS_SETTLE 2 /* ms */ +#define USB_RESUME_DELAY (20*5) /* ms */ +#define USB_RESUME_WAIT 10 /* ms */ +#define USB_RESUME_RECOVERY 10 /* ms */ +#define USB_EXTRA_POWER_UP_TIME 0 /* ms */ +#else +/* Allow for marginal and non-conforming devices. */ +#define USB_PORT_RESET_DELAY 50 /* ms */ +#define USB_PORT_ROOT_RESET_DELAY 250 /* ms */ +#define USB_PORT_RESET_RECOVERY 250 /* ms */ +#define USB_PORT_POWERUP_DELAY 300 /* ms */ +#define USB_PORT_RESUME_DELAY (20*2) /* ms */ +#define USB_SET_ADDRESS_SETTLE 10 /* ms */ +#define USB_RESUME_DELAY (50*5) /* ms */ +#define USB_RESUME_WAIT 50 /* ms */ +#define USB_RESUME_RECOVERY 50 /* ms */ +#define USB_EXTRA_POWER_UP_TIME 20 /* ms */ #endif -#include +#define USB_MIN_POWER 100 /* mA */ +#define USB_MAX_POWER 500 /* mA */ -MALLOC_DECLARE(M_USB); -MALLOC_DECLARE(M_USBDEV); -MALLOC_DECLARE(M_USBHC); -#endif /* _KERNEL */ - -#define PWR_RESUME 0 -#define PWR_SUSPEND 1 -#define PWR_STANDBY 2 -#define PWR_SOFTSUSPEND 3 -#define PWR_SOFTSTANDBY 4 -#define PWR_SOFTRESUME 5 +#define USB_BUS_RESET_DELAY 100 /* ms */ -/* These two defines are used by usbd to autoload the usb kld */ -#define USB_KLD "usb" /* name of usb module */ -#define USB_UHUB "usb/uhub" /* root hub */ - -#define USB_STACK_VERSION 2 - -#define USB_MAX_DEVICES 128 -#define USB_START_ADDR 0 - -#define USB_CONTROL_ENDPOINT 0 -#define USB_MAX_ENDPOINTS 16 - -#define USB_FRAMES_PER_SECOND 1000 - /* - * The USB records contain some unaligned little-endian word - * components. The U[SG]ETW macros take care of both the alignment - * and endian problem and should always be used to access non-byte - * values. + * USB record layout in memory: + * + * - USB config 0 + * - USB interfaces + * - USB alternative interfaces + * - USB pipes + * + * - USB config 1 + * - USB interfaces + * - USB alternative interfaces + * - USB pipes */ -typedef u_int8_t uByte; -typedef u_int8_t uWord[2]; -typedef u_int8_t uDWord[4]; -#define USETW2(w,h,l) ((w)[0] = (u_int8_t)(l), (w)[1] = (u_int8_t)(h)) +/* Declaration of USB records */ -#if 1 -#define UGETW(w) ((w)[0] | ((w)[1] << 8)) -#define USETW(w,v) ((w)[0] = (u_int8_t)(v), (w)[1] = (u_int8_t)((v) >> 8)) -#define UGETDW(w) ((w)[0] | ((w)[1] << 8) | ((w)[2] << 16) | ((w)[3] << 24)) -#define USETDW(w,v) ((w)[0] = (u_int8_t)(v), \ - (w)[1] = (u_int8_t)((v) >> 8), \ - (w)[2] = (u_int8_t)((v) >> 16), \ - (w)[3] = (u_int8_t)((v) >> 24)) -#else -/* - * On little-endian machines that can handle unanliged accesses - * (e.g. i386) these macros can be replaced by the following. - */ -#define UGETW(w) (*(u_int16_t *)(w)) -#define USETW(w,v) (*(u_int16_t *)(w) = (v)) -#define UGETDW(w) (*(u_int32_t *)(w)) -#define USETDW(w,v) (*(u_int32_t *)(w) = (v)) -#endif +struct usb2_device_request { + uByte bmRequestType; + uByte bRequest; + uWord wValue; + uWord wIndex; + uWord wLength; +} __packed; +typedef struct usb2_device_request usb_device_request_t; -#define UPACKED __packed +#define UT_WRITE 0x00 +#define UT_READ 0x80 +#define UT_STANDARD 0x00 +#define UT_CLASS 0x20 +#define UT_VENDOR 0x40 +#define UT_DEVICE 0x00 +#define UT_INTERFACE 0x01 +#define UT_ENDPOINT 0x02 +#define UT_OTHER 0x03 -typedef struct { - uByte bmRequestType; - uByte bRequest; - uWord wValue; - uWord wIndex; - uWord wLength; -} UPACKED usb_device_request_t; +#define UT_READ_DEVICE (UT_READ | UT_STANDARD | UT_DEVICE) +#define UT_READ_INTERFACE (UT_READ | UT_STANDARD | UT_INTERFACE) +#define UT_READ_ENDPOINT (UT_READ | UT_STANDARD | UT_ENDPOINT) +#define UT_WRITE_DEVICE (UT_WRITE | UT_STANDARD | UT_DEVICE) +#define UT_WRITE_INTERFACE (UT_WRITE | UT_STANDARD | UT_INTERFACE) +#define UT_WRITE_ENDPOINT (UT_WRITE | UT_STANDARD | UT_ENDPOINT) +#define UT_READ_CLASS_DEVICE (UT_READ | UT_CLASS | UT_DEVICE) +#define UT_READ_CLASS_INTERFACE (UT_READ | UT_CLASS | UT_INTERFACE) +#define UT_READ_CLASS_OTHER (UT_READ | UT_CLASS | UT_OTHER) +#define UT_READ_CLASS_ENDPOINT (UT_READ | UT_CLASS | UT_ENDPOINT) +#define UT_WRITE_CLASS_DEVICE (UT_WRITE | UT_CLASS | UT_DEVICE) +#define UT_WRITE_CLASS_INTERFACE (UT_WRITE | UT_CLASS | UT_INTERFACE) +#define UT_WRITE_CLASS_OTHER (UT_WRITE | UT_CLASS | UT_OTHER) +#define UT_WRITE_CLASS_ENDPOINT (UT_WRITE | UT_CLASS | UT_ENDPOINT) +#define UT_READ_VENDOR_DEVICE (UT_READ | UT_VENDOR | UT_DEVICE) +#define UT_READ_VENDOR_INTERFACE (UT_READ | UT_VENDOR | UT_INTERFACE) +#define UT_READ_VENDOR_OTHER (UT_READ | UT_VENDOR | UT_OTHER) +#define UT_READ_VENDOR_ENDPOINT (UT_READ | UT_VENDOR | UT_ENDPOINT) +#define UT_WRITE_VENDOR_DEVICE (UT_WRITE | UT_VENDOR | UT_DEVICE) +#define UT_WRITE_VENDOR_INTERFACE (UT_WRITE | UT_VENDOR | UT_INTERFACE) +#define UT_WRITE_VENDOR_OTHER (UT_WRITE | UT_VENDOR | UT_OTHER) +#define UT_WRITE_VENDOR_ENDPOINT (UT_WRITE | UT_VENDOR | UT_ENDPOINT) -#define UT_WRITE 0x00 -#define UT_READ 0x80 -#define UT_STANDARD 0x00 -#define UT_CLASS 0x20 -#define UT_VENDOR 0x40 -#define UT_DEVICE 0x00 -#define UT_INTERFACE 0x01 -#define UT_ENDPOINT 0x02 -#define UT_OTHER 0x03 +/* Requests */ +#define UR_GET_STATUS 0x00 +#define UR_CLEAR_FEATURE 0x01 +#define UR_SET_FEATURE 0x03 +#define UR_SET_ADDRESS 0x05 +#define UR_GET_DESCRIPTOR 0x06 +#define UDESC_DEVICE 0x01 +#define UDESC_CONFIG 0x02 +#define UDESC_STRING 0x03 +#define USB_LANGUAGE_TABLE 0x00 /* language ID string index */ +#define UDESC_INTERFACE 0x04 +#define UDESC_ENDPOINT 0x05 +#define UDESC_DEVICE_QUALIFIER 0x06 +#define UDESC_OTHER_SPEED_CONFIGURATION 0x07 +#define UDESC_INTERFACE_POWER 0x08 +#define UDESC_OTG 0x09 +#define UDESC_DEBUG 0x0A +#define UDESC_IFACE_ASSOC 0x0B /* interface association */ +#define UDESC_BOS 0x0F /* binary object store */ +#define UDESC_DEVICE_CAPABILITY 0x10 +#define UDESC_CS_DEVICE 0x21 /* class specific */ +#define UDESC_CS_CONFIG 0x22 +#define UDESC_CS_STRING 0x23 +#define UDESC_CS_INTERFACE 0x24 +#define UDESC_CS_ENDPOINT 0x25 +#define UDESC_HUB 0x29 +#define UDESC_ENDPOINT_SS_COMP 0x30 /* super speed */ +#define UR_SET_DESCRIPTOR 0x07 +#define UR_GET_CONFIG 0x08 +#define UR_SET_CONFIG 0x09 +#define UR_GET_INTERFACE 0x0a +#define UR_SET_INTERFACE 0x0b +#define UR_SYNCH_FRAME 0x0c +#define UR_SET_SEL 0x30 +#define UR_ISOCH_DELAY 0x31 -#define UT_READ_DEVICE (UT_READ | UT_STANDARD | UT_DEVICE) -#define UT_READ_INTERFACE (UT_READ | UT_STANDARD | UT_INTERFACE) -#define UT_READ_ENDPOINT (UT_READ | UT_STANDARD | UT_ENDPOINT) -#define UT_WRITE_DEVICE (UT_WRITE | UT_STANDARD | UT_DEVICE) -#define UT_WRITE_INTERFACE (UT_WRITE | UT_STANDARD | UT_INTERFACE) -#define UT_WRITE_ENDPOINT (UT_WRITE | UT_STANDARD | UT_ENDPOINT) -#define UT_READ_CLASS_DEVICE (UT_READ | UT_CLASS | UT_DEVICE) -#define UT_READ_CLASS_INTERFACE (UT_READ | UT_CLASS | UT_INTERFACE) -#define UT_READ_CLASS_OTHER (UT_READ | UT_CLASS | UT_OTHER) -#define UT_READ_CLASS_ENDPOINT (UT_READ | UT_CLASS | UT_ENDPOINT) -#define UT_WRITE_CLASS_DEVICE (UT_WRITE | UT_CLASS | UT_DEVICE) -#define UT_WRITE_CLASS_INTERFACE (UT_WRITE | UT_CLASS | UT_INTERFACE) -#define UT_WRITE_CLASS_OTHER (UT_WRITE | UT_CLASS | UT_OTHER) -#define UT_WRITE_CLASS_ENDPOINT (UT_WRITE | UT_CLASS | UT_ENDPOINT) -#define UT_READ_VENDOR_DEVICE (UT_READ | UT_VENDOR | UT_DEVICE) -#define UT_READ_VENDOR_INTERFACE (UT_READ | UT_VENDOR | UT_INTERFACE) -#define UT_READ_VENDOR_OTHER (UT_READ | UT_VENDOR | UT_OTHER) -#define UT_READ_VENDOR_ENDPOINT (UT_READ | UT_VENDOR | UT_ENDPOINT) -#define UT_WRITE_VENDOR_DEVICE (UT_WRITE | UT_VENDOR | UT_DEVICE) -#define UT_WRITE_VENDOR_INTERFACE (UT_WRITE | UT_VENDOR | UT_INTERFACE) -#define UT_WRITE_VENDOR_OTHER (UT_WRITE | UT_VENDOR | UT_OTHER) -#define UT_WRITE_VENDOR_ENDPOINT (UT_WRITE | UT_VENDOR | UT_ENDPOINT) +/* HUB specific request */ +#define UR_GET_BUS_STATE 0x02 +#define UR_CLEAR_TT_BUFFER 0x08 +#define UR_RESET_TT 0x09 +#define UR_GET_TT_STATE 0x0a +#define UR_STOP_TT 0x0b +#define UR_SET_HUB_DEPTH 0x0c +#define UR_GET_PORT_ERR_COUNT 0x0d -/* Requests */ -#define UR_GET_STATUS 0x00 -#define UR_CLEAR_FEATURE 0x01 -#define UR_SET_FEATURE 0x03 -#define UR_SET_ADDRESS 0x05 -#define UR_GET_DESCRIPTOR 0x06 -#define UDESC_DEVICE 0x01 -#define UDESC_CONFIG 0x02 -#define UDESC_STRING 0x03 -#define UDESC_INTERFACE 0x04 -#define UDESC_ENDPOINT 0x05 -#define UDESC_DEVICE_QUALIFIER 0x06 -#define UDESC_OTHER_SPEED_CONFIGURATION 0x07 -#define UDESC_INTERFACE_POWER 0x08 -#define UDESC_OTG 0x09 -#define UDESC_CS_DEVICE 0x21 /* class specific */ -#define UDESC_CS_CONFIG 0x22 -#define UDESC_CS_STRING 0x23 -#define UDESC_CS_INTERFACE 0x24 -#define UDESC_CS_ENDPOINT 0x25 -#define UDESC_HUB 0x29 -#define UR_SET_DESCRIPTOR 0x07 -#define UR_GET_CONFIG 0x08 -#define UR_SET_CONFIG 0x09 -#define UR_GET_INTERFACE 0x0a -#define UR_SET_INTERFACE 0x0b -#define UR_SYNCH_FRAME 0x0c - /* Feature numbers */ -#define UF_ENDPOINT_HALT 0 -#define UF_DEVICE_REMOTE_WAKEUP 1 -#define UF_TEST_MODE 2 +#define UF_ENDPOINT_HALT 0 +#define UF_DEVICE_REMOTE_WAKEUP 1 +#define UF_TEST_MODE 2 +#define UF_U1_ENABLE 0x30 +#define UF_U2_ENABLE 0x31 +#define UF_LTM_ENABLE 0x32 -#define USB_MAX_IPACKET 8 /* maximum size of the initial packet */ +/* HUB specific features */ +#define UHF_C_HUB_LOCAL_POWER 0 +#define UHF_C_HUB_OVER_CURRENT 1 +#define UHF_PORT_CONNECTION 0 +#define UHF_PORT_ENABLE 1 +#define UHF_PORT_SUSPEND 2 +#define UHF_PORT_OVER_CURRENT 3 +#define UHF_PORT_RESET 4 +#define UHF_PORT_LINK_STATE 5 +#define UHF_PORT_POWER 8 +#define UHF_PORT_LOW_SPEED 9 +#define UHF_C_PORT_CONNECTION 16 +#define UHF_C_PORT_ENABLE 17 +#define UHF_C_PORT_SUSPEND 18 +#define UHF_C_PORT_OVER_CURRENT 19 +#define UHF_C_PORT_RESET 20 +#define UHF_PORT_TEST 21 +#define UHF_PORT_INDICATOR 22 -#define USB_2_MAX_CTRL_PACKET 64 -#define USB_2_MAX_BULK_PACKET 512 +/* SuperSpeed HUB specific features */ +#define UHF_PORT_U1_TIMEOUT 23 +#define UHF_PORT_U2_TIMEOUT 24 +#define UHF_C_PORT_LINK_STATE 25 +#define UHF_C_PORT_CONFIG_ERROR 26 +#define UHF_PORT_REMOTE_WAKE_MASK 27 +#define UHF_BH_PORT_RESET 28 +#define UHF_C_BH_PORT_RESET 29 +#define UHF_FORCE_LINKPM_ACCEPT 30 -typedef struct { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; -} UPACKED usb_descriptor_t; +struct usb2_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; +} __packed; +typedef struct usb2_descriptor usb_descriptor_t; -typedef struct { - uByte bLength; - uByte bDescriptorType; - uWord bcdUSB; -#define UD_USB_2_0 0x0200 -#define UD_IS_USB2(d) (UGETW((d)->bcdUSB) >= UD_USB_2_0) - uByte bDeviceClass; - uByte bDeviceSubClass; - uByte bDeviceProtocol; - uByte bMaxPacketSize; +struct usb2_device_descriptor { + uByte bLength; + uByte bDescriptorType; + uWord bcdUSB; +#define UD_USB_2_0 0x0200 +#define UD_USB_3_0 0x0300 +#define UD_IS_USB2(d) ((d)->bcdUSB[1] == 0x02) +#define UD_IS_USB3(d) ((d)->bcdUSB[1] == 0x03) + uByte bDeviceClass; + uByte bDeviceSubClass; + uByte bDeviceProtocol; + uByte bMaxPacketSize; /* The fields below are not part of the initial descriptor. */ - uWord idVendor; - uWord idProduct; - uWord bcdDevice; - uByte iManufacturer; - uByte iProduct; - uByte iSerialNumber; - uByte bNumConfigurations; -} UPACKED usb_device_descriptor_t; -#define USB_DEVICE_DESCRIPTOR_SIZE 18 + uWord idVendor; + uWord idProduct; + uWord bcdDevice; + uByte iManufacturer; + uByte iProduct; + uByte iSerialNumber; + uByte bNumConfigurations; +} __packed; +typedef struct usb2_device_descriptor usb_device_descriptor_t; -typedef struct { - uByte bLength; - uByte bDescriptorType; - uWord wTotalLength; - uByte bNumInterface; - uByte bConfigurationValue; - uByte iConfiguration; - uByte bmAttributes; -#define UC_BUS_POWERED 0x80 -#define UC_SELF_POWERED 0x40 -#define UC_REMOTE_WAKEUP 0x20 - uByte bMaxPower; /* max current in 2 mA units */ -#define UC_POWER_FACTOR 2 -} UPACKED usb_config_descriptor_t; -#define USB_CONFIG_DESCRIPTOR_SIZE 9 +/* Binary Device Object Store (BOS) */ +struct usb2_bos_descriptor { + uByte bLength; + uByte bDescriptorType; + uWord wTotalLength; + uByte bNumDeviceCaps; +} __packed; +typedef struct usb2_bos_descriptor usb_bos_descriptor_t; -typedef struct { - uByte bLength; - uByte bDescriptorType; - uByte bInterfaceNumber; - uByte bAlternateSetting; - uByte bNumEndpoints; - uByte bInterfaceClass; - uByte bInterfaceSubClass; - uByte bInterfaceProtocol; - uByte iInterface; -} UPACKED usb_interface_descriptor_t; -#define USB_INTERFACE_DESCRIPTOR_SIZE 9 +/* Binary Device Object Store Capability */ +struct usb2_bos_cap_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDevCapabilityType; +#define USB_DEVCAP_RESERVED 0x00 +#define USB_DEVCAP_WUSB 0x01 +#define USB_DEVCAP_USB2EXT 0x02 +#define USB_DEVCAP_SUPER_SPEED 0x03 +#define USB_DEVCAP_CONTAINER_ID 0x04 + /* data ... */ +} __packed; +typedef struct usb2_bos_cap_descriptor usb_bos_cap_descriptor_t; -typedef struct { - uByte bLength; - uByte bDescriptorType; - uByte bEndpointAddress; -#define UE_GET_DIR(a) ((a) & 0x80) -#define UE_SET_DIR(a,d) ((a) | (((d)&1) << 7)) -#define UE_DIR_IN 0x80 -#define UE_DIR_OUT 0x00 -#define UE_ADDR 0x0f -#define UE_GET_ADDR(a) ((a) & UE_ADDR) - uByte bmAttributes; -#define UE_XFERTYPE 0x03 -#define UE_CONTROL 0x00 -#define UE_ISOCHRONOUS 0x01 -#define UE_BULK 0x02 -#define UE_INTERRUPT 0x03 -#define UE_GET_XFERTYPE(a) ((a) & UE_XFERTYPE) -#define UE_ISO_TYPE 0x0c -#define UE_ISO_ASYNC 0x04 -#define UE_ISO_ADAPT 0x08 -#define UE_ISO_SYNC 0x0c -#define UE_GET_ISO_TYPE(a) ((a) & UE_ISO_TYPE) - uWord wMaxPacketSize; -#define UE_GET_TRANS(a) (((a) >> 11) & 0x3) -#define UE_GET_SIZE(a) ((a) & 0x7ff) - uByte bInterval; -} UPACKED usb_endpoint_descriptor_t; -#define USB_ENDPOINT_DESCRIPTOR_SIZE 7 +struct usb2_devcap_usb2ext_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDevCapabilityType; + uByte bmAttributes; +#define USB_V2EXT_LPM 0x02 +} __packed; +typedef struct usb2_devcap_usb2ext_descriptor usb_devcap_usb2ext_descriptor_t; -typedef struct { - uByte bLength; - uByte bDescriptorType; - uWord bString[127]; -} UPACKED usb_string_descriptor_t; -#define USB_MAX_STRING_LEN 128 -#define USB_LANGUAGE_TABLE 0 /* # of the string language id table */ +struct usb2_devcap_ss_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDevCapabilityType; + uByte bmAttributes; + uWord wSpeedsSupported; + uByte bFunctionaltySupport; + uByte bU1DevExitLat; + uByte bU2DevExitLat; +} __packed; +typedef struct usb2_devcap_ss_descriptor usb_devcap_ss_descriptor_t; -/* Hub specific request */ -#define UR_GET_BUS_STATE 0x02 -#define UR_CLEAR_TT_BUFFER 0x08 -#define UR_RESET_TT 0x09 -#define UR_GET_TT_STATE 0x0a -#define UR_STOP_TT 0x0b +struct usb2_devcap_container_id_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDevCapabilityType; + uByte bReserved; + uByte ContainerID; +} __packed; +typedef struct usb2_devcap_container_id_descriptor + usb_devcap_container_id_descriptor_t; -/* Hub features */ -#define UHF_C_HUB_LOCAL_POWER 0 -#define UHF_C_HUB_OVER_CURRENT 1 -#define UHF_PORT_CONNECTION 0 -#define UHF_PORT_ENABLE 1 -#define UHF_PORT_SUSPEND 2 -#define UHF_PORT_OVER_CURRENT 3 -#define UHF_PORT_RESET 4 -#define UHF_PORT_POWER 8 -#define UHF_PORT_LOW_SPEED 9 -#define UHF_C_PORT_CONNECTION 16 -#define UHF_C_PORT_ENABLE 17 -#define UHF_C_PORT_SUSPEND 18 -#define UHF_C_PORT_OVER_CURRENT 19 -#define UHF_C_PORT_RESET 20 -#define UHF_PORT_TEST 21 -#define UHF_PORT_INDICATOR 22 +/* Device class codes */ +#define UDCLASS_IN_INTERFACE 0x00 +#define UDCLASS_COMM 0x02 +#define UDCLASS_HUB 0x09 +#define UDSUBCLASS_HUB 0x00 +#define UDPROTO_FSHUB 0x00 +#define UDPROTO_HSHUBSTT 0x01 +#define UDPROTO_HSHUBMTT 0x02 +#define UDCLASS_DIAGNOSTIC 0xdc +#define UDCLASS_WIRELESS 0xe0 +#define UDSUBCLASS_RF 0x01 +#define UDPROTO_BLUETOOTH 0x01 +#define UDCLASS_VENDOR 0xff -typedef struct { - uByte bDescLength; - uByte bDescriptorType; - uByte bNbrPorts; - uWord wHubCharacteristics; -#define UHD_PWR 0x0003 -#define UHD_PWR_GANGED 0x0000 -#define UHD_PWR_INDIVIDUAL 0x0001 -#define UHD_PWR_NO_SWITCH 0x0002 -#define UHD_COMPOUND 0x0004 -#define UHD_OC 0x0018 -#define UHD_OC_GLOBAL 0x0000 -#define UHD_OC_INDIVIDUAL 0x0008 -#define UHD_OC_NONE 0x0010 -#define UHD_TT_THINK 0x0060 -#define UHD_TT_THINK_8 0x0000 -#define UHD_TT_THINK_16 0x0020 -#define UHD_TT_THINK_24 0x0040 -#define UHD_TT_THINK_32 0x0060 -#define UHD_PORT_IND 0x0080 - uByte bPwrOn2PwrGood; /* delay in 2 ms units */ -#define UHD_PWRON_FACTOR 2 - uByte bHubContrCurrent; - uByte DeviceRemovable[32]; /* max 255 ports */ -#define UHD_NOT_REMOV(desc, i) \ - (((desc)->DeviceRemovable[(i)/8] >> ((i) % 8)) & 1) - /* deprecated */ uByte PortPowerCtrlMask[1]; -} UPACKED usb_hub_descriptor_t; -#define USB_HUB_DESCRIPTOR_SIZE 9 /* includes deprecated PortPowerCtrlMask */ +struct usb2_config_descriptor { + uByte bLength; + uByte bDescriptorType; + uWord wTotalLength; + uByte bNumInterface; + uByte bConfigurationValue; +#define USB_UNCONFIG_NO 0 + uByte iConfiguration; + uByte bmAttributes; +#define UC_BUS_POWERED 0x80 +#define UC_SELF_POWERED 0x40 +#define UC_REMOTE_WAKEUP 0x20 + uByte bMaxPower; /* max current in 2 mA units */ +#define UC_POWER_FACTOR 2 +} __packed; +typedef struct usb2_config_descriptor usb_config_descriptor_t; -typedef struct { - uByte bLength; - uByte bDescriptorType; - uWord bcdUSB; - uByte bDeviceClass; - uByte bDeviceSubClass; - uByte bDeviceProtocol; - uByte bMaxPacketSize0; - uByte bNumConfigurations; - uByte bReserved; -} UPACKED usb_device_qualifier_t; -#define USB_DEVICE_QUALIFIER_SIZE 10 +struct usb2_interface_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bInterfaceNumber; + uByte bAlternateSetting; + uByte bNumEndpoints; + uByte bInterfaceClass; + uByte bInterfaceSubClass; + uByte bInterfaceProtocol; + uByte iInterface; +} __packed; +typedef struct usb2_interface_descriptor usb_interface_descriptor_t; -typedef struct { - uByte bLength; - uByte bDescriptorType; - uByte bmAttributes; -#define UOTG_SRP 0x01 -#define UOTG_HNP 0x02 -} UPACKED usb_otg_descriptor_t; - -/* OTG feature selectors */ -#define UOTG_B_HNP_ENABLE 3 -#define UOTG_A_HNP_SUPPORT 4 -#define UOTG_A_ALT_HNP_SUPPORT 5 - -typedef struct { - uWord wStatus; -/* Device status flags */ -#define UDS_SELF_POWERED 0x0001 -#define UDS_REMOTE_WAKEUP 0x0002 -/* Endpoint status flags */ -#define UES_HALT 0x0001 -} UPACKED usb_status_t; - -typedef struct { - uWord wHubStatus; -#define UHS_LOCAL_POWER 0x0001 -#define UHS_OVER_CURRENT 0x0002 - uWord wHubChange; -} UPACKED usb_hub_status_t; - -typedef struct { - uWord wPortStatus; -#define UPS_CURRENT_CONNECT_STATUS 0x0001 -#define UPS_PORT_ENABLED 0x0002 -#define UPS_SUSPEND 0x0004 -#define UPS_OVERCURRENT_INDICATOR 0x0008 -#define UPS_RESET 0x0010 -#define UPS_PORT_POWER 0x0100 -#define UPS_LOW_SPEED 0x0200 -#define UPS_HIGH_SPEED 0x0400 -#define UPS_PORT_TEST 0x0800 -#define UPS_PORT_INDICATOR 0x1000 - uWord wPortChange; -#define UPS_C_CONNECT_STATUS 0x0001 -#define UPS_C_PORT_ENABLED 0x0002 -#define UPS_C_SUSPEND 0x0004 -#define UPS_C_OVERCURRENT_INDICATOR 0x0008 -#define UPS_C_PORT_RESET 0x0010 -} UPACKED usb_port_status_t; +struct usb2_interface_assoc_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bFirstInterface; + uByte bInterfaceCount; + uByte bFunctionClass; + uByte bFunctionSubClass; + uByte bFunctionProtocol; + uByte iFunction; +} __packed; +typedef struct usb2_interface_assoc_descriptor usb_interface_assoc_descriptor_t; -/* Device class codes */ -#define UDCLASS_IN_INTERFACE 0x00 -#define UDCLASS_COMM 0x02 -#define UDCLASS_HUB 0x09 -#define UDSUBCLASS_HUB 0x00 -#define UDPROTO_FSHUB 0x00 -#define UDPROTO_HSHUBSTT 0x01 -#define UDPROTO_HSHUBMTT 0x02 -#define UDCLASS_DIAGNOSTIC 0xdc -#define UDCLASS_WIRELESS 0xe0 -#define UDSUBCLASS_RF 0x01 -#define UDPROTO_BLUETOOTH 0x01 -#define UDCLASS_VENDOR 0xff - /* Interface class codes */ -#define UICLASS_UNSPEC 0x00 +#define UICLASS_UNSPEC 0x00 +#define UICLASS_AUDIO 0x01 /* audio */ +#define UISUBCLASS_AUDIOCONTROL 1 +#define UISUBCLASS_AUDIOSTREAM 2 +#define UISUBCLASS_MIDISTREAM 3 -#define UICLASS_AUDIO 0x01 -#define UISUBCLASS_AUDIOCONTROL 1 -#define UISUBCLASS_AUDIOSTREAM 2 -#define UISUBCLASS_MIDISTREAM 3 +#define UICLASS_CDC 0x02 /* communication */ +#define UISUBCLASS_DIRECT_LINE_CONTROL_MODEL 1 +#define UISUBCLASS_ABSTRACT_CONTROL_MODEL 2 +#define UISUBCLASS_TELEPHONE_CONTROL_MODEL 3 +#define UISUBCLASS_MULTICHANNEL_CONTROL_MODEL 4 +#define UISUBCLASS_CAPI_CONTROLMODEL 5 +#define UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL 6 +#define UISUBCLASS_ATM_NETWORKING_CONTROL_MODEL 7 +#define UISUBCLASS_WIRELESS_HANDSET_CM 8 +#define UISUBCLASS_DEVICE_MGMT 9 +#define UISUBCLASS_MOBILE_DIRECT_LINE_MODEL 10 +#define UISUBCLASS_OBEX 11 +#define UISUBCLASS_ETHERNET_EMULATION_MODEL 12 -#define UICLASS_CDC 0x02 /* communication */ -#define UISUBCLASS_DIRECT_LINE_CONTROL_MODEL 1 -#define UISUBCLASS_ABSTRACT_CONTROL_MODEL 2 -#define UISUBCLASS_TELEPHONE_CONTROL_MODEL 3 -#define UISUBCLASS_MULTICHANNEL_CONTROL_MODEL 4 -#define UISUBCLASS_CAPI_CONTROLMODEL 5 -#define UISUBCLASS_ETHERNET_NETWORKING_CONTROL_MODEL 6 -#define UISUBCLASS_ATM_NETWORKING_CONTROL_MODEL 7 -#define UIPROTO_CDC_AT 1 +#define UIPROTO_CDC_AT 1 +#define UIPROTO_CDC_ETH_512X4 0x76 /* FreeBSD specific */ -#define UICLASS_HID 0x03 -#define UISUBCLASS_BOOT 1 -#define UIPROTO_BOOT_KEYBOARD 1 -#define UIPROTO_MOUSE 2 +#define UICLASS_HID 0x03 +#define UISUBCLASS_BOOT 1 +#define UIPROTO_BOOT_KEYBOARD 1 +#define UIPROTO_MOUSE 2 -#define UICLASS_PHYSICAL 0x05 +#define UICLASS_PHYSICAL 0x05 +#define UICLASS_IMAGE 0x06 +#define UISUBCLASS_SIC 1 /* still image class */ +#define UICLASS_PRINTER 0x07 +#define UISUBCLASS_PRINTER 1 +#define UIPROTO_PRINTER_UNI 1 +#define UIPROTO_PRINTER_BI 2 +#define UIPROTO_PRINTER_1284 3 -#define UICLASS_IMAGE 0x06 +#define UICLASS_MASS 0x08 +#define UISUBCLASS_RBC 1 +#define UISUBCLASS_SFF8020I 2 +#define UISUBCLASS_QIC157 3 +#define UISUBCLASS_UFI 4 +#define UISUBCLASS_SFF8070I 5 +#define UISUBCLASS_SCSI 6 +#define UIPROTO_MASS_CBI_I 0 +#define UIPROTO_MASS_CBI 1 +#define UIPROTO_MASS_BBB_OLD 2 /* Not in the spec anymore */ +#define UIPROTO_MASS_BBB 80 /* 'P' for the Iomega Zip drive */ -#define UICLASS_PRINTER 0x07 -#define UISUBCLASS_PRINTER 1 -#define UIPROTO_PRINTER_UNI 1 -#define UIPROTO_PRINTER_BI 2 -#define UIPROTO_PRINTER_1284 3 +#define UICLASS_HUB 0x09 +#define UISUBCLASS_HUB 0 +#define UIPROTO_FSHUB 0 +#define UIPROTO_HSHUBSTT 0 /* Yes, same as previous */ +#define UIPROTO_HSHUBMTT 1 -#define UICLASS_MASS 0x08 -#define UISUBCLASS_RBC 1 -#define UISUBCLASS_SFF8020I 2 -#define UISUBCLASS_QIC157 3 -#define UISUBCLASS_UFI 4 -#define UISUBCLASS_SFF8070I 5 -#define UISUBCLASS_SCSI 6 -#define UIPROTO_MASS_CBI_I 0 -#define UIPROTO_MASS_CBI 1 -#define UIPROTO_MASS_BBB_OLD 2 /* Not in the spec anymore */ -#define UIPROTO_MASS_BBB 80 /* 'P' for the Iomega Zip drive */ +#define UICLASS_CDC_DATA 0x0a +#define UISUBCLASS_DATA 0 +#define UIPROTO_DATA_ISDNBRI 0x30 /* Physical iface */ +#define UIPROTO_DATA_HDLC 0x31 /* HDLC */ +#define UIPROTO_DATA_TRANSPARENT 0x32 /* Transparent */ +#define UIPROTO_DATA_Q921M 0x50 /* Management for Q921 */ +#define UIPROTO_DATA_Q921 0x51 /* Data for Q921 */ +#define UIPROTO_DATA_Q921TM 0x52 /* TEI multiplexer for Q921 */ +#define UIPROTO_DATA_V42BIS 0x90 /* Data compression */ +#define UIPROTO_DATA_Q931 0x91 /* Euro-ISDN */ +#define UIPROTO_DATA_V120 0x92 /* V.24 rate adaption */ +#define UIPROTO_DATA_CAPI 0x93 /* CAPI 2.0 commands */ +#define UIPROTO_DATA_HOST_BASED 0xfd /* Host based driver */ +#define UIPROTO_DATA_PUF 0xfe /* see Prot. Unit Func. Desc. */ +#define UIPROTO_DATA_VENDOR 0xff /* Vendor specific */ -#define UICLASS_HUB 0x09 -#define UISUBCLASS_HUB 0 -#define UIPROTO_FSHUB 0 -#define UIPROTO_HSHUBSTT 0 /* Yes, same as previous */ -#define UIPROTO_HSHUBMTT 1 +#define UICLASS_SMARTCARD 0x0b +#define UICLASS_FIRM_UPD 0x0c +#define UICLASS_SECURITY 0x0d +#define UICLASS_DIAGNOSTIC 0xdc +#define UICLASS_WIRELESS 0xe0 +#define UISUBCLASS_RF 0x01 +#define UIPROTO_BLUETOOTH 0x01 -#define UICLASS_CDC_DATA 0x0a -#define UISUBCLASS_DATA 0 -#define UIPROTO_DATA_ISDNBRI 0x30 /* Physical iface */ -#define UIPROTO_DATA_HDLC 0x31 /* HDLC */ -#define UIPROTO_DATA_TRANSPARENT 0x32 /* Transparent */ -#define UIPROTO_DATA_Q921M 0x50 /* Management for Q921 */ -#define UIPROTO_DATA_Q921 0x51 /* Data for Q921 */ -#define UIPROTO_DATA_Q921TM 0x52 /* TEI multiplexer for Q921 */ -#define UIPROTO_DATA_V42BIS 0x90 /* Data compression */ -#define UIPROTO_DATA_Q931 0x91 /* Euro-ISDN */ -#define UIPROTO_DATA_V120 0x92 /* V.24 rate adaption */ -#define UIPROTO_DATA_CAPI 0x93 /* CAPI 2.0 commands */ -#define UIPROTO_DATA_HOST_BASED 0xfd /* Host based driver */ -#define UIPROTO_DATA_PUF 0xfe /* see Prot. Unit Func. Desc.*/ -#define UIPROTO_DATA_VENDOR 0xff /* Vendor specific */ +#define UICLASS_APPL_SPEC 0xfe +#define UISUBCLASS_FIRMWARE_DOWNLOAD 1 +#define UISUBCLASS_IRDA 2 +#define UIPROTO_IRDA 0 -#define UICLASS_SMARTCARD 0x0b +#define UICLASS_VENDOR 0xff +#define UISUBCLASS_XBOX360_CONTROLLER 0x5d +#define UIPROTO_XBOX360_GAMEPAD 0x01 -/*#define UICLASS_FIRM_UPD 0x0c*/ +struct usb2_endpoint_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bEndpointAddress; +#define UE_GET_DIR(a) ((a) & 0x80) +#define UE_SET_DIR(a,d) ((a) | (((d)&1) << 7)) +#define UE_DIR_IN 0x80 +#define UE_DIR_OUT 0x00 +#define UE_DIR_ANY 0xff /* for internal use only! */ +#define UE_ADDR 0x0f +#define UE_ADDR_ANY 0xff /* for internal use only! */ +#define UE_GET_ADDR(a) ((a) & UE_ADDR) + uByte bmAttributes; +#define UE_XFERTYPE 0x03 +#define UE_CONTROL 0x00 +#define UE_ISOCHRONOUS 0x01 +#define UE_BULK 0x02 +#define UE_INTERRUPT 0x03 +#define UE_BULK_INTR 0xfe /* for internal use only! */ +#define UE_TYPE_ANY 0xff /* for internal use only! */ +#define UE_GET_XFERTYPE(a) ((a) & UE_XFERTYPE) +#define UE_ISO_TYPE 0x0c +#define UE_ISO_ASYNC 0x04 +#define UE_ISO_ADAPT 0x08 +#define UE_ISO_SYNC 0x0c +#define UE_GET_ISO_TYPE(a) ((a) & UE_ISO_TYPE) + uWord wMaxPacketSize; +#define UE_ZERO_MPS 0xFFFF /* for internal use only */ + uByte bInterval; +} __packed; +typedef struct usb2_endpoint_descriptor usb_endpoint_descriptor_t; -#define UICLASS_SECURITY 0x0d +struct usb2_endpoint_ss_comp_descriptor { + uByte bLength; + uByte bDescriptorType; + uWord bMaxBurst; + uByte bmAttributes; + uWord wBytesPerInterval; +} __packed; +typedef struct usb2_endpoint_ss_comp_descriptor + usb_endpoint_ss_comp_descriptor_t; -#define UICLASS_DIAGNOSTIC 0xdc +struct usb2_string_descriptor { + uByte bLength; + uByte bDescriptorType; + uWord bString[126]; + uByte bUnused; +} __packed; +typedef struct usb2_string_descriptor usb_string_descriptor_t; -#define UICLASS_WIRELESS 0xe0 -#define UISUBCLASS_RF 0x01 -#define UIPROTO_BLUETOOTH 0x01 +#define USB_MAKE_STRING_DESC(m,name) \ +struct name { \ + uByte bLength; \ + uByte bDescriptorType; \ + uByte bData[sizeof((uint8_t []){m})]; \ +} __packed; \ +static const struct name name = { \ + .bLength = sizeof(struct name), \ + .bDescriptorType = UDESC_STRING, \ + .bData = { m }, \ +} -#define UICLASS_APPL_SPEC 0xfe -#define UISUBCLASS_FIRMWARE_DOWNLOAD 1 -#define UISUBCLASS_IRDA 2 -#define UIPROTO_IRDA 0 +struct usb2_hub_descriptor { + uByte bDescLength; + uByte bDescriptorType; + uByte bNbrPorts; + uWord wHubCharacteristics; +#define UHD_PWR 0x0003 +#define UHD_PWR_GANGED 0x0000 +#define UHD_PWR_INDIVIDUAL 0x0001 +#define UHD_PWR_NO_SWITCH 0x0002 +#define UHD_COMPOUND 0x0004 +#define UHD_OC 0x0018 +#define UHD_OC_GLOBAL 0x0000 +#define UHD_OC_INDIVIDUAL 0x0008 +#define UHD_OC_NONE 0x0010 +#define UHD_TT_THINK 0x0060 +#define UHD_TT_THINK_8 0x0000 +#define UHD_TT_THINK_16 0x0020 +#define UHD_TT_THINK_24 0x0040 +#define UHD_TT_THINK_32 0x0060 +#define UHD_PORT_IND 0x0080 + uByte bPwrOn2PwrGood; /* delay in 2 ms units */ +#define UHD_PWRON_FACTOR 2 + uByte bHubContrCurrent; + uByte DeviceRemovable[32]; /* max 255 ports */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Feb 24 19:49:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B0334106574A; Tue, 24 Feb 2009 19:49: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 872871065748 for ; Tue, 24 Feb 2009 19:49:09 +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 4EB6C8FC20 for ; Tue, 24 Feb 2009 19:49:09 +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 n1OJn9MN018199 for ; Tue, 24 Feb 2009 19:49:09 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 n1OJn9gj018197 for perforce@freebsd.org; Tue, 24 Feb 2009 19:49:09 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 24 Feb 2009 19:49:09 GMT Message-Id: <200902241949.n1OJn9gj018197@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 158221 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Feb 2009 19:49:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=158221 Change 158221 by rwatson@rwatson_fledge on 2009/02/24 19:48:08 Update version in README. Affected files ... .. //depot/projects/trustedbsd/openbsm/README#35 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/README#35 (text+ko) ==== @@ -1,4 +1,4 @@ -OpenBSM 1.1 alpha 4 +OpenBSM 1.1 beta 1 Introduction @@ -56,4 +56,4 @@ http://www.TrustedBSD.org/ -$P4: //depot/projects/trustedbsd/openbsm/README#34 $ +$P4: //depot/projects/trustedbsd/openbsm/README#35 $ From owner-p4-projects@FreeBSD.ORG Tue Feb 24 19:57:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 12788106567D; Tue, 24 Feb 2009 19:57: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 BA456106567A for ; Tue, 24 Feb 2009 19:57:17 +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 A72B18FC1C for ; Tue, 24 Feb 2009 19:57:17 +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 n1OJvH7E018923 for ; Tue, 24 Feb 2009 19:57:17 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 n1OJvHgq018921 for perforce@freebsd.org; Tue, 24 Feb 2009 19:57:17 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 24 Feb 2009 19:57:17 GMT Message-Id: <200902241957.n1OJvHgq018921@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 158222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Feb 2009 19:57:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=158222 Change 158222 by rwatson@rwatson_fledge on 2009/02/24 19:56:58 One more change to note in NEWS; add Todd Heberlein in credits due to a number of recent bug reports. Affected files ... .. //depot/projects/trustedbsd/openbsm/CREDITS#5 edit .. //depot/projects/trustedbsd/openbsm/NEWS#32 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/CREDITS#5 (text+ko) ==== @@ -27,6 +27,7 @@ Eric Hall Xin LI Stacey Son + Todd Heberlein In addition, Coverity, Inc.'s Prevent(tm) static analysis tool and Gimpel Software's FlexeLint tool were used to identify a number of bugs in the ==== //depot/projects/trustedbsd/openbsm/NEWS#32 (text+ko) ==== @@ -17,6 +17,7 @@ many users. - Use au_domain_to_bsm(3) and au_socket_type_to_bsm(3) to convert au_to_socket_ex(3) arguments to BSM format. +- Fix error encoding AUT_IPC_PERM tokens. OpenBSM 1.1 alpha 5 @@ -430,4 +431,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#31 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#32 $ From owner-p4-projects@FreeBSD.ORG Tue Feb 24 20:05:26 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D1AA1065673; Tue, 24 Feb 2009 20:05: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 1CF3B106566B for ; Tue, 24 Feb 2009 20:05:26 +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 096898FC0C for ; Tue, 24 Feb 2009 20:05:26 +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 n1OK5Pfv020863 for ; Tue, 24 Feb 2009 20:05: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 n1OK5Ps0020861 for perforce@freebsd.org; Tue, 24 Feb 2009 20:05:25 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Tue, 24 Feb 2009 20:05:25 GMT Message-Id: <200902242005.n1OK5Ps0020861@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 158223 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 24 Feb 2009 20:05:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=158223 Change 158223 by rwatson@rwatson_fledge on 2009/02/24 20:04:58 Put OpenBSM 1.1 beta 1 up for download. Affected files ... .. //depot/projects/trustedbsd/www/downloads/openbsm-1.1-beta1.tgz#1 add .. //depot/projects/trustedbsd/www/news.page#21 edit .. //depot/projects/trustedbsd/www/openbsm.page#36 edit Differences ... ==== //depot/projects/trustedbsd/www/news.page#21 (text+ko) ==== @@ -1,7 +1,7 @@ + + @@ -843,6 +843,13 @@ wlan_scan_ap_load="YES" wlan_scan_sta_load="YES" + + Both wlan_scan_ap and + wlan_scan_sta modules are required by + &os; 7.X, other &os; versions do not need + them. + + With that you will need the modules that implement cryptographic support for the security protocols you intend to use. These are intended to be @@ -883,6 +890,11 @@ device wlan_ccmp # AES-CCMP crypto support for 802.11 devices device wlan_tkip # TKIP and Michael crypto support for 802.11 devices + Both wlan_scan_ap and + wlan_scan_sta lines are required by + &os; 7.X, other &os; versions do not need + them. + With this information in the kernel configuration file, recompile the kernel and reboot your &os; machine. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#23 (text+ko) ==== @@ -1,7 +1,7 @@ + docs* + Meta-ports for FreeBSD documentation. + + + + editors General editors. Specialized editors go in the section for those @@ -12423,6 +12429,18 @@ 8.0-CURRENT after removal of minor(), minor2unit(), unit2minor(), etc. 800062 + + 8.0-CURRENT after GENERIC config change to use the USB2 stack, but also the addition of fdevname(3). + 800063 + + + 8.0-CURRENT after the USB2 stack is moved to and replaces dev/usb. + 800064 + + + 8.0-CURRENT after the renaming of all functions in libmp(3). + 800065 + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#14 (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.469 2009/01/30 22:09:36 jamie Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.471 2009/02/19 22:04:29 mva Exp $ --> aaron@FreeBSD.org"> @@ -94,6 +94,8 @@ avatar@FreeBSD.org"> +avg@FreeBSD.org"> + awebster@pubnix.net"> az@FreeBSD.org"> @@ -748,6 +750,8 @@ mux@FreeBSD.org"> +mva@FreeBSD.org"> + mwlucas@FreeBSD.org"> naddy@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/book.sgml#12 (text+ko) ==== @@ -1,5 +1,5 @@ + uid Brad Davis -uid Brad Davis -sub 2048g/1F29D404 2005-05-14 [expires: 2007-05-14] +sub 2048g/1F29D404 2005-05-14 [expires: 2014-02-21] ]]> ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -376,6 +376,11 @@ &pgpkey.billf; + + &a.avg; + &pgpkey.avg; + + &a.beat; &pgpkey.beat; @@ -1401,3 +1406,8 @@ &pgpkey.sson; + + &a.mva; + &pgpkey.mva; + + ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#12 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -22,6 +22,7 @@ + @@ -194,6 +195,7 @@ + ==== //depot/projects/docproj_nl/share/sgml/mirrors.xml#7 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: doc/share/sgml/mirrors.xml,v 1.77 2009/01/29 14:20:25 pav Exp $ + $FreeBSD: doc/share/sgml/mirrors.xml,v 1.78 2009/02/23 12:27:32 pgj Exp $ @@ -850,7 +850,7 @@ cvsup.hu.FreeBSD.org - janos.mohacsi@bsd.hu + hostmaster@hu.FreeBSD.org ==== //depot/projects/docproj_nl/www/en/copyright/freebsd-doc-license.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

      Copyright 1994-2008 +

      Copyright 1994-2009 The FreeBSD Project. All rights reserved.

      ==== //depot/projects/docproj_nl/www/en/copyright/freebsd-license.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -8,7 +8,7 @@ &header; -

      Copyright 1994-2008 +

      Copyright 1994-2009 The FreeBSD Project. All rights reserved.

      ==== //depot/projects/docproj_nl/www/en/developers.sgml#12 (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.211 2009/01/30 22:09:36 jamie Exp $ +$FreeBSD: www/en/developers.sgml,v 1.213 2009/02/19 22:11:01 mva Exp $ --> @@ -50,6 +50,7 @@ + @@ -375,6 +376,7 @@ + ==== //depot/projects/docproj_nl/www/en/donations/donors.sgml#14 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2547,6 +2547,24 @@ Received + + Colin Jensen + 4.4BSD Manuals from O'Reilly + marcel + Received + + + + Charles Smeijer + HP/CPQ Gb NIC NC7770, PCI-X 133 HP p/n 284685-003 Rev 0G
      + HP/CPQ Gb NIC NC7770, PCI-X 133 HP p/n 284685-003 Rev 0E
      + HP/CPQ Dual port Gb NIC NC7170, PCI-X 133 HP p/n 313559-001 Rev 0A
      + SMC Fast ethernet USB NIC p/n 98-012084-585
      + IBM Gb NIC PCI-X 133 p/n 00P6130
      + HP DAT72 data cartridge 72 GB + ed + Received + &footer; ==== //depot/projects/docproj_nl/www/en/platforms/ppc.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -167,30 +167,11 @@
      • No AltiVec support yet.
      • G5 CPUs are unsupported.
        • -
      • SMP is not yet supported.
        • -
      • On-board BMAC+ ethernet does not work. There is a work-in-progress - bm(4) driver available on Peter Grehan's personal page - here (see if_bm.c and - if_bmreg.h).
        • -
      • There is no graphical mouse cursor on console.
        • +
      • SMP is available only in -CURRENT.
      • Fdisk does not work.
        • -
      • Only USB keyboards are supported.
        • -
      • If you have Bluetooth, there is a 'fake' OHCI port and devices - created that can be used to access a wireless keyboard or mouse. - Problem is, it gets probed before the fixed keyboard/mouse and is - first in line to syscons. To get around this, the PCI slot associated - with the problematic ohci2 can be disabled at the loader prompt: - 
        OK set hint.pcib.1.skipslot=26
        • -
      • For ATI Radeon-based machines: -
          -
        • A ofw syscons range check needs to be relaxed using the sysctl - hw.ofwfb.relax_mmap.
          • -
        • A special radeon - driver - is needed. You must add the following your xorg.conf into the - Section "Device": 
          Option "iBookHacks" "on"
          • -
        -
        • +
      • ADB keyboards (as in Apple laptops) are supported only in -CURRENT
        • +
      • For ATI Radeon-based machines, a ofw syscons range check needs to be + relaxed using the sysctl hw.ofwfb.relax_mmap.
      • There is a known bug in the boot-loader, that prevents you from loading an alternate kernel, so testing your kernel is a bit risky. When booting the loader from the Open Firmware prompt, give it a ==== //depot/projects/docproj_nl/www/en/ports/categories#2 (text+ko) ==== @@ -1,5 +1,5 @@ #Originally from src/release/sysinstall/index.c,v 1.57 1998/10/15 -#$FreeBSD: www/en/ports/categories,v 1.38 2008/04/23 02:09:56 linimon Exp $ +#$FreeBSD: www/en/ports/categories,v 1.39 2009/02/26 01:44:43 linimon Exp $ # See categories.descriptions for the meaning of the abbrevations at the # end of each category. @@ -20,6 +20,7 @@ deskutils,"Various Desktop utilities.",EU devel,"Software development utilities and libraries.",SAAD dns,"DNS client and server utilities.",CCATI +docs,"Meta-ports for FreeBSD documentation.",VC editors,"Common text editors.",EU elisp,"Things related to Emacs Lisp.",VC emulators,"Utilities for emulating other OS types.",SAAD ==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#8 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.226 2009/01/13 22:36:03 simon Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.227 2009/02/16 22:04:13 cperciva Exp $ @@ -10,6 +10,18 @@ 2009 + 2 + + + 16 + + + FreeBSD-SA-09:05.telnetd + + + + + 1 ==== //depot/projects/docproj_nl/www/share/sgml/commercial.consult.xml#7 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.57 2008/11/14 21:12:47 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.58 2009/02/26 19:21:53 jkois Exp $ @@ -86,6 +86,20 @@ + + Acadix, LLC + http://www.acadix.biz + + Acadix, LLC offers a full range of services for FreeBSD and other + platforms, including system integration, file servers, WEB servers, + and programming/porting. Acadix provides on-site services to + businesses, schools, and charitable organizations in the Milwaukee + metro area. Programming services are available to all locations in + the U.S. For more information, please visit our website. + + + Advance Systems Group http://www.advansys.net/ ==== //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#6 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.40 2008/11/14 21:37:31 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.43 2009/02/26 21:01:20 jkois Exp $ @@ -890,14 +890,49 @@ http://www.rootbsd.net RootBSD is a hosting company specializing in virtual FreeBSD - servers. The FreeBSD Virtual Private Servers were created with - FreeBSD jails, and some custom development we have done on top - of that. Each VPS includes root access and a web-based control - panel for managing and monitoring the virtual FreeBSD environment. - Technical support is handled in-house by FreeBSD experts who can - diagnose problems and help you get up and running quickly. RootBSD - has donated multiple jails to FreeBSD developers to support the - community. + hosting and managed services. The FreeBSD Virtual Private + Servers allow users to modify the kernel, setup a firewall and + many more options. Each VPS includes root access and a web-based + control panel for managing the virtual environment. Technical + support is handled in-house by FreeBSD experts who can diagnose + problems and help you get up and running quickly. RootBSD has + donated services to FreeBSD developers to support the community. + + + + + ServerBeach + http://www.serverbeach.com + + Founded in 2002, ServerBeach was launched to serve the market's + thirst for self-managed servers equipped with powerful hardware, + fast and reliable bandwidth, convenient automation tools, and + first-class support - all at an affordable price. Self-managed + servers are not an afterthought at the Beach, it's our business. + And we do whatever we can to satisfy the needs of our core + customers, the "Geeks" - people like you. People like us. In 2004, + the picture improved even more when ServerBeach was acquired by + PEER 1. This allowed us to connect our data centers to the + rock-solid, ultra-fast PEER 1 network with our 100% Uptime + Guarantee. ServerBeach is the only self-managed hosting company + in the world that offers servers in three geographically diverse + locations: WEST COAST, CENTRAL US, and EAST COAST. Now offering + FreeBSD, Ubuntu, and other Linux Operating Systems. + + + + + SimpleRezo + http://www.simplerezo.com + + SimpleRezo, a French company, provides web hosting solutions based + exclusively on FreeBSD and technologies (jails or dedicated + server, Apache, PHP, Tomcat, MySQL, pgSQL...). Other services + include: Network architecture consulting (fail-over, high + availability), FreeBSD server administration or support (fileserver, + firewalls, mailserver) and others more. Please visit our website + to get more information. ==== //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#2 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.software.xml,v 1.10 2007/09/01 21:29:59 gabor Exp $ + $FreeBSD: www/share/sgml/commercial.software.xml,v 1.11 2009/02/26 20:48:10 jkois Exp $ @@ -1052,6 +1052,20 @@ + + Pacific Timesheet + http://www.pacifictimesheet.com/ + + Pacific Timesheet is a web-based timesheet software that provides + payroll, project, job costing, time and attendance features in one + system. Other modules include automated approvals, billing and + pay rates, time-off scheduling, custom reporting, iPhone timesheet, + IVR integration, time clock integration and payroll integration. + We support all major operating systems and browsers. Our software + is available as a licensed or as a ASP/online version. + + + PACT http://pact.insider.org/ ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#14 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.67 2009/01/24 19:07:08 danger Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.68 2009/02/22 02:10:57 jkoshy Exp $ @@ -113,6 +113,33 @@ from commercial vendors. + + BSDday Argentina 2009 + http://www.bsdday.com.ar/ + + 2009 + 5 + 29 + + + 2009 + 5 + 30 + + + Argentina + Buenos Aires + + + BSDday Argentina is a conference for users and developers + on BSD based systems. The conference is for anyone developing, + deploying and using systems based on FreeBSD, NetBSD, OpenBSD, + DragonFlyBSD and others *BSD. BSDday Argentina is a technical conference + and aims to collect the best technical papers and presentations available + to ensure that the latest developments in our open source community are + shared with the widest possible audience. + + FreeBSD Kernel Internals: Intensive Evening Course http://www.mckusick.com/courses/adveveclass.html ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#29 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.225 2009/02/14 18:07:57 miwi Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.228 2009/02/19 22:15:41 miwi Exp $ @@ -36,6 +36,24 @@ 2 + 19 + + +

        New committer: Marcus von + Appen (ports)

        +         +         + + + 18 + + +

        New committer: Andriy Gapon + (src)

        +         +         + + 14 From owner-p4-projects@FreeBSD.ORG Fri Feb 27 17:19:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96E781065670; Fri, 27 Feb 2009 17:19: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 516F1106566B for ; Fri, 27 Feb 2009 17:19: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 3D1DF8FC08 for ; Fri, 27 Feb 2009 17:19: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 n1RHJ30m027216 for ; Fri, 27 Feb 2009 17:19:03 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1RHJ3oP027214 for perforce@freebsd.org; Fri, 27 Feb 2009 17:19:03 GMT (envelope-from rene@FreeBSD.org) Date: Fri, 27 Feb 2009 17:19:03 GMT Message-Id: <200902271719.n1RHJ3oP027214@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 158391 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Feb 2009 17:19:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=158391 Change 158391 by rene@rene_self on 2009/02/27 17:18:44 MFen handbook/advanced-networking 1.420 -> 1.421 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#27 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#27 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.10 2009/01/06 22:10:38 rene Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.420 + %SRCID% 1.421 --> @@ -940,6 +940,13 @@ wlan_scan_ap_load="YES" wlan_scan_sta_load="YES" + + Zowel wlan_scan_ap en + wlan_scan_sta zijn nodig voor + &os; 7.X, voor andere versies van &os; zijn ze niet + nodig. + + Daarvoor zijn ook de modules nodig die cryptografische ondersteuning implementeren voor de te gebruiken veiligheidsprotocollen. Het is de bedoeling dat ze dynamisch @@ -984,6 +991,11 @@ device wlan_ccmp # AES-CCMP crypto ondersteuning voor 802.11 apparaten device wlan_tkip # TKIP en Michael crypto ondersteuning voor 802.11 apparaten + Zowel wlan_scan_ap en + wlan_scan_sta zijn nodig voor + &os; 7.X, voor andere versies van &os; zijn ze niet + nodig. + Met deze informatie in het kernelinstellingenbestand kan de kernel opnieuw gecompileerd en de &os;-computer opnieuw opgestart worden. From owner-p4-projects@FreeBSD.ORG Fri Feb 27 18:54:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 835441065950; Fri, 27 Feb 2009 18:54: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 1ED2B106594B; Fri, 27 Feb 2009 18:54:12 +0000 (UTC) (envelope-from ulf.lilleengen@gmail.com) Received: from bene1.itea.ntnu.no (bene1.itea.ntnu.no [IPv6:2001:700:300:3::56]) by mx1.freebsd.org (Postfix) with ESMTP id 5FACB8FC17; Fri, 27 Feb 2009 18:54:11 +0000 (UTC) (envelope-from ulf.lilleengen@gmail.com) Received: from localhost (localhost [127.0.0.1]) by bene1.itea.ntnu.no (Postfix) with ESMTP id 9E991240F3; Fri, 27 Feb 2009 19:54:09 +0100 (CET) Received: from carrot (unknown [IPv6:2001:700:300:3::184]) by bene1.itea.ntnu.no (Postfix) with ESMTP id 1F74B240F2; Fri, 27 Feb 2009 19:54:09 +0100 (CET) Date: Fri, 27 Feb 2009 19:55:06 +0000 From: Ulf Lilleengen To: Oleksandr Tymoshenko Message-ID: <20090227195506.GA74274@carrot> References: <200902261742.n1QHgvYL013181@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200902261742.n1QHgvYL013181@repoman.freebsd.org> User-Agent: Mutt/1.5.19 (2009-01-05) X-Virus-Scanned: Debian amavisd-new at bene1.itea.ntnu.no Cc: Perforce Change Reviews Subject: Re: PERFORCE change 158337 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Feb 2009 18:54:16 -0000 On Thu, Feb 26, 2009 at 05:42:57PM +0000, Oleksandr Tymoshenko wrote: > http://perforce.freebsd.org/chv.cgi?CH=158337 > > Change 158337 by gonzo@gonzo_figaro on 2009/02/26 17:42:09 > > - AVR32 toolchain uses its own functions for 64-bit arithmetics. > To make linker happy we'll provide dumb wrappers around > __[u](div|mod)di3 functions. This should be done in assembler > though. > > Affected files ... > > .. //depot/projects/avr32/src/sys/conf/files.avr32#7 edit > .. //depot/projects/avr32/src/sys/libkern/avr32/muldi64.c#1 add > There seems to be something wrong after this change, like some operations are not performed correctly or something as it made printf output for numbers weird somehow. Instead of: CPU: AVR32B (ID 1, Rev 1) (130 MHz) Features: JAVA PC OCD SIMD DSP real memory = 31604736 (30 MB) avail memory = 30072832 (28 MB) it prints CPU: AVR32B (ID 1, Rev 1) (0 MHz) Features: JAVA PC OCD SIMD DSP real memory = 02 (00 MB) avail memory = 08 (08 MB) -- Ulf Lilleengen From owner-p4-projects@FreeBSD.ORG Fri Feb 27 19:01:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A30F71065670; Fri, 27 Feb 2009 19:01: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 60D7F1065675 for ; Fri, 27 Feb 2009 19:01:29 +0000 (UTC) (envelope-from gonzo@bluezbox.com) Received: from core.tav.kiev.ua (tavex.colocall.com [62.149.10.42]) by mx1.freebsd.org (Postfix) with ESMTP id DABE68FC14 for ; Fri, 27 Feb 2009 19:01:28 +0000 (UTC) (envelope-from gonzo@bluezbox.com) Received: from [76.77.86.2] (helo=[10.80.5.136]) by core.tav.kiev.ua with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.52 (FreeBSD)) id 1Ld7yQ-0007XE-96; Fri, 27 Feb 2009 21:02:22 +0200 Message-ID: <49A83861.8020707@bluezbox.com> Date: Fri, 27 Feb 2009 11:00:49 -0800 From: Oleksandr Tymoshenko User-Agent: Thunderbird 2.0.0.19 (Windows/20081209) MIME-Version: 1.0 To: Ulf Lilleengen References: <200902261742.n1QHgvYL013181@repoman.freebsd.org> <20090227195506.GA74274@carrot> In-Reply-To: <20090227195506.GA74274@carrot> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Core-Spam-Level: - X-Core-Spam-Report: Spam detection software, running on the system "core.tav.kiev.ua", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see The administrator of that system for details. Content preview: Ulf Lilleengen wrote: > On Thu, Feb 26, 2009 at 05:42:57PM +0000, Oleksandr Tymoshenko wrote: >> http://perforce.freebsd.org/chv.cgi?CH=158337 >> >> Change 158337 by gonzo@gonzo_figaro on 2009/02/26 17:42:09 >> >> - AVR32 toolchain uses its own functions for 64-bit arithmetics. >> To make linker happy we'll provide dumb wrappers around >> __[u](div|mod)di3 functions. This should be done in assembler >> though. >> >> Affected files ... >> >> .. //depot/projects/avr32/src/sys/conf/files.avr32#7 edit >> .. //depot/projects/avr32/src/sys/libkern/avr32/muldi64.c#1 add >> > There seems to be something wrong after this change, like some operations are > not performed correctly or something as it made printf output for numbers > weird somehow. Instead of: Thanks for report! Yes, Arnar noticed it yesterday. Will be fixed soon (I hope). > > CPU: AVR32B (ID 1, Rev 1) (130 MHz) > Features: JAVA PC OCD SIMD DSP > real memory = 31604736 (30 MB) > avail memory = 30072832 (28 MB) > > it prints > > CPU: AVR32B (ID 1, Rev 1) (0 MHz) > Features: JAVA PC OCD SIMD DSP > real memory = 02 (00 MB) > avail memory = 08 (08 MB) > > [...] Content analysis details: (-1.8 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.8 ALL_TRUSTED Passed through trusted hosts only via SMTP 0.0 BAYES_50 BODY: Bayesian spam probability is 40 to 60% [score: 0.5000] Cc: Perforce Change Reviews Subject: Re: PERFORCE change 158337 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Feb 2009 19:01:31 -0000 Ulf Lilleengen wrote: > On Thu, Feb 26, 2009 at 05:42:57PM +0000, Oleksandr Tymoshenko wrote: >> http://perforce.freebsd.org/chv.cgi?CH=158337 >> >> Change 158337 by gonzo@gonzo_figaro on 2009/02/26 17:42:09 >> >> - AVR32 toolchain uses its own functions for 64-bit arithmetics. >> To make linker happy we'll provide dumb wrappers around >> __[u](div|mod)di3 functions. This should be done in assembler >> though. >> >> Affected files ... >> >> .. //depot/projects/avr32/src/sys/conf/files.avr32#7 edit >> .. //depot/projects/avr32/src/sys/libkern/avr32/muldi64.c#1 add >> > There seems to be something wrong after this change, like some operations are > not performed correctly or something as it made printf output for numbers > weird somehow. Instead of: Thanks for report! Yes, Arnar noticed it yesterday. Will be fixed soon (I hope). > > CPU: AVR32B (ID 1, Rev 1) (130 MHz) > Features: JAVA PC OCD SIMD DSP > real memory = 31604736 (30 MB) > avail memory = 30072832 (28 MB) > > it prints > > CPU: AVR32B (ID 1, Rev 1) (0 MHz) > Features: JAVA PC OCD SIMD DSP > real memory = 02 (00 MB) > avail memory = 08 (08 MB) > > From owner-p4-projects@FreeBSD.ORG Fri Feb 27 19:33:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09FC610656F7; Fri, 27 Feb 2009 19:33: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 BB80110656F4 for ; Fri, 27 Feb 2009 19:33:26 +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 A739F8FC08 for ; Fri, 27 Feb 2009 19:33:26 +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 n1RJXQRW041654 for ; Fri, 27 Feb 2009 19:33:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1RJXOBA041652 for perforce@freebsd.org; Fri, 27 Feb 2009 19:33:24 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 27 Feb 2009 19:33:24 GMT Message-Id: <200902271933.n1RJXOBA041652@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 158399 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Feb 2009 19:33:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=158399 Change 158399 by hselasky@hselasky_laptop001 on 2009/02/27 19:32:38 IFC @ 158396 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#17 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#16 integrate .. //depot/projects/usb/src/sys/amd64/conf/USB2#5 delete .. //depot/projects/usb/src/sys/arm/mv/files.mv#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#7 integrate .. //depot/projects/usb/src/sys/boot/i386/btx/btx/btx.S#5 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#16 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#13 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#10 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sockio.c#6 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/usb/src/sys/contrib/altq/altq/altq_subr.c#8 integrate .. //depot/projects/usb/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_if.c#8 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#10 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#11 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#38 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#8 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#7 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_irq.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_lock.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_dma.c#8 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.h#5 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_irq.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_reg.h#1 branch .. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/usb/src/sys/dev/mca/mca_bus.c#2 integrate .. //depot/projects/usb/src/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#14 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#24 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#36 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.h#8 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio_pcm.c#11 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudioreg.h#9 integrate .. //depot/projects/usb/src/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#3 integrate .. //depot/projects/usb/src/sys/dev/txp/3c990img.h#2 integrate .. //depot/projects/usb/src/sys/dev/txp/if_txp.c#6 integrate .. //depot/projects/usb/src/sys/dev/txp/if_txpreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb.h#37 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_if.m#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#44 integrate .. //depot/projects/usb/src/sys/dev/usb/usbhid.h#7 integrate .. //depot/projects/usb/src/sys/dev/usb2/controller/at91dci.c#29 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.c#6 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci.h#2 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/atmegadci_atmelarm.c#2 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2.c#35 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_ixp4xx.c#2 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/ehci2_mbus.c#2 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/musb2_otg.c#28 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/ohci2.c#32 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/uhci2.c#31 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_controller.h#14 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/usb2_pci.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/controller/uss820dci.c#25 delete .. //depot/projects/usb/src/sys/dev/usb2/core/README.TXT#9 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#38 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_dev.c#47 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#55 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.h#15 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_generic.c#45 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_handle_request.c#17 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.c#11 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hid.h#11 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_hub.c#40 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.c#20 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_process.h#11 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.c#36 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_request.h#13 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.c#46 delete .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_transfer.h#17 delete .. //depot/projects/usb/src/sys/dev/usb2/ethernet/if_kuefw.h#3 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devid.h#30 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_devtable.h#30 delete .. //depot/projects/usb/src/sys/dev/usb2/include/usb2_ioctl.h#32 delete .. //depot/projects/usb/src/sys/dev/usb2/input/ums2.c#17 delete .. //depot/projects/usb/src/sys/dev/usb2/quirk/usb2_quirk.c#16 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/u3g2.c#14 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/uftdi2_reg.h#6 delete .. //depot/projects/usb/src/sys/dev/usb2/serial/uslcom2.c#2 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#42 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumfw.h#3 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rumvar.h#10 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#41 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_uralvar.h#10 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#41 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zydreg.h#11 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.c#7 delete .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.h#9 delete .. //depot/projects/usb/src/sys/fs/udf/udf.h#4 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#13 integrate .. //depot/projects/usb/src/sys/i386/conf/USB2#5 delete .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#14 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#14 integrate .. //depot/projects/usb/src/sys/i386/i386/vm86.c#3 integrate .. //depot/projects/usb/src/sys/i386/isa/npx.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_condvar.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_cons.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#14 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_poll.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_priv.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#12 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#16 integrate .. //depot/projects/usb/src/sys/kern/kern_thr.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_time.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_uuid.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_prf.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty_info.c#4 integrate .. //depot/projects/usb/src/sys/kern/tty_inq.c#3 integrate .. //depot/projects/usb/src/sys/kern/tty_outq.c#3 integrate .. //depot/projects/usb/src/sys/kern/tty_pty.c#9 integrate .. //depot/projects/usb/src/sys/kern/tty_ttydisc.c#4 integrate .. //depot/projects/usb/src/sys/libkern/strtouq.c#2 integrate .. //depot/projects/usb/src/sys/modules/usb/Makefile#14 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#7 delete .. //depot/projects/usb/src/sys/modules/usb2/serial_slcom/Makefile#2 delete .. //depot/projects/usb/src/sys/net/bridgestp.c#11 integrate .. //depot/projects/usb/src/sys/net/if.c#18 integrate .. //depot/projects/usb/src/sys/net/if_ef.c#6 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#15 integrate .. //depot/projects/usb/src/sys/net/if_loop.c#15 integrate .. //depot/projects/usb/src/sys/net/if_mib.c#5 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#12 integrate .. //depot/projects/usb/src/sys/net/raw_cb.c#10 integrate .. //depot/projects/usb/src/sys/net/raw_usrreq.c#9 integrate .. //depot/projects/usb/src/sys/net/vnet.h#4 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_ddb.c#11 integrate .. //depot/projects/usb/src/sys/netgraph/atm/ng_atm.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ether.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_gif.c#5 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#16 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#8 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#8 integrate .. //depot/projects/usb/src/sys/netinet/in_proto.c#9 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#13 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#18 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#16 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#14 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#18 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#15 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#13 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#15 integrate .. //depot/projects/usb/src/sys/netinet6/in6.c#17 integrate .. //depot/projects/usb/src/sys/netinet6/in6_ifattach.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/in6_proto.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#17 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_mroute.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#11 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#14 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_rtr.c#13 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#17 integrate .. //depot/projects/usb/src/sys/netinet6/scope6.c#9 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#10 integrate .. //depot/projects/usb/src/sys/netipsec/key_debug.c#4 integrate .. //depot/projects/usb/src/sys/netipsec/keysock.c#10 integrate .. //depot/projects/usb/src/sys/netipsec/xform_ipip.c#11 integrate .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#10 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_diskless.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/booke/swtch.S#2 integrate .. //depot/projects/usb/src/sys/powerpc/booke/trap.c#3 integrate .. //depot/projects/usb/src/sys/powerpc/booke/trap_subr.S#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/frame.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/pcb.h#5 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/genassym.c#8 integrate .. //depot/projects/usb/src/sys/security/mac/mac_process.c#9 integrate .. //depot/projects/usb/src/sys/sys/param.h#21 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#10 integrate .. //depot/projects/usb/src/sys/vm/vm_kern.c#11 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#13 integrate .. //depot/projects/usb/src/sys/vm/vm_map.h#8 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#15 integrate .. //depot/projects/usb/src/sys/vm/vm_pager.c#3 integrate .. //depot/projects/usb/src/sys/vm/vm_unix.c#3 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.297 2009/02/03 09:01:45 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.299 2009/02/25 22:24:56 sobomax Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -151,6 +151,7 @@ int cpu_present:1; int cpu_bsp:1; int cpu_disabled:1; + int cpu_hyperthread:1; } static cpu_info[MAX_APIC_ID + 1]; int cpu_apic_ids[MAXCPU]; int apic_cpuids[MAX_APIC_ID + 1]; @@ -353,11 +354,6 @@ cpu_apic_ids[0] = boot_cpu_id; apic_cpuids[boot_cpu_id] = 0; - assign_cpu_ids(); - - /* Start each Application Processor */ - start_all_aps(); - /* Setup the initial logical CPUs info. */ logical_cpus = logical_cpus_mask = 0; if (cpu_feature & CPUID_HTT) @@ -404,6 +400,11 @@ hyperthreading_cpus = logical_cpus; } + assign_cpu_ids(); + + /* Start each Application Processor */ + start_all_aps(); + set_interrupt_apic_ids(); } @@ -415,18 +416,26 @@ cpu_mp_announce(void) { int i, x; + const char *hyperthread; /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) continue; + if (cpu_info[x].cpu_hyperthread) { + hyperthread = "/HT"; + } else { + hyperthread = ""; + } if (cpu_info[x].cpu_disabled) - printf(" cpu (AP): APIC ID: %2d (disabled)\n", x); + printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", + hyperthread, x); else { KASSERT(i < mp_ncpus, ("mp_ncpus and actual cpus are out of whack")); - printf(" cpu%d (AP): APIC ID: %2d\n", i++, x); + printf(" cpu%d (AP%s): APIC ID: %2d\n", i++, + hyperthread, x); } } } @@ -642,11 +651,28 @@ { u_int i; + TUNABLE_INT_FETCH("machdep.hyperthreading_allowed", + &hyperthreading_allowed); + /* Check for explicitly disabled CPUs. */ for (i = 0; i <= MAX_APIC_ID; i++) { if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp) continue; + if (hyperthreading_cpus > 1 && i % hyperthreading_cpus != 0) { + cpu_info[i].cpu_hyperthread = 1; +#if defined(SCHED_ULE) + /* + * Don't use HT CPU if it has been disabled by a + * tunable. + */ + if (hyperthreading_allowed == 0) { + cpu_info[i].cpu_disabled = 1; + continue; + } +#endif + } + /* Don't use this CPU if it has been disabled by a tunable. */ if (resource_disabled("lapic", i)) { cpu_info[i].cpu_disabled = 1; @@ -1198,6 +1224,16 @@ if (error || !req->newptr) return (error); +#ifdef SCHED_ULE + /* + * SCHED_ULE doesn't allow enabling/disabling HT cores at + * run time. + */ + if (allowed != hyperthreading_allowed) + return (ENOTSUP); + return (error); +#endif + if (allowed) hlt_cpus_mask &= ~hyperthreading_cpus_mask; else @@ -1242,8 +1278,6 @@ * of hlt_logical_cpus. */ if (hyperthreading_cpus_mask) { - TUNABLE_INT_FETCH("machdep.hyperthreading_allowed", - &hyperthreading_allowed); SYSCTL_ADD_PROC(&logical_cpu_clist, SYSCTL_STATIC_CHILDREN(_machdep), OID_AUTO, "hyperthreading_allowed", CTLTYPE_INT|CTLFLAG_RW, ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#16 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.648 2009/02/23 06:00:24 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.649 2009/02/25 20:26:48 jkim Exp $"); /* * Manages physical address maps. @@ -594,7 +594,6 @@ if (!(cpu_feature & CPUID_PAT)) panic("no PAT??"); -#ifdef PAT_WORKS /* * Leave the indices 0-3 at the default of WB, WT, UC, and UC-. * Program 4 and 5 as WP and WC. @@ -604,23 +603,6 @@ pat_msr &= ~(PAT_MASK(4) | PAT_MASK(5)); pat_msr |= PAT_VALUE(4, PAT_WRITE_PROTECTED) | PAT_VALUE(5, PAT_WRITE_COMBINING); -#else - /* - * Due to some Intel errata, we can only safely use the lower 4 - * PAT entries. Thus, just replace PAT Index 2 with WC instead - * of UC-. - * - * Intel Pentium III Processor Specification Update - * Errata E.27 (Upper Four PAT Entries Not Usable With Mode B - * or Mode C Paging) - * - * Intel Pentium IV Processor Specification Update - * Errata N46 (PAT Index MSB May Be Calculated Incorrectly) - */ - pat_msr = rdmsr(MSR_PAT); - pat_msr &= ~PAT_MASK(2); - pat_msr |= PAT_VALUE(2, PAT_WRITE_COMBINING); -#endif wrmsr(MSR_PAT, pat_msr); } @@ -783,10 +765,9 @@ break; } } - + /* Map the caching mode to a PAT index. */ switch (mode) { -#ifdef PAT_WORKS case PAT_UNCACHEABLE: pat_index = 3; break; @@ -805,25 +786,9 @@ case PAT_WRITE_PROTECTED: pat_index = 4; break; -#else - case PAT_UNCACHED: - case PAT_UNCACHEABLE: - case PAT_WRITE_PROTECTED: - pat_index = 3; - break; - case PAT_WRITE_THROUGH: - pat_index = 1; - break; - case PAT_WRITE_BACK: - pat_index = 0; - break; - case PAT_WRITE_COMBINING: - pat_index = 2; - break; -#endif default: panic("Unknown caching mode %d\n", mode); - } + } /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ cache_bits = 0; ==== //depot/projects/usb/src/sys/arm/mv/files.mv#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/mv/files.mv,v 1.4 2009/02/16 21:42:41 marcel Exp $ +# $FreeBSD: src/sys/arm/mv/files.mv,v 1.5 2009/02/24 23:30:52 thompsa Exp $ # # The Marvell CPU cores # - Compliant with V5TE architecture @@ -32,5 +32,4 @@ dev/uart/uart_bus_mbus.c optional uart dev/uart/uart_cpu_mv.c optional uart dev/uart/uart_dev_ns8250.c optional uart -dev/usb/ehci_mbus.c optional ehci -dev/usb2/controller/ehci2_mbus.c optional usb2_core usb2_controller usb2_controller_ehci +dev/usb/controller/ehci_mbus.c optional ehci ==== //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#7 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.8 2009/02/03 19:16:04 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.9 2009/02/24 23:34:02 thompsa Exp $ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard @@ -46,4 +46,5 @@ # arm/xscale/ixp425/ixp425_qmgr.c optional qmgr # -dev/usb/ehci_ixp4xx.c optional ehci +dev/usb/controller/ehci_ixp4xx.c optional ehci usb +legacy/dev/usb/ehci_ixp4xx.c optional ehci ousb ==== //depot/projects/usb/src/sys/boot/i386/btx/btx/btx.S#5 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.47 2008/08/08 19:39:11 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.48 2009/02/24 23:11:15 jhb Exp $ */ /* @@ -36,6 +36,7 @@ /* * Fields in %eflags. */ + .set PSL_RESERVED_DEFAULT,0x00000002 .set PSL_T,0x00000100 # Trap flag .set PSL_I,0x00000200 # Interrupt enable flag .set PSL_VM,0x00020000 # Virtual 8086 mode flag @@ -455,6 +456,18 @@ * -0x3c %fs * -0x40 %ds * -0x44 %es + * -0x48 zero %eax (hardware int only) + * -0x4c zero %ecx (hardware int only) + * -0x50 zero %edx (hardware int only) + * -0x54 zero %ebx (hardware int only) + * -0x58 zero %esp (hardware int only) + * -0x5c zero %ebp (hardware int only) + * -0x60 zero %esi (hardware int only) + * -0x64 zero %edi (hardware int only) + * -0x68 zero %gs (hardware int only) + * -0x6c zero %fs (hardware int only) + * -0x70 zero %ds (hardware int only) + * -0x74 zero %es (hardware int only) */ int_hw: cld # String ops inc pusha # Save gp regs @@ -467,12 +480,15 @@ pushl %ds # address popl %es # data leal 0x44(%esp,1),%esi # Base of frame + movl %esp,MEM_ESPR-0x04 # Save kernel stack pointer movl -0x14(%esi),%eax # Get Int no cmpl $-1,%eax # Hardware interrupt? - jne intusr.2 # Yes + jne intusr.1 # Yes /* - * v86 calls save the btx_v86 pointer on the real mode stack and read the - * address and flags from the btx_v86 structure. + * v86 calls save the btx_v86 pointer on the real mode stack and read + * the address and flags from the btx_v86 structure. For interrupt + * handler invocations (VM86 INTx requests), disable interrupts, + * tracing, and alignment checking while the handler runs. */ movl $MEM_USR,%ebx # User base movl %ebx,%edx # address @@ -482,35 +498,36 @@ movl %edx,MEM_ESPR-0x08 # Save btx_v86 ptr movl V86_ADDR(%edx),%eax # Get int no/address movl V86_CTL(%edx),%edx # Get control flags + movl -0x08(%esi),%ebx # Save user flags in %ebx + testl $V86F_ADDR,%edx # Segment:offset? + jnz intusr.4 # Yes + andl $~(PSL_I|PSL_T|PSL_AC),%ebx # Disable interrupts, tracing, + # and alignment checking for + # interrupt handler jmp intusr.3 # Skip hardware interrupt /* - * Hardware interrupts store a NULL btx_v86 pointer and use the address - * (interrupt number) from the stack with empty flags. Also, we clear - * the segment registers for the interrupt handler. + * Hardware interrupts store a NULL btx_v86 pointer and use the + * address (interrupt number) from the stack with empty flags. Also, + * push a dummy frame of zeros onto the stack for all the general + * purpose and segment registers and clear %eflags. This gives the + * hardware interrupt handler a clean slate. */ -intusr.2: xorl %edx,%edx # Control flags +intusr.1: xorl %edx,%edx # Control flags movl %edx,MEM_ESPR-0x08 # NULL btx_v86 ptr - movl %edx,-0x38(%esi) # Real mode %gs of 0 - movl %edx,-0x3c(%esi) # Real mode %fs of 0 - movl %edx,-0x40(%esi) # Real mode %ds of 0 - movl %edx,-0x44(%esi) # Real mode %es of 0 + movl $12,%ecx # Frame is 12 dwords +intusr.2: pushl $0x0 # Fill frame + loop intusr.2 # with zeros + movl $PSL_RESERVED_DEFAULT,%ebx # Set clean %eflags /* - * %eax now holds either the interrupt number or segment:offset of function. - * %edx now holds the V86F_* flags. - * - * For interrupt handler invocations (either hardware interrupts or VM86 - * INTx requests) we also disable interrupts, tracing, and alignment checking - * while the handler runs. + * Look up real mode IDT entry for hardware interrupts and VM86 INTx + * requests. */ -intusr.3: movl -0x08(%esi),%ebx # Save user flags in %ebx - testl $V86F_ADDR,%edx # Segment:offset? - jnz intusr.4 # Yes - shll $0x2,%eax # Scale +intusr.3: shll $0x2,%eax # Scale movl (%eax),%eax # Load int vector - andl $~(PSL_I|PSL_T|PSL_AC),%ebx # Disable interrupts, tracing, - # and alignment checking for - # interrupt handler jmp intusr.5 # Skip CALLF test +/* + * Panic if V86F_CALLF isn't set with V86F_ADDR. + */ intusr.4: testl $V86F_CALLF,%edx # Far call? jnz intusr.5 # Ok movl %edx,0x30(%esp,1) # Place VM86 flags in int no @@ -522,6 +539,11 @@ popl %gs popal # Restore gp regs jmp ex_noc # Panic +/* + * %eax now holds the segment:offset of the function. + * %ebx now holds the %eflags to pass to real mode. + * %edx now holds the V86F_* flags. + */ intusr.5: movw %bx,MEM_ESPR-0x12 # Pass user flags to real mode # target /* @@ -536,8 +558,7 @@ rep # from btx_v86 movsl # to kernel stack popl %esi # Restore -intusr.6: movl %esp,MEM_ESPR-0x04 # Save kernel stack pointer - movl -0x08(%esi),%ebx # Copy user flags to real +intusr.6: movl -0x08(%esi),%ebx # Copy user flags to real movl %ebx,MEM_ESPR-0x0c # mode return trampoline movl $rret_tramp,%ebx # Set return trampoline movl %ebx,MEM_ESPR-0x10 # CS:IP @@ -611,9 +632,16 @@ movb $SEL_TSS,%cl # Set task ltr %cx # register /* - * Now we are back in protected mode. Copy the registers off of the real - * mode stack onto the kernel stack. Also, initialize all the seg regs on - * the kernel stack. + * Now we are back in protected mode. The kernel stack frame set up + * before entering real mode is still intact. For hardware interrupts, + * leave the frame unchanged. + */ + cmpl $0,MEM_ESPR-0x08 # Leave saved regs unchanged + jz rret_tramp.3 # for hardware ints +/* + * For V86 calls, copy the registers off of the real mode stack onto + * the kernel stack as we want their updated values. Also, initialize + * the segment registers on the kernel stack. * * Note that the %esp in the kernel stack after this is garbage, but popa * ignores it, so we don't have to fix it up. @@ -624,20 +652,17 @@ movl $8,%ecx # Copy GP regs from rep # real mode stack movsl # to kernel stack - popl %esi # Restore movl $SEL_UDATA,%eax # Selector for data seg regs movl $4,%ecx # Initialize %ds, rep # %es, %fs, and stosl # %gs /* - * If this was a V86 call, copy the saved seg regs on the real mode stack - * back over to the btx_v86 structure. Also, conditionally update the saved - * eflags on the kernel stack based on the flags from the user. + * For V86 calls, copy the saved seg regs on the real mode stack back + * over to the btx_v86 structure. Also, conditionally update the + * saved eflags on the kernel stack based on the flags from the user. */ movl MEM_ESPR-0x08,%ecx # Get btx_v86 ptr - jecxz rret_tramp.3 # Skip for hardware ints leal V86_GS(%ecx),%edi # %edi => btx_v86 seg regs - pushl %esi # Save leal MEM_ESPR-0x2c,%esi # %esi => real mode seg regs xchgl %ecx,%edx # Save btx_v86 ptr movl $4,%ecx # Copy seg regs ==== //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#16 (text+ko) ==== @@ -39,10 +39,11 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_route.h" #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.135 2009/02/13 15:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.136 2009/02/27 14:12:05 bz Exp $"); #include #include @@ -76,6 +77,7 @@ #include #include +#include #include #include ==== //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#9 (text+ko) ==== @@ -26,10 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_route.h" #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.146 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.147 2009/02/27 14:12:05 bz Exp $"); #include #include @@ -63,6 +64,7 @@ #include #include #include +#include #include #ifdef COMPAT_LINUX32 ==== //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.100 2008/12/27 09:42:17 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/kern_ndis.c,v 1.102 2009/02/24 18:09:31 rdivacky Exp $"); #include #include @@ -65,6 +65,9 @@ #include #include +#include +#include + #include #include #include @@ -255,10 +258,8 @@ } static void -ndis_resetdone_func(adapter, status, addressingreset) - ndis_handle adapter; - ndis_status status; - uint8_t addressingreset; +ndis_resetdone_func(ndis_handle adapter, ndis_status status, + uint8_t addressingreset) { ndis_miniport_block *block; struct ndis_softc *sc; ==== //depot/projects/usb/src/sys/compat/ndis/subr_hal.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.28 2006/05/16 14:37:57 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_hal.c,v 1.29 2009/02/24 18:09:31 rdivacky Exp $"); #include #include @@ -142,18 +142,14 @@ } static void -WRITE_PORT_USHORT(port, val) - uint16_t *port; - uint16_t val; +WRITE_PORT_USHORT(uint16_t *port, uint16_t val) { bus_space_write_2(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val); return; } static void -WRITE_PORT_UCHAR(port, val) - uint8_t *port; - uint8_t val; +WRITE_PORT_UCHAR(uint8_t *port, uint8_t val) { bus_space_write_1(NDIS_BUS_SPACE_IO, 0x0, (bus_size_t)port, val); return; @@ -378,9 +374,7 @@ } void -KfReleaseSpinLock(lock, newirql) - kspin_lock *lock; - uint8_t newirql; +KfReleaseSpinLock(kspin_lock *lock, uint8_t newirql) { KeReleaseSpinLockFromDpcLevel(lock); KeLowerIrql(newirql); @@ -407,8 +401,7 @@ } uint8_t -KfRaiseIrql(irql) - uint8_t irql; +KfRaiseIrql(uint8_t irql) { uint8_t oldirql; @@ -428,8 +421,7 @@ } void -KfLowerIrql(oldirql) - uint8_t oldirql; +KfLowerIrql(uint8_t oldirql) { if (oldirql == DISPATCH_LEVEL) return; @@ -453,8 +445,7 @@ } static void -_KeLowerIrql(oldirql) - uint8_t oldirql; +_KeLowerIrql(uint8_t oldirql) { KeLowerIrql(oldirql); return; ==== //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#13 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.115 2008/12/27 08:03:32 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.117 2009/02/24 18:09:31 rdivacky Exp $"); /* * This file implements a translation layer between the BSD networking @@ -95,6 +95,8 @@ #include #include +#include +#include #include #include @@ -903,10 +905,8 @@ } static void -NdisAcquireReadWriteLock(lock, writeacc, state) - ndis_rw_lock *lock; - uint8_t writeacc; - ndis_lock_state *state; +NdisAcquireReadWriteLock(ndis_rw_lock *lock, uint8_t writeacc, + ndis_lock_state *state) { if (writeacc == TRUE) { KeAcquireSpinLock(&lock->nrl_spinlock, &state->nls_oldirql); @@ -1089,13 +1089,9 @@ } static void -NdisMStartBufferPhysicalMapping(adapter, buf, mapreg, writedev, addrarray, arraysize) - ndis_handle adapter; - ndis_buffer *buf; - uint32_t mapreg; - uint8_t writedev; - ndis_paddr_unit *addrarray; - uint32_t *arraysize; +NdisMStartBufferPhysicalMapping(ndis_handle adapter, ndis_buffer *buf, + uint32_t mapreg, uint8_t writedev, ndis_paddr_unit *addrarray, + uint32_t *arraysize) { ndis_miniport_block *block; struct ndis_softc *sc; @@ -1472,12 +1468,8 @@ } static ndis_status -NdisMAllocateMapRegisters(adapter, dmachannel, dmasize, physmapneeded, maxmap) - ndis_handle adapter; - uint32_t dmachannel; - uint8_t dmasize; - uint32_t physmapneeded; - uint32_t maxmap; +NdisMAllocateMapRegisters(ndis_handle adapter, uint32_t dmachannel, + uint8_t dmasize, uint32_t physmapneeded, uint32_t maxmap) { struct ndis_softc *sc; ndis_miniport_block *block; @@ -1555,12 +1547,8 @@ */ static void -NdisMAllocateSharedMemory(adapter, len, cached, vaddr, paddr) - ndis_handle adapter; - uint32_t len; - uint8_t cached; - void **vaddr; - ndis_physaddr *paddr; +NdisMAllocateSharedMemory(ndis_handle adapter, uint32_t len, uint8_t cached, + void **vaddr, ndis_physaddr *paddr) { ndis_miniport_block *block; struct ndis_softc *sc; @@ -1678,11 +1666,8 @@ } static ndis_status -NdisMAllocateSharedMemoryAsync(adapter, len, cached, ctx) - ndis_handle adapter; - uint32_t len; - uint8_t cached; - void *ctx; +NdisMAllocateSharedMemoryAsync(ndis_handle adapter, uint32_t len, + uint8_t cached, void *ctx) { ndis_miniport_block *block; struct ndis_allocwork *w; @@ -1715,12 +1700,8 @@ } static void -NdisMFreeSharedMemory(adapter, len, cached, vaddr, paddr) - ndis_handle adapter; - uint32_t len; - uint8_t cached; - void *vaddr; - ndis_physaddr paddr; +NdisMFreeSharedMemory(ndis_handle adapter, uint32_t len, uint8_t cached, + void *vaddr, ndis_physaddr paddr) { ndis_miniport_block *block; struct ndis_softc *sc; @@ -1827,10 +1808,8 @@ */ static ndis_status -NdisMInitializeScatterGatherDma(adapter, is64, maxphysmap) - ndis_handle adapter; - uint8_t is64; - uint32_t maxphysmap; +NdisMInitializeScatterGatherDma(ndis_handle adapter, uint8_t is64, + uint32_t maxphysmap) { struct ndis_softc *sc; ndis_miniport_block *block; @@ -2431,14 +2410,9 @@ } static ndis_status -NdisMRegisterInterrupt(intr, adapter, ivec, ilevel, reqisr, shared, imode) - ndis_miniport_interrupt *intr; - ndis_handle adapter; - uint32_t ivec; - uint32_t ilevel; - uint8_t reqisr; - uint8_t shared; - ndis_interrupt_mode imode; +NdisMRegisterInterrupt(ndis_miniport_interrupt *intr, ndis_handle adapter, + uint32_t ivec, uint32_t ilevel, uint8_t reqisr, uint8_t shared, + ndis_interrupt_mode imode) { ndis_miniport_block *block; ndis_miniport_characteristics *ch; ==== //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.97 2008/12/27 08:03:32 weongyo Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.98 2009/02/24 18:09:31 rdivacky Exp $"); #include #include @@ -446,10 +446,7 @@ } static void * -ntoskrnl_memchr(buf, ch, len) - void *buf; - unsigned char ch; - size_t len; +ntoskrnl_memchr(void *buf, unsigned char ch, size_t len) { if (len != 0) { unsigned char *p = buf; @@ -520,10 +517,8 @@ } static uint8_t -RtlEqualUnicodeString(str1, str2, caseinsensitive) - unicode_string *str1; - unicode_string *str2; - uint8_t caseinsensitive; +RtlEqualUnicodeString(unicode_string *str1, unicode_string *str2, + uint8_t caseinsensitive) { int i; @@ -595,10 +590,7 @@ } uint32_t -RtlUnicodeStringToAnsiString(dest, src, allocate) - ansi_string *dest; - unicode_string *src; - uint8_t allocate; +RtlUnicodeStringToAnsiString(ansi_string *dest, unicode_string *src, uint8_t allocate) { if (dest == NULL || src == NULL) return(STATUS_INVALID_PARAMETER); @@ -626,10 +618,8 @@ } uint32_t -RtlAnsiStringToUnicodeString(dest, src, allocate) - unicode_string *dest; - ansi_string *src; - uint8_t allocate; +RtlAnsiStringToUnicodeString(unicode_string *dest, ansi_string *src, + uint8_t allocate) { if (dest == NULL || src == NULL) return(STATUS_INVALID_PARAMETER); @@ -727,14 +717,9 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Feb 27 20:14:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A068B1065678; Fri, 27 Feb 2009 20:14: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 57D691065672 for ; Fri, 27 Feb 2009 20:14: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 3D01A8FC19 for ; Fri, 27 Feb 2009 20:14: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 n1RKED0j045563 for ; Fri, 27 Feb 2009 20:14:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1RKEDN7045561 for perforce@freebsd.org; Fri, 27 Feb 2009 20:14:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 27 Feb 2009 20:14:13 GMT Message-Id: <200902272014.n1RKEDN7045561@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 158403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Feb 2009 20:14:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=158403 Change 158403 by hselasky@hselasky_laptop001 on 2009/02/27 20:13:30 USB NDIS: Make code compile again. Affected files ... .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#11 edit .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#14 edit .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#6 edit .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#12 edit .. //depot/projects/usb/src/sys/modules/if_ndis/Makefile#5 edit .. //depot/projects/usb/src/sys/modules/ndis/Makefile#6 edit Differences ... ==== //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#11 (text+ko) ==== @@ -65,9 +65,6 @@ #include #include -#include -#include - #include #include #include ==== //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#14 (text+ko) ==== @@ -95,8 +95,6 @@ #include #include -#include -#include #include #include ==== //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#6 (text+ko) ==== @@ -56,16 +56,16 @@ #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/src/sys/dev/if_ndis/if_ndis_usb.c#12 (text+ko) ==== @@ -53,7 +53,7 @@ #include #include -#include +#include #include @@ -67,7 +67,7 @@ SYSCTL_NODE(_hw, OID_AUTO, ndisusb, CTLFLAG_RD, 0, "NDIS USB driver parameters"); -MODULE_DEPEND(ndis, usb2_core, 1, 1, 1); +MODULE_DEPEND(ndis, usb, 1, 1, 1); MODULE_DEPEND(ndis, ndisapi, 1, 1, 1); MODULE_DEPEND(ndis, if_ndis, 1, 1, 1); ==== //depot/projects/usb/src/sys/modules/if_ndis/Makefile#5 (text+ko) ==== @@ -5,6 +5,6 @@ KMOD= if_ndis SRCS= if_ndis.c if_ndis_pci.c if_ndis_pccard.c if_ndis_usb.c SRCS+= device_if.h bus_if.h pci_if.h card_if.h pccarddevs.h -SRCS+= opt_usb.h usbdevs.h opt_bus.h usb2_if.h +SRCS+= opt_usb.h usbdevs.h opt_bus.h usb_if.h .include ==== //depot/projects/usb/src/sys/modules/ndis/Makefile#6 (text+ko) ==== @@ -6,7 +6,7 @@ SRCS= subr_pe.c subr_ndis.c subr_hal.c subr_ntoskrnl.c kern_ndis.c SRCS+= kern_windrv.c subr_usbd.c SRCS+= device_if.h bus_if.h pci_if.h vnode_if.h -SRCS+= opt_usb.h usb2_if.h opt_bus.h +SRCS+= opt_usb.h usb_if.h opt_bus.h .if ${MACHINE_ARCH} == "amd64" SRCS+= winx64_wrap.S From owner-p4-projects@FreeBSD.ORG Fri Feb 27 21:14:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 193211065676; Fri, 27 Feb 2009 21:14: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 CA150106566C for ; Fri, 27 Feb 2009 21:14:14 +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 B70A88FC18 for ; Fri, 27 Feb 2009 21:14:14 +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 n1RLEEOE061115 for ; Fri, 27 Feb 2009 21:14:14 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1RLEE9f061113 for perforce@freebsd.org; Fri, 27 Feb 2009 21:14:14 GMT (envelope-from jhb@freebsd.org) Date: Fri, 27 Feb 2009 21:14:14 GMT Message-Id: <200902272114.n1RLEE9f061113@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 158407 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 27 Feb 2009 21:14:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=158407 Change 158407 by jhb@jhb_jhbbsd on 2009/02/27 21:13:56 IFC @158406 Affected files ... .. //depot/projects/smpng/sys/dev/ata/ata-usb.c#10 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#25 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#7 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#14 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/image/uscanner.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_ioctl.h#3 integrate .. //depot/projects/smpng/sys/fs/msdosfs/denode.h#17 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_denode.c#33 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#62 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#48 integrate .. //depot/projects/smpng/sys/fs/msdosfs/msdosfsmount.h#15 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#49 integrate .. //depot/projects/smpng/sys/netinet/sctp_crc32.c#10 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#24 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#26 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.h#11 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#25 integrate .. //depot/projects/smpng/sys/sys/param.h#136 integrate Differences ... ==== //depot/projects/smpng/sys/dev/ata/ata-usb.c#10 (text) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.12 2009/02/23 21:19:18 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.13 2009/02/27 19:27:33 mav Exp $"); #include "usbdevs.h" #include @@ -322,6 +322,7 @@ struct usb2_interface_descriptor *id; const char *proto, *subclass; struct usb2_device_request request; + device_t child; uint16_t i; uint8_t maxlun; uint8_t has_intr; @@ -413,11 +414,11 @@ /* ata channels are children to this USB control device */ for (i = 0; i <= sc->maxlun; i++) { - if (!device_add_child(sc->dev, "ata", - devclass_find_free_unit(ata_devclass, 2))) { - device_printf(sc->dev, "failed to attach ata child device\n"); - goto detach; - } + if ((child = device_add_child(sc->dev, "ata", + devclass_find_free_unit(ata_devclass, 2))) == NULL) { + device_printf(sc->dev, "failed to add ata child device\n"); + } else + device_set_ivars(child, (void *)(intptr_t)i); } bus_generic_attach(sc->dev); @@ -957,23 +958,10 @@ static int ata_usbchannel_probe(device_t dev) { - struct ata_channel *ch = device_get_softc(dev); - device_t *children; - int count, i; char buffer[32]; - /* take care of green memory */ - bzero(ch, sizeof(struct ata_channel)); - - /* find channel number on this controller */ - if (!device_get_children(device_get_parent(dev), &children, &count)) { - for (i = 0; i < count; i++) { - if (children[i] == dev) - ch->unit = i; - } - free(children, M_TEMP); - } - snprintf(buffer, sizeof(buffer), "USB lun %d", ch->unit); + snprintf(buffer, sizeof(buffer), "USB lun %d", + (int)(intptr_t)device_get_ivars(dev)); device_set_desc_copy(dev, buffer); return (0); @@ -984,8 +972,13 @@ { struct ata_channel *ch = device_get_softc(dev); + if (ch->attached) + return (0); + ch->attached = 1; + /* initialize the softc basics */ ch->dev = dev; + ch->unit = (intptr_t)device_get_ivars(dev); ch->state = ATA_IDLE; ch->hw.begin_transaction = ata_usbchannel_begin_transaction; ch->hw.end_transaction = ata_usbchannel_end_transaction; @@ -1015,6 +1008,10 @@ device_t *children; int nchildren, i; + if (!ch->attached) + return (0); + ch->attached = 0; + /* detach & delete all children */ if (!device_get_children(dev, &children, &nchildren)) { for (i = 0; i < nchildren; i++) ==== //depot/projects/smpng/sys/dev/bce/if_bce.c#25 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006-2008 Broadcom Corporation + * Copyright (c) 2006-2009 Broadcom Corporation * David Christensen . All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.50 2009/01/15 22:28:05 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.51 2009/02/27 19:25:06 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -89,7 +89,6 @@ /****************************************************************************/ /* BCE Build Time Options */ /****************************************************************************/ -#define BCE_USE_SPLIT_HEADER 1 /* #define BCE_NVRAM_WRITE_SUPPORT 1 */ @@ -294,12 +293,12 @@ static void bce_dump_mbuf (struct bce_softc *, struct mbuf *); static void bce_dump_tx_mbuf_chain (struct bce_softc *, u16, int); static void bce_dump_rx_mbuf_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); #endif static void bce_dump_txbd (struct bce_softc *, int, struct tx_bd *); static void bce_dump_rxbd (struct bce_softc *, int, struct rx_bd *); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); #endif static void bce_dump_l2fhdr (struct bce_softc *, int, struct l2_fhdr *); @@ -307,7 +306,7 @@ static void bce_dump_ftqs (struct bce_softc *); static void bce_dump_tx_chain (struct bce_softc *, u16, int); static void bce_dump_rx_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS static void bce_dump_pg_chain (struct bce_softc *, u16, int); #endif static void bce_dump_status_block (struct bce_softc *); @@ -392,7 +391,7 @@ static void bce_fill_rx_chain (struct bce_softc *); static void bce_free_rx_chain (struct bce_softc *); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); static int bce_init_pg_chain (struct bce_softc *); static void bce_fill_pg_chain (struct bce_softc *); @@ -597,7 +596,7 @@ /* Firmware version and device features. */ printf("F/W (0x%08X); Flags( ", sc->bce_fw_ver); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS printf("SPLT "); #endif if (sc->bce_flags & BCE_MFW_ENABLE_FLAG) @@ -1013,7 +1012,7 @@ * This may change later if the MTU size is set to * something other than 1500. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sc->rx_bd_mbuf_alloc_size = MHLEN; /* Make sure offset is 16 byte aligned for hardware. */ sc->rx_bd_mbuf_align_pad = roundup2((MSIZE - MHLEN), 16) - @@ -2753,7 +2752,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* Free, unmap and destroy all page buffer descriptor chain pages. */ for (i = 0; i < PG_PAGES; i++ ) { if (sc->pg_bd_chain[i] != NULL) { @@ -2817,7 +2816,7 @@ sc->rx_mbuf_tag = NULL; } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* Unload and destroy the page mbuf maps. */ for (i = 0; i < TOTAL_PG_BD; i++) { if (sc->pg_mbuf_map[i] != NULL) { @@ -3267,7 +3266,7 @@ /* * Create a DMA tag for RX mbufs. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS max_size = max_seg_size = ((sc->rx_bd_mbuf_alloc_size < MCLBYTES) ? MCLBYTES : sc->rx_bd_mbuf_alloc_size); #else @@ -3303,7 +3302,7 @@ } } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* * Create a DMA tag for the page buffer descriptor chain, * allocate and clear the memory, and fetch the physical @@ -4384,7 +4383,7 @@ bce_disable_intr(sc); /* Free RX buffers. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS bce_free_pg_chain(sc); #endif bce_free_rx_chain(sc); @@ -4822,7 +4821,7 @@ goto bce_get_rx_buf_exit); /* This is a new mbuf allocation. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS MGETHDR(m_new, M_DONTWAIT, MT_DATA); #else if (sc->rx_bd_mbuf_alloc_size <= MCLBYTES) @@ -4901,7 +4900,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Encapsulate an mbuf cluster into the page chain. */ /* */ @@ -5010,7 +5009,7 @@ return(rc); } -#endif /* BCE_USE_SPLIT_HEADER */ +#endif /* ZERO_COPY_SOCKETS */ /****************************************************************************/ /* Initialize the TX context memory. */ @@ -5368,7 +5367,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Allocate memory and initialize the page data structures. */ /* Assumes that bce_init_rx_chain() has not already been called. */ @@ -5534,7 +5533,7 @@ DBEXIT(BCE_VERBOSE_RESET | BCE_VERBOSE_RECV | BCE_VERBOSE_UNLOAD); } -#endif /* BCE_USE_SPLIT_HEADER */ +#endif /* ZERO_COPY_SOCKETS */ /****************************************************************************/ @@ -5707,7 +5706,7 @@ unsigned int pkt_len; u16 sw_rx_cons, sw_rx_cons_idx, hw_rx_cons; u32 status; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS unsigned int rem_len; u16 sw_pg_cons, sw_pg_cons_idx; #endif @@ -5723,7 +5722,7 @@ bus_dmamap_sync(sc->rx_bd_chain_tag, sc->rx_bd_chain_map[i], BUS_DMASYNC_POSTWRITE); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* Prepare the page chain pages to be accessed by the host CPU. */ for (int i = 0; i < PG_PAGES; i++) bus_dmamap_sync(sc->pg_bd_chain_tag, @@ -5735,7 +5734,7 @@ /* Get working copies of the driver's view of the consumer indices. */ sw_rx_cons = sc->rx_cons; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sw_pg_cons = sc->pg_cons; #endif @@ -5797,7 +5796,7 @@ */ m_adj(m0, sizeof(struct l2_fhdr) + ETHER_ALIGN); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* * Check whether the received frame fits in a single * mbuf or not (i.e. packet data + FCS <= @@ -5970,7 +5969,7 @@ if (m0) { /* Make sure we don't lose our place when we release the lock. */ sc->rx_cons = sw_rx_cons; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sc->pg_cons = sw_pg_cons; #endif @@ -5980,7 +5979,7 @@ /* Recover our place. */ sw_rx_cons = sc->rx_cons; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sw_pg_cons = sc->pg_cons; #endif } @@ -5991,7 +5990,7 @@ } /* No new packets to process. Refill the RX and page chains and exit. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sc->pg_cons = sw_pg_cons; bce_fill_pg_chain(sc); #endif @@ -6003,7 +6002,7 @@ bus_dmamap_sync(sc->rx_bd_chain_tag, sc->rx_bd_chain_map[i], BUS_DMASYNC_PREWRITE); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS for (int i = 0; i < PG_PAGES; i++) bus_dmamap_sync(sc->pg_bd_chain_tag, sc->pg_bd_chain_map[i], BUS_DMASYNC_PREWRITE); @@ -6249,7 +6248,7 @@ * Calculate and program the hardware Ethernet MTU * size. Be generous on the receive if we have room. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS if (ifp->if_mtu <= (sc->rx_bd_mbuf_data_len + sc->pg_bd_mbuf_alloc_size)) ether_mtu = sc->rx_bd_mbuf_data_len + sc->pg_bd_mbuf_alloc_size; #else @@ -6281,7 +6280,7 @@ /* Program appropriate promiscuous/multicast filtering. */ bce_set_rx_mode(sc); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* Init page buffer descriptor chain. */ bce_init_pg_chain(sc); #endif @@ -6794,7 +6793,7 @@ BCE_LOCK(sc); ifp->if_mtu = ifr->ifr_mtu; ifp->if_drv_flags &= ~IFF_DRV_RUNNING; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* No buffer allocation size changes are necessary. */ #else /* Recalculate our buffer allocation sizes. */ @@ -7495,7 +7494,7 @@ bce_stats_update(sc); /* Top off the receive and page chains. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS bce_fill_pg_chain(sc); #endif bce_fill_rx_chain(sc); @@ -7675,7 +7674,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Provides a sysctl interface to allow dumping the page chain. */ /* */ @@ -8248,7 +8247,7 @@ (void *)sc, 0, bce_sysctl_dump_tx_chain, "I", "Dump tx_bd chain"); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "dump_pg_chain", CTLTYPE_INT | CTLFLAG_RW, (void *)sc, 0, @@ -8543,7 +8542,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Prints out the mbufs in the mbuf page chain. */ /* */ @@ -8667,7 +8666,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Prints out a rx_bd structure in the page chain. */ /* */ @@ -9154,7 +9153,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Prints out the page chain. */ /* */ @@ -9635,7 +9634,7 @@ "0x%08X:%08X - (sc->rx_bd_chain) rx_bd chain virtual address\n", val_hi, val_lo); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS val_hi = BCE_ADDR_HI(sc->pg_bd_chain); val_lo = BCE_ADDR_LO(sc->pg_bd_chain); BCE_PRINTF( @@ -9655,7 +9654,7 @@ "0x%08X:%08X - (sc->rx_mbuf_ptr) rx mbuf chain virtual address\n", val_hi, val_lo); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS val_hi = BCE_ADDR_HI(sc->pg_mbuf_ptr); val_lo = BCE_ADDR_LO(sc->pg_mbuf_ptr); BCE_PRINTF( @@ -9708,7 +9707,7 @@ BCE_PRINTF(" 0x%08X - (sc->free_rx_bd) free rx_bd's\n", sc->free_rx_bd); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS BCE_PRINTF(" 0x%04X(0x%04X) - (sc->pg_prod) page producer index\n", sc->pg_prod, (u16) PG_CHAIN_IDX(sc->pg_prod)); @@ -10218,7 +10217,7 @@ bce_dump_tpat_state(sc, 0); bce_dump_cp_state(sc, 0); bce_dump_com_state(sc, 0); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS bce_dump_pgbd(sc, 0, NULL); bce_dump_pg_mbuf_chain(sc, 0, USABLE_PG_BD); bce_dump_pg_chain(sc, 0, USABLE_PG_BD); ==== //depot/projects/smpng/sys/dev/bce/if_bcefw.h#7 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006-2008 Broadcom Corporation + * Copyright (c) 2006-2009 Broadcom Corporation * David Christensen . All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bce/if_bcefw.h,v 1.7 2008/06/13 01:16:37 davidch Exp $ + * $FreeBSD: src/sys/dev/bce/if_bcefw.h,v 1.8 2009/02/27 19:25:06 davidch Exp $ */ /* ==== //depot/projects/smpng/sys/dev/bce/if_bcereg.h#14 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006-2008 Broadcom Corporation + * Copyright (c) 2006-2009 Broadcom Corporation * David Christensen . All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.22 2008/11/22 05:55:56 kmacy Exp $ + * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.23 2009/02/27 19:25:06 davidch Exp $ */ #ifndef _BCE_H_DEFINED @@ -6206,6 +6206,7 @@ #define RX_PAGE(x) (((x) & ~USABLE_RX_BD_PER_PAGE) >> (BCM_PAGE_BITS - 4)) #define RX_IDX(x) ((x) & USABLE_RX_BD_PER_PAGE) +#ifdef ZERO_COPY_SOCKETS /* * To accomodate jumbo frames, the page chain should * be 4 times larger than the receive chain. @@ -6226,6 +6227,8 @@ #define PG_PAGE(x) (((x) & ~USABLE_PG_BD_PER_PAGE) >> (BCM_PAGE_BITS - 4)) #define PG_IDX(x) ((x) & USABLE_PG_BD_PER_PAGE) +#endif /* ZERO_COPY_SOCKETS */ + /* Context size. */ #define CTX_SHIFT 7 #define CTX_SIZE (1 << CTX_SHIFT) @@ -6499,8 +6502,11 @@ u16 tx_prod; u16 tx_cons; u32 tx_prod_bseq; /* Counts the bytes used. */ + +#ifdef ZERO_COPY_SOCKETS u16 pg_prod; u16 pg_cons; +#endif int bce_link; struct callout bce_tick_callout; @@ -6513,7 +6519,10 @@ int rx_bd_mbuf_alloc_size; int rx_bd_mbuf_data_len; int rx_bd_mbuf_align_pad; + +#ifdef ZERO_COPY_SOCKETS int pg_bd_mbuf_alloc_size; +#endif /* Receive mode settings (i.e promiscuous, multicast, etc.). */ u32 rx_mode; @@ -6533,11 +6542,13 @@ struct rx_bd *rx_bd_chain[RX_PAGES]; bus_addr_t rx_bd_chain_paddr[RX_PAGES]; +#ifdef ZERO_COPY_SOCKETS /* H/W maintained page buffer descriptor chain structure. */ bus_dma_tag_t pg_bd_chain_tag; bus_dmamap_t pg_bd_chain_map[PG_PAGES]; struct rx_bd *pg_bd_chain[PG_PAGES]; bus_addr_t pg_bd_chain_paddr[PG_PAGES]; +#endif /* H/W maintained status block. */ bus_dma_tag_t status_tag; @@ -6567,7 +6578,10 @@ /* Bus tag for RX/TX mbufs. */ bus_dma_tag_t rx_mbuf_tag; bus_dma_tag_t tx_mbuf_tag; + +#ifdef ZERO_COPY_SOCKETS bus_dma_tag_t pg_mbuf_tag; +#endif /* S/W maintained mbuf TX chain structure. */ bus_dmamap_t tx_mbuf_map[TOTAL_TX_BD]; @@ -6577,17 +6591,22 @@ bus_dmamap_t rx_mbuf_map[TOTAL_RX_BD]; struct mbuf *rx_mbuf_ptr[TOTAL_RX_BD]; +#ifdef ZERO_COPY_SOCKETS /* S/W maintained mbuf page chain structure. */ bus_dmamap_t pg_mbuf_map[TOTAL_PG_BD]; struct mbuf *pg_mbuf_ptr[TOTAL_PG_BD]; +#endif /* Track the number of buffer descriptors in use. */ u16 free_rx_bd; u16 max_rx_bd; u16 used_tx_bd; u16 max_tx_bd; + +#ifdef ZERO_COPY_SOCKETS u16 free_pg_bd; u16 max_pg_bd; +#endif /* Provides access to hardware statistics through sysctl. */ u64 stat_IfHCInOctets; @@ -6661,7 +6680,10 @@ /* Track the number of enqueued mbufs. */ int debug_tx_mbuf_alloc; int debug_rx_mbuf_alloc; + +#ifdef ZERO_COPY_SOCKETS int debug_pg_mbuf_alloc; +#endif /* Track how many and what type of interrupts are generated. */ u32 interrupts_generated; @@ -6676,8 +6698,10 @@ u32 rx_low_watermark; /* Lowest number of rx_bd's free. */ u32 rx_empty_count; /* Number of times the RX chain was empty. */ +#ifdef ZERO_COPY_SOCKETS u32 pg_low_watermark; /* Lowest number of pages free. */ u32 pg_empty_count; /* Number of times the page chain was empty. */ +#endif u32 tx_hi_watermark; /* Greatest number of tx_bd's used. */ u32 tx_full_count; /* Number of times the TX chain was full. */ @@ -6693,5 +6717,5 @@ #endif }; -#endif /* #ifndef _BCE_H_DEFINED */ +#endif /* __BCEREG_H_DEFINED */ ==== //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#22 (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.39 2009/02/23 21:19:18 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.40 2009/02/27 17:27:16 thompsa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -379,9 +379,9 @@ static void umidi_stop_read(struct usb2_fifo *); static void umidi_start_write(struct usb2_fifo *); static void umidi_stop_write(struct usb2_fifo *); -static int umidi_open(struct usb2_fifo *, int, struct thread *); -static int umidi_ioctl(struct usb2_fifo *, u_long cmd, void *, int, struct thread *); -static void umidi_close(struct usb2_fifo *, int, struct thread *); +static int umidi_open(struct usb2_fifo *, int); +static int umidi_ioctl(struct usb2_fifo *, u_long cmd, void *, int); +static void umidi_close(struct usb2_fifo *, int); static void umidi_init(device_t dev); static int32_t umidi_probe(device_t dev); static int32_t umidi_detach(device_t dev); @@ -3585,7 +3585,7 @@ } static int -umidi_open(struct usb2_fifo *fifo, int fflags, struct thread *td) +umidi_open(struct usb2_fifo *fifo, int fflags) { struct umidi_chan *chan = fifo->priv_sc0; struct umidi_sub_chan *sub = umidi_sub_by_fifo(fifo); @@ -3617,7 +3617,7 @@ } static void -umidi_close(struct usb2_fifo *fifo, int fflags, struct thread *td) +umidi_close(struct usb2_fifo *fifo, int fflags) { if (fflags & FREAD) { usb2_fifo_free_buffer(fifo); @@ -3630,7 +3630,7 @@ static int umidi_ioctl(struct usb2_fifo *fifo, u_long cmd, void *data, - int fflags, struct thread *td) + int fflags) { return (ENODEV); } @@ -3684,9 +3684,6 @@ (chan->max_cable == 0)) { chan->max_cable = UMIDI_CABLES_MAX; } - /* set interface permissions */ - usb2_set_iface_perm(sc->sc_udev, chan->iface_index, - UID_ROOT, GID_OPERATOR, 0644); for (n = 0; n < chan->max_cable; n++) { @@ -3694,7 +3691,8 @@ error = usb2_fifo_attach(sc->sc_udev, chan, &chan->mtx, &umidi_fifo_methods, &sub->fifo, unit, n, - chan->iface_index); + chan->iface_index, + UID_ROOT, GID_OPERATOR, 0644); if (error) { goto detach; } ==== //depot/projects/smpng/sys/dev/usb/bluetooth/ubtbcmfw.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: src/sys/dev/usb/bluetooth/ubtbcmfw.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $ + * $FreeBSD: src/sys/dev/usb/bluetooth/ubtbcmfw.c,v 1.2 2009/02/27 17:27:16 thompsa Exp $ */ #include "usbdevs.h" @@ -211,13 +211,10 @@ goto detach; } - /* Set interface permissions */ - usb2_set_iface_perm(uaa->device, uaa->info.bIfaceIndex, - UID_ROOT, GID_OPERATOR, 0644); - error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx, &ubtbcmfw_fifo_methods, &sc->sc_fifo, - device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex); + device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex, + UID_ROOT, GID_OPERATOR, 0644); if (error != 0) { device_printf(dev, "could not attach fifo. %s\n", usb2_errstr(error)); @@ -369,7 +366,7 @@ */ static int -ubtbcmfw_open(struct usb2_fifo *fifo, int fflags, struct thread *td) +ubtbcmfw_open(struct usb2_fifo *fifo, int fflags) { struct ubtbcmfw_softc *sc = fifo->priv_sc0; struct usb2_xfer *xfer; @@ -398,7 +395,7 @@ */ static void -ubtbcmfw_close(struct usb2_fifo *fifo, int fflags, struct thread *td) +ubtbcmfw_close(struct usb2_fifo *fifo, int fflags) { if (fflags & (FREAD | FWRITE)) usb2_fifo_free_buffer(fifo); @@ -410,7 +407,7 @@ static int ubtbcmfw_ioctl(struct usb2_fifo *fifo, u_long cmd, void *data, - int fflags, struct thread *td) + int fflags) { struct ubtbcmfw_softc *sc = fifo->priv_sc0; int error = 0; ==== //depot/projects/smpng/sys/dev/usb/image/uscanner.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/image/uscanner.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/image/uscanner.c,v 1.2 2009/02/27 17:27:16 thompsa Exp $"); /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -399,13 +399,11 @@ "error=%s\n", usb2_errstr(error)); goto detach; } - /* set interface permissions */ - usb2_set_iface_perm(uaa->device, uaa->info.bIfaceIndex, - UID_ROOT, GID_OPERATOR, 0644); error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx, &uscanner_fifo_methods, &sc->sc_fifo, - unit, 0 - 1, uaa->info.bIfaceIndex); + unit, 0 - 1, uaa->info.bIfaceIndex, + UID_ROOT, GID_OPERATOR, 0644); if (error) { goto detach; } @@ -553,7 +551,7 @@ * uscanner character device opening method. */ static int -uscanner_open(struct usb2_fifo *fifo, int fflags, struct thread *td) +uscanner_open(struct usb2_fifo *fifo, int fflags) { struct uscanner_softc *sc; @@ -585,7 +583,7 @@ } static void -uscanner_close(struct usb2_fifo *fifo, int fflags, struct thread *td) +uscanner_close(struct usb2_fifo *fifo, int fflags) { if (fflags & (FREAD | FWRITE)) { usb2_fifo_free_buffer(fifo); ==== //depot/projects/smpng/sys/dev/usb/input/uhid.c#2 (text+ko) ==== @@ -5,7 +5,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/input/uhid.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/input/uhid.c,v 1.2 2009/02/27 17:27:16 thompsa Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -447,7 +447,7 @@ } static int -uhid_open(struct usb2_fifo *fifo, int fflags, struct thread *td) +uhid_open(struct usb2_fifo *fifo, int fflags) { struct uhid_softc *sc = fifo->priv_sc0; @@ -474,7 +474,7 @@ } static void -uhid_close(struct usb2_fifo *fifo, int fflags, struct thread *td) +uhid_close(struct usb2_fifo *fifo, int fflags) { if (fflags & (FREAD | FWRITE)) { usb2_fifo_free_buffer(fifo); @@ -483,7 +483,7 @@ static int uhid_ioctl(struct usb2_fifo *fifo, u_long cmd, void *addr, - int fflags, struct thread *td) + int fflags) { struct uhid_softc *sc = fifo->priv_sc0; struct usb2_gen_descriptor *ugd; @@ -734,13 +734,11 @@ sc->sc_fsize); sc->sc_fsize = UHID_BSIZE; } - /* set interface permissions */ - usb2_set_iface_perm(uaa->device, uaa->info.bIfaceIndex, - UID_ROOT, GID_OPERATOR, 0644); error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx, &uhid_fifo_methods, &sc->sc_fifo, - unit, 0 - 1, uaa->info.bIfaceIndex); + unit, 0 - 1, uaa->info.bIfaceIndex, + UID_ROOT, GID_OPERATOR, 0644); if (error) { goto detach; } ==== //depot/projects/smpng/sys/dev/usb/input/ums.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/input/ums.c,v 1.2 2009/02/24 03:34:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/input/ums.c,v 1.3 2009/02/27 17:27:16 thompsa Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf @@ -583,13 +583,10 @@ sc->sc_status.dy = 0; sc->sc_status.dz = 0; - /* set interface permissions */ - usb2_set_iface_perm(uaa->device, uaa->info.bIfaceIndex, - UID_ROOT, GID_OPERATOR, 0644); - err = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx, &ums_fifo_methods, &sc->sc_fifo, - unit, 0 - 1, uaa->info.bIfaceIndex); + unit, 0 - 1, uaa->info.bIfaceIndex, + UID_ROOT, GID_OPERATOR, 0644); if (err) { goto detach; } @@ -697,7 +694,7 @@ } static int -ums_open(struct usb2_fifo *fifo, int fflags, struct thread *td) +ums_open(struct usb2_fifo *fifo, int fflags) { struct ums_softc *sc = fifo->priv_sc0; @@ -724,7 +721,7 @@ } static void -ums_close(struct usb2_fifo *fifo, int fflags, struct thread *td) +ums_close(struct usb2_fifo *fifo, int fflags) { if (fflags & FREAD) { usb2_fifo_free_buffer(fifo); @@ -732,8 +729,7 @@ } static int -ums_ioctl(struct usb2_fifo *fifo, u_long cmd, void *addr, - int fflags, struct thread *td) +ums_ioctl(struct usb2_fifo *fifo, u_long cmd, void *addr, int fflags) { struct ums_softc *sc = fifo->priv_sc0; mousemode_t mode; ==== //depot/projects/smpng/sys/dev/usb/misc/ufm.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/misc/ufm.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/misc/ufm.c,v 1.2 2009/02/27 17:27:16 thompsa Exp $"); #include "usbdevs.h" @@ -139,13 +139,10 @@ device_set_usb2_desc(dev); - /* set interface permissions */ - usb2_set_iface_perm(uaa->device, uaa->info.bIfaceIndex, - UID_ROOT, GID_OPERATOR, 0644); - error = usb2_fifo_attach(uaa->device, sc, &sc->sc_mtx, &ufm_fifo_methods, &sc->sc_fifo, - device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex); + device_get_unit(dev), 0 - 1, uaa->info.bIfaceIndex, + UID_ROOT, GID_OPERATOR, 0644); if (error) { goto detach; } @@ -169,7 +166,7 @@ } static int -ufm_open(struct usb2_fifo *dev, int fflags, struct thread *td) +ufm_open(struct usb2_fifo *dev, int fflags) { if ((fflags & (FWRITE | FREAD)) != (FWRITE | FREAD)) { return (EACCES); @@ -300,7 +297,7 @@ static int ufm_ioctl(struct usb2_fifo *fifo, u_long cmd, void *addr, - int fflags, struct thread *td) + int fflags) { struct ufm_softc *sc = fifo->priv_sc0; int error = 0; ==== //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ulpt.c,v 1.1 2009/02/23 18:31:00 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/ulpt.c,v 1.2 2009/02/27 17:27:16 thompsa Exp $"); /* $NetBSD: ulpt.c,v 1.60 2003/10/04 21:19:50 augustss Exp $ */ @@ -395,7 +395,7 @@ } static int -ulpt_open(struct usb2_fifo *fifo, int fflags, struct thread *td) +ulpt_open(struct usb2_fifo *fifo, int fflags) { struct ulpt_softc *sc = fifo->priv_sc0; @@ -404,11 +404,11 @@ if (sc->sc_fflags == 0) { ulpt_reset(sc); } - return (unlpt_open(fifo, fflags, td)); + return (unlpt_open(fifo, fflags)); } static int -unlpt_open(struct usb2_fifo *fifo, int fflags, struct thread *td) +unlpt_open(struct usb2_fifo *fifo, int fflags) { struct ulpt_softc *sc = fifo->priv_sc0; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 28 00:52:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9960A1065676; Sat, 28 Feb 2009 00:51: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 6D9D6106564A for ; Sat, 28 Feb 2009 00:51:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 516558FC13 for ; Sat, 28 Feb 2009 00:51:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1S0pv9j091792 for ; Sat, 28 Feb 2009 00:51:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1S0pvQ0091790 for perforce@freebsd.org; Sat, 28 Feb 2009 00:51:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 28 Feb 2009 00:51:57 GMT Message-Id: <200902280051.n1S0pvQ0091790@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 158418 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Feb 2009 00:52:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=158418 Change 158418 by hselasky@hselasky_laptop001 on 2009/02/28 00:51:00 USB NDIS: Fix the last bits and pieces. - mostly fix locking issues - add support for pipe abortion - remove IFF_NEEDSGIANT Affected files ... .. //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#6 edit .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#7 edit .. //depot/projects/usb/src/sys/compat/ndis/usbd_var.h#4 edit .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#18 edit .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#13 edit .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hub.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#6 (text+ko) ==== @@ -56,6 +56,9 @@ #include #endif +#include +#include + #include #include #include @@ -431,6 +434,9 @@ STAILQ_INSERT_HEAD(&drvdb_head, new, link); mtx_unlock(&drvdb_mtx); + /* Make sure all driver-less USB devices get explored again! */ + usb2_needs_explore_all(); + return (0); } ==== //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#7 (text+ko) ==== @@ -96,10 +96,11 @@ static int32_t usbd_func_getdesc(irp *ip); static usb2_error_t usbd_get_desc_ndis(struct usb2_device *udev, struct mtx *mtx, uint16_t id, uint16_t maxlen, uint8_t type, uint8_t index, uint8_t retries, void *desc, uint16_t *actlen); static int32_t usbd_func_selconf(irp *ip); +static int32_t usbd_func_pipe_abort(irp *ip); static int32_t usbd_func_vendorclass(irp *ip); static void usbd_irpcancel(device_object *dobj, irp *ip); static int32_t ndis_setup_endpoint(struct ndis_softc *sc, uint8_t iface_index, struct usb2_endpoint_descriptor *edesc, uint32_t bufsize); -static void ndis_xfer_complete(struct ndisusb_ep *nuep, int32_t status); +static void ndis_xfer_complete(struct ndis_softc *sc, struct ndisusb_ep *nuep, int32_t status); static int32_t usbd_func_bulkintr(irp *ip); static union usbd_urb *USBD_CreateConfigurationRequest(struct usb2_config_descriptor *conf, uint16_t *len); static union usbd_urb *USBD_CreateConfigurationRequestEx(struct usb2_config_descriptor *conf, struct usbd_interface_list_entry *list); @@ -415,6 +416,10 @@ status = usbd_func_selconf(ip); USBD_URB_STATUS(urb) = status; break; + case URB_FUNCTION_ABORT_PIPE: + status = usbd_func_pipe_abort(ip); + USBD_URB_STATUS(urb) = status; + break; case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: status = usbd_func_getdesc(ip); USBD_URB_STATUS(urb) = status; @@ -425,7 +430,6 @@ USBD_URB_STATUS(urb) = status = USBD_STATUS_NOT_SUPPORTED; break; } - return (status); } @@ -469,7 +473,7 @@ /* Success */ status = USB_ERR_NORMAL_COMPLETION; } else { - status = usbd_get_desc_ndis(sc->ndisusb_dev, &sc->ndis_mtx, + status = usbd_get_desc_ndis(sc->ndisusb_dev, NULL, ctldesc->ucd_langid, ctldesc->ucd_trans_buflen, ctldesc->ucd_desctype, ctldesc->ucd_idx, 3, ctldesc->ucd_trans_buf, &actlen); @@ -532,13 +536,9 @@ intf = &selconf->usc_intf; for (i = 0; i < conf->bNumInterface && intf->uii_len > 0; i++) { - mtx_unlock(&sc->ndis_mtx); - err = usb2_set_alt_interface_index(sc->ndisusb_dev, intf->uii_intfnum, intf->uii_altset); - mtx_lock(&sc->ndis_mtx); - if (err != USB_ERR_NORMAL_COMPLETION) { device_printf(dev, "setting alternate interface failed: %s\n", @@ -585,6 +585,47 @@ } static int32_t +usbd_func_pipe_abort(irp *ip) +{ + device_t dev = IRP_NDIS_DEV(ip); + struct ndis_softc *sc; + struct usb2_endpoint_descriptor *edesc; + struct usbd_urb_pipe_abort *upa; + struct usbd_urb_bulk_or_intr_transfer *ubi; + union usbd_urb *urb; + static struct ndisusb_ep *nuep; + + sc = device_get_softc(dev); + urb = usbd_geturb(ip); + + upa = &urb->uu_pipe_abort; + edesc = upa->upa_handle; + if (edesc == NULL) { + device_printf(dev, "pipe handle is NULL\n"); + return USBD_STATUS_REQUEST_FAILED; + } + + nuep = usbd_get_ndisusb_ep(sc, edesc->bEndpointAddress); + if (nuep == NULL) { + device_printf(dev, "endpoint does not exist\n"); + return USBD_STATUS_REQUEST_FAILED; + } + + NDIS_LOCK(sc); + + usb2_transfer_stop(nuep->urb_xfer[0]); + + while ((ubi = usbd_first_ubi(nuep))) { + ndis_xfer_complete(sc, nuep, USBD_STATUS_CANCELED); + } + + usb2_transfer_start(nuep->urb_xfer[0]); + + NDIS_UNLOCK(sc); + return USBD_STATUS_SUCCESS; +} + +static int32_t usbd_func_vendorclass(irp *ip) { device_t dev = IRP_NDIS_DEV(ip); @@ -639,7 +680,7 @@ USETW(req.wLength, vcreq->uvc_trans_buflen); err = usb2_do_request(sc->ndisusb_dev, - &sc->ndis_mtx, &req, vcreq->uvc_trans_buf); + NULL, &req, vcreq->uvc_trans_buf); return usbd_usb2urb(err); } @@ -647,13 +688,23 @@ static void usbd_irpcancel(device_object *dobj, irp *ip) { + device_t dev = IRP_NDIS_DEV(ip); + struct ndis_softc *sc = device_get_softc(dev); struct ndisusb_ep *nuep; union usbd_urb *urb; struct usbd_urb_bulk_or_intr_transfer *ubi; + struct usbd_urb_bulk_or_intr_transfer *ubi_first; + + /* XXX we have a LOR here ! --hps */ + IoReleaseCancelSpinLock(ip->irp_cancelirql); + NDIS_LOCK(sc); + IoAcquireCancelSpinLock(&ip->irp_cancelirql); + if (IRP_NDISUSB_EP(ip) == NULL) { ip->irp_cancel = TRUE; IoReleaseCancelSpinLock(ip->irp_cancelirql); + NDIS_UNLOCK(sc); return; } @@ -663,13 +714,14 @@ urb = usbd_geturb(ip); ubi = &urb->uu_bulkintr; + /* get current UBI */ + ubi_first = usbd_first_ubi(nuep); + /* remove UBI from queue */ usbd_remove_ubi(nuep, ubi); /* check if the currently executing transfer is being cancelled */ - if (nuep->irp_curr == ip) { - nuep->irp_curr = NULL; - + if (ubi == ubi_first) { /* * Make sure that the current USB transfer proxy is * cancelled and then restarted. @@ -680,6 +732,7 @@ ip->irp_cancel = TRUE; IoReleaseCancelSpinLock(ip->irp_cancelirql); + NDIS_UNLOCK(sc); } static int32_t @@ -718,13 +771,9 @@ cfg[0].mh.flags.proxy_buffer = 1; cfg[0].mh.flags.short_xfer_ok = 1; - mtx_unlock(&sc->ndis_mtx); - err = usb2_transfer_setup(sc->ndisusb_dev, &iface_index, nuep->urb_xfer, cfg, 1, sc, &sc->ndis_mtx); - mtx_lock(&sc->ndis_mtx); - if (err) return (usbd_usb2urb(err)); @@ -760,14 +809,19 @@ } static void -ndis_xfer_complete(struct ndisusb_ep *nuep, int32_t status) +ndis_xfer_complete(struct ndis_softc *sc, struct ndisusb_ep *nuep, int32_t status) { - irp *ip = nuep->irp_curr; + irp *ip; struct usbd_urb_bulk_or_intr_transfer *ubi; union usbd_urb *urb; + ubi = usbd_first_ubi(nuep); + if (ubi == NULL) + return; /* cancelled */ + + ip = ubi->ubi_hca.reserved8[2]; if (ip == NULL) - return; /* cancelled */ + return; /* cancelled */ if (status != USBD_STATUS_SUCCESS) nuep->urb_actlen = 0; @@ -790,7 +844,11 @@ ip->irp_iostat.isb_status = usbd_urb2nt(USBD_URB_STATUS(urb)); + NDIS_UNLOCK(sc); + IoCompleteRequest(ip, IO_NO_INCREMENT); + + NDIS_LOCK(sc); } /*------------------------------------------------------------------------* @@ -810,6 +868,7 @@ switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: + if (nuep->urb_rx_data) { /* copy in data with regard to the URB */ usb2_copy_out(xfer->frbuffers, 0, @@ -825,15 +884,15 @@ nuep->urb_len = 0; /* check if short transfer is ok */ if (nuep->urb_short_flag) - ndis_xfer_complete(nuep, USBD_STATUS_ERROR_SHORT_TRANSFER); + ndis_xfer_complete(sc, nuep, USBD_STATUS_ERROR_SHORT_TRANSFER); else - ndis_xfer_complete(nuep, USBD_STATUS_SUCCESS); + ndis_xfer_complete(sc, nuep, USBD_STATUS_SUCCESS); } else { /* check remainder */ if (nuep->urb_len > 0) goto setup_bulk; - ndis_xfer_complete(nuep, USBD_STATUS_SUCCESS); + ndis_xfer_complete(sc, nuep, USBD_STATUS_SUCCESS); } case USB_ST_SETUP: @@ -851,6 +910,10 @@ nuep->urb_len = ubi->ubi_trans_buflen; nuep->urb_data = ubi->ubi_trans_buf; nuep->urb_actlen = 0; + if (ubi->ubi_trans_flags & USBD_SHORT_TRANSFER_OK) + nuep->urb_short_flag = 0; + else + nuep->urb_short_flag = 1; setup_bulk: if (max_bulk > nuep->urb_len) @@ -874,12 +937,11 @@ break; default: - ndis_xfer_complete(nuep, usbd_usb2urb(xfer->error)); - if (xfer->error != USB_ERR_CANCELLED) { xfer->flags.stall_pipe = 1; device_printf(sc->ndis_dev, "USB error (%s)\n", usb2_errstr(xfer->error)); + ndis_xfer_complete(sc, nuep, usbd_usb2urb(xfer->error)); goto tr_setup; } break; @@ -916,6 +978,8 @@ return (USBD_STATUS_REQUEST_FAILED); } + NDIS_LOCK(sc); + /* final UBI transfer setup */ IoAcquireCancelSpinLock(&ip->irp_cancelirql); @@ -931,9 +995,14 @@ /* enqueue the URB */ usbd_enqueue_ubi(nuep, ubi); + /* store reference to IRP */ + ubi->ubi_hca.reserved8[2] = ip; + /* start USB transfer, if any */ usb2_transfer_start(nuep->urb_xfer[0]); + NDIS_UNLOCK(sc); + /* return pending status code */ return (USBD_STATUS_PENDING); } @@ -1095,4 +1164,4 @@ { NULL, NULL, NULL } }; -MODULE_DEPEND(ndis, usb2_core, 1, 1, 1); +MODULE_DEPEND(ndis, usb, 1, 1, 1); ==== //depot/projects/usb/src/sys/compat/ndis/usbd_var.h#4 (text+ko) ==== @@ -44,7 +44,9 @@ #define IOCTL_INTERNAL_USB_SUBMIT_URB 0x00220003 #define URB_FUNCTION_SELECT_CONFIGURATION 0x0000 +#define URB_FUNCTION_ABORT_PIPE 0x0002 #define URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER 0x0009 +#define URB_FUNCTION_ISOCH_TRANSFER 0x000A #define URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE 0x000B #define URB_FUNCTION_VENDOR_DEVICE 0x0017 #define URB_FUNCTION_VENDOR_INTERFACE 0x0018 @@ -136,6 +138,12 @@ struct usbd_interface_information usc_intf; }; +struct usbd_urb_pipe_abort { + struct usbd_urb_header upa_hdr; + struct usb2_endpoint_descriptor *upa_handle; + uint32_t upa_reserved; +}; + struct usbd_hcd_area { void *reserved8[8]; }; @@ -192,10 +200,11 @@ union usbd_urb { struct usbd_urb_header uu_hdr; - struct usbd_urb_select_configuration uu_selconf; - struct usbd_urb_bulk_or_intr_transfer uu_bulkintr; - struct usbd_urb_control_descriptor_request uu_ctldesc; - struct usbd_urb_vendor_or_class_request uu_vcreq; + struct usbd_urb_select_configuration uu_selconf; + struct usbd_urb_pipe_abort uu_pipe_abort; + struct usbd_urb_bulk_or_intr_transfer uu_bulkintr; + struct usbd_urb_control_descriptor_request uu_ctldesc; + struct usbd_urb_vendor_or_class_request uu_vcreq; }; #define USBD_URB_STATUS(urb) ((urb)->uu_hdr.uuh_status) ==== //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#18 (text+ko) ==== @@ -713,8 +713,6 @@ if_initname(ifp, device_get_name(dev), device_get_unit(dev)); ifp->if_mtu = ETHERMTU; ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; - if (sc->ndis_iftype == PNPBus) - ifp->if_flags |= IFF_NEEDSGIANT; ifp->if_ioctl = ndis_ioctl; ifp->if_start = ndis_start; ifp->if_init = ndis_init; ==== //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#13 (text+ko) ==== @@ -69,7 +69,6 @@ MODULE_DEPEND(ndis, usb, 1, 1, 1); MODULE_DEPEND(ndis, ndisapi, 1, 1, 1); -MODULE_DEPEND(ndis, if_ndis, 1, 1, 1); static device_probe_t ndisusb_probe; static device_attach_t ndisusb_attach; ==== //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#9 (text+ko) ==== @@ -123,7 +123,6 @@ struct ndisusb_ep { struct usbd_urb_bulk_or_intr_transfer *ubi_first; struct usbd_urb_bulk_or_intr_transfer **ubi_last; - irp *irp_curr; struct usb2_xfer *urb_xfer[1]; uint8_t *urb_data; uint32_t urb_len; ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.h#2 (text+ko) ==== @@ -27,6 +27,11 @@ #ifndef _USB2_HUB_H_ #define _USB2_HUB_H_ +#include + +struct usb2_bus; +struct usb2_device; + /* * The following structure defines an USB port. */ From owner-p4-projects@FreeBSD.ORG Sat Feb 28 04:35:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 489C71065670; Sat, 28 Feb 2009 04:35: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 F1D60106566B for ; Sat, 28 Feb 2009 04:35:48 +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 DFF5C8FC08 for ; Sat, 28 Feb 2009 04:35:48 +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 n1S4Zmvx012462 for ; Sat, 28 Feb 2009 04:35:48 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1S4ZmIx012460 for perforce@freebsd.org; Sat, 28 Feb 2009 04:35:48 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 28 Feb 2009 04:35:48 GMT Message-Id: <200902280435.n1S4ZmIx012460@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 158427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Feb 2009 04:35:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=158427 Change 158427 by pgj@beehive on 2009/02/28 04:35:29 Fix transtable entries for month names Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#7 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#7 (text+ko) ==== @@ -335,62 +335,62 @@ 1 - 1 + január 2 - 2 + február 3 - 3 + március 4 - 4 + április 5 - 5 + május 6 - 6 + június 7 - 7 + július 8 - 8 + augusztus 9 - 9 + szeptember 10 - 10 + október 11 - 11 + november 12 - 12 + december From owner-p4-projects@FreeBSD.ORG Sat Feb 28 04:42:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 659971065676; Sat, 28 Feb 2009 04:42: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 25AE6106566C for ; Sat, 28 Feb 2009 04:42:56 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1254E8FC0A for ; Sat, 28 Feb 2009 04:42:56 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1S4guHN012923 for ; Sat, 28 Feb 2009 04:42:56 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1S4gt0g012921 for perforce@freebsd.org; Sat, 28 Feb 2009 04:42:55 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 28 Feb 2009 04:42:55 GMT Message-Id: <200902280442.n1S4gt0g012921@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 158428 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Feb 2009 04:42:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=158428 Change 158428 by pgj@beehive on 2009/02/28 04:42:04 - Extend main page translation by the following items (starting from the year 2009): - Project news entries (HTML, RSS, RDF) - Press releases (HTML, RSS) - Events (HTML, RSS) - Work around missing l10n features in events/libcommon.xsl Affected files ... .. //depot/projects/docproj_hu/www/hu/Makefile#2 edit .. //depot/projects/docproj_hu/www/hu/events/Makefile#1 add .. //depot/projects/docproj_hu/www/hu/events/Makefile.inc#1 add .. //depot/projects/docproj_hu/www/hu/events/events.css#1 add .. //depot/projects/docproj_hu/www/hu/events/rss.xsl#1 add .. //depot/projects/docproj_hu/www/hu/index.xsl#17 edit .. //depot/projects/docproj_hu/www/hu/news/Makefile#2 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#7 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/press.xml#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.events.xsl#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rdf.xsl#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.news-rss.xsl#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.newsflash.xsl#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.pastevents.xsl#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.press-rss.xsl#1 add .. //depot/projects/docproj_hu/www/hu/share/sgml/templates.press.xsl#1 add Differences ... ==== //depot/projects/docproj_hu/www/hu/Makefile#2 (text+ko) ==== @@ -34,10 +34,11 @@ SUBDIR+= developers SUBDIR+= docproj SUBDIR+= docs +SUBDIR+= events SUBDIR+= news SUBDIR+= platforms +SUBDIR+= projects SUBDIR+= search -SUBDIR+= projects SUBDIR+= support .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= doc ==== //depot/projects/docproj_hu/www/hu/index.xsl#17 (text+ko) ==== @@ -44,9 +44,9 @@ + title="A &os; Projekt hírei" href="&base;/news/rss.xml" /> + title="A &os; Projekt biztonsági figyelmeztetései" href="&base;/security/rss.xml" /> @@ -122,7 +122,7 @@
      • Stabil (hagyományos) kiadás: &rel2.current; + href="&u.rel2.announce;">Stabil (kifutó) kiadás: &rel2.current;
      • @@ -246,11 +246,11 @@
        • További hírek + href="&base;/news/newsflash.html" title="További hírek">További hírek
        • Hírek RSS Feed + href="&base;/news/rss.xml" title="Hírek RSS Feed">Hírek RSS Feed
        @@ -274,7 +274,7 @@ @@ -298,7 +298,7 @@
        • Tovább + href="&base;/news/press.html" title="Tovább események a médiában">Tovább
        @@ -323,11 +323,11 @@
        • Tovább + href="&base;/security/advisories.html" title="További biztonsági figyelmeztetések">Tovább
        • Biztonsági figyelmeztetések RSS Feed + href="&base;/security/rss.xml" title="Biztonsági figyelmeztetések RSS Feed">Biztonsági figyelmeztetések RSS Feed
        ==== //depot/projects/docproj_hu/www/hu/news/Makefile#2 (text+ko) ==== @@ -14,8 +14,10 @@ DEPENDSET.DEFAULT= transtable news press -XMLDOCS= newsflash:${XSL_NEWS_NEWSFLASH}:${XML_NEWS_NEWS_MASTER}: -XMLDOCS+= news-rdf:${XSL_NEWS_NEWS_RDF}:${XML_NEWS_NEWS_MASTER}:news.rdf -XMLDOCS+= press:${XSL_NEWS_PRESS}:${XML_NEWS_PRESS_MASTER}: +XMLDOCS= newsflash:../share/sgml/templates.newsflash.xsl:${XML_NEWS_NEWS}: +XMLDOCS+= news-rdf:../share/sgml/templates.news-rdf.xsl:${XML_NEWS_NEWS}:news.rdf +XMLDOCS+= news-rss:../share/sgml/templates.news-rss.xsl:${XML_NEWS_NEWS}:rss.xml +XMLDOCS+= press:../share/sgml/templates.press.xsl:${XML_NEWS_PRESS}: +XMLDOCS+= press-rss:../share/sgml/templates.press-rss.xsl:${XML_NEWS_PRESS}:press-rss.xml .include "${WEB_PREFIX}/share/mk/web.site.mk" ==== //depot/projects/docproj_hu/www/hu/share/sgml/libcommon.xsl#7 (text+ko) ==== @@ -5,11 +5,455 @@ + + + + + + +

        A &os; népszerûsége nyomán a + világban létrejött számos + felhasználói csoport.

        + +

        Ha tudomásunk van olyan további &os; + felhasználói csoportokról, amelyek az + alábbi felsorolásban még nem szerepelnek, + küldjünk egy hibajelentést + a www kategóriában a következõ + adatok megadásával:

        + +
          +
        1. A felhasználói csoport honlapjának + címe.
          2. + +
        2. Egy kapcsolattartó személy e-mail címe a + látogatóink és a honlapunk + karbantartóinak számára.
          3. + +
        3. A felhasználói csoport tömör (egy + bekezdésnyi) bemutatása.
          4. +
        + +

        Az elõbb felsorolt információkat + kérjük HTML formátumban beküldeni. A &os; + lendületének megõrzésének + szellemében elsõsorban olyan + felhasználói csoportok jelentkezését + várjuk, amelyek aktívak és + tevékenységük nyilvános. Ha még + nem lenne a környékünkön ilyen csoport, + akkor javasoljuk, hogy kutassunk fel és vegyünk fel + kapcsolatot a közelünkben élõ + érdeklõdõkkel, például a oldalon keresztül, + és alapítsunk egy saját + felhasználói csoportot.

        + +

        Régiók:

        +         + + + &os; hírek + +

        A &os; operációs rendszer dinamikusan és + gyorsan fejlõdik, ezért a legfrissebb + fejlesztések nyomonkövetése nem mindig + könnyû feladat. Ha kíváncsiak vagyunk a + rendszerrel kapcsolatos legújabb + információkra, térjünk vissza erre az + oldalra gyakran. Emellett érdemes lehet még + feliratkoznunk a freebsd-announce + levelezési listára, vagy a + hozzátartozó RSS feedre.

        + +

        Továbbá az alábbi projektek rendelkeznek + saját külön híroldallal, amelyek figyelemmel + kísérésével pedig az adott projektben + végzett munkáról tudhatunk meg + többet.

        + + + +

        A korábbi, a jelenlegi és a jövõbeni + kiadásokról bõvebben a kiadások + információs oldalán + olvashatunk.

        + +

        A &os; Projekt biztonsági figyelmeztetéseit a biztonsági + információs oldalon találjuk meg.

        +         + + +

        Korábbi bejelentések: + 2008, + 2007, + 2006, + 2005, + 2004, + 2003, + 2002, + 2001, + 2000, + 1999, + 1998, + 1997, + 1996

        +         + + + Hírek fõoldal + + + +

        Korábbi sajtókiadványok: + 2008, + 2007, + 2006, + 2005, + 2004, + 2003, + 2002, + 2001, + 2000, + 1999, + 1998-1996

        +         + + +

        Ha tudunk bármilyen olyan &os; témájú + hírrõl vagy egyéb írásról, + amely nem szerepel az itteniek között, írjunk egy + levelet a www@FreeBSD.org + címre, hogy fel tudjuk ide is tenni.

        +         + + + + +

        A lentebb látható térképen + sötét pirossal jelöltük azokat az + országokat és régiókat, ahol a + közeljövõben valamilyen nagyobb &os; + témájú esemény várható. + Sárgával és narancssárgával + jelöltük azokat az országokat, ahol + korábban már lezajlott valamilyen &os; + témájú esemény. Itt a színek + az események számával egyre + sötétednek.

        + + + + + + +         + + +

        Ha tudunk valamilyen olyan &os; témájú + eseményrõl vagy eseményekrõl, amelyek a + többi &os; felhasználó számára is + érdekesek lehetnek, de még nem szerepelnek az + oldalon található listában, írjuk meg + a www@FreeBSD.org + címre, hogy fel tudjuk tenni.

        + +

        Az iCalendar formátumot ismerõ programokkal + dolgozó felhasználók az oldalon szereplõ + összes eseményt elérhetik a kalendáriumként + is.

        +         + + +

        Aktuális/közelgõ + események:

        +         + + +

        Korábbi események:

        +         + + + + +

        Megjelent a .

        +         + + + + &os; biztonsági figyelmeztetések + http://www.FreeBSD.org/security/ + A &os; Projekt által megjelentetett + biztonsági figyelmeztetések + + + + + + + &os; biztonsági figyelmeztetések + http://www.FreeBSD.org/security/ + + <xsl:value-of select="$title" /> + + A &os; Projekt által megjelentetett + biztonsági figyelmeztetések + en-us + secteam@FreeBSD.org (&os; Security Team) + secteam@FreeBSD.org (&os; Security Team) + http://blogs.law.harvard.edu/tech/rss + 120 + + http://www.FreeBSD.org/logo/logo-full.png + <xsl:value-of select="$title" /> + + + + + rss.xml + + + + + + + + &os; sajtóhibák + http://www.FreeBSD.org/security/ + + <xsl:value-of select="$title" /> + + A &os; Projekt által megjelentetett + sajtóhibák + en-us + secteam@FreeBSD.org (FreeBSD Security Team) + secteam@FreeBSD.org (FreeBSD Security Team) + http://blogs.law.harvard.edu/tech/rss + 120 + + http://www.FreeBSD.org/logo/logo-full.png + <xsl:value-of select="$title" /> + + + + + rss.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + január + február + március + április + május + június + július + augusztus + szeptember + október + november + december + érvénytelen hónap + + + + + + + + + jan + feb + már + ápr + máj + jún + júl + aug + szep + okt + nov + dec + érvénytelen hónap + + + + + + + + + + + + . + + + + + + + + + + - + + + + + . + + + + + + + + + + + + . + + + + + + + + + + + + + + + +

        + + +
        + + + + &enbase;/ + &base;/ + + events/# + + + + + +
        + + (, ) + +

        +         +         +         From owner-p4-projects@FreeBSD.ORG Sat Feb 28 07:12:30 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3CC51065673; Sat, 28 Feb 2009 07:12: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 A0254106566B for ; Sat, 28 Feb 2009 07:12:29 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E6668FC1A for ; Sat, 28 Feb 2009 07:12:29 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1S7CT5L037819 for ; Sat, 28 Feb 2009 07:12:29 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1S7CTfq037817 for perforce@freebsd.org; Sat, 28 Feb 2009 07:12:29 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 28 Feb 2009 07:12:29 GMT Message-Id: <200902280712.n1S7CTfq037817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158434 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Feb 2009 07:12:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=158434 Change 158434 by lulf@lulf_carrot on 2009/02/28 07:12:14 - Make mmc device attach to mci driver. However, a call to DELAY() in the mmc driver seems to lock everything up for now. Affected files ... .. //depot/projects/avr32/src/sys/avr32/conf/NGW100#9 edit .. //depot/projects/avr32/src/sys/dev/mmc/mmc.c#3 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/conf/NGW100#9 (text+ko) ==== @@ -61,3 +61,5 @@ device random device ether device md +#device mmc +#device mmcsd ==== //depot/projects/avr32/src/sys/dev/mmc/mmc.c#3 (text+ko) ==== @@ -1528,5 +1528,6 @@ static devclass_t mmc_devclass; +DRIVER_MODULE(mmc, at32_mci, mmc_driver, mmc_devclass, NULL, NULL); DRIVER_MODULE(mmc, at91_mci, mmc_driver, mmc_devclass, NULL, NULL); DRIVER_MODULE(mmc, sdhci, mmc_driver, mmc_devclass, NULL, NULL); From owner-p4-projects@FreeBSD.ORG Sat Feb 28 08:05:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC0A21065673; Sat, 28 Feb 2009 08:05: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 6B0C3106566B for ; Sat, 28 Feb 2009 08:05:23 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5977F8FC15 for ; Sat, 28 Feb 2009 08:05:23 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n1S85NLZ042656 for ; Sat, 28 Feb 2009 08:05:23 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1S85Nhl042654 for perforce@freebsd.org; Sat, 28 Feb 2009 08:05:23 GMT (envelope-from lulf@FreeBSD.org) Date: Sat, 28 Feb 2009 08:05:23 GMT Message-Id: <200902280805.n1S85Nhl042654@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158436 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Feb 2009 08:05:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=158436 Change 158436 by lulf@lulf_carrot on 2009/02/28 08:04:57 - Add a ap7000 specific header with implementation-defined settings. - First try at implementing cpu_idle, setting the cpu to IDLE mode for ap7000. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#8 edit .. //depot/projects/avr32/src/sys/avr32/include/at32ap7000.h#1 add Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#8 (text+ko) ==== @@ -63,6 +63,7 @@ #include #include #include +#include extern vm_offset_t _evba; @@ -89,7 +90,17 @@ void cpu_idle(int busy) { + uint32_t gm; + + gm = bit_offset(SYS, SR, GM); + /* Make sure interrupts are enabled before we do this. */ + if (gm == 1 || (sysreg_read(SR) & INTR_MASK) == gm) + panic("sleeping with interrupts disabled"); +#if defined(CPU_AT32AP7000) + __asm__ __volatile ("sleep %0" : : "i"(AT32AP7000_SLEEP_IDLE)); +#else avr32_impl(); +#endif } void From owner-p4-projects@FreeBSD.ORG Sat Feb 28 09:26:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECF9C1065670; Sat, 28 Feb 2009 09:26: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 AC162106566B for ; Sat, 28 Feb 2009 09:26:45 +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 98D858FC14 for ; Sat, 28 Feb 2009 09:26: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 n1S9QjgW059337 for ; Sat, 28 Feb 2009 09:26:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1S9Qjkl059335 for perforce@freebsd.org; Sat, 28 Feb 2009 09:26:45 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 28 Feb 2009 09:26:45 GMT Message-Id: <200902280926.n1S9Qjkl059335@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 158437 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Feb 2009 09:26:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=158437 Change 158437 by hselasky@hselasky_laptop001 on 2009/02/28 09:26:26 IFC @ 158435 Affected files ... .. //depot/projects/usb/src/sys/arm/at91/files.at91#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#39 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#16 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcefw.h#6 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#10 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#9 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_irq.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_dma.c#9 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.h#6 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_drv.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_irq.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydreg.h#3 edit .. //depot/projects/usb/src/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_denode.c#8 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_vnops.c#12 integrate .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.c#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.h#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#15 integrate .. //depot/projects/usb/src/sys/sys/cdefs.h#6 integrate .. //depot/projects/usb/src/sys/sys/param.h#22 integrate Differences ... ==== //depot/projects/usb/src/sys/arm/at91/files.at91#7 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.9 2008/11/25 19:05:46 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.10 2009/02/27 23:12:28 imp Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91_machdep.c standard @@ -15,10 +15,10 @@ arm/at91/at91_twi.c optional at91_twi arm/at91/at91_udp.c optional at91_udp arm/at91/if_ate.c optional ate -arm/at91/ohci_atmelarm.c optional ohci arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart +dev/usb/controller/ohci_atmelarm.c optional ohci # # All the boards we support # ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#39 (text) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.12 2009/02/23 21:19:18 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.13 2009/02/27 19:27:33 mav Exp $"); #include "usbdevs.h" #include @@ -322,6 +322,7 @@ struct usb2_interface_descriptor *id; const char *proto, *subclass; struct usb2_device_request request; + device_t child; uint16_t i; uint8_t maxlun; uint8_t has_intr; @@ -413,11 +414,11 @@ /* ata channels are children to this USB control device */ for (i = 0; i <= sc->maxlun; i++) { - if (!device_add_child(sc->dev, "ata", - devclass_find_free_unit(ata_devclass, 2))) { - device_printf(sc->dev, "failed to attach ata child device\n"); - goto detach; - } + if ((child = device_add_child(sc->dev, "ata", + devclass_find_free_unit(ata_devclass, 2))) == NULL) { + device_printf(sc->dev, "failed to add ata child device\n"); + } else + device_set_ivars(child, (void *)(intptr_t)i); } bus_generic_attach(sc->dev); @@ -957,23 +958,10 @@ static int ata_usbchannel_probe(device_t dev) { - struct ata_channel *ch = device_get_softc(dev); - device_t *children; - int count, i; char buffer[32]; - /* take care of green memory */ - bzero(ch, sizeof(struct ata_channel)); - - /* find channel number on this controller */ - if (!device_get_children(device_get_parent(dev), &children, &count)) { - for (i = 0; i < count; i++) { - if (children[i] == dev) - ch->unit = i; - } - free(children, M_TEMP); - } - snprintf(buffer, sizeof(buffer), "USB lun %d", ch->unit); + snprintf(buffer, sizeof(buffer), "USB lun %d", + (int)(intptr_t)device_get_ivars(dev)); device_set_desc_copy(dev, buffer); return (0); @@ -984,8 +972,13 @@ { struct ata_channel *ch = device_get_softc(dev); + if (ch->attached) + return (0); + ch->attached = 1; + /* initialize the softc basics */ ch->dev = dev; + ch->unit = (intptr_t)device_get_ivars(dev); ch->state = ATA_IDLE; ch->hw.begin_transaction = ata_usbchannel_begin_transaction; ch->hw.end_transaction = ata_usbchannel_end_transaction; @@ -1015,6 +1008,10 @@ device_t *children; int nchildren, i; + if (!ch->attached) + return (0); + ch->attached = 0; + /* detach & delete all children */ if (!device_get_children(dev, &children, &nchildren)) { for (i = 0; i < nchildren; i++) ==== //depot/projects/usb/src/sys/dev/bce/if_bce.c#16 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006-2008 Broadcom Corporation + * Copyright (c) 2006-2009 Broadcom Corporation * David Christensen . All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.50 2009/01/15 22:28:05 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.51 2009/02/27 19:25:06 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -89,7 +89,6 @@ /****************************************************************************/ /* BCE Build Time Options */ /****************************************************************************/ -#define BCE_USE_SPLIT_HEADER 1 /* #define BCE_NVRAM_WRITE_SUPPORT 1 */ @@ -294,12 +293,12 @@ static void bce_dump_mbuf (struct bce_softc *, struct mbuf *); static void bce_dump_tx_mbuf_chain (struct bce_softc *, u16, int); static void bce_dump_rx_mbuf_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS static void bce_dump_pg_mbuf_chain (struct bce_softc *, u16, int); #endif static void bce_dump_txbd (struct bce_softc *, int, struct tx_bd *); static void bce_dump_rxbd (struct bce_softc *, int, struct rx_bd *); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS static void bce_dump_pgbd (struct bce_softc *, int, struct rx_bd *); #endif static void bce_dump_l2fhdr (struct bce_softc *, int, struct l2_fhdr *); @@ -307,7 +306,7 @@ static void bce_dump_ftqs (struct bce_softc *); static void bce_dump_tx_chain (struct bce_softc *, u16, int); static void bce_dump_rx_chain (struct bce_softc *, u16, int); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS static void bce_dump_pg_chain (struct bce_softc *, u16, int); #endif static void bce_dump_status_block (struct bce_softc *); @@ -392,7 +391,7 @@ static void bce_fill_rx_chain (struct bce_softc *); static void bce_free_rx_chain (struct bce_softc *); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS static int bce_get_pg_buf (struct bce_softc *, struct mbuf *, u16 *, u16 *); static int bce_init_pg_chain (struct bce_softc *); static void bce_fill_pg_chain (struct bce_softc *); @@ -597,7 +596,7 @@ /* Firmware version and device features. */ printf("F/W (0x%08X); Flags( ", sc->bce_fw_ver); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS printf("SPLT "); #endif if (sc->bce_flags & BCE_MFW_ENABLE_FLAG) @@ -1013,7 +1012,7 @@ * This may change later if the MTU size is set to * something other than 1500. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sc->rx_bd_mbuf_alloc_size = MHLEN; /* Make sure offset is 16 byte aligned for hardware. */ sc->rx_bd_mbuf_align_pad = roundup2((MSIZE - MHLEN), 16) - @@ -2753,7 +2752,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* Free, unmap and destroy all page buffer descriptor chain pages. */ for (i = 0; i < PG_PAGES; i++ ) { if (sc->pg_bd_chain[i] != NULL) { @@ -2817,7 +2816,7 @@ sc->rx_mbuf_tag = NULL; } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* Unload and destroy the page mbuf maps. */ for (i = 0; i < TOTAL_PG_BD; i++) { if (sc->pg_mbuf_map[i] != NULL) { @@ -3267,7 +3266,7 @@ /* * Create a DMA tag for RX mbufs. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS max_size = max_seg_size = ((sc->rx_bd_mbuf_alloc_size < MCLBYTES) ? MCLBYTES : sc->rx_bd_mbuf_alloc_size); #else @@ -3303,7 +3302,7 @@ } } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* * Create a DMA tag for the page buffer descriptor chain, * allocate and clear the memory, and fetch the physical @@ -4384,7 +4383,7 @@ bce_disable_intr(sc); /* Free RX buffers. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS bce_free_pg_chain(sc); #endif bce_free_rx_chain(sc); @@ -4822,7 +4821,7 @@ goto bce_get_rx_buf_exit); /* This is a new mbuf allocation. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS MGETHDR(m_new, M_DONTWAIT, MT_DATA); #else if (sc->rx_bd_mbuf_alloc_size <= MCLBYTES) @@ -4901,7 +4900,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Encapsulate an mbuf cluster into the page chain. */ /* */ @@ -5010,7 +5009,7 @@ return(rc); } -#endif /* BCE_USE_SPLIT_HEADER */ +#endif /* ZERO_COPY_SOCKETS */ /****************************************************************************/ /* Initialize the TX context memory. */ @@ -5368,7 +5367,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Allocate memory and initialize the page data structures. */ /* Assumes that bce_init_rx_chain() has not already been called. */ @@ -5534,7 +5533,7 @@ DBEXIT(BCE_VERBOSE_RESET | BCE_VERBOSE_RECV | BCE_VERBOSE_UNLOAD); } -#endif /* BCE_USE_SPLIT_HEADER */ +#endif /* ZERO_COPY_SOCKETS */ /****************************************************************************/ @@ -5707,7 +5706,7 @@ unsigned int pkt_len; u16 sw_rx_cons, sw_rx_cons_idx, hw_rx_cons; u32 status; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS unsigned int rem_len; u16 sw_pg_cons, sw_pg_cons_idx; #endif @@ -5723,7 +5722,7 @@ bus_dmamap_sync(sc->rx_bd_chain_tag, sc->rx_bd_chain_map[i], BUS_DMASYNC_POSTWRITE); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* Prepare the page chain pages to be accessed by the host CPU. */ for (int i = 0; i < PG_PAGES; i++) bus_dmamap_sync(sc->pg_bd_chain_tag, @@ -5735,7 +5734,7 @@ /* Get working copies of the driver's view of the consumer indices. */ sw_rx_cons = sc->rx_cons; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sw_pg_cons = sc->pg_cons; #endif @@ -5797,7 +5796,7 @@ */ m_adj(m0, sizeof(struct l2_fhdr) + ETHER_ALIGN); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* * Check whether the received frame fits in a single * mbuf or not (i.e. packet data + FCS <= @@ -5970,7 +5969,7 @@ if (m0) { /* Make sure we don't lose our place when we release the lock. */ sc->rx_cons = sw_rx_cons; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sc->pg_cons = sw_pg_cons; #endif @@ -5980,7 +5979,7 @@ /* Recover our place. */ sw_rx_cons = sc->rx_cons; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sw_pg_cons = sc->pg_cons; #endif } @@ -5991,7 +5990,7 @@ } /* No new packets to process. Refill the RX and page chains and exit. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS sc->pg_cons = sw_pg_cons; bce_fill_pg_chain(sc); #endif @@ -6003,7 +6002,7 @@ bus_dmamap_sync(sc->rx_bd_chain_tag, sc->rx_bd_chain_map[i], BUS_DMASYNC_PREWRITE); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS for (int i = 0; i < PG_PAGES; i++) bus_dmamap_sync(sc->pg_bd_chain_tag, sc->pg_bd_chain_map[i], BUS_DMASYNC_PREWRITE); @@ -6249,7 +6248,7 @@ * Calculate and program the hardware Ethernet MTU * size. Be generous on the receive if we have room. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS if (ifp->if_mtu <= (sc->rx_bd_mbuf_data_len + sc->pg_bd_mbuf_alloc_size)) ether_mtu = sc->rx_bd_mbuf_data_len + sc->pg_bd_mbuf_alloc_size; #else @@ -6281,7 +6280,7 @@ /* Program appropriate promiscuous/multicast filtering. */ bce_set_rx_mode(sc); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* Init page buffer descriptor chain. */ bce_init_pg_chain(sc); #endif @@ -6794,7 +6793,7 @@ BCE_LOCK(sc); ifp->if_mtu = ifr->ifr_mtu; ifp->if_drv_flags &= ~IFF_DRV_RUNNING; -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /* No buffer allocation size changes are necessary. */ #else /* Recalculate our buffer allocation sizes. */ @@ -7495,7 +7494,7 @@ bce_stats_update(sc); /* Top off the receive and page chains. */ -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS bce_fill_pg_chain(sc); #endif bce_fill_rx_chain(sc); @@ -7675,7 +7674,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Provides a sysctl interface to allow dumping the page chain. */ /* */ @@ -8248,7 +8247,7 @@ (void *)sc, 0, bce_sysctl_dump_tx_chain, "I", "Dump tx_bd chain"); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "dump_pg_chain", CTLTYPE_INT | CTLFLAG_RW, (void *)sc, 0, @@ -8543,7 +8542,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Prints out the mbufs in the mbuf page chain. */ /* */ @@ -8667,7 +8666,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Prints out a rx_bd structure in the page chain. */ /* */ @@ -9154,7 +9153,7 @@ } -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS /****************************************************************************/ /* Prints out the page chain. */ /* */ @@ -9635,7 +9634,7 @@ "0x%08X:%08X - (sc->rx_bd_chain) rx_bd chain virtual address\n", val_hi, val_lo); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS val_hi = BCE_ADDR_HI(sc->pg_bd_chain); val_lo = BCE_ADDR_LO(sc->pg_bd_chain); BCE_PRINTF( @@ -9655,7 +9654,7 @@ "0x%08X:%08X - (sc->rx_mbuf_ptr) rx mbuf chain virtual address\n", val_hi, val_lo); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS val_hi = BCE_ADDR_HI(sc->pg_mbuf_ptr); val_lo = BCE_ADDR_LO(sc->pg_mbuf_ptr); BCE_PRINTF( @@ -9708,7 +9707,7 @@ BCE_PRINTF(" 0x%08X - (sc->free_rx_bd) free rx_bd's\n", sc->free_rx_bd); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS BCE_PRINTF(" 0x%04X(0x%04X) - (sc->pg_prod) page producer index\n", sc->pg_prod, (u16) PG_CHAIN_IDX(sc->pg_prod)); @@ -10218,7 +10217,7 @@ bce_dump_tpat_state(sc, 0); bce_dump_cp_state(sc, 0); bce_dump_com_state(sc, 0); -#ifdef BCE_USE_SPLIT_HEADER +#ifdef ZERO_COPY_SOCKETS bce_dump_pgbd(sc, 0, NULL); bce_dump_pg_mbuf_chain(sc, 0, USABLE_PG_BD); bce_dump_pg_chain(sc, 0, USABLE_PG_BD); ==== //depot/projects/usb/src/sys/dev/bce/if_bcefw.h#6 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006-2008 Broadcom Corporation + * Copyright (c) 2006-2009 Broadcom Corporation * David Christensen . All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bce/if_bcefw.h,v 1.7 2008/06/13 01:16:37 davidch Exp $ + * $FreeBSD: src/sys/dev/bce/if_bcefw.h,v 1.8 2009/02/27 19:25:06 davidch Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#10 (text) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006-2008 Broadcom Corporation + * Copyright (c) 2006-2009 Broadcom Corporation * David Christensen . All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.22 2008/11/22 05:55:56 kmacy Exp $ + * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.23 2009/02/27 19:25:06 davidch Exp $ */ #ifndef _BCE_H_DEFINED @@ -6206,6 +6206,7 @@ #define RX_PAGE(x) (((x) & ~USABLE_RX_BD_PER_PAGE) >> (BCM_PAGE_BITS - 4)) #define RX_IDX(x) ((x) & USABLE_RX_BD_PER_PAGE) +#ifdef ZERO_COPY_SOCKETS /* * To accomodate jumbo frames, the page chain should * be 4 times larger than the receive chain. @@ -6226,6 +6227,8 @@ #define PG_PAGE(x) (((x) & ~USABLE_PG_BD_PER_PAGE) >> (BCM_PAGE_BITS - 4)) #define PG_IDX(x) ((x) & USABLE_PG_BD_PER_PAGE) +#endif /* ZERO_COPY_SOCKETS */ + /* Context size. */ #define CTX_SHIFT 7 #define CTX_SIZE (1 << CTX_SHIFT) @@ -6499,8 +6502,11 @@ u16 tx_prod; u16 tx_cons; u32 tx_prod_bseq; /* Counts the bytes used. */ + +#ifdef ZERO_COPY_SOCKETS u16 pg_prod; u16 pg_cons; +#endif int bce_link; struct callout bce_tick_callout; @@ -6513,7 +6519,10 @@ int rx_bd_mbuf_alloc_size; int rx_bd_mbuf_data_len; int rx_bd_mbuf_align_pad; + +#ifdef ZERO_COPY_SOCKETS int pg_bd_mbuf_alloc_size; +#endif /* Receive mode settings (i.e promiscuous, multicast, etc.). */ u32 rx_mode; @@ -6533,11 +6542,13 @@ struct rx_bd *rx_bd_chain[RX_PAGES]; bus_addr_t rx_bd_chain_paddr[RX_PAGES]; +#ifdef ZERO_COPY_SOCKETS /* H/W maintained page buffer descriptor chain structure. */ bus_dma_tag_t pg_bd_chain_tag; bus_dmamap_t pg_bd_chain_map[PG_PAGES]; struct rx_bd *pg_bd_chain[PG_PAGES]; bus_addr_t pg_bd_chain_paddr[PG_PAGES]; +#endif /* H/W maintained status block. */ bus_dma_tag_t status_tag; @@ -6567,7 +6578,10 @@ /* Bus tag for RX/TX mbufs. */ bus_dma_tag_t rx_mbuf_tag; bus_dma_tag_t tx_mbuf_tag; + +#ifdef ZERO_COPY_SOCKETS bus_dma_tag_t pg_mbuf_tag; +#endif /* S/W maintained mbuf TX chain structure. */ bus_dmamap_t tx_mbuf_map[TOTAL_TX_BD]; @@ -6577,17 +6591,22 @@ bus_dmamap_t rx_mbuf_map[TOTAL_RX_BD]; struct mbuf *rx_mbuf_ptr[TOTAL_RX_BD]; +#ifdef ZERO_COPY_SOCKETS /* S/W maintained mbuf page chain structure. */ bus_dmamap_t pg_mbuf_map[TOTAL_PG_BD]; struct mbuf *pg_mbuf_ptr[TOTAL_PG_BD]; +#endif /* Track the number of buffer descriptors in use. */ u16 free_rx_bd; u16 max_rx_bd; u16 used_tx_bd; u16 max_tx_bd; + +#ifdef ZERO_COPY_SOCKETS u16 free_pg_bd; u16 max_pg_bd; +#endif /* Provides access to hardware statistics through sysctl. */ u64 stat_IfHCInOctets; @@ -6661,7 +6680,10 @@ /* Track the number of enqueued mbufs. */ int debug_tx_mbuf_alloc; int debug_rx_mbuf_alloc; + +#ifdef ZERO_COPY_SOCKETS int debug_pg_mbuf_alloc; +#endif /* Track how many and what type of interrupts are generated. */ u32 interrupts_generated; @@ -6676,8 +6698,10 @@ u32 rx_low_watermark; /* Lowest number of rx_bd's free. */ u32 rx_empty_count; /* Number of times the RX chain was empty. */ +#ifdef ZERO_COPY_SOCKETS u32 pg_low_watermark; /* Lowest number of pages free. */ u32 pg_empty_count; /* Number of times the page chain was empty. */ +#endif u32 tx_hi_watermark; /* Greatest number of tx_bd's used. */ u32 tx_full_count; /* Number of times the TX chain was full. */ @@ -6693,5 +6717,5 @@ #endif }; -#endif /* #ifndef _BCE_H_DEFINED */ +#endif /* __BCEREG_H_DEFINED */ ==== //depot/projects/usb/src/sys/dev/drm/drmP.h#9 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.31 2009/02/27 06:01:42 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.32 2009/02/28 02:37:55 rnoland Exp $"); #ifndef _DRM_P_H_ #define _DRM_P_H_ @@ -794,6 +794,7 @@ u32 drm_vblank_count(struct drm_device *dev, int crtc); int drm_vblank_get(struct drm_device *dev, int crtc); void drm_vblank_put(struct drm_device *dev, int crtc); +void drm_vblank_cleanup(struct drm_device *dev); int drm_vblank_wait(struct drm_device *dev, unsigned int *vbl_seq); int drm_vblank_init(struct drm_device *dev, int num_crtcs); void drm_vbl_send_signals(struct drm_device *dev, int crtc); ==== //depot/projects/usb/src/sys/dev/drm/drm_drv.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.20 2009/02/27 06:01:42 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_drv.c,v 1.22 2009/02/28 02:37:55 rnoland Exp $"); /** @file drm_drv.c * The catch-all file for DRM device support, including module setup/teardown, @@ -134,6 +134,9 @@ .d_flags = D_TRACKCLOSE }; +int drm_msi = 1; /* Enable by default. */ +TUNABLE_INT("hw.drm.msi", &drm_msi); + static struct drm_msi_blacklist_entry drm_msi_blacklist[] = { {0x8086, 0x2772}, /* Intel i945G */ \ {0x8086, 0x27A2}, /* Intel i945GM */ \ @@ -222,7 +225,8 @@ dev->pci_vendor = pci_get_vendor(dev->device); dev->pci_device = pci_get_device(dev->device); - if (!drm_msi_is_blacklisted(dev->pci_vendor, dev->pci_device)) { + if (drm_msi && + !drm_msi_is_blacklisted(dev->pci_vendor, dev->pci_device)) { msicount = pci_msi_count(dev->device); DRM_DEBUG("MSI count = %d\n", msicount); if (msicount > 1) @@ -519,6 +523,8 @@ DRM_DEBUG("mtrr_del = %d", retcode); } + drm_vblank_cleanup(dev); + DRM_LOCK(); drm_lastclose(dev); DRM_UNLOCK(); ==== //depot/projects/usb/src/sys/dev/drm/drm_irq.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_irq.c,v 1.9 2009/02/25 18:54:35 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_irq.c,v 1.10 2009/02/28 02:37:55 rnoland Exp $"); /** @file drm_irq.c * Support code for handling setup/teardown of interrupt handlers and @@ -96,7 +96,7 @@ } } -static void drm_vblank_cleanup(struct drm_device *dev) +void drm_vblank_cleanup(struct drm_device *dev) { unsigned long irqflags; @@ -213,8 +213,6 @@ bus_teardown_intr(dev->device, dev->irqr, dev->irqh); DRM_LOCK(); - drm_vblank_cleanup(dev); - return 0; } ==== //depot/projects/usb/src/sys/dev/drm/i915_dma.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/i915_dma.c,v 1.15 2009/02/25 20:24:13 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/i915_dma.c,v 1.16 2009/02/28 02:37:55 rnoland Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -902,6 +902,13 @@ #endif DRM_SPININIT(&dev_priv->user_irq_lock, "userirq"); + ret = drm_vblank_init(dev, I915_NUM_PIPE); + + if (ret) { + (void) i915_driver_unload(dev); + return ret; + } + return ret; } ==== //depot/projects/usb/src/sys/dev/drm/i915_drv.h#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/i915_drv.h,v 1.9 2009/02/25 20:24:13 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/i915_drv.h,v 1.10 2009/02/28 02:37:55 rnoland Exp $"); #ifndef _I915_DRV_H_ #define _I915_DRV_H_ @@ -49,6 +49,8 @@ PIPE_B, }; +#define I915_NUM_PIPE 2 + /* Interface history: * * 1.1: Original. ==== //depot/projects/usb/src/sys/dev/drm/i915_irq.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/i915_irq.c,v 1.10 2009/02/25 20:24:13 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/i915_irq.c,v 1.11 2009/02/28 02:37:55 rnoland Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -484,11 +484,6 @@ int i915_driver_irq_postinstall(struct drm_device *dev) { drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; - int ret, num_pipes = 2; - - ret = drm_vblank_init(dev, num_pipes); - if (ret) - return ret; dev_priv->vblank_pipe = DRM_I915_VBLANK_PIPE_A | DRM_I915_VBLANK_PIPE_B; ==== //depot/projects/usb/src/sys/dev/drm/mach64_drv.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_drv.c,v 1.8 2008/10/13 18:03:27 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_drv.c,v 1.9 2009/02/28 02:37:55 rnoland Exp $"); #include @@ -54,6 +54,7 @@ DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ; dev->driver->buf_priv_size = 1; /* No dev_priv */ + dev->driver->load = mach64_driver_load; dev->driver->lastclose = mach64_driver_lastclose; dev->driver->get_vblank_counter = mach64_get_vblank_counter; dev->driver->enable_vblank = mach64_enable_vblank; @@ -94,6 +95,12 @@ return drm_attach(nbdev, mach64_pciidlist); } +int +mach64_driver_load(struct drm_device * dev, unsigned long flags) +{ + return drm_vblank_init(dev, 1); +} + static int mach64_detach(device_t nbdev) { ==== //depot/projects/usb/src/sys/dev/drm/mach64_drv.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_drv.h,v 1.3 2008/08/23 20:59:12 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_drv.h,v 1.4 2009/02/28 02:37:55 rnoland Exp $"); #ifndef __MACH64_DRV_H__ #define __MACH64_DRV_H__ @@ -166,6 +166,7 @@ extern int mach64_get_param(struct drm_device *dev, void *data, struct drm_file *file_priv); +extern int mach64_driver_load(struct drm_device * dev, unsigned long flags); extern u32 mach64_get_vblank_counter(struct drm_device *dev, int crtc); extern int mach64_enable_vblank(struct drm_device *dev, int crtc); extern void mach64_disable_vblank(struct drm_device *dev, int crtc); ==== //depot/projects/usb/src/sys/dev/drm/mach64_irq.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_irq.c,v 1.3 2008/08/23 20:59:12 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/mach64_irq.c,v 1.4 2009/02/28 02:37:55 rnoland Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -146,7 +146,7 @@ int mach64_driver_irq_postinstall(struct drm_device * dev) { - return drm_vblank_init(dev, 1); + return 0; } void mach64_driver_irq_uninstall(struct drm_device * dev) ==== //depot/projects/usb/src/sys/dev/drm/mga_dma.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.14 2008/08/23 20:59:12 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/mga_dma.c,v 1.15 2009/02/28 02:37:55 rnoland Exp $"); /** * \file mga_dma.c @@ -399,6 +399,7 @@ int mga_driver_load(struct drm_device *dev, unsigned long flags) { drm_mga_private_t *dev_priv; + int ret; dev_priv = drm_alloc(sizeof(drm_mga_private_t), DRM_MEM_DRIVER); if (!dev_priv) @@ -418,6 +419,13 @@ dev->types[7] = _DRM_STAT_PRIMARY; dev->types[8] = _DRM_STAT_SECONDARY; + ret = drm_vblank_init(dev, 1); + + if (ret) { + (void) mga_driver_unload(dev); + return ret; + } + return 0; } ==== //depot/projects/usb/src/sys/dev/drm/mga_irq.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/mga_irq.c,v 1.7 2008/08/23 20:59:12 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/mga_irq.c,v 1.8 2009/02/28 02:37:55 rnoland Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -157,11 +157,6 @@ int mga_driver_irq_postinstall(struct drm_device * dev) { drm_mga_private_t *dev_priv = (drm_mga_private_t *) dev->dev_private; - int ret; - - ret = drm_vblank_init(dev, 1); - if (ret) - return ret; DRM_INIT_WAITQUEUE(&dev_priv->fence_queue); ==== //depot/projects/usb/src/sys/dev/drm/r128_drv.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.16 2008/10/13 18:03:27 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/r128_drv.c,v 1.17 2009/02/28 02:37:55 rnoland Exp $"); #include "dev/drm/drmP.h" #include "dev/drm/drm.h" @@ -52,6 +52,7 @@ DRIVER_SG | DRIVER_HAVE_DMA | DRIVER_HAVE_IRQ; dev->driver->buf_priv_size = sizeof(drm_r128_buf_priv_t); + dev->driver->load = r128_driver_load; dev->driver->preclose = r128_driver_preclose; dev->driver->lastclose = r128_driver_lastclose; dev->driver->get_vblank_counter = r128_get_vblank_counter; @@ -93,6 +94,11 @@ return drm_attach(nbdev, r128_pciidlist); } +int r128_driver_load(struct drm_device * dev, unsigned long flags) +{ + return drm_vblank_init(dev, 1); +} + static int r128_detach(device_t nbdev) { ==== //depot/projects/usb/src/sys/dev/drm/r128_drv.h#3 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Feb 28 11:36:05 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA57B1065676; Sat, 28 Feb 2009 11:36: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 6896A106566C for ; Sat, 28 Feb 2009 11:36:05 +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 567518FC2C for ; Sat, 28 Feb 2009 11:36:05 +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 n1SBa5H8071335 for ; Sat, 28 Feb 2009 11:36:05 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1SBa5fh071333 for perforce@freebsd.org; Sat, 28 Feb 2009 11:36:05 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 28 Feb 2009 11:36:05 GMT Message-Id: <200902281136.n1SBa5fh071333@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 158443 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Feb 2009 11:36:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=158443 Change 158443 by hselasky@hselasky_laptop001 on 2009/02/28 11:35:07 USB CORE: - remove redundant iface_index parameter. - /dev/usb/x.y.z.v is now /dev/usb/x.y.v - add some extra NULL checks - simplify /dev/usb/xxx device generation Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#4 (text+ko) ==== @@ -82,7 +82,7 @@ static void usb2_fifo_check_methods(struct usb2_fifo_methods *); static struct usb2_fifo *usb2_fifo_alloc(void); static struct usb2_pipe *usb2_dev_get_pipe(struct usb2_device *, uint8_t, - uint8_t, uint8_t); + uint8_t); static void usb2_loc_fill(struct usb2_fs_privdata *, struct usb2_cdev_privdata *); static void usb2_close(void *); @@ -140,7 +140,6 @@ { cpd->bus_index = pd->bus_index; cpd->dev_index = pd->dev_index; - cpd->iface_index = pd->iface_index; cpd->ep_addr = pd->ep_addr; cpd->fifo_index = pd->fifo_index; } @@ -238,19 +237,6 @@ } } - /* check if we require an interface */ - cpd->iface = usb2_get_iface(cpd->udev, cpd->iface_index); - if (dev_ep_index != 0) { - /* non control endpoint - we need an interface */ - if (cpd->iface == NULL) { - DPRINTFN(2, "no iface\n"); - goto error; - } - if (cpd->iface->idesc == NULL) { - DPRINTFN(2, "no idesc\n"); - goto error; - } - } /* when everything is OK we increment the refcounts */ if (cpd->is_write) { DPRINTFN(2, "ref write\n"); @@ -394,7 +380,6 @@ struct usb2_device *udev = cpd->udev; struct usb2_fifo *f; struct usb2_pipe *pipe; - uint8_t iface_index = cpd->iface_index; uint8_t n; uint8_t is_tx; uint8_t is_rx; @@ -449,11 +434,6 @@ /* wrong endpoint index */ continue; } - if (ep != 0 && - f->iface_index != iface_index) { - /* wrong interface index */ - continue; - } if (f->opened) { /* FIFO is opened */ is_busy = 1; @@ -471,11 +451,6 @@ /* wrong endpoint index */ continue; } - if (ep != 0 && - f->iface_index != iface_index) { - /* wrong interface index */ - continue; - } if (f->opened) { /* FIFO is opened */ is_busy = 1; @@ -499,8 +474,8 @@ if (is_tx && (udev->fifo[n + USB_FIFO_TX] == NULL)) { pipe = usb2_dev_get_pipe(udev, - iface_index, ep, USB_FIFO_TX); - DPRINTFN(5, "dev_get_pipe(%d, 0x%x, 0x%x)\n", iface_index, ep, USB_FIFO_TX); + ep, USB_FIFO_TX); + DPRINTFN(5, "dev_get_pipe(%d, 0x%x)\n", ep, USB_FIFO_TX); if (pipe == NULL) { DPRINTFN(5, "dev_get_pipe returned NULL\n"); return (EINVAL); @@ -516,7 +491,7 @@ f->priv_mtx = udev->default_mtx; f->priv_sc0 = pipe; f->methods = &usb2_ugen_methods; - f->iface_index = iface_index; + f->iface_index = pipe->iface_index; f->udev = udev; mtx_lock(&usb2_ref_lock); udev->fifo[n + USB_FIFO_TX] = f; @@ -527,8 +502,8 @@ (udev->fifo[n + USB_FIFO_RX] == NULL)) { pipe = usb2_dev_get_pipe(udev, - iface_index, ep, USB_FIFO_RX); - DPRINTFN(5, "dev_get_pipe(%d, 0x%x, 0x%x)\n", iface_index, ep, USB_FIFO_RX); + ep, USB_FIFO_RX); + DPRINTFN(5, "dev_get_pipe(%d, 0x%x)\n", ep, USB_FIFO_RX); if (pipe == NULL) { DPRINTFN(5, "dev_get_pipe returned NULL\n"); return (EINVAL); @@ -544,7 +519,7 @@ f->priv_mtx = udev->default_mtx; f->priv_sc0 = pipe; f->methods = &usb2_ugen_methods; - f->iface_index = iface_index; + f->iface_index = pipe->iface_index; f->udev = udev; mtx_lock(&usb2_ref_lock); udev->fifo[n + USB_FIFO_RX] = f; @@ -624,7 +599,7 @@ static struct usb2_pipe * usb2_dev_get_pipe(struct usb2_device *udev, - uint8_t iface_index, uint8_t ep_index, uint8_t dir) + uint8_t ep_index, uint8_t dir) { struct usb2_pipe *pipe; uint8_t ep_dir; @@ -656,15 +631,6 @@ /* invalid pipe */ return (NULL); } - if (ep_index != 0) { - if (pipe->iface_index != iface_index) { - /* - * Permissions violation - trying to access a - * pipe that does not belong to the interface. - */ - return (NULL); - } - } return (pipe); /* success */ } @@ -1059,7 +1025,12 @@ if (err != 0) return (err); - err = usb2_ref_device(cpd, 1); + /* + * Performance optimistaion: 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 */ ); if (err) { return (ENXIO); } @@ -1719,7 +1690,6 @@ pd = malloc(sizeof(struct usb2_fs_privdata), M_USBDEV, M_WAITOK | M_ZERO); pd->bus_index = device_get_unit(udev->bus->bdev); pd->dev_index = udev->device_index; - pd->iface_index = iface_index; pd->ep_addr = -1; /* not an endpoint */ pd->fifo_index = f_tx->fifo_index; pd->mode = FREAD|FWRITE; ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#3 (text+ko) ==== @@ -92,7 +92,6 @@ struct usb2_fifo *txfifo; int bus_index; /* bus index */ int dev_index; /* device index */ - int iface_index; /* interface index */ int ep_addr; /* endpoint address */ uint8_t fifo_index; /* FIFO index */ uint8_t is_read; /* location has read access */ @@ -105,7 +104,6 @@ struct usb2_fs_privdata { int bus_index; int dev_index; - int iface_index; int ep_addr; int mode; int fifo_index; ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#3 (text+ko) ==== @@ -74,7 +74,7 @@ uint8_t); static void usb2_notify_addq(const char *type, struct usb2_device *); static void usb2_fifo_free_wrap(struct usb2_device *, uint8_t, uint8_t); -static struct cdev *usb2_make_dev(struct usb2_device *, int, int, int); +static struct cdev *usb2_make_dev(struct usb2_device *, int, int); static void usb2_cdev_create(struct usb2_device *); static void usb2_cdev_free(struct usb2_device *); static void usb2_cdev_cleanup(void *); @@ -421,7 +421,6 @@ iface->idesc = id; iface->alt_index = alt_index; iface->parent_iface_index = USB_IFACE_INDEX_ANY; - iface->ep_in_mask = iface->ep_out_mask = 0; nendpt = id->bNumEndpoints; DPRINTFN(5, "found idesc nendpt=%d\n", nendpt); @@ -445,14 +444,6 @@ found: ed = (void *)desc; - /* Fill in the endpoint bitmasks */ - if (ed->bEndpointAddress & UE_DIR_IN) - iface->ep_in_mask |= - 1 << UE_GET_ADDR(ed->bEndpointAddress); - else - iface->ep_out_mask |= - 1 << UE_GET_ADDR(ed->bEndpointAddress); - /* find a free pipe */ while (pipe != pipe_end) { if (pipe->edesc == NULL) { @@ -730,7 +721,6 @@ * Free all generic FIFOs for this interface, except control * endpoint FIFOs: */ - usb2_cdev_free(udev); usb2_fifo_free_wrap(udev, iface_index, 0); err = usb2_fill_iface_data(udev, iface_index, alt_index); @@ -740,9 +730,6 @@ err = usb2_req_set_alt_interface_no(udev, NULL, iface_index, iface->idesc->bAlternateSetting); - /* create device nodes for each endpoint */ - usb2_cdev_create(udev); - done: if (do_unlock) { sx_unlock(udev->default_sx + 1); @@ -1447,7 +1434,7 @@ udev->device_index = device_index; /* Create the control endpoint device */ - udev->default_dev = usb2_make_dev(udev, 0 , 0, FREAD|FWRITE); + udev->default_dev = usb2_make_dev(udev, 0, FREAD|FWRITE); /* Create a link from /dev/ugenX.X to the default endpoint */ snprintf(udev->ugen_name, sizeof(udev->ugen_name), USB_GENERIC_NAME "%u.%u", device_get_unit(bus->bdev), @@ -1720,7 +1707,7 @@ } static struct cdev * -usb2_make_dev(struct usb2_device *udev, int iface_index, int ep, int mode) +usb2_make_dev(struct usb2_device *udev, int ep, int mode) { struct usb2_fs_privdata* pd; char devname[20]; @@ -1730,17 +1717,17 @@ M_WAITOK | M_ZERO); pd->bus_index = device_get_unit(udev->bus->bdev); pd->dev_index = udev->device_index; - pd->iface_index = iface_index; pd->ep_addr = ep; pd->mode = mode; /* Now, create the device itself */ - snprintf(devname, sizeof(devname), "%u.%u.%u.%u", + snprintf(devname, sizeof(devname), "%u.%u.%u", pd->bus_index, pd->dev_index, - pd->iface_index, pd->ep_addr); + pd->ep_addr); pd->cdev = make_dev(&usb2_devsw, 0, UID_ROOT, GID_OPERATOR, 0600, USB_DEVICE_DIR "/%s", devname); - pd->cdev->si_drv1 = pd; + if (pd->cdev != NULL) + pd->cdev->si_drv1 = pd; return (pd->cdev); } @@ -1748,20 +1735,22 @@ static void usb2_cdev_create(struct usb2_device *udev) { - struct usb2_interface *iface; + struct usb2_config_descriptor *cd = usb2_get_config_descriptor(udev); + struct usb2_endpoint_descriptor *ed; + struct usb2_descriptor *desc; struct usb2_fs_privdata* pd; struct cdev *dev; - uint8_t niface; - int i, ep, mode, inmode, outmode; + int inmode; + int outmode; + int inmask; + int outmask; + int mode; + uint8_t ep; KASSERT(LIST_FIRST(&udev->pd_list) == NULL, ("stale cdev entries")); DPRINTFN(2, "Creating device nodes\n"); - usb2_interface_count(udev, &niface); - if (niface == 0) - return; /* nothing to do */ - if (usb2_get_mode(udev) == USB_MODE_DEVICE) { inmode = FWRITE; outmode = FREAD; @@ -1770,20 +1759,38 @@ outmode = FWRITE; } - for (i = 0; i < niface; i++) { - iface = usb2_get_iface(udev, i); - if (iface == NULL) - break; + inmask = 0; + outmask = 0; + desc = NULL; + + /* + * Collect all used endpoint numbers instead of just + * generating 16 static endpoints. + */ + while ((desc = usb2_desc_foreach(cd, desc))) { + /* filter out all endpoint descriptors */ + if ((desc->bDescriptorType == UDESC_ENDPOINT) && + (desc->bLength >= sizeof(*ed))) { + ed = (struct usb2_endpoint_descriptor *)desc; + + /* update masks */ + ep = ed->bEndpointAddress; + if ((ep & (UE_DIR_OUT|UE_DIR_IN)) == UE_DIR_OUT) + outmask |= (1 << (ep & 0x0F)); + else + inmask |= (1 << (ep & 0x0F)); + } + } - /* Create all available endpoints except EP0 */ - for (ep = 1; ep < 16; ep++) { - mode = 0; - mode |= iface->ep_in_mask & (1 << ep) ? inmode : 0; - mode |= iface->ep_out_mask & (1 << ep) ? outmode : 0; - if (mode == 0) - continue; /* no IN or OUT endpoint */ + /* Create all available endpoints except EP0 */ + for (ep = 1; ep != 16; ep++) { + mode = (inmask & (1 << ep)) ? inmode : 0; + mode |= (outmask & (1 << ep)) ? outmode : 0; + if (mode == 0) + continue; /* no IN or OUT endpoint */ - dev = usb2_make_dev(udev, i , ep, mode); + dev = usb2_make_dev(udev, ep, mode); + if (dev != NULL) { pd = dev->si_drv1; LIST_INSERT_HEAD(&udev->pd_list, pd, pd_next); } ==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#3 (text+ko) ==== @@ -65,8 +65,6 @@ device_t subdev; uint8_t alt_index; uint8_t parent_iface_index; - uint16_t ep_in_mask; /* bitmask of IN endpoints */ - uint16_t ep_out_mask; /* bitmask of OUT endpoints */ }; /* ==== //depot/projects/usb/src/sys/dev/usb/usb_generic.c#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sat Feb 28 18:49:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A6301065674; Sat, 28 Feb 2009 18:49: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 577C5106566B for ; Sat, 28 Feb 2009 18:49:02 +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 447258FC12 for ; Sat, 28 Feb 2009 18:49:02 +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 n1SIn2bC033827 for ; Sat, 28 Feb 2009 18:49:02 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1SIn2AX033825 for perforce@freebsd.org; Sat, 28 Feb 2009 18:49:02 GMT (envelope-from antab@FreeBSD.org) Date: Sat, 28 Feb 2009 18:49:02 GMT Message-Id: <200902281849.n1SIn2AX033825@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 158473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Feb 2009 18:49:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=158473 Change 158473 by antab@antab_farm on 2009/02/28 18:48:26 - Move if_ate from arm/at91/ to dev/ate/ and make it build and attach on at32, fails on busdma for now. - Add at32_hmatrix, only for dumping the hmatrix setup for now, later provide access to change bus setup from userspace. - Continue implmenting pmap_tlb_miss to call vm_fault, can now page in on demand. - Other bits needed to load init. Able to find, load and fail executing dumb init. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/exception.S#6 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#10 edit .. //depot/projects/avr32/src/sys/avr32/avr32/support.S#7 edit .. //depot/projects/avr32/src/sys/avr32/avr32/trap.c#6 edit .. //depot/projects/avr32/src/sys/avr32/conf/NGW100#10 edit .. //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap7000.hints#2 edit .. //depot/projects/avr32/src/sys/avr32/include/pmap.h#4 edit .. //depot/projects/avr32/src/sys/avr32/include/pte.h#4 edit .. //depot/projects/avr32/src/sys/avr32/include/trap.h#4 edit .. //depot/projects/avr32/src/sys/conf/files#5 edit .. //depot/projects/avr32/src/sys/conf/files.avr32#10 edit .. //depot/projects/avr32/src/sys/dev/ate/if_ate.c#1 add Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/exception.S#6 (text+ko) ==== @@ -134,6 +134,7 @@ mfsr r12, AT32_SYS_ECR mfsr r11, AT32_SYS_TLBEAR mfsr r10, AT32_SYS_TLBEHI + mov r9, sp rcall pmap_tlb_miss POP_TRAPFRAME(EX) rete ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#10 (text+ko) ==== @@ -30,6 +30,7 @@ #include #include #include +#include #include // antab: What does this stand for? @@ -44,6 +45,8 @@ static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); static void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); +static int pmap_remove_pte(struct pmap *pmap, pt_entry_t *ptq, vm_offset_t va); +static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); static struct pmap kernel_pmap_store; @@ -88,6 +91,7 @@ kernel_pmap->pm_active = ~0; kernel_pmap->pm_asid = 0; kernel_pmap->pm_asid_generation = 0; + TAILQ_INIT(&kernel_pmap->pm_pvlist); /* Setup kernel page dir and table */ kernel_pmap->pm_pd = (pd_entry_t *)pmap_steal_memory(PAGE_SIZE); @@ -254,7 +258,7 @@ if (!ent) { panic("pmap_kenter: not in kernel segment\n"); } - *ent = PTE_CACHEABLE | PTE_PERM_READ | PTE_PERM_WRITE; + *ent = PTE_CACHEABLE | PTE_PERM_READ | PTE_PERM_WRITE | PTE_GLOBAL; pfn_set(*ent, pa); /* No need to do any tlb inserts, will just get a miss exception @@ -439,7 +443,7 @@ * We might be turning off write access to the page, so we * go ahead and sense modify status. */ - if (page_is_managed(opa)) { + if (page_is_managed(opa)) { om = m; } goto update; @@ -553,7 +557,39 @@ void pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - avr32_impl(); + vm_offset_t va; + pt_entry_t *pte; + + if (pmap == NULL) { + return; + } + + if (pmap->pm_stats.resident_count == 0) { + return; + } + + vm_page_lock_queues(); + PMAP_LOCK(pmap); + + /* + * special handling of removing one page. a very common operation + * and easy to short circuit some code. + */ + if ((sva + PAGE_SIZE) == eva) { + pmap_remove_page(pmap, sva); + goto out; + } + for (va = sva; va < eva; va += PAGE_SIZE) { + pte = pmap_pte(pmap, va); + if (!pte || !*pte) { + continue; + } + pmap_remove_page(pmap, va); + } + +out: + vm_page_unlock_queues(); + PMAP_UNLOCK(pmap); } void @@ -562,19 +598,28 @@ register pv_entry_t pv; register pt_entry_t *pte; - mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->md.pv_flags & PV_TABLE_REF) { vm_page_flag_set(m, PG_REFERENCED); } while ((pv = TAILQ_FIRST(&m->md.pv_list)) != NULL) { - printf("Remove from pmap: %p\n", pv->pv_pmap); PMAP_LOCK(pv->pv_pmap); pv->pv_pmap->pm_stats.resident_count--; + + /* + * Update the vm_page_t clean and reference bits. + */ pte = pmap_pte(pv->pv_pmap, pv->pv_va); - // TODO More work needed + if (*pte & PTE_WIRED) { + pv->pv_pmap->pm_stats.wired_count--; + } + //if (*pte & PTE_M) { + // vm_page_dirty(m); + //} TODO + *pte = 0; + tlb_remove_entry(pv->pv_pmap, pv->pv_va); TAILQ_REMOVE(&pv->pv_pmap->pm_pvlist, pv, pv_plist); TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -621,6 +666,70 @@ vm_page_flag_clear(m, PG_WRITEABLE); } +/* + * pmap_remove_pte: do the things to unmap a page in a process + */ +static int +pmap_remove_pte(struct pmap *pmap, pt_entry_t *ptq, vm_offset_t va) +{ + vm_page_t m; + vm_offset_t pa; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + + if (*ptq & PTE_WIRED) { + pmap->pm_stats.wired_count--; + } + + pmap->pm_stats.resident_count--; + pa = pfn_get(*ptq); + + if (page_is_managed(pa)) { + m = PHYS_TO_VM_PAGE(pa); + //if (oldpte & PTE_M) { + // vm_page_dirty(m); + //} TODO + if (m->md.pv_flags & PV_TABLE_REF) { + vm_page_flag_set(m, PG_REFERENCED); + } + m->md.pv_flags &= ~(PV_TABLE_REF | PV_TABLE_MOD); + + if (pmap_page_is_mapped(m)) { + pmap_remove_entry(pmap, m, va); + } + } + *ptq = 0; + return (1); +} + +/* + * Remove a single page from a process address space + */ +static void +pmap_remove_page(struct pmap *pmap, vm_offset_t va) +{ + register pt_entry_t *pte; + + mtx_assert(&vm_page_queue_mtx, MA_OWNED); + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + pte = pmap_pte(pmap, va); + + /* + * if there is no pte for this address, just skip it!!! + */ + if (!pte || !*pte) { + return; + } + /* + * get a local va for mappings for this pmap. + */ + pmap_remove_pte(pmap, pte, va); + tlb_remove_entry(pmap, va); + + return; +} + vm_paddr_t pmap_extract(pmap_t pmap, vm_offset_t va) { @@ -746,9 +855,8 @@ * isn't already there. */ pmap->pm_stats.resident_count++; - ptepa = VM_PAGE_TO_PHYS(m); + ptepa = AVR32_PHYS_TO_P1(VM_PAGE_TO_PHYS(m)); pmap->pm_pd[ptepindex] = (pd_entry_t)ptepa; - avr32_impl(); return m; } @@ -793,7 +901,6 @@ boolean_t wired) { pv_entry_t pv; - pv = get_pv_entry(); if (pv == NULL) { panic("no pv entries: increase vm.pmap.shpgperproc"); @@ -819,13 +926,13 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->md.pv_list_count < pmap->pm_stats.resident_count) { TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { - if (pmap == pv->pv_pmap && va == pv->pv_va) - break; + if (pmap == pv->pv_pmap && va == pv->pv_va) + break; } } else { TAILQ_FOREACH(pv, &pmap->pm_pvlist, pv_plist) { - if (va == pv->pv_va) - break; + if (va == pv->pv_va) + break; } } @@ -906,7 +1013,7 @@ * Called when we need to update the TLB */ static int tlb_at = KSTACK_PAGES; -void pmap_tlb_miss(uint32_t ecr, uint32_t tlbear, uint32_t tlbehi) { +void pmap_tlb_miss(uint32_t ecr, uint32_t tlbear, uint32_t tlbehi, struct trapframe *tf) { pd_entry_t* pd = (pd_entry_t *)sysreg_read(PTBR); pt_entry_t *ent; register_t mmucr; @@ -917,12 +1024,82 @@ } if (!ent || !*ent) { + /* + * Enable exceptions before continuing, we are going to + * hit memory needs tlb lookups from here one. + */ + __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_EM)); + __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_GM)); + + if (tlbear == 0x0) { + panic("Access to 0x0! OMG!\n"); + } + struct thread *td = curthread; + struct proc *p = curproc; + vm_prot_t ftype; + vm_map_t map; + vm_offset_t va; + int rv = 0; + ksiginfo_t ksi; + + ftype = (ecr == T_TLB_MISS_WRITE) ? VM_PROT_WRITE : VM_PROT_READ; + va = trunc_page((vm_offset_t)tlbear); + + if ((vm_offset_t)tlbear < VM_MIN_KERNEL_ADDRESS) { + map = &p->p_vmspace->vm_map; + + /* + * Keep swapout from messing with us during this + * critical time. + */ + PROC_LOCK(p); + ++p->p_lock; + PROC_UNLOCK(p); + + rv = vm_fault(map, va, ftype, + (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY + : VM_FAULT_NORMAL); + + PROC_LOCK(p); + --p->p_lock; + PROC_UNLOCK(p); + } else { + map = kernel_map; + + rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); + } + + if (rv == KERN_SUCCESS) { + if (!TRAPF_USERMODE(tf)) { + return; + } + goto out; + } + if (!TRAPF_USERMODE(tf)) { + panic("Fault in kernel at 0x%x", tlbear); + } + + /* + * Generate signal + */ + td->td_frame->regs.pc = tf->regs.pc; + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV; + ksi.ksi_code = ftype; + ksi.ksi_addr = (void *)tf->regs.pc; + ksi.ksi_trapno = ecr; + trapsignal(td, &ksi); +out: + userret(td, tf); + return; + /* printf("\nTLB miss: %x\n", ecr); printf("pd: %x\n", sysreg_read(PTBR)); printf("TLBEAR: %x\n", tlbear); printf("TLBEHI: %x\n", tlbehi); printf("PC: %x\n", sysreg_read(RAR_EX)); printf("SR: %x\n", sysreg_read(RSR_EX)); */ + breakpoint(); panic("pmap_tlb_miss: address 0x%x not in pd %p\n", tlbear, pd); } ==== //depot/projects/avr32/src/sys/avr32/avr32/support.S#7 (text+ko) ==== @@ -140,20 +140,6 @@ END(copyout) /** - * Copy a null terminated string from the user address space into - * the kernel address space. - * - * copyinstr(fromaddr, toaddr, maxlength, &lencopied) - * caddr_t fromaddr; - * caddr_t toaddr; - * u_int maxlength; - * u_int *lencopied; - */ -ENTRY(copyinstr) - breakpoint -END(copyinstr) - -/** * Copy a null terminated string from the kernel address space into * the user address space. * @@ -178,6 +164,8 @@ * r9 lencopied(pushed)/char * r8 copy count */ +ENTRY(copyinstr) + /* TODO: Should probably check addresses.. */ ENTRY(copystr) st.w --sp, r9 /* Push r9 to stack */ mov r8, 0 /* Clear copy count */ @@ -207,24 +195,31 @@ * memory. All these functions are MPSAFE. */ ENTRY(fubyte) + ld.ub r12, r12 + retal r12 +END(fubyte) + ENTRY(fuword) ENTRY(fuword32) + ld.w r12, r12 + retal r12 +END(fuword32) + ENTRY(fuword64) breakpoint +END(fuword64) /* * Store a 32-bit word, a 16-bit word, or an 8-bit byte to user memory. * All these functions are MPSAFE. */ ENTRY(subyte) - breakpoint st.b r12, r11 retal sp END(subyte) ENTRY(suword) ENTRY(suword32) - breakpoint st.w r12, r11 retal sp END(suword) ==== //depot/projects/avr32/src/sys/avr32/avr32/trap.c#6 (text+ko) ==== ==== //depot/projects/avr32/src/sys/avr32/conf/NGW100#10 (text+ko) ==== @@ -9,6 +9,7 @@ hints "cpu/at32ap700x.hints" # Hints for all buildin devices hints "cpu/at32ap7000.hints" # Hints for all buildin devices hints "NGW100.hints" +options ROOTDEVNAME=\"ufs:cfid0h1\" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols #options VERBOSE_SYSINIT @@ -40,11 +41,15 @@ #options WITNESS_KDB device at32_intc # Interrupt controller +device at32_hmatrix # HSB Bus Matrix device at32_sdramc # SDRAM controller device at32_smc # Static memory controller device at32_pm # Power Manager device at32_rtc # Real Time Counter (System clock) device at32_pio # Peripheral IO +#device mii # Requred for ate +#device ate # MACB Ethernet driver + #device gpio # GPIO framework device uart # USART support #device atmel_twi # TWI (I2C) support ==== //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap7000.hints#2 (text+ko) ==== @@ -6,12 +6,12 @@ hint.at32_lcdc.0.msize="0x200000" hint.at32_lcdc.0.irq="1" -hint.at32_macb.0.at="at32bus0" -hint.at32_macb.0.maddr="0xFFF01800" -hint.at32_macb.0.msize="0x400" -hint.at32_macb.0.irq="25" +hint.ate.0.at="at32bus0" +hint.ate.0.maddr="0xFFF01800" +hint.ate.0.msize="0x400" +hint.ate.0.irq="25" -hint.at32_macb.1.at="at32bus0" -hint.at32_macb.1.maddr="0xFFF01C00" -hint.at32_macb.1.msize="0x400" -hint.at32_macb.1.irq="26" +hint.ate.1.at="at32bus0" +hint.ate.1.maddr="0xFFF01C00" +hint.ate.1.msize="0x400" +hint.ate.1.irq="26" ==== //depot/projects/avr32/src/sys/avr32/include/pmap.h#4 (text+ko) ==== @@ -106,6 +106,7 @@ #include #include +#include #define NKPT 128 /* actual number of kernel page tables */ @@ -196,7 +197,7 @@ */ pt_entry_t* pmap_pte(pmap_t pmap, vm_offset_t va); -void pmap_tlb_miss(uint32_t ecr, uint32_t tlbear, uint32_t tlbehi); +void pmap_tlb_miss(uint32_t ecr, uint32_t tlbear, uint32_t tlbehi, struct trapframe *); #define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) #define vtophys(va) pmap_kextract((vm_offset_t)(va)) ==== //depot/projects/avr32/src/sys/avr32/include/pte.h#4 (text+ko) ==== @@ -42,12 +42,13 @@ #define PD_SHIFT 22 #define PT_SHIFT 12 -#define PTE_WIRED 1 << bit_shift(SYS, TLBELO, SZ) /* Reuse size field */ +#define PTE_SOFTWARE_MASK bit_mask(SYS, TLBELO, SZ) /* Mask bits used by software */ #define PTE_WRITE_THRU bit_offset(SYS, TLBELO, W) /* Write thru */ #define PTE_PERM_READ 4 << bit_shift(SYS, TLBELO, AP) #define PTE_PERM_WRITE 2 << bit_shift(SYS, TLBELO, AP) #define PTE_PERM_EXECUTE 1 << bit_shift(SYS, TLBELO, AP) #define PTE_WIRED 1 << bit_shift(SYS, TLBELO, SZ) /* Reuse size field for wired */ +#define PTE_GLOBAL bit_offset(SYS, TLBELO, G) #define PTE_BUFFERABLE bit_offset(SYS, TLBELO, B) /* Bufferable */ #define PTE_CACHEABLE bit_offset(SYS, TLBELO, C) /* Cacheable */ #define PTE_DIRTY bit_offset(SYS, TLBELO, D) /* Dirty */ ==== //depot/projects/avr32/src/sys/avr32/include/trap.h#4 (text+ko) ==== @@ -39,5 +39,10 @@ void trapframe_dump(struct trapframe *frame); #define T_BREAKPOINT 0x07 +#define T_TLB_PROT_READ 0x0F +#define T_TLB_PROT_WRITE 0x10 +#define T_TLB_MISS_READ 0x18 +#define T_TLB_MISS_WRITE 0x1C + #endif /* _MACHINE_TRAP_H_ */ ==== //depot/projects/avr32/src/sys/conf/files#5 (text+ko) ==== @@ -509,6 +509,7 @@ dev/ata/atapi-tape.c optional atapist dev/ata/atapi-cam.c optional atapicam # +dev/ate/if_ate.c optional ate dev/ath/if_ath.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/if_ath_pci.c optional ath pci \ ==== //depot/projects/avr32/src/sys/conf/files.avr32#10 (text+ko) ==== @@ -12,6 +12,7 @@ avr32/avr32/pm_machdep.c standard avr32/avr32/elf_machdep.c standard avr32/avr32/uio_machdep.c standard +avr32/avr32/busdma_machdep.c standard avr32/avr32/sf_buf.c standard avr32/avr32/cache.c standard avr32/avr32/clock.c standard @@ -29,6 +30,7 @@ avr32/avr32/at32_intc.c optional at32_intc avr32/avr32/at32_pm.c optional at32_pm +avr32/avr32/at32_hmatrix.c optional at32_hmatrix avr32/avr32/at32_rtc.c optional at32_rtc avr32/avr32/at32_pio.c optional at32_pio avr32/avr32/at32_sdramc.c optional at32_sdramc @@ -39,17 +41,17 @@ libkern/ashldi3.c standard libkern/ashrdi3.c standard -libkern/avr32/muldi64.c standard -libkern/divdi3.c standard +#libkern/avr32/muldi64.c standard +#libkern/divdi3.c standard libkern/ffs.c standard libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard #libkern/lshrdi3.c standard -libkern/moddi3.c standard +#libkern/moddi3.c standard libkern/qdivrem.c standard -libkern/udivdi3.c standard -libkern/umoddi3.c standard +#libkern/udivdi3.c standard +#libkern/umoddi3.c standard avr32/avr32/in_cksum.c optional inet From owner-p4-projects@FreeBSD.ORG Sat Feb 28 18:56:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11DC21065674; Sat, 28 Feb 2009 18:56: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 C35E0106566B for ; Sat, 28 Feb 2009 18:56:09 +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 973398FC08 for ; Sat, 28 Feb 2009 18:56:09 +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 n1SIu95b034380 for ; Sat, 28 Feb 2009 18:56:09 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n1SIu9HY034378 for perforce@freebsd.org; Sat, 28 Feb 2009 18:56:09 GMT (envelope-from antab@FreeBSD.org) Date: Sat, 28 Feb 2009 18:56:09 GMT Message-Id: <200902281856.n1SIu9HY034378@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 158474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 28 Feb 2009 18:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=158474 Change 158474 by antab@antab_farm on 2009/02/28 18:55:21 - Add at32_hmatrix, only for dumping the hmatrix setup for now, later provide access to change bus setup from userspace Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32_hmatrix.c#1 add .. //depot/projects/avr32/src/sys/avr32/include/reg_hmatrix.h#1 add Differences ...