From owner-p4-projects@FreeBSD.ORG Sun Dec 30 00:46:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9DBF16A419; Sun, 30 Dec 2007 00:46:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FB5716A417 for ; Sun, 30 Dec 2007 00:46:23 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 46F7113C461 for ; Sun, 30 Dec 2007 00:46:23 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU0kNt1019733 for ; Sun, 30 Dec 2007 00:46:23 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU0kNTH019730 for perforce@freebsd.org; Sun, 30 Dec 2007 00:46:23 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 00:46:23 GMT Message-Id: <200712300046.lBU0kNTH019730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 131999 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 00:46:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=131999 Change 131999 by gcooper@shiina-ibook on 2007/12/30 00:45:36 1. Scratch one more todo from turner. 2. Add a few more checks (stuff seems missing). 3. Add a very funny comment (or at least I thought it was funny -- ok, ok, just confused / frustrated. lol). Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#4 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db_match.c#4 (text+ko) ==== @@ -145,11 +145,9 @@ if (regex == NULL) return NULL; - /* Count the number of regex's */ - for (rex.count = 0; regex[rex.count] != NULL; rex.count++) - continue; + rex.count = (sizeof(regex) / sizeof(const char **)) - 1; + rex.rex = malloc(rex.count * sizeof(regex_t)); - rex.rex = malloc(rex.count * sizeof(regex_t)); if (rex.rex == NULL) return NULL; @@ -187,11 +185,8 @@ if (patterns == NULL) return NULL; - /* Count the number of globs */ - for (the_glob.count = 0; patterns[the_glob.count] != NULL; - the_glob.count++) - continue; - + the_glob.count = (sizeof(patterns) / sizeof(const char**)) - 1; + /* patterns is NULL terminated already. No worries.. */ the_glob.patterns = patterns; pkgs = pkg_db_get_installed_match(db, pkg_match_glob, &the_glob); @@ -217,7 +212,10 @@ * @brief Function to match all packages with one of the given names * @return 0 if the package matches * @return -1 otherwise - */ + * + * @todo: Verify this does as promised; this doesn't seem functionally + * correct in the least.. + */ static int pkg_match_name(struct pkg *pkg, const void *data) { @@ -269,16 +267,29 @@ static int pkg_match_glob(struct pkg *pkg, const void *data) { - /** @todo Fix to just take a null terminated array of strings */ + /* + * Andrew Turner: + * @todo Fix to just take a null terminated array of strings + * Garrett Cooper: + * Agh... make up your mind. Are you going to use the count + * data member or a temporary variable, per fn, per struct + * (this applies not only to struct glob_or, but also struct + * regex_or)? + * + * Using count eats up more memory, but not too much, whereas + * calculating it on the fly requires some time for determining + * the NULL terminated length, but blah.. this is just plain, + * silly.. + */ unsigned int i; const struct glob_or *the_glob; - + assert(pkg != NULL); assert(data != NULL); - the_glob = data; + the_glob = (const struct glob_or*) data; for(i=0; i < the_glob->count; i++) { - /* This should use the csh_match from FreeBSD pkg_info */ + /* @todo: This should use the csh_match from FreeBSD pkg_info */ if (fnmatch(the_glob->patterns[i], pkg_get_name(pkg), 0) == 0) return 0; } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 00:48:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C89ED16A418; Sun, 30 Dec 2007 00:48: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 8E70F16A421 for ; Sun, 30 Dec 2007 00:48:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7D07213C465 for ; Sun, 30 Dec 2007 00:48:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU0mPuh028733 for ; Sun, 30 Dec 2007 00:48:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU0mPAo028730 for perforce@freebsd.org; Sun, 30 Dec 2007 00:48:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 00:48:25 GMT Message-Id: <200712300048.lBU0mPAo028730@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132000 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 00:48:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=132000 Change 132000 by gcooper@shiina-ibook on 2007/12/30 00:47:46 - pkg_action_null's a noop function. So why does it have to be interactive? - Trim down the __unused's.. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#5 edit Differences ... ==== //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/contrib/libpkg/pkg_db.c#5 (text+ko) ==== @@ -107,17 +107,12 @@ /** * @brief The package action used when no output is required - * Andrew: - * @todo Change to follow the interactive flag - * Garrett: - * This isn't necessary I think, and should stick with - * the interface, not with the library. * * This is a function that does nothing. * It can be used for a pkg_action when no output is required */ void -pkg_action_null(enum pkg_action_level level __unused, const char *fmt __unused, +pkg_action_null(enum pkg_action_level level, const char *fmt, ...) { } @@ -313,7 +308,7 @@ * @return 0 */ int -pkg_match_all(struct pkg *pkg __unused, const void *data __unused) +pkg_match_all(struct pkg *pkg, const void *data) { return 0; } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:14:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0CFF16A469; Sun, 30 Dec 2007 02:14:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6655D16A420 for ; Sun, 30 Dec 2007 02:14:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 56B4F13C4E5 for ; Sun, 30 Dec 2007 02:14:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2Et6Z064009 for ; Sun, 30 Dec 2007 02:14:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2EtEp064002 for perforce@freebsd.org; Sun, 30 Dec 2007 02:14:55 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:14:55 GMT Message-Id: <200712300214.lBU2EtEp064002@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132003 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:14:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=132003 Change 132003 by jb@jb_freebsd1 on 2007/12/30 02:14:49 Add the opensolaris module to the build. It contains common stuff we need for compatibility such as the global cpu lock and the cpu array of CDDL'd things. Affected files ... .. //depot/projects/dtrace/src/sys/modules/Makefile#33 edit .. //depot/projects/dtrace/src/sys/modules/opensolaris/Makefile#1 add Differences ... ==== //depot/projects/dtrace/src/sys/modules/Makefile#33 (text+ko) ==== @@ -196,6 +196,7 @@ ${_nwfs} \ ${_nxge} \ ${_oltr} \ + ${_opensolaris} \ ${_padlock} \ patm \ ${_pccard} \ @@ -537,6 +538,7 @@ _nve= nve _nvram= nvram _nxge= nxge +_opensolaris= opensolaris _pccard= pccard _rr232x= rr232x _safe= safe From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:15:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE3FD16A41A; Sun, 30 Dec 2007 02:15:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3EF716A419 for ; Sun, 30 Dec 2007 02:15:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7C15713C469 for ; Sun, 30 Dec 2007 02:15:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2FvDK064540 for ; Sun, 30 Dec 2007 02:15:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2FvOr064537 for perforce@freebsd.org; Sun, 30 Dec 2007 02:15:57 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:15:57 GMT Message-Id: <200712300215.lBU2FvOr064537@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132004 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:15:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=132004 Change 132004 by jb@jb_freebsd1 on 2007/12/30 02:15:46 The atomic and kmem compatibility stuff is now in the opensolaris module. Affected files ... .. //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/cyclic/Makefile#6 (text+ko) ==== @@ -4,9 +4,7 @@ .PATH: ${.CURDIR}/../../compat/opensolaris/kern KMOD= cyclic -SRCS= cyclic.c \ - opensolaris_atomic.c \ - opensolaris_kmem.c +SRCS= cyclic.c SRCS+= bus_if.h device_if.h vnode_if.h From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:18:00 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 796BF16A468; Sun, 30 Dec 2007 02:18:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F04216A420 for ; Sun, 30 Dec 2007 02:18:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E15913C46A for ; Sun, 30 Dec 2007 02:18:00 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2Hx5Q064641 for ; Sun, 30 Dec 2007 02:17:59 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2HxEd064629 for perforce@freebsd.org; Sun, 30 Dec 2007 02:17:59 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:17:59 GMT Message-Id: <200712300217.lBU2HxEd064629@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132005 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:18:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=132005 Change 132005 by jb@jb_freebsd1 on 2007/12/30 02:17:04 Use cpu_lock and solaris_cpu from the opensolaris module from now on. This stuff is shared with at least the dtrace module. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/amd64/cyclic_machdep.c#5 edit .. //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#9 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#12 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/amd64/cyclic_machdep.c#5 (text+ko) ==== @@ -63,7 +63,7 @@ static void cyclic_swi_low(void *dummy) { - cpu_t *c = &cyclic_cpu[curcpu]; + cpu_t *c = &solaris_cpu[curcpu]; c->cpu_intr_actv |= (1 << CY_LOW_LEVEL); @@ -75,7 +75,7 @@ static void cyclic_swi_lock(void *dummy) { - cpu_t *c = &cyclic_cpu[curcpu]; + cpu_t *c = &solaris_cpu[curcpu]; c->cpu_intr_actv |= (1 << CY_LOCK_LEVEL); @@ -195,7 +195,7 @@ * If the target CPU is the current one, just call the * function. This covers the non-SMP case. */ - if (c == &cyclic_cpu[curcpu]) + if (c == &solaris_cpu[curcpu]) (*func)(param); else printf("%s:%s(%d): Need to have a way to execute the function on another CPU\n",__FUNCTION__,__FILE__,__LINE__); ==== //depot/projects/dtrace/src/sys/cddl/kern/kern_cyclic.c#9 (text+ko) ==== @@ -32,22 +32,8 @@ static void cyclic_load(void *dummy) { - int i; - - mutex_init(&cpu_lock, "Cyclic CPU lock", MUTEX_DEFAULT, NULL); - mutex_enter(&cpu_lock); - /* - * "Enable" all CPUs even though they may not exist just so - * that the asserts work. On FreeBSD, if a CPU exists, it is - * enabled. - */ - for (i = 0; i < SMP_MAXCPU; i++) { - cyclic_cpu[i].cpuid = i; - cyclic_cpu[i].cpu_flags &= CPU_ENABLE; - } - /* Initialise the machine-dependent backend. */ cyclic_machdep_init(); @@ -65,8 +51,6 @@ cyclic_machdep_uninit(); mutex_exit(&cpu_lock); - - mutex_destroy(&cpu_lock); } SYSUNINIT(cyclic_unregister, SI_SUB_CYCLIC, SI_ORDER_SECOND, cyclic_unload, NULL); @@ -78,7 +62,7 @@ static void cyclic_clock(void) { - cpu_t *c = &cyclic_cpu[curcpu]; + cpu_t *c = &solaris_cpu[curcpu]; if (c->cpu_cyclic != NULL) { c->cpu_intr_actv |= (1 << CY_HIGH_LEVEL); @@ -116,3 +100,4 @@ DEV_MODULE(cyclic, cyclic_modevent, NULL); MODULE_VERSION(cyclic, 1); +MODULE_DEPEND(cyclic, opensolaris, 1, 1, 1); ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#12 (text) ==== @@ -568,8 +568,6 @@ #include #include #define gethrtime_unscaled dtrace_gethrtime -static cyclic_cpu_t cyclic_cpu[SMP_MAXCPU]; -kmutex_t cpu_lock; #endif #ifdef CYCLIC_TRACE @@ -1567,7 +1565,7 @@ * FreeBSD doesn't have cpu partitions, so just use the current * CPU for now. */ - cyclic_cpu_t *c = &cyclic_cpu[curcpu]; + solaris_cpu_t *c = &solaris_cpu[curcpu]; #endif return (c->cpu_cyclic); @@ -2649,7 +2647,7 @@ if (pcpu_find(i) == NULL) continue; - c = &cyclic_cpu[i]; + c = &solaris_cpu[i]; #endif if ((cpu = c->cpu_cyclic) == NULL) @@ -2897,8 +2895,8 @@ cyclic_configure(CPU); cyclic_online(CPU); #else - cyclic_configure(&cyclic_cpu[curcpu]); - cyclic_online(&cyclic_cpu[curcpu]); + cyclic_configure(&solaris_cpu[curcpu]); + cyclic_online(&solaris_cpu[curcpu]); #endif } @@ -2930,7 +2928,7 @@ if (pcpu_find(i) == NULL) continue; - c = &cyclic_cpu[i]; + c = &solaris_cpu[i]; #endif if (c->cpu_cyclic == NULL) { cyclic_configure(c); @@ -2958,7 +2956,7 @@ if ((pc = pcpu_find(id)) == NULL) continue; - c = &cyclic_cpu[id]; + c = &solaris_cpu[id]; if (c->cpu_cyclic == NULL) continue; @@ -3386,7 +3384,7 @@ if (pcpu_find(i) == NULL) continue; - c = &cyclic_cpu[i]; + c = &solaris_cpu[i]; #endif cpu = c->cpu_cyclic; be = cpu->cyp_backend; @@ -3454,7 +3452,7 @@ if (pcpu_find(i) == NULL) continue; - c = &cyclic_cpu[i]; + c = &solaris_cpu[i]; #endif cpu = c->cpu_cyclic; ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/sys/cyclic.h#8 (text) ==== @@ -39,16 +39,7 @@ #if defined(sun) #include #else -struct cyc_cpu; #define cpupart_t void -#undef cpu_t -#define cpu_t cyclic_cpu_t -typedef struct { - int cpuid; - struct cyc_cpu *cpu_cyclic; - uint32_t cpu_flags; - uint_t cpu_intr_actv; -} cyclic_cpu_t; #endif #endif /* !_ASM */ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:19:02 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA22016A469; Sun, 30 Dec 2007 02:19: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 7FC0216A421 for ; Sun, 30 Dec 2007 02:19:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 580CF13C4F5 for ; Sun, 30 Dec 2007 02:19:02 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2J0tm064695 for ; Sun, 30 Dec 2007 02:19:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2J0qK064692 for perforce@freebsd.org; Sun, 30 Dec 2007 02:19:00 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:19:00 GMT Message-Id: <200712300219.lBU2J0qK064692@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132006 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:19:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=132006 Change 132006 by jb@jb_freebsd1 on 2007/12/30 02:18:55 Remove the definition of cpu_t. It isn't clear what it should default to. Some apps might want it defines as struct pcpu (pcpu_t) while others might want solaris_cpu_t. For now we'll use the latter. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/pcpu.h#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/pcpu.h#5 (text+ko) ==== @@ -34,8 +34,6 @@ typedef struct pcpu pcpu_t; -#define cpu_t pcpu_t - #define cpu_id pc_cpuid #endif From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:22:05 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB01716A420; Sun, 30 Dec 2007 02:22:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A070B16A41A for ; Sun, 30 Dec 2007 02:22:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 90E0813C447 for ; Sun, 30 Dec 2007 02:22:04 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2M4cl065602 for ; Sun, 30 Dec 2007 02:22:04 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2M4FL065597 for perforce@freebsd.org; Sun, 30 Dec 2007 02:22:04 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:22:04 GMT Message-Id: <200712300222.lBU2M4FL065597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132007 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:22:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=132007 Change 132007 by jb@jb_freebsd1 on 2007/12/30 02:21:15 Add some extra definitions. solaris_cpu_t contains the fields that would be added to struct pcpu if it was clear that wouldn't be a license violation. Opinions vary on that. Doing it this way is the safest option, albeit a little inconvenient at times. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpuvar.h#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpuvar.h#4 (text+ko) ==== @@ -30,6 +30,21 @@ #include #ifdef _KERNEL + +struct cyc_cpu; + +typedef struct { + int cpuid; + struct cyc_cpu *cpu_cyclic; + uint32_t cpu_flags; + uint_t cpu_intr_actv; +} solaris_cpu_t; + +/* Some code may choose to redefine this if pcpu_t would be more useful. */ +#define cpu_t solaris_cpu_t + +extern solaris_cpu_t solaris_cpu[]; + #define CPU_CACHE_COHERENCE_SIZE 64 /* @@ -120,6 +135,8 @@ CPU_DTRACE_BADSTACK) #define CPU_DTRACE_ERROR (CPU_DTRACE_FAULT | CPU_DTRACE_DROP) +extern kmutex_t cpu_lock; + typedef enum { CPU_INIT, CPU_CONFIG, From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:23:06 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D70616A468; Sun, 30 Dec 2007 02:23:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 115DA16A417 for ; Sun, 30 Dec 2007 02:23:06 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DF21C13C45A for ; Sun, 30 Dec 2007 02:23:05 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2N5BY065988 for ; Sun, 30 Dec 2007 02:23:05 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2N5T0065985 for perforce@freebsd.org; Sun, 30 Dec 2007 02:23:05 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:23:05 GMT Message-Id: <200712300223.lBU2N5T0065985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:23:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=132008 Change 132008 by jb@jb_freebsd1 on 2007/12/30 02:22:37 Work in progress. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_anon.c#6 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_cddl.h#3 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#16 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#16 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#14 edit .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_anon.c#6 (text+ko) ==== @@ -59,128 +59,3 @@ (void) dtrace_state_go(state, &dtrace_anon.dta_beganon); } } - -static dtrace_state_t * -dtrace_anon_grab(void) -{ - dtrace_state_t *state; - - ASSERT(MUTEX_HELD(&dtrace_lock)); - - if ((state = dtrace_anon.dta_state) == NULL) { - ASSERT(dtrace_anon.dta_enabling == NULL); - return (NULL); - } - - ASSERT(dtrace_anon.dta_enabling != NULL); - ASSERT(dtrace_retained != NULL); - - dtrace_enabling_destroy(dtrace_anon.dta_enabling); - dtrace_anon.dta_enabling = NULL; - dtrace_anon.dta_state = NULL; - - return (state); -} - -static void -dtrace_anon_property(void) -{ - int i, rv; - dtrace_state_t *state; - dof_hdr_t *dof; - char c[32]; /* enough for "dof-data-" + digits */ - - ASSERT(MUTEX_HELD(&dtrace_lock)); - ASSERT(MUTEX_HELD(&cpu_lock)); - - for (i = 0; ; i++) { - (void) snprintf(c, sizeof (c), "dof-data-%d", i); - - dtrace_err_verbose = 1; - - if ((dof = dtrace_dof_property(c)) == NULL) { - dtrace_err_verbose = 0; - break; - } - - /* - * We want to create anonymous state, so we need to transition - * the kernel debugger to indicate that DTrace is active. If - * this fails (e.g. because the debugger has modified text in - * some way), we won't continue with the processing. - */ - if (kdi_dtrace_set(KDI_DTSET_DTRACE_ACTIVATE) != 0) { - cmn_err(CE_NOTE, "kernel debugger active; anonymous " - "enabling ignored."); - dtrace_dof_destroy(dof); - break; - } - - /* - * If we haven't allocated an anonymous state, we'll do so now. - */ - if ((state = dtrace_anon.dta_state) == NULL) { -#if defined(sun) - state = dtrace_state_create(NULL, NULL); -#else - state = dtrace_state_create(NULL); -#endif - dtrace_anon.dta_state = state; - - if (state == NULL) { - /* - * This basically shouldn't happen: the only - * failure mode from dtrace_state_create() is a - * failure of ddi_soft_state_zalloc() that - * itself should never happen. Still, the - * interface allows for a failure mode, and - * we want to fail as gracefully as possible: - * we'll emit an error message and cease - * processing anonymous state in this case. - */ - cmn_err(CE_WARN, "failed to create " - "anonymous state"); - dtrace_dof_destroy(dof); - break; - } - } - - rv = dtrace_dof_slurp(dof, &state->dts_vstate, CRED(), - &dtrace_anon.dta_enabling, 0, B_TRUE); - - if (rv == 0) - rv = dtrace_dof_options(dof, state); - - dtrace_err_verbose = 0; - dtrace_dof_destroy(dof); - - if (rv != 0) { - /* - * This is malformed DOF; chuck any anonymous state - * that we created. - */ - ASSERT(dtrace_anon.dta_enabling == NULL); - dtrace_state_destroy(state); - dtrace_anon.dta_state = NULL; - break; - } - - ASSERT(dtrace_anon.dta_enabling != NULL); - } - - if (dtrace_anon.dta_enabling != NULL) { - int rval; - - /* - * dtrace_enabling_retain() can only fail because we are - * trying to retain more enablings than are allowed -- but - * we only have one anonymous enabling, and we are guaranteed - * to be allowed at least one retained enabling; we assert - * that dtrace_enabling_retain() returns success. - */ - rval = dtrace_enabling_retain(dtrace_anon.dta_enabling); - ASSERT(rval == 0); - - dtrace_enabling_dump(dtrace_anon.dta_enabling); - } -} ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_cddl.h#3 (text+ko) ==== @@ -27,6 +27,8 @@ #include +#define LOCK_LEVEL 10 + /* * Kernel DTrace extension to 'struct proc' for FreeBSD. */ @@ -93,11 +95,40 @@ * Definitions for fields in struct proc which are named differntly in FreeBSD. */ #define p_cred p_ucred +#define p_parent p_pptr /* * Definitions for fields in struct thread which are named differntly in FreeBSD. */ #define t_procp td_proc #define t_tid td_tid +#define t_did td_tid + + +int priv_policy(const cred_t *, int, boolean_t, int, const char *); +boolean_t priv_policy_only(const cred_t *, int, boolean_t); +boolean_t priv_policy_choice(const cred_t *, int, boolean_t); + +/* + * Test privilege. Audit success or failure, allow privilege debugging. + * Returns 0 for success, err for failure. + */ +#define PRIV_POLICY(cred, priv, all, err, reason) \ + priv_policy((cred), (priv), (all), (err), (reason)) + +/* + * Test privilege. Audit success only, no privilege debugging. + * Returns 1 for success, and 0 for failure. + */ +#define PRIV_POLICY_CHOICE(cred, priv, all) \ + priv_policy_choice((cred), (priv), (all)) + +/* + * Test privilege. No priv_debugging, no auditing. + * Returns 1 for success, and 0 for failure. + */ + +#define PRIV_POLICY_ONLY(cred, priv, all) \ + priv_policy_only((cred), (priv), (all)) #endif /* !_DTRACE_CDDL_H_ */ ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#16 (text+ko) ==== @@ -336,7 +336,7 @@ } if ((dof = dtrace_dof_copyin((uintptr_t) p->dof, &rval)) == NULL) - return (rval); + return (EINVAL); mutex_enter(&cpu_lock); mutex_enter(&dtrace_lock); @@ -738,10 +738,6 @@ return (rval); } - /* Really handled in upper layer */ - case FIOASYNC: - case FIONBIO: - break; default: error = ENOTTY; } ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#16 (text+ko) ==== @@ -39,8 +39,7 @@ * XXX This is a short term hack to avoid having to comment * out lots and lots of lock/unlock calls. */ - dtrace_mutex_init(&cpu_lock,"XXX cpu_lock hack"); - dtrace_mutex_init(&mod_lock,"XXX mod_lock hack"); + mutex_init(&mod_lock,"XXX mod_lock hack", MUTEX_DEFAULT, NULL); /* * Initialise the mutexes without 'witness' because the dtrace @@ -50,10 +49,10 @@ * low memory situation. And that low memory situation might be * the very problem we are trying to trace. */ - dtrace_mutex_init(&dtrace_lock,"dtrace probe state"); - dtrace_mutex_init(&dtrace_provider_lock,"dtrace provider state"); - dtrace_mutex_init(&dtrace_meta_lock,"dtrace meta-provider state"); - dtrace_mutex_init(&dtrace_errlock,"dtrace error lock"); + mutex_init(&dtrace_lock,"dtrace probe state", MUTEX_DEFAULT, NULL); + mutex_init(&dtrace_provider_lock,"dtrace provider state", MUTEX_DEFAULT, NULL); + mutex_init(&dtrace_meta_lock,"dtrace meta-provider state", MUTEX_DEFAULT, NULL); + mutex_init(&dtrace_errlock,"dtrace error lock", MUTEX_DEFAULT, NULL); mutex_enter(&cpu_lock); mutex_enter(&dtrace_provider_lock); ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#14 (text+ko) ==== @@ -61,11 +61,13 @@ ASSERT(state->dts_necbs == 0); dtrace_state_destroy(state); +#ifdef DOODAD /* * If we're being detached with anonymous state, we need to * indicate to the kernel debugger that DTrace is now inactive. */ (void) kdi_dtrace_set(KDI_DTSET_DTRACE_DEACTIVATE); +#endif } bzero(&dtrace_anon, sizeof (dtrace_anon_t)); @@ -145,14 +147,13 @@ dtrace_taskq = NULL; #endif - dtrace_mutex_destroy(&dtrace_meta_lock); - dtrace_mutex_destroy(&dtrace_provider_lock); - dtrace_mutex_destroy(&dtrace_lock); - dtrace_mutex_destroy(&dtrace_errlock); + mutex_destroy(&dtrace_meta_lock); + mutex_destroy(&dtrace_provider_lock); + mutex_destroy(&dtrace_lock); + mutex_destroy(&dtrace_errlock); /* XXX Hack */ - dtrace_mutex_destroy(&cpu_lock); - dtrace_mutex_destroy(&mod_lock); + mutex_destroy(&mod_lock); /* * Reset our hook for thread switches, but ensure that vtime isn't ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#4 (text) ==== @@ -114,7 +114,9 @@ #include #include #include +#include #include +#include #include "dtrace_cddl.h" #endif @@ -190,14 +192,18 @@ #endif static vmem_t *dtrace_arena; /* probe ID arena */ static vmem_t *dtrace_minor; /* minor number arena */ +#if defined(sun) static taskq_t *dtrace_taskq; /* task queue */ +#endif static dtrace_probe_t **dtrace_probes; /* array of all probes */ static int dtrace_nprobes; /* number of probes */ static dtrace_provider_t *dtrace_provider; /* provider list */ static dtrace_meta_t *dtrace_meta_pid; /* user-land meta provider */ static int dtrace_opens; /* number of opens */ static int dtrace_helpers; /* number of helpers */ +#if defined(sun) static void *dtrace_softstate; /* softstate pointer */ +#endif static dtrace_hash_t *dtrace_bymod; /* probes hashed by module */ static dtrace_hash_t *dtrace_byfunc; /* probes hashed by function */ static dtrace_hash_t *dtrace_byname; /* probes hashed by name */ @@ -252,7 +258,6 @@ MALLOC_DEFINE(M_DTRACE, "dtrace", "Dynamic Trace"); /* XXX FreeBSD hacks. */ -static kmutex_t cpu_lock; static kmutex_t mod_lock; #define cr_suid cr_svuid @@ -387,6 +392,7 @@ * no way for a global variable key signature to match a thread-local key * signature. */ +#if defined(sun) #define DTRACE_TLS_THRKEY(where) { \ uint_t intr = 0; \ uint_t actv = CPU->cpu_intr_actv >> (LOCK_LEVEL + 1); \ @@ -396,6 +402,18 @@ (where) = ((curthread->t_did + DIF_VARIABLE_MAX) & \ (((uint64_t)1 << 61) - 1)) | ((uint64_t)intr << 61); \ } +#else +#define DTRACE_TLS_THRKEY(where) { \ + solaris_cpu_t *_c = &solaris_cpu[curcpu]; \ + uint_t intr = 0; \ + uint_t actv = _c->cpu_intr_actv >> (LOCK_LEVEL + 1); \ + for (; actv; actv >>= 1) \ + intr++; \ + ASSERT(intr < (1 << 3)); \ + (where) = ((curthread->td_tid + DIF_VARIABLE_MAX) & \ + (((uint64_t)1 << 61) - 1)) | ((uint64_t)intr << 61); \ +} +#endif #define DT_BSWAP_8(x) ((x) & 0xff) #define DT_BSWAP_16(x) ((DT_BSWAP_8(x) << 8) | DT_BSWAP_8((x) >> 8)) @@ -463,7 +481,7 @@ * This address falls within a toxic region; return 0. \ */ \ *flags |= CPU_DTRACE_BADADDR; \ - cpu_core[curcpu].cpuc_dtrace_illval = addr; \ + cpu_core[curcpu].cpuc_dtrace_illval = addr; \ return (0); \ } \ \ @@ -513,16 +531,20 @@ static int dtrace_enabling_match(dtrace_enabling_t *, int *); static void dtrace_enabling_matchall(void); static dtrace_state_t *dtrace_anon_grab(void); +#if defined(sun) static uint64_t dtrace_helper(int, dtrace_mstate_t *, dtrace_state_t *, uint64_t, uint64_t); static dtrace_helpers_t *dtrace_helpers_create(proc_t *); +#endif static void dtrace_buffer_drop(dtrace_buffer_t *); static intptr_t dtrace_buffer_reserve(dtrace_buffer_t *, size_t, size_t, dtrace_state_t *, dtrace_mstate_t *); static int dtrace_state_option(dtrace_state_t *, dtrace_optid_t, dtrace_optval_t); static int dtrace_ecb_create_enable(dtrace_probe_t *, void *); +#if defined(sun) static void dtrace_helper_provider_destroy(dtrace_helper_provider_t *); +#endif uint16_t dtrace_load16(uintptr_t); uint32_t dtrace_load32(uintptr_t); uint64_t dtrace_load64(uintptr_t); @@ -2124,7 +2146,7 @@ dtrace_speculation_t *spec; dtrace_buffer_t *src, *dest; uintptr_t daddr, saddr, dlimit; - dtrace_speculation_state_t current, new; + dtrace_speculation_state_t current, new = 0; intptr_t offs; if (which == 0) @@ -2260,7 +2282,7 @@ dtrace_specid_t which) { dtrace_speculation_t *spec; - dtrace_speculation_state_t current, new; + dtrace_speculation_state_t current, new = 0; dtrace_buffer_t *buf; if (which == 0) @@ -2422,7 +2444,7 @@ dtrace_specid_t which) { dtrace_speculation_t *spec; - dtrace_speculation_state_t current, new; + dtrace_speculation_state_t current, new = 0; dtrace_buffer_t *buf; if (which == 0) @@ -2794,19 +2816,22 @@ */ return ((uint64_t)curthread->t_procp->p_ppid); #else - return ((uint64_t)curproc->p_ppid); + return ((uint64_t)curproc->p_pptr->p_pid); #endif case DIF_VAR_TID: +#if defined(sun) /* * See comment in DIF_VAR_PID. */ if (DTRACE_ANCHORED(mstate->dtms_probe) && CPU_ON_INTR(CPU)) return (0); +#endif return ((uint64_t)curthread->t_tid); case DIF_VAR_EXECNAME: +#if defined(sun) if (!dtrace_priv_proc(state)) return (0); @@ -2825,6 +2850,9 @@ return (dtrace_dif_varstr( (uintptr_t)curthread->t_procp->p_user.u_comm, state, mstate)); +#else + return ((uint64_t)(uintptr_t) curthread->td_proc->p_comm); +#endif case DIF_VAR_ZONENAME: #if defined(sun) @@ -2854,11 +2882,13 @@ if (!dtrace_priv_proc(state)) return (0); +#if defined(sun) /* * See comment in DIF_VAR_PID. */ if (DTRACE_ANCHORED(mstate->dtms_probe) && CPU_ON_INTR(CPU)) return ((uint64_t)p0.p_cred->cr_uid); +#endif /* * It is always safe to dereference one's own t_procp pointer: @@ -2875,11 +2905,13 @@ if (!dtrace_priv_proc(state)) return (0); +#if defined(sun) /* * See comment in DIF_VAR_PID. */ if (DTRACE_ANCHORED(mstate->dtms_probe) && CPU_ON_INTR(CPU)) return ((uint64_t)p0.p_cred->cr_gid); +#endif /* * It is always safe to dereference one's own t_procp pointer: @@ -2893,6 +2925,7 @@ return ((uint64_t)curthread->t_procp->p_cred->cr_gid); case DIF_VAR_ERRNO: { +#if defined(sun) klwp_t *lwp; if (!dtrace_priv_proc(state)) return (0); @@ -2913,6 +2946,9 @@ return (0); return ((uint64_t)lwp->lwp_errno); +#else + return (0); +#endif } default: DTRACE_CPUFLAG_SET(CPU_DTRACE_ILLOP); @@ -2936,6 +2972,7 @@ volatile uintptr_t *illval = &cpu_core[curcpu].cpuc_dtrace_illval; dtrace_vstate_t *vstate = &state->dts_vstate; +#ifdef DOODAD union { mutex_impl_t mi; uint64_t mx; @@ -2945,6 +2982,7 @@ krwlock_t ri; uintptr_t rw; } r; +#endif switch (subr) { case DIF_SUBR_RAND: @@ -2952,6 +2990,8 @@ break; case DIF_SUBR_MUTEX_OWNED: +#ifdef DOODAD + union { if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t), mstate, vstate)) { regs[rd] = 0; @@ -2963,9 +3003,12 @@ regs[rd] = MUTEX_OWNER(&m.mi) != MUTEX_NO_OWNER; else regs[rd] = LOCK_HELD(&m.mi.m_spin.m_spinlock); +#endif break; case DIF_SUBR_MUTEX_OWNER: +#ifdef DOODAD + union { if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t), mstate, vstate)) { regs[rd] = 0; @@ -2978,9 +3021,12 @@ regs[rd] = (uintptr_t)MUTEX_OWNER(&m.mi); else regs[rd] = 0; +#endif break; case DIF_SUBR_MUTEX_TYPE_ADAPTIVE: +#ifdef DOODAD + union { if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t), mstate, vstate)) { regs[rd] = 0; @@ -2989,9 +3035,12 @@ m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_ADAPTIVE(&m.mi); +#endif break; case DIF_SUBR_MUTEX_TYPE_SPIN: +#ifdef DOODAD + union { if (!dtrace_canload(tupregs[0].dttk_value, sizeof (kmutex_t), mstate, vstate)) { regs[rd] = 0; @@ -3000,9 +3049,12 @@ m.mx = dtrace_load64(tupregs[0].dttk_value); regs[rd] = MUTEX_TYPE_SPIN(&m.mi); +#endif break; case DIF_SUBR_RW_READ_HELD: { +#ifdef DOODAD + union { uintptr_t tmp; if (!dtrace_canload(tupregs[0].dttk_value, sizeof (uintptr_t), @@ -3013,10 +3065,13 @@ r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_READ_HELD(&r.ri, tmp); +#endif break; } case DIF_SUBR_RW_WRITE_HELD: +#ifdef DOODAD + union { if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t), mstate, vstate)) { regs[rd] = 0; @@ -3025,9 +3080,12 @@ r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_WRITE_HELD(&r.ri); +#endif break; case DIF_SUBR_RW_ISWRITER: +#ifdef DOODAD + union { if (!dtrace_canload(tupregs[0].dttk_value, sizeof (krwlock_t), mstate, vstate)) { regs[rd] = 0; @@ -3036,6 +3094,7 @@ r.rw = dtrace_loadptr(tupregs[0].dttk_value); regs[rd] = _RW_ISWRITER(&r.ri); +#endif break; case DIF_SUBR_BCOPY: { @@ -3469,7 +3528,7 @@ uintptr_t tokaddr = tupregs[1].dttk_value; uint64_t size = state->dts_options[DTRACEOPT_STRSIZE]; uintptr_t limit, toklimit = tokaddr + size; - uint8_t c, tokmap[32]; /* 256 / 8 */ + uint8_t c = 0, tokmap[32]; /* 256 / 8 */ char *dest = (char *)mstate->dtms_scratch_ptr; int i; @@ -4421,7 +4480,7 @@ uint8_t cc_n = 0, cc_z = 0, cc_v = 0, cc_c = 0; int64_t cc_r; - uint_t pc = 0, id, opc; + uint_t pc = 0, id, opc = 0; uint8_t ttop = 0; dif_instr_t instr; uint_t r1, r2, rd; @@ -5296,8 +5355,8 @@ if (curthread->t_dtrace_sig == 0) curthread->t_dtrace_sig = (uint8_t)sig; +#ifdef DOODAD curthread->t_sig_check = 1; -#ifdef DOODAD aston(curthread); #endif } @@ -5310,8 +5369,8 @@ if (!curthread->t_dtrace_stop) { curthread->t_dtrace_stop = 1; +#ifdef DOODAD curthread->t_sig_check = 1; -#ifdef DOODAD aston(curthread); #endif } @@ -5320,12 +5379,14 @@ static void dtrace_action_chill(dtrace_mstate_t *mstate, hrtime_t val) { +#ifdef DOODAD hrtime_t now; volatile uint16_t *flags; #if defined(sun) cpu_t *cpu = CPU; #else - cpu_t *cpu = pcpu_find(curcpu); + cpu_t *c = &solaris_cpu[curcpu]; + struct pcpu *cpu = pcpu_find(curcpu); #endif if (dtrace_destructive_disallow) @@ -5364,6 +5425,7 @@ */ mstate->dtms_present &= ~DTRACE_MSTATE_TIMESTAMP; cpu->cpu_dtrace_chilled += val; +#endif } static void @@ -5502,6 +5564,7 @@ volatile uint16_t *flags; hrtime_t now; +#if defined(sun) /* * Kick out immediately if this CPU is still being born (in which case * curthread will be set to -1) or the current thread can't allow @@ -5509,6 +5572,7 @@ */ if (((uintptr_t)curthread & 1) || (curthread->t_flag & T_DONTDTRACE)) return; +#endif cookie = dtrace_interrupt_disable(); probe = dtrace_probes[id - 1]; @@ -5572,11 +5636,7 @@ * arguments to aggregating actions, one iteration of the * action loop will use the last iteration's value. */ -#ifdef lint uint64_t val = 0; -#else - uint64_t val; -#endif mstate.dtms_present = DTRACE_MSTATE_ARGS | DTRACE_MSTATE_PROBE; *flags &= ~CPU_DTRACE_ERROR; @@ -6382,6 +6442,7 @@ { uint32_t priv; +#if defined(sun) if (cr == NULL || PRIV_POLICY_ONLY(cr, PRIV_ALL, B_FALSE)) { /* * For DTRACE_PRIV_ALL, the uid and zoneid don't matter. @@ -6403,6 +6464,9 @@ if (PRIV_POLICY_ONLY(cr, PRIV_PROC_ZONE, B_FALSE)) priv |= DTRACE_PRIV_ZONEOWNER; } +#else + priv = DTRACE_PRIV_ALL; +#endif *privp = priv; } @@ -7446,6 +7510,7 @@ } while (all && (prv = prv->dtpv_next) != NULL); } +#if defined(sun) /* * Iterate over each probe, and call the Framework-to-Provider API function * denoted by offs. @@ -7486,6 +7551,7 @@ dtrace_interrupt_enable(cookie); } +#endif static int dtrace_probe_enable(dtrace_probedesc_t *desc, dtrace_enabling_t *enab) @@ -7657,6 +7723,7 @@ dtrace_enabling_matchall(); } +#if defined(sun) static void dtrace_helper_provider_remove_one(dof_helper_t *dhp, dof_sec_t *sec, pid_t pid) { @@ -7704,6 +7771,7 @@ dtrace_helper_provider_remove_one(dhp, sec, pid); } } +#endif /* * DTrace Meta Provider-to-Framework API Functions @@ -8243,6 +8311,7 @@ return (err); } +#if defined(sun) /* * Validate a DTrace DIF object that it is to be used as a helper. Helpers * are much more constrained than normal DIFOs. Specifically, they may @@ -8397,6 +8466,7 @@ return (err); } +#endif /* * Returns 1 if the expression in the DIF object can be cached on a per-thread @@ -8482,7 +8552,7 @@ static void dtrace_difo_chunksize(dtrace_difo_t *dp, dtrace_vstate_t *vstate) { - uint64_t sval; + uint64_t sval = 0; dtrace_key_t tupregs[DIF_DTR_NREGS + 2]; /* +2 for thread and id */ const dif_instr_t *text = dp->dtdo_buf; uint_t pc, srd = 0; @@ -8496,7 +8566,7 @@ uint_t rd = DIF_INSTR_RD(instr); uint_t r1 = DIF_INSTR_R1(instr); uint_t nkeys = 0; - uchar_t scope; + uchar_t scope = 0; dtrace_key_t *key = tupregs; @@ -8625,10 +8695,10 @@ for (i = 0; i < dp->dtdo_varlen; i++) { dtrace_difv_t *v = &dp->dtdo_vartab[i]; - dtrace_statvar_t *svar, ***svarp; + dtrace_statvar_t *svar, ***svarp = NULL; size_t dsize = 0; uint8_t scope = v->dtdv_scope; - int *np; + int *np = NULL; if ((id = v->dtdv_id) < DIF_VAR_OTHER_UBASE) continue; @@ -8727,6 +8797,7 @@ dtrace_difo_hold(dp); } +#if defined(sun) static dtrace_difo_t * dtrace_difo_duplicate(dtrace_difo_t *dp, dtrace_vstate_t *vstate) { @@ -8770,6 +8841,7 @@ dtrace_difo_init(new, vstate); return (new); } +#endif static void dtrace_difo_destroy(dtrace_difo_t *dp, dtrace_vstate_t *vstate) @@ -8780,10 +8852,10 @@ for (i = 0; i < dp->dtdo_varlen; i++) { dtrace_difv_t *v = &dp->dtdo_vartab[i]; - dtrace_statvar_t *svar, **svarp; + dtrace_statvar_t *svar, **svarp = NULL; uint_t id; uint8_t scope = v->dtdv_scope; - int *np; + int *np = NULL; switch (scope) { case DIFV_SCOPE_THREAD: @@ -9476,7 +9548,7 @@ uint16_t format = 0; dtrace_recdesc_t *rec; dtrace_state_t *state = ecb->dte_state; - dtrace_optval_t *opt = state->dts_options, nframes, strsize; + dtrace_optval_t *opt = state->dts_options, nframes = 0, strsize; uint64_t arg = desc->dtad_arg; ASSERT(MUTEX_HELD(&dtrace_lock)); @@ -10061,7 +10133,11 @@ dtrace_buffer_alloc(dtrace_buffer_t *bufs, size_t size, int flags, processorid_t cpu) { +#if defined(sun) cpu_t *cp; +#else + struct pcpu *cp; +#endif dtrace_buffer_t *buf; #if defined(sun) @@ -11116,6 +11192,41 @@ return (dof); } +#if !defined(sun) +static __inline uchar_t +dtrace_dof_char(char c) { + switch (c) { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + return (c - '0'); + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + return (c - 'A' + 10); + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + return (c - 'a' + 10); + } + /* Should not reach here. */ + return (0); +} +#endif + static dof_hdr_t * dtrace_dof_property(const char *name) { @@ -11133,39 +11244,71 @@ if (ddi_prop_lookup_int_array(DDI_DEV_T_ANY, dtrace_devi, 0, (char *)name, (int **)&buf, &len) != DDI_PROP_SUCCESS) return (NULL); -#endif for (i = 0; i < len; i++) buf[i] = (uchar_t)(((int *)buf)[i]); if (len < sizeof (dof_hdr_t)) { -#if defined(sun) ddi_prop_free(buf); -#endif dtrace_dof_error(NULL, "truncated header"); return (NULL); } if (len < (loadsz = ((dof_hdr_t *)buf)->dofh_loadsz)) { -#if defined(sun) ddi_prop_free(buf); -#endif dtrace_dof_error(NULL, "truncated DOF"); return (NULL); } if (loadsz >= dtrace_dof_maxsize) { -#if defined(sun) ddi_prop_free(buf); -#endif dtrace_dof_error(NULL, "oversized DOF"); return (NULL); } dof = kmem_alloc(loadsz, KM_SLEEP); bcopy(buf, dof, loadsz); -#if defined(sun) ddi_prop_free(buf); +#else + char *p; + char *p_env; + + if ((p_env = getenv(name)) == NULL) + return (NULL); + + len = strlen(p_env) / 2; + + buf = kmem_alloc(len, KM_SLEEP); + + dof = (dof_hdr_t *) buf; + + p = p_env; + + for (i = 0; i < len; i++) { + buf[i] = (dtrace_dof_char(p[0]) << 4) | + dtrace_dof_char(p[1]); + p += 2; + } + + freeenv(p_env); + + if (len < sizeof (dof_hdr_t)) { + free(buf, M_DTRACE); + dtrace_dof_error(NULL, "truncated header"); + return (NULL); + } + + if (len < (loadsz = dof->dofh_loadsz)) { + free(buf, M_DTRACE); + dtrace_dof_error(NULL, "truncated DOF"); + return (NULL); + } + + if (loadsz >= dtrace_dof_maxsize) { + free(buf, M_DTRACE); + dtrace_dof_error(NULL, "oversized DOF"); + return (NULL); + } #endif return (dof); @@ -11976,7 +12119,7 @@ /* * DTrace Consumer State Functions */ -int +static int dtrace_dstate_init(dtrace_dstate_t *dstate, size_t size) { size_t hashsize, maxper, min, chunksize = dstate->dtds_chunksize; @@ -12078,7 +12221,7 @@ return (0); } -void +static void dtrace_dstate_fini(dtrace_dstate_t *dstate) { ASSERT(MUTEX_HELD(&cpu_lock)); @@ -12153,7 +12296,7 @@ state->dts_alive = now; } -dtrace_state_t * +static dtrace_state_t * #if defined(sun) dtrace_state_create(dev_t *devp, cred_t *cr) #else @@ -12389,7 +12532,7 @@ dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which) { dtrace_optval_t *opt = state->dts_options, size; - processorid_t cpu; + processorid_t cpu = 0;; int flags = 0, rval; ASSERT(MUTEX_HELD(&dtrace_lock)); @@ -13131,6 +13274,7 @@ } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:49:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D05516A421; Sun, 30 Dec 2007 02:49: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 32AA716A417 for ; Sun, 30 Dec 2007 02:49:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A65313C465 for ; Sun, 30 Dec 2007 02:49:34 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2nXfF075692 for ; Sun, 30 Dec 2007 02:49:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2nX2w075689 for perforce@freebsd.org; Sun, 30 Dec 2007 02:49:33 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:49:33 GMT Message-Id: <200712300249.lBU2nX2w075689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132010 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:49:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=132010 Change 132010 by jb@jb_freebsd1 on 2007/12/30 02:48:38 Add the opensolaris module load/unload/init source. This is where the global variables live. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:51:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5511216A420; Sun, 30 Dec 2007 02:51: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 1B0E416A419 for ; Sun, 30 Dec 2007 02:51:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0B86D13C442 for ; Sun, 30 Dec 2007 02:51:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2pZSD076413 for ; Sun, 30 Dec 2007 02:51:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2pZIU076409 for perforce@freebsd.org; Sun, 30 Dec 2007 02:51:35 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:51:35 GMT Message-Id: <200712300251.lBU2pZIU076409@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132011 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:51:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=132011 Change 132011 by jb@jb_freebsd1 on 2007/12/30 02:50:45 gcc doesn't like inlined functions containing varargs. The code was ZFS specific too. We'll have a proper (OpenSolaris compatible) function in the opensolaris module that we can all share and live happily ever after together with. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cmn_err.h#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cmn_err.h#2 (text+ko) ==== @@ -44,44 +44,7 @@ #define CE_PANIC 3 /* panic */ #define CE_IGNORE 4 /* print nothing */ -static __inline void -vcmn_err(int ce, const char *fmt, va_list adx) -{ - char buf[256]; - - switch (ce) { - case CE_CONT: - snprintf(buf, sizeof(buf), "ZFS(cont): %s\n", fmt); - break; - case CE_NOTE: - snprintf(buf, sizeof(buf), "ZFS: NOTICE: %s\n", fmt); - break; - case CE_WARN: - snprintf(buf, sizeof(buf), "ZFS: WARNING: %s\n", fmt); - break; - case CE_PANIC: - snprintf(buf, sizeof(buf), "ZFS(panic): %s\n", fmt); - break; - case CE_IGNORE: - break; - default: - panic("unknown severity level"); - } - if (ce != CE_IGNORE) - vprintf(buf, adx); - if (ce == CE_PANIC) - panic("ZFS"); -} - -static __inline void -cmn_err(int ce, const char *fmt, ...) -{ - va_list adx; - - va_start(adx, fmt); - vcmn_err(ce, fmt, adx); - va_end(adx); -} +void cmn_err(int, const char *, ...); #ifdef __cplusplus } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:52:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A740116A420; Sun, 30 Dec 2007 02:52:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60D6D16A417 for ; Sun, 30 Dec 2007 02:52:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 38D1B13C467 for ; Sun, 30 Dec 2007 02:52:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2qbIF076868 for ; Sun, 30 Dec 2007 02:52:37 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2qbO6076864 for perforce@freebsd.org; Sun, 30 Dec 2007 02:52:37 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:52:37 GMT Message-Id: <200712300252.lBU2qbO6076864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132012 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:52:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=132012 Change 132012 by jb@jb_freebsd1 on 2007/12/30 02:52:08 Add an OpenSolaris compatible error function for the opensolaris module that all other OpenSolaris derived kernel modules can share. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_cmn_err.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:53:39 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EEFE316A498; Sun, 30 Dec 2007 02:53: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 B1CAA16A468 for ; Sun, 30 Dec 2007 02:53:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 89C9713C45D for ; Sun, 30 Dec 2007 02:53:38 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2rcpv077846 for ; Sun, 30 Dec 2007 02:53:38 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2rcj3077842 for perforce@freebsd.org; Sun, 30 Dec 2007 02:53:38 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:53:38 GMT Message-Id: <200712300253.lBU2rcj3077842@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132014 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:53:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=132014 Change 132014 by jb@jb_freebsd1 on 2007/12/30 02:53:32 Remove the DTrace specific common error function. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/cmn_err.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 02:59:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CADA816A419; Sun, 30 Dec 2007 02:59: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 909C216A417 for ; Sun, 30 Dec 2007 02:59:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 80A9813C455 for ; Sun, 30 Dec 2007 02:59:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU2xj9m079395 for ; Sun, 30 Dec 2007 02:59:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU2xjJJ079392 for perforce@freebsd.org; Sun, 30 Dec 2007 02:59:45 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 02:59:45 GMT Message-Id: <200712300259.lBU2xjJJ079392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 02:59:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=132015 Change 132015 by jb@jb_freebsd1 on 2007/12/30 02:59:24 Some OpenSolaris code uses vcmn_err() so make it non-static and add a prototype for it. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_cmn_err.c#2 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cmn_err.h#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_cmn_err.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ #include -static void +void vcmn_err(int ce, const char *fmt, va_list adx) { char buf[256]; ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cmn_err.h#3 (text+ko) ==== @@ -45,6 +45,7 @@ #define CE_IGNORE 4 /* print nothing */ void cmn_err(int, const char *, ...); +void vcmn_err(int, const char *, va_list); #ifdef __cplusplus } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 03:35:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4006416A420; Sun, 30 Dec 2007 03:35: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 05E6916A41A for ; Sun, 30 Dec 2007 03:35:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EA6C113C45D for ; Sun, 30 Dec 2007 03:35:22 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU3ZMi2095227 for ; Sun, 30 Dec 2007 03:35:22 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU3ZMXw095220 for perforce@freebsd.org; Sun, 30 Dec 2007 03:35:22 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 03:35:22 GMT Message-Id: <200712300335.lBU3ZMXw095220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132017 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 03:35:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=132017 Change 132017 by jb@jb_freebsd1 on 2007/12/30 03:35:03 Move the atomic stuff from zfs here. Affected files ... .. //depot/projects/dtrace/src/sys/modules/opensolaris/Makefile#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/opensolaris/Makefile#2 (text+ko) ==== @@ -4,8 +4,15 @@ KMOD= opensolaris SRCS= opensolaris.c \ - opensolaris_atomic.c \ + opensolaris_cmn_err.c \ opensolaris_kmem.c + +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" +.PATH: ${.CURDIR}/../../contrib/opensolaris/common/atomic/${MACHINE_ARCH} +SRCS+= atomic.S +.else +SRCS+= opensolaris_atomic.c +.endif CFLAGS+= -I${.CURDIR}/../../compat/opensolaris \ -I${.CURDIR}/../../contrib/opensolaris/uts/common \ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 03:37:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3CBF16A41A; Sun, 30 Dec 2007 03:37: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 6971A16A418 for ; Sun, 30 Dec 2007 03:37:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3D82713C478 for ; Sun, 30 Dec 2007 03:37:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU3bPqb095619 for ; Sun, 30 Dec 2007 03:37:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU3bPBB095616 for perforce@freebsd.org; Sun, 30 Dec 2007 03:37:25 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 03:37:25 GMT Message-Id: <200712300337.lBU3bPBB095616@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132018 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 03:37:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=132018 Change 132018 by jb@jb_freebsd1 on 2007/12/30 03:36:35 The cpu_lock is now defined in a header and part of the opensolaris module. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/kern/cyclic_test.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/kern/cyclic_test.c#2 (text+ko) ==== @@ -36,8 +36,6 @@ #include #include -extern kmutex_t cpu_lock; - static struct timespec test_001_start; static void From owner-p4-projects@FreeBSD.ORG Sun Dec 30 04:22:14 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 066D616A4A9; Sun, 30 Dec 2007 04:22:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F7D216A4BF for ; Sun, 30 Dec 2007 04:22:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 175FB13C468 for ; Sun, 30 Dec 2007 04:22:13 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU4MCNb013040 for ; Sun, 30 Dec 2007 04:22:12 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU4MCfX013037 for perforce@freebsd.org; Sun, 30 Dec 2007 04:22:12 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 04:22:12 GMT Message-Id: <200712300422.lBU4MCfX013037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132021 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 04:22:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=132021 Change 132021 by jb@jb_freebsd1 on 2007/12/30 04:21:48 Hook the DTrace modules back into the build. Only on amd64 for now. Affected files ... .. //depot/projects/dtrace/src/sys/modules/Makefile#34 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/Makefile#34 (text+ko) ==== @@ -74,6 +74,7 @@ ${_digi} \ ${_dpt} \ ${_drm} \ + ${_dtrace} \ dummynet \ ${_ed} \ ${_elink} \ @@ -511,6 +512,7 @@ _cyclic_test= cyclic_test _digi= digi _drm= drm +_dtrace= dtrace _ed= ed _em= em _exca= exca From owner-p4-projects@FreeBSD.ORG Sun Dec 30 04:24:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DEA716A46E; Sun, 30 Dec 2007 04:24: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 79D1616A47B for ; Sun, 30 Dec 2007 04:24:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C36B13C478 for ; Sun, 30 Dec 2007 04:24:15 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU4OF5s014034 for ; Sun, 30 Dec 2007 04:24:15 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU4OFTa014031 for perforce@freebsd.org; Sun, 30 Dec 2007 04:24:15 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 04:24:15 GMT Message-Id: <200712300424.lBU4OFTa014031@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132022 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 04:24:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=132022 Change 132022 by jb@jb_freebsd1 on 2007/12/30 04:23:17 Just build the main dtrace module for now. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#18 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/Makefile#18 (text+ko) ==== @@ -3,8 +3,9 @@ .include .include "Makefile.inc" -SUBDIR= dtrace \ - profile \ +SUBDIR= dtrace + +XXX= profile \ systrace .if ${MACHINE_ARCH} == "i386" From owner-p4-projects@FreeBSD.ORG Sun Dec 30 05:03:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A04F16A41A; Sun, 30 Dec 2007 05:03: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 12F1016A419 for ; Sun, 30 Dec 2007 05:03:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 02FDA13C45B for ; Sun, 30 Dec 2007 05:03:56 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU53tES041402 for ; Sun, 30 Dec 2007 05:03:55 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU53tYX041398 for perforce@freebsd.org; Sun, 30 Dec 2007 05:03:55 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 30 Dec 2007 05:03:55 GMT Message-Id: <200712300503.lBU53tYX041398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132023 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 05:03:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=132023 Change 132023 by kmacy@pandemonium:kmacy:xen31 on 2007/12/30 05:02:56 no need to use spin locks - switch to MTX_DEF Affected files ... .. //depot/projects/xen31/sys/dev/xen/console/console.c#3 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/console/console.c#3 (text+ko) ==== @@ -76,9 +76,9 @@ #define XCUNIT(x) (minor(x)) #define ISTTYOPEN(tp) ((tp) && ((tp)->t_state & TS_ISOPEN)) #define CN_LOCK_INIT(x, _name) \ - mtx_init(&x, _name, _name, MTX_SPIN) -#define CN_LOCK(l, f) mtx_lock_irqsave(&(l), (f)) -#define CN_UNLOCK(l, f) mtx_unlock_irqrestore(&(l), (f)) + mtx_init(&x, _name, NULL, MTX_DEF) +#define CN_LOCK(l) mtx_lock(&(l)) +#define CN_UNLOCK(l) mtx_unlock(&(l)) #define CN_LOCK_ASSERT(x) mtx_assert(&x, MA_OWNED) #define CN_LOCK_DESTROY(x) mtx_destroy(&x) @@ -146,24 +146,22 @@ xccncheckc(struct consdev *dev) { int ret = (xc_mute ? 0 : -1); - int flags; - CN_LOCK(cn_mtx, flags); + CN_LOCK(cn_mtx); if ((rp - rc)) { /* we need to return only one char */ ret = (int)rbuf[RBUF_MASK(rc)]; rc++; } - CN_UNLOCK(cn_mtx, flags); + CN_UNLOCK(cn_mtx); return(ret); } static void xccnputc(struct consdev *dev, int c) { - int flags; - CN_LOCK(cn_mtx, flags); + CN_LOCK(cn_mtx); xcons_putc(c); - CN_UNLOCK(cn_mtx, flags); + CN_UNLOCK(cn_mtx); } static void @@ -284,17 +282,17 @@ void xencons_rx(char *buf, unsigned len) { - int i, flags; + int i; struct tty *tp = xccons; - CN_LOCK(cn_mtx, flags); + CN_LOCK(cn_mtx); for (i = 0; i < len; i++) { if (xen_console_up) (*linesw[tp->t_line]->l_rint)(buf[i], tp); else rbuf[RBUF_MASK(rp++)] = buf[i]; } - CN_UNLOCK(cn_mtx, flags); + CN_UNLOCK(cn_mtx); } static void @@ -325,10 +323,9 @@ void xencons_tx(void) { - unsigned long flags; - CN_LOCK(cn_mtx, flags); + CN_LOCK(cn_mtx); __xencons_tx_flush(); - CN_UNLOCK(cn_mtx, flags); + CN_UNLOCK(cn_mtx); } static void @@ -432,15 +429,14 @@ static void xcstart(struct tty *tp) { - int flags; int s; boolean_t cons_full = FALSE; s = spltty(); - CN_LOCK(cn_mtx, flags); + CN_LOCK(cn_mtx); if (tp->t_state & (TS_TIMEOUT | TS_TTSTOP)) { ttwwakeup(tp); - CN_UNLOCK(cn_mtx, flags); + CN_UNLOCK(cn_mtx); return; } @@ -456,7 +452,7 @@ /* let the timeout kick us in a bit */ xc_start_needed = TRUE; } - CN_UNLOCK(cn_mtx, flags); + CN_UNLOCK(cn_mtx); splx(s); } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 05:11:04 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A951616A41B; Sun, 30 Dec 2007 05:11:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F8CB16A419 for ; Sun, 30 Dec 2007 05:11:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4F06B13C43E for ; Sun, 30 Dec 2007 05:11:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU5B3KQ044329 for ; Sun, 30 Dec 2007 05:11:03 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU5B3nn044321 for perforce@freebsd.org; Sun, 30 Dec 2007 05:11:03 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 30 Dec 2007 05:11:03 GMT Message-Id: <200712300511.lBU5B3nn044321@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132024 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 05:11:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=132024 Change 132024 by kmacy@pandemonium:kmacy:xen31 on 2007/12/30 05:10:32 disable atpic on default XEN config Affected files ... .. //depot/projects/xen31/sys/conf/files.i386#11 edit .. //depot/projects/xen31/sys/i386/conf/DEFAULTS#4 edit .. //depot/projects/xen31/sys/i386/conf/XEN#2 edit .. //depot/projects/xen31/sys/i386/i386/machdep.c#9 edit .. //depot/projects/xen31/sys/i386/xen/exception.s#2 edit Differences ... ==== //depot/projects/xen31/sys/conf/files.i386#11 (text+ko) ==== @@ -328,6 +328,7 @@ i386/i386/uio_machdep.c standard i386/i386/vm86.c standard i386/i386/vm_machdep.c standard +i386/xen/xen_bus.c optional xen i386/ibcs2/ibcs2_errno.c optional ibcs2 i386/ibcs2/ibcs2_fcntl.c optional ibcs2 i386/ibcs2/ibcs2_ioctl.c optional ibcs2 @@ -347,7 +348,7 @@ i386/ibcs2/ibcs2_xenix.c optional ibcs2 i386/ibcs2/ibcs2_xenix_sysent.c optional ibcs2 i386/ibcs2/imgact_coff.c optional ibcs2 -i386/isa/atpic.c standard +i386/isa/atpic.c optional atpic #i386/isa/atpic_vector.s standard i386/isa/clock.c optional native i386/xen/clock.c optional xen ==== //depot/projects/xen31/sys/i386/conf/DEFAULTS#4 (text+ko) ==== @@ -15,6 +15,7 @@ # Pseudo devices. device mem # Memory and kernel memory devices device io # I/O device +device atpic # UART chips on this platform device uart_ns8250 ==== //depot/projects/xen31/sys/i386/conf/XEN#2 (text+ko) ==== @@ -145,7 +145,6 @@ device cardbus # CardBus (32-bit) bus # Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports device uart # Generic UART driver # Parallel port @@ -192,3 +191,4 @@ options XEN nooption NATIVE +nodevice atpic ==== //depot/projects/xen31/sys/i386/i386/machdep.c#9 (text+ko) ==== @@ -2307,7 +2307,9 @@ #ifdef DEV_ISA if (xen_start_info->flags & SIF_PRIVILEGED) { elcr_probe(); +#ifdef DEV_ATPIC atpic_startup(); +#endif } #endif ==== //depot/projects/xen31/sys/i386/xen/exception.s#2 (text+ko) ==== @@ -260,8 +260,10 @@ SUPERALIGN_TEXT MCOUNT_LABEL(bintr) +#ifdef DEV_ATPIC #include - +#endif + #ifdef DEV_APIC .data .p2align 4 From owner-p4-projects@FreeBSD.ORG Sun Dec 30 05:18:12 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 427F016A420; Sun, 30 Dec 2007 05:18: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 07D2316A419 for ; Sun, 30 Dec 2007 05:18:12 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB74F13C457 for ; Sun, 30 Dec 2007 05:18:11 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU5IBHB047607 for ; Sun, 30 Dec 2007 05:18:11 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU5IBvm047604 for perforce@freebsd.org; Sun, 30 Dec 2007 05:18:11 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 30 Dec 2007 05:18:11 GMT Message-Id: <200712300518.lBU5IBvm047604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132025 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 05:18:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=132025 Change 132025 by kmacy@pandemonium:kmacy:xen31 on 2007/12/30 05:17:47 update event channel code fix pic registration so that we actually get clock interrupts and console interrupts now next up - block device interrupts Affected files ... .. //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#4 edit .. //depot/projects/xen31/sys/dev/xen/console/xencons_ring.c#3 edit .. //depot/projects/xen31/sys/i386/include/xen/evtchn.h#3 edit .. //depot/projects/xen31/sys/i386/include/xen/xen-os.h#3 edit .. //depot/projects/xen31/sys/i386/include/xen/xen_intr.h#2 edit .. //depot/projects/xen31/sys/i386/xen/xen_bus.c#1 add .. //depot/projects/xen31/sys/xen/evtchn/evtchn.c#3 edit .. //depot/projects/xen31/sys/xen/xenbus/xenbus_comms.c#3 edit .. //depot/projects/xen31/sys/xen/xenbus/xenbus_xs.c#6 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#4 (text+ko) ==== @@ -378,11 +378,8 @@ } info->ring_ref = err; - err = xenbus_alloc_evtchn(dev, &info->evtchn); - if (err) - goto fail; - err = bind_evtchn_to_irqhandler(info->evtchn, "xbd", - (driver_intr_t *)blkif_int, + err = bind_listening_port_to_irqhandler(dev->otherend_id, + "xbd", (driver_intr_t *)blkif_int, info, INTR_TYPE_BIO | INTR_MPSAFE, NULL); if (err <= 0) { xenbus_dev_fatal(dev, err, @@ -421,7 +418,11 @@ break; case XenbusStateClosing: - panic("not implemented"); + if (info->users > 0) + xenbus_dev_error(dev, -EBUSY, + "Device in use; refusing to close"); + else + blkfront_closing(dev); #ifdef notyet bd = bdget(info->dev); if (bd == NULL) ==== //depot/projects/xen31/sys/dev/xen/console/xencons_ring.c#3 (text+ko) ==== @@ -101,7 +101,7 @@ if (!xen_start_info->console_evtchn) return 0; - err = bind_evtchn_to_irqhandler(xen_start_info->console_evtchn, + err = bind_caller_port_to_irqhandler(xen_start_info->console_evtchn, "xencons", handle_input, NULL, INTR_TYPE_MISC | INTR_MPSAFE, NULL); if (err) { ==== //depot/projects/xen31/sys/i386/include/xen/evtchn.h#3 (text+ko) ==== ==== //depot/projects/xen31/sys/i386/include/xen/xen-os.h#3 (text+ko) ==== @@ -118,15 +118,16 @@ preempt_enable_no_resched(); \ } while (0) - +/* + * Add critical_{enter, exit}? + * + */ #define __save_and_cli(x) \ do { \ vcpu_info_t *_vcpu; \ - preempt_disable(); \ _vcpu = &HYPERVISOR_shared_info->vcpu_info[smp_processor_id()]; \ (x) = _vcpu->evtchn_upcall_mask; \ _vcpu->evtchn_upcall_mask = 1; \ - preempt_enable_no_resched(); \ barrier(); \ } while (0) ==== //depot/projects/xen31/sys/i386/include/xen/xen_intr.h#2 (text+ko) ==== @@ -30,12 +30,25 @@ extern void unbind_from_irq(int irq); extern void bind_evtchn_to_cpu(unsigned int chn, unsigned int cpu); -extern int bind_evtchn_to_irqhandler(unsigned int evtchn, const char *devname, - driver_intr_t handler, void *arg, unsigned long irqflags, void **cookiep); +extern int bind_caller_port_to_irqhandler(unsigned int caller_port, + const char *devname, driver_intr_t handler, void *arg, + unsigned long irqflags, void **cookiep); +extern int bind_listening_port_to_irqhandler(unsigned int remote_domain, + const char *devname, driver_intr_t handler, void *arg, unsigned long irqflags, + void **cookiep); extern int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, const char *devname, driver_filter_t filter, driver_intr_t handler, unsigned long irqflags); extern int bind_ipi_to_irqhandler(unsigned int ipi, unsigned int cpu, const char *devname, driver_intr_t handler, unsigned long irqflags); +extern int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain, + unsigned int remote_port, + const char *devname, + driver_filter_t filter, + driver_intr_t handler, + unsigned long irqflags); + + + extern void unbind_from_irqhandler(unsigned int evtchn, void *dev_id); static __inline__ int irq_cannonicalize(int irq) { ==== //depot/projects/xen31/sys/xen/evtchn/evtchn.c#3 (text+ko) ==== @@ -82,10 +82,6 @@ struct xenpic_intsrc xp_pins[0]; }; - - - - #define TODO printf("%s: not implemented!\n", __func__) /* IRQ <-> event-channel mappings. */ @@ -94,7 +90,15 @@ /* Packed IRQ information: binding type, sub-type index, and event channel. */ static uint32_t irq_info[NR_IRQS]; /* Binding types. */ -enum { IRQT_UNBOUND, IRQT_PIRQ, IRQT_VIRQ, IRQT_IPI, IRQT_EVTCHN }; +enum { + IRQT_UNBOUND, + IRQT_PIRQ, + IRQT_VIRQ, + IRQT_IPI, + IRQT_LOCAL_PORT, + IRQT_CALLER_PORT +}; + /* Constructor for packed IRQ information. */ #define mk_irq_info(type, index, evtchn) \ (((uint32_t)(type) << 24) | ((uint32_t)(index) << 16) | (uint32_t)(evtchn)) @@ -227,25 +231,82 @@ return irq; } -static int -bind_evtchn_to_irq(unsigned int evtchn) +static int +bind_caller_port_to_irq(unsigned int caller_port) +{ + int irq; + + mtx_lock_spin(&irq_mapping_update_lock); + + if ((irq = evtchn_to_irq[caller_port]) == -1) { + if ((irq = find_unbound_irq()) < 0) + goto out; + + evtchn_to_irq[caller_port] = irq; + irq_info[irq] = mk_irq_info(IRQT_CALLER_PORT, 0, caller_port); + } + + irq_bindcount[irq]++; + + out: + mtx_unlock_spin(&irq_mapping_update_lock); + return irq; +} + +static int +bind_local_port_to_irq(unsigned int local_port) +{ + int irq; + + mtx_lock_spin(&irq_mapping_update_lock); + + PANIC_IF(evtchn_to_irq[local_port] != -1); + + if ((irq = find_unbound_irq()) < 0) { + struct evtchn_close close = { .port = local_port }; + PANIC_IF(HYPERVISOR_event_channel_op(EVTCHNOP_close, &close)); + + goto out; + } + + evtchn_to_irq[local_port] = irq; + irq_info[irq] = mk_irq_info(IRQT_LOCAL_PORT, 0, local_port); + irq_bindcount[irq]++; + + out: + mtx_unlock_spin(&irq_mapping_update_lock); + return irq; +} + +static int +bind_listening_port_to_irq(unsigned int remote_domain) +{ + struct evtchn_alloc_unbound alloc_unbound; + int err; + + alloc_unbound.dom = DOMID_SELF; + alloc_unbound.remote_dom = remote_domain; + + err = HYPERVISOR_event_channel_op(EVTCHNOP_alloc_unbound, + &alloc_unbound); + + return err ? : bind_local_port_to_irq(alloc_unbound.port); +} + +static int +bind_interdomain_evtchn_to_irq(unsigned int remote_domain, + unsigned int remote_port) { - int irq; + struct evtchn_bind_interdomain bind_interdomain; + int err; - mtx_lock_spin(&irq_mapping_update_lock); - - if ((irq = evtchn_to_irq[evtchn]) == -1) { - irq = find_unbound_irq(); - evtchn_to_irq[evtchn] = irq; - irq_info[irq] = mk_irq_info(IRQT_EVTCHN, 0, evtchn); - } + bind_interdomain.remote_dom = remote_domain; + bind_interdomain.remote_port = remote_port; - irq_bindcount[irq]++; - intr_register_source(&xp->xp_pins[irq].xp_intsrc); + err = HYPERVISOR_event_channel_op(EVTCHNOP_bind_interdomain, + &bind_interdomain); - mtx_unlock_spin(&irq_mapping_update_lock); - - return irq; + return err ? : bind_local_port_to_irq(bind_interdomain.local_port); } static int @@ -348,7 +409,30 @@ } int -bind_evtchn_to_irqhandler(unsigned int evtchn, +bind_caller_port_to_irqhandler(unsigned int caller_port, + const char *devname, + driver_intr_t handler, + void *arg, + unsigned long irqflags, + void **cookiep) +{ + unsigned int irq; + int retval; + + irq = bind_caller_port_to_irq(caller_port); + intr_register_source(&xp->xp_pins[irq].xp_intsrc); + retval = intr_add_handler(devname, irq, NULL, handler, arg, irqflags, cookiep); + if (retval != 0) { + unbind_from_irq(irq); + return -retval; + } + + return irq; +} + +int +bind_listening_port_to_irqhandler( + unsigned int remote_domain, const char *devname, driver_intr_t handler, void *arg, @@ -358,7 +442,7 @@ unsigned int irq; int retval; - irq = bind_evtchn_to_irq(evtchn); + irq = bind_listening_port_to_irq(remote_domain); intr_register_source(&xp->xp_pins[irq].xp_intsrc); retval = intr_add_handler(devname, irq, NULL, handler, arg, irqflags, cookiep); if (retval != 0) { @@ -370,6 +454,29 @@ } int +bind_interdomain_evtchn_to_irqhandler( + unsigned int remote_domain, + unsigned int remote_port, + const char *devname, + driver_filter_t filter, + driver_intr_t handler, + unsigned long irqflags) +{ + unsigned int irq; + int retval; + + irq = bind_interdomain_evtchn_to_irq(remote_domain, remote_port); + intr_register_source(&xp->xp_pins[irq].xp_intsrc); + retval = intr_add_handler(devname, irq, filter, handler, NULL, irqflags, NULL); + if (retval != 0) { + unbind_from_irq(irq); + return -retval; + } + + return irq; +} + +int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu, const char *devname, @@ -405,13 +512,14 @@ retval = intr_add_handler(devname, irq, NULL, handler, NULL, irqflags, NULL); if (retval != 0) { unbind_from_irq(irq); - return retval; + return -retval; } return irq; } -void unbind_from_irqhandler(unsigned int irq, void *dev_id) +void +unbind_from_irqhandler(unsigned int irq, void *dev_id) { if (dev_id) intr_remove_handler(dev_id); /* XXX */ @@ -420,7 +528,8 @@ #if 0 /* Rebind an evtchn so that it gets delivered to a specific cpu */ -static void rebind_irq_to_cpu(unsigned irq, unsigned tcpu) +static void +rebind_irq_to_cpu(unsigned irq, unsigned tcpu) { evtchn_op_t op = { .cmd = EVTCHNOP_bind_vcpu }; int evtchn; @@ -789,14 +898,14 @@ return; } - synch_clear_bit(port, &s->evtchn_mask[0]); + synch_clear_bit(port, &s->evtchn_mask); /* * The following is basically the equivalent of 'hw_resend_irq'. Just * like a real IO-APIC we 'lose the interrupt edge' if the channel is * masked. */ - if (synch_test_bit(port, &s->evtchn_pending[0]) && + if (synch_test_bit(port, &s->evtchn_pending) && !synch_test_and_set_bit(port / BITS_PER_LONG, &vcpu_info->evtchn_pending_sel)) { vcpu_info->evtchn_upcall_pending = 1; @@ -912,6 +1021,13 @@ xp->xp_numintr = NR_IRQS; bzero(xp->xp_pins, sizeof(struct xenpic_intsrc) * NR_IRQS); + + /* We need to register our PIC's beforehand */ + if (intr_register_pic(&xenpic_pirq_template)) + panic("XEN: intr_register_pic() failure"); + if (intr_register_pic(&xenpic_dynirq_template)) + panic("XEN: intr_register_pic() failure"); + /* * Initialize the dynamic IRQ's - we initialize the structures, but * we do not bind them (bind_evtchn_to_irqhandle() does this) @@ -924,14 +1040,9 @@ tpin = &pin[dynirq_to_irq(i)]; tpin->xp_intsrc.is_pic = xp->xp_dynirq_pic; tpin->xp_vector = dynirq_to_irq(i); + + intr_register_source(&tpin->xp_intsrc); } - - /* We need to register our PIC's beforehand */ - if (intr_register_pic(&xenpic_pirq_template)) - panic("XEN: intr_register_pic() failure"); - if (intr_register_pic(&xenpic_dynirq_template)) - panic("XEN: intr_register_pic() failure"); - /* * Now, we go ahead and claim every PIRQ there is. */ ==== //depot/projects/xen31/sys/xen/xenbus/xenbus_comms.c#3 (text+ko) ==== @@ -194,7 +194,7 @@ if (xenbus_irq) unbind_from_irqhandler(xenbus_irq, &xb_waitq); - err = bind_evtchn_to_irqhandler( + err = bind_caller_port_to_irqhandler( xen_start_info->store_evtchn, "xenbus", wake_waiting, NULL, INTR_TYPE_NET, NULL); if (err <= 0) { printk("XENBUS request irq failed %i\n", err); ==== //depot/projects/xen31/sys/xen/xenbus/xenbus_xs.c#6 (text+ko) ==== @@ -145,12 +145,12 @@ char *body; int i; - if (HYPERVISOR_shared_info->evtchn_mask[curcpu] & 1) { + if (HYPERVISOR_shared_info->evtchn_mask[curcpu] & 0x2) { /* * Give other domain time to run :-/ */ - for (i = 0; i < 1000; i++) - HYPERVISOR_sched_op(SCHEDOP_yield, NULL); + for (i = 0; i < 5000; i++) + HYPERVISOR_yield(); xs_process_msg(); } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:16:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1AB416A41A; Sun, 30 Dec 2007 07:16:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B48DE16A419 for ; Sun, 30 Dec 2007 07:16:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8BF6713C43E for ; Sun, 30 Dec 2007 07:16:14 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7GEMi094417 for ; Sun, 30 Dec 2007 07:16:14 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7GEr0094414 for perforce@freebsd.org; Sun, 30 Dec 2007 07:16:14 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:16:14 GMT Message-Id: <200712300716.lBU7GEr0094414@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132046 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:16:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=132046 Change 132046 by jb@jb_freebsd1 on 2007/12/30 07:16:03 Add amd64 specific sources. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#1 add .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#1 add .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:18:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2724916A468; Sun, 30 Dec 2007 07:18:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0C8D16A41A for ; Sun, 30 Dec 2007 07:18:18 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CF30313C459 for ; Sun, 30 Dec 2007 07:18:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7IH4Y094498 for ; Sun, 30 Dec 2007 07:18:17 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7IHxn094495 for perforce@freebsd.org; Sun, 30 Dec 2007 07:18:17 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:18:17 GMT Message-Id: <200712300718.lBU7IHxn094495@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132048 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:18:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=132048 Change 132048 by jb@jb_freebsd1 on 2007/12/30 07:18:01 Some definitions that need to be included in asm code are handled more cleanly in a separate header. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpuvar.h#5 edit .. //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpuvar_defs.h#1 add Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/sys/cpuvar.h#5 (text+ko) ==== @@ -28,6 +28,7 @@ #define _COMPAT_OPENSOLARIS_SYS_CPUVAR_H #include +#include #ifdef _KERNEL @@ -66,6 +67,8 @@ } cpu_core_t; extern cpu_core_t cpu_core[]; + +extern kmutex_t cpu_lock; #endif /* _KERNEL */ /* @@ -109,34 +112,6 @@ #define CPU_SPARE 0x100 /* CPU offline available for use */ #define CPU_FAULTED 0x200 /* CPU offline diagnosed faulty */ -/* - * DTrace flags. - */ -#define CPU_DTRACE_NOFAULT 0x0001 /* Don't fault */ -#define CPU_DTRACE_DROP 0x0002 /* Drop this ECB */ -#define CPU_DTRACE_BADADDR 0x0004 /* DTrace fault: bad address */ -#define CPU_DTRACE_BADALIGN 0x0008 /* DTrace fault: bad alignment */ -#define CPU_DTRACE_DIVZERO 0x0010 /* DTrace fault: divide by zero */ -#define CPU_DTRACE_ILLOP 0x0020 /* DTrace fault: illegal operation */ -#define CPU_DTRACE_NOSCRATCH 0x0040 /* DTrace fault: out of scratch */ -#define CPU_DTRACE_KPRIV 0x0080 /* DTrace fault: bad kernel access */ -#define CPU_DTRACE_UPRIV 0x0100 /* DTrace fault: bad user access */ -#define CPU_DTRACE_TUPOFLOW 0x0200 /* DTrace fault: tuple stack overflow */ -#if defined(__sparc) -#define CPU_DTRACE_FAKERESTORE 0x0400 /* pid provider hint to getreg */ -#endif -#define CPU_DTRACE_ENTRY 0x0800 /* pid provider hint to ustack() */ -#define CPU_DTRACE_BADSTACK 0x1000 /* DTrace fault: bad stack */ - -#define CPU_DTRACE_FAULT (CPU_DTRACE_BADADDR | CPU_DTRACE_BADALIGN | \ - CPU_DTRACE_DIVZERO | CPU_DTRACE_ILLOP | \ - CPU_DTRACE_NOSCRATCH | CPU_DTRACE_KPRIV | \ - CPU_DTRACE_UPRIV | CPU_DTRACE_TUPOFLOW | \ - CPU_DTRACE_BADSTACK) -#define CPU_DTRACE_ERROR (CPU_DTRACE_FAULT | CPU_DTRACE_DROP) - -extern kmutex_t cpu_lock; - typedef enum { CPU_INIT, CPU_CONFIG, From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:20:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9FC216A420; Sun, 30 Dec 2007 07:20:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7F3DB16A417 for ; Sun, 30 Dec 2007 07:20:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E44713C478 for ; Sun, 30 Dec 2007 07:20:19 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7KJEi094890 for ; Sun, 30 Dec 2007 07:20:19 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7KJXb094886 for perforce@freebsd.org; Sun, 30 Dec 2007 07:20:19 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:20:19 GMT Message-Id: <200712300720.lBU7KJXb094886@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132050 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:20:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=132050 Change 132050 by jb@jb_freebsd1 on 2007/12/30 07:19:44 Make the zfs module depend on the opensolaris module. Actually make the zfsctl module depend on opensolaris. The module file is zfs.ko but internally it's known as 'zfsctl'. Confused? Me too. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 (text+ko) ==== @@ -1824,3 +1824,4 @@ 0 }; DECLARE_MODULE(zfsctrl, zfs_mod, SI_SUB_VFS, SI_ORDER_ANY); +MODULE_DEPEND(zfsctrl, opensolaris, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:20:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C218A16A523; Sun, 30 Dec 2007 07:20: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 BB9AD16A421 for ; Sun, 30 Dec 2007 07:20:19 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 91A0D13C47E for ; Sun, 30 Dec 2007 07:20:19 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7KJQp094901 for ; Sun, 30 Dec 2007 07:20:19 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7KJx0094897 for perforce@freebsd.org; Sun, 30 Dec 2007 07:20:19 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:20:19 GMT Message-Id: <200712300720.lBU7KJx0094897@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132051 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:20:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=132051 Change 132051 by gcooper@shiina-ibook on 2007/12/30 07:20:15 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/pkg_action_version.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section..h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/pkg_action_version.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:20:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D344216A52F; Sun, 30 Dec 2007 07:20: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 095EA16A4FE for ; Sun, 30 Dec 2007 07:20:19 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA28D13C4DD for ; Sun, 30 Dec 2007 07:20:19 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7KJLZ094909 for ; Sun, 30 Dec 2007 07:20:19 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7KJN4094906 for perforce@freebsd.org; Sun, 30 Dec 2007 07:20:19 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:20:19 GMT Message-Id: <200712300720.lBU7KJN4094906@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132052 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:20:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=132052 Change 132052 by gcooper@shiina-ibook on 2007/12/30 07:20:18 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/pkg_action_update.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/pkg_action_update.h#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BF3116A46C; Sun, 30 Dec 2007 07:21: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 16EEA16A41B for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E23AE13C455 for ; Sun, 30 Dec 2007 07:21:20 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LKqX095391 for ; Sun, 30 Dec 2007 07:21:20 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LKVO095388 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:20 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:20 GMT Message-Id: <200712300721.lBU7LKVO095388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132053 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=132053 Change 132053 by gcooper@shiina-ibook on 2007/12/30 07:20:29 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/pkg_action_version.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/pkg_action_version.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C791F16A500; Sun, 30 Dec 2007 07:21: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 235E316A421 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1339B13C459 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LKMV095397 for ; Sun, 30 Dec 2007 07:21:20 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LKte095394 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:20 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:21:20 GMT Message-Id: <200712300721.lBU7LKte095394@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132054 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=132054 Change 132054 by jb@jb_freebsd1 on 2007/12/30 07:20:34 Remove things that are now in the shared opensolaris module. Affected files ... .. //depot/projects/dtrace/src/sys/modules/zfs/Makefile#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/zfs/Makefile#4 (text+ko) ==== @@ -12,7 +12,6 @@ SRCS+= nvpair.c .PATH: ${.CURDIR}/../../compat/opensolaris/kern -SRCS+= opensolaris_kmem.c SRCS+= opensolaris_kobj.c SRCS+= opensolaris_kstat.c SRCS+= opensolaris_misc.c @@ -21,14 +20,6 @@ SRCS+= opensolaris_vfs.c SRCS+= opensolaris_zone.c -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" -.PATH: ${.CURDIR}/../../contrib/opensolaris/common/atomic/${MACHINE_ARCH} -SRCS+= atomic.S -.else -.PATH: ${.CURDIR}/../../compat/opensolaris/kern -SRCS+= opensolaris_atomic.c -.endif - .PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/fs SRCS+= gfs.c From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A4F816A552; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60B1416A468 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3757E13C45B for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LLl2095403 for ; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LLRe095400 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:21 GMT Message-Id: <200712300721.lBU7LLRe095400@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132055 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=132055 Change 132055 by gcooper@shiina-ibook on 2007/12/30 07:20:38 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/pkg_action_update.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/pkg_action_update.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/update/section.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3AB0D16A47A; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98FB216A4C4 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5AB7F13C468 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LL7g095410 for ; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LLmS095407 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:21 GMT Message-Id: <200712300721.lBU7LLmS095407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132056 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=132056 Change 132056 by gcooper@shiina-ibook on 2007/12/30 07:20:40 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/pkg_action_sign.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/pkg_action_sign.h#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C82E316A632; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4ADD16A4FD for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DDB713C474 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LLAH095416 for ; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LLNm095413 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:21 GMT Message-Id: <200712300721.lBU7LLNm095413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132057 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132057 Change 132057 by gcooper@shiina-ibook on 2007/12/30 07:20:41 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/pkg_action_sign.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/pkg_action_sign.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/sign/section.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51AFA16A697; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED90016A528 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A120113C478 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LLV5095423 for ; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LL3p095420 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:21 GMT Message-Id: <200712300721.lBU7LL3p095420@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132058 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132058 Change 132058 by gcooper@shiina-ibook on 2007/12/30 07:20:43 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/pkg_action_show.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/pkg_action_show.h#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90D7F16A7C5; Sun, 30 Dec 2007 07:21: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 0529616A53A for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5F6F13C4E3 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LLkB095429 for ; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LLaX095426 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:21 GMT Message-Id: <200712300721.lBU7LLaX095426@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132059 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=132059 Change 132059 by gcooper@shiina-ibook on 2007/12/30 07:20:45 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/pkg_action_show.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/pkg_action_show.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/show/section.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF1E416A7CA; Sun, 30 Dec 2007 07:21: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 2E88516A554 for ; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E98C613C442 for ; Sun, 30 Dec 2007 07:21:21 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LL3n095436 for ; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LLcI095433 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:21 GMT Message-Id: <200712300721.lBU7LLcI095433@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132060 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=132060 Change 132060 by gcooper@shiina-ibook on 2007/12/30 07:20:46 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/pkg_action.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.h#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/pkg_action.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 368D316A85D; Sun, 30 Dec 2007 07:21:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77A6E16A4F5 for ; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3BF4B13C457 for ; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LMLO095448 for ; Sun, 30 Dec 2007 07:21:22 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LMC3095445 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:22 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:22 GMT Message-Id: <200712300721.lBU7LMC3095445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=132062 Change 132062 by gcooper@shiina-ibook on 2007/12/30 07:21:02 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/pkg_action_info.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/pkg_action_info.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAE4116A8EE; Sun, 30 Dec 2007 07:21:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BDDF816A625 for ; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5EEE413C458 for ; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LMN9095455 for ; Sun, 30 Dec 2007 07:21:22 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LMlu095452 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:22 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:22 GMT Message-Id: <200712300721.lBU7LMlu095452@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132063 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=132063 Change 132063 by gcooper@shiina-ibook on 2007/12/30 07:21:05 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/pkg_action.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/base.c#1 branch .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/pkg_action.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CBF5016AA0E; Sun, 30 Dec 2007 07:21: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 7A77016A592 for ; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1842513C447 for ; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LLu1095442 for ; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LLZN095439 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:21 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:21 GMT Message-Id: <200712300721.lBU7LLZN095439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132061 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=132061 Change 132061 by gcooper@shiina-ibook on 2007/12/30 07:20:56 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/pkg_action_info.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/info/section.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:21:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7586E16AAAE; Sun, 30 Dec 2007 07:21:24 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E1D9016A655 for ; Sun, 30 Dec 2007 07:21:23 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 81AF513C469 for ; Sun, 30 Dec 2007 07:21:22 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7LMkH095461 for ; Sun, 30 Dec 2007 07:21:22 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7LMm8095458 for perforce@freebsd.org; Sun, 30 Dec 2007 07:21:22 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:21:22 GMT Message-Id: <200712300721.lBU7LMm8095458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132064 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:21:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=132064 Change 132064 by gcooper@shiina-ibook on 2007/12/30 07:21:07 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/pkg_action_delete.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/pkg_action_delete.h#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:22:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E68416A41A; Sun, 30 Dec 2007 07:22:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C510616A417 for ; Sun, 30 Dec 2007 07:22:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B4BB913C458 for ; Sun, 30 Dec 2007 07:22:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7MNO4096051 for ; Sun, 30 Dec 2007 07:22:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7MN9s096048 for perforce@freebsd.org; Sun, 30 Dec 2007 07:22:23 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:22:23 GMT Message-Id: <200712300722.lBU7MN9s096048@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:22:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132065 Change 132065 by jb@jb_freebsd1 on 2007/12/30 07:21:29 Mention the module name in the message. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ { int i; - printf("This module contains code covered by the\n"); + printf("This module (opensolaris) contains code covered by the\n"); printf("Common Development and Distribution License (CDDL)\n"); printf("see http://opensolaris.org/os/licensing/opensolaris_license/\n"); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:22:24 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6D4AF16A517; Sun, 30 Dec 2007 07:22:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E8B7816A418 for ; Sun, 30 Dec 2007 07:22:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D88CF13C459 for ; Sun, 30 Dec 2007 07:22:23 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7MNkk096057 for ; Sun, 30 Dec 2007 07:22:23 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7MNxR096054 for perforce@freebsd.org; Sun, 30 Dec 2007 07:22:23 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:22:23 GMT Message-Id: <200712300722.lBU7MNxR096054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132066 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:22:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=132066 Change 132066 by jb@jb_freebsd1 on 2007/12/30 07:22:10 WIP. Affected files ... .. //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#10 edit Differences ... ==== //depot/projects/dtrace/src/sys/modules/dtrace/dtrace/Makefile#10 (text+ko) ==== @@ -1,19 +1,15 @@ # $FreeBSD$ -.if ${MACHINE_ARCH} == "amd64" -ARCHDIR= i386 -.else ARCHDIR= ${MACHINE_ARCH} -.endif .PATH: ${.CURDIR}/../../../contrib/opensolaris/uts/common/dtrace +.PATH: ${.CURDIR}/../../../cddl/kern .PATH: ${.CURDIR}/../../../cddl/dev/dtrace .PATH: ${.CURDIR}/../../../cddl/dev/dtrace/${ARCHDIR} KMOD= dtrace -SRCS= dtrace.c -UYUYSRCS= \ - dtrace_mutex.c \ +SRCS= dtrace.c \ + vmem.c \ dtrace_asm.S \ dtrace_subr.c From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:23:25 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 753AC16A420; Sun, 30 Dec 2007 07:23: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 3AABF16A418 for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1137E13C458 for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7NOc4097030 for ; Sun, 30 Dec 2007 07:23:24 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NONs097026 for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:24 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:23:24 GMT Message-Id: <200712300723.lBU7NONs097026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132067 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:23:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=132067 Change 132067 by gcooper@shiina-ibook on 2007/12/30 07:22:53 Readding some files that were accidentally deleted as per a reverted rename op. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.c#1 add .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/section.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:23:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C759B16A524; Sun, 30 Dec 2007 07:23: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 5E64916A419 for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3527513C468 for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7NP5V097041 for ; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NPnR097037 for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:23:25 GMT Message-Id: <200712300723.lBU7NPnR097037@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:23:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=132068 Change 132068 by gcooper@shiina-ibook on 2007/12/30 07:22:56 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/pkg_action_delete.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/pkg_action_delete.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/delete/section.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:23:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 19BAE16A417; Sun, 30 Dec 2007 07:23: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 94AA116A4C0 for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6005413C469 for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7NPvM097050 for ; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NPiU097045 for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:23:25 GMT Message-Id: <200712300723.lBU7NPiU097045@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132070 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:23:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=132070 Change 132070 by gcooper@shiina-ibook on 2007/12/30 07:22:57 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/pkg_action_clean.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/pkg_action_clean.h#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:23:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCF1C16A65F; Sun, 30 Dec 2007 07:23: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 BF0BE16A50E for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 83C3513C46E for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7NPqW097061 for ; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NPPI097057 for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:23:25 GMT Message-Id: <200712300723.lBU7NPPI097057@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:23:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=132071 Change 132071 by gcooper@shiina-ibook on 2007/12/30 07:22:59 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/pkg_action_add.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/pkg_add.h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/pkg_action_add.h#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:23:27 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6AB216A663; Sun, 30 Dec 2007 07:23: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 D1AE116A533 for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A774713C474 for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7NPPv097070 for ; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NPTJ097066 for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:23:25 GMT Message-Id: <200712300723.lBU7NPTJ097066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132072 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:23:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=132072 Change 132072 by gcooper@shiina-ibook on 2007/12/30 07:23:02 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/pkg_action_clean.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/pkg_action_clean.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/clean/section.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:23:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9488816A6D7; Sun, 30 Dec 2007 07:23: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 139CA16A58F for ; Sun, 30 Dec 2007 07:23:26 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D0EC613C478 for ; Sun, 30 Dec 2007 07:23:25 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7NP0P097078 for ; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NPZ0097074 for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:23:25 GMT Message-Id: <200712300723.lBU7NPZ0097074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:23:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=132073 Change 132073 by jb@jb_freebsd1 on 2007/12/30 07:23:02 WIP. Just trying to get the module to compile, link and load. Hacks abound. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 (text) ==== @@ -219,6 +219,12 @@ static dtrace_helpers_t *dtrace_deferred_pid; /* deferred helper list */ static dtrace_enabling_t *dtrace_retained; /* list of retained enablings */ static dtrace_dynvar_t dtrace_dynhash_sink; /* end of dynamic hash chains */ +#if !defined(sun) +int dtrace_in_probe; /* non-zero if executing a probe */ +#if defined(__i386__) || defined(__amd64__) +uintptr_t dtrace_in_probe_addr; /* Address of invop when already in probe */ +#endif +#endif /* * DTrace Locking @@ -2701,7 +2707,7 @@ * dtrace_caller() only guarantees correct * results for anchored probes. */ - pc_t caller[2]; + pc_t caller[2] = {0, 0}; dtrace_getpcstack(caller, 2, aframes, (uint32_t *)(uintptr_t)mstate->dtms_arg[0]); @@ -2713,7 +2719,7 @@ * we must resort to the slower approach of * calling dtrace_getpcstack(). */ - pc_t caller; + pc_t caller = 0; dtrace_getpcstack(&caller, 1, aframes, NULL); mstate->dtms_caller = caller; @@ -15937,6 +15943,11 @@ #include #include #include +#include +#include +#if defined(__amd64__) +#include +#endif SYSINIT(dtrace_load, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_load, NULL) SYSINIT(dtrace_anon_init, SI_SUB_DTRACE_ANON, SI_ORDER_FIRST, dtrace_anon_init, NULL) @@ -15944,4 +15955,5 @@ DEV_MODULE(dtrace, dtrace_modevent, NULL); MODULE_VERSION(dtrace, 1); MODULE_DEPEND(dtrace, cyclic, 1, 1, 1); +MODULE_DEPEND(dtrace, opensolaris, 1, 1, 1); #endif From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:23:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1977116A4E5; Sun, 30 Dec 2007 07:23: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 44A8816A5C4 for ; Sun, 30 Dec 2007 07:23:26 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0174813C442 for ; Sun, 30 Dec 2007 07:23:26 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7NPq4097088 for ; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NPYE097085 for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:25 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:23:25 GMT Message-Id: <200712300723.lBU7NPYE097085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:23:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=132074 Change 132074 by gcooper@shiina-ibook on 2007/12/30 07:23:05 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/pkg_action_check.h To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.h Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/pkg_action_check.h#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:23:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3B9CF16A853; Sun, 30 Dec 2007 07:23: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 8AD3D16A608 for ; Sun, 30 Dec 2007 07:23:26 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 258E713C448 for ; Sun, 30 Dec 2007 07:23:26 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7NQpo097097 for ; Sun, 30 Dec 2007 07:23:26 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NQvU097093 for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:26 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:23:26 GMT Message-Id: <200712300723.lBU7NQvU097093@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:23:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=132075 Change 132075 by gcooper@shiina-ibook on 2007/12/30 07:23:07 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/pkg_action_check.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/pkg_action_check.c#3 delete .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/check/section.c#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:23:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65CCC16A85E; Sun, 30 Dec 2007 07:23: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 D527B16A661 for ; Sun, 30 Dec 2007 07:23:26 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D62E13C44B for ; Sun, 30 Dec 2007 07:23:26 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7NQxG097109 for ; Sun, 30 Dec 2007 07:23:26 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7NQTC097105 for perforce@freebsd.org; Sun, 30 Dec 2007 07:23:26 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:23:26 GMT Message-Id: <200712300723.lBU7NQTC097105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:23:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=132076 Change 132076 by gcooper@shiina-ibook on 2007/12/30 07:23:11 Rename/Move: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/pkg_action_add.c To: //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/pkg_add.c Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/add/pkg_action_add.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:24:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFA7816A468; Sun, 30 Dec 2007 07:24:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4ED516A417 for ; Sun, 30 Dec 2007 07:24:27 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B3C413C467 for ; Sun, 30 Dec 2007 07:24:27 +0000 (UTC) (envelope-from gcooper@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7ORiV098195 for ; Sun, 30 Dec 2007 07:24:27 GMT (envelope-from gcooper@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7ORtp098191 for perforce@freebsd.org; Sun, 30 Dec 2007 07:24:27 GMT (envelope-from gcooper@FreeBSD.org) Date: Sun, 30 Dec 2007 07:24:27 GMT Message-Id: <200712300724.lBU7ORtp098191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gcooper@FreeBSD.org using -f From: Garrett Cooper To: Perforce Change Reviews Cc: Subject: PERFORCE change 132077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:24:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=132077 Change 132077 by gcooper@shiina-ibook on 2007/12/30 07:23:43 Didn't work its way into rename changelists.. Affected files ... .. //depot/projects/soc2007/revised_fbsd_pkgtools/pkg_revised/v2/pkgman/action/version/section.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:24:28 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4032B16A51B; Sun, 30 Dec 2007 07:24:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0E1E16A41A for ; Sun, 30 Dec 2007 07:24:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F55313C468 for ; Sun, 30 Dec 2007 07:24:27 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7ORF9098204 for ; Sun, 30 Dec 2007 07:24:27 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7ORkO098201 for perforce@freebsd.org; Sun, 30 Dec 2007 07:24:27 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:24:27 GMT Message-Id: <200712300724.lBU7ORkO098201@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:24:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=132078 Change 132078 by jb@jb_freebsd1 on 2007/12/30 07:24:25 We use the END() macro to do what OpenSolaris uses SET_SIZE() for. Their name makes more sense considering that the macro only sets the .size. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#4 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#4 (text+ko) ==== @@ -33,7 +33,7 @@ ENTRY(dtrace_getfp) movl %ebp, %eax ret - SET_SIZE(dtrace_getfp) + END(dtrace_getfp) /* uint32_t dtrace_cas32(uint32_t *target, uint32_t cmp, uint32_t new) @@ -47,8 +47,8 @@ lock cmpxchgl %ecx, (%edx) ret - SET_SIZE(dtrace_casptr) - SET_SIZE(dtrace_cas32) + END(dtrace_casptr) + END(dtrace_cas32) /* uintptr_t dtrace_caller(int aframes) @@ -57,7 +57,7 @@ ENTRY(dtrace_caller) movl $-1, %eax ret - SET_SIZE(dtrace_caller) + END(dtrace_caller) /* void dtrace_copy(uintptr_t src, uintptr_t dest, size_t size) @@ -80,7 +80,7 @@ movl %ebp, %esp popl %ebp ret - SET_SIZE(dtrace_copy) + END(dtrace_copy) /* void dtrace_copystr(uintptr_t uaddr, uintptr_t kaddr, size_t size) @@ -113,7 +113,7 @@ popl %ebp ret - SET_SIZE(dtrace_copystr) + END(dtrace_copystr) /* uintptr_t dtrace_fulword(void *addr) @@ -124,7 +124,7 @@ xorl %eax, %eax movl (%ecx), %eax ret - SET_SIZE(dtrace_fulword) + END(dtrace_fulword) /* uint8_t dtrace_fuword8_nocheck(void *addr) @@ -135,7 +135,7 @@ xorl %eax, %eax movzbl (%ecx), %eax ret - SET_SIZE(dtrace_fuword8_nocheck) + END(dtrace_fuword8_nocheck) /* uint16_t dtrace_fuword16_nocheck(void *addr) @@ -146,7 +146,7 @@ xorl %eax, %eax movzwl (%ecx), %eax ret - SET_SIZE(dtrace_fuword16_nocheck) + END(dtrace_fuword16_nocheck) /* uint32_t dtrace_fuword32_nocheck(void *addr) @@ -157,7 +157,7 @@ xorl %eax, %eax movl (%ecx), %eax ret - SET_SIZE(dtrace_fuword32_nocheck) + END(dtrace_fuword32_nocheck) /* uint64_t dtrace_fuword64_nocheck(void *addr) @@ -170,7 +170,7 @@ movl (%ecx), %eax movl 4(%ecx), %edx ret - SET_SIZE(dtrace_fuword64_nocheck) + END(dtrace_fuword64_nocheck) /* void dtrace_probe_error(dtrace_state_t *state, dtrace_epid_t epid, int which, int fault, int fltoffs, uintptr_t illval) @@ -190,7 +190,7 @@ movl %ebp, %esp popl %ebp ret - SET_SIZE(dtrace_probe_error) + END(dtrace_probe_error) /* void dtrace_membar_producer(void) @@ -199,7 +199,7 @@ ENTRY(dtrace_membar_producer) rep; ret /* use 2 byte return instruction when branch target */ /* AMD Software Optimization Guide - Section 6.2 */ - SET_SIZE(dtrace_membar_producer) + END(dtrace_membar_producer) /* void dtrace_membar_consumer(void) @@ -208,4 +208,4 @@ ENTRY(dtrace_membar_consumer) rep; ret /* use 2 byte return instruction when branch target */ /* AMD Software Optimization Guide - Section 6.2 */ - SET_SIZE(dtrace_membar_consumer) + END(dtrace_membar_consumer) From owner-p4-projects@FreeBSD.ORG Sun Dec 30 07:26:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B47E816A469; Sun, 30 Dec 2007 07:26: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 79D4516A419 for ; Sun, 30 Dec 2007 07:26:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 68C3913C458 for ; Sun, 30 Dec 2007 07:26:30 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBU7QUjl098806 for ; Sun, 30 Dec 2007 07:26:30 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBU7QTkx098803 for perforce@freebsd.org; Sun, 30 Dec 2007 07:26:29 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 07:26:29 GMT Message-Id: <200712300726.lBU7QTkx098803@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132079 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 07:26:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=132079 Change 132079 by jb@jb_freebsd1 on 2007/12/30 07:25:38 Hacks to get this sucker to compile, link and load without killing my amd64 development box. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#19 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#17 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#15 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_vtime.c#2 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hacks.c#19 (text+ko) ==== @@ -2,39 +2,11 @@ dtrace_cacheid_t dtrace_predcache_id; -void *hack_refs[] = - { - dtrace_cpu_setup_initial, - dtrace_getustack_common, - dtrace_helper, - dtrace_helper_slurp, - dtrace_helpers_destroy, - dtrace_helpers_duplicate, - dtrace_inscratch, - dtrace_module_loaded, - dtrace_module_unloaded, - dtrace_priv_proc_control, - dtrace_speculation, - dtrace_speculation_clean - }; -void -dtrace_vpanic(const char *fmt, __va_list args) -{ - kdb_backtrace(); - vprintf(fmt,args); -} +int panic_quiesce; +char panic_stack[PANICSTKSIZE]; + boolean_t priv_policy_only(const cred_t *a, int b, boolean_t c) { return 0; } -taskqid_t -taskq_dispatch(taskq_t *a, task_func_t b, void *c, uint_t d) -{ - return 0; -} -int -kdi_dtrace_set(kdi_dtrace_set_t a) -{ - return 0; -} ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#17 (text+ko) ==== @@ -32,8 +32,10 @@ dtrace_instr_size_func = dtrace_instr_size; #endif +#ifdef DOODAD /* Hang our hook for thread switches. */ dtrace_vtime_switch_func = dtrace_vtime_switch; +#endif /* * XXX This is a short term hack to avoid having to comment ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#15 (text+ko) ==== @@ -159,8 +159,10 @@ * Reset our hook for thread switches, but ensure that vtime isn't * active first. */ +#ifdef DOODAD dtrace_vtime_active = 0; dtrace_vtime_switch_func = NULL; +#endif #if defined(__i386__) /* Reset our hook for DTrace traps during probes. */ ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_vtime.c#2 (text+ko) ==== @@ -27,6 +27,7 @@ void dtrace_vtime_enable(void) { +#ifdef DOODAD dtrace_vtime_state_t state, nstate = 0; do { @@ -49,11 +50,13 @@ } while (dtrace_cas32((uint32_t *)&dtrace_vtime_active, state, nstate) != state); +#endif } void dtrace_vtime_disable(void) { +#ifdef DOODAD dtrace_vtime_state_t state, nstate = 0; do { @@ -76,22 +79,22 @@ } while (dtrace_cas32((uint32_t *)&dtrace_vtime_active, state, nstate) != state); +#endif } void dtrace_vtime_switch(kthread_t *next) { +#ifdef DOODAD dtrace_icookie_t cookie; hrtime_t ts; -#ifdef DOODAD if (tnf_tracing_active) { tnf_thread_switch(next); if (dtrace_vtime_active == DTRACE_VTIME_INACTIVE_TNF) return; } -#endif cookie = dtrace_interrupt_disable(); ts = dtrace_gethrtime(); @@ -105,4 +108,5 @@ next->td_dtrace_start = ts; dtrace_interrupt_enable(cookie); +#endif } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 12:28:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF37D16A46C; Sun, 30 Dec 2007 12:28:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B1DD16A417 for ; Sun, 30 Dec 2007 12:28:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 47E6613C458 for ; Sun, 30 Dec 2007 12:28:48 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUCSmHF031811 for ; Sun, 30 Dec 2007 12:28:48 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUCSlVB031808 for perforce@freebsd.org; Sun, 30 Dec 2007 12:28:47 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 30 Dec 2007 12:28:47 GMT Message-Id: <200712301228.lBUCSlVB031808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132087 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 12:28:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=132087 Change 132087 by rdivacky@rdivacky_witten on 2007/12/30 12:28:44 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#20 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#12 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/svr4_stream.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#12 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/atkbdc/atkbd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/creator.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/fb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/fbreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/machfb.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/splash_bmp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/splash_pcx.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/vga.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gem.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gem_pci.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gemreg.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gemvar.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/kbd/kbdreg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/kbdmux/kbdmux.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/le/am7990.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/le/am79900.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/streams/streams.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/blank/blank_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/daemon/daemon_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/dragon/dragon_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/fade/fade_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/fire/fire_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/green/green_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/logo/logo_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/rain/rain_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/scvgarndr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/scvidctl.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/snake/snake_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/star/star_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/syscons.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/syscons/warp/warp_saver.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ukbd.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/fifofs/fifo_vnops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/conf/NOTES#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/xbox/xboxfb.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/isa/vga_isa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_event.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#18 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_generic.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_mqueue.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_bio.c#6 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#57 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/cbus/gdc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/pc98/cbus/scgdcrndr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/file.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/unpcb.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_balloc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_fault.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_object.c#7 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_page.c#8 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_reserv.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_reserv.h#1 branch Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/conf/NOTES#6 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.73 2007/12/15 00:56:16 scottl Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.74 2007/12/28 22:50:04 rpaulo Exp $ # # @@ -411,6 +411,7 @@ # vpd: Vital Product Data kernel interface # cy: Cyclades serial driver # digi: Digiboard driver +# asmc: Apple System Management Controller # Notes on the Specialix SI/XIO driver: # The host card is memory, not IO mapped. @@ -436,7 +437,7 @@ hint.pbio.0.port="0x360" device smbios device vpd - +device asmc # # Laptop/Notebook options: # ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#20 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.106 2007/10/24 19:03:52 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.107 2007/12/29 14:28:01 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.88 2007/09/18 19:50:33 dwmalone Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_stats.c,v 1.89 2007/12/29 14:25:29 kib Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -284,12 +284,17 @@ linux_stat(struct thread *td, struct linux_stat_args *args) { struct stat buf; + char *path; int error; + + LCONVPATHEXIST(td, args->path, &path); + #ifdef DEBUG if (ldebug(stat)) - printf(ARGS(stat, "%s, *"), args->path); + printf(ARGS(stat, "%s, *"), args->path); #endif - error = kern_stat(td, args->path, UIO_SYSSPACE, &buf); + error = kern_stat(td, path, UIO_SYSSPACE, &buf); + LFREEPATH(path); if (error) return (error); translate_path_major_minor(td, args->path, &buf); @@ -300,13 +305,17 @@ linux_lstat(struct thread *td, struct linux_lstat_args *args) { struct stat buf; + char *path; int error; + LCONVPATHEXIST(td, args->path, &path); + #ifdef DEBUG if (ldebug(lstat)) - printf(ARGS(lstat, "%s, *"), args->path); + printf(ARGS(lstat, "%s, *"), args->path); #endif error = kern_lstat(td, args->path, UIO_SYSSPACE, &buf); + LFREEPATH(path); if (error) return (error); translate_path_major_minor(td, args->path, &buf); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/svr4/svr4_stream.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.62 2006/08/05 22:04:21 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stream.c,v 1.63 2007/12/30 01:42:12 jeff Exp $"); #include "opt_compat.h" #include "opt_ktrace.h" @@ -1481,8 +1481,6 @@ uap->dat, uap->flags); #endif /* DEBUG_SVR4 */ - FILE_LOCK_ASSERT(fp, MA_NOTOWNED); - if (uap->ctl != NULL) { if ((error = copyin(uap->ctl, &ctl, sizeof(ctl))) != 0) { #ifdef DEBUG_SVR4 @@ -1656,8 +1654,6 @@ error = 0; afp = NULL; - FILE_LOCK_ASSERT(fp, MA_NOTOWNED); - memset(&sc, 0, sizeof(sc)); #ifdef DEBUG_SVR4 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1260 2007/12/26 11:32:32 rwatson Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1261 2007/12/29 19:53:03 alc Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -2108,6 +2108,7 @@ vm/vm_pageq.c standard vm/vm_pager.c standard vm/vm_phys.c standard +vm/vm_reserv.c standard vm/vm_unix.c standard vm/vm_zeroidle.c standard vm/vnode_pager.c standard ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/atkbdc/atkbd.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.52 2006/10/25 13:35:42 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd.c,v 1.53 2007/12/29 21:55:22 wkoszek Exp $"); #include "opt_compat.h" #include "opt_kbd.h" @@ -162,15 +162,15 @@ */ s = spltty(); kbd = (keyboard_t *)arg; - if ((*kbdsw[kbd->kb_index]->lock)(kbd, TRUE)) { + if (kbdd_lock(kbd, TRUE)) { /* * We have seen the lock flag is not set. Let's reset * the flag early, otherwise the LED update routine fails * which may want the lock during the interrupt routine. */ - (*kbdsw[kbd->kb_index]->lock)(kbd, FALSE); - if ((*kbdsw[kbd->kb_index]->check_char)(kbd)) - (*kbdsw[kbd->kb_index]->intr)(kbd, NULL); + kbdd_lock(kbd, FALSE); + if (kbdd_check_char(kbd)) + kbdd_intr(kbd, NULL); } splx(s); timeout(atkbd_timeout, arg, hz/10); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/atkbdc/atkbd_atkbdc.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd_atkbdc.c,v 1.20 2007/02/23 12:18:33 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/atkbdc/atkbd_atkbdc.c,v 1.21 2007/12/29 21:55:22 wkoszek Exp $"); #include "opt_kbd.h" @@ -158,9 +158,9 @@ kbd->kb_flags &= ~KB_INITIALIZED; args[0] = device_get_unit(device_get_parent(dev)); args[1] = rman_get_start(sc->intr); - (*kbdsw[kbd->kb_index]->init)(device_get_unit(dev), &kbd, - args, device_get_flags(dev)); - (*kbdsw[kbd->kb_index]->clear_state)(kbd); + kbdd_init(kbd, device_get_unit(dev), &kbd, args, + device_get_flags(dev)); + kbdd_clear_state(kbd); } return 0; } @@ -171,7 +171,7 @@ keyboard_t *kbd; kbd = (keyboard_t *)arg; - (*kbdsw[kbd->kb_index]->intr)(kbd, NULL); + kbdd_intr(kbd, NULL); } DRIVER_MODULE(atkbd, atkbdc, atkbd_driver, atkbd_devclass, 0, 0); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/creator.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/creator.c,v 1.13 2007/06/16 21:48:49 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/creator.c,v 1.14 2007/12/29 23:26:55 wkoszek Exp $"); #include #include @@ -845,9 +845,9 @@ int i; for (i = 0; i < len; i++) { - (*vidsw[adp->va_index]->putc)(adp, off + i, s[i] & 0xff, - (s[i] & 0xff00) >> 8); + vidd_putc(adp, off + i, s[i] & 0xff, (s[i] & 0xff00) >> 8); } + return (0); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/fb.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/fb.c,v 1.33 2005/12/04 10:06:03 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/fb.c,v 1.34 2007/12/29 23:26:55 wkoszek Exp $"); #include "opt_fb.h" @@ -484,7 +484,7 @@ len = imin(len, adp->va_window_size - offset); if (len <= 0) break; - (*vidsw[adp->va_index]->set_win_org)(adp, uio->uio_offset); + vidd_set_win_org(adp, uio->uio_offset); error = uiomove((caddr_t)(adp->va_window + offset), len, uio); if (error) break; @@ -505,7 +505,7 @@ if (adp == NULL) /* XXX */ return ENXIO; - error = (*vidsw[adp->va_index]->ioctl)(adp, cmd, arg); + error = vidd_ioctl(adp, cmd, arg); if (error == ENOIOCTL) error = ENODEV; return error; @@ -514,7 +514,7 @@ int genfbmmap(genfb_softc_t *sc, video_adapter_t *adp, vm_offset_t offset, vm_offset_t *paddr, int prot) { - return (*vidsw[adp->va_index]->mmap)(adp, offset, paddr, prot); + return vidd_mmap(adp, offset, paddr, prot); } #endif /* FB_INSTALL_CDEV */ @@ -686,16 +686,15 @@ break; case FBIO_MODEINFO: /* get mode information */ - error = (*vidsw[adp->va_index]->get_info)(adp, - ((video_info_t *)arg)->vi_mode, - (video_info_t *)arg); + error = vidd_get_info(adp, + ((video_info_t *)arg)->vi_mode, + (video_info_t *)arg); if (error) error = ENODEV; break; case FBIO_FINDMODE: /* find a matching video mode */ - error = (*vidsw[adp->va_index]->query_mode)(adp, - (video_info_t *)arg); + error = vidd_query_mode(adp, (video_info_t *)arg); break; case FBIO_GETMODE: /* get video mode */ @@ -703,7 +702,7 @@ break; case FBIO_SETMODE: /* set video mode */ - error = (*vidsw[adp->va_index]->set_mode)(adp, *(int *)arg); + error = vidd_set_mode(adp, *(int *)arg); if (error) error = ENODEV; /* EINVAL? */ break; @@ -722,7 +721,7 @@ break; case FBIO_BLANK: /* blank display */ - error = (*vidsw[adp->va_index]->blank_display)(adp, *(int *)arg); + error = vidd_blank_display(adp, *(int *)arg); break; case FBIO_GETPALETTE: /* get color palette */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/fbreg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.21 2007/01/18 13:08:08 marius Exp $ + * $FreeBSD: src/sys/dev/fb/fbreg.h,v 1.22 2007/12/29 23:26:55 wkoszek Exp $ */ #ifndef _DEV_FB_FBREG_H_ @@ -189,20 +189,74 @@ vi_putm_t *putm; } video_switch_t; -#define save_palette(adp, pal) \ - (*vidsw[(adp)->va_index]->save_palette)((adp), (pal)) -#define load_palette(adp, pal) \ - (*vidsw[(adp)->va_index]->load_palette)((adp), (pal)) -#define get_mode_info(adp, mode, buf) \ - (*vidsw[(adp)->va_index]->get_info)((adp), (mode), (buf)) -#define set_video_mode(adp, mode) \ +#define vidd_probe(unit, adpp, arg, flags) \ + (*vidsw[(adp)->va_index]->probe)((unit), (adpp), (arg), (flags)) +#define vidd_init(unit, adp, flags) \ + (*vidsw[(adp)->va_index]->init)((unit), (adp), (flags)) +#define vidd_get_info(adp, mode, info) \ + (*vidsw[(adp)->va_index]->get_info)((adp), (mode), (info)) +#define vidd_query_mode(adp, mode) \ + (*vidsw[(adp)->va_index]->query_mode)((adp), (mode)) +#define vidd_set_mode(adp, mode) \ (*vidsw[(adp)->va_index]->set_mode)((adp), (mode)) -#define set_border(adp, border) \ +#define vidd_save_font(adp, page, size, width, data, c, count) \ + (*vidsw[(adp)->va_index]->save_font)((adp), (page), (size), \ + (width), (data), (c), (count)) +#define vidd_load_font(adp, page, size, width, data, c, count) \ + (*vidsw[(adp)->va_index]->load_font)((adp), (page), (size), \ + (width), (data), (c), (count)) +#define vidd_show_font(adp, page) \ + (*vidsw[(adp)->va_index]->show_font)((adp), (page)) +#define vidd_save_palette(adp, pallete) \ + (*vidsw[(adp)->va_index]->save_palette)((adp), (pallete)) +#define vidd_load_palette(adp, pallete) \ + (*vidsw[(adp)->va_index]->load_palette)((adp), (pallete)) +#define vidd_set_border(adp, border) \ (*vidsw[(adp)->va_index]->set_border)((adp), (border)) -#define set_origin(adp, o) \ - (*vidsw[(adp)->va_index]->set_win_org)(adp, o) - -/* XXX - add more macros */ +#define vidd_save_state(adp, p, size) \ + (*vidsw[(adp)->va_index]->save_state)((adp), (p), (size)) +#define vidd_load_state(adp, p) \ + (*vidsw[(adp)->va_index]->load_state)((adp), (p)) +#define vidd_set_win_org(adp, offset) \ + (*vidsw[(adp)->va_index]->set_win_org)((adp), (offset)) +#define vidd_read_hw_cursor(adp, col, row) \ + (*vidsw[(adp)->va_index]->read_hw_cursor)((adp), (col), (row)) +#define vidd_set_hw_cursor(adp, col, row) \ + (*vidsw[(adp)->va_index]->set_hw_cursor)((adp), (col), (row)) +#define vidd_set_hw_cursor_shape(adp, base, height, celsize, blink) \ + (*vidsw[(adp)->va_index]->set_hw_cursor_shape)((adp), (base), \ + (height), (celsize), (blink)) +#define vidd_blank_display(adp, mode) \ + (*vidsw[(adp)->va_index]->blank_display)((adp), (mode)) +#define vidd_mmap(adp, offset, paddr, prot) \ + (*vidsw[(adp)->va_index]->mmap)((adp), (offset), (paddr), (prot)) +#define vidd_ioctl(adp, cmd, data) \ + (*vidsw[(adp)->va_index]->ioctl)((adp), (cmd), (data)) +#define vidd_clear(adp) \ + (*vidsw[(adp)->va_index]->clear)((adp)) +#define vidd_fill_rect(adp, val, x, y, cx, cy) \ + (*vidsw[(adp)->va_index]->fill_rect)((adp), (val), (x), (y), \ + (cx), (cy)) +#define vidd_bitblt(adp, ...) \ + (*vidsw[(adp)->va_index]->bitblt)(adp, __VA_ARGS__) +#define vidd_diag(adp, level) \ + (*vidsw[(adp)->va_index]->diag)((adp), (level)) +#define vidd_save_cursor_palette(adp, palette) \ + (*vidsw[(adp)->va_index]->save_cursor_palette)((adp), (palette)) +#define vidd_load_cursor_palette(adp, palette) \ + (*vidsw[(adp)->va_index]->load_cursor_palette)((adp), (palette)) +#define vidd_copy(adp, src, dst, n) \ + (*vidsw[(adp)->va_index]->copy)((adp), (src), (dst), (n)) +#define vidd_putp(adp, offset, p, a, size, bpp, bit_ltor1, byte_ltor2) \ + (*vidsw[(adp)->va_index]->putp)((adp), (offset), (p), (a), \ + (size), (bpp), (bit_ltor1), (bit_ltor2)) +#define vidd_putc(adp, offset, c, a) \ + (*vidsw[(adp)->va_index]->putc)((adp), (offset), (c), (a)) +#define vidd_puts(adp, offset, s, len) \ + (*vidsw[(adp)->va_index]->puts)((adp), (offset), (s), (len)) +#define vidd_putm(adp, x, y, pixel_image, pixel_mask, size, width) \ + (*vidsw[(adp)->va_index]->putm)((adp), (x), (y), (pixel_image), \ + (pixel_mask), (size), (width)) /* video driver */ typedef struct video_driver { ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/machfb.c#3 (text+ko) ==== @@ -55,7 +55,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/machfb.c,v 1.5 2007/06/16 21:48:50 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/machfb.c,v 1.6 2007/12/29 23:26:55 wkoszek Exp $"); /* * Driver for ATI Mach64 graphics chips. Some code is derived from the @@ -1113,7 +1113,7 @@ MACHFB_BLANK; blanks = 0; } - (*vidsw[adp->va_index]->putc)(adp, off + i, c, a); + vidd_putc(adp, off + i, c, a); } } if (blanks != 0) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/splash_bmp.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/splash_bmp.c,v 1.20 2007/07/11 22:34:34 mjacob Exp $ + * $FreeBSD: src/sys/dev/fb/splash_bmp.c,v 1.21 2007/12/29 23:26:55 wkoszek Exp $ */ #include @@ -94,9 +94,9 @@ return ENODEV; } for (i = 0; modes[i] >= 0; ++i) { - if (((*vidsw[adp->va_index]->get_info)(adp, modes[i], &info) == 0) - && (bmp_Init((u_char *)bmp_decoder.data, - info.vi_width, info.vi_height, info.vi_depth) == 0)) + if ((vidd_get_info(adp, modes[i], &info) == 0) && + (bmp_Init((u_char *)bmp_decoder.data, info.vi_width, + info.vi_height, info.vi_depth) == 0)) break; } splash_mode = modes[i]; @@ -127,11 +127,11 @@ if (on) { if (!splash_on) { /* set up the video mode and draw something */ - if ((*vidsw[adp->va_index]->set_mode)(adp, splash_mode)) + if (vidd_set_mode(adp, splash_mode)) return 1; if (bmp_Draw(adp)) return 1; - (*vidsw[adp->va_index]->save_palette)(adp, pal); + vidd_save_palette(adp, pal); time_stamp = 0; splash_on = TRUE; } @@ -160,7 +160,7 @@ for (i = 0; i < sizeof(pal); ++i) { tpal[i] = pal[i] * brightness / FADE_LEVELS; } - (*vidsw[adp->va_index]->load_palette)(adp, tpal); + vidd_load_palette(adp, tpal); time_stamp = tv.tv_sec; } } @@ -298,7 +298,7 @@ sofs += (x >> 3); newbank = sofs/info->adp->va_window_size; if (info->bank != newbank) { - (*vidsw[info->adp->va_index]->set_win_org)(info->adp, newbank*info->adp->va_window_size); + vidd_set_win_org(info->adp, newbank*info->adp->va_window_size); info->bank = newbank; } sofs %= info->adp->va_window_size; @@ -313,7 +313,7 @@ sofs += x; newbank = sofs/info->adp->va_window_size; if (info->bank != newbank) { - (*vidsw[info->adp->va_index]->set_win_org)(info->adp, newbank*info->adp->va_window_size); + vidd_set_win_org(info->adp, newbank*info->adp->va_window_size); info->bank = newbank; } sofs %= info->adp->va_window_size; @@ -601,8 +601,8 @@ /* clear the screen */ bmp_info.vidmem = (u_char *)adp->va_window; bmp_info.adp = adp; - (*vidsw[adp->va_index]->clear)(adp); - (*vidsw[adp->va_index]->set_win_org)(adp, 0); + vidd_clear(adp); + vidd_set_win_org(adp, 0); bmp_info.bank = 0; /* initialise the info structure for drawing */ @@ -612,7 +612,7 @@ #endif /* set the palette for our image */ - (*vidsw[adp->va_index]->load_palette)(adp, (u_char *)&bmp_info.palette); + vidd_load_palette(adp, (u_char *)&bmp_info.palette); #if 0 #ifndef PC98 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/splash_pcx.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/splash_pcx.c,v 1.8 2004/08/06 21:35:51 des Exp $ + * $FreeBSD: src/sys/dev/fb/splash_pcx.c,v 1.9 2007/12/29 23:26:55 wkoszek Exp $ */ #include @@ -98,7 +98,7 @@ pcx_info.bpp, pcx_info.planes); for (i = 0; modes[i] >= 0; ++i) { - if (get_mode_info(adp, modes[i], &info) != 0) + if (vidd_get_info(adp, modes[i], &info) != 0) continue; if (bootverbose) printf("splash_pcx: considering mode %d:\n" @@ -136,7 +136,7 @@ { if (on) { if (!splash_on) { - if (set_video_mode(adp, splash_mode) || pcx_draw(adp)) + if (vidd_set_mode(adp, splash_mode) || pcx_draw(adp)) return 1; splash_on = TRUE; } @@ -208,7 +208,7 @@ if (pcx_info.zlen < 1) return (1); - load_palette(adp, pcx_info.palette); + vidd_load_palette(adp, pcx_info.palette); vidmem = (uint8_t *)adp->va_window; swidth = adp->va_info.vi_width; @@ -219,7 +219,7 @@ banksize = adp->va_window_size; for (origin = 0; origin < sheight*sbpsl; origin += banksize) { - set_origin(adp, origin); + vidd_set_win_org(adp, origin); bzero(vidmem, banksize); } @@ -231,7 +231,7 @@ pos -= banksize; origin += banksize; } - set_origin(adp, origin); + vidd_set_win_org(adp, origin); for (scan = i = 0; scan < pcx_info.height; ++scan, ++y, pos += sbpsl) { for (j = 0; j < pcx_info.bpsl && i < pcx_info.zlen; ++i) { @@ -251,7 +251,7 @@ if (pos > banksize) { origin += banksize; pos -= banksize; - set_origin(adp, origin); + vidd_set_win_org(adp, origin); } if (pos + pcx_info.width > banksize) { @@ -260,7 +260,7 @@ bcopy(line, vidmem + pos, j); origin += banksize; pos -= banksize; - set_origin(adp, origin); + vidd_set_win_org(adp, origin); bcopy(line + j, vidmem, pcx_info.width - j); } else { bcopy(line, vidmem + pos, pcx_info.width); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/fb/vga.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.36 2005/12/04 02:12:41 ru Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/vga.c,v 1.37 2007/12/29 23:26:55 wkoszek Exp $"); #include "opt_vga.h" #include "opt_fb.h" @@ -1656,7 +1656,7 @@ update_adapter_info(adp, &info); /* move hardware cursor out of the way */ - (*vidsw[adp->va_index]->set_hw_cursor)(adp, -1, -1); + vidd_set_hw_cursor(adp, -1, -1); return 0; #else /* VGA_NO_MODE_CHANGE */ @@ -2502,7 +2502,7 @@ length = adp->va_line_width*adp->va_info.vi_height; while (length > 0) { l = imin(length, adp->va_window_size); - (*vidsw[adp->va_index]->set_win_org)(adp, at); + vidd_set_win_org(adp, at); bzero_io(adp->va_window, l); length -= l; at += l; @@ -2522,7 +2522,7 @@ length = adp->va_line_width*adp->va_info.vi_height; while (length > 0) { l = imin(length, adp->va_window_size); - (*vidsw[adp->va_index]->set_win_org)(adp, at); + vidd_set_win_org(adp, at); fill_io(val, adp->va_window, l); length -= l; at += l; @@ -2540,7 +2540,7 @@ length = adp->va_line_width*adp->va_info.vi_height; while (length > 0) { l = imin(length, adp->va_window_size); - (*vidsw[adp->va_index]->set_win_org)(adp, at); + vidd_set_win_org(adp, at); switch (adp->va_info.vi_pixel_size) { case sizeof(u_int16_t): fillw_io(val, adp->va_window, l/sizeof(u_int16_t)); @@ -2599,7 +2599,7 @@ while (cy > 0) { pos = adp->va_line_width*y + x/8; if (bank != pos/banksize) { - (*vidsw[adp->va_index]->set_win_org)(adp, pos); + vidd_set_win_org(adp, pos); bank = pos/banksize; } offset = pos%banksize; @@ -2612,7 +2612,7 @@ if (offset >= banksize) { offset = 0; ++bank; /* next bank */ - (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize); + vidd_set_win_org(adp, bank*banksize); } outw(GDCIDX, 0xff08); /* bit mask */ } @@ -2624,7 +2624,7 @@ if (offset >= banksize) { offset = 0; ++bank; /* next bank */ - (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize); + vidd_set_win_org(adp, bank*banksize); } } if ((x + cx) % 8) { @@ -2634,7 +2634,7 @@ if (offset >= banksize) { offset = 0; ++bank; /* next bank */ - (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize); + vidd_set_win_org(adp, bank*banksize); } outw(GDCIDX, 0xff08); /* bit mask */ } @@ -2662,7 +2662,7 @@ while (cy > 0) { pos = adp->va_line_width*y + x*adp->va_info.vi_pixel_size; if (bank != pos/banksize) { - (*vidsw[adp->va_index]->set_win_org)(adp, pos); + vidd_set_win_org(adp, pos); bank = pos/banksize; } offset = pos%banksize; @@ -2672,7 +2672,7 @@ /* the line may cross the window boundary */ if (offset + cx > banksize) { ++bank; /* next bank */ - (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize); + vidd_set_win_org(adp, bank*banksize); end = offset + cx - banksize; fill_io(val, adp->va_window, end/adp->va_info.vi_pixel_size); } @@ -2700,7 +2700,7 @@ while (cy > 0) { pos = adp->va_line_width*y + x*sizeof(u_int16_t); if (bank != pos/banksize) { - (*vidsw[adp->va_index]->set_win_org)(adp, pos); + vidd_set_win_org(adp, pos); bank = pos/banksize; } offset = pos%banksize; @@ -2710,7 +2710,7 @@ /* the line may cross the window boundary */ if (offset + cx > banksize) { ++bank; /* next bank */ - (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize); + vidd_set_win_org(adp, bank*banksize); end = offset + cx - banksize; fillw_io(val, adp->va_window, end/sizeof(u_int16_t)); } @@ -2740,7 +2740,7 @@ while (cy > 0) { pos = adp->va_line_width*y + x*3; if (bank != pos/banksize) { - (*vidsw[adp->va_index]->set_win_org)(adp, pos); + vidd_set_win_org(adp, pos); bank = pos/banksize; } offset = pos%banksize; @@ -2751,7 +2751,7 @@ /* the line may cross the window boundary */ if (offset + cx >= banksize) { ++bank; /* next bank */ - (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize); + vidd_set_win_org(adp, bank*banksize); j = 0; end = offset + cx - banksize; for (; j < end; i = (++i)%3, ++j) { @@ -2782,7 +2782,7 @@ while (cy > 0) { pos = adp->va_line_width*y + x*sizeof(u_int32_t); if (bank != pos/banksize) { - (*vidsw[adp->va_index]->set_win_org)(adp, pos); + vidd_set_win_org(adp, pos); bank = pos/banksize; } offset = pos%banksize; @@ -2792,7 +2792,7 @@ /* the line may cross the window boundary */ if (offset + cx > banksize) { ++bank; /* next bank */ - (*vidsw[adp->va_index]->set_win_org)(adp, bank*banksize); + vidd_set_win_org(adp, bank*banksize); end = offset + cx - banksize; filll_io(val, adp->va_window, end/sizeof(u_int32_t)); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/gem/if_gem.c#7 (text+ko) ==== @@ -1,6 +1,7 @@ /*- * Copyright (C) 2001 Eduardo Horvath. * Copyright (c) 2001-2003 Thomas Moestl + * Copyright (c) 2007 Marius Strobl * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.45 2007/10/13 00:24:09 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.46 2007/12/30 01:32:03 marius Exp $"); /* * Driver for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers @@ -83,53 +84,53 @@ CTASSERT(powerof2(GEM_NRXDESC) && GEM_NRXDESC >= 32 && GEM_NRXDESC <= 8192); CTASSERT(powerof2(GEM_NTXDESC) && GEM_NTXDESC >= 32 && GEM_NTXDESC <= 8192); -#define TRIES 10000 +#define TRIES 10000 /* - * The GEM hardware support basic TCP/UDP checksum offloading. However, + * The GEM hardware support basic TCP/UDP checksum offloading. However, * the hardware doesn't compensate the checksum for UDP datagram which - * can yield to 0x0. As a safe guard, UDP checksum offload is disabled - * by default. It can be reactivated by setting special link option + * can yield to 0x0. As a safe guard, UDP checksum offload is disabled + * by default. It can be reactivated by setting special link option * link0 with ifconfig(8). */ #define GEM_CSUM_FEATURES (CSUM_TCP) -static void gem_start(struct ifnet *); -static void gem_start_locked(struct ifnet *); -static void gem_stop(struct ifnet *, int); -static int gem_ioctl(struct ifnet *, u_long, caddr_t); -static void gem_cddma_callback(void *, bus_dma_segment_t *, int, int); -static __inline void gem_txcksum(struct gem_softc *, struct mbuf *, uint64_t *); -static __inline void gem_rxcksum(struct mbuf *, uint64_t); -static void gem_tick(void *); -static int gem_watchdog(struct gem_softc *); -static void gem_init(void *); -static void gem_init_locked(struct gem_softc *); -static void gem_init_regs(struct gem_softc *); -static u_int gem_ringsize(u_int); -static int gem_meminit(struct gem_softc *); -static struct mbuf *gem_defrag(struct mbuf *, int, int); -static int gem_load_txmbuf(struct gem_softc *, struct mbuf **); -static void gem_mifinit(struct gem_softc *); -static int gem_bitwait(struct gem_softc *, bus_addr_t, u_int32_t, - u_int32_t); -static void gem_reset(struct gem_softc *); -static int gem_reset_rx(struct gem_softc *); +static int gem_add_rxbuf(struct gem_softc *sc, int idx); +static int gem_bitwait(struct gem_softc *sc, bus_addr_t r, uint32_t clr, + uint32_t set); +static void gem_cddma_callback(void *xsc, bus_dma_segment_t *segs, + int nsegs, int error); +static struct mbuf *gem_defrag(struct mbuf *m0, int how, int maxfrags); +static int gem_disable_rx(struct gem_softc *sc); +static int gem_disable_tx(struct gem_softc *sc); +static void gem_eint(struct gem_softc *sc, u_int status); +static void gem_init(void *xsc); +static void gem_init_locked(struct gem_softc *sc); +static void gem_init_regs(struct gem_softc *sc); +static int gem_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data); +static int gem_load_txmbuf(struct gem_softc *sc, struct mbuf **m_head); +static int gem_meminit(struct gem_softc *sc); +static void gem_mifinit(struct gem_softc *sc); +static void gem_reset(struct gem_softc *sc); +static int gem_reset_rx(struct gem_softc *sc); static void gem_reset_rxdma(struct gem_softc *sc); -static int gem_reset_tx(struct gem_softc *); -static int gem_disable_rx(struct gem_softc *); -static int gem_disable_tx(struct gem_softc *); -static void gem_rxdrain(struct gem_softc *); -static int gem_add_rxbuf(struct gem_softc *, int); -static void gem_setladrf(struct gem_softc *); - -struct mbuf *gem_get(struct gem_softc *, int, int); -static void gem_eint(struct gem_softc *, u_int); -static void gem_rint(struct gem_softc *); +static int gem_reset_tx(struct gem_softc *sc); +static u_int gem_ringsize(u_int sz); +static void gem_rint(struct gem_softc *sc); #ifdef GEM_RINT_TIMEOUT -static void gem_rint_timeout(void *); +static void gem_rint_timeout(void *arg); #endif -static void gem_tint(struct gem_softc *); +static __inline void gem_rxcksum(struct mbuf *m, uint64_t flags); +static void gem_rxdrain(struct gem_softc *sc); +static void gem_setladrf(struct gem_softc *sc); +static void gem_start(struct ifnet *ifp); +static void gem_start_locked(struct ifnet *ifp); +static void gem_stop(struct ifnet *ifp, int disable); +static void gem_tick(void *arg); +static void gem_tint(struct gem_softc *sc); +static __inline void gem_txcksum(struct gem_softc *sc, struct mbuf *m, + uint64_t *cflags); +static int gem_watchdog(struct gem_softc *sc); devclass_t gem_devclass; DRIVER_MODULE(miibus, gem, miibus_driver, miibus_devclass, 0, 0); @@ -140,20 +141,13 @@ #define KTR_GEM KTR_CT2 #endif -#define GEM_NSEGS GEM_NTXDESC - -/* - * gem_attach: - * - * Attach a Gem interface to the system. - */ int -gem_attach(sc) - struct gem_softc *sc; +gem_attach(struct gem_softc *sc) { + struct gem_txsoft *txs; struct ifnet *ifp; - int i, error; - u_int32_t v; + int error, i; + uint32_t v; ifp = sc->sc_ifp = if_alloc(IFT_ETHER); if (ifp == NULL) @@ -170,8 +164,8 @@ error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, - &sc->sc_pdmatag); + BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, + NULL, &sc->sc_pdmatag); if (error) goto fail_ifnet; @@ -197,15 +191,15 @@ goto fail_ttag; /* - * Allocate the control data structures, and create and load the + * Allocate the control data structures, create and load the * DMA map for it. */ if ((error = bus_dmamem_alloc(sc->sc_cdmatag, (void **)&sc->sc_control_data, BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO, &sc->sc_cddmamap))) { - device_printf(sc->sc_dev, "unable to allocate control data," - " error = %d\n", error); + device_printf(sc->sc_dev, + "unable to allocate control data, error = %d\n", error); goto fail_ctag; } @@ -213,8 +207,9 @@ if ((error = bus_dmamap_load(sc->sc_cdmatag, sc->sc_cddmamap, sc->sc_control_data, sizeof(struct gem_control_data), gem_cddma_callback, sc, 0)) != 0 || sc->sc_cddma == 0) { - device_printf(sc->sc_dev, "unable to load control data DMA " - "map, error = %d\n", error); + device_printf(sc->sc_dev, + "unable to load control data DMA map, error = %d\n", + error); goto fail_cmem; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 30 13:25:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D789116A421; Sun, 30 Dec 2007 13:25:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84D6816A417 for ; Sun, 30 Dec 2007 13:25:48 +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 7228013C447 for ; Sun, 30 Dec 2007 13:25:48 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUDPmpR064239 for ; Sun, 30 Dec 2007 13:25:48 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUDPmpI064235 for perforce@freebsd.org; Sun, 30 Dec 2007 13:25:48 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 13:25:48 GMT Message-Id: <200712301325.lBUDPmpI064235@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 132092 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 13:25:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=132092 Change 132092 by hselasky@hselasky_laptop001 on 2007/12/30 13:25:10 First step converting "uchcom" to the new USB API. o Prefix all function names by "uchcom_". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#2 (text+ko) ==== @@ -216,11 +216,11 @@ static void uchcom_intr(usbd_xfer_handle, usbd_private_handle, usbd_status); -static int set_config(device_t ); -static int find_ifaces(struct uchcom_softc *, usbd_interface_handle *); -static int find_endpoints(struct uchcom_softc *, +static int uchcom_set_config(device_t ); +static int uchcom_find_ifaces(struct uchcom_softc *, usbd_interface_handle *); +static int uchcom_find_endpoints(struct uchcom_softc *, struct uchcom_endpoints *); -static void close_intr_pipe(struct uchcom_softc *); +static void uchcom_close_intr_pipe(struct uchcom_softc *); static int uchcom_match(device_t ); static int uchcom_attach(device_t ); @@ -270,7 +270,7 @@ DPRINTF(("\n\nuchcom attach: sc=%p\n", sc)); - if (set_config(self)) + if (uchcom_set_config(self)) goto failed; switch (uaa->release) { @@ -282,10 +282,10 @@ break; } - if (find_ifaces(sc, &ucom->sc_iface)) + if (uchcom_find_ifaces(sc, &ucom->sc_iface)) goto failed; - if (find_endpoints(sc, &endpoints)) + if (uchcom_find_endpoints(sc, &endpoints)) goto failed; sc->sc_intr_endpoint = endpoints.ep_intr; @@ -320,7 +320,7 @@ DPRINTF(("uchcom_detach: sc=%p flags=%d\n", sc, flags)); - close_intr_pipe(sc); + uchcom_close_intr_pipe(sc); ucom->sc_dying = 1; @@ -329,7 +329,7 @@ return rv; } static int -set_config(device_t dev) +uchcom_set_config(device_t dev) { struct uchcom_softc *sc = device_get_softc(dev); struct ucom_softc *ucom = &sc->sc_ucom; @@ -346,7 +346,7 @@ } static int -find_ifaces(struct uchcom_softc *sc, usbd_interface_handle *riface) +uchcom_find_ifaces(struct uchcom_softc *sc, usbd_interface_handle *riface) { usbd_status err; struct ucom_softc *ucom = &sc->sc_ucom; @@ -363,7 +363,7 @@ } static int -find_endpoints(struct uchcom_softc *sc, struct uchcom_endpoints *endpoints) +uchcom_find_endpoints(struct uchcom_softc *sc, struct uchcom_endpoints *endpoints) { struct ucom_softc *ucom= &sc->sc_ucom; int i, bin=-1, bout=-1, intr=-1, isize=0; @@ -427,7 +427,7 @@ */ static __inline usbd_status -generic_control_out(struct uchcom_softc *sc, uint8_t reqno, +uchcom_ctrl_write(struct uchcom_softc *sc, uint8_t reqno, uint16_t value, uint16_t index) { usb_device_request_t req; @@ -442,7 +442,7 @@ } static __inline usbd_status -generic_control_in(struct uchcom_softc *sc, uint8_t reqno, +uchcom_ctrl_read(struct uchcom_softc *sc, uint8_t reqno, uint16_t value, uint16_t index, void *buf, int buflen, int *actlen) { @@ -460,26 +460,26 @@ } static __inline usbd_status -write_reg(struct uchcom_softc *sc, +uchcom_write_reg(struct uchcom_softc *sc, uint8_t reg1, uint8_t val1, uint8_t reg2, uint8_t val2) { DPRINTF(("uchcom: write reg 0x%02X<-0x%02X, 0x%02X<-0x%02X\n", (unsigned)reg1, (unsigned)val1, (unsigned)reg2, (unsigned)val2)); - return generic_control_out( + return uchcom_ctrl_write( sc, UCHCOM_REQ_WRITE_REG, reg1|((uint16_t)reg2<<8), val1|((uint16_t)val2<<8)); } static __inline usbd_status -read_reg(struct uchcom_softc *sc, +uchcom_read_reg(struct uchcom_softc *sc, uint8_t reg1, uint8_t *rval1, uint8_t reg2, uint8_t *rval2) { uint8_t buf[UCHCOM_INPUT_BUF_SIZE]; usbd_status err; int actin; - err = generic_control_in( + err = uchcom_ctrl_read( sc, UCHCOM_REQ_READ_REG, reg1|((uint16_t)reg2<<8), 0, buf, sizeof buf, &actin); if (err) @@ -502,7 +502,7 @@ usbd_status err; int actin; - err = generic_control_in( + err = uchcom_ctrl_read( sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof buf, &actin); if (err) return err; @@ -513,21 +513,21 @@ } static __inline usbd_status -get_status(struct uchcom_softc *sc, uint8_t *rval) +uchcom_get_status(struct uchcom_softc *sc, uint8_t *rval) { - return read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL); + return uchcom_read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL); } static __inline usbd_status -set_dtrrts_10(struct uchcom_softc *sc, uint8_t val) +uchcom_set_dtrrts_10(struct uchcom_softc *sc, uint8_t val) { - return write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val); + return uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val); } static __inline usbd_status -set_dtrrts_20(struct uchcom_softc *sc, uint8_t val) +uchcom_set_dtrrts_20(struct uchcom_softc *sc, uint8_t val) { - return generic_control_out(sc, UCHCOM_REQ_SET_DTRRTS, val, 0); + return uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0); } @@ -536,7 +536,7 @@ */ static int -update_version(struct uchcom_softc *sc) +uchcom_update_version(struct uchcom_softc *sc) { usbd_status err; @@ -551,7 +551,7 @@ } static void -convert_status(struct uchcom_softc *sc, uint8_t cur) +uchcom_convert_status(struct uchcom_softc *sc, uint8_t cur) { sc->sc_dtr = !(cur & UCHCOM_DTR_MASK); sc->sc_rts = !(cur & UCHCOM_RTS_MASK); @@ -566,21 +566,21 @@ usbd_status err; uint8_t cur; - err = get_status(sc, &cur); + err = uchcom_get_status(sc, &cur); if (err) { device_printf(sc->sc_ucom.sc_dev, "cannot update status: %s\n", usbd_errstr(err)); return EIO; } - convert_status(sc, cur); + uchcom_convert_status(sc, cur); return 0; } static int -set_dtrrts(struct uchcom_softc *sc, int dtr, int rts) +uchcom_set_dtrrts(struct uchcom_softc *sc, int dtr, int rts) { usbd_status err; uint8_t val = 0; @@ -589,9 +589,9 @@ if (rts) val |= UCHCOM_RTS_MASK; if (sc->sc_version < UCHCOM_VER_20) - err = set_dtrrts_10(sc, ~val); + err = uchcom_set_dtrrts_10(sc, ~val); else - err = set_dtrrts_20(sc, ~val); + err = uchcom_set_dtrrts_20(sc, ~val); if (err) { device_printf(sc->sc_ucom.sc_dev, "cannot set DTR/RTS: %s\n", @@ -603,12 +603,12 @@ } static int -set_break(struct uchcom_softc *sc, int onoff) +uchcom_set_break(struct uchcom_softc *sc, int onoff) { usbd_status err; uint8_t brk1, brk2; - err = read_reg(sc, UCHCOM_REG_BREAK1, &brk1, UCHCOM_REG_BREAK2, &brk2); + err = uchcom_read_reg(sc, UCHCOM_REG_BREAK1, &brk1, UCHCOM_REG_BREAK2, &brk2); if (err) return EIO; if (onoff) { @@ -620,7 +620,7 @@ brk1 |= UCHCOM_BRK1_MASK; brk2 |= UCHCOM_BRK2_MASK; } - err = write_reg(sc, UCHCOM_REG_BREAK1, brk1, UCHCOM_REG_BREAK2, brk2); + err = uchcom_write_reg(sc, UCHCOM_REG_BREAK1, brk1, UCHCOM_REG_BREAK2, brk2); if (err) return EIO; @@ -628,7 +628,7 @@ } static int -calc_divider_settings(struct uchcom_divider *dp, uint32_t rate) +uchcom_calc_divider_settings(struct uchcom_divider *dp, uint32_t rate) { int i; const struct uchcom_divider_record *rp; @@ -667,18 +667,18 @@ } static int -set_dte_rate(struct uchcom_softc *sc, uint32_t rate) +uchcom_set_dte_rate(struct uchcom_softc *sc, uint32_t rate) { usbd_status err; struct uchcom_divider dv; - if (calc_divider_settings(&dv, rate)) + if (uchcom_calc_divider_settings(&dv, rate)) return EINVAL; - if ((err = write_reg(sc, + if ((err = uchcom_write_reg(sc, UCHCOM_REG_BPS_PRE, dv.dv_prescaler, UCHCOM_REG_BPS_DIV, dv.dv_div)) || - (err = write_reg(sc, + (err = uchcom_write_reg(sc, UCHCOM_REG_BPS_MOD, dv.dv_mod, UCHCOM_REG_BPS_PAD, 0))) { device_printf(sc->sc_ucom.sc_dev, " cannot set DTE rate: %s\n", @@ -690,12 +690,12 @@ } static int -set_line_control(struct uchcom_softc *sc, tcflag_t cflag) +uchcom_set_line_control(struct uchcom_softc *sc, tcflag_t cflag) { usbd_status err; uint8_t lcr1 = 0, lcr2 = 0; - err = read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); + err = uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); if (err) { device_printf(sc->sc_ucom.sc_dev, " cannot get LCR: %s\n", usbd_errstr(err)); @@ -731,7 +731,7 @@ lcr2 |= UCHCOM_LCR2_PAREVEN; } - err = write_reg(sc, UCHCOM_REG_LCR1, lcr1, UCHCOM_REG_LCR2, lcr2); + err = uchcom_write_reg(sc, UCHCOM_REG_LCR1, lcr1, UCHCOM_REG_LCR2, lcr2); if (err) { device_printf(sc->sc_ucom.sc_dev, "cannot set LCR: %s\n", usbd_errstr(err)); @@ -742,12 +742,12 @@ } static int -clear_chip(struct uchcom_softc *sc) +uchcom_clear_chip(struct uchcom_softc *sc) { usbd_status err; DPRINTF(("%s: clear\n", USBDEVNAME(sc->sc_dev))); - err = generic_control_out(sc, UCHCOM_REQ_RESET, 0, 0); + err = uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, 0, 0); if (err) { device_printf(sc->sc_ucom.sc_dev, "cannot clear: %s\n", usbd_errstr(err)); @@ -758,21 +758,21 @@ } static int -reset_chip(struct uchcom_softc *sc) +uchcom_reset_chip(struct uchcom_softc *sc) { usbd_status err; uint8_t lcr1, lcr2, pre, div, mod; uint16_t val=0, idx=0; - err = read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); + err = uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); if (err) goto failed; - err = read_reg(sc, UCHCOM_REG_BPS_PRE, &pre, UCHCOM_REG_BPS_DIV, &div); + err = uchcom_read_reg(sc, UCHCOM_REG_BPS_PRE, &pre, UCHCOM_REG_BPS_DIV, &div); if (err) goto failed; - err = read_reg(sc, UCHCOM_REG_BPS_MOD, &mod, UCHCOM_REG_BPS_PAD, NULL); + err = uchcom_read_reg(sc, UCHCOM_REG_BPS_MOD, &mod, UCHCOM_REG_BPS_PAD, NULL); if (err) goto failed; @@ -790,7 +790,7 @@ DPRINTF(("%s: reset v=0x%04X, i=0x%04X\n", USBDEVNAME(sc->sc_dev), val, idx)); - err = generic_control_out(sc, UCHCOM_REQ_RESET, val, idx); + err = uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, val, idx); if (err) goto failed; @@ -803,23 +803,23 @@ } static int -setup_comm(struct uchcom_softc *sc) +uchcom_setup_comm(struct uchcom_softc *sc) { int ret; - ret = update_version(sc); + ret = uchcom_update_version(sc); if (ret) return ret; - ret = clear_chip(sc); + ret = uchcom_clear_chip(sc); if (ret) return ret; - ret = set_dte_rate(sc, TTYDEF_SPEED); + ret = uchcom_set_dte_rate(sc, TTYDEF_SPEED); if (ret) return ret; - ret = set_line_control(sc, CS8); + ret = uchcom_set_line_control(sc, CS8); if (ret) return ret; @@ -827,16 +827,16 @@ if (ret) return ret; - ret = reset_chip(sc); + ret = uchcom_reset_chip(sc); if (ret) return ret; - ret = set_dte_rate(sc, TTYDEF_SPEED); /* XXX */ + ret = uchcom_set_dte_rate(sc, TTYDEF_SPEED); /* XXX */ if (ret) return ret; sc->sc_dtr = sc->sc_rts = 1; - ret = set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); + ret = uchcom_set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); if (ret) return ret; @@ -844,7 +844,7 @@ } static int -setup_intr_pipe(struct uchcom_softc *sc) +uchcom_setup_intr_pipe(struct uchcom_softc *sc) { usbd_status err; struct ucom_softc *ucom = &sc->sc_ucom; @@ -868,7 +868,7 @@ } static void -close_intr_pipe(struct uchcom_softc *sc) +uchcom_close_intr_pipe(struct uchcom_softc *sc) { usbd_status err; struct ucom_softc *ucom = &sc->sc_ucom; @@ -896,7 +896,7 @@ * methods for ucom */ void -uchcom_get_status(void *arg, int portno, u_char *rlsr, u_char *rmsr) +uchcom_uchcom_get_status(void *arg, int portno, u_char *rlsr, u_char *rmsr) { struct uchcom_softc *sc = arg; @@ -918,14 +918,14 @@ switch (reg) { case UCOM_SET_DTR: sc->sc_dtr = !!onoff; - set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); + uchcom_set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); break; case UCOM_SET_RTS: sc->sc_rts = !!onoff; - set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); + uchcom_set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); break; case UCOM_SET_BREAK: - set_break(sc, onoff); + uchcom_set_break(sc, onoff); break; } } @@ -939,11 +939,11 @@ if (sc->sc_ucom.sc_dying) return 0; - ret = set_line_control(sc, t->c_cflag); + ret = uchcom_set_line_control(sc, t->c_cflag); if (ret) return ret; - ret = set_dte_rate(sc, t->c_ospeed); + ret = uchcom_set_dte_rate(sc, t->c_ospeed); if (ret) return ret; @@ -959,11 +959,11 @@ if (sc->sc_ucom.sc_dying) return EIO; - ret = setup_intr_pipe(sc); + ret = uchcom_setup_intr_pipe(sc); if (ret) return ret; - ret = setup_comm(sc); + ret = uchcom_setup_comm(sc); if (ret) return ret; @@ -978,7 +978,7 @@ if (sc->sc_ucom.sc_dying) return; - close_intr_pipe(sc); + uchcom_close_intr_pipe(sc); } @@ -1012,7 +1012,7 @@ (unsigned)buf[4], (unsigned)buf[5], (unsigned)buf[6], (unsigned)buf[7])); - convert_status(sc, buf[UCHCOM_INTR_STAT1]); + uchcom_convert_status(sc, buf[UCHCOM_INTR_STAT1]); ucom_status_change(&sc->sc_ucom); } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 13:27:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F403E16A41B; Sun, 30 Dec 2007 13:27:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B9EDF16A418 for ; Sun, 30 Dec 2007 13:27:50 +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 A8ED213C457 for ; Sun, 30 Dec 2007 13:27:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUDRoJ0064415 for ; Sun, 30 Dec 2007 13:27:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUDRo8n064412 for perforce@freebsd.org; Sun, 30 Dec 2007 13:27:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 13:27:50 GMT Message-Id: <200712301327.lBUDRo8n064412@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 132093 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 13:27:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=132093 Change 132093 by hselasky@hselasky_laptop001 on 2007/12/30 13:27:44 Get device methods right. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#3 (text+ko) ==== @@ -222,9 +222,9 @@ struct uchcom_endpoints *); static void uchcom_close_intr_pipe(struct uchcom_softc *); -static int uchcom_match(device_t ); -static int uchcom_attach(device_t ); -static int uchcom_detach(device_t ); +static device_probe_t uchcom_probe; +static device_attach_t uchcom_attach; +static device_detach_t uchcom_detach; struct ucom_callback uchcom_callback = { .ucom_get_status = uchcom_get_status, @@ -244,7 +244,7 @@ * driver entry points */ -static int uchcom_match(device_t self) +static int uchcom_probe(device_t self) { struct usb_attach_arg *uaa = device_get_ivars(self); @@ -1018,7 +1018,7 @@ static device_method_t uchcom_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, uchcom_match), + DEVMETHOD(device_probe, uchcom_probe), DEVMETHOD(device_attach, uchcom_attach), DEVMETHOD(device_detach, uchcom_detach), From owner-p4-projects@FreeBSD.ORG Sun Dec 30 13:51:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7861216A469; Sun, 30 Dec 2007 13:51: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 3B63416A417 for ; Sun, 30 Dec 2007 13:51:15 +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 2975213C459 for ; Sun, 30 Dec 2007 13:51:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUDpE8F072474 for ; Sun, 30 Dec 2007 13:51:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUDpExO072471 for perforce@freebsd.org; Sun, 30 Dec 2007 13:51:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 13:51:14 GMT Message-Id: <200712301351.lBUDpExO072471@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 132094 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 13:51:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=132094 Change 132094 by hselasky@hselasky_laptop001 on 2007/12/30 13:50:55 Getting the uchcom probe and attach routines right. Some code borrowed from uplcom. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#4 (text+ko) ==== @@ -147,26 +147,23 @@ #define UCHCOM_INTR_STAT2 0x03 #define UCHCOM_INTR_LEAST 4 -#define UCHCOMIBUFSIZE 256 -#define UCHCOMOBUFSIZE 256 +#define UCHCOM_BULK_BUF_SIZE 1024 /* bytes */ +#define UCHCOM_N_TRANSFER 6 /* units */ + +struct uchcom_softc { + struct ucom_super_softc sc_super_ucom; + struct ucom_softc sc_ucom; -struct uchcom_softc -{ - struct ucom_softc sc_ucom; + struct usbd_xfer *sc_xfer[UCHCOM_N_TRANSFER]; + struct usbd_device *sc_udev; - /* */ - int sc_intr_endpoint; - int sc_intr_size; - usbd_pipe_handle sc_intr_pipe; - u_char *sc_intr_buf; - /* */ - uint8_t sc_version; - int sc_dtr; - int sc_rts; - u_char sc_lsr; - u_char sc_msr; - int sc_lcr1; - int sc_lcr2; + uint8_t sc_version; + uint8_t sc_msr; + uint8_t sc_lsr; /* local status register */ + uint8_t sc_flag; +#define UCHCOM_FLAG_INTR_STALL 0x01 +#define UCHCOM_FLAG_READ_STALL 0x02 +#define UCHCOM_FLAG_WRITE_STALL 0x04 }; struct uchcom_endpoints @@ -213,19 +210,78 @@ static int uchcom_param(void *, int, struct termios *); static int uchcom_open(void *, int); static void uchcom_close(void *, int); -static void uchcom_intr(usbd_xfer_handle, usbd_private_handle, - usbd_status); - -static int uchcom_set_config(device_t ); -static int uchcom_find_ifaces(struct uchcom_softc *, usbd_interface_handle *); -static int uchcom_find_endpoints(struct uchcom_softc *, - struct uchcom_endpoints *); -static void uchcom_close_intr_pipe(struct uchcom_softc *); static device_probe_t uchcom_probe; static device_attach_t uchcom_attach; static device_detach_t uchcom_detach; +static usbd_callback_t uchcom_intr_callback; +static usbd_callback_t uchcom_intr_clear_stall_callback; +static usbd_callback_t uchcom_write_callback; +static usbd_callback_t uchcom_write_clear_stall_callback; +static usbd_callback_t uchcom_read_callback; +static usbd_callback_t uchcom_read_clear_stall_callback; + +static const struct usbd_config uchcom_config_data[UCHCOM_N_TRANSFER] = { + + [0] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_OUT, + .bufsize = UCHCOM_BULK_BUF_SIZE, + .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,}, + .mh.callback = &uchcom_write_callback, + }, + + [1] = { + .type = UE_BULK, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .bufsize = UCHCOM_BULK_BUF_SIZE, + .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .mh.callback = &uchcom_read_callback, + }, + + [2] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .bufsize = sizeof(usb_device_request_t), + .mh.callback = &uchcom_write_clear_stall_callback, + .mh.timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ + }, + + [3] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .bufsize = sizeof(usb_device_request_t), + .mh.callback = &uchcom_read_clear_stall_callback, + .mh.timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ + }, + + [4] = { + .type = UE_INTERRUPT, + .endpoint = UE_ADDR_ANY, + .direction = UE_DIR_IN, + .mh.flags = {.pipe_bof = 1,.short_xfer_ok = 1,}, + .bufsize = 0, /* use wMaxPacketSize */ + .mh.callback = &uchcom_intr_callback, + }, + + [5] = { + .type = UE_CONTROL, + .endpoint = 0x00, /* Control pipe */ + .direction = UE_DIR_ANY, + .bufsize = sizeof(usb_device_request_t), + .mh.callback = &uchcom_intr_clear_stall_callback, + .mh.timeout = 1000, /* 1 second */ + .interval = 50, /* 50ms */ + }, +}; + struct ucom_callback uchcom_callback = { .ucom_get_status = uchcom_get_status, .ucom_set = uchcom_set, @@ -238,190 +294,106 @@ }; - - /* ---------------------------------------------------------------------- * driver entry points */ -static int uchcom_probe(device_t self) +static int +uchcom_probe(device_t dev) { - struct usb_attach_arg *uaa = device_get_ivars(self); + struct usb_attach_arg *uaa = device_get_ivars(dev); + + DPRINTF(10, "\n"); + + if (uaa->usb_mode != USB_MODE_HOST) { + return (UMATCH_NONE); + } + + if (uaa->iface) { + return (UMATCH_NONE); + } return (uchcom_lookup(uaa->vendor, uaa->product) != NULL ? UMATCH_VENDOR_PRODUCT : UMATCH_NONE); } -static int uchcom_attach(device_t self) +static int +uchcom_attach(device_t dev) { - struct uchcom_softc *sc = device_get_softc(self); - struct usb_attach_arg *uaa = device_get_ivars(self); - usbd_device_handle dev = uaa->device; + struct uchcom_softc *sc = device_get_softc(dev); + struct usb_attach_arg *uaa = device_get_ivars(dev); + int error; + uint8_t iface_index; + + DPRINTF(10, "\n"); - struct uchcom_endpoints endpoints; - struct ucom_softc *ucom = &sc->sc_ucom; + if (sc == NULL) { + return (ENOMEM); + } + usbd_set_device_desc(dev); - ucom->sc_dev = self; - ucom->sc_udev = dev; + sc->sc_udev = uaa->device; - ucom->sc_dying = 0; - sc->sc_dtr = sc->sc_rts = -1; - sc->sc_lsr = sc->sc_msr = 0; + /* configure the chip */ - DPRINTF(("\n\nuchcom attach: sc=%p\n", sc)); + error = usbd_set_config_index(uaa->device, UCHCOM_CONFIG_INDEX, 1); - if (uchcom_set_config(self)) - goto failed; + if (error) { + device_printf(dev, "failed to set configuration, " + "error=%s\n", usbd_errstr(error)); + goto detach; + } switch (uaa->release) { case UCHCOM_REV_CH340: - device_printf(self, "CH340 detected\n"); + device_printf(dev, "CH340 detected\n"); break; default: - device_printf(self, "CH341 detected\n"); + device_printf(dev, "CH341 detected\n"); break; } - if (uchcom_find_ifaces(sc, &ucom->sc_iface)) - goto failed; + iface_index = UCHCOM_IFACE_INDEX; + error = usbd_transfer_setup(uaa->device, + &iface_index, sc->sc_xfer, uchcom_config_data, + UCHCOM_N_TRANSFER, sc, &Giant); - if (uchcom_find_endpoints(sc, &endpoints)) - goto failed; + if (error) { + DPRINTF(0, "one or more missing USB endpoints, " + "error=%s\n", usbd_errstr(error)); + goto detach; + } - sc->sc_intr_endpoint = endpoints.ep_intr; - sc->sc_intr_size = endpoints.ep_intr_size; + /* clear stall at first run */ + sc->sc_flag |= (UCHCOM_FLAG_READ_STALL | + UCHCOM_FLAG_WRITE_STALL); - /* setup ucom layer */ - ucom->sc_portno = UCOM_UNK_PORTNO; - ucom->sc_bulkin_no = endpoints.ep_bulkin; - ucom->sc_bulkout_no = endpoints.ep_bulkout; - ucom->sc_ibufsize = UCHCOMIBUFSIZE; - ucom->sc_obufsize = UCHCOMOBUFSIZE; - ucom->sc_ibufsizepad = UCHCOMIBUFSIZE; - ucom->sc_opkthdrlen = 0; - ucom->sc_parent = sc; - - ucom->sc_callback = &uchcom_callback; - - ucom_attach(&sc->sc_ucom); - + error = ucom_attach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1, sc, + &uchcom_callback, &Giant); + if (error) { + goto detach; + } return 0; -failed: - ucom->sc_dying = 1; - return ENXIO; +detach: + uchcom_detach(dev); + return (ENXIO); } -static int uchcom_detach(device_t self) -{ - struct uchcom_softc *sc = device_get_softc(self); - struct ucom_softc *ucom = &sc->sc_ucom ; - int rv = 0; - - DPRINTF(("uchcom_detach: sc=%p flags=%d\n", sc, flags)); - - uchcom_close_intr_pipe(sc); - - ucom->sc_dying = 1; - - rv = ucom_detach(ucom); - - return rv; -} static int -uchcom_set_config(device_t dev) +uchcom_detach(device_t dev) { struct uchcom_softc *sc = device_get_softc(dev); - struct ucom_softc *ucom = &sc->sc_ucom; - usbd_status err; - - err = usbd_set_config_index(ucom->sc_udev, UCHCOM_CONFIG_INDEX, 1); - if (err) { - device_printf(dev, "failed to set configuration: %s\n", - usbd_errstr(err)); - return -1; - } - return 0; -} + DPRINTF(10, "\n"); -static int -uchcom_find_ifaces(struct uchcom_softc *sc, usbd_interface_handle *riface) -{ - usbd_status err; - struct ucom_softc *ucom = &sc->sc_ucom; + ucom_detach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1); - err = usbd_device2interface_handle(ucom->sc_udev, UCHCOM_IFACE_INDEX, - riface); - if (err) { - device_printf(ucom->sc_dev, "failed to get interface: %s\n", - usbd_errstr(err)); - return -1; - } + usbd_transfer_unsetup(sc->sc_xfer, UCHCOM_N_TRANSFER); - return 0; -} - -static int -uchcom_find_endpoints(struct uchcom_softc *sc, struct uchcom_endpoints *endpoints) -{ - struct ucom_softc *ucom= &sc->sc_ucom; - int i, bin=-1, bout=-1, intr=-1, isize=0; - usb_interface_descriptor_t *id; - usb_endpoint_descriptor_t *ed; - - id = usbd_get_interface_descriptor(ucom->sc_iface); - - for (i = 0; i < id->bNumEndpoints; i++) { - ed = usbd_interface2endpoint_descriptor(ucom->sc_iface, i); - if (ed == NULL) { - device_printf(ucom->sc_dev, "no endpoint descriptor for %d\n", i); - return -1; - } - - if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - UE_GET_XFERTYPE(ed->bmAttributes) == UE_INTERRUPT) { - intr = ed->bEndpointAddress; - isize = UGETW(ed->wMaxPacketSize); - } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN && - UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) { - bin = ed->bEndpointAddress; - } else if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT && - UE_GET_XFERTYPE(ed->bmAttributes) == UE_BULK) { - bout = ed->bEndpointAddress; - } - } - - if (intr == -1 || bin == -1 || bout == -1) { - if (intr == -1) { - device_printf(ucom->sc_dev, "no interrupt end point\n"); - } - if (bin == -1) { - device_printf(ucom->sc_dev, "no data bulk in end point\n"); - - } - if (bout == -1) { - device_printf(ucom->sc_dev, "no data bulk out end point\n"); - } - return -1; - } - if (isize < UCHCOM_INTR_LEAST) { - device_printf(ucom->sc_dev, "intr pipe is too short"); - return -1; - } - - DPRINTF(("%s: bulkin=%d, bulkout=%d, intr=%d, isize=%d\n", - USBDEVNAME(sc->sc_dev), bin, bout, intr, isize)); - - endpoints->ep_intr = intr; - endpoints->ep_intr_size = isize; - endpoints->ep_bulkin = bin; - endpoints->ep_bulkout = bout; - - return 0; + return (0); } - /* ---------------------------------------------------------------------- * low level i/o */ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 13:53:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B50B16A46B; Sun, 30 Dec 2007 13:53:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B51F16A41B for ; Sun, 30 Dec 2007 13:53:17 +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 29F5813C4EF for ; Sun, 30 Dec 2007 13:53:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUDrHFv073454 for ; Sun, 30 Dec 2007 13:53:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUDrHxK073450 for perforce@freebsd.org; Sun, 30 Dec 2007 13:53:17 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 13:53:17 GMT Message-Id: <200712301353.lBUDrHxK073450@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 132095 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 13:53:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=132095 Change 132095 by hselasky@hselasky_laptop001 on 2007/12/30 13:53:16 Get rid if inlining. These functions are not time critical. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#5 (text+ko) ==== @@ -398,7 +398,7 @@ * low level i/o */ -static __inline usbd_status +static usbd_status uchcom_ctrl_write(struct uchcom_softc *sc, uint8_t reqno, uint16_t value, uint16_t index) { @@ -413,7 +413,7 @@ return usbd_do_request(sc->sc_ucom.sc_udev, &req, 0); } -static __inline usbd_status +static usbd_status uchcom_ctrl_read(struct uchcom_softc *sc, uint8_t reqno, uint16_t value, uint16_t index, void *buf, int buflen, int *actlen) @@ -431,7 +431,7 @@ USBD_DEFAULT_TIMEOUT); } -static __inline usbd_status +static usbd_status uchcom_write_reg(struct uchcom_softc *sc, uint8_t reg1, uint8_t val1, uint8_t reg2, uint8_t val2) { @@ -443,7 +443,7 @@ reg1|((uint16_t)reg2<<8), val1|((uint16_t)val2<<8)); } -static __inline usbd_status +static usbd_status uchcom_read_reg(struct uchcom_softc *sc, uint8_t reg1, uint8_t *rval1, uint8_t reg2, uint8_t *rval2) { @@ -467,7 +467,7 @@ return USBD_NORMAL_COMPLETION; } -static __inline usbd_status +static usbd_status get_version(struct uchcom_softc *sc, uint8_t *rver) { uint8_t buf[UCHCOM_INPUT_BUF_SIZE]; @@ -484,19 +484,19 @@ return USBD_NORMAL_COMPLETION; } -static __inline usbd_status +static usbd_status uchcom_get_status(struct uchcom_softc *sc, uint8_t *rval) { return uchcom_read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL); } -static __inline usbd_status +static usbd_status uchcom_set_dtrrts_10(struct uchcom_softc *sc, uint8_t val) { return uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val); } -static __inline usbd_status +static usbd_status uchcom_set_dtrrts_20(struct uchcom_softc *sc, uint8_t val) { return uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 13:55:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C6A4616A421; Sun, 30 Dec 2007 13:55: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 8C02216A418 for ; Sun, 30 Dec 2007 13:55:19 +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 7A99D13C43E for ; Sun, 30 Dec 2007 13:55:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUDtJLt075525 for ; Sun, 30 Dec 2007 13:55:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUDtJGN075522 for perforce@freebsd.org; Sun, 30 Dec 2007 13:55:19 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 13:55:19 GMT Message-Id: <200712301355.lBUDtJGN075522@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 132096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 13:55:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=132096 Change 132096 by hselasky@hselasky_laptop001 on 2007/12/30 13:54:20 Prefix function name by "uchcom_". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#6 (text+ko) ==== @@ -468,7 +468,7 @@ } static usbd_status -get_version(struct uchcom_softc *sc, uint8_t *rver) +uchcom_get_version(struct uchcom_softc *sc, uint8_t *rver) { uint8_t buf[UCHCOM_INPUT_BUF_SIZE]; usbd_status err; @@ -512,7 +512,7 @@ { usbd_status err; - err = get_version(sc, &sc->sc_version); + err = uchcom_get_version(sc, &sc->sc_version); if (err) { device_printf(sc->sc_ucom.sc_dev, "cannot get version: %s\n", usbd_errstr(err)); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 13:57:23 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4E8316A41B; Sun, 30 Dec 2007 13:57:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89FBA16A419 for ; Sun, 30 Dec 2007 13:57:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 312C013C458 for ; Sun, 30 Dec 2007 13:57:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUDvMCn075639 for ; Sun, 30 Dec 2007 13:57:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUDvLXG075636 for perforce@freebsd.org; Sun, 30 Dec 2007 13:57:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 13:57:21 GMT Message-Id: <200712301357.lBUDvLXG075636@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 132097 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 13:57:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=132097 Change 132097 by hselasky@hselasky_laptop001 on 2007/12/30 13:57:15 Style change. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#7 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#7 (text+ko) ==== @@ -373,7 +373,7 @@ if (error) { goto detach; } - return 0; + return (0); detach: uchcom_detach(dev); @@ -410,7 +410,7 @@ USETW(req.wIndex, index); USETW(req.wLength, 0); - return usbd_do_request(sc->sc_ucom.sc_udev, &req, 0); + return (usbd_do_request(sc->sc_ucom.sc_udev, &req, 0)); } static usbd_status @@ -426,9 +426,9 @@ USETW(req.wIndex, index); USETW(req.wLength, (uint16_t)buflen); - return usbd_do_request_flags(sc->sc_ucom.sc_udev, &req, buf, + return (usbd_do_request_flags(sc->sc_ucom.sc_udev, &req, buf, USBD_SHORT_XFER_OK, actlen, - USBD_DEFAULT_TIMEOUT); + USBD_DEFAULT_TIMEOUT)); } static usbd_status @@ -438,9 +438,9 @@ DPRINTF(("uchcom: write reg 0x%02X<-0x%02X, 0x%02X<-0x%02X\n", (unsigned)reg1, (unsigned)val1, (unsigned)reg2, (unsigned)val2)); - return uchcom_ctrl_write( + return (uchcom_ctrl_write( sc, UCHCOM_REQ_WRITE_REG, - reg1|((uint16_t)reg2<<8), val1|((uint16_t)val2<<8)); + reg1|((uint16_t)reg2<<8), val1|((uint16_t)val2<<8))); } static usbd_status @@ -455,7 +455,7 @@ sc, UCHCOM_REQ_READ_REG, reg1|((uint16_t)reg2<<8), 0, buf, sizeof buf, &actin); if (err) - return err; + return (err); DPRINTF(("uchcom: read reg 0x%02X->0x%02X, 0x%02X->0x%02X\n", (unsigned)reg1, (unsigned)buf[0], @@ -464,7 +464,7 @@ if (rval1) *rval1 = buf[0]; if (rval2) *rval2 = buf[1]; - return USBD_NORMAL_COMPLETION; + return (USBD_NORMAL_COMPLETION); } static usbd_status @@ -477,29 +477,29 @@ err = uchcom_ctrl_read( sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof buf, &actin); if (err) - return err; + return (err); if (rver) *rver = buf[0]; - return USBD_NORMAL_COMPLETION; + return (USBD_NORMAL_COMPLETION); } static usbd_status uchcom_get_status(struct uchcom_softc *sc, uint8_t *rval) { - return uchcom_read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL); + return (uchcom_read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL)); } static usbd_status uchcom_set_dtrrts_10(struct uchcom_softc *sc, uint8_t val) { - return uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val); + return (uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val)); } static usbd_status uchcom_set_dtrrts_20(struct uchcom_softc *sc, uint8_t val) { - return uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0); + return (uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0)); } @@ -516,10 +516,10 @@ if (err) { device_printf(sc->sc_ucom.sc_dev, "cannot get version: %s\n", usbd_errstr(err)); - return EIO; + return (EIO); } - return 0; + return (0); } static void @@ -543,11 +543,11 @@ device_printf(sc->sc_ucom.sc_dev, "cannot update status: %s\n", usbd_errstr(err)); - return EIO; + return (EIO); } uchcom_convert_status(sc, cur); - return 0; + return (0); } @@ -568,10 +568,10 @@ if (err) { device_printf(sc->sc_ucom.sc_dev, "cannot set DTR/RTS: %s\n", usbd_errstr(err)); - return EIO; + return (EIO); } - return 0; + return (0); } static int @@ -582,7 +582,7 @@ err = uchcom_read_reg(sc, UCHCOM_REG_BREAK1, &brk1, UCHCOM_REG_BREAK2, &brk2); if (err) - return EIO; + return (EIO); if (onoff) { /* on - clear bits */ brk1 &= ~UCHCOM_BRK1_MASK; @@ -594,9 +594,9 @@ } err = uchcom_write_reg(sc, UCHCOM_REG_BREAK1, brk1, UCHCOM_REG_BREAK2, brk2); if (err) - return EIO; + return (EIO); - return 0; + return (0); } static int @@ -614,7 +614,7 @@ goto found; } } - return -1; + return (-1); found: dp->dv_prescaler = rp->dvr_divider.dv_prescaler; @@ -624,7 +624,7 @@ div = rp->dvr_base_clock / rate; rem = rp->dvr_base_clock % rate; if (div==0 || div>=0xFF) - return -1; + return (-1); if ((rem<<1) >= rate) div += 1; dp->dv_div = (uint8_t)-div; @@ -635,7 +635,7 @@ dp->dv_mod = mod / 0x100; - return 0; + return (0); } static int @@ -645,7 +645,7 @@ struct uchcom_divider dv; if (uchcom_calc_divider_settings(&dv, rate)) - return EINVAL; + return (EINVAL); if ((err = uchcom_write_reg(sc, UCHCOM_REG_BPS_PRE, dv.dv_prescaler, @@ -655,10 +655,10 @@ UCHCOM_REG_BPS_PAD, 0))) { device_printf(sc->sc_ucom.sc_dev, " cannot set DTE rate: %s\n", usbd_errstr(err)); - return EIO; + return (EIO); } - return 0; + return (0); } static int @@ -671,7 +671,7 @@ if (err) { device_printf(sc->sc_ucom.sc_dev, " cannot get LCR: %s\n", usbd_errstr(err)); - return EIO; + return (EIO); } lcr1 &= ~UCHCOM_LCR1_MASK; @@ -690,7 +690,7 @@ case CS5: case CS6: case CS7: - return EINVAL; + return (EINVAL); case CS8: break; } @@ -707,10 +707,10 @@ if (err) { device_printf(sc->sc_ucom.sc_dev, "cannot set LCR: %s\n", usbd_errstr(err)); - return EIO; + return (EIO); } - return 0; + return (0); } static int @@ -723,10 +723,10 @@ if (err) { device_printf(sc->sc_ucom.sc_dev, "cannot clear: %s\n", usbd_errstr(err)); - return EIO; + return (EIO); } - return 0; + return (0); } static int @@ -766,12 +766,12 @@ if (err) goto failed; - return 0; + return (0); failed: device_printf(sc->sc_ucom.sc_dev, "cannot reset: %s\n", usbd_errstr(err)); - return EIO; + return (EIO); } static int @@ -781,38 +781,38 @@ ret = uchcom_update_version(sc); if (ret) - return ret; + return (ret); ret = uchcom_clear_chip(sc); if (ret) - return ret; + return (ret); ret = uchcom_set_dte_rate(sc, TTYDEF_SPEED); if (ret) - return ret; + return (ret); ret = uchcom_set_line_control(sc, CS8); if (ret) - return ret; + return (ret); ret = update_status(sc); if (ret) - return ret; + return (ret); ret = uchcom_reset_chip(sc); if (ret) - return ret; + return (ret); ret = uchcom_set_dte_rate(sc, TTYDEF_SPEED); /* XXX */ if (ret) - return ret; + return (ret); sc->sc_dtr = sc->sc_rts = 1; ret = uchcom_set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); if (ret) - return ret; + return (ret); - return 0; + return (0); } static int @@ -833,10 +833,10 @@ device_printf(ucom->sc_dev, "cannot open interrupt pipe: %s\n", usbd_errstr(err)); - return EIO; + return (EIO); } } - return 0; + return (0); } static void @@ -909,17 +909,17 @@ int ret; if (sc->sc_ucom.sc_dying) - return 0; + return (0); ret = uchcom_set_line_control(sc, t->c_cflag); if (ret) - return ret; + return (ret); ret = uchcom_set_dte_rate(sc, t->c_ospeed); if (ret) - return ret; + return (ret); - return 0; + return (0); } int @@ -929,17 +929,17 @@ struct uchcom_softc *sc = arg; if (sc->sc_ucom.sc_dying) - return EIO; + return (EIO); ret = uchcom_setup_intr_pipe(sc); if (ret) - return ret; + return (ret); ret = uchcom_setup_comm(sc); if (ret) - return ret; + return (ret); - return 0; + return (0); } void From owner-p4-projects@FreeBSD.ORG Sun Dec 30 14:24:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B59216A46B; Sun, 30 Dec 2007 14:24:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D154516A468 for ; Sun, 30 Dec 2007 14:24:50 +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 C0BD613C46E for ; Sun, 30 Dec 2007 14:24:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUEOoYx087007 for ; Sun, 30 Dec 2007 14:24:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUEOoVf086999 for perforce@freebsd.org; Sun, 30 Dec 2007 14:24:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 14:24:50 GMT Message-Id: <200712301424.lBUEOoVf086999@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 132098 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 14:24:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=132098 Change 132098 by hselasky@hselasky_laptop001 on 2007/12/30 14:24:09 "usb_control_msg" should return the actual transfer length in case of success. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#21 (text+ko) ==== @@ -577,12 +577,20 @@ return (err); } -/* The following function performs a control transfer sequence one any +/*------------------------------------------------------------------------* + * usb_control_msg + * + * The following function performs a control transfer sequence one any * control, bulk or interrupt endpoint, specified by "uhe". A control * transfer means that you transfer an 8-byte header first followed by * a data-phase as indicated by the 8-byte header. The "timeout" is * given in milliseconds. - */ + * + * Return values: + * 0: Success + * < 0: Failure + * > 0: Acutal length + *------------------------------------------------------------------------*/ int32_t usb_control_msg(struct usb_device *dev, struct usb_host_endpoint *uhe, uint8_t request, uint8_t requesttype, @@ -696,6 +704,9 @@ } usb_free_urb(urb); + if (err == 0) { + err = actlen; + } return (err); } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 14:25:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 842B616A420; Sun, 30 Dec 2007 14:25:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1297516A417 for ; Sun, 30 Dec 2007 14:25:52 +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 017D413C455 for ; Sun, 30 Dec 2007 14:25:52 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUEPpcl087927 for ; Sun, 30 Dec 2007 14:25:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUEPpR4087924 for perforce@freebsd.org; Sun, 30 Dec 2007 14:25:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 14:25:51 GMT Message-Id: <200712301425.lBUEPpR4087924@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 132099 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 14:25:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=132099 Change 132099 by hselasky@hselasky_laptop001 on 2007/12/30 14:25:30 Style change. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#22 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#22 (text+ko) ==== @@ -406,12 +406,12 @@ struct usb_host_endpoint *uhe; if (urb == NULL) { - return -EINVAL; + return (-EINVAL); } mtx_assert(&usb_global_lock, MA_OWNED); if (urb->pipe == NULL) { - return -EINVAL; + return (-EINVAL); } uhe = urb->pipe; @@ -433,7 +433,7 @@ } else { /* no pipes have been setup yet! */ urb->status = -EINVAL; - return -EINVAL; + return (-EINVAL); } return (0); } @@ -451,12 +451,12 @@ uint16_t x; if (urb == NULL) { - return -EINVAL; + return (-EINVAL); } mtx_assert(&usb_global_lock, MA_OWNED); if (urb->pipe == NULL) { - return -EINVAL; + return (-EINVAL); } uhe = urb->pipe; @@ -511,7 +511,7 @@ uint8_t addr; if (uhe == NULL) - return -EINVAL; + return (-EINVAL); type = uhe->desc.bmAttributes & UE_XFERTYPE; addr = uhe->desc.bEndpointAddress; @@ -524,7 +524,7 @@ pipe = usbd_get_pipe(dev->bsd_udev, uhe->bsd_iface_index, cfg); if (pipe == NULL) - return -EINVAL; + return (-EINVAL); usbd_clear_data_toggle(dev->bsd_udev, pipe); @@ -606,7 +606,7 @@ uint8_t addr; if (uhe == NULL) { - return -EINVAL; + return (-EINVAL); } type = (uhe->desc.bmAttributes & UE_XFERTYPE); addr = (uhe->desc.bEndpointAddress & UE_ADDR); @@ -621,16 +621,16 @@ uhe_read = NULL; } else { if (type == UE_ISOCHRONOUS) { - return -EINVAL; + return (-EINVAL); } uhe_write = usb_find_host_endpoint(dev, type, addr | UE_DIR_OUT); if (uhe_write == NULL) { - return -EINVAL; + return (-EINVAL); } if (requesttype & UT_READ) { uhe_read = usb_find_host_endpoint(dev, type, addr | UE_DIR_IN); if (uhe_read == NULL) { - return -EINVAL; + return (-EINVAL); } } else { uhe_read = NULL; @@ -645,7 +645,7 @@ */ urb = usb_alloc_urb(0xFFFF, size); if (urb == NULL) - return -ENOMEM; + return (-ENOMEM); urb->dev = dev; @@ -722,9 +722,9 @@ int32_t err; if (p_ui == NULL) - return -EINVAL; + return (-EINVAL); if (alt_index >= p_ui->num_altsetting) - return -EINVAL; + return (-EINVAL); usb_linux_cleanup_interface(dev, p_ui); err = -usbd_set_config_index(dev->bsd_udev, p_ui->bsd_iface_index, alt_index); if (err == 0) { @@ -793,7 +793,7 @@ if (usbd_transfer_setup(dev->bsd_udev, &(uhe->bsd_iface_index), uhe->bsd_xfer, cfg, 2, uhe, &usb_global_lock)) { - return -EINVAL; + return (-EINVAL); } } else { if (bufsize > (1 << 22)) { @@ -813,7 +813,7 @@ if (usbd_transfer_setup(dev->bsd_udev, &(uhe->bsd_iface_index), uhe->bsd_xfer, cfg, 1, uhe, &usb_global_lock)) { - return -EINVAL; + return (-EINVAL); } } return (0); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 14:43:10 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99FF116A41B; Sun, 30 Dec 2007 14:43: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 5F4F516A417 for ; Sun, 30 Dec 2007 14:43:10 +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 4D8DA13C45B for ; Sun, 30 Dec 2007 14:43:10 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUEhALc093346 for ; Sun, 30 Dec 2007 14:43:10 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUEhA5G093339 for perforce@freebsd.org; Sun, 30 Dec 2007 14:43:10 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 14:43:10 GMT Message-Id: <200712301443.lBUEhA5G093339@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 132100 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 14:43:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=132100 Change 132100 by hselasky@hselasky_laptop001 on 2007/12/30 14:42:52 New function "uchcom_do_request". Handle control transfer errors centrally instead of everywhere in the code. When a read- control transfer fails we simply return 0x00 for data. Else we don't care except for printing out an error message. Optionally we could nicely loop in "uchcom_do_request" until the request succeeds. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#8 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#8 (text+ko) ==== @@ -398,7 +398,37 @@ * low level i/o */ -static usbd_status +static void +uchcom_do_request(struct uchcom_softc *sc, + usb_device_request_t *req, void *data) +{ + uint16_t length; + uint16_t actlen; + usbd_status_t err; + + length = UGETW(req->wLength); + actlen = 0; + + if (ucom_cfg_is_gone(&(sc->sc_ucom))) { + goto done; + } + err = usbd_do_request_flags(sc->sc_udev, &Giant, req, + data, USBD_SHORT_XFER_OK, &actlen, 1000); + + if (err) { + DPRINTFN(-1, "device request failed, err=%s " + "(ignored)\n", usbd_errstr(err)); + } +done: + if (length != actlen) { + if (req->bmRequestType & UT_READ) { + bzero(USBD_ADD_BYTES(data,actlen), length - actlen); + } + } + return; +} + +static void uchcom_ctrl_write(struct uchcom_softc *sc, uint8_t reqno, uint16_t value, uint16_t index) { @@ -410,13 +440,13 @@ USETW(req.wIndex, index); USETW(req.wLength, 0); - return (usbd_do_request(sc->sc_ucom.sc_udev, &req, 0)); + uchcom_do_request(sc, &req, NULL); + return; } -static usbd_status +static void uchcom_ctrl_read(struct uchcom_softc *sc, uint8_t reqno, - uint16_t value, uint16_t index, void *buf, int buflen, - int *actlen) + uint16_t value, uint16_t index, void *buf, uint16_t buflen) { usb_device_request_t req; @@ -424,47 +454,43 @@ req.bRequest = reqno; USETW(req.wValue, value); USETW(req.wIndex, index); - USETW(req.wLength, (uint16_t)buflen); + USETW(req.wLength, buflen); - return (usbd_do_request_flags(sc->sc_ucom.sc_udev, &req, buf, - USBD_SHORT_XFER_OK, actlen, - USBD_DEFAULT_TIMEOUT)); + uchcom_do_request(sc, &req, buf); + return; } -static usbd_status +static void uchcom_write_reg(struct uchcom_softc *sc, uint8_t reg1, uint8_t val1, uint8_t reg2, uint8_t val2) { - DPRINTF(("uchcom: write reg 0x%02X<-0x%02X, 0x%02X<-0x%02X\n", + DPRINTFN(0, "0x%02X<-0x%02X, 0x%02X<-0x%02X\n", (unsigned)reg1, (unsigned)val1, - (unsigned)reg2, (unsigned)val2)); - return (uchcom_ctrl_write( + (unsigned)reg2, (unsigned)val2); + uchcom_ctrl_write( sc, UCHCOM_REQ_WRITE_REG, - reg1|((uint16_t)reg2<<8), val1|((uint16_t)val2<<8))); + reg1|((uint16_t)reg2<<8), val1|((uint16_t)val2<<8)); + return; } -static usbd_status +static void uchcom_read_reg(struct uchcom_softc *sc, uint8_t reg1, uint8_t *rval1, uint8_t reg2, uint8_t *rval2) { uint8_t buf[UCHCOM_INPUT_BUF_SIZE]; - usbd_status err; - int actin; - err = uchcom_ctrl_read( + uchcom_ctrl_read( sc, UCHCOM_REQ_READ_REG, - reg1|((uint16_t)reg2<<8), 0, buf, sizeof buf, &actin); - if (err) - return (err); + reg1|((uint16_t)reg2<<8), 0, buf, sizeof(buf)); - DPRINTF(("uchcom: read reg 0x%02X->0x%02X, 0x%02X->0x%02X\n", + DPRINTFN(0, "0x%02X->0x%02X, 0x%02X->0x%02X\n", (unsigned)reg1, (unsigned)buf[0], - (unsigned)reg2, (unsigned)buf[1])); + (unsigned)reg2, (unsigned)buf[1]); if (rval1) *rval1 = buf[0]; if (rval2) *rval2 = buf[1]; - return (USBD_NORMAL_COMPLETION); + return; } static usbd_status @@ -472,12 +498,9 @@ { uint8_t buf[UCHCOM_INPUT_BUF_SIZE]; usbd_status err; - int actin; - err = uchcom_ctrl_read( - sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof buf, &actin); - if (err) - return (err); + uchcom_ctrl_read( + sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof(buf)); if (rver) *rver = buf[0]; @@ -487,19 +510,19 @@ static usbd_status uchcom_get_status(struct uchcom_softc *sc, uint8_t *rval) { - return (uchcom_read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL)); + uchcom_read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL); } static usbd_status uchcom_set_dtrrts_10(struct uchcom_softc *sc, uint8_t val) { - return (uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val)); + uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val); } static usbd_status uchcom_set_dtrrts_20(struct uchcom_softc *sc, uint8_t val) { - return (uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0)); + uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0); } @@ -580,9 +603,7 @@ usbd_status err; uint8_t brk1, brk2; - err = uchcom_read_reg(sc, UCHCOM_REG_BREAK1, &brk1, UCHCOM_REG_BREAK2, &brk2); - if (err) - return (EIO); + uchcom_read_reg(sc, UCHCOM_REG_BREAK1, &brk1, UCHCOM_REG_BREAK2, &brk2); if (onoff) { /* on - clear bits */ brk1 &= ~UCHCOM_BRK1_MASK; @@ -592,9 +613,7 @@ brk1 |= UCHCOM_BRK1_MASK; brk2 |= UCHCOM_BRK2_MASK; } - err = uchcom_write_reg(sc, UCHCOM_REG_BREAK1, brk1, UCHCOM_REG_BREAK2, brk2); - if (err) - return (EIO); + uchcom_write_reg(sc, UCHCOM_REG_BREAK1, brk1, UCHCOM_REG_BREAK2, brk2); return (0); } @@ -647,17 +666,12 @@ if (uchcom_calc_divider_settings(&dv, rate)) return (EINVAL); - if ((err = uchcom_write_reg(sc, + uchcom_write_reg(sc, UCHCOM_REG_BPS_PRE, dv.dv_prescaler, - UCHCOM_REG_BPS_DIV, dv.dv_div)) || - (err = uchcom_write_reg(sc, + UCHCOM_REG_BPS_DIV, dv.dv_div); + uchcom_write_reg(sc, UCHCOM_REG_BPS_MOD, dv.dv_mod, - UCHCOM_REG_BPS_PAD, 0))) { - device_printf(sc->sc_ucom.sc_dev, " cannot set DTE rate: %s\n", - usbd_errstr(err)); - return (EIO); - } - + UCHCOM_REG_BPS_PAD, 0); return (0); } @@ -667,12 +681,7 @@ usbd_status err; uint8_t lcr1 = 0, lcr2 = 0; - err = uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); - if (err) { - device_printf(sc->sc_ucom.sc_dev, " cannot get LCR: %s\n", - usbd_errstr(err)); - return (EIO); - } + uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); lcr1 &= ~UCHCOM_LCR1_MASK; lcr2 &= ~UCHCOM_LCR2_MASK; @@ -703,12 +712,7 @@ lcr2 |= UCHCOM_LCR2_PAREVEN; } - err = uchcom_write_reg(sc, UCHCOM_REG_LCR1, lcr1, UCHCOM_REG_LCR2, lcr2); - if (err) { - device_printf(sc->sc_ucom.sc_dev, "cannot set LCR: %s\n", - usbd_errstr(err)); - return (EIO); - } + uchcom_write_reg(sc, UCHCOM_REG_LCR1, lcr1, UCHCOM_REG_LCR2, lcr2); return (0); } @@ -716,17 +720,9 @@ static int uchcom_clear_chip(struct uchcom_softc *sc) { - usbd_status err; - DPRINTF(("%s: clear\n", USBDEVNAME(sc->sc_dev))); - err = uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, 0, 0); - if (err) { - device_printf(sc->sc_ucom.sc_dev, "cannot clear: %s\n", - usbd_errstr(err)); - return (EIO); - } - - return (0); + uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, 0, 0); + return; } static int @@ -736,17 +732,11 @@ uint8_t lcr1, lcr2, pre, div, mod; uint16_t val=0, idx=0; - err = uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); - if (err) - goto failed; + uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); - err = uchcom_read_reg(sc, UCHCOM_REG_BPS_PRE, &pre, UCHCOM_REG_BPS_DIV, &div); - if (err) - goto failed; + uchcom_read_reg(sc, UCHCOM_REG_BPS_PRE, &pre, UCHCOM_REG_BPS_DIV, &div); - err = uchcom_read_reg(sc, UCHCOM_REG_BPS_MOD, &mod, UCHCOM_REG_BPS_PAD, NULL); - if (err) - goto failed; + uchcom_read_reg(sc, UCHCOM_REG_BPS_MOD, &mod, UCHCOM_REG_BPS_PAD, NULL); val |= (uint16_t)(lcr1&0xF0) << 8; val |= 0x01; @@ -762,9 +752,7 @@ DPRINTF(("%s: reset v=0x%04X, i=0x%04X\n", USBDEVNAME(sc->sc_dev), val, idx)); - err = uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, val, idx); - if (err) - goto failed; + uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, val, idx); return (0); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 14:48:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1505916A41B; Sun, 30 Dec 2007 14:48:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CEC6016A419 for ; Sun, 30 Dec 2007 14:48:15 +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 BD96613C447 for ; Sun, 30 Dec 2007 14:48:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUEmF65095397 for ; Sun, 30 Dec 2007 14:48:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUEmFna095394 for perforce@freebsd.org; Sun, 30 Dec 2007 14:48:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 14:48:15 GMT Message-Id: <200712301448.lBUEmFna095394@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 132101 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 14:48:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=132101 Change 132101 by hselasky@hselasky_laptop001 on 2007/12/30 14:47:45 Get rid of more error handling code and "uchcom_close_intr_pipe". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#9 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#9 (text+ko) ==== @@ -493,33 +493,32 @@ return; } -static usbd_status +static void uchcom_get_version(struct uchcom_softc *sc, uint8_t *rver) { uint8_t buf[UCHCOM_INPUT_BUF_SIZE]; - usbd_status err; uchcom_ctrl_read( sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof(buf)); if (rver) *rver = buf[0]; - return (USBD_NORMAL_COMPLETION); + return; } -static usbd_status +static void uchcom_get_status(struct uchcom_softc *sc, uint8_t *rval) { uchcom_read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL); } -static usbd_status +static void uchcom_set_dtrrts_10(struct uchcom_softc *sc, uint8_t val) { uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val); } -static usbd_status +static void uchcom_set_dtrrts_20(struct uchcom_softc *sc, uint8_t val) { uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0); @@ -533,16 +532,7 @@ static int uchcom_update_version(struct uchcom_softc *sc) { - usbd_status err; - - err = uchcom_get_version(sc, &sc->sc_version); - if (err) { - device_printf(sc->sc_ucom.sc_dev, "cannot get version: %s\n", - usbd_errstr(err)); - return (EIO); - } - - return (0); + uchcom_get_version(sc, &sc->sc_version); } static void @@ -555,44 +545,29 @@ sc->sc_msr = (cur << 4) | ((sc->sc_msr >> 4) ^ cur); } -static int +static void update_status(struct uchcom_softc *sc) { - usbd_status err; uint8_t cur; - err = uchcom_get_status(sc, &cur); - if (err) { - device_printf(sc->sc_ucom.sc_dev, - "cannot update status: %s\n", - usbd_errstr(err)); - return (EIO); - } + uchcom_get_status(sc, &cur); uchcom_convert_status(sc, cur); - - return (0); + return; } static int uchcom_set_dtrrts(struct uchcom_softc *sc, int dtr, int rts) { - usbd_status err; uint8_t val = 0; if (dtr) val |= UCHCOM_DTR_MASK; if (rts) val |= UCHCOM_RTS_MASK; if (sc->sc_version < UCHCOM_VER_20) - err = uchcom_set_dtrrts_10(sc, ~val); + uchcom_set_dtrrts_10(sc, ~val); else - err = uchcom_set_dtrrts_20(sc, ~val); - - if (err) { - device_printf(sc->sc_ucom.sc_dev, "cannot set DTR/RTS: %s\n", - usbd_errstr(err)); - return (EIO); - } + uchcom_set_dtrrts_20(sc, ~val); return (0); } @@ -600,7 +575,6 @@ static int uchcom_set_break(struct uchcom_softc *sc, int onoff) { - usbd_status err; uint8_t brk1, brk2; uchcom_read_reg(sc, UCHCOM_REG_BREAK1, &brk1, UCHCOM_REG_BREAK2, &brk2); @@ -755,11 +729,6 @@ uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, val, idx); return (0); - -failed: - device_printf(sc->sc_ucom.sc_dev, "cannot reset: %s\n", - usbd_errstr(err)); - return (EIO); } static int @@ -827,31 +796,6 @@ return (0); } -static void -uchcom_close_intr_pipe(struct uchcom_softc *sc) -{ - usbd_status err; - struct ucom_softc *ucom = &sc->sc_ucom; - if (ucom->sc_dying) - return; - - if (sc->sc_intr_pipe != NULL) { - err = usbd_abort_pipe(sc->sc_intr_pipe); - if (err) - device_printf(ucom->sc_dev, - "abort interrupt pipe failed: %s\n", - usbd_errstr(err)); - err = usbd_close_pipe(sc->sc_intr_pipe); - if (err) - device_printf(ucom->sc_dev, - " close interrupt pipe failed: %s\n", - usbd_errstr(err)); - free(sc->sc_intr_buf, M_USBDEV); - sc->sc_intr_pipe = NULL; - } -} - - /* ---------------------------------------------------------------------- * methods for ucom */ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 14:52:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8EC3116A473; Sun, 30 Dec 2007 14:52:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52D0416A417 for ; Sun, 30 Dec 2007 14:52:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4161613C4E1 for ; Sun, 30 Dec 2007 14:52:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUEqKSn096314 for ; Sun, 30 Dec 2007 14:52:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUEqKdM096309 for perforce@freebsd.org; Sun, 30 Dec 2007 14:52:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 14:52:20 GMT Message-Id: <200712301452.lBUEqKdM096309@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 132102 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 14:52:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=132102 Change 132102 by hselasky@hselasky_laptop001 on 2007/12/30 14:51:43 Update the debugging prints in "uchcom". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#10 (text+ko) ==== @@ -92,13 +92,19 @@ #include #include "usbdevs.h" -#ifdef UCHCOM_DEBUG -#define DPRINTFN(n, x) if (uchcomdebug > (n)) logprintf x -int uchcomdebug = 0; +#ifdef USB_DEBUG +#define DPRINTFN(n,fmt,...) \ + do { if (uchcom_debug > (n)) { \ + printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0) + +static int uchcom_debug = 0; + +SYSCTL_NODE(_hw_usb, OID_AUTO, uchcom, CTLFLAG_RW, 0, "USB uchcom"); +SYSCTL_INT(_hw_usb_uchcom, OID_AUTO, debug, CTLFLAG_RW, + &uchcom_debug, 0, "uchcom debug level"); #else -#define DPRINTFN(n, x) +#define DPRINTFN(...) do { } while (0) #endif -#define DPRINTF(x) DPRINTFN(0, x) #define UCHCOM_IFACE_INDEX 0 #define UCHCOM_CONFIG_INDEX 0 @@ -694,7 +700,7 @@ static int uchcom_clear_chip(struct uchcom_softc *sc) { - DPRINTF(("%s: clear\n", USBDEVNAME(sc->sc_dev))); + DPRINTFN(0, "\n"); uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, 0, 0); return; } @@ -723,8 +729,7 @@ idx |= mod & 0xF8; val |= 0x10; - DPRINTF(("%s: reset v=0x%04X, i=0x%04X\n", - USBDEVNAME(sc->sc_dev), val, idx)); + DPRINTFN(0, "reset v=0x%04X, i=0x%04X\n", val, idx); uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, val, idx); @@ -903,18 +908,17 @@ if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) return; - DPRINTF(("%s: abnormal status: %s\n", - USBDEVNAME(sc->sc_dev), usbd_errstr(status))); + DPRINTFN(0, "abnormal status: %s\n", + usbd_errstr(status)); usbd_clear_endpoint_stall_async(sc->sc_intr_pipe); return; } - DPRINTF(("%s: intr: 0x%02X 0x%02X 0x%02X 0x%02X " + DPRINTFN(0, "intr: 0x%02X 0x%02X 0x%02X 0x%02X " "0x%02X 0x%02X 0x%02X 0x%02X\n", - USBDEVNAME(sc->sc_dev), (unsigned)buf[0], (unsigned)buf[1], (unsigned)buf[2], (unsigned)buf[3], (unsigned)buf[4], (unsigned)buf[5], - (unsigned)buf[6], (unsigned)buf[7])); + (unsigned)buf[6], (unsigned)buf[7]); uchcom_convert_status(sc, buf[UCHCOM_INTR_STAT1]); ucom_status_change(&sc->sc_ucom); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:04:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B0AE16A421; Sun, 30 Dec 2007 15:04:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D473D16A41B for ; Sun, 30 Dec 2007 15:04:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C474713C465 for ; Sun, 30 Dec 2007 15:04:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUF4WTM004023 for ; Sun, 30 Dec 2007 15:04:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUF4WoI004020 for perforce@freebsd.org; Sun, 30 Dec 2007 15:04:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 15:04:32 GMT Message-Id: <200712301504.lBUF4WoI004020@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 132103 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:04:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=132103 Change 132103 by hselasky@hselasky_laptop001 on 2007/12/30 15:04:26 Fix the "uchcom" interrupt endpoint callback(s). Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#11 (text+ko) ==== @@ -894,34 +894,60 @@ /* ---------------------------------------------------------------------- * callback when the modem status is changed. */ -void -uchcom_intr(usbd_xfer_handle xfer, usbd_private_handle priv, - usbd_status status) +static void +uchcom_intr_callback(struct usbd_xfer *xfer) { - struct uchcom_softc *sc = priv; - u_char *buf = sc->sc_intr_buf; + struct uchcom_softc *sc = xfer->priv_sc; + uint8_t buf[UCHCOM_INTR_LEAST]; + + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: - if (sc->sc_ucom.sc_dying) - return; + DPRINTF(0, "actlen = %u\n", xfer->actlen); - if (status != USBD_NORMAL_COMPLETION) { - if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) - return; + if (xfer->actlen >= UCHCOM_INTR_LEAST) { + usbd_copy_out(xfer->frbuffers + 0, 0, buf, + UCHCOM_INTR_LEAST); - DPRINTFN(0, "abnormal status: %s\n", - usbd_errstr(status)); - usbd_clear_endpoint_stall_async(sc->sc_intr_pipe); - return; - } - DPRINTFN(0, "intr: 0x%02X 0x%02X 0x%02X 0x%02X " - "0x%02X 0x%02X 0x%02X 0x%02X\n", + DPRINTFN(0, "data = 0x%02X 0x%02X 0x%02X 0x%02X\n" (unsigned)buf[0], (unsigned)buf[1], - (unsigned)buf[2], (unsigned)buf[3], - (unsigned)buf[4], (unsigned)buf[5], - (unsigned)buf[6], (unsigned)buf[7]); + (unsigned)buf[2], (unsigned)buf[3]); uchcom_convert_status(sc, buf[UCHCOM_INTR_STAT1]); ucom_status_change(&sc->sc_ucom); + } + + case USBD_ST_SETUP: + if (sc->sc_flag & UCHCOM_FLAG_INTR_STALL) { + usbd_transfer_start(sc->sc_xfer[5]); + } else { + xfer->frlengths[0] = xfer->max_data_length; + usbd_start_hardware(xfer); + } + break; + + default: /* Error */ + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UCHCOM_FLAG_INTR_STALL; + usbd_transfer_start(sc->sc_xfer[5]); + } + break; + } + return; +} + +static void +uchcom_intr_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uchcom_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[4]; + + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(0, "stall cleared\n"); + sc->sc_flag &= ~UCHCOM_FLAG_INTR_STALL; + usbd_transfer_start(xfer_other); + } + return; } static device_method_t uchcom_methods[] = { From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:46:16 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2B0816A420; Sun, 30 Dec 2007 15:46: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 B81F216A418 for ; Sun, 30 Dec 2007 15:46:15 +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 A72C213C455 for ; Sun, 30 Dec 2007 15:46:15 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFkFcx018959 for ; Sun, 30 Dec 2007 15:46:15 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFkFFi018956 for perforce@freebsd.org; Sun, 30 Dec 2007 15:46:15 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 15:46:15 GMT Message-Id: <200712301546.lBUFkFFi018956@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 132104 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:46:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=132104 Change 132104 by hselasky@hselasky_laptop001 on 2007/12/30 15:45:28 Get all the ucom callbacks right in "uchcom". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#12 (text+ko) ==== @@ -163,6 +163,8 @@ struct usbd_xfer *sc_xfer[UCHCOM_N_TRANSFER]; struct usbd_device *sc_udev; + uint8_t sc_dtr; /* local copy */ + uint8_t sc_rts; /* local copy */ uint8_t sc_version; uint8_t sc_msr; uint8_t sc_lsr; /* local status register */ @@ -211,11 +213,17 @@ }; #define uchcom_lookup(v, p) usb_lookup(uchcom_devs, v, p) -static void uchcom_get_status(void *, int, u_char *, u_char *); -static void uchcom_set(void *, int, int, int); -static int uchcom_param(void *, int, struct termios *); -static int uchcom_open(void *, int); -static void uchcom_close(void *, int); +static int uchcom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag, struct thread *td); +static int uchcom_pre_param(struct ucom_softc *ucom, struct termios *t); +static void uchcom_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr); +static void uchcom_cfg_param(struct ucom_softc *ucom, struct termios *t); +static void uchcom_cfg_set_break(struct ucom_softc *sc, uint8_t onoff); +static void uchcom_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff); +static void uchcom_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff); +static void uchcom_start_read(struct ucom_softc *ucom); +static void uchcom_start_write(struct ucom_softc *ucom); +static void uchcom_stop_read(struct ucom_softc *ucom); +static void uchcom_stop_write(struct ucom_softc *ucom); static device_probe_t uchcom_probe; static device_attach_t uchcom_attach; @@ -288,18 +296,20 @@ }, }; -struct ucom_callback uchcom_callback = { - .ucom_get_status = uchcom_get_status, - .ucom_set = uchcom_set, - .ucom_param = uchcom_param, - .ucom_ioctl = NULL, - .ucom_open = uchcom_open, - .ucom_close = uchcom_close, - .ucom_read = NULL, - .ucom_write = NULL, +struct ucom_callback uchcom_callback = { + .ucom_cfg_get_status = &uchcom_cfg_get_status, + .ucom_cfg_set_dtr = &uchcom_cfg_set_dtr, + .ucom_cfg_set_rts = &uchcom_cfg_set_rts, + .ucom_cfg_set_break = &uchcom_cfg_set_break, + .ucom_cfg_param = &uchcom_cfg_param, + .ucom_pre_param = &uchcom_pre_param, + .ucom_ioctl = &uchcom_ioctl, + .ucom_start_read = &uchcom_start_read, + .ucom_stop_read = &uchcom_stop_read, + .ucom_start_write = &uchcom_start_write, + .ucom_stop_write = &uchcom_stop_write, }; - /* ---------------------------------------------------------------------- * driver entry points */ @@ -370,6 +380,17 @@ goto detach; } + /* + * Do the initialization during attach so that the system does not + * sleep during open: + */ + uchcom_update_version(sc); + uchcom_clear_chip(sc); + uchcom_reset_chip(sc); + + sc->sc_dtr = 1; + sc->sc_rts = 1; + /* clear stall at first run */ sc->sc_flag |= (UCHCOM_FLAG_READ_STALL | UCHCOM_FLAG_WRITE_STALL); @@ -516,18 +537,21 @@ uchcom_get_status(struct uchcom_softc *sc, uint8_t *rval) { uchcom_read_reg(sc, UCHCOM_REG_STAT1, rval, UCHCOM_REG_STAT2, NULL); + return; } static void uchcom_set_dtrrts_10(struct uchcom_softc *sc, uint8_t val) { uchcom_write_reg(sc, UCHCOM_REG_STAT1, val, UCHCOM_REG_STAT1, val); + return; } static void uchcom_set_dtrrts_20(struct uchcom_softc *sc, uint8_t val) { uchcom_ctrl_write(sc, UCHCOM_REQ_SET_DTRRTS, val, 0); + return; } @@ -535,10 +559,11 @@ * middle layer */ -static int +static void uchcom_update_version(struct uchcom_softc *sc) { uchcom_get_version(sc, &sc->sc_version); + return; } static void @@ -562,13 +587,13 @@ } -static int -uchcom_set_dtrrts(struct uchcom_softc *sc, int dtr, int rts) +static void +uchcom_set_dtrrts(struct uchcom_softc *sc) { uint8_t val = 0; - if (dtr) val |= UCHCOM_DTR_MASK; - if (rts) val |= UCHCOM_RTS_MASK; + if (sc->sc_dtr) val |= UCHCOM_DTR_MASK; + if (sc->sc_rts) val |= UCHCOM_RTS_MASK; if (sc->sc_version < UCHCOM_VER_20) uchcom_set_dtrrts_10(sc, ~val); @@ -578,10 +603,12 @@ return (0); } -static int -uchcom_set_break(struct uchcom_softc *sc, int onoff) +static void +uchcom_cfg_set_break(struct ucom_softc *ucom, uint8_t onoff) { - uint8_t brk1, brk2; + struct uchcom_softc *sc = ucom->sc_parent; + uint8_t brk1; + uint8_t brk2; uchcom_read_reg(sc, UCHCOM_REG_BREAK1, &brk1, UCHCOM_REG_BREAK2, &brk2); if (onoff) { @@ -595,18 +622,20 @@ } uchcom_write_reg(sc, UCHCOM_REG_BREAK1, brk1, UCHCOM_REG_BREAK2, brk2); - return (0); + return; } static int uchcom_calc_divider_settings(struct uchcom_divider *dp, uint32_t rate) { - int i; const struct uchcom_divider_record *rp; - uint32_t div, rem, mod; + uint32_t div; + uint32_t rem; + uint32_t mod; + uint8_t i; /* find record */ - for (i=0; i= rate && dividers[i].dvr_low <= rate) { rp = ÷rs[i]; @@ -637,14 +666,13 @@ return (0); } -static int +static void uchcom_set_dte_rate(struct uchcom_softc *sc, uint32_t rate) { - usbd_status err; struct uchcom_divider dv; if (uchcom_calc_divider_settings(&dv, rate)) - return (EINVAL); + return; uchcom_write_reg(sc, UCHCOM_REG_BPS_PRE, dv.dv_prescaler, @@ -652,14 +680,14 @@ uchcom_write_reg(sc, UCHCOM_REG_BPS_MOD, dv.dv_mod, UCHCOM_REG_BPS_PAD, 0); - return (0); + return; } -static int +static void uchcom_set_line_control(struct uchcom_softc *sc, tcflag_t cflag) { - usbd_status err; - uint8_t lcr1 = 0, lcr2 = 0; + uint8_t lcr1 = 0; + uint8_t lcr2 = 0; uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); @@ -675,18 +703,9 @@ * - it is unclear how to handle stop bits. */ - switch (ISSET(cflag, CSIZE)) { - case CS5: - case CS6: - case CS7: - return (EINVAL); - case CS8: - break; - } - - if (ISSET(cflag, PARENB)) { + if (cflag & PARENB) { lcr1 |= UCHCOM_LCR1_PARENB; - if (ISSET(cflag, PARODD)) + if (cflag & PARODD) lcr2 |= UCHCOM_LCR2_PARODD; else lcr2 |= UCHCOM_LCR2_PAREVEN; @@ -694,10 +713,10 @@ uchcom_write_reg(sc, UCHCOM_REG_LCR1, lcr1, UCHCOM_REG_LCR2, lcr2); - return (0); + return; } -static int +static void uchcom_clear_chip(struct uchcom_softc *sc) { DPRINTFN(0, "\n"); @@ -705,19 +724,23 @@ return; } -static int +static void uchcom_reset_chip(struct uchcom_softc *sc) { - usbd_status err; - uint8_t lcr1, lcr2, pre, div, mod; - uint16_t val=0, idx=0; + uint16_t val; + uint16_t idx; + uint8_t lcr1; + uint8_t lcr2; + uint8_t pre; + uint8_t div; + uint8_t mod; uchcom_read_reg(sc, UCHCOM_REG_LCR1, &lcr1, UCHCOM_REG_LCR2, &lcr2); - uchcom_read_reg(sc, UCHCOM_REG_BPS_PRE, &pre, UCHCOM_REG_BPS_DIV, &div); - uchcom_read_reg(sc, UCHCOM_REG_BPS_MOD, &mod, UCHCOM_REG_BPS_PAD, NULL); + val = 0; + idx = 0; val |= (uint16_t)(lcr1&0xF0) << 8; val |= 0x01; val |= (uint16_t)(lcr2&0x0F) << 8; @@ -733,164 +756,84 @@ uchcom_ctrl_write(sc, UCHCOM_REQ_RESET, val, idx); - return (0); + return; } -static int -uchcom_setup_comm(struct uchcom_softc *sc) +/* ---------------------------------------------------------------------- + * methods for ucom + */ +static void +uchcom_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr) { - int ret; + struct uchcom_softc *sc = ucom->sc_parent; - ret = uchcom_update_version(sc); - if (ret) - return (ret); + DPRINTF(0, "\n"); - ret = uchcom_clear_chip(sc); - if (ret) - return (ret); - - ret = uchcom_set_dte_rate(sc, TTYDEF_SPEED); - if (ret) - return (ret); - - ret = uchcom_set_line_control(sc, CS8); - if (ret) - return (ret); - - ret = update_status(sc); - if (ret) - return (ret); - - ret = uchcom_reset_chip(sc); - if (ret) - return (ret); - - ret = uchcom_set_dte_rate(sc, TTYDEF_SPEED); /* XXX */ - if (ret) - return (ret); - - sc->sc_dtr = sc->sc_rts = 1; - ret = uchcom_set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); - if (ret) - return (ret); - - return (0); + *lsr = sc->sc_lsr; + *msr = sc->sc_msr; + return; } static int -uchcom_setup_intr_pipe(struct uchcom_softc *sc) +uchcom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag, + struct thread *td) { - usbd_status err; - struct ucom_softc *ucom = &sc->sc_ucom; - if (sc->sc_intr_endpoint != -1 && sc->sc_intr_pipe == NULL) { - sc->sc_intr_buf = malloc(sc->sc_intr_size, M_USBDEV, M_WAITOK); - err = usbd_open_pipe_intr(ucom->sc_iface, - sc->sc_intr_endpoint, - USBD_SHORT_XFER_OK, - &sc->sc_intr_pipe, sc, - sc->sc_intr_buf, - sc->sc_intr_size, - uchcom_intr, USBD_DEFAULT_INTERVAL); - if (err) { - device_printf(ucom->sc_dev, - "cannot open interrupt pipe: %s\n", - usbd_errstr(err)); - return (EIO); - } - } - return (0); + return (ENOTTY); } -/* ---------------------------------------------------------------------- - * methods for ucom - */ -void -uchcom_uchcom_get_status(void *arg, int portno, u_char *rlsr, u_char *rmsr) +static void +uchcom_cfg_set_dtr(struct ucom_softc *ucom, uint8_t onoff) { - struct uchcom_softc *sc = arg; + struct uchcom_softc *sc = ucom->sc_parent; - if (sc->sc_ucom.sc_dying) - return; + DPRINTF(0, "onoff = %d\n", onoff); - *rlsr = sc->sc_lsr; - *rmsr = sc->sc_msr; + sc->sc_dtr = onoff; + uchcom_set_dtrrts(sc); + return; } -void -uchcom_set(void *arg, int portno, int reg, int onoff) +static void +uchcom_cfg_set_rts(struct ucom_softc *ucom, uint8_t onoff) { - struct uchcom_softc *sc = arg; - - if (sc->sc_ucom.sc_dying) - return; + struct uchcom_softc *sc = ucom->sc_parent; - switch (reg) { - case UCOM_SET_DTR: - sc->sc_dtr = !!onoff; - uchcom_set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); - break; - case UCOM_SET_RTS: - sc->sc_rts = !!onoff; - uchcom_set_dtrrts(sc, sc->sc_dtr, sc->sc_rts); - break; - case UCOM_SET_BREAK: - uchcom_set_break(sc, onoff); - break; - } -} + DPRINTF(0, "onoff = %d\n", onoff); -int -uchcom_param(void *arg, int portno, struct termios *t) -{ - struct uchcom_softc *sc = arg; - int ret; - - if (sc->sc_ucom.sc_dying) - return (0); - - ret = uchcom_set_line_control(sc, t->c_cflag); - if (ret) - return (ret); - - ret = uchcom_set_dte_rate(sc, t->c_ospeed); - if (ret) - return (ret); - - return (0); + sc->sc_rts = onoff; + uchcom_set_dtrrts(sc); + return; } -int -uchcom_open(void *arg, int portno) +static int +uchcom_pre_param(struct ucom_softc *ucom, struct termios *t) { - int ret; - struct uchcom_softc *sc = arg; + struct uchcom_divider dv; - if (sc->sc_ucom.sc_dying) - return (EIO); + switch (t->c_cflag & CSIZE) { + case CS5: + case CS6: + case CS7: + return (EIO); + defaul: + break; + } - ret = uchcom_setup_intr_pipe(sc); - if (ret) - return (ret); - - ret = uchcom_setup_comm(sc); - if (ret) - return (ret); - - return (0); + if (uchcom_calc_divider_settings(&dv, t->c_ospeed)) { + return (EIO); + } + return (0); /* success */ } -void -uchcom_close(void *arg, int portno) +static void +uchcom_cfg_param(struct ucom_softc *ucom, struct termios *t) { - struct uchcom_softc *sc = arg; - - if (sc->sc_ucom.sc_dying) - return; - - uchcom_close_intr_pipe(sc); + struct uchcom_softc *sc = ucom->sc_parent; + uchcom_set_line_control(sc, t->c_cflag); + uchcom_set_dte_rate(sc, t->c_ospeed); + return; } - /* ---------------------------------------------------------------------- * callback when the modem status is changed. */ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:47:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 33E9216A46B; Sun, 30 Dec 2007 15:47: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 ED17616A468 for ; Sun, 30 Dec 2007 15:47:16 +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 DC64913C468 for ; Sun, 30 Dec 2007 15:47:16 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFlGVk019015 for ; Sun, 30 Dec 2007 15:47:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFlGj7019012 for perforce@freebsd.org; Sun, 30 Dec 2007 15:47:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 15:47:16 GMT Message-Id: <200712301547.lBUFlGj7019012@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 132105 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:47:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=132105 Change 132105 by hselasky@hselasky_laptop001 on 2007/12/30 15:47:08 Add more USB callbacks to "uchcom". These functions were taken from "uplcom". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#13 (text+ko) ==== @@ -893,6 +893,95 @@ return; } +static void +uchcom_write_callback(struct usbd_xfer *xfer) +{ + struct uchcom_softc *sc = xfer->priv_sc; + uint32_t actlen; + + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_SETUP: + case USBD_ST_TRANSFERRED: + if (sc->sc_flag & UCHCOM_FLAG_WRITE_STALL) { + usbd_transfer_start(sc->sc_xfer[2]); + return; + } + if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, + UCHCOM_BULK_BUF_SIZE, &actlen)) { + + DPRINTF(0, "actlen = %d\n", actlen); + + xfer->frlengths[0] = actlen; + usbd_start_hardware(xfer); + } + return; + + default: /* Error */ + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UCHCOM_FLAG_WRITE_STALL; + usbd_transfer_start(sc->sc_xfer[2]); + } + return; + + } +} + +static void +uchcom_write_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uchcom_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[0]; + + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(0, "stall cleared\n"); + sc->sc_flag &= ~UCHCOM_FLAG_WRITE_STALL; + usbd_transfer_start(xfer_other); + } + return; +} + +static void +uchcom_read_callback(struct usbd_xfer *xfer) +{ + struct uchcom_softc *sc = xfer->priv_sc; + + switch (USBD_GET_STATE(xfer)) { + case USBD_ST_TRANSFERRED: + ucom_put_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, xfer->actlen); + + case USBD_ST_SETUP: + if (sc->sc_flag & UCHCOM_FLAG_READ_STALL) { + usbd_transfer_start(sc->sc_xfer[3]); + } else { + xfer->frlengths[0] = xfer->max_data_length; + usbd_start_hardware(xfer); + } + return; + + default: /* Error */ + if (xfer->error != USBD_CANCELLED) { + sc->sc_flag |= UCHCOM_FLAG_READ_STALL; + usbd_transfer_start(sc->sc_xfer[3]); + } + return; + + } +} + +static void +uchcom_read_clear_stall_callback(struct usbd_xfer *xfer) +{ + struct uchcom_softc *sc = xfer->priv_sc; + struct usbd_xfer *xfer_other = sc->sc_xfer[1]; + + if (usbd_clear_stall_callback(xfer, xfer_other)) { + DPRINTF(0, "stall cleared\n"); + sc->sc_flag &= ~UCHCOM_FLAG_READ_STALL; + usbd_transfer_start(xfer_other); + } + return; +} + static device_method_t uchcom_methods[] = { /* Device interface */ DEVMETHOD(device_probe, uchcom_probe), From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:49:19 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CA4016A46C; Sun, 30 Dec 2007 15:49: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 31DD416A468 for ; Sun, 30 Dec 2007 15:49:19 +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 223E813C4F2 for ; Sun, 30 Dec 2007 15:49:19 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFnJUx019187 for ; Sun, 30 Dec 2007 15:49:19 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFnIdQ019184 for perforce@freebsd.org; Sun, 30 Dec 2007 15:49:18 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 15:49:18 GMT Message-Id: <200712301549.lBUFnIdQ019184@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 132106 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:49:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=132106 Change 132106 by hselasky@hselasky_laptop001 on 2007/12/30 15:48:43 Add more "ucom" callbacks to uchcom, taken from "uplcom". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#14 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#14 (text+ko) ==== @@ -834,6 +834,52 @@ return; } +static void +uchcom_start_read(struct ucom_softc *ucom) +{ + struct uchcom_softc *sc = ucom->sc_parent; + + /* start interrupt endpoint */ + usbd_transfer_start(sc->sc_xfer[4]); + + /* start read endpoint */ + usbd_transfer_start(sc->sc_xfer[1]); + return; +} + +static void +uchcom_stop_read(struct ucom_softc *ucom) +{ + struct uchcom_softc *sc = ucom->sc_parent; + + /* stop interrupt endpoint */ + usbd_transfer_stop(sc->sc_xfer[4]); + + /* stop read endpoint */ + usbd_transfer_stop(sc->sc_xfer[3]); + usbd_transfer_stop(sc->sc_xfer[1]); + return; +} + +static void +uchcom_start_write(struct ucom_softc *ucom) +{ + struct uchcom_softc *sc = ucom->sc_parent; + + usbd_transfer_start(sc->sc_xfer[0]); + return; +} + +static void +uchcom_stop_write(struct ucom_softc *ucom) +{ + struct uchcom_softc *sc = ucom->sc_parent; + + usbd_transfer_stop(sc->sc_xfer[2]); + usbd_transfer_stop(sc->sc_xfer[0]); + return; +} + /* ---------------------------------------------------------------------- * callback when the modem status is changed. */ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:50:21 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E656C16A41A; Sun, 30 Dec 2007 15:50: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 AAD3D16A418 for ; Sun, 30 Dec 2007 15:50:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9A05813C45A for ; Sun, 30 Dec 2007 15:50:20 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFoKde019488 for ; Sun, 30 Dec 2007 15:50:20 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFoKA6019484 for perforce@freebsd.org; Sun, 30 Dec 2007 15:50:20 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 30 Dec 2007 15:50:20 GMT Message-Id: <200712301550.lBUFoKA6019484@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 132107 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:50:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=132107 Change 132107 by pgj@disznohal on 2007/12/30 15:49:38 Add initial Hungarian translation of Appendix C: Resources on the Internet. Raw translation of the appendices completed. The whole handbook is completed in roughly 50%. Happy New Year! Affected files ... .. //depot/projects/docproj_hu/books/handbook/eresources/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/books/handbook/eresources/chapter.sgml#2 (text+ko) ==== @@ -4,597 +4,735 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml,v 1.183 2007/08/10 09:08:28 blackend Exp $ --> - - Resources on the Internet + + + + Erõforrások az interneten - The rapid pace of FreeBSD progress makes print media impractical as a - means of following the latest developments. Electronic resources are the - best, if not often the only, way stay informed of the latest advances. - Since FreeBSD is a volunteer effort, the user community itself also - generally serves as a technical support department of sorts, - with electronic mail and USENET news being the most effective way of - reaching that community. + A &os; gyors ütemû fejlõdése a nyomtatott + médiát alkalmatlanná teszi a legfrissebb + fejlesztések nyomonkövetésére. Ezzel + szemben az elektronikus erõforrások a biztos, ha gyakran + nem is csak az egyetlen, módjai a legújabb + elõrelépések figyelemmel + követésének. Mivel a &os;-t + többségében önkéntesek fejlesztik, az + õt körülvevõ felhasználói + közösség önmaga is egyfajta szakmai + segélynyújtó egyletként + funkcionál, amit leghatékonyabban elektronikus + levelében vagy USENET hírcsoportokon keresztül + érhetünk el. - The most important points of contact with the FreeBSD user community - are outlined below. If you are aware of other resources not mentioned - here, please send them to the &a.doc; so that they may also be - included. + A továbbiakban a &os; felhasználók + közösségének különbözõ + fajtájú elérhetõségeit + vázoljuk fel nagyvonalakban. Ha úgy + érezzük, hogy ebbõl a felsorolásban kimaradt + volna valami, akkor ne habozzunk róla + értesítést küldeni a &a.doc; + címére (angolul), hogy felvehessük a többi + közé. - Mailing Lists + Levelezési listák - Though many of the FreeBSD development members read USENET, we - cannot always guarantee that we will get to your questions in a timely - fashion (or at all) if you post them only to one of the - comp.unix.bsd.freebsd.* groups. By addressing your - questions to the appropriate mailing list you will reach both us and a - concentrated FreeBSD audience, invariably assuring a better (or at least - faster) response. + Habár sok &os; fejlesztõ olvas USENET-et, nem + tudjuk mindig szavatolni, hogy a + comp.unix.bsd.freebsd.* csoportok + valamelyikére küldött levelek idõben (vagy + egyáltalán) megválaszolásra + kerülnek. A megfelelõ levelezési listák + címére küldött levelekkel a + fejlesztõk mellett a &os; közönségét + is egyaránt el tudjuk érni, ami változatlanul + jobb (de legalább is gyorsabb) válaszokkal + kecsegtet. - The charters for the various lists are given at the bottom of this - document. Please read the charter before joining or sending - mail to any list. Most of our list subscribers now receive - many hundreds of FreeBSD related messages every day, and by setting down - charters and rules for proper use we are striving to keep the - signal-to-noise ratio of the lists high. To do less would see the - mailing lists ultimately fail as an effective communications medium for - the project. + A különbözõ listák + témájának rövid leírása a + dokumentum alján olvasható. + Szeretnénk mindenkit megkérni, hogy + mielõtt feliratkozik vagy levelet küld valamelyik + listára, figyelmesen olvassa el ezeket. Az egyes + listák tagjai már így is naponta + többszáz &os;-vel kapcsolatos üzenetet kapnak, + miközben a listák tematikájának + és szabályainak lefektetésével + igyekszünk a jel-zaj arányt minél + kedvezõbb szinten tartani. Ezek nélkül a + levelezési listák a projekt számára + haszontalan kommunikációs + eszközökké válnának. - If you wish to test your ability to send to - &os; lists, send a test message to &a.test.name;. - Please do not send test messages to any other list. + A &a.test.name; címet használjuk, ha + ki akarjuk próbálni, hogy tudunk-e levelet + küldeni a &os; listáira. A többi + listára viszont lehetõleg ne küldjünk + teszt jellegû üzeneteket. - When in doubt about what list to post a question to, see How to get best results from - the FreeBSD-questions mailing list. + Ha nem tudjuk eldönteni, hogy pontosan melyik + listát is kellene megcímeznünk + kérdésünkkel, olvassuk el a Hogyan kapjunk + értékelhetõ választ a &os;-questions + levelezési listáról címû + leírást (angolul). - Before posting to any list, please learn about how to best use - the mailing lists, such as how to help avoid frequently-repeated - discussions, by reading the - Mailing List Frequently Asked Questions (FAQ) document. + Mielõtt akármelyik listára is + küldenénk levelet, olvassuk el a Levelezési + listák Gyakran Ismételt + Kérdéseit (angolul), amivel + elkerülhetjük a gyakran feltett kérdések + és témák ismételt + felhozását. - Archives are kept for all of the mailing lists and can be searched - using the FreeBSD World - Wide Web server. The keyword searchable archive offers an - excellent way of finding answers to frequently asked questions and - should be consulted before posting a question. + A levelezési listák tartalma folyamatosan + archiválódik, és ezekben az + archívumokban a + &os; honlapján tudunk keresni. Az itt + elérhetõ, kulcsszavak alapján + történõ keresés remek módját + nyújtja a gyakran felmerülõ + kérdések egyszerû és gyors + megválaszolásának, ezért ilyen + esetekben elõször mindig ezt javasolt + használni. - List Summary + A listák összefoglalása - General lists: The following are general - lists which anyone is free (and encouraged) to join: + Általános listák: + A következõ általános célú + listákhoz szabadon (és nyugodtan) + csatlakozhatunk: - List - Purpose + Lista + Tartalom &a.cvsall.name; - Changes made to the FreeBSD source tree + Értesítés a &os; + forrásfájában elvégzett + változtatásokról &a.advocacy.name; - FreeBSD Evangelism + A &os; igéjének + terjesztése &a.announce.name; - Important events and project milestones + Fontosabb események és + elõrelépések a projektek + életében &a.arch.name; - Architecture and design discussions + Architekturális és tervezési + kérdések tárgyalása &a.bugbusters.name; - Discussions pertaining to the maintenance of the FreeBSD - problem report database and related tools + A &os; hibabejelentéseit + tároló adatbázis és a + kapcsolódó eszközök + karbantartására vonatkozó + megbeszélések - + &a.bugs.name; - Bug reports + Hibajelentések &a.chat.name; - Non-technical items related to the FreeBSD - community + A &os; közösség nem szakmai + jellegû dolgai &a.current.name; - Discussion concerning the use of - &os.current; + A &os.current; használatának + tárgyalása &a.isp.name; - Issues for Internet Service Providers using - FreeBSD + A &os;-t alkalmazó + internetszolgáltatók fóruma &a.jobs.name; - FreeBSD employment and consulting - opportunities + &os;-s munkalehetõségek &a.policy.name; - FreeBSD Core team policy decisions. Low volume, and - read-only + A &os; fejlõdését + irányító csoport (Core Team) + döntéseirõl + tájékoztató lista. A forgalma + kicsi, csak olvasható. &a.questions.name; - User questions and technical support + A felhasználók kérdései + és szakmai + segítségnyújtás &a.security-notifications.name; - Security notifications + Biztonsági figyelmeztetések &a.stable.name; - Discussion concerning the use of - &os.stable; + A &os.stable; használatát illetõ + kérdések &a.test.name; - Where to send your test messages instead of one of - the actual lists + Ide lehet küldeni a + próbaüzeneteket - Technical lists: The following lists are for - technical discussion. You should read the charter for each list - carefully before joining or sending mail to one as there are firm - guidelines for their use and content. + Szakmai listák: A + következõ listák szakmai jellegû + témákat képviselnek. Mielõtt + bármelyikükre levelet küldenénk vagy + feliratkoznánk, figyelmesen olvassuk el a tartalmukat + és céljaikat bemutató rövid + leírásukat. - List - Purpose + Lista + Tartalom &a.acpi.name; - ACPI and power management development + Az ACPI és energiagazdálkodás + támogatás fejlesztése &a.afs.name; - Porting AFS to FreeBSD + Az AFS áthozása &os;-re &a.aic7xxx.name; - Developing drivers for the &adaptec; AIC 7xxx + Az &adaptec; AIC 7xxx sorozat meghajtóinak + fejlesztése &a.alpha.name; - Porting FreeBSD to the Alpha + A &os; Alpha portja &a.amd64.name; - Porting FreeBSD to AMD64 systems + A &os; AMD64 portja &a.apache.name; - Discussion about Apache related ports + Az Apache és + hozzátartozó portok + tárgyalása &a.arm.name; - Porting FreeBSD to &arm; processors + A &os; portja &arm; processzorokra &a.atm.name; - Using ATM networking with FreeBSD + &os; használata ATM + hálózatokkal &a.audit.name; - Source code audit project + A forráskód + ellenõrzésérõl szóló + projekt &a.binup.name; - Design and development of the binary update system + A bináris frissítésekkel + foglalkozó rendszer tervezése és + fejlesztése &a.bluetooth.name; - Using &bluetooth; technology in FreeBSD + A &bluetooth; technológia használata + a &os;-ben &a.cluster.name; - Using FreeBSD in a clustered environment + A &os; klaszteres környezetben &a.cvsweb.name; - CVSweb maintenance + A CVSweb karbantartása &a.database.name; - Discussing database use and development under - FreeBSD + Adatbázisok használata és + fejlesztése &os; alatt &a.doc.name; - Creating FreeBSD related documents + &os;-rõl szóló + leírások + készítése &a.drivers.name; - Writing device drivers for &os; + Eszközmeghajtók írása + &os;-re &a.eclipse.name; - FreeBSD users of Eclipse IDE, tools, rich client - applications and ports. + Az Eclipse integrált fejlesztõi + környezet, eszközeinek, gazdag kliens + alkalmazásinak és portjainak &os; alatti + használata &a.embedded.name; - Using FreeBSD in embedded applications + A &os; használata beágyazott + alkalmazásokban &a.eol.name; - Peer support of FreeBSD-related software that - is no longer supported by the FreeBSD project. + Olyan &os;-s szoftverek független + továbbfejlesztése, amelyeket hivatalosan + már nem támogatnak &a.emulation.name; - Emulation of other systems such as - Linux/&ms-dos;/&windows; + Linux/&ms-dos;/&windows; és hasonló + rendszerek emulációja &a.firewire.name; - FreeBSD &firewire; (iLink, IEEE 1394) technical - discussion + A &os; és a &firewire; (iLink, IEEE 1394) + kapcsolatának technikai + kérdései &a.fs.name; - File systems + Állományrendszerek &a.geom.name; - GEOM-specific discussions and implementations + A GEOM-hoz tartozó témák + és implementációk &a.gnome.name; - Porting GNOME and GNOME applications + A GNOME és + GNOME-alkalmazások + portolása &a.hackers.name; - General technical discussion + Általános szakmai + témák &a.hardware.name; - General discussion of hardware for running - FreeBSD + A &os; futtatására + szolgáló hardverekkel foglalkozó + témák &a.i18n.name; - FreeBSD Internationalization + A &os; honosítása &a.ia32.name; - FreeBSD on the IA-32 (&intel; x86) platform + A &os; használata az IA-32 (&intel; x86) + platformon &a.ia64.name; - Porting FreeBSD to &intel;'s upcoming IA64 systems + A &os; portolása az &intel; + következõ IA64 rendszereire &a.ipfw.name; - Technical discussion concerning the redesign of the IP - firewall code + Az IP tûzfal kódjának + újratervezését érintõ + szakmai megbeszélések &a.isdn.name; - ISDN developers + ISDN fejlesztõk levelei &a.jail.name; - Discussion about the &man.jail.8; facility + A &man.jail.8; segédprogram &a.java.name; - &java; developers and people porting &jdk;s to - FreeBSD + &java; fejlesztõk kérdései + és a &jdk;-k átültetése + &os;-re &a.kde.name; - Porting KDE and KDE applications + A KDE és + KDE-alkalmazások + portolása &a.lfs.name; - Porting LFS to FreeBSD + Az LFS áthozása &os;-re &a.libh.name; - The second generation installation and package - system + A második generációs + telepítõ- és csomagrendszer &a.mips.name; - Porting FreeBSD to &mips; + A &os; portolása &mips;-re &a.mobile.name; - Discussions about mobile computing + A mobil számítógépekkel + kapcsolatos megbeszélések &a.mozilla.name; - Porting Mozilla to FreeBSD + A Mozilla + átültetése &os;-re &a.multimedia.name; - Multimedia applications + Multimédia alkalmazások &a.newbus.name; - Technical discussions about bus architecture + A buszarchitektúrával kapcsolatos + szakmai megbeszélések &a.net.name; - Networking discussion and TCP/IP source code + A TCP/IP forráskódjával + és hálózatkezeléssel + kapcsolatos kérdések &a.openoffice.name; - Porting OpenOffice.org and - &staroffice; to FreeBSD + A OpenOffice.org + és &staroffice; + alkalmazások portolása &os;-re &a.performance.name; - Performance tuning questions for high - performance/load installations + Nagy terhelésû és + teljesítményû rendszerek + teljesítményhangolási + kérdései &a.perl.name; - Maintenance of a number of - Perl-related ports + A rengeteg Perl alapú port + karbantársa &a.pf.name; - Discussion and questions about the packet filter - firewall system + A csomagszûrõ + mûködésével kapcsolatos + kérdések és + megbeszélések &a.platforms.name; - Concerning ports to non &intel; architecture - platforms + Portolás nem &intel; + architektúrájú platformokra &a.ports.name; - Discussion of the Ports Collection + A Portgyûjtemény + mûködése &a.ports-bugs.name; - Discussion of the ports bugs/PRs + A portokhoz tartozó hibák és + hibajelentések megbeszélése &a.ppc.name; - Porting FreeBSD to the &powerpc; + A &os; portolása &powerpc;-re &a.proliant.name; - Technical discussion of FreeBSD on HP ProLiant server platforms + HP ProLiant szerverek és a &os; + kapcsolata &a.python.name; - FreeBSD-specific Python issues + A Python &os;-n futó + változatának problémái &a.qa.name; - Discussion of Quality Assurance, usually pending a release + A minõségbiztosítás + megbeszélése, különösen a + kiadások közeledtével &a.rc.name; - Discussion related to the rc.d system and its development + Az rc.d rendszer és + annak fejlõdése &a.realtime.name; - Development of realtime extensions to FreeBSD + A &os; valósidejû + kiterjesztéseinek fejlesztése &a.scsi.name; - The SCSI subsystem + A SCSI alrendszer &a.security.name; - Security issues affecting FreeBSD + A &os; mûködését + fenyegetõ biztonsági + problémák &a.small.name; - Using FreeBSD in embedded applications - (obsolete; use &a.embedded.name; instead) + A &os; használata beágyazott + alkalmazásokban (elavult; helyette a + &a.embedded.name; címét + használjuk) &a.smp.name; - Design discussions for [A]Symmetric - MultiProcessing + Az [A]Szimmetrikus többszálú + feldolgozáshoz ([A]Symmetric MultiProcessing) + tartozó tervezési + megbeszélések &a.sparc.name; - Porting FreeBSD to &sparc; based systems + A &os; portolása &sparc; alapú + rendszerekre &a.standards.name; - FreeBSD's conformance to the C99 and the &posix; - standards + A &os; megfelelése a C99 és &posix; + szabványoknak &a.sun4v.name; - Porting FreeBSD to &ultrasparc; T1 based systems + A &os; portolása &ultrasparc; T1 + alapú rendszerekre &a.threads.name; - Threading in FreeBSD + A &os; szálkezelése &a.testing.name; - FreeBSD Performance and Stability Tests + A &os; teljesítmény- és + megbízhatósági tesztjei &a.tokenring.name; - Support Token Ring in FreeBSD + A Token Ring támogatása a + &os;-ben &a.usb.name; - Discussing &os; support for USB + USB támogatás a &os;-ben &a.vuxml.name; - Discussion on VuXML infrastructure + A VuXML infrastruktúra + tárgyalása &a.x11.name; - Maintenance and support of X11 on FreeBSD + Az X11 karbantartása és + támogata &os; alatt - Limited lists: The following lists are for - more specialized (and demanding) audiences and are probably not of - interest to the general public. It is also a good idea to establish a - presence in the technical lists before joining one of these limited - lists so that you will understand the communications etiquette involved. + Korlátozott listák: A + következõ listák sokkalta jobban + specializálódótt (és + igényesebb) közösségnek szólnak, + nem a nagyközönségnek. Ezért + mielõtt egy ilyen listára feliratkoznánk, + érdemes némi tapasztalatot gyûjtenünk a + szakmai témájú listákon, így + megismerjük az itt alkalmazott kommunikációs + szabályokat. - List - Purpose + Lista + Tartalom &a.hubs.name; - People running mirror sites (infrastructural - support) + A tükrözések üzemeltetõi + számára (infrastrukturális + támogatás) &a.usergroups.name; - User group coordination + A felhasználói csoportok + összefogása &a.vendors.name; - Vendors pre-release coordination + Kiadások elõtt a forgalmazók + koordinálása &a.www.name; - Maintainers of www.FreeBSD.org + A www.FreeBSD.org + karbantartói számára - Digest lists: All of the above lists - are available in a digest format. Once subscribed to a list, - you can change your digest options in your account options - section. + Kivonatolt listák: Az eddig + említett listák elérhetõek kivonatolt + formában is. Miután feliratkoztunk egy + listára, a hozzáférésünk + beállításainál + kiválaszthatjuk, hogy kivonatolt formátumban + kívánjuk-e kapni a leveleket. - CVS lists: The following lists are for people - interested in seeing the log messages for changes to various areas of - the source tree. They are Read-Only lists and - should not have mail sent to them. + CVS listák: A + következõ listák a forrásfa + különbözõ részeinek + változtatásáról és a + hozzájuk tartozó üzenetekrõl adnak + értesítést. Ezek a listák + csak olvasásra vannak, nem szabad + rájuk levelet küldeni. - List - Source area - Area Description (source for) + Lista + Forráskód területe + A terület leírása (minek a + forrása) @@ -602,31 +740,35 @@ &a.cvsall.name; /usr/(CVSROOT|doc|ports|projects|src) - All changes to any place in the tree (superset of other CVS commit lists) + A fában végzett akármelyik + módosítás (az összes CVS lista + együtt) &a.cvs-doc.name; /usr/(doc|www) - All changes to the doc and www trees + A doc és www ágak + változásai &a.cvs-ports.name; /usr/ports - All changes to the ports tree + A portfa változásai &a.cvs-projects.name; /usr/projects - All changes to the projects tree + A projektek változásai &a.cvs-src.name; /usr/src - All changes to the src tree + A rendszer forrásának + változásai @@ -634,92 +776,133 @@ - How to Subscribe + Hogyan iratkozzunk fel - To subscribe to a list, click on the list name above or - go to &a.mailman.lists.link; - and click on the list that you are interested in. The list - page should contain all of the necessary subscription - instructions. + Ha fel akarunk iratkozni valamelyik listára, + kattintsunk a nevére, vagy menjünk a + &a.mailman.lists.link; címre és a válasszuk + ki onnan a keresett listát. A lista oldalán + megtalálunk minden feliratkozással kapcsolatos + utasítást. - To actually post to a given list you simply send mail to >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:51:22 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 354FC16A41A; Sun, 30 Dec 2007 15:51:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE77716A418 for ; Sun, 30 Dec 2007 15:51:21 +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 DE8AB13C44B for ; Sun, 30 Dec 2007 15:51:21 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFpLmw019875 for ; Sun, 30 Dec 2007 15:51:21 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFpL5j019872 for perforce@freebsd.org; Sun, 30 Dec 2007 15:51:21 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 15:51:21 GMT Message-Id: <200712301551.lBUFpL5j019872@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 132108 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:51:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=132108 Change 132108 by hselasky@hselasky_laptop001 on 2007/12/30 15:50:30 Fix "uchcom" header files. Substitute "DPRINTF" by "DPRINTFN". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#15 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#15 (text+ko) ==== @@ -72,24 +72,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include #include -#include - -#include -#include +#include #include +#include #include + #include "usbdevs.h" #ifdef USB_DEBUG @@ -319,7 +312,7 @@ { struct usb_attach_arg *uaa = device_get_ivars(dev); - DPRINTF(10, "\n"); + DPRINTFN(10, "\n"); if (uaa->usb_mode != USB_MODE_HOST) { return (UMATCH_NONE); @@ -341,7 +334,7 @@ int error; uint8_t iface_index; - DPRINTF(10, "\n"); + DPRINTFN(10, "\n"); if (sc == NULL) { return (ENOMEM); @@ -375,7 +368,7 @@ UCHCOM_N_TRANSFER, sc, &Giant); if (error) { - DPRINTF(0, "one or more missing USB endpoints, " + DPRINTFN(0, "one or more missing USB endpoints, " "error=%s\n", usbd_errstr(error)); goto detach; } @@ -412,7 +405,7 @@ { struct uchcom_softc *sc = device_get_softc(dev); - DPRINTF(10, "\n"); + DPRINTFN(10, "\n"); ucom_detach(&(sc->sc_super_ucom), &(sc->sc_ucom), 1); @@ -767,7 +760,7 @@ { struct uchcom_softc *sc = ucom->sc_parent; - DPRINTF(0, "\n"); + DPRINTFN(0, "\n"); *lsr = sc->sc_lsr; *msr = sc->sc_msr; @@ -786,7 +779,7 @@ { struct uchcom_softc *sc = ucom->sc_parent; - DPRINTF(0, "onoff = %d\n", onoff); + DPRINTFN(0, "onoff = %d\n", onoff); sc->sc_dtr = onoff; uchcom_set_dtrrts(sc); @@ -798,7 +791,7 @@ { struct uchcom_softc *sc = ucom->sc_parent; - DPRINTF(0, "onoff = %d\n", onoff); + DPRINTFN(0, "onoff = %d\n", onoff); sc->sc_rts = onoff; uchcom_set_dtrrts(sc); @@ -892,7 +885,7 @@ switch (USBD_GET_STATE(xfer)) { case USBD_ST_TRANSFERRED: - DPRINTF(0, "actlen = %u\n", xfer->actlen); + DPRINTFN(0, "actlen = %u\n", xfer->actlen); if (xfer->actlen >= UCHCOM_INTR_LEAST) { usbd_copy_out(xfer->frbuffers + 0, 0, buf, @@ -932,7 +925,7 @@ struct usbd_xfer *xfer_other = sc->sc_xfer[4]; if (usbd_clear_stall_callback(xfer, xfer_other)) { - DPRINTF(0, "stall cleared\n"); + DPRINTFN(0, "stall cleared\n"); sc->sc_flag &= ~UCHCOM_FLAG_INTR_STALL; usbd_transfer_start(xfer_other); } @@ -955,7 +948,7 @@ if (ucom_get_data(&(sc->sc_ucom), xfer->frbuffers + 0, 0, UCHCOM_BULK_BUF_SIZE, &actlen)) { - DPRINTF(0, "actlen = %d\n", actlen); + DPRINTFN(0, "actlen = %d\n", actlen); xfer->frlengths[0] = actlen; usbd_start_hardware(xfer); @@ -979,7 +972,7 @@ struct usbd_xfer *xfer_other = sc->sc_xfer[0]; if (usbd_clear_stall_callback(xfer, xfer_other)) { - DPRINTF(0, "stall cleared\n"); + DPRINTFN(0, "stall cleared\n"); sc->sc_flag &= ~UCHCOM_FLAG_WRITE_STALL; usbd_transfer_start(xfer_other); } @@ -1021,7 +1014,7 @@ struct usbd_xfer *xfer_other = sc->sc_xfer[1]; if (usbd_clear_stall_callback(xfer, xfer_other)) { - DPRINTF(0, "stall cleared\n"); + DPRINTFN(0, "stall cleared\n"); sc->sc_flag &= ~UCHCOM_FLAG_READ_STALL; usbd_transfer_start(xfer_other); } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:54:26 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C45CF16A46E; Sun, 30 Dec 2007 15:54: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 887DB16A420 for ; Sun, 30 Dec 2007 15:54:25 +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 6F14A13C478 for ; Sun, 30 Dec 2007 15:54:25 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFsPH6021829 for ; Sun, 30 Dec 2007 15:54:25 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFsPVB021826 for perforce@freebsd.org; Sun, 30 Dec 2007 15:54:25 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 15:54:25 GMT Message-Id: <200712301554.lBUFsPVB021826@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 132109 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:54:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=132109 Change 132109 by hselasky@hselasky_laptop001 on 2007/12/30 15:53:31 Add "uchcom" prototypes and remove an unused structure. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#16 (text+ko) ==== @@ -167,14 +167,6 @@ #define UCHCOM_FLAG_WRITE_STALL 0x04 }; -struct uchcom_endpoints -{ - int ep_bulkin; - int ep_bulkout; - int ep_intr; - int ep_intr_size; -}; - struct uchcom_divider { uint8_t dv_prescaler; @@ -206,6 +198,8 @@ }; #define uchcom_lookup(v, p) usb_lookup(uchcom_devs, v, p) +/* protypes */ + static int uchcom_ioctl(struct ucom_softc *ucom, uint32_t cmd, caddr_t data, int flag, struct thread *td); static int uchcom_pre_param(struct ucom_softc *ucom, struct termios *t); static void uchcom_cfg_get_status(struct ucom_softc *ucom, uint8_t *lsr, uint8_t *msr); @@ -218,6 +212,16 @@ static void uchcom_stop_read(struct ucom_softc *ucom); static void uchcom_stop_write(struct ucom_softc *ucom); +static void uchcom_update_version(struct uchcom_softc *sc); +static void uchcom_convert_status(struct uchcom_softc *sc, uint8_t cur); +static void update_status(struct uchcom_softc *sc); +static void uchcom_set_dtrrts(struct uchcom_softc *sc); +static int uchcom_calc_divider_settings(struct uchcom_divider *dp, uint32_t rate); +static void uchcom_set_dte_rate(struct uchcom_softc *sc, uint32_t rate); +static void uchcom_set_line_control(struct uchcom_softc *sc, tcflag_t cflag); +static void uchcom_clear_chip(struct uchcom_softc *sc); +static void uchcom_reset_chip(struct uchcom_softc *sc); + static device_probe_t uchcom_probe; static device_attach_t uchcom_attach; static device_detach_t uchcom_detach; From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:57:29 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 571F216A475; Sun, 30 Dec 2007 15:57: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 1C6E916A417 for ; Sun, 30 Dec 2007 15:57:29 +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 0CC1C13C4D9 for ; Sun, 30 Dec 2007 15:57:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFvS4D023150 for ; Sun, 30 Dec 2007 15:57:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFvSYS023147 for perforce@freebsd.org; Sun, 30 Dec 2007 15:57:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 15:57:28 GMT Message-Id: <200712301557.lBUFvSYS023147@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 132110 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:57:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=132110 Change 132110 by hselasky@hselasky_laptop001 on 2007/12/30 15:57:05 "uchcom" compile fixes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#17 (text+ko) ==== @@ -384,6 +384,7 @@ uchcom_update_version(sc); uchcom_clear_chip(sc); uchcom_reset_chip(sc); + update_status(sc); sc->sc_dtr = 1; sc->sc_rts = 1; @@ -597,7 +598,7 @@ else uchcom_set_dtrrts_20(sc, ~val); - return (0); + return; } static void @@ -812,7 +813,7 @@ case CS6: case CS7: return (EIO); - defaul: + default: break; } @@ -895,7 +896,7 @@ usbd_copy_out(xfer->frbuffers + 0, 0, buf, UCHCOM_INTR_LEAST); - DPRINTFN(0, "data = 0x%02X 0x%02X 0x%02X 0x%02X\n" + DPRINTFN(0, "data = 0x%02X 0x%02X 0x%02X 0x%02X\n", (unsigned)buf[0], (unsigned)buf[1], (unsigned)buf[2], (unsigned)buf[3]); @@ -1040,6 +1041,8 @@ sizeof (struct uchcom_softc) }; -DRIVER_MODULE(uchcom, uhub, uchcom_driver, ucom_devclass, usbd_driver_load, 0); +static devclass_t uchcom_devclass; + +DRIVER_MODULE(uchcom, uhub, uchcom_driver, uchcom_devclass, usbd_driver_load, 0); MODULE_DEPEND(uchcom, usb, 1, 1, 1); MODULE_DEPEND(uchcom, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:58:30 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC3FE16A41B; Sun, 30 Dec 2007 15:58: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 817EF16A417 for ; Sun, 30 Dec 2007 15:58:30 +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 70EAF13C469 for ; Sun, 30 Dec 2007 15:58:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFwU6D023212 for ; Sun, 30 Dec 2007 15:58:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFwUat023209 for perforce@freebsd.org; Sun, 30 Dec 2007 15:58:30 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 15:58:30 GMT Message-Id: <200712301558.lBUFwUat023209@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 132111 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:58:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=132111 Change 132111 by hselasky@hselasky_laptop001 on 2007/12/30 15:58:01 Style changes by "usb_style.sh". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#18 (text+ko) ==== @@ -146,8 +146,8 @@ #define UCHCOM_INTR_STAT2 0x03 #define UCHCOM_INTR_LEAST 4 -#define UCHCOM_BULK_BUF_SIZE 1024 /* bytes */ -#define UCHCOM_N_TRANSFER 6 /* units */ +#define UCHCOM_BULK_BUF_SIZE 1024 /* bytes */ +#define UCHCOM_N_TRANSFER 6 /* units */ struct uchcom_softc { struct ucom_super_softc sc_super_ucom; @@ -156,46 +156,46 @@ struct usbd_xfer *sc_xfer[UCHCOM_N_TRANSFER]; struct usbd_device *sc_udev; - uint8_t sc_dtr; /* local copy */ - uint8_t sc_rts; /* local copy */ - uint8_t sc_version; - uint8_t sc_msr; - uint8_t sc_lsr; /* local status register */ - uint8_t sc_flag; + uint8_t sc_dtr; /* local copy */ + uint8_t sc_rts; /* local copy */ + uint8_t sc_version; + uint8_t sc_msr; + uint8_t sc_lsr; /* local status register */ + uint8_t sc_flag; #define UCHCOM_FLAG_INTR_STALL 0x01 #define UCHCOM_FLAG_READ_STALL 0x02 #define UCHCOM_FLAG_WRITE_STALL 0x04 }; -struct uchcom_divider -{ - uint8_t dv_prescaler; - uint8_t dv_div; - uint8_t dv_mod; +struct uchcom_divider { + uint8_t dv_prescaler; + uint8_t dv_div; + uint8_t dv_mod; }; -struct uchcom_divider_record -{ - uint32_t dvr_high; - uint32_t dvr_low; - uint32_t dvr_base_clock; - struct uchcom_divider dvr_divider; +struct uchcom_divider_record { + uint32_t dvr_high; + uint32_t dvr_low; + uint32_t dvr_base_clock; + struct uchcom_divider dvr_divider; }; static const struct uchcom_divider_record dividers[] = { - { 307200, 307200, UCHCOM_BASE_UNKNOWN, { 7, 0xD9, 0 } }, - { 921600, 921600, UCHCOM_BASE_UNKNOWN, { 7, 0xF3, 0 } }, - { 2999999, 23530, 6000000, { 3, 0, 0 } }, - { 23529, 2942, 750000, { 2, 0, 0 } }, - { 2941, 368, 93750, { 1, 0, 0 } }, - { 367, 1, 11719, { 0, 0, 0 } }, + {307200, 307200, UCHCOM_BASE_UNKNOWN, {7, 0xD9, 0}}, + {921600, 921600, UCHCOM_BASE_UNKNOWN, {7, 0xF3, 0}}, + {2999999, 23530, 6000000, {3, 0, 0}}, + {23529, 2942, 750000, {2, 0, 0}}, + {2941, 368, 93750, {1, 0, 0}}, + {367, 1, 11719, {0, 0, 0}}, }; + #define NUM_DIVIDERS (sizeof (dividers) / sizeof (dividers[0])) static const struct usb_devno uchcom_devs[] = { - { USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341SER }, + {USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341SER}, }; + #define uchcom_lookup(v, p) usb_lookup(uchcom_devs, v, p) /* protypes */ @@ -321,13 +321,11 @@ if (uaa->usb_mode != USB_MODE_HOST) { return (UMATCH_NONE); } - if (uaa->iface) { return (UMATCH_NONE); } - return (uchcom_lookup(uaa->vendor, uaa->product) != NULL ? - UMATCH_VENDOR_PRODUCT : UMATCH_NONE); + UMATCH_VENDOR_PRODUCT : UMATCH_NONE); } static int @@ -356,7 +354,6 @@ "error=%s\n", usbd_errstr(error)); goto detach; } - switch (uaa->release) { case UCHCOM_REV_CH340: device_printf(dev, "CH340 detected\n"); @@ -376,7 +373,6 @@ "error=%s\n", usbd_errstr(error)); goto detach; } - /* * Do the initialization during attach so that the system does not * sleep during open: @@ -447,7 +443,7 @@ done: if (length != actlen) { if (req->bmRequestType & UT_READ) { - bzero(USBD_ADD_BYTES(data,actlen), length - actlen); + bzero(USBD_ADD_BYTES(data, actlen), length - actlen); } } return; @@ -455,7 +451,7 @@ static void uchcom_ctrl_write(struct uchcom_softc *sc, uint8_t reqno, - uint16_t value, uint16_t index) + uint16_t value, uint16_t index) { usb_device_request_t req; @@ -487,33 +483,35 @@ static void uchcom_write_reg(struct uchcom_softc *sc, - uint8_t reg1, uint8_t val1, uint8_t reg2, uint8_t val2) + uint8_t reg1, uint8_t val1, uint8_t reg2, uint8_t val2) { DPRINTFN(0, "0x%02X<-0x%02X, 0x%02X<-0x%02X\n", - (unsigned)reg1, (unsigned)val1, - (unsigned)reg2, (unsigned)val2); + (unsigned)reg1, (unsigned)val1, + (unsigned)reg2, (unsigned)val2); uchcom_ctrl_write( - sc, UCHCOM_REQ_WRITE_REG, - reg1|((uint16_t)reg2<<8), val1|((uint16_t)val2<<8)); + sc, UCHCOM_REQ_WRITE_REG, + reg1 | ((uint16_t)reg2 << 8), val1 | ((uint16_t)val2 << 8)); return; } static void uchcom_read_reg(struct uchcom_softc *sc, - uint8_t reg1, uint8_t *rval1, uint8_t reg2, uint8_t *rval2) + uint8_t reg1, uint8_t *rval1, uint8_t reg2, uint8_t *rval2) { uint8_t buf[UCHCOM_INPUT_BUF_SIZE]; uchcom_ctrl_read( - sc, UCHCOM_REQ_READ_REG, - reg1|((uint16_t)reg2<<8), 0, buf, sizeof(buf)); + sc, UCHCOM_REQ_READ_REG, + reg1 | ((uint16_t)reg2 << 8), 0, buf, sizeof(buf)); DPRINTFN(0, "0x%02X->0x%02X, 0x%02X->0x%02X\n", - (unsigned)reg1, (unsigned)buf[0], - (unsigned)reg2, (unsigned)buf[1]); + (unsigned)reg1, (unsigned)buf[0], + (unsigned)reg2, (unsigned)buf[1]); - if (rval1) *rval1 = buf[0]; - if (rval2) *rval2 = buf[1]; + if (rval1) + *rval1 = buf[0]; + if (rval2) + *rval2 = buf[1]; return; } @@ -524,9 +522,10 @@ uint8_t buf[UCHCOM_INPUT_BUF_SIZE]; uchcom_ctrl_read( - sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof(buf)); + sc, UCHCOM_REQ_GET_VERSION, 0, 0, buf, sizeof(buf)); - if (rver) *rver = buf[0]; + if (rver) + *rver = buf[0]; return; } @@ -590,8 +589,10 @@ { uint8_t val = 0; - if (sc->sc_dtr) val |= UCHCOM_DTR_MASK; - if (sc->sc_rts) val |= UCHCOM_RTS_MASK; + if (sc->sc_dtr) + val |= UCHCOM_DTR_MASK; + if (sc->sc_rts) + val |= UCHCOM_RTS_MASK; if (sc->sc_version < UCHCOM_VER_20) uchcom_set_dtrrts_10(sc, ~val); @@ -633,7 +634,7 @@ uint8_t i; /* find record */ - for (i=0; i != NUM_DIVIDERS; i++) { + for (i = 0; i != NUM_DIVIDERS; i++) { if (dividers[i].dvr_high >= rate && dividers[i].dvr_low <= rate) { rp = ÷rs[i]; @@ -649,15 +650,15 @@ else { div = rp->dvr_base_clock / rate; rem = rp->dvr_base_clock % rate; - if (div==0 || div>=0xFF) - return (-1); - if ((rem<<1) >= rate) + if (div == 0 || div >= 0xFF) + return (-1); + if ((rem << 1) >= rate) div += 1; dp->dv_div = (uint8_t)-div; } - mod = UCHCOM_BPS_MOD_BASE/rate + UCHCOM_BPS_MOD_BASE_OFS; - mod = mod + mod/2; + mod = UCHCOM_BPS_MOD_BASE / rate + UCHCOM_BPS_MOD_BASE_OFS; + mod = mod + mod / 2; dp->dv_mod = mod / 0x100; @@ -670,14 +671,14 @@ struct uchcom_divider dv; if (uchcom_calc_divider_settings(&dv, rate)) - return; + return; uchcom_write_reg(sc, - UCHCOM_REG_BPS_PRE, dv.dv_prescaler, - UCHCOM_REG_BPS_DIV, dv.dv_div); + UCHCOM_REG_BPS_PRE, dv.dv_prescaler, + UCHCOM_REG_BPS_DIV, dv.dv_div); uchcom_write_reg(sc, - UCHCOM_REG_BPS_MOD, dv.dv_mod, - UCHCOM_REG_BPS_PAD, 0); + UCHCOM_REG_BPS_MOD, dv.dv_mod, + UCHCOM_REG_BPS_PAD, 0); return; } @@ -708,7 +709,6 @@ else lcr2 |= UCHCOM_LCR2_PAREVEN; } - uchcom_write_reg(sc, UCHCOM_REG_LCR1, lcr1, UCHCOM_REG_LCR2, lcr2); return; @@ -739,9 +739,9 @@ val = 0; idx = 0; - val |= (uint16_t)(lcr1&0xF0) << 8; + val |= (uint16_t)(lcr1 & 0xF0) << 8; val |= 0x01; - val |= (uint16_t)(lcr2&0x0F) << 8; + val |= (uint16_t)(lcr2 & 0x0F) << 8; val |= 0x02; idx |= pre & 0x07; val |= 0x04; @@ -820,13 +820,14 @@ if (uchcom_calc_divider_settings(&dv, t->c_ospeed)) { return (EIO); } - return (0); /* success */ + return (0); /* success */ } static void uchcom_cfg_param(struct ucom_softc *ucom, struct termios *t) { struct uchcom_softc *sc = ucom->sc_parent; + uchcom_set_line_control(sc, t->c_cflag); uchcom_set_dte_rate(sc, t->c_ospeed); return; @@ -893,17 +894,16 @@ DPRINTFN(0, "actlen = %u\n", xfer->actlen); if (xfer->actlen >= UCHCOM_INTR_LEAST) { - usbd_copy_out(xfer->frbuffers + 0, 0, buf, + usbd_copy_out(xfer->frbuffers + 0, 0, buf, UCHCOM_INTR_LEAST); - DPRINTFN(0, "data = 0x%02X 0x%02X 0x%02X 0x%02X\n", - (unsigned)buf[0], (unsigned)buf[1], - (unsigned)buf[2], (unsigned)buf[3]); + DPRINTFN(0, "data = 0x%02X 0x%02X 0x%02X 0x%02X\n", + (unsigned)buf[0], (unsigned)buf[1], + (unsigned)buf[2], (unsigned)buf[3]); - uchcom_convert_status(sc, buf[UCHCOM_INTR_STAT1]); - ucom_status_change(&sc->sc_ucom); + uchcom_convert_status(sc, buf[UCHCOM_INTR_STAT1]); + ucom_status_change(&sc->sc_ucom); } - case USBD_ST_SETUP: if (sc->sc_flag & UCHCOM_FLAG_INTR_STALL) { usbd_transfer_start(sc->sc_xfer[5]); @@ -1032,13 +1032,13 @@ DEVMETHOD(device_attach, uchcom_attach), DEVMETHOD(device_detach, uchcom_detach), - { 0, 0 } + {0, 0} }; static driver_t uchcom_driver = { "ucom", uchcom_methods, - sizeof (struct uchcom_softc) + sizeof(struct uchcom_softc) }; static devclass_t uchcom_devclass; From owner-p4-projects@FreeBSD.ORG Sun Dec 30 15:59:32 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E83C616A41A; Sun, 30 Dec 2007 15:59:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AD62116A418 for ; Sun, 30 Dec 2007 15:59:31 +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 9DEDD13C469 for ; Sun, 30 Dec 2007 15:59:31 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUFxV8n023236 for ; Sun, 30 Dec 2007 15:59:31 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUFxVga023233 for perforce@freebsd.org; Sun, 30 Dec 2007 15:59:31 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 15:59:31 GMT Message-Id: <200712301559.lBUFxVga023233@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 132112 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 15:59:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=132112 Change 132112 by hselasky@hselasky_laptop001 on 2007/12/30 15:58:51 Style changes - more. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#19 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#19 (text+ko) ==== @@ -102,49 +102,49 @@ #define UCHCOM_IFACE_INDEX 0 #define UCHCOM_CONFIG_INDEX 0 -#define UCHCOM_REV_CH340 0x0250 -#define UCHCOM_INPUT_BUF_SIZE 8 +#define UCHCOM_REV_CH340 0x0250 +#define UCHCOM_INPUT_BUF_SIZE 8 -#define UCHCOM_REQ_GET_VERSION 0x5F -#define UCHCOM_REQ_READ_REG 0x95 -#define UCHCOM_REQ_WRITE_REG 0x9A -#define UCHCOM_REQ_RESET 0xA1 -#define UCHCOM_REQ_SET_DTRRTS 0xA4 +#define UCHCOM_REQ_GET_VERSION 0x5F +#define UCHCOM_REQ_READ_REG 0x95 +#define UCHCOM_REQ_WRITE_REG 0x9A +#define UCHCOM_REQ_RESET 0xA1 +#define UCHCOM_REQ_SET_DTRRTS 0xA4 -#define UCHCOM_REG_STAT1 0x06 -#define UCHCOM_REG_STAT2 0x07 -#define UCHCOM_REG_BPS_PRE 0x12 -#define UCHCOM_REG_BPS_DIV 0x13 -#define UCHCOM_REG_BPS_MOD 0x14 -#define UCHCOM_REG_BPS_PAD 0x0F -#define UCHCOM_REG_BREAK1 0x05 -#define UCHCOM_REG_BREAK2 0x18 -#define UCHCOM_REG_LCR1 0x18 -#define UCHCOM_REG_LCR2 0x25 +#define UCHCOM_REG_STAT1 0x06 +#define UCHCOM_REG_STAT2 0x07 +#define UCHCOM_REG_BPS_PRE 0x12 +#define UCHCOM_REG_BPS_DIV 0x13 +#define UCHCOM_REG_BPS_MOD 0x14 +#define UCHCOM_REG_BPS_PAD 0x0F +#define UCHCOM_REG_BREAK1 0x05 +#define UCHCOM_REG_BREAK2 0x18 +#define UCHCOM_REG_LCR1 0x18 +#define UCHCOM_REG_LCR2 0x25 -#define UCHCOM_VER_20 0x20 +#define UCHCOM_VER_20 0x20 -#define UCHCOM_BASE_UNKNOWN 0 -#define UCHCOM_BPS_MOD_BASE 20000000 -#define UCHCOM_BPS_MOD_BASE_OFS 1100 +#define UCHCOM_BASE_UNKNOWN 0 +#define UCHCOM_BPS_MOD_BASE 20000000 +#define UCHCOM_BPS_MOD_BASE_OFS 1100 -#define UCHCOM_DTR_MASK 0x20 -#define UCHCOM_RTS_MASK 0x40 +#define UCHCOM_DTR_MASK 0x20 +#define UCHCOM_RTS_MASK 0x40 -#define UCHCOM_BRK1_MASK 0x01 -#define UCHCOM_BRK2_MASK 0x40 +#define UCHCOM_BRK1_MASK 0x01 +#define UCHCOM_BRK2_MASK 0x40 -#define UCHCOM_LCR1_MASK 0xAF -#define UCHCOM_LCR2_MASK 0x07 -#define UCHCOM_LCR1_PARENB 0x80 -#define UCHCOM_LCR2_PAREVEN 0x07 -#define UCHCOM_LCR2_PARODD 0x06 -#define UCHCOM_LCR2_PARMARK 0x05 -#define UCHCOM_LCR2_PARSPACE 0x04 +#define UCHCOM_LCR1_MASK 0xAF +#define UCHCOM_LCR2_MASK 0x07 +#define UCHCOM_LCR1_PARENB 0x80 +#define UCHCOM_LCR2_PAREVEN 0x07 +#define UCHCOM_LCR2_PARODD 0x06 +#define UCHCOM_LCR2_PARMARK 0x05 +#define UCHCOM_LCR2_PARSPACE 0x04 -#define UCHCOM_INTR_STAT1 0x02 -#define UCHCOM_INTR_STAT2 0x03 -#define UCHCOM_INTR_LEAST 4 +#define UCHCOM_INTR_STAT1 0x02 +#define UCHCOM_INTR_STAT2 0x03 +#define UCHCOM_INTR_LEAST 4 #define UCHCOM_BULK_BUF_SIZE 1024 /* bytes */ #define UCHCOM_N_TRANSFER 6 /* units */ @@ -190,13 +190,13 @@ {367, 1, 11719, {0, 0, 0}}, }; -#define NUM_DIVIDERS (sizeof (dividers) / sizeof (dividers[0])) +#define NUM_DIVIDERS (sizeof (dividers) / sizeof (dividers[0])) static const struct usb_devno uchcom_devs[] = { {USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341SER}, }; -#define uchcom_lookup(v, p) usb_lookup(uchcom_devs, v, p) +#define uchcom_lookup(v, p) usb_lookup(uchcom_devs, v, p) /* protypes */ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 16:00:33 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 529D016A468; Sun, 30 Dec 2007 16:00:33 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F27F916A418 for ; Sun, 30 Dec 2007 16:00:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CAF3213C467 for ; Sun, 30 Dec 2007 16:00:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUG0W12023587 for ; Sun, 30 Dec 2007 16:00:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUG0WbI023584 for perforce@freebsd.org; Sun, 30 Dec 2007 16:00:32 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 16:00:32 GMT Message-Id: <200712301600.lBUG0WbI023584@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 132113 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 16:00:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=132113 Change 132113 by hselasky@hselasky_laptop001 on 2007/12/30 16:00:16 Build "uchcom" by default. Affected files ... .. //depot/projects/usb/src/sys/modules/Makefile#9 edit Differences ... ==== //depot/projects/usb/src/sys/modules/Makefile#9 (text+ko) ==== @@ -265,6 +265,7 @@ ubsa \ ubsec \ ubser \ + uchcom \ ucom \ ucycom \ udav \ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 16:07:40 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA7C216A46B; Sun, 30 Dec 2007 16:07:40 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6953516A418 for ; Sun, 30 Dec 2007 16:07:40 +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 59D9813C4E9 for ; Sun, 30 Dec 2007 16:07:40 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUG7eKk028353 for ; Sun, 30 Dec 2007 16:07:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUG7eg6028350 for perforce@freebsd.org; Sun, 30 Dec 2007 16:07:40 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 30 Dec 2007 16:07:40 GMT Message-Id: <200712301607.lBUG7eg6028350@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 132115 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 16:07:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=132115 Change 132115 by hselasky@hselasky_laptop001 on 2007/12/30 16:06:54 Prefix function name by "uchcom". The "uchcom" driver is now ready for testing! Affected files ... .. //depot/projects/usb/src/sys/dev/usb/uchcom.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/uchcom.c#20 (text+ko) ==== @@ -214,7 +214,7 @@ static void uchcom_update_version(struct uchcom_softc *sc); static void uchcom_convert_status(struct uchcom_softc *sc, uint8_t cur); -static void update_status(struct uchcom_softc *sc); +static void uchcom_update_status(struct uchcom_softc *sc); static void uchcom_set_dtrrts(struct uchcom_softc *sc); static int uchcom_calc_divider_settings(struct uchcom_divider *dp, uint32_t rate); static void uchcom_set_dte_rate(struct uchcom_softc *sc, uint32_t rate); @@ -380,7 +380,7 @@ uchcom_update_version(sc); uchcom_clear_chip(sc); uchcom_reset_chip(sc); - update_status(sc); + uchcom_update_status(sc); sc->sc_dtr = 1; sc->sc_rts = 1; @@ -574,7 +574,7 @@ } static void -update_status(struct uchcom_softc *sc) +uchcom_update_status(struct uchcom_softc *sc) { uint8_t cur; From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:00:43 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 287C316A420; Sun, 30 Dec 2007 20:00:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C846C16A46E for ; Sun, 30 Dec 2007 20:00:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B6EB313C503 for ; Sun, 30 Dec 2007 20:00:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUK0gLS025980 for ; Sun, 30 Dec 2007 20:00:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUK0e0o025977 for perforce@freebsd.org; Sun, 30 Dec 2007 20:00:40 GMT (envelope-from imp@freebsd.org) Date: Sun, 30 Dec 2007 20:00:40 GMT Message-Id: <200712302000.lBUK0e0o025977@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132118 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 20:00:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=132118 Change 132118 by imp@imp_paco-paco on 2007/12/30 20:00:19 Integrate from juniper-mips. Also, make it get past make depend on malta Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/_bus.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/_inttypes.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/_limits.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/_stdint.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/am29lv081b.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/archtype.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/atomic.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/bootinfo.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/bswap.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/clock.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/clockvar.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/cp0.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpu.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpuconf.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/cpufunc.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/db_machdep.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/defs.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/defs_mips.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/elf.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/endian.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/exec.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/float.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/frame.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/gdb_machdep.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ieeefp.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/in_cksum.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/intr.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/kdb.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/limits.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/md_var.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/memdev.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/mips_opcode.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/mutex.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ns16550.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pcb.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pcpu.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pltfm.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/pmap.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pmc_mdep.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/proc.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/profile.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/psl.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/pte.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ptrace.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/queue.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/reg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/regdef.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/regnum.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/reloc.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/resource.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/rm7000.h#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/include/runq.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/setjmp.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/sf_buf.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/sigframe.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/signal.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/smp.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/stdarg.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/trap.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/ucontext.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/varargs.h#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cache.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/clock.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/cpu.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_disasm.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_interface.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/db_trace.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/elf_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/fp.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/gdb_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/genassym.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/interrupt.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mainbus.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mem.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mips_subr.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/mp_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pm_machdep.c#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/psraccess.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/support.S#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/swtch.S#2 edit .. //depot/projects/mips2-jnpr/src/sys/mips/mips/tlb.S#1 branch .. //depot/projects/mips2-jnpr/src/sys/mips/mips/trap.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/uio_machdep.c#2 integrate .. //depot/projects/mips2-jnpr/src/sys/mips/mips/vm_machdep.c#2 integrate Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_bus.h#2 (text+ko) ==== @@ -25,11 +25,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $ + * $FreeBSD: src/sys/i386/include/_bus.h,v 1.1 2005/04/18 21:45:33 imp Exp $ */ -#ifndef AMD64_INCLUDE__BUS_H -#define AMD64_INCLUDE__BUS_H +#ifndef MIPS_INCLUDE__BUS_H +#define MIPS_INCLUDE__BUS_H /* * Bus address and size types @@ -40,7 +40,7 @@ /* * Access methods for bus resources and address space. */ -typedef uint32_t bus_space_tag_t; -typedef uint32_t bus_space_handle_t; +typedef int bus_space_tag_t; +typedef u_int bus_space_handle_t; -#endif /* AMD64_INCLUDE__BUS_H */ +#endif /* MIPS_INCLUDE__BUS_H */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_inttypes.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * From: $NetBSD: int_fmtio.h,v 1.2 2001/04/26 16:25:21 kleink Exp $ - * $FreeBSD: src/sys/amd64/include/_inttypes.h,v 1.3 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/i386/include/_inttypes.h,v 1.2 2002/06/30 05:48:02 mike Exp $ */ #ifndef _MACHINE_INTTYPES_H_ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_limits.h#2 (text+ko) ==== @@ -27,10 +27,10 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/amd64/include/_limits.h,v 1.11 2005/08/20 16:44:40 stefanf Exp $ + * $FreeBSD: src/sys/i386/include/_limits.h,v 1.27 2005/01/06 22:18:15 imp Exp $ */ -#ifndef _MACHINE__LIMITS_H_ +#ifndef _MACHINE__LIMITS_H_ #define _MACHINE__LIMITS_H_ /* @@ -59,18 +59,25 @@ #define __INT_MAX 0x7fffffff /* max value for an int */ #define __INT_MIN (-0x7fffffff - 1) /* min value for an int */ -#define __ULONG_MAX 0xffffffffUL /* max for an unsigned long */ -#define __LONG_MAX 0x7fffffffL /* max for a long */ -#define __LONG_MIN (-0x7fffffffL - 1) /* min for a long */ +/* Bad hack for gcc configured to give 64-bit longs. */ +#ifdef _LARGE_LONG +#define __ULONG_MAX 0xffffffffffffffffUL +#define __LONG_MAX 0x7fffffffffffffffL +#define __LONG_MIN (-0x7fffffffffffffffL - 1) +#else +#define __ULONG_MAX 0xffffffffUL /* max value for an unsigned long */ +#define __LONG_MAX 0x7fffffffL /* max value for a long */ +#define __LONG_MIN (-0x7fffffffL - 1) /* min value for a long */ +#endif /* max value for an unsigned long long */ #define __ULLONG_MAX 0xffffffffffffffffULL #define __LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ #define __LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ -#define __SSIZE_MAX __LONG_MAX /* max value for a ssize_t */ +#define __SSIZE_MAX __INT_MAX /* max value for a ssize_t */ -#define __SIZE_T_MAX __ULONG_MAX /* max value for a size_t */ +#define __SIZE_T_MAX __UINT_MAX /* max value for a size_t */ #define __OFF_MAX __LLONG_MAX /* max value for an off_t */ #define __OFF_MIN __LLONG_MIN /* min value for an off_t */ @@ -80,13 +87,11 @@ #define __QUAD_MAX __LLONG_MAX /* max value for a quad_t */ #define __QUAD_MIN __LLONG_MIN /* min value for a quad_t */ +#ifdef _LARGE_LONG +#define __LONG_BIT 64 +#else #define __LONG_BIT 32 +#endif #define __WORD_BIT 32 -/* - * Minimum signal stack size. - * XXXMIPS: need a value - */ -#define __MINSIGSTKSZ (512 * 4) - #endif /* !_MACHINE__LIMITS_H_ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_stdint.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/_stdint.h,v 1.3 2004/05/18 16:04:56 stefanf Exp $ + * $FreeBSD: src/sys/i386/include/_stdint.h,v 1.2 2004/05/18 16:04:57 stefanf Exp $ */ #ifndef _MACHINE__STDINT_H_ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.11 2006/01/09 06:05:56 imp Exp $ + * $FreeBSD: src/sys/i386/include/_types.h,v 1.12 2005/07/02 23:13:31 thompsa Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -43,6 +43,8 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define __NO_STRICT_ALIGNMENT + /* * Basic types upon which most other types are built. */ @@ -52,23 +54,33 @@ typedef unsigned short __uint16_t; typedef int __int32_t; typedef unsigned int __uint32_t; + +#if defined(lint) +/* LONGLONG */ +typedef long long __int64_t; +/* LONGLONG */ +typedef unsigned long long __uint64_t; +#elif defined(__GNUCLIKE_ATTRIBUTE_MODE_DI) +typedef int __attribute__((__mode__(__DI__))) __int64_t; +typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t; +#else +/* LONGLONG */ typedef long long __int64_t; +/* LONGLONG */ typedef unsigned long long __uint64_t; +#endif /* * Standard type definitions. */ -typedef __int32_t __clock_t; /* clock()... */ +typedef unsigned long __clock_t; /* clock()... */ typedef unsigned int __cpumask_t; typedef __int32_t __critical_t; typedef double __double_t; -/* - * XXXMIPS: should we use double here, or float? - */ typedef double __float_t; -typedef __int32_t __intfptr_t; +typedef long __intfptr_t; typedef __int64_t __intmax_t; -typedef __int32_t __intptr_t; +typedef long __intptr_t; typedef __int32_t __int_fast8_t; typedef __int32_t __int_fast16_t; typedef __int32_t __int_fast32_t; @@ -79,11 +91,12 @@ typedef __int64_t __int_least64_t; typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */ typedef __int32_t __register_t; +typedef __int32_t f_register_t; typedef __int32_t __segsz_t; /* segment size (in pages) */ typedef __uint32_t __size_t; /* sizeof() */ typedef __int32_t __ssize_t; /* byte count or error */ typedef __int32_t __time_t; /* time()... */ -typedef __uint32_t __uintfptr_t; +typedef unsigned long __uintfptr_t; typedef __uint64_t __uintmax_t; typedef __uint32_t __uintptr_t; typedef __uint32_t __uint_fast8_t; @@ -99,20 +112,24 @@ typedef __int64_t __vm_ooffset_t; typedef __uint32_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; -typedef __uint32_t __vm_size_t; +typedef unsigned long __vm_size_t; /* * Unusual type definitions. */ #ifdef __GNUCLIKE_BUILTIN_VARARGS -typedef __builtin_va_list __va_list; /* internally known to gcc */ -#elif defined(lint) -typedef char * __va_list; /* pretend */ -#endif +typedef __builtin_va_list __va_list; /* internally known to gcc */ +#else +typedef char * __va_list; +#endif /* __GNUCLIKE_BUILTIN_VARARGS */ #if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \ && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ #endif +typedef struct label_t { + __register_t val[13]; +} label_t; + #endif /* !_MACHINE__TYPES_H_ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/asm.h#2 (text+ko) ==== @@ -1,6 +1,7 @@ -/* $NetBSD: asm.h,v 1.37 2006/01/20 22:02:40 christos Exp $ */ +/* $NetBSD: asm.h,v 1.29 2000/12/14 21:29:51 jeffs Exp $ */ /* + * $Id: asm.h,v 1.10 2007/08/09 11:23:32 katta Exp $ * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * @@ -15,7 +16,11 @@ * 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. Neither the name of the University nor the names of its contributors + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -52,131 +57,86 @@ */ #ifndef _MACHINE_ASM_H_ -#define _MACHINE_ASM_H_ +#define _MACHINE_ASM_H_ -#include +#ifndef NO_REG_DEFS +#include +#endif +#include /* - * Assembly coding style - * - * This file contains macros and register defines to - * aid in writing more readable assembly code. - * Some rules to make assembly code understandable by - * a debugger are also noted. + * Define -pg profile entry code. + * Must always be noreorder, must never use a macro instruction + * Final addiu to t9 must always equal the size of this _KERN_MCOUNT */ +#define _KERN_MCOUNT \ + .set push; \ + .set noreorder; \ + .set noat; \ + subu sp,sp,16; \ + sw t9,12(sp); \ + move AT,ra; \ + lui t9,%hi(_mcount); \ + addiu t9,t9,%lo(_mcount); \ + jalr t9; \ + nop; \ + lw t9,4(sp); \ + addiu sp,sp,8; \ + addiu t9,t9,40; \ + .set pop; -/* - * Symbolic register names and register saving rules - * - * Legend: - * T Saved by caller (Temporaries) - * S Saved by callee (call-Safe registers) - */ +#ifdef GPROF +#define MCOUNT _KERN_MCOUNT +#else +#define MCOUNT +#endif + +#define _C_LABEL(x) x -#define zero $0 /* wired zero */ -#define AT $1 /* (T) assembler scratch */ -#define v0 $2 -#define v1 $3 -#define a0 $4 /* (T) argument registers */ -#define a1 $5 -#define a2 $6 -#define a3 $7 /* - * There is neither n32 nor n64 ABI support on the moment, but we'll - * leave these defines to our descendants. + * Endian-independent assembly-code aliases for unaligned memory accesses. */ -#if defined(__mips_n32) || defined(__mips_n64) -#define a4 $8 -#define a5 $9 -#define a6 $10 -#define a7 $11 -#define t0 $12 /* temp registers (not saved across subroutine calls) */ -#define t1 $13 -#define t2 $14 -#define t3 $15 -#else -#define t0 $8 /* temp registers (not saved across subroutine calls) */ -#define t1 $9 -#define t2 $10 -#define t3 $11 -#define t4 $12 -#define t5 $13 -#define t6 $14 -#define t7 $15 -#endif /* __mips_n32 || __mips_n64 */ -#define s0 $16 /* (S) call-safe registers */ -#define s1 $17 -#define s2 $18 -#define s3 $19 -#define s4 $20 -#define s5 $21 -#define s6 $22 -#define s7 $23 -#define t8 $24 /* (T) temporary registers */ -#define t9 $25 /* Address of callee in PIC code */ -#define k0 $26 /* Kernel registers? */ -#define k1 $27 -#define gp $28 /* (T) (local) data pointer */ -#define sp $29 /* (S) stack pointer */ -#define s8 $30 /* (S) call-safe register */ -#define ra $31 /* (T) return address */ +#if BYTE_ORDER == LITTLE_ENDIAN +#define LWLO lwl +#define LWHI lwr +#define SWLO swl +#define SWHI swr +#endif -/* - * These are temp registers whose names can be used in either the old - * or new ABI, although they map to different physical registers. In - * the old ABI, they map to t4-t7, and in the new ABI, they map to a4-a7. - * - * Because they overlap with the last 4 arg regs in the new ABI, ta0-ta3 - * should be used only when we need more than t0-t3. - */ -#if defined(__mips_n32) || defined(__mips_n64) -#define ta0 $8 -#define ta1 $9 -#define ta2 $10 -#define ta3 $11 -#else -#define ta0 $12 -#define ta1 $13 -#define ta2 $14 -#define ta3 $15 -#endif /* __mips_n32 || __mips_n64 */ +#if BYTE_ORDER == BIG_ENDIAN +#define LWLO lwr +#define LWHI lwl +#define SWLO swr +#define SWHI swl +#endif -#ifdef __ELF__ -# define _C_LABEL(x) x +#ifdef USE_AENT +#define AENT(x) \ + .aent x, 0 #else -# ifdef __STDC__ -# define _C_LABEL(x) _ ## x -# else -# define _C_LABEL(x) _/**/x -# endif +#define AENT(x) #endif -#define AENT(x) \ - .aent x, 0 - -/* - * WEAK_ALIAS: create a weak alias. - */ +#ifdef __ELF__ #define WEAK_ALIAS(alias,sym) \ .weak alias; \ alias = sym +#endif /* - * STRONG_ALIAS: create a strong alias. + * WARN_REFERENCES: create a warning if the specified symbol is referenced + * (ELF only, and thus, no leading underscores). */ -#define STRONG_ALIAS(alias,sym) \ - .globl alias; \ - alias = sym - -#define GLOBAL(sym) \ - .globl sym; sym: - -#define ENTRY(sym) \ - .text; .globl sym; .ent sym; sym: +#ifdef __ELF__ +#ifdef __STDC__ +#define WARN_REFERENCES(_sym,_msg) \ + .section .gnu.warning. ## _sym ; .ascii _msg ; .text +#else +#define WARN_REFERENCES(_sym,_msg) \ + .section .gnu.warning./**/_sym ; .ascii _msg ; .text +#endif /* __STDC__ */ +#endif /* __ELF__ */ -#define ASM_ENTRY(sym) \ - .text; .globl sym; .type sym,@function; sym: - /* * LEAF * A leaf routine does @@ -188,16 +148,18 @@ .globl _C_LABEL(x); \ .ent _C_LABEL(x), 0; \ _C_LABEL(x): ; \ - .frame sp, 0, ra; + .frame sp, 0, ra; \ + MCOUNT /* - * STATIC_LEAF - * Declare a local leaf function. + * LEAF_NOPROFILE + * No profilable leaf routine. */ -#define STATIC_LEAF(x) \ +#define LEAF_NOPROFILE(x) \ + .globl _C_LABEL(x); \ .ent _C_LABEL(x), 0; \ _C_LABEL(x): ; \ - .frame sp, 0, ra; + .frame sp, 0, ra /* * XLEAF @@ -209,14 +171,6 @@ _C_LABEL(x): /* - * STATIC_XLEAF - * declare alternate entry to a static leaf routine - */ -#define STATIC_XLEAF(x) \ - AENT (_C_LABEL(x)); \ -_C_LABEL(x): - -/* * NESTED * A function calls other functions and needs * therefore stack space to save/restore registers. @@ -225,7 +179,18 @@ .globl _C_LABEL(x); \ .ent _C_LABEL(x), 0; \ _C_LABEL(x): ; \ - .frame sp, fsize, retpc; + .frame sp, fsize, retpc; \ + MCOUNT + +/* + * NESTED_NOPROFILE(x) + * No profilable nested routine. + */ +#define NESTED_NOPROFILE(x, fsize, retpc) \ + .globl _C_LABEL(x); \ + .ent _C_LABEL(x), 0; \ +_C_LABEL(x): ; \ + .frame sp, fsize, retpc /* * XNESTED @@ -244,35 +209,86 @@ .end _C_LABEL(x) /* - * Call ast if required + * IMPORT -- import external symbol + */ +#define IMPORT(sym, size) \ + .extern _C_LABEL(sym),size + +/* + * EXPORT -- export definition of symbol + */ +#define EXPORT(x) \ + .globl _C_LABEL(x); \ +_C_LABEL(x): + +/* + * VECTOR + * exception vector entrypoint + * XXX: regmask should be used to generate .mask + */ +#define VECTOR(x, regmask) \ + .ent _C_LABEL(x),0; \ + EXPORT(x); \ + +#ifdef __STDC__ +#define VECTOR_END(x) \ + EXPORT(x ## End); \ + END(x) +#else +#define VECTOR_END(x) \ + EXPORT(x/**/End); \ + END(x) +#endif + +#define KSEG0TEXT_START +#define KSEG0TEXT_END +#define KSEG0TEXT .text + +/* + * Macros to panic and printf from assembly language. + */ +#define PANIC(msg) \ + la a0, 9f; \ + jal _C_LABEL(panic); \ + nop; \ + MSG(msg) + +#define PANIC_KSEG0(msg, reg) PANIC(msg) + +#define PRINTF(msg) \ + la a0, 9f; \ + jal _C_LABEL(printf); \ + nop; \ + MSG(msg) + +#define MSG(msg) \ + .rdata; \ +9: .asciiz msg; \ + .text + +#define ASMSTR(str) \ + .asciiz str; \ + .align 3 + +/* + * XXX retain dialects XXX */ -#define DO_AST \ - lw k1, pcpup; \ - lw k1, PC_CURTHREAD(k1); \ - lw t0, TD_FLAGS(k1); \ - and t0, t0, (TDF_ASTPENDING|TDF_NEEDRESCHED); \ - beq t0, zero, 27f; \ - nop; \ - lw k1, TD_FRAME(k1); \ - lw t0, TF_REG_SR(k1); \ - and t0, t0, MIPS_SR_KSU_USER; \ - beq t0, zero, 27f; \ - nop; \ - move a0, k1; \ - jal ast; \ - nop; \ -27: +#define ALEAF(x) XLEAF(x) +#define NLEAF(x) LEAF_NOPROFILE(x) +#define NON_LEAF(x, fsize, retpc) NESTED(x, fsize, retpc) +#define NNON_LEAF(x, fsize, retpc) NESTED_NOPROFILE(x, fsize, retpc) /* * standard callframe { - * register_t cf_args[4]; arg0 - arg3 - * register_t cf_sp; frame pointer - * register_t cf_ra; return address + * register_t cf_args[4]; arg0 - arg3 + * register_t cf_sp; frame pointer + * register_t cf_ra; return address * }; */ -#define CALLFRAME_SIZ (4 * (4 + 2)) -#define CALLFRAME_SP (4 * 4) -#define CALLFRAME_RA (4 * 5) +#define CALLFRAME_SIZ (4 * (4 + 2)) +#define CALLFRAME_SP (4 * 4) +#define CALLFRAME_RA (4 * 5) +#define START_FRAME CALLFRAME_SIZ /* * While it would be nice to be compatible with the SGI @@ -285,105 +301,147 @@ */ #if !defined(_MIPS_BSD_API) || _MIPS_BSD_API == _MIPS_BSD_API_LP32 -#define REG_L lw +#define REG_L lw #define REG_S sw -#define REG_LI li -#define REG_PROLOGUE .set push -#define REG_EPILOGUE .set pop +#define REG_LI li +#define REG_PROLOGUE .set push +#define REG_EPILOGUE .set pop #define SZREG 4 #else -#define REG_L ld +#define REG_L ld #define REG_S sd -#define REG_LI dli -#define REG_PROLOGUE .set push ; .set mips3 -#define REG_EPILOGUE .set pop +#define REG_LI dli +#define REG_PROLOGUE .set push ; .set mips3 +#define REG_EPILOGUE .set pop #define SZREG 8 -#endif /* _MIPS_BSD_API */ +#endif /* _MIPS_BSD_API */ + +#define mfc0_macro(data, spr) \ + asm volatile ("mfc0 %0, $%1" \ + : "=r" (data) /* outputs */ \ + : "i" (spr)); /* inputs */ + +#define mtc0_macro(data, spr) \ + asm volatile ("mtc0 %0, $%1" \ + : /* outputs */ \ + : "r" (data), "i" (spr)); /* inputs */ + +#define cfc0_macro(data, spr) \ + asm volatile ("cfc0 %0, $%1" \ + : "=r" (data) /* outputs */ \ + : "i" (spr)); /* inputs */ + + +#define ctc0_macro(data, spr) \ + asm volatile ("ctc0 %0, $%1" \ + : /* outputs */ \ + : "r" (data), "i" (spr)); /* inputs */ + + +#define lbu_macro(data, addr) \ + asm volatile ("lbu %0, 0x0(%1)" \ + : "=r" (data) /* outputs */ \ + : "r" (addr)); /* inputs */ + +#define lb_macro(data, addr) \ + asm volatile ("lb %0, 0x0(%1)" \ + : "=r" (data) /* outputs */ \ + : "r" (addr)); /* inputs */ + +#define lwl_macro(data, addr) \ + asm volatile ("lwl %0, 0x0(%1)" \ + : "=r" (data) /* outputs */ \ + : "r" (addr)); /* inputs */ + +#define lwr_macro(data, addr) \ + asm volatile ("lwr %0, 0x0(%1)" \ + : "=r" (data) /* outputs */ \ + : "r" (addr)); /* inputs */ + +#define ldl_macro(data, addr) \ + asm volatile ("ldl %0, 0x0(%1)" \ + : "=r" (data) /* outputs */ \ + : "r" (addr)); /* inputs */ + +#define ldr_macro(data, addr) \ + asm volatile ("ldr %0, 0x0(%1)" \ + : "=r" (data) /* outputs */ \ + : "r" (addr)); /* inputs */ + +#define sb_macro(data, addr) \ + asm volatile ("sb %0, 0x0(%1)" \ + : /* outputs */ \ + : "r" (data), "r" (addr)); /* inputs */ + +#define swl_macro(data, addr) \ + asm volatile ("swl %0, 0x0(%1)" \ + : /* outputs */ \ + : "r" (data), "r" (addr)); /* inputs */ + +#define swr_macro(data, addr) \ + asm volatile ("swr %0, 0x0(%1)" \ + : /* outputs */ \ + : "r" (data), "r" (addr)); /* inputs */ -/* - * XXX: Values which depends on register size. Used for sigcontext/mcontext_t - * handling. Should to be checked and replaced in _setjmp/_longjmp functions. - */ +#define sdl_macro(data, addr) \ + asm volatile ("sdl %0, 0x0(%1)" \ + : /* outputs */ \ + : "r" (data), "r" (addr)); /* inputs */ -#if !defined(_MIPS_BSD_API) || _MIPS_BSD_API == _MIPS_BSD_API_LP32 -#define _OFFSETOF_SC_REGS 12 -#define _OFFSETOF_SC_FPREGS 152 -#define _OFFSETOF_SC_MASK 320 -#else -#define _OFFSETOF_SC_REGS 16 -#define _OFFSETOF_SC_FPREGS 292 -#define _OFFSETOF_SC_MASK 460 -#endif +#define sdr_macro(data, addr) \ + asm volatile ("sdr %0, 0x0(%1)" \ + : /* outputs */ \ + : "r" (data), "r" (addr)); /* inputs */ -#define RCSID(x) .text; .asciz x +#define mfgr_macro(data, gr) \ + asm volatile ("move %0, $%1" \ + : "=r" (data) /* outputs */ \ + : "i" (gr)); /* inputs */ -#undef __FBSDID -#if !defined(lint) && !defined(STRIP_FBSDID) -#define __FBSDID(s) .ident s -#else -#define __FBSDID(s) /* nothing */ -#endif /* not lint and not STRIP_FBSDID */ +#define dmfc0_macro(data, spr) \ + asm volatile ("dmfc0 %0, $%1" \ + : "=r" (data) /* outputs */ \ + : "i" (spr)); /* inputs */ -#ifdef __STDC__ -#define WARN_REFERENCES(sym,msg) \ - .stabs msg ## ,30,0,0,0 ; \ - .stabs __STRING(_C_LABEL(sym)) ## ,1,0,0,0 -#elif defined(__ELF__) -#define WARN_REFERENCES(sym,msg) \ - .stabs msg,30,0,0,0 ; \ - .stabs __STRING(sym),1,0,0,0 -#else -#define WARN_REFERENCES(sym,msg) \ - .stabs msg,30,0,0,0 ; \ - .stabs __STRING(_/**/sym),1,0,0,0 -#endif /* __STDC__ */ +#define dmtc0_macro(data, spr, sel) \ + asm volatile ("dmtc0 %0, $%1, %2" \ + : /* no outputs */ \ + : "r" (data), "i" (spr), "i" (sel)); /* inputs */ /* - * Description of the setjmp buffer + * The DYNAMIC_STATUS_MASK option adds an additional masking operation + * when updating the hardware interrupt mask in the status register. * - * word 0 magic number (dependant on creator) - * 1 RA - * 2 S0 - * 3 S1 - * 4 S2 - * 5 S3 - * 6 S4 - * 7 S5 - * 8 S6 - * 9 S7 - * 10 SP - * 11 S8 - * 12 signal mask (dependant on magic) - * 13 (con't) - * 14 (con't) - * 15 (con't) + * This is useful for platforms that need to at run-time mask + * interrupts based on motherboard configuration or to handle + * slowly clearing interrupts. * - * The magic number number identifies the jmp_buf and - * how the buffer was created as well as providing - * a sanity check - * + * XXX this is only currently implemented for mips3. */ +#ifdef MIPS_DYNAMIC_STATUS_MASK +#define DYNAMIC_STATUS_MASK(sr,scratch) \ + lw scratch, mips_dynamic_status_mask; \ + and sr, sr, scratch -#define _JB_MAGIC__SETJMP 0xBADFACED -#define _JB_MAGIC_SETJMP 0xFACEDBAD +#define DYNAMIC_STATUS_MASK_TOUSER(sr,scratch1) \ + ori sr, (MIPS_INT_MASK | MIPS_SR_INT_IE); \ + DYNAMIC_STATUS_MASK(sr,scratch1) +#else +#define DYNAMIC_STATUS_MASK(sr,scratch) +#define DYNAMIC_STATUS_MASK_TOUSER(sr,scratch1) +#endif -/* Valid for all jmp_buf's */ +#ifdef SMP + /* + * FREEBSD_DEVELOPERS_FIXME + * In multiprocessor case, store/retrieve the pcpu structure + * address for current CPU in scratch register for fast access. + */ -#define _JB_MAGIC 0 -#define _JB_REG_RA 1 -#define _JB_REG_S0 2 -#define _JB_REG_S1 3 -#define _JB_REG_S2 4 -#define _JB_REG_S3 5 -#define _JB_REG_S4 6 -#define _JB_REG_S5 7 -#define _JB_REG_S6 8 -#define _JB_REG_S7 9 -#define _JB_REG_SP 10 -#define _JB_REG_S8 11 -/* Only valid with the _JB_MAGIC_SETJMP magic */ - -#define _JB_SIGMASK 12 +#else +#define GET_CPU_PCPU(reg) \ + lw reg, _C_LABEL(pcpup); +#endif #endif /* !_MACHINE_ASM_H_ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/atomic.h#2 (text+ko) ==== @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2002-2004 Juli Mallett. All rights reserved. - * Copyright (c) 2006 John Baldwin + * Copyright (c) 1998 Doug Rabson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -24,8 +23,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.39 2005/09/27 17:39:10 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.21.2.3 2005/10/06 18:12:05 jhb Exp $ */ + #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -33,235 +33,349 @@ #error this file needs sys/cdefs.h as a prerequisite #endif -#include +static __inline void +mips_sync(void) +{ + __asm __volatile (".set noreorder\n\t" + "sync\n\t" + "nop\n\t" + "nop\n\t" + "nop\n\t" + "nop\n\t" + "nop\n\t" + "nop\n\t" + "nop\n\t" + "nop\n\t" + ".set reorder\n" + : : : "memory"); +} /* * Various simple arithmetic on memory which is atomic in the presence - * of interrupts and multiple processors. - * - * atomic_set_int(P, V) (*(u_int*)(P) |= (V)) - * atomic_clear_int(P, V) (*(u_int*)(P) &= ~(V)) - * atomic_add_int(P, V) (*(u_int*)(P) += (V)) - * atomic_subtract_int(P, V) (*(u_int*)(P) -= (V)) - * atomic_readandclear_int(P) (return *(u_int*)P; *(u_int*)P = 0;) - * - * atomic_set_long(P, V) (*(u_long*)(P) |= (V)) - * atomic_clear_long(P, V) (*(u_long*)(P) &= ~(V)) - * atomic_add_long(P, V) (*(u_long*)(P) += (V)) - * atomic_subtract_long(P, V) (*(u_long*)(P) -= (V)) - * atomic_readandclear_long(P) (return *(u_long*)P; *(u_long*)P = 0;) + * of interrupts and SMP safe. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:18:20 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0C7ED16A421; Sun, 30 Dec 2007 20:18: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 935B016A41B for ; Sun, 30 Dec 2007 20:18:19 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 82CB513C4E7 for ; Sun, 30 Dec 2007 20:18:19 +0000 (UTC) (envelope-from delphij@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUKIJbB045931 for ; Sun, 30 Dec 2007 20:18:19 GMT (envelope-from delphij@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUKI5lp045911 for perforce@freebsd.org; Sun, 30 Dec 2007 20:18:05 GMT (envelope-from delphij@freebsd.org) Date: Sun, 30 Dec 2007 20:18:05 GMT Message-Id: <200712302018.lBUKI5lp045911@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to delphij@freebsd.org using -f From: Xin LI To: Perforce Change Reviews Cc: Subject: PERFORCE change 132119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 20:18:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=132119 Change 132119 by delphij@charlie on 2007/12/30 20:17:57 IFC Affected files ... .. //depot/projects/delphij_fork/Makefile#4 integrate .. //depot/projects/delphij_fork/bin/cp/cp.c#2 integrate .. //depot/projects/delphij_fork/bin/mv/mv.c#2 integrate .. //depot/projects/delphij_fork/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/delphij_fork/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/delphij_fork/contrib/gcc/config/sparc/freebsd.h#2 integrate .. //depot/projects/delphij_fork/contrib/gcc/fold-const.c#3 integrate .. //depot/projects/delphij_fork/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/delphij_fork/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/delphij_fork/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/delphij_fork/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/delphij_fork/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/delphij_fork/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/CREDITS#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/HISTORY#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/INSTALL#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/LICENSE#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/MANIFEST#2 delete .. //depot/projects/delphij_fork/contrib/openpam/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/README#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/RELNOTES#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/aclocal.m4#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/autogen.sh#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/bin/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/bin/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/bin/su/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/bin/su/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/bin/su/su.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/compile#1 branch .. //depot/projects/delphij_fork/contrib/openpam/config.h.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/configure#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/configure.ac#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/configure.in#2 delete .. //depot/projects/delphij_fork/contrib/openpam/depcomp#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam.man#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_borrow_cred.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_free_data.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_free_envlist.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_get_option.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_log.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_nullconv.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_readline.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_restore_cred.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_set_option.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/openpam_ttyconv.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam.conf.5#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam.man#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_acct_mgmt.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_authenticate.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_chauthtok.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_close_session.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_conv.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_end.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_error.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_get_authtok.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_get_data.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_get_item.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_get_user.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_getenv.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_getenvlist.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_info.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_open_session.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_prompt.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_putenv.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_set_data.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_set_item.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_setcred.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_setenv.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_sm_authenticate.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_sm_chauthtok.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_sm_close_session.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_sm_open_session.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_sm_setcred.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_start.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_strerror.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_verror.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_vinfo.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/doc/man/pam_vprompt.3#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/security/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/security/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/security/openpam.h#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/security/openpam_attr.h#1 branch .. //depot/projects/delphij_fork/contrib/openpam/include/security/openpam_version.h#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/security/pam_appl.h#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/security/pam_constants.h#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/security/pam_modules.h#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/include/security/pam_types.h#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/install-sh#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_borrow_cred.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_configure.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_dispatch.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_dynamic.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_findenv.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_free_data.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_free_envlist.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_get_option.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_impl.h#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_load.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_log.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_nullconv.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_readline.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_restore_cred.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_set_option.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_static.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/openpam_ttyconv.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_acct_mgmt.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_authenticate.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_authenticate_secondary.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_chauthtok.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_close_session.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_end.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_error.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_get_authtok.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_get_data.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_get_item.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_get_mapped_authtok.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_get_mapped_username.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_get_user.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_getenv.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_getenvlist.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_info.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_open_session.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_prompt.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_putenv.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_set_data.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_set_item.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_set_mapped_authtok.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_set_mapped_username.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_setcred.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_setenv.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_acct_mgmt.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_authenticate.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_authenticate_secondary.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_chauthtok.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_close_session.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_get_mapped_authtok.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_get_mapped_username.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_open_session.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_set_mapped_authtok.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_set_mapped_username.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_sm_setcred.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_start.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_strerror.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_verror.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_vinfo.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/lib/pam_vprompt.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/ltconfig#2 delete .. //depot/projects/delphij_fork/contrib/openpam/ltmain.sh#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/misc/gendoc.pl#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/missing#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/mkinstalldirs#2 delete .. //depot/projects/delphij_fork/contrib/openpam/modules/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/pam_deny/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/pam_deny/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/pam_deny/pam_deny.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/pam_permit/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/pam_permit/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/pam_permit/pam_permit.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/pam_unix/Makefile.am#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/pam_unix/Makefile.in#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/delphij_fork/contrib/openpam/stamp-h.in#2 delete .. //depot/projects/delphij_fork/etc/defaults/periodic.conf#3 integrate .. //depot/projects/delphij_fork/etc/rc.d/ldconfig#3 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes#6 integrate .. //depot/projects/delphij_fork/games/fortune/datfiles/fortunes-o.real#5 integrate .. //depot/projects/delphij_fork/include/complex.h#2 integrate .. //depot/projects/delphij_fork/include/nsswitch.h#2 integrate .. //depot/projects/delphij_fork/include/pthread_np.h#3 integrate .. //depot/projects/delphij_fork/lib/Makefile#5 integrate .. //depot/projects/delphij_fork/lib/libc/Versions.def#2 integrate .. //depot/projects/delphij_fork/lib/libc/amd64/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/libc/amd64/gd_qnan.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/arm/gd_qnan.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/gdtoa/Symbol.map#3 integrate .. //depot/projects/delphij_fork/lib/libc/gdtoa/_ldtoa.c#4 integrate .. //depot/projects/delphij_fork/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/gen/sem_open.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/libc/i386/gd_qnan.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/ia64/Symbol.map#3 integrate .. //depot/projects/delphij_fork/lib/libc/ia64/gd_qnan.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/locale/localeconv.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/libc/sparc64/gd_qnan.h#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdio/vfscanf.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdio/vfwprintf.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdio/vfwscanf.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/malloc.3#3 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/string/strtok.3#2 integrate .. //depot/projects/delphij_fork/lib/libc/string/strtok.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/delphij_fork/lib/libc/sys/select.2#2 integrate .. //depot/projects/delphij_fork/lib/libfetch/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libfetch/common.c#2 integrate .. //depot/projects/delphij_fork/lib/libfetch/common.h#2 integrate .. //depot/projects/delphij_fork/lib/libfetch/fetch.3#2 integrate .. //depot/projects/delphij_fork/lib/libfetch/fetch.c#2 integrate .. //depot/projects/delphij_fork/lib/libfetch/file.c#2 integrate .. //depot/projects/delphij_fork/lib/libfetch/ftp.c#2 integrate .. //depot/projects/delphij_fork/lib/libfetch/http.c#2 integrate .. //depot/projects/delphij_fork/lib/libkse/sys/thr_error.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_accept.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_aio_suspend.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_atfork.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_destroy.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_get_np.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getdetachstate.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getguardsize.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getinheritsched.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedparam.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getschedpolicy.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getscope.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstack.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstackaddr.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_getstacksize.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_init.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setdetachstate.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setguardsize.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setinheritsched.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedparam.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setschedpolicy.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setscope.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstack.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstackaddr.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_attr_setstacksize.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrier.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_barrierattr.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_cancel.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_clean.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_close.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_concurrency.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_cond.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_destroy.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_condattr_init.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_connect.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_creat.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_create.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_detach.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_equal.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_execve.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_exit.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_fcntl.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_fork.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_fsync.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_getprio.c#3 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_getschedparam.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_info.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_init.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_join.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_kill.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_main_np.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_init.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mattr_kind_np.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_msync.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_multi_np.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_prioceiling.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutex_protocol.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_mutexattr_destroy.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_nanosleep.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_once.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_open.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_pause.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_poll.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_private.h#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_pselect.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_pspinlock.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_raise.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_read.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_readv.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_resume_np.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlock.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_rwlockattr.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_select.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_self.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sem.c#3 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_setprio.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_setschedparam.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaction.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigaltstack.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigmask.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigpending.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigprocmask.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigsuspend.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sigwait.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_single_np.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_sleep.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_spec.c#5 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_spinlock.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_suspend_np.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_switch_np.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_symbols.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_system.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_tcdrain.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_vfork.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_wait4.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_waitpid.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_write.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_writev.c#4 integrate .. //depot/projects/delphij_fork/lib/libkse/thread/thr_yield.c#4 integrate .. //depot/projects/delphij_fork/lib/libpam/libpam/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libpam/modules/pam_krb5/pam_krb5.c#2 integrate .. //depot/projects/delphij_fork/lib/libpam/modules/pam_ssh/pam_ssh.c#2 integrate .. //depot/projects/delphij_fork/lib/libpam/modules/pam_unix/pam_unix.c#2 integrate .. //depot/projects/delphij_fork/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/delphij_fork/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/delphij_fork/lib/libthr/pthread.map#3 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_exit.c#2 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_mutex.c#6 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/delphij_fork/lib/libthr/thread/thr_syscalls.c#2 integrate .. //depot/projects/delphij_fork/lib/libufs/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/libufs/block.c#2 integrate .. //depot/projects/delphij_fork/lib/libufs/bread.3#2 integrate .. //depot/projects/delphij_fork/lib/libufs/libufs.h#2 integrate .. //depot/projects/delphij_fork/lib/libutil/pty.c#3 integrate .. //depot/projects/delphij_fork/lib/msun/Makefile#2 integrate .. //depot/projects/delphij_fork/lib/msun/Symbol.map#2 integrate .. //depot/projects/delphij_fork/lib/msun/amd64/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/msun/amd64/s_logbl.S#1 branch .. //depot/projects/delphij_fork/lib/msun/i387/Makefile.inc#2 integrate .. //depot/projects/delphij_fork/lib/msun/i387/s_logbl.S#1 branch .. //depot/projects/delphij_fork/lib/msun/ld128/s_nanl.c#1 branch .. //depot/projects/delphij_fork/lib/msun/ld80/s_nanl.c#1 branch .. //depot/projects/delphij_fork/lib/msun/man/atan2.3#2 integrate .. //depot/projects/delphij_fork/lib/msun/man/csqrt.3#1 branch .. //depot/projects/delphij_fork/lib/msun/man/hypot.3#2 integrate .. //depot/projects/delphij_fork/lib/msun/man/ilogb.3#2 integrate .. //depot/projects/delphij_fork/lib/msun/man/math.3#2 integrate .. //depot/projects/delphij_fork/lib/msun/man/nan.3#1 branch .. //depot/projects/delphij_fork/lib/msun/man/sqrt.3#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/math.h#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/math_private.h#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_carg.c#1 branch .. //depot/projects/delphij_fork/lib/msun/src/s_cargf.c#1 branch .. //depot/projects/delphij_fork/lib/msun/src/s_csqrt.c#1 branch .. //depot/projects/delphij_fork/lib/msun/src/s_csqrtf.c#1 branch .. //depot/projects/delphij_fork/lib/msun/src/s_logb.c#2 integrate .. //depot/projects/delphij_fork/lib/msun/src/s_logbl.c#1 branch .. //depot/projects/delphij_fork/lib/msun/src/s_nan.c#1 branch .. //depot/projects/delphij_fork/lib/msun/src/w_cabs.c#2 integrate .. //depot/projects/delphij_fork/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate .. //depot/projects/delphij_fork/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/Makefile#2 integrate .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/Makefile.inc#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/amd64/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/amd64/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/amd64/proc-amd64.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/article.sgml#1 branch .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/common/artheader.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/common/hw.ent#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/common/intro.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/i386/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/i386/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/hardware/i386/proc-i386.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/Makefile.inc#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/amd64/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/amd64/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/common/abstract.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/common/artheader.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/common/install.ent#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/common/install.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/common/layout.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/common/trouble.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/common/upgrade.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/i386/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/i386/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/ia64/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/ia64/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/pc98/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/pc98/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/sparc64/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/sparc64/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/installation/sparc64/install.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/Makefile.inc#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/amd64/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/amd64/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/article.sgml#1 branch .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/common/new.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/common/relnotes.ent#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/i386/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/i386/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/ia64/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/ia64/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/pc98/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/pc98/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/powerpc/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/powerpc/article.sgml#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/sparc64/Makefile#2 delete .. //depot/projects/delphij_fork/release/doc/zh_CN.GB2312/relnotes/sparc64/article.sgml#2 delete .. //depot/projects/delphij_fork/sbin/Makefile#3 integrate .. //depot/projects/delphij_fork/sbin/atacontrol/atacontrol.c#3 integrate .. //depot/projects/delphij_fork/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/delphij_fork/sbin/ddb/Makefile#1 branch .. //depot/projects/delphij_fork/sbin/ddb/ddb.8#1 branch .. //depot/projects/delphij_fork/sbin/ddb/ddb.c#1 branch .. //depot/projects/delphij_fork/sbin/ddb/ddb.h#1 branch .. //depot/projects/delphij_fork/sbin/ddb/ddb_script.c#1 branch .. //depot/projects/delphij_fork/sbin/devd/devd.hh#2 integrate .. //depot/projects/delphij_fork/sbin/growfs/growfs.c#2 integrate .. //depot/projects/delphij_fork/sbin/ifconfig/ifconfig.8#6 integrate .. //depot/projects/delphij_fork/sbin/ifconfig/ifconfig.c#3 integrate .. //depot/projects/delphij_fork/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/delphij_fork/sbin/natd/natd.8#2 integrate .. //depot/projects/delphij_fork/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/delphij_fork/sbin/newfs/newfs.8#3 integrate .. //depot/projects/delphij_fork/sbin/newfs/newfs.c#3 integrate .. //depot/projects/delphij_fork/sbin/newfs/newfs.h#3 integrate .. //depot/projects/delphij_fork/sbin/newfs_msdos/newfs_msdos.8#3 integrate .. //depot/projects/delphij_fork/sbin/savecore/savecore.8#2 integrate .. //depot/projects/delphij_fork/sbin/savecore/savecore.c#2 integrate .. //depot/projects/delphij_fork/share/colldef/Makefile#2 integrate .. //depot/projects/delphij_fork/share/colldef/README#2 integrate .. //depot/projects/delphij_fork/share/colldef/map.ISO8859-9#1 branch .. //depot/projects/delphij_fork/share/colldef/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/delphij_fork/share/man/man3/tgmath.3#2 integrate .. //depot/projects/delphij_fork/share/man/man3/tree.3#2 integrate .. //depot/projects/delphij_fork/share/man/man4/Makefile#9 integrate .. //depot/projects/delphij_fork/share/man/man4/bge.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/ddb.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/hptrr.4#1 branch .. //depot/projects/delphij_fork/share/man/man4/ng_car.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/nve.4#3 integrate .. //depot/projects/delphij_fork/share/man/man4/syncache.4#2 integrate .. //depot/projects/delphij_fork/share/man/man4/textdump.4#1 branch .. //depot/projects/delphij_fork/share/man/man5/src.conf.5#5 integrate .. //depot/projects/delphij_fork/share/man/man7/build.7#2 integrate .. //depot/projects/delphij_fork/share/man/man7/ports.7#5 integrate .. //depot/projects/delphij_fork/share/man/man9/BUS_SETUP_INTR.9#2 integrate .. //depot/projects/delphij_fork/share/man/man9/VOP_LOCK.9#2 integrate .. //depot/projects/delphij_fork/share/man/man9/lock.9#2 integrate .. //depot/projects/delphij_fork/share/man/man9/sf_buf.9#2 integrate .. //depot/projects/delphij_fork/share/misc/Makefile#2 integrate .. //depot/projects/delphij_fork/share/misc/bsd-family-tree#4 integrate .. //depot/projects/delphij_fork/share/mk/bsd.own.mk#3 integrate .. //depot/projects/delphij_fork/share/mklocale/Makefile#2 integrate .. //depot/projects/delphij_fork/share/mklocale/tr_TR.ISO8859-9.src#1 branch .. //depot/projects/delphij_fork/share/timedef/tr_TR.ISO8859-9.src#2 integrate .. //depot/projects/delphij_fork/share/timedef/tr_TR.UTF-8.src#2 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/mp_watchdog.c#2 integrate .. //depot/projects/delphij_fork/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/delphij_fork/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/delphij_fork/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/delphij_fork/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/delphij_fork/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/delphij_fork/sys/arm/at91/at91.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/delphij_fork/sys/arm/at91/kb920x_machdep.c#5 integrate .. //depot/projects/delphij_fork/sys/arm/at91/uart_dev_at91usart.c#2 integrate .. //depot/projects/delphij_fork/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/boot2/bwct_board.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/arm/at91/libat91/spi_flash.c#2 integrate .. //depot/projects/delphij_fork/sys/boot/forth/support.4th#2 integrate .. //depot/projects/delphij_fork/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/delphij_fork/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/delphij_fork/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/delphij_fork/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/delphij_fork/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/delphij_fork/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/delphij_fork/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/delphij_fork/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/delphij_fork/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/delphij_fork/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/delphij_fork/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/delphij_fork/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/delphij_fork/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/delphij_fork/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/delphij_fork/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/delphij_fork/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/delphij_fork/sys/cam/scsi/scsi_low.h#2 integrate .. //depot/projects/delphij_fork/sys/compat/freebsd32/freebsd32_misc.c#6 integrate .. //depot/projects/delphij_fork/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/delphij_fork/sys/conf/NOTES#14 integrate .. //depot/projects/delphij_fork/sys/conf/files#14 integrate .. //depot/projects/delphij_fork/sys/conf/files.amd64#8 integrate .. //depot/projects/delphij_fork/sys/conf/files.i386#8 integrate .. //depot/projects/delphij_fork/sys/conf/files.powerpc#4 integrate .. //depot/projects/delphij_fork/sys/conf/options#9 integrate .. //depot/projects/delphij_fork/sys/conf/options.powerpc#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_capture.c#1 branch .. //depot/projects/delphij_fork/sys/ddb/db_command.c#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_command.h#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_input.c#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_lex.c#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_lex.h#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_main.c#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_output.c#2 integrate .. //depot/projects/delphij_fork/sys/ddb/db_script.c#1 branch .. //depot/projects/delphij_fork/sys/ddb/db_textdump.c#1 branch .. //depot/projects/delphij_fork/sys/ddb/ddb.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/aac/aac.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/Osd/OsdDebug.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/amr/amr.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/bge/if_bgereg.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/common/cxgb_t3_cpl.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_l2t.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_offload.c#5 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_offload.h#5 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/delphij_fork/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/delphij_fork/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/array.h#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/him.h#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/list.h#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/delphij_fork/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/delphij_fork/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/delphij_fork/sys/dev/mfi/mfi.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/ofw/openpromio.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/pci/pci_user.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/re/if_re.c#11 integrate .. //depot/projects/delphij_fork/sys/dev/sio/sio.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/snp/snp.c#4 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/uart/uart_core.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/uart/uart_cpu_powerpc.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/umass.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/usb/ums.c#3 integrate .. //depot/projects/delphij_fork/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/delphij_fork/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/delphij_fork/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/delphij_fork/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/delphij_fork/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/delphij_fork/sys/geom/geom_dev.c#2 integrate .. //depot/projects/delphij_fork/sys/geom/geom_io.c#3 integrate .. //depot/projects/delphij_fork/sys/geom/part/g_part.c#5 integrate .. //depot/projects/delphij_fork/sys/geom/part/g_part_bsd.c#3 integrate .. //depot/projects/delphij_fork/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/delphij_fork/sys/i386/conf/GENERIC.hints#3 integrate .. //depot/projects/delphij_fork/sys/i386/conf/NOTES#6 integrate .. //depot/projects/delphij_fork/sys/i386/conf/PAE#4 integrate .. //depot/projects/delphij_fork/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/delphij_fork/sys/i386/i386/mp_watchdog.c#2 integrate .. //depot/projects/delphij_fork/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/delphij_fork/sys/i386/include/vmparam.h#3 integrate .. //depot/projects/delphij_fork/sys/i386/pci/pci_pir.c#2 integrate .. //depot/projects/delphij_fork/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/delphij_fork/sys/ia64/include/vmparam.h#3 integrate .. //depot/projects/delphij_fork/sys/kern/Makefile#2 integrate .. //depot/projects/delphij_fork/sys/kern/init_main.c#6 integrate .. //depot/projects/delphij_fork/sys/kern/kern_clock.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_event.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_lock.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_mbuf.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_proc.c#7 integrate .. //depot/projects/delphij_fork/sys/kern/kern_resource.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/kern_sig.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_sx.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/kern_thread.c#8 integrate .. //depot/projects/delphij_fork/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/sched_4bsd.c#7 integrate .. //depot/projects/delphij_fork/sys/kern/sched_ule.c#10 integrate .. //depot/projects/delphij_fork/sys/kern/subr_bus.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/subr_kdb.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/subr_lock.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/subr_witness.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/sys_generic.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/delphij_fork/sys/kern/tty_cons.c#2 integrate .. //depot/projects/delphij_fork/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/delphij_fork/sys/kern/vfs_subr.c#6 integrate .. //depot/projects/delphij_fork/sys/modules/Makefile#10 integrate .. //depot/projects/delphij_fork/sys/modules/cxgb/Makefile#4 integrate .. //depot/projects/delphij_fork/sys/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/delphij_fork/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/delphij_fork/sys/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/delphij_fork/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/delphij_fork/sys/net/bpf.c#6 integrate .. //depot/projects/delphij_fork/sys/net/bpf.h#3 integrate .. //depot/projects/delphij_fork/sys/net/bpf_filter.c#3 integrate .. //depot/projects/delphij_fork/sys/net/bridgestp.c#4 integrate .. //depot/projects/delphij_fork/sys/net/bridgestp.h#3 integrate .. //depot/projects/delphij_fork/sys/net/if.h#2 integrate .. //depot/projects/delphij_fork/sys/net/if_bridge.c#7 integrate .. //depot/projects/delphij_fork/sys/net/if_enc.c#3 integrate .. //depot/projects/delphij_fork/sys/net/if_lagg.c#8 integrate .. //depot/projects/delphij_fork/sys/net/route.c#4 integrate .. //depot/projects/delphij_fork/sys/net/route.h#2 integrate .. //depot/projects/delphij_fork/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_base.c#5 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_car.h#2 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_l2tp.c#3 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_pppoe.c#4 integrate .. //depot/projects/delphij_fork/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/if_ether.c#5 integrate .. //depot/projects/delphij_fork/sys/netinet/if_ether.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/delphij_fork/sys/netinet/ip_fw2.c#9 integrate .. //depot/projects/delphij_fork/sys/netinet/sctp_bsd_addr.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_offload.c#1 branch .. //depot/projects/delphij_fork/sys/netinet/tcp_offload.h#1 branch .. //depot/projects/delphij_fork/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/delphij_fork/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/delphij_fork/sys/netinet/toedev.h#1 branch .. //depot/projects/delphij_fork/sys/netinet6/dest6.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/frag6.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/icmp6.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6.h#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_id.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_ipsec.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_ipsec.h#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_mroute.h#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_output.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6_var.h#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/mld6.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6.c#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/pim6.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/route6.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/scope6.c#3 integrate .. //depot/projects/delphij_fork/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/delphij_fork/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/delphij_fork/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_usrreq.c#8 integrate .. //depot/projects/delphij_fork/sys/netinet6/udp6_var.h#4 integrate .. //depot/projects/delphij_fork/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/delphij_fork/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/delphij_fork/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/delphij_fork/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/delphij_fork/sys/pc98/cbus/sio.c#4 integrate .. //depot/projects/delphij_fork/sys/pc98/pc98/machdep.c#4 integrate .. //depot/projects/delphij_fork/sys/powerpc/aim/clock.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/copyinout.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/interrupt.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/locore.S#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/machdep.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/mmu_oea.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/nexus.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/ofw_machdep.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/ofwmagic.S#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/swtch.S#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/trap.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/trap_subr.S#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/uio_machdep.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/uma_machdep.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/aim/vm_machdep.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/conf/GENERIC#5 integrate .. //depot/projects/delphij_fork/sys/powerpc/conf/NOTES#3 integrate .. //depot/projects/delphij_fork/sys/powerpc/include/_bus.h#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/include/bus.h#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/include/fpu.h#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/delphij_fork/sys/powerpc/powermac/grackle.c#3 integrate .. //depot/projects/delphij_fork/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/powermac/pswitch.c#2 integrate .. //depot/projects/delphij_fork/sys/powerpc/powermac/uninorth.c#3 integrate .. //depot/projects/delphij_fork/sys/powerpc/powerpc/bus_machdep.c#1 branch .. //depot/projects/delphij_fork/sys/powerpc/powerpc/clock.c#3 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/copyinout.c#2 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/db_memrw.c#2 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/interrupt.c#4 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/locore.S#2 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/machdep.c#4 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/mmu_oea.c#3 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/nexus.c#3 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/ofw_machdep.c#2 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/ofwmagic.S#2 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/swtch.S#3 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/trap.c#5 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/trap_subr.S#2 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/uio_machdep.c#2 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/uma_machdep.c#3 delete .. //depot/projects/delphij_fork/sys/powerpc/powerpc/vm_machdep.c#4 delete .. //depot/projects/delphij_fork/sys/powerpc/psim/iobus.c#2 integrate .. //depot/projects/delphij_fork/sys/security/audit/audit_pipe.c#3 integrate .. //depot/projects/delphij_fork/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/delphij_fork/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/delphij_fork/sys/sparc64/include/vmparam.h#3 integrate .. //depot/projects/delphij_fork/sys/sparc64/pci/psycho.c#6 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/delphij_fork/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/delphij_fork/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/delphij_fork/sys/sun4v/sun4v/hvcons.c#2 integrate .. //depot/projects/delphij_fork/sys/sun4v/sun4v/machdep.c#3 integrate .. //depot/projects/delphij_fork/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/delphij_fork/sys/sys/_lock.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/ata.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/cdefs.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/copyright.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/kdb.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/kernel.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/kerneldump.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/lock_profile.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/lockmgr.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/mbuf.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/param.h#7 integrate .. //depot/projects/delphij_fork/sys/sys/pcpu.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/priv.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/proc.h#10 integrate .. //depot/projects/delphij_fork/sys/sys/selinfo.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/socket.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/socketvar.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/sx.h#3 integrate .. //depot/projects/delphij_fork/sys/sys/systm.h#4 integrate .. //depot/projects/delphij_fork/sys/sys/tree.h#2 integrate .. //depot/projects/delphij_fork/sys/sys/tty.h#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm.h#2 integrate .. //depot/projects/delphij_fork/sys/vm/vm_object.h#3 integrate .. //depot/projects/delphij_fork/sys/vm/vm_page.c#11 integrate .. //depot/projects/delphij_fork/sys/vm/vm_phys.c#4 integrate .. //depot/projects/delphij_fork/sys/vm/vm_phys.h#4 integrate .. //depot/projects/delphij_fork/tools/build/options/WITHOUT_BZIP2#2 integrate .. //depot/projects/delphij_fork/tools/build/options/WITHOUT_GNU#2 integrate .. //depot/projects/delphij_fork/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/delphij_fork/tools/build/options/WITHOUT_INSTALLLIB#1 branch .. //depot/projects/delphij_fork/tools/build/options/WITHOUT_KERBEROS#2 integrate .. //depot/projects/delphij_fork/tools/build/options/WITHOUT_KVM#2 integrate .. //depot/projects/delphij_fork/tools/build/options/WITHOUT_PAM#2 integrate .. //depot/projects/delphij_fork/tools/build/options/WITHOUT_TOOLCHAIN#3 integrate .. //depot/projects/delphij_fork/tools/build/options/makeman#3 integrate .. //depot/projects/delphij_fork/tools/regression/bin/mv/Makefile#1 branch .. //depot/projects/delphij_fork/tools/regression/bin/mv/regress.sh#1 branch .. //depot/projects/delphij_fork/tools/regression/bin/mv/regress.t#1 branch .. //depot/projects/delphij_fork/tools/regression/lib/libc/gen/test-wordexp.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/lib/libc/stdio/test-scanfloat.c#3 integrate .. //depot/projects/delphij_fork/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/delphij_fork/tools/regression/lib/msun/test-csqrt.c#1 branch .. //depot/projects/delphij_fork/tools/regression/lib/msun/test-csqrt.t#1 branch .. //depot/projects/delphij_fork/tools/regression/lib/msun/test-lround.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/lib/msun/test-nan.c#1 branch .. //depot/projects/delphij_fork/tools/regression/lib/msun/test-nan.t#1 branch .. //depot/projects/delphij_fork/tools/regression/lib/msun/test-next.c#2 integrate .. //depot/projects/delphij_fork/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/delphij_fork/tools/regression/usr.bin/sed/regress.sh#3 integrate .. //depot/projects/delphij_fork/tools/tools/ath/athdebug/athdebug.c#3 integrate .. //depot/projects/delphij_fork/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/delphij_fork/tools/tools/ath/athstats/athstats.c#3 integrate .. //depot/projects/delphij_fork/tools/tools/ath/athstats/main.c#3 integrate .. //depot/projects/delphij_fork/tools/tools/ath/athstats/statfoo.c#3 integrate .. //depot/projects/delphij_fork/tools/tools/ministat/Makefile#2 delete .. //depot/projects/delphij_fork/tools/tools/ministat/README#2 delete .. //depot/projects/delphij_fork/tools/tools/ministat/chameleon#2 delete .. //depot/projects/delphij_fork/tools/tools/ministat/iguana#2 delete .. //depot/projects/delphij_fork/tools/tools/ministat/ministat.c#2 delete .. //depot/projects/delphij_fork/tools/tools/nanobsd/nanobsd.sh#3 integrate .. //depot/projects/delphij_fork/usr.bin/Makefile#5 integrate .. //depot/projects/delphij_fork/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#2 integrate .. //depot/projects/delphij_fork/usr.bin/ipcrm/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.bin/ipcrm/ipcrm.1#2 integrate .. //depot/projects/delphij_fork/usr.bin/ipcrm/ipcrm.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/ipcs/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.bin/ipcs/ipc.c#1 branch .. //depot/projects/delphij_fork/usr.bin/ipcs/ipc.h#1 branch .. //depot/projects/delphij_fork/usr.bin/ipcs/ipcs.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/make/Makefile.dist#2 integrate .. //depot/projects/delphij_fork/usr.bin/ministat/Makefile#1 branch .. //depot/projects/delphij_fork/usr.bin/ministat/README#1 branch .. //depot/projects/delphij_fork/usr.bin/ministat/chameleon#1 branch .. //depot/projects/delphij_fork/usr.bin/ministat/iguana#1 branch .. //depot/projects/delphij_fork/usr.bin/ministat/ministat.1#1 branch .. //depot/projects/delphij_fork/usr.bin/ministat/ministat.c#1 branch .. //depot/projects/delphij_fork/usr.bin/netstat/inet.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/usbhidctl/usbhid.c#2 integrate .. //depot/projects/delphij_fork/usr.bin/vmstat/Makefile#2 integrate .. //depot/projects/delphij_fork/usr.bin/vmstat/vmstat.8#2 integrate .. //depot/projects/delphij_fork/usr.bin/vmstat/vmstat.c#3 integrate .. //depot/projects/delphij_fork/usr.bin/xinstall/xinstall.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/boot98cfg/boot98cfg.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/config/config.y#2 integrate .. //depot/projects/delphij_fork/usr.sbin/iostat/iostat.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/mergemaster/mergemaster.sh#2 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/Makefile#4 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/add/pkg_add.1#4 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/create/pkg_create.1#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/delete/pkg_delete.1#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/info/pkg_info.1#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/search/Makefile#2 delete .. //depot/projects/delphij_fork/usr.sbin/pkg_install/search/pkg_search.1#2 delete .. //depot/projects/delphij_fork/usr.sbin/pkg_install/search/pkg_search.sh#2 delete .. //depot/projects/delphij_fork/usr.sbin/pkg_install/updating/pkg_updating.1#3 integrate .. //depot/projects/delphij_fork/usr.sbin/pkg_install/version/pkg_version.1#3 integrate .. //depot/projects/delphij_fork/usr.sbin/ppp/auth.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/dist.h#3 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/index.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/sysinstall/main.c#2 integrate .. //depot/projects/delphij_fork/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/delphij_fork/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate Differences ... ==== //depot/projects/delphij_fork/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ +# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ # # The user-driven targets are: # @@ -238,17 +238,18 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${MAKE} make); \ fi # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. # MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/delphij_fork/bin/cp/cp.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.57 2006/10/11 10:26:34 trhodes Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.59 2007/12/26 08:32:20 edwin Exp $"); /* * Cp copies source files to target files. @@ -210,10 +210,9 @@ /* * Case (1). Target is not a directory. */ - if (argc > 1) { - usage(); - exit(1); - } + if (argc > 1) + errx(1, "%s is not a directory", to.p_path); + /* * Need to detect the case: * cp -R dir foo ==== //depot/projects/delphij_fork/bin/mv/mv.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46 2005/09/05 04:36:08 csjp Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.50 2007/12/27 11:33:42 dds Exp $"); #include #include @@ -65,6 +65,9 @@ #include #include +/* Exit code for a failed exec. */ +#define EXEC_FAILED 127 + int fflg, iflg, nflg, vflg; int copy(char *, char *); @@ -198,6 +201,11 @@ } } } + /* + * Rename on FreeBSD will fail with EISDIR and ENOTDIR, before failing + * with EXDEV. Therefore, copy() doesn't have to perform the checks + * specified in the Step 3 of the POSIX mv specification. + */ if (!rename(from, to)) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:31:46 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72E7B16A419; Sun, 30 Dec 2007 20:31:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3873016A417 for ; Sun, 30 Dec 2007 20:31:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 125FA13C45B for ; Sun, 30 Dec 2007 20:31:46 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUKVjk0050693 for ; Sun, 30 Dec 2007 20:31:45 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUKVj3f050689 for perforce@freebsd.org; Sun, 30 Dec 2007 20:31:45 GMT (envelope-from imp@freebsd.org) Date: Sun, 30 Dec 2007 20:31:45 GMT Message-Id: <200712302031.lBUKVj3f050689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 20:31:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=132120 Change 132120 by imp@imp_paco-paco on 2007/12/30 20:30:45 typo FLAGS -> CFLAGS Affected files ... .. //depot/projects/mips2-jnpr/src/sys/conf/Makefile.mips#2 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/conf/Makefile.mips#2 (text+ko) ==== @@ -55,7 +55,7 @@ HACK_EXTRA_FLAGS+=-fno-pic -mno-abicalls -G0 $(ARCH_FLAGS) # XXX hardcoded kernel entry point -ASM_FLAGS+=${CFLAGS} -D_LOCORE -DLOCORE +ASM_CFLAGS+=${CFLAGS} -D_LOCORE -DLOCORE %BEFORE_DEPEND From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:34:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95C7A16A41B; Sun, 30 Dec 2007 20:34: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 5BABC16A419 for ; Sun, 30 Dec 2007 20:34:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4DD8813C457 for ; Sun, 30 Dec 2007 20:34:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUKYnop053106 for ; Sun, 30 Dec 2007 20:34:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUKYniw053103 for perforce@freebsd.org; Sun, 30 Dec 2007 20:34:49 GMT (envelope-from imp@freebsd.org) Date: Sun, 30 Dec 2007 20:34:49 GMT Message-Id: <200712302034.lBUKYniw053103@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 20:34:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=132121 Change 132121 by imp@imp_paco-paco on 2007/12/30 20:34:11 Remove, for the moment, the XLR thread disabling. We don't have the defines for that. Chances are good we'll have to pull in a lot from the mips2 version of these files. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/mips/locore.S#3 (text+ko) ==== @@ -113,10 +113,12 @@ /* calculate linear cpuid */ sll t0, a1, 2 addu a2, t0, a0 +#if 0 /* XXX: this is for the xlr mips CPU */ /* Initially, disable all hardware threads on each core except thread0 */ li t1, VCPU_ID_0 li t2, XLR_THREAD_ENABLE_IND mtcr t1, t2 +#endif #ifdef SMP la t0, _C_LABEL(__pcpu) From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:38:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F5AB16A469; Sun, 30 Dec 2007 20:38:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C6FF416A421 for ; Sun, 30 Dec 2007 20:38:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B809A13C4FD for ; Sun, 30 Dec 2007 20:38:53 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUKcrlQ053999 for ; Sun, 30 Dec 2007 20:38:53 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUKcrSe053996 for perforce@freebsd.org; Sun, 30 Dec 2007 20:38:53 GMT (envelope-from imp@freebsd.org) Date: Sun, 30 Dec 2007 20:38:53 GMT Message-Id: <200712302038.lBUKcrSe053996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 20:38:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=132122 Change 132122 by imp@imp_paco-paco on 2007/12/30 20:38:15 Fewer redundant definitions. Many of these defines are different between JNPR and MIPS2 and will need to be resolved/aligned somehow. Either we'll need some way to allow each subport to cope, or we'll need to harmonize them. I suspect that some can be harmonized, at least in the 32-bit and 64-bit cases, while others will need tweaking per subport. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#3 (text+ko) ==== @@ -176,15 +176,19 @@ /* * XXXMIPS: This values need to be changed!!! */ +#if 0 #define VM_MIN_ADDRESS ((vm_offset_t)0x0000000000010000) #define VM_MAXUSER_ADDRESS ((vm_offset_t)MIPS_KSEG0_START-1) #define VM_MAX_ADDRESS ((vm_offset_t)0x0000000100000000) #define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG3_START) #define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG3_END) +#endif #define KERNBASE (VM_MIN_KERNEL_ADDRESS) +#if 0 /* virtual sizes (bytes) for various kernel submaps */ #define VM_KMEM_SIZE (16*1024*1024) /* XXX ??? */ +#endif #define NBSEG 0x400000 /* bytes/segment */ #define SEGOFSET (NBSEG-1) /* byte offset into segment */ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:42:58 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5304616A41B; Sun, 30 Dec 2007 20:42:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 188DF16A419 for ; Sun, 30 Dec 2007 20:42:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0A9AB13C467 for ; Sun, 30 Dec 2007 20:42:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUKgvOx055004 for ; Sun, 30 Dec 2007 20:42:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUKgv5Y055000 for perforce@freebsd.org; Sun, 30 Dec 2007 20:42:57 GMT (envelope-from imp@freebsd.org) Date: Sun, 30 Dec 2007 20:42:57 GMT Message-Id: <200712302042.lBUKgv5Y055000@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132123 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 20:42:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=132123 Change 132123 by imp@imp_paco-paco on 2007/12/30 20:42:20 The Juniper port defines KERNBASE in parma.h, not in vmparam.h. cope for the moment. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#4 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/vmparam.h#4 (text+ko) ==== @@ -182,10 +182,8 @@ #define VM_MAX_ADDRESS ((vm_offset_t)0x0000000100000000) #define VM_MIN_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG3_START) #define VM_MAX_KERNEL_ADDRESS ((vm_offset_t)MIPS_KSEG3_END) -#endif #define KERNBASE (VM_MIN_KERNEL_ADDRESS) -#if 0 /* virtual sizes (bytes) for various kernel submaps */ #define VM_KMEM_SIZE (16*1024*1024) /* XXX ??? */ #endif From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:45:01 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 099B316A421; Sun, 30 Dec 2007 20:45: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 C33C516A417 for ; Sun, 30 Dec 2007 20:45:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B514413C478 for ; Sun, 30 Dec 2007 20:45:00 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUKj07l056574 for ; Sun, 30 Dec 2007 20:45:00 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUKj0xV056557 for perforce@freebsd.org; Sun, 30 Dec 2007 20:45:00 GMT (envelope-from imp@freebsd.org) Date: Sun, 30 Dec 2007 20:45:00 GMT Message-Id: <200712302045.lBUKj0xV056557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132124 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 20:45:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=132124 Change 132124 by imp@imp_paco-paco on 2007/12/30 20:44:32 Comment about a difference between juniper port and mips2 port. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/param.h#3 (text+ko) ==== @@ -99,6 +99,10 @@ #define SEGOFSET (NBSEG-1) /* byte offset into segment */ #define SEGSHIFT 22 /* LOG2(NBSEG) */ +/* XXXimp: This has moved to vmparam.h */ +/* Also, this differs from the mips2 definition, but likely is better */ +/* since this means the kernel won't chew up TLBs when it is executing */ +/* code */ #define KERNBASE 0x80000000 /* start of kernel virtual */ #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:53:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B533516A41A; Sun, 30 Dec 2007 20:53: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 6F40916A418 for ; Sun, 30 Dec 2007 20:53:09 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 614BE13C4CC for ; Sun, 30 Dec 2007 20:53:09 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUKr954068131 for ; Sun, 30 Dec 2007 20:53:09 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUKr9DL068127 for perforce@freebsd.org; Sun, 30 Dec 2007 20:53:09 GMT (envelope-from imp@freebsd.org) Date: Sun, 30 Dec 2007 20:53:09 GMT Message-Id: <200712302053.lBUKr9DL068127@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132125 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 20:53:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=132125 Change 132125 by imp@imp_paco-paco on 2007/12/30 20:53:05 MINSIGSTKSZ moved to _limit.h and grew a couple of underscores, so make it so. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/_limits.h#3 edit .. //depot/projects/mips2-jnpr/src/sys/mips/include/signal.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/_limits.h#3 (text+ko) ==== @@ -94,4 +94,6 @@ #endif #define __WORD_BIT 32 +#define __MINSIGSTKSZ (512 * 4) + #endif /* !_MACHINE__LIMITS_H_ */ ==== //depot/projects/mips2-jnpr/src/sys/mips/include/signal.h#3 (text+ko) ==== @@ -45,9 +45,6 @@ #include #include -#if __XSI_VISIBLE -#define MINSIGSTKSZ (512 * 4) -#endif /* * Machine-dependent signal definitions */ From owner-p4-projects@FreeBSD.ORG Sun Dec 30 20:56:13 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29FBC16A421; Sun, 30 Dec 2007 20:56: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 E408A16A417 for ; Sun, 30 Dec 2007 20:56:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D644E13C468 for ; Sun, 30 Dec 2007 20:56:12 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUKuCva070572 for ; Sun, 30 Dec 2007 20:56:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUKuC6x070569 for perforce@freebsd.org; Sun, 30 Dec 2007 20:56:12 GMT (envelope-from imp@freebsd.org) Date: Sun, 30 Dec 2007 20:56:12 GMT Message-Id: <200712302056.lBUKuC6x070569@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 132126 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 20:56:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=132126 Change 132126 by imp@imp_paco-paco on 2007/12/30 20:56:09 Remove now-redundant data. Affected files ... .. //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#3 edit Differences ... ==== //depot/projects/mips2-jnpr/src/sys/mips/include/bus.h#3 (text+ko) ==== @@ -802,35 +802,6 @@ struct uio; /* - * bus_dmasync_op_t - * - * Operations performed by bus_dmamap_sync(). - */ -typedef enum { - BUS_DMASYNC_PREREAD, - BUS_DMASYNC_POSTREAD, - BUS_DMASYNC_PREWRITE, - BUS_DMASYNC_POSTWRITE -} bus_dmasync_op_t; - -/* - * bus_dma_tag_t - * - * A machine-dependent opaque type describing the characteristics - * of how to perform DMA mappings. This structure encapsultes - * information concerning address and alignment restrictions, number - * of S/G segments, amount of data per S/G segment, etc. - */ -typedef struct bus_dma_tag *bus_dma_tag_t; - -/* - * bus_dmamap_t - * - * DMA mapping instance information. - */ -typedef struct bus_dmamap *bus_dmamap_t; - -/* * bus_dma_segment_t * * Describes a single contiguous DMA transaction. Values From owner-p4-projects@FreeBSD.ORG Sun Dec 30 21:18:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4470A16A41B; Sun, 30 Dec 2007 21:18:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0A1F616A418 for ; Sun, 30 Dec 2007 21:18:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D874813C45D for ; Sun, 30 Dec 2007 21:18:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBULIaIS079291 for ; Sun, 30 Dec 2007 21:18:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBULIatg079288 for perforce@freebsd.org; Sun, 30 Dec 2007 21:18:36 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 21:18:36 GMT Message-Id: <200712302118.lBULIatg079288@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132127 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 21:18:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=132127 Change 132127 by jb@jb_freebsd1 on 2007/12/30 21:17:40 Destroy the cyclic ID cache on uninit to avoid a memory leak. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#13 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/os/cyclic.c#13 (text) ==== @@ -2964,6 +2964,9 @@ cyclic_offline(c); cyclic_unconfigure(c); } + + if (cyclic_id_cache != NULL) + kmem_cache_destroy(cyclic_id_cache); } #endif From owner-p4-projects@FreeBSD.ORG Sun Dec 30 21:48:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D22A216A421; Sun, 30 Dec 2007 21:48:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9802616A41B for ; Sun, 30 Dec 2007 21:48:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8A40413C467 for ; Sun, 30 Dec 2007 21:48:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBULm7bG092404 for ; Sun, 30 Dec 2007 21:48:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBULm7Ep092401 for perforce@freebsd.org; Sun, 30 Dec 2007 21:48:07 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 21:48:07 GMT Message-Id: <200712302148.lBULm7Ep092401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132128 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 21:48:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=132128 Change 132128 by jb@jb_freebsd1 on 2007/12/30 21:47:07 Move the event handler cleanup code from modevent to here so that the SYSUINIT drivers it. Use FreeBSD error values rather than the DDI_FAILURE hack. Remove some OpenSolaris-specific code. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#16 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#16 (text+ko) ==== @@ -22,14 +22,25 @@ * */ -#define DDI_FAILURE EBUSY - static int dtrace_unload() { dtrace_state_t *state; int error = 0; + /* + * Check if there is still an event handler callback + * registered. + */ + if (eh_tag != 0) { + /* De-register the device cloning event handler. */ + EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); + eh_tag = 0; + + /* Stop device cloning. */ + clone_cleanup(&dtrace_clones); + } + mutex_enter(&cpu_lock); mutex_enter(&dtrace_provider_lock); mutex_enter(&dtrace_lock); @@ -40,14 +51,14 @@ mutex_exit(&dtrace_provider_lock); mutex_exit(&dtrace_lock); mutex_exit(&cpu_lock); - return (DDI_FAILURE); + return (EBUSY); } if (dtrace_unregister((dtrace_provider_id_t)dtrace_provider) != 0) { mutex_exit(&dtrace_provider_lock); mutex_exit(&dtrace_lock); mutex_exit(&cpu_lock); - return (DDI_FAILURE); + return (EBUSY); } dtrace_provider = NULL; @@ -120,13 +131,6 @@ dtrace_toxranges_max = 0; } -#ifdef DOODAD - ddi_remove_minor_node(dtrace_devi, NULL); - dtrace_devi = NULL; - - ddi_soft_state_fini(&dtrace_softstate); -#endif - ASSERT(dtrace_vtime_references == 0); ASSERT(dtrace_opens == 0); ASSERT(dtrace_retained == NULL); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 21:48:08 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFFDB16A4FC; Sun, 30 Dec 2007 21:48:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BC6EE16A420 for ; Sun, 30 Dec 2007 21:48:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AE90D13C468 for ; Sun, 30 Dec 2007 21:48:07 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBULm7rI092410 for ; Sun, 30 Dec 2007 21:48:07 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBULm70H092407 for perforce@freebsd.org; Sun, 30 Dec 2007 21:48:07 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 21:48:07 GMT Message-Id: <200712302148.lBULm70H092407@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132129 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 21:48:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=132129 Change 132129 by jb@jb_freebsd1 on 2007/12/30 21:48:05 Move the cloning code to dtrace_load/dtrace_unload so that it is driven by SYSINIT and SYSUNINIT. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#8 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_modevent.c#8 (text+ko) ==== @@ -30,30 +30,9 @@ switch (type) { case MOD_LOAD: - - /* Enable device cloning. */ - clone_setup(&dtrace_clones); - - /* Setup device cloning events. */ - eh_tag = EVENTHANDLER_REGISTER(dev_clone, dtrace_clone, 0, 1000); break; case MOD_UNLOAD: - if ((error = dtrace_unload()) != 0) - return (error); - - /* - * Check if there is still an event handler callback - * registered. - */ - if (eh_tag != 0) { - /* De-register the device cloning event handler. */ - EVENTHANDLER_DEREGISTER(dev_clone, eh_tag); - eh_tag = 0; - - /* Stop device cloning. */ - clone_cleanup(&dtrace_clones); - } break; case MOD_SHUTDOWN: From owner-p4-projects@FreeBSD.ORG Sun Dec 30 21:49:09 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3086E16A41B; Sun, 30 Dec 2007 21:49:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA5BD16A419 for ; Sun, 30 Dec 2007 21:49:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCF4613C465 for ; Sun, 30 Dec 2007 21:49:08 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBULn8d2092483 for ; Sun, 30 Dec 2007 21:49:08 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBULn8Tq092480 for perforce@freebsd.org; Sun, 30 Dec 2007 21:49:08 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 21:49:08 GMT Message-Id: <200712302149.lBULn8Tq092480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 21:49:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=132130 Change 132130 by jb@jb_freebsd1 on 2007/12/30 21:48:35 Move the cloing code from modevent to here so that it is driven by SYSINIT. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#18 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#18 (text+ko) ==== @@ -177,5 +177,12 @@ mutex_exit(&dtrace_lock); mutex_exit(&dtrace_provider_lock); +printf("%s(%d): enable device cloning\n",__func__,__LINE__); + /* Enable device cloning. */ + clone_setup(&dtrace_clones); + + /* Setup device cloning events. */ + eh_tag = EVENTHANDLER_REGISTER(dev_clone, dtrace_clone, 0, 1000); + return; } From owner-p4-projects@FreeBSD.ORG Sun Dec 30 21:56:17 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DF4716A421; Sun, 30 Dec 2007 21:56: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 13E2116A41B for ; Sun, 30 Dec 2007 21:56:17 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E1FC813C45B for ; Sun, 30 Dec 2007 21:56:16 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBULuGRM096026 for ; Sun, 30 Dec 2007 21:56:16 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBULuGcj096023 for perforce@freebsd.org; Sun, 30 Dec 2007 21:56:16 GMT (envelope-from jb@freebsd.org) Date: Sun, 30 Dec 2007 21:56:16 GMT Message-Id: <200712302156.lBULuGcj096023@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132131 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 21:56:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=132131 Change 132131 by jb@jb_freebsd1 on 2007/12/30 21:55:31 Oops. Remove a debug printf that crept in. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#19 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#19 (text+ko) ==== @@ -177,7 +177,6 @@ mutex_exit(&dtrace_lock); mutex_exit(&dtrace_provider_lock); -printf("%s(%d): enable device cloning\n",__func__,__LINE__); /* Enable device cloning. */ clone_setup(&dtrace_clones); From owner-p4-projects@FreeBSD.ORG Sun Dec 30 22:25:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C7A0B16A469; Sun, 30 Dec 2007 22:25: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 8714C16A420 for ; Sun, 30 Dec 2007 22:25:47 +0000 (UTC) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7309B13C4D5 for ; Sun, 30 Dec 2007 22:25:47 +0000 (UTC) (envelope-from alc@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBUMPlEh008709 for ; Sun, 30 Dec 2007 22:25:47 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBUMPls9008706 for perforce@freebsd.org; Sun, 30 Dec 2007 22:25:47 GMT (envelope-from alc@freebsd.org) Date: Sun, 30 Dec 2007 22:25:47 GMT Message-Id: <200712302225.lBUMPls9008706@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 132132 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 30 Dec 2007 22:25:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=132132 Change 132132 by alc@alc_home on 2007/12/30 22:24:50 I don't need these files. Affected files ... .. //depot/projects/superpages/doc/Makefile#2 delete .. //depot/projects/superpages/doc/README#2 delete .. //depot/projects/superpages/doc/bn_BD.ISO10646-1/Makefile#2 delete .. //depot/projects/superpages/doc/bn_BD.ISO10646-1/articles/Makefile#2 delete .. //depot/projects/superpages/doc/bn_BD.ISO10646-1/articles/Makefile.inc#2 delete .. //depot/projects/superpages/doc/bn_BD.ISO10646-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/superpages/doc/bn_BD.ISO10646-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/superpages/doc/bn_BD.ISO10646-1/articles/new-users/Makefile#2 delete .. //depot/projects/superpages/doc/bn_BD.ISO10646-1/articles/new-users/article.sgml#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/Makefile#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/euro/Makefile#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/euro/article.sgml#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/ipsec-must/Makefile#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/ipsec-must/article.sgml#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/pxe/Makefile#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/pxe/article.sgml#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/pxe/dhcpd.conf#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/pxe/install.cfg#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/pxe/loader.rc#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/pxe/post#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/articles/pxe/pre#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/authors.ent#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/disclaimer.sgml#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/license.sgml#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/superpages/doc/da_DK.ISO8859-1/share/sgml/translators.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/contributing/article.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/laptop/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/laptop/article.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/new-users/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/new-users/article.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/version-guide/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/articles/version-guide/article.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/Makefile.inc#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/faq/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/faq/book.sgml#5 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/book.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/chapter.decl#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/chapters.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/examples/appendix.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/structure/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/Makefile#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/appendix.decl#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/audit/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/basics/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/book.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/boot/chapter.sgml#5 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/chapter.decl#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/chapters.ent#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/colophon.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/config/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/desktop/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/disks/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/install/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/l10n/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/mail/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/mirrors/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/multimedia/chapter.sgml#5 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/network-servers/chapter.sgml#5 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/newsgroups.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/ports/chapter.sgml#5 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/printing/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/security/chapter.sgml#5 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/serialcomms/chapter.sgml#5 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/txtfiles.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/users/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/books/handbook/x11/chapter.sgml#3 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/flyer/Makefile#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/flyer/flyer.tex#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/articles.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/bibliography.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/books.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#4 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/mirrors-local.xsl#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/trademarks.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/trademarks.sgml#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/translators.ent#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/transtable-local.xsl#2 delete .. //depot/projects/superpages/doc/de_DE.ISO8859-1/share/sgml/transtable.xml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/Makefile.inc#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/cvs-freebsd/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/cvs-freebsd/article.sgml#3 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/formatting-media/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/formatting-media/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/freebsd-questions/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/freebsd-questions/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/java-tomcat/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/java-tomcat/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/laptop/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/laptop/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/multi-os/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/multi-os/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/new-users/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/new-users/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/problem-reports/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/problem-reports/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/releng-packages/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/releng-packages/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/releng-packages/extra.css#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/releng/Makefile#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/releng/article.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/articles/releng/extra.css#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/articles.ent#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/bookinfo.ent#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/catalog#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/l10n.ent#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/teams.ent#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/trademarks.ent#2 delete .. //depot/projects/superpages/doc/el_GR.ISO8859-7/share/sgml/trademarks.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/5-roadmap/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/5-roadmap/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/5-roadmap/extra.css#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/Makefile#6 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/bsdl-gpl/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/bsdl-gpl/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/building-products/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/building-products/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/casestudy-argentina.com/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/checkpoint/Makefile#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/checkpoint/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/committers-guide/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/committers-guide/article.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/console-server/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/console-server/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributing-ports/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributing-ports/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributing/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/chapter.decl#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.386bsd.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#10 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#7 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.core.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.corealumni.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.docproj.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.staff.sgml#6 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/contributors/contrib.who.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/cvs-freebsd/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/cvs-freebsd/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/cvsup-advanced/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/cvsup-advanced/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/dialup-firewall/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/diskless-x/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/diskless-x/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/euro/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/euro/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.conf.default#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_1.sh#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.conf.default#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_2.sh#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/stage_3.mk#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/filtering-bridges/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/filtering-bridges/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/fonts/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/fonts/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/formatting-media/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/formatting-media/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/freebsd-questions/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/freebsd-questions/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/geom-class/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/geom-class/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/hats/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/hats/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/hubs/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/hubs/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/ipsec-must/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/ipsec-must/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/laptop/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/laptop/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/linux-comparison/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/linux-comparison/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/mailing-list-faq/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/mailing-list-faq/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/mh/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/mh/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/multi-os/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/multi-os/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/new-users/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/new-users/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/p4-primer/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pam/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pam/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pam/converse.c#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pam/pam_unix.c#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pam/su.c#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/portbuild/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pr-guidelines/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/problem-reports/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pxe/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pxe/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pxe/dhcpd.conf#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pxe/install.cfg#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pxe/loader.rc#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pxe/post#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/pxe/pre#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/relaydelay/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/relaydelay/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/releng-packages/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/releng-packages/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/releng-packages/extra.css#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/releng/Makefile#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/releng/article.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/releng/extra.css#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/serial-uart/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/serial-uart/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/solid-state/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/solid-state/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/storage-devices/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/storage-devices/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/version-guide/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/version-guide/article.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/vinum/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/vinum/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/vm-design/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/vm-design/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/wp-toolbox/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/wp-toolbox/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/zip-drive/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/articles/zip-drive/article.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/Makefile.inc#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/book.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/boot/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/chapters.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/driverbasics/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/isa/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/jail/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/kobj/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/locking/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/mac.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/mac/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/newbus/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/pccard/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/pci/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/scsi/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/smp/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/sound/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/sysinit/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/usb/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/arch-handbook/vm/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/bibliography/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/bibliography/book.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/corp-net-guide/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/corp-net-guide/book.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/corp-net-guide/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/design-44bsd/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/design-44bsd/book.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/design-44bsd/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/dev-model/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/dev-model/book.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/dev-model/chapters.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/book.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/chapters.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/dma/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/ipv6/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/kerneldebug/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/l10n/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/policies/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/secure/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/sockets/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/testing/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/tools/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/developers-handbook/x86/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/faq/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/faq/book.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/book.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/chapter.decl#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/chapters.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/doc-build/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/examples/appendix.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/structure/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/translations/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/advanced-networking/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/appendix.decl#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/audit/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/audit/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/disk-layout.kil#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/example-dir1.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/example-dir2.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/example-dir3.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/example-dir4.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/basics/example-dir5.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/bibliography/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/book.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/boot/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml#6 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/chapter.decl#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/chapters.ent#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/colophon.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/config/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/config/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/cutting-edge/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/desktop/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/disks/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/eresources/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/firewalls/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/geom/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/install/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/install/disk-layout.kil#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/install/example-dir1.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/install/example-dir2.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/install/example-dir3.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/install/example-dir4.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/install/example-dir5.dot#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/introduction/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/kernelconfig/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/l10n/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/l10n/chapter.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/linuxemu/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mac/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mail/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mail/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#7 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/multimedia/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/multimedia/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/network-servers/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/network-servers/chapter.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/pgpkeys/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/ports/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/ports/chapter.sgml#5 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/printing/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/printing/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/security/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#6 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/serialcomms/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/serialcomms/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/txtfiles.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/users/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/vinum/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/vinum/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/x11/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/handbook/x11/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/answers/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/basics/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/book.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/chapters.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/glossary/glossary.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/gods/chapter.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/intro/chapter.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/legalnotice.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/pmake/shortcuts/chapter.sgml#4 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/porters-handbook/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#9 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/books/porters-handbook/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/flyer/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/flyer/flyer.tex#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/mk/doc.local.mk#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/authors.ent#7 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/teams.ent#3 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/20050513-bsdcan-slides/slides.xml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/README#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/common/freebsd-5.3.xml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/common/freebsd-dev-model.xml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/common/freebsd-linux-license.xml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/common/freebsd-organization.xml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/common/freebsd-recent-releases.xml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/common/freebsd-release-process.xml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/common/freebsd-users.xml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/common/what-is-freebsd.xml#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/freebsd-general/Makefile#2 delete .. //depot/projects/superpages/doc/en_US.ISO8859-1/slides/freebsd-general/slides.xml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/admin.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/applications.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/includes.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/install.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/misc.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/network.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/preface.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/serial.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/FAQ/x.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/euro/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/euro/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/laptop/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/releng/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/releng/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/releng/extra.css#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/Makefile.inc#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/faq/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/faq/book.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/Makefile#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#4 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/authors.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/book.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#4 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#4 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/flyer/Makefile#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/flyer/flyer.tex#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/authors.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#3 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/catalog#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/teams.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#2 delete .. //depot/projects/superpages/doc/es_ES.ISO8859-1/share/sgml/translators.ent#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/Makefile.inc#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/committers-guide/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/committers-guide/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/contributing/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/contributing/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/contributors/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/contributors/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/cvsup-advanced/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ddwg/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ddwg/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/diskless-x/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/diskless-x/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/euro/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/euro/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/filtering-bridges/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/filtering-bridges/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/fonts/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/fonts/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/formatting-media/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/formatting-media/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ip-aliasing/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ip-aliasing/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ipsec-must/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ipsec-must/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/java-tomcat/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/java-tomcat/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/laptop/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/laptop/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/make-world/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/make-world/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/mh/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/mh/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/multi-os/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/multi-os/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/new-users/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/new-users/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ntfs/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ntfs/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pam/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pam/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pam/converse.c#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pam/pam_unix.c#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pam/su.c#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ppp/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/ppp/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pr-guidelines/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pr-guidelines/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/problem-reports/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/problem-reports/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/programming-tools/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/programming-tools/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pxe/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pxe/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pxe/dhcpd.conf#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pxe/install.cfg#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pxe/loader.rc#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pxe/pkgmaker.sh#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pxe/post#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/pxe/pre#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/releng-packages/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/releng-packages/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/releng-packages/extra.css#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/releng/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/releng/branches.ascii#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/releng/branches.pic#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/releng/extra.css#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/zip-drive/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/articles/zip-drive/article.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/Makefile.inc#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/book.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/chapters.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/driverbasics/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/locking/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/pci/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/scsi/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/secure/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/tools/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/developers-handbook/usb/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/faq/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/faq/book.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/book.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/chapters.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/in-progress.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/overview/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/psgml-mode/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/see-also/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-markup/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/stylesheets/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/the-faq/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/the-handbook/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/the-website/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/todo.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/tools/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/translations/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/fdp-primer/writing-style/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/Makefile#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-bus.eps#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/isdn-twisted-pair.eps#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/natd.eps#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/advanced-networking/net-routing.pic#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/appendix.decl#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/basics/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/bibliography/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/book.sgml#4 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/boot/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/boot/chapter.sgml#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/chapter.decl#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/chapters.ent#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/colophon.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/config/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/config/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/desktop/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#5 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/disks/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/disks/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/eresources/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/eresources/chapter.sgml#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/geom/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/install/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/install/chapter.sgml#4 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/install/disk-layout.eps#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir1.eps#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir2.eps#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir3.eps#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir4.eps#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/install/example-dir5.eps#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/introduction/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/introduction/chapter.sgml#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/l10n/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/l10n/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/linuxemu/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/mac/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/mail/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/mail/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/mirrors/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/mirrors/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/multimedia/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/multimedia/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/network-servers/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/network-servers/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/ports/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/ports/chapter.sgml#4 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/serialcomms/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/users/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/users/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/vinum/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/x11/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/handbook/x11/chapter.sgml#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/porters-handbook/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/porters-handbook/book.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/porters-handbook/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/ppp-primer/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/books/ppp-primer/book.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/flyer/Makefile#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/flyer/flyer.tex#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man1/builtin.1#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man1/cat.1#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man1/chkey.1#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man1/echo.1#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man1/head.1#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man1/intro.1#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/agp.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/amd.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/cardbus.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/man4.i386/aic.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/man4.i386/wt.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/ncr.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/sd.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/sn.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/spic.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/st.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man4/uscanner.4#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man5/intro.5#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man5/publickey.5#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man6/intro.6#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man7/ascii.7#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/man/man7/intro.7#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/abstract.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/artheader.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/authors.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/bookinfo.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/books.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/catalog#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/copyright.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/disclaimer.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/l10n.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/license.sgml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/mailing-lists.ent#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/mirrors-local.xsl#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/newsgroups.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/teams.ent#3 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/trademarks.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/translators.ent#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/transtable-local.xsl#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/transtable.xml#2 delete .. //depot/projects/superpages/doc/fr_FR.ISO8859-1/share/sgml/urls.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/Makefile.inc#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/committers-guide/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/committers-guide/article.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/euro/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/euro/article.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/explaining-bsd/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/explaining-bsd/article.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/filtering-bridges/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/filtering-bridges/article.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/multi-os/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/multi-os/article.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/new-users/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/new-users/article.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/vm-design/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/articles/vm-design/article.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/Makefile.inc#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/advanced-networking/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/appendix.decl#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/audit/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/audit/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/basics/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/basics/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/bibliography/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/bibliography/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/book.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/boot/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/boot/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/chapter.decl#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/chapters.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/colophon.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/config/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/config/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/cutting-edge/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/desktop/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/desktop/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/disks/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/disks/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/eresources/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/eresources/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/firewalls/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/firewalls/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/geom/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/geom/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/install/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/install/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/introduction/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/introduction/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/kernelconfig/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/l10n/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/l10n/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/linuxemu/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/linuxemu/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/mac/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/mac/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/mail/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/mail/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/mirrors/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/mirrors/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/multimedia/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/multimedia/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/network-servers/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/network-servers/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/pgpkeys/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/ports/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/ports/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/ppp-and-slip/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/preface/preface.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/printing/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/printing/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/security/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/security/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/serialcomms/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/serialcomms/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/txtfiles.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/users/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/users/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/vinum/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/x11/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/handbook/x11/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/bibliography/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/book.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/chapters.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/command-summary/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/commands/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/editors/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/getting-started/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/glossary/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/history/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/preface/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/shell-programming/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/shells/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/special-features/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/structure/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/system-resource/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/books/unix-introduction/text-processing/chapter.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/flyer/Makefile#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/flyer/flyer.tex#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/articles.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/bookinfo.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/books.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/catalog#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/glossary/freebsd-glossary.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/l10n.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/legalnotice.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/mailing-lists.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/mirrors-local.xsl#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/trademarks.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/trademarks.sgml#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/translators.ent#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/transtable-local.xsl#2 delete .. //depot/projects/superpages/doc/it_IT.ISO8859-15/share/sgml/transtable.xml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/Makefile#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/Makefile#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/Makefile.inc#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/contributing/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/contributing/article.sgml#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/contributors/Makefile#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/contributors/article.sgml#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/dialup-firewall/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/dialup-firewall/article.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/diskless-x/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/diskless-x/article.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/fbsd-from-scratch/Makefile#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/fbsd-from-scratch/article.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.conf.default#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_1.sh#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.conf.default#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_2.sh#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/fbsd-from-scratch/stage_3.mk#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/fonts/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/fonts/article.sgml#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/ipsec-must/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/ipsec-must/article.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/multi-os/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/multi-os/article.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/problem-reports/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/problem-reports/article.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/zip-drive/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/articles/zip-drive/article.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/Makefile.inc#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/design-44bsd/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/design-44bsd/book.sgml#3 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/design-44bsd/fig1.eps#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/design-44bsd/fig2.eps#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/design-44bsd/freebsd.dsl#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/faq/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/faq/book.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/fdp-primer/Makefile#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/fdp-primer/book.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/fdp-primer/chapter.decl#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/fdp-primer/chapters.ent#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/fdp-primer/examples/appendix.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/fdp-primer/overview/chapter.sgml#2 delete .. //depot/projects/superpages/doc/ja_JP.eucJP/books/fdp-primer/psgml-mode/chapter.sgml#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 31 01:26:34 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAE8516A41B; Mon, 31 Dec 2007 01:26:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B114416A419 for ; Mon, 31 Dec 2007 01:26:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8B3DF13C448 for ; Mon, 31 Dec 2007 01:26:33 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV1QXJS088685 for ; Mon, 31 Dec 2007 01:26:33 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV1QXwh088682 for perforce@freebsd.org; Mon, 31 Dec 2007 01:26:33 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 01:26:33 GMT Message-Id: <200712310126.lBV1QXwh088682@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132137 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 01:26:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=132137 Change 132137 by jb@jb_freebsd1 on 2007/12/31 01:26:14 Add a minimal kernel config that keeps popping itself up when I use p4 to look for files that haven't been added. I wish that p4 was better at reporting files it doesn't know about. Even cvs can do that! :-P Affected files ... .. //depot/projects/dtrace/src/sys/amd64/conf/MINIMAL#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 31 01:28:36 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1385716A468; Mon, 31 Dec 2007 01:28: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 CDAFE16A417 for ; Mon, 31 Dec 2007 01:28:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF5AD13C43E for ; Mon, 31 Dec 2007 01:28:35 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV1SZt1088743 for ; Mon, 31 Dec 2007 01:28:35 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV1SZVT088740 for perforce@freebsd.org; Mon, 31 Dec 2007 01:28:35 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 01:28:35 GMT Message-Id: <200712310128.lBV1SZVT088740@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132138 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 01:28:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=132138 Change 132138 by jb@jb_freebsd1 on 2007/12/31 01:28:01 Need to use a kmem_free now that these allocations were made with the kmem implemntation in the opensolaris module. Using the wrong memory identifier ends in tears. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#17 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#17 (text+ko) ==== @@ -108,7 +108,7 @@ } if (dtrace_probes != NULL) { - free(dtrace_probes, M_DTRACE); + kmem_free(dtrace_probes, 0); dtrace_probes = NULL; dtrace_nprobes = 0; } @@ -125,7 +125,7 @@ vmem_destroy(dtrace_arena); if (dtrace_toxrange != NULL) { - free(dtrace_toxrange, M_DTRACE); + kmem_free(dtrace_toxrange, 0); dtrace_toxrange = NULL; dtrace_toxranges = 0; dtrace_toxranges_max = 0; From owner-p4-projects@FreeBSD.ORG Mon Dec 31 01:29:37 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F27316A46C; Mon, 31 Dec 2007 01:29:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 053EA16A469 for ; Mon, 31 Dec 2007 01:29:37 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EBBE313C457 for ; Mon, 31 Dec 2007 01:29:36 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV1Tawu088787 for ; Mon, 31 Dec 2007 01:29:36 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV1Ta8R088784 for perforce@freebsd.org; Mon, 31 Dec 2007 01:29:36 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 01:29:36 GMT Message-Id: <200712310129.lBV1Ta8R088784@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132139 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 01:29:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=132139 Change 132139 by jb@jb_freebsd1 on 2007/12/31 01:28:48 Delete some Solaris-specific code that we do in a very different way. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#20 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#20 (text+ko) ==== @@ -61,31 +61,6 @@ mutex_enter(&dtrace_lock); #ifdef DOODAD - if (ddi_soft_state_init(&dtrace_softstate, - sizeof (dtrace_state_t), 0) != 0) { - cmn_err(CE_NOTE, "/dev/dtrace failed to initialize soft state"); - mutex_exit(&cpu_lock); - mutex_exit(&dtrace_provider_lock); - mutex_exit(&dtrace_lock); - return (DDI_FAILURE); - } - - if (ddi_create_minor_node(devi, DTRACEMNR_DTRACE, S_IFCHR, - DTRACEMNRN_DTRACE, DDI_PSEUDO, NULL) == DDI_FAILURE || - ddi_create_minor_node(devi, DTRACEMNR_HELPER, S_IFCHR, - DTRACEMNRN_HELPER, DDI_PSEUDO, NULL) == DDI_FAILURE) { - cmn_err(CE_NOTE, "/dev/dtrace couldn't create minor nodes"); - ddi_remove_minor_node(devi, NULL); - ddi_soft_state_fini(&dtrace_softstate); - mutex_exit(&cpu_lock); - mutex_exit(&dtrace_provider_lock); - mutex_exit(&dtrace_lock); - return (DDI_FAILURE); - } - - ddi_report_dev(devi); - dtrace_devi = devi; - dtrace_modload = dtrace_module_loaded; dtrace_modunload = dtrace_module_unloaded; dtrace_cpu_init = dtrace_cpu_setup_initial; From owner-p4-projects@FreeBSD.ORG Mon Dec 31 01:36:44 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C01C916A420; Mon, 31 Dec 2007 01:36: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 6556F16A41A for ; Mon, 31 Dec 2007 01:36:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 573B213C448 for ; Mon, 31 Dec 2007 01:36:44 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV1aien092401 for ; Mon, 31 Dec 2007 01:36:44 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV1aivQ092398 for perforce@freebsd.org; Mon, 31 Dec 2007 01:36:44 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 01:36:44 GMT Message-Id: <200712310136.lBV1aivQ092398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132140 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 01:36:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=132140 Change 132140 by jb@jb_freebsd1 on 2007/12/31 01:35:52 For the time being, force debug mode on so we can get a list of the leaked allocations (if any). Use stack_print_ddb() instead of stack_print() to avoid tripping over locks. It _is_ a debug routine anyway and of course this means that the module will only load into a kernel containing DDB. I'm not sure when the SYSUNINIT should run. If it runs too early it reports allocations that are still to be freed. Not all modules are device drivers, so SI_SUB_DRIVERS probably isn't correct. Certainly the DTrace modules have to operate as early in the kernel initialisation as possible to be useful tracing the boot process. Remove the 'static' from kmem_show() so that I can call it myself. I found that it was running after my symbols had been discarded, leaving the symbol names I was looking for defaulted to something unhelpful. Note that the ZFS references in this file will have to change. They don't belong here. Affected files ... .. //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 edit Differences ... ==== //depot/projects/dtrace/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#3 (text+ko) ==== @@ -40,6 +40,8 @@ #include #include +#define KMEM_DEBUG + #ifdef KMEM_DEBUG #include #include @@ -236,7 +238,8 @@ } #ifdef KMEM_DEBUG -static void +void kmem_show(void *); +void kmem_show(void *dummy __unused) { struct kmem_item *i; @@ -248,12 +251,16 @@ printf("KMEM_DEBUG: Leaked elements:\n\n"); LIST_FOREACH(i, &kmem_items, next) { printf("address=%p\n", i); - stack_print(&i->stack); + /* + * Cheat and use the DDB routine + * to avoid lock issues. + */ + stack_print_ddb(&i->stack); printf("\n"); } } mtx_unlock(&kmem_items_mtx); } -SYSUNINIT(sol_kmem, SI_SUB_DRIVERS, SI_ORDER_FIRST, kmem_show, NULL); +SYSUNINIT(sol_kmem, SI_SUB_CPU, SI_ORDER_FIRST, kmem_show, NULL); #endif /* KMEM_DEBUG */ From owner-p4-projects@FreeBSD.ORG Mon Dec 31 01:37:45 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D036916A41A; Mon, 31 Dec 2007 01:37:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 964BF16A417 for ; Mon, 31 Dec 2007 01:37:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8891713C459 for ; Mon, 31 Dec 2007 01:37:45 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV1bjEv092438 for ; Mon, 31 Dec 2007 01:37:45 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV1bjTp092435 for perforce@freebsd.org; Mon, 31 Dec 2007 01:37:45 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 01:37:45 GMT Message-Id: <200712310137.lBV1bjTp092435@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 01:37:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=132141 Change 132141 by jb@jb_freebsd1 on 2007/12/31 01:37:43 Add a SYSUNINIT for dtrace_unload() so that it will play nicely when linked into a kernel rather than loaded as a module. Add a few missing sem-colons. Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#6 (text) ==== @@ -15949,8 +15949,9 @@ #include #endif -SYSINIT(dtrace_load, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_load, NULL) -SYSINIT(dtrace_anon_init, SI_SUB_DTRACE_ANON, SI_ORDER_FIRST, dtrace_anon_init, NULL) +SYSINIT(dtrace_load, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_load, NULL); +SYSUNINIT(dtrace_unload, SI_SUB_DTRACE, SI_ORDER_FIRST, dtrace_unload, NULL); +SYSINIT(dtrace_anon_init, SI_SUB_DTRACE_ANON, SI_ORDER_FIRST, dtrace_anon_init, NULL); DEV_MODULE(dtrace, dtrace_modevent, NULL); MODULE_VERSION(dtrace, 1); From owner-p4-projects@FreeBSD.ORG Mon Dec 31 03:36:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 42C4616A41B; Mon, 31 Dec 2007 03:36: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 0881A16A417 for ; Mon, 31 Dec 2007 03:36:56 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D4B8813C44B for ; Mon, 31 Dec 2007 03:36:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV3atl9039275 for ; Mon, 31 Dec 2007 03:36:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV3atTg039272 for perforce@freebsd.org; Mon, 31 Dec 2007 03:36:55 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 03:36:55 GMT Message-Id: <200712310336.lBV3atTg039272@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132145 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 03:36:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=132145 Change 132145 by jb@jb_freebsd1 on 2007/12/31 03:36:35 I divided the dtrace.c source file up into manageable bits, but found it difficult to integrated changes from OpenSolaris. So now I'm back managing the enormous file (which is nearly 16000 lines). These layout in these files is how I would have done it if I'd had my way. Such is life. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace.c#35 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_actdesc.c#3 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_action.c#7 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_aggregate.c#2 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_buffer.c#8 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_close.c#5 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_context.c#6 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dif.c#11 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_difo.c#6 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dof.c#8 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_dynvar.c#6 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ecb.c#4 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_enabling.c#4 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_format.c#2 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_freebsd.c#4 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hash.c#4 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_helper.c#5 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_helpprov.c#3 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_hook.c#4 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_match.c#3 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_meta.c#2 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_mutex.c#3 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_mutex.h#2 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_open.c#6 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_predicate.c#3 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_priv.c#5 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probe.c#10 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probekey.c#3 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_probemgmt.c#6 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_register.c#7 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_speculation.c#4 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_state.c#11 delete .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_util.c#4 delete Differences ... From owner-p4-projects@FreeBSD.ORG Mon Dec 31 04:25:47 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAF8416A41B; Mon, 31 Dec 2007 04:25:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B0CE816A418 for ; Mon, 31 Dec 2007 04:25:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A0CFD13C43E for ; Mon, 31 Dec 2007 04:25:46 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV4Pkta058932 for ; Mon, 31 Dec 2007 04:25:46 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV4Pkus058929 for perforce@freebsd.org; Mon, 31 Dec 2007 04:25:46 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 04:25:46 GMT Message-Id: <200712310425.lBV4Pkus058929@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 04:25:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=132147 Change 132147 by jb@jb_freebsd1 on 2007/12/31 04:25:29 Remove the M_DTRACE memory type. Use the one that the kmem in the opensolaris module uses. Save the pointer to the allocated DTrace state in dtrace_open(). Check for a couple of NULL pointers when destroying the state because a premature exit by dtrace(8) can leave those pointers NULL and freeing them ends in tears. (The premature exit is another story) Affected files ... .. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#7 edit Differences ... ==== //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/dtrace/dtrace.c#7 (text) ==== @@ -261,8 +261,6 @@ static kmutex_t dtrace_meta_lock; /* meta-provider state lock */ #if !defined(sun) -MALLOC_DEFINE(M_DTRACE, "dtrace", "Dynamic Trace"); - /* XXX FreeBSD hacks. */ static kmutex_t mod_lock; @@ -275,7 +273,6 @@ #define NCPU 32 #define SNOCD 0 #define CPU_ON_INTR(_a) 0 -#define M_KMEM M_DTRACE #define PRIV_EFFECTIVE (1 << 0) #define PRIV_DTRACE_KERNEL (1 << 1) @@ -11299,19 +11296,19 @@ freeenv(p_env); if (len < sizeof (dof_hdr_t)) { - free(buf, M_DTRACE); + kmem_free(buf, 0); dtrace_dof_error(NULL, "truncated header"); return (NULL); } if (len < (loadsz = dof->dofh_loadsz)) { - free(buf, M_DTRACE); + kmem_free(buf, 0); dtrace_dof_error(NULL, "truncated DOF"); return (NULL); } if (loadsz >= dtrace_dof_maxsize) { - free(buf, M_DTRACE); + kmem_free(buf, 0); dtrace_dof_error(NULL, "oversized DOF"); return (NULL); } @@ -12341,7 +12338,7 @@ } /* Allocate memory for the state. */ - state = malloc(sizeof(dtrace_state_t), M_DTRACE, M_WAITOK | M_ZERO); + state = kmem_zalloc(sizeof(dtrace_state_t), KM_SLEEP); #endif state->dts_epid = DTRACE_EPIDNONE + 1; @@ -13121,7 +13118,8 @@ dtrace_dstate_fini(&vstate->dtvs_dynvars); dtrace_vstate_fini(vstate); - kmem_free(state->dts_ecbs, state->dts_necbs * sizeof (dtrace_ecb_t *)); + if (state->dts_ecbs != NULL) + kmem_free(state->dts_ecbs, state->dts_necbs * sizeof (dtrace_ecb_t *)); if (state->dts_aggregations != NULL) { #ifdef DEBUG @@ -13139,7 +13137,8 @@ for (i = 0; i < nspec; i++) kmem_free(spec[i].dtsp_buffer, bufsize); - kmem_free(spec, nspec * sizeof (dtrace_speculation_t)); + if (spec != NULL) + kmem_free(spec, nspec * sizeof (dtrace_speculation_t)); dtrace_format_destroy(state); @@ -14809,6 +14808,7 @@ state = dtrace_state_create(devp, cred_p); #else state = dtrace_state_create(dev); + dev->si_drv1 = state; #endif mutex_exit(&cpu_lock); @@ -14872,7 +14872,7 @@ dtrace_state_destroy(state); #if !defined(sun) - free(state, M_DTRACE); + kmem_free(state, 0); dev->si_drv1 = NULL; #endif } From owner-p4-projects@FreeBSD.ORG Mon Dec 31 04:27:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A287316A417; Mon, 31 Dec 2007 04:27: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 3192116A468 for ; Mon, 31 Dec 2007 04:27:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 222BE13C45B for ; Mon, 31 Dec 2007 04:27:49 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV4Rmko059007 for ; Mon, 31 Dec 2007 04:27:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV4RmPl059004 for perforce@freebsd.org; Mon, 31 Dec 2007 04:27:48 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 04:27:48 GMT Message-Id: <200712310427.lBV4RmPl059004@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132148 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 04:27:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=132148 Change 132148 by jb@jb_freebsd1 on 2007/12/31 04:27:40 Remove the M_DTRACE memory type and be consistent about using the kmem implementation in the opensolaris module. Affected files ... .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#21 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#3 edit .. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#18 edit Differences ... ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_load.c#21 (text+ko) ==== @@ -145,7 +145,7 @@ if (dtrace_helptrace_enabled) { ASSERT(dtrace_helptrace_buffer == NULL); dtrace_helptrace_buffer = - malloc(dtrace_helptrace_bufsize, M_DTRACE, M_NOWAIT | M_ZERO); + kmem_zalloc(dtrace_helptrace_bufsize, KM_SLEEP); dtrace_helptrace_next = 0; } ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ prov = prov->dtpv_next; } - if ((p_name = malloc(len, M_DTRACE, M_NOWAIT)) == NULL) + if ((p_name = kmem_alloc(len, KM_SLEEP)) == NULL) error = ENOMEM; else { /* Start with an empty string. */ @@ -73,7 +73,7 @@ if (p_name != NULL) { error = sysctl_handle_string(oidp, p_name, len, req); - free(p_name, M_DTRACE); + kmem_free(p_name, 0); } return (error); ==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_unload.c#18 (text+ko) ==== @@ -103,7 +103,7 @@ mutex_exit(&cpu_lock); if (dtrace_helptrace_enabled) { - free(dtrace_helptrace_buffer, M_DTRACE); + kmem_free(dtrace_helptrace_buffer, 0); dtrace_helptrace_buffer = NULL; } From owner-p4-projects@FreeBSD.ORG Mon Dec 31 05:29:56 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8A0A16A419; Mon, 31 Dec 2007 05:29: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 5F8DF16A417 for ; Mon, 31 Dec 2007 05:29:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3775613C459 for ; Mon, 31 Dec 2007 05:29:55 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV5TtGb090999 for ; Mon, 31 Dec 2007 05:29:55 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV5TteM090996 for perforce@freebsd.org; Mon, 31 Dec 2007 05:29:55 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 05:29:55 GMT Message-Id: <200712310529.lBV5TteM090996@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132152 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 05:29:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=132152 Change 132152 by jb@jb_freebsd1 on 2007/12/31 05:29:23 Comment out a hack that seemed to be required on i386 last time. Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#12 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#12 (text) ==== @@ -479,7 +479,7 @@ { const dtrace_vector_t *v = dtp->dt_vector; -#if !defined(sun) +#if !defined(sun) && defined(DOODAD) /* XXX Avoid sign extension. This shouldn't be necessary. */ val &= 0xffffffff; #endif From owner-p4-projects@FreeBSD.ORG Mon Dec 31 05:31:57 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BAAA516A41A; Mon, 31 Dec 2007 05:31:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 80AFA16A418 for ; Mon, 31 Dec 2007 05:31:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7126413C46B for ; Mon, 31 Dec 2007 05:31:57 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV5VvPA092210 for ; Mon, 31 Dec 2007 05:31:57 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV5VvH3092205 for perforce@freebsd.org; Mon, 31 Dec 2007 05:31:57 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 05:31:57 GMT Message-Id: <200712310531.lBV5VvH3092205@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132153 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 05:31:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=132153 Change 132153 by jb@jb_freebsd1 on 2007/12/31 05:31:02 amd64 doesn't seem to have a program header in the kernel modules like i386 does. I don't know enough about amd64 to know if that's a problem or not. I have a feeling I'm not far off learning that. :-P Affected files ... .. //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#14 edit Differences ... ==== //depot/projects/dtrace/src/contrib/opensolaris/lib/libdtrace/common/dt_module.c#14 (text) ==== @@ -927,6 +927,7 @@ #if defined(sun) dmp->dm_modid = (int)OBJFS_MODID(st.st_ino); #else +#if defined(__i386__) /* * Find the first load section and figure out the relocation * offset for the symbols. The kernel module will not need @@ -939,6 +940,7 @@ } } #endif +#endif if (dmp->dm_info.objfs_info_primary) dmp->dm_flags |= DT_DM_PRIMARY; From owner-p4-projects@FreeBSD.ORG Mon Dec 31 07:17:48 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F32716A41B; Mon, 31 Dec 2007 07:17:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F002A16A419 for ; Mon, 31 Dec 2007 07:17:47 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DE7FC13C43E for ; Mon, 31 Dec 2007 07:17:47 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV7Hl2T033856 for ; Mon, 31 Dec 2007 07:17:47 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV7Hlak033853 for perforce@freebsd.org; Mon, 31 Dec 2007 07:17:47 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 31 Dec 2007 07:17:47 GMT Message-Id: <200712310717.lBV7Hlak033853@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 07:17:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=132155 Change 132155 by kmacy@pandemonium:kmacy:xen31 on 2007/12/31 07:17:11 bring xenbus more in line with the linux implementation Affected files ... .. //depot/projects/xen31/sys/i386/include/xen/xen-public/io/xenbus.h#2 edit .. //depot/projects/xen31/sys/i386/include/xen/xenbus.h#2 edit .. //depot/projects/xen31/sys/xen/xenbus/xenbus_client.c#3 edit .. //depot/projects/xen31/sys/xen/xenbus/xenbus_comms.c#4 edit .. //depot/projects/xen31/sys/xen/xenbus/xenbus_comms.h#3 edit .. //depot/projects/xen31/sys/xen/xenbus/xenbus_dev.c#3 edit .. //depot/projects/xen31/sys/xen/xenbus/xenbus_probe.c#4 edit .. //depot/projects/xen31/sys/xen/xenbus/xenbus_xs.c#7 edit Differences ... ==== //depot/projects/xen31/sys/i386/include/xen/xen-public/io/xenbus.h#2 (text+ko) ==== @@ -3,40 +3,71 @@ * * Xenbus protocol details. * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * * Copyright (C) 2005 XenSource Ltd. */ #ifndef _XEN_PUBLIC_IO_XENBUS_H #define _XEN_PUBLIC_IO_XENBUS_H -/* The state of either end of the Xenbus, i.e. the current communication - status of initialisation across the bus. States here imply nothing about - the state of the connection between the driver and the kernel's device - layers. */ -typedef enum -{ - XenbusStateUnknown = 0, - XenbusStateInitialising = 1, - XenbusStateInitWait = 2, /* Finished early initialisation, but waiting - for information from the peer or hotplug - scripts. */ - XenbusStateInitialised = 3, /* Initialised and waiting for a connection - from the peer. */ - XenbusStateConnected = 4, - XenbusStateClosing = 5, /* The device is being closed due to an error - or an unplug event. */ - XenbusStateClosed = 6 +/* + * The state of either end of the Xenbus, i.e. the current communication + * status of initialisation across the bus. States here imply nothing about + * the state of the connection between the driver and the kernel's device + * layers. + */ +enum xenbus_state { + XenbusStateUnknown = 0, + + XenbusStateInitialising = 1, + + /* + * InitWait: Finished early initialisation but waiting for information + * from the peer or hotplug scripts. + */ + XenbusStateInitWait = 2, + + /* + * Initialised: Waiting for a connection from the peer. + */ + XenbusStateInitialised = 3, + + XenbusStateConnected = 4, + + /* + * Closing: The device is being closed due to an error or an unplug event. + */ + XenbusStateClosing = 5, -} XenbusState; + XenbusStateClosed = 6 +}; +typedef enum xenbus_state XenbusState; #endif /* _XEN_PUBLIC_IO_XENBUS_H */ /* * Local variables: - * c-file-style: "linux" - * indent-tabs-mode: t - * c-indent-level: 8 - * c-basic-offset: 8 - * tab-width: 8 + * mode: C + * c-set-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil * End: */ ==== //depot/projects/xen31/sys/i386/include/xen/xenbus.h#2 (text+ko) ==== @@ -58,12 +58,13 @@ struct xenbus_watch otherend_watch; /* must be first */ const char *devicetype; const char *nodename; - char *otherend; + const char *otherend; int otherend_id; struct xendev_list_head *bus; struct xenbus_driver *driver; int has_error; - void *data; + enum xenbus_state state; + void *dev_driver_data; LIST_ENTRY(xenbus_device) list; }; @@ -98,6 +99,7 @@ int (*read_otherend_details)(struct xenbus_device *dev); int (*watch_otherend)(struct xenbus_device *dev); int (*cleanup_device)(struct xenbus_device *dev); + int (*is_ready)(struct xenbus_device *dev); LIST_ENTRY(xenbus_driver) list; }; @@ -116,35 +118,40 @@ int xenbus_remove_device(struct xenbus_device *dev); -struct xenbus_transaction; +struct xenbus_transaction +{ + uint32_t id; +}; + +#define XBT_NIL ((struct xenbus_transaction) { 0 }) -char **xenbus_directory(struct xenbus_transaction *t, +char **xenbus_directory(struct xenbus_transaction t, const char *dir, const char *node, unsigned int *num); -void *xenbus_read(struct xenbus_transaction *t, +void *xenbus_read(struct xenbus_transaction t, const char *dir, const char *node, unsigned int *len); -int xenbus_write(struct xenbus_transaction *t, +int xenbus_write(struct xenbus_transaction t, const char *dir, const char *node, const char *string); -int xenbus_mkdir(struct xenbus_transaction *t, +int xenbus_mkdir(struct xenbus_transaction t, const char *dir, const char *node); -int xenbus_exists(struct xenbus_transaction *t, +int xenbus_exists(struct xenbus_transaction t, const char *dir, const char *node); -int xenbus_rm(struct xenbus_transaction *t, const char *dir, const char *node); -struct xenbus_transaction *xenbus_transaction_start(void); -int xenbus_transaction_end(struct xenbus_transaction *t, int abort); +int xenbus_rm(struct xenbus_transaction t, const char *dir, const char *node); +int xenbus_transaction_start(struct xenbus_transaction *t); +int xenbus_transaction_end(struct xenbus_transaction t, int abort); /* Single read and scanf: returns -errno or num scanned if > 0. */ -int xenbus_scanf(struct xenbus_transaction *t, +int xenbus_scanf(struct xenbus_transaction t, const char *dir, const char *node, const char *fmt, ...) __attribute__((format(scanf, 4, 5))); /* Single printf and write: returns -errno or 0. */ -int xenbus_printf(struct xenbus_transaction *t, +int xenbus_printf(struct xenbus_transaction t, const char *dir, const char *node, const char *fmt, ...) __attribute__((format(printf, 4, 5))); /* Generic read function: NULL-terminated triples of name, * sprintf-style type string, and pointer. Returns 0 or errno.*/ -int xenbus_gather(struct xenbus_transaction *t, const char *dir, ...); +int xenbus_gather(struct xenbus_transaction t, const char *dir, ...); /* notifer routines for when the xenstore comes up */ int register_xenstore_notifier(xenstore_event_handler_t func, void *arg, int priority); @@ -205,13 +212,11 @@ /** * Advertise in the store a change of the given driver to the given new_state. - * Perform the change inside the given transaction xbt. xbt may be NULL, in * which case this is performed inside its own transaction. Return 0 on * success, or -errno on error. On error, the device will switch to * XenbusStateClosing, and the error will be saved in the store. */ int xenbus_switch_state(struct xenbus_device *dev, - struct xenbus_transaction *xbt, XenbusState new_state); @@ -261,6 +266,11 @@ void xenbus_dev_fatal(struct xenbus_device *dev, int err, const char *fmt, ...); +int xenbus_dev_init(void); + +const char *xenbus_strstate(enum xenbus_state state); +int xenbus_dev_is_online(struct xenbus_device *dev); +int xenbus_frontend_closed(struct xenbus_device *dev); #endif /* _ASM_XEN_XENBUS_H */ ==== //depot/projects/xen31/sys/xen/xenbus/xenbus_client.c#3 (text+ko) ==== @@ -101,7 +101,6 @@ int xenbus_switch_state(struct xenbus_device *dev, - struct xenbus_transaction *xbt, XenbusState state) { /* We check whether the state is currently set to the given value, and @@ -113,22 +112,36 @@ */ int current_state; + int err; + + if (state == dev->state) + return (0); - int err = xenbus_scanf(xbt, dev->nodename, "state", "%d", + err = xenbus_scanf(XBT_NIL, dev->nodename, "state", "%d", ¤t_state); - if ((err == 1 && (XenbusState)current_state == state) || - err == -ENOENT) + if (err != 1) return 0; - err = xenbus_printf(xbt, dev->nodename, "state", "%d", state); + err = xenbus_printf(XBT_NIL, dev->nodename, "state", "%d", state); if (err) { - xenbus_dev_fatal(dev, err, "writing new state"); + if (state != XenbusStateClosing) /* Avoid looping */ + xenbus_dev_fatal(dev, err, "writing new state"); return err; } + + dev->state = state; return 0; + } -EXPORT_SYMBOL(xenbus_switch_state); +int xenbus_frontend_closed(struct xenbus_device *dev) +{ + xenbus_switch_state(dev, XenbusStateClosed); +#if 0 + complete(&dev->down); +#endif + return 0; +} /** * Return the path to the error node for the given device, or NULL on failure. @@ -165,8 +178,9 @@ ret = vsnprintf(printf_buffer+len, PRINTF_BUFFER_SIZE-len, fmt, ap); BUG_ON(len + ret > PRINTF_BUFFER_SIZE-1); - dev->has_error = 1; - +#if 0 + dev_err(&dev->dev, "%s\n", printf_buffer); +#endif path_buffer = error_path(dev); if (path_buffer == NULL) { @@ -175,7 +189,7 @@ goto fail; } - if (xenbus_write(NULL, path_buffer, "error", printf_buffer) != 0) { + if (xenbus_write(XBT_NIL, path_buffer, "error", printf_buffer) != 0) { printk("xenbus: failed to write error node for %s (%s)\n", dev->nodename, printf_buffer); goto fail; @@ -210,7 +224,7 @@ _dev_error(dev, err, fmt, ap); va_end(ap); - xenbus_switch_state(dev, NULL, XenbusStateClosing); + xenbus_switch_state(dev, XenbusStateClosing); } EXPORT_SYMBOL(xenbus_dev_fatal); @@ -264,7 +278,7 @@ { XenbusState result; - int err = xenbus_gather(NULL, path, "state", "%d", &result, NULL); + int err = xenbus_gather(XBT_NIL, path, "state", "%d", &result, NULL); if (err) result = XenbusStateClosed; ==== //depot/projects/xen31/sys/xen/xenbus/xenbus_comms.c#4 (text+ko) ==== @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -116,15 +117,18 @@ cons = intf->req_cons; prod = intf->req_prod; mb(); - if (!check_indexes(cons, prod)) - return -EIO; + if (!check_indexes(cons, prod)) { + intf->req_cons = intf->req_prod = 0; + return -EIO; + } dst = get_output_chunk(cons, prod, intf->req, &avail); if (avail == 0) continue; if (avail > len) avail = len; - + mb(); + memcpy(dst, data, avail); data += avail; len -= avail; @@ -140,6 +144,20 @@ return 0; } +#ifdef notyet +int xb_data_to_read(void) +{ + struct xenstore_domain_interface *intf = xen_store_interface; + return (intf->rsp_cons != intf->rsp_prod); +} + +int xb_wait_for_data_to_read(void) +{ + return wait_event_interruptible(xb_waitq, xb_data_to_read()); +} +#endif + + int xb_read(void *tdata, unsigned len) { struct xenstore_domain_interface *intf = xenstore_domain_interface(); @@ -156,10 +174,11 @@ /* Read indexes, then verify. */ cons = intf->rsp_cons; prod = intf->rsp_prod; - mb(); - if (!check_indexes(cons, prod)) + if (!check_indexes(cons, prod)) { + intf->rsp_cons = intf->rsp_prod = 0; return -EIO; - + } + src = get_input_chunk(cons, prod, intf->rsp, &avail); if (avail == 0) continue; @@ -189,15 +208,24 @@ /* Set up interrupt handler off store event channel. */ int xb_init_comms(void) { + struct xenstore_domain_interface *intf = xenstore_domain_interface(); int err; + if (intf->rsp_prod != intf->rsp_cons) { + log(LOG_WARNING, "XENBUS response ring is not quiescent " + "(%08x:%08x): fixing up\n", + intf->rsp_cons, intf->rsp_prod); + intf->rsp_cons = intf->rsp_prod; + } + if (xenbus_irq) unbind_from_irqhandler(xenbus_irq, &xb_waitq); err = bind_caller_port_to_irqhandler( - xen_start_info->store_evtchn, "xenbus", wake_waiting, NULL, INTR_TYPE_NET, NULL); + xen_start_info->store_evtchn, + "xenbus", wake_waiting, NULL, INTR_TYPE_NET, NULL); if (err <= 0) { - printk("XENBUS request irq failed %i\n", err); + log(LOG_WARNING, "XENBUS request irq failed %i\n", err); return err; } ==== //depot/projects/xen31/sys/xen/xenbus/xenbus_comms.h#3 (text+ko) ==== @@ -82,6 +82,65 @@ (type *)( (char *)__mptr - offsetof(type,member) );}) +/* + * XXX + * + */ + +#define GFP_KERNEL 1 +#define EXPORT_SYMBOL(x) +#define kmalloc(size, unused) malloc(size, M_DEVBUF, M_WAITOK) +#define kfree(ptr) free((void *)(uintptr_t)ptr, M_DEVBUF) +#define BUG_ON PANIC_IF +#define semaphore sema +#define rw_semaphore sema +typedef struct mtx spinlock_t; +#define spin_lock mtx_lock +#define spin_unlock mtx_unlock +#define DEFINE_SPINLOCK(lock) struct mtx lock +#define DECLARE_MUTEX(lock) struct sema lock +#define u32 uint32_t +#define list_del(head, ent) TAILQ_REMOVE(head, ent, list) +#define simple_strtoul strtoul +#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) +#define list_empty TAILQ_EMPTY +#define wake_up wakeup +#define BUS_ID_SIZE 128 + +struct xen_bus_type +{ + char *root; + unsigned int levels; + int (*get_bus_id)(char bus_id[BUS_ID_SIZE], const char *nodename); + int (*probe)(const char *type, const char *dir); + struct xendev_list_head *bus; + int error; +#if 0 + struct bus_type bus; + struct device dev; +#endif +}; + + +extern void xenbus_backend_probe_and_watch(void); +int xenbus_probe_node(struct xen_bus_type *bus, const char *type, + const char *nodename); +int xenbus_probe_devices(struct xen_bus_type *bus); + +int xenbus_register_driver_common(struct xenbus_driver *drv, + struct xen_bus_type *bus); + +void dev_changed(const char *node, struct xen_bus_type *bus); + +int +read_otherend_details(struct xenbus_device *xendev, char *id_node, + char *path_node); + +char *kasprintf(const char *fmt, ...); + + + + #endif /* _XENBUS_COMMS_H */ /* ==== //depot/projects/xen31/sys/xen/xenbus/xenbus_dev.c#3 (text+ko) ==== @@ -42,20 +42,18 @@ #include -#include - #include #include #include +#include -#define EXPORT_SYMBOL(x) + + #define kmalloc(size, unused) malloc(size, M_DEVBUF, M_WAITOK) -#define kfree(ptr) free(ptr, M_DEVBUF) #define BUG_ON PANIC_IF #define semaphore sema #define rw_semaphore sema -typedef struct mtx spinlock_t; #define spin_lock mtx_lock #define spin_unlock mtx_unlock #define DEFINE_SPINLOCK(lock) struct mtx lock @@ -65,7 +63,7 @@ struct xenbus_dev_transaction { LIST_ENTRY(xenbus_dev_transaction) list; - struct xenbus_transaction *handle; + struct xenbus_transaction handle; }; struct xenbus_dev_data { @@ -131,10 +129,10 @@ int len = uio->uio_iov[0].iov_len; if ((len + u->len) > sizeof(u->u.buffer)) - return -EINVAL; + return EINVAL; if (copyin(u->u.buffer + u->len, uio->uio_iov[0].iov_base, len) != 0) - return -EFAULT; + return EFAULT; u->len += len; if (u->len < (sizeof(u->u.msg) + u->u.msg.len)) @@ -158,14 +156,13 @@ } else { if (u->u.msg.type == XS_TRANSACTION_START) { trans = kmalloc(sizeof(*trans), GFP_KERNEL); - trans->handle = (struct xenbus_transaction *) - simple_strtoul(reply, NULL, 0); + trans->handle.id = simple_strtoul(reply, NULL, 0); LIST_INSERT_HEAD(&u->transactions, trans, list); } else if (u->u.msg.type == XS_TRANSACTION_END) { LIST_FOREACH(trans, &u->transactions, list) - if ((unsigned long)trans->handle == - (unsigned long)u->u.msg.tx_id) + if (trans->handle.id == + u->u.msg.tx_id) break; #if 0 /* XXX does this mean the list is empty? */ BUG_ON(&trans->list == &u->transactions); ==== //depot/projects/xen31/sys/xen/xenbus/xenbus_probe.c#4 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -57,27 +58,6 @@ #include -#define EXPORT_SYMBOL(x) -#define kmalloc(size, unused) malloc(size, M_DEVBUF, M_WAITOK) -#define kfree(ptr) free(ptr, M_DEVBUF) -#define BUG_ON PANIC_IF -#define semaphore sema -#define rw_semaphore sema -typedef struct mtx spinlock_t; -#define spin_lock mtx_lock -#define spin_unlock mtx_unlock -#define DEFINE_SPINLOCK(lock) struct mtx lock -#define DECLARE_MUTEX(lock) struct sema lock -#define u32 uint32_t -#define list_del(head, ent) TAILQ_REMOVE(head, ent, list) -#define simple_strtoul strtoul -#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) -#define list_empty TAILQ_EMPTY -#define wake_up wakeup -#define KERN_WARNING -#define BUS_ID_SIZE 128 - - struct xendev_list_head xenbus_device_frontend_list; struct xendev_list_head xenbus_device_backend_list; static LIST_HEAD(, xenbus_driver) xendrv_list; @@ -92,7 +72,6 @@ #define streq(a, b) (strcmp((a), (b)) == 0) -static char *kasprintf(const char *fmt, ...); static int watch_otherend(struct xenbus_device *dev); @@ -123,44 +102,47 @@ } #endif -struct xen_bus_type -{ - char *root; - unsigned int levels; - int (*get_bus_id)(char bus_id[BUS_ID_SIZE], const char *nodename); - int (*probe)(const char *type, const char *dir, int unit); - struct xendev_list_head *bus; -#if 0 - struct bus_type bus; - struct device dev; -#endif -}; - /* device// => - */ static int frontend_bus_id(char bus_id[BUS_ID_SIZE], const char *nodename) { nodename = strchr(nodename, '/'); if (!nodename || strlen(nodename + 1) >= BUS_ID_SIZE) { - printk(KERN_WARNING "XENBUS: bad frontend %s\n", nodename); - return EINVAL; + log(LOG_WARNING, "XENBUS: bad frontend %s\n", nodename); + return -EINVAL; } strlcpy(bus_id, nodename + 1, BUS_ID_SIZE); if (!strchr(bus_id, '/')) { - printk(KERN_WARNING "XENBUS: bus_id %s no slash\n", bus_id); - return EINVAL; + log(LOG_WARNING, "XENBUS: bus_id %s no slash\n", bus_id); + return -EINVAL; } *strchr(bus_id, '/') = '-'; return 0; } -static int +static void free_otherend_details(struct xenbus_device *dev) +{ + kfree((void*)(uintptr_t)dev->otherend); + dev->otherend = NULL; +} + + +static void free_otherend_watch(struct xenbus_device *dev) +{ + if (dev->otherend_watch.node) { + unregister_xenbus_watch(&dev->otherend_watch); + kfree(dev->otherend_watch.node); + dev->otherend_watch.node = NULL; + } +} + +int read_otherend_details(struct xenbus_device *xendev, char *id_node, char *path_node) { - int err = xenbus_gather(NULL, xendev->nodename, + int err = xenbus_gather(XBT_NIL, xendev->nodename, id_node, "%i", &xendev->otherend_id, path_node, NULL, &xendev->otherend, NULL); @@ -171,12 +153,12 @@ return err; } if (strlen(xendev->otherend) == 0 || - !xenbus_exists(NULL, xendev->otherend, "")) { - xenbus_dev_fatal(xendev, ENOENT, "missing other end from %s", + !xenbus_exists(XBT_NIL, xendev->otherend, "")) { + xenbus_dev_fatal(xendev, -ENOENT, "missing other end from %s", xendev->nodename); - kfree(xendev->otherend); + kfree((void *)(uintptr_t)xendev->otherend); xendev->otherend = NULL; - return ENOENT; + return -ENOENT; } return 0; @@ -185,95 +167,21 @@ static int read_backend_details(struct xenbus_device *xendev) { - if (!strncmp(xendev->nodename, "backend", 7)) - return -ENOENT; return read_otherend_details(xendev, "backend-id", "backend"); } - +#ifdef notyet +/* XXX - move to probe backend */ static int read_frontend_details(struct xenbus_device *xendev) { if (strncmp(xendev->nodename, "backend", 7)) return -ENOENT; return read_otherend_details(xendev, "frontend-id", "frontend"); } - -static int watch_otherend_backend(struct xenbus_device *dev) -{ - struct xenbus_transaction *xbt; - - /* We need to add the hotplug-status because we don't */ - /* have a hotplug script to do this. If we ever do, */ - /* this can be removed -- WORK */ - xbt = xenbus_transaction_start(); - xenbus_printf(xbt, dev->nodename, "hotplug-status","%s","connected"); - xenbus_transaction_end(xbt, 0); +#endif - return watch_otherend(dev); -} - -static int watch_otherend_frontend(struct xenbus_device *dev) -{ - return watch_otherend(dev); -} - -/* We need to remove the backend device node from the xenbus */ -/* because we don't have a hotplug script to do this. If we */ -/* ever do, this can be removed -- WORK */ -static int -xenbus_cleanup_backend_device(struct xenbus_device *dev) -{ - char *node, **dir; - unsigned int dir_n; - int i; - - i = strlen(dev->nodename); - if (!i) - return 0; - - node = malloc(i+1, M_DEVBUF, M_WAITOK); - if (!node) - return ENOMEM; - strcpy(node, dev->nodename); -again: - DPRINTK("removing %s\n", node); - if (!xenbus_rm(NULL, node, "")) { - while (i > 7) { - if (node[i] == '/') { - node[i] = '\0'; - dir = xenbus_directory(NULL, node, "", &dir_n); - if (!IS_ERR(dir)) { - kfree(dir); - if (dir_n == 0) - goto again; - } - break; - } - i--; - } - } - free(node, M_DEVBUF); - return 0; -} - -static void free_otherend_details(struct xenbus_device *dev) -{ - kfree(dev->otherend); - dev->otherend = NULL; -} - - -static void free_otherend_watch(struct xenbus_device *dev) -{ - if (dev->otherend_watch.node) { - unregister_xenbus_watch(&dev->otherend_watch); - kfree(dev->otherend_watch.node); - dev->otherend_watch.node = NULL; - } -} - /* Bus type for frontend drivers. */ -static int xenbus_probe_frontend(const char *type, const char *name, int unit); +static int xenbus_probe_frontend(const char *type, const char *name); static struct xen_bus_type xenbus_frontend = { .root = "device", .levels = 2, /* device/type/ */ @@ -292,44 +200,6 @@ #endif }; -/* backend/// => -- */ -static int backend_bus_id(char bus_id[BUS_ID_SIZE], const char *nodename) -{ - int domid, err; - const char *devid, *type; - char *frontend; - unsigned int typelen; - - type = strchr(nodename, '/'); - if (!type) - return EINVAL; - type++; - typelen = strcspn(type, "/"); - if (!typelen || type[typelen] != '/') - return EINVAL; - - devid = strrchr(nodename, '/') + 1; - - err = xenbus_gather(NULL, nodename, "frontend-id", "%i", &domid, - "frontend", NULL, &frontend, NULL); - if (err) - return err; - if (strlen(frontend) == 0) - err = ERANGE; - - if (!err && !xenbus_exists(NULL, frontend, "")) - err = ENOENT; - - if (err) { - kfree(frontend); - return err; - } - - if (snprintf(bus_id, BUS_ID_SIZE, - "%.*s-%i-%s", typelen, type, domid, devid) >= BUS_ID_SIZE) - return ENOSPC; - return 0; -} #if 0 static int xenbus_hotplug_backend(device_t dev, char **envp, int num_envp, char *buffer, int buffer_size) @@ -346,11 +216,11 @@ DPRINTK(""); if (dev == NULL) - return ENODEV; + return -ENODEV; xdev = to_xenbus_device(dev); if (xdev == NULL) - return ENODEV; + return -ENODEV; if (dev->driver) drv = to_xenbus_driver(dev->driver); @@ -398,6 +268,7 @@ } #endif +#if 0 static int xenbus_probe_backend(const char *type, const char *domid, int unit); static struct xen_bus_type xenbus_backend = { .root = "backend", @@ -417,8 +288,8 @@ }, #endif }; +#endif - static void otherend_changed(struct xenbus_watch *watch, const char **vec, unsigned int len) { @@ -439,6 +310,22 @@ DPRINTK("state is %d, %s, %s", state, dev->otherend_watch.node, vec[XS_WATCH_PATH]); + + /* + * Ignore xenbus transitions during shutdown. This prevents us doing + * work that can fail e.g., when the rootfs is gone. + */ +#if 0 + if (system_state > SYSTEM_RUNNING) { + struct xen_bus_type *bus = bus; + bus = container_of(dev->dev.bus, struct xen_bus_type, bus); + /* If we're frontend, drive the state machine to Closed. */ + /* This should cause the backend to release our resources. */ + if ((bus == &xenbus_frontend) && (state == XenbusStateClosing)) + xenbus_frontend_closed(dev); + return; + } +#endif if (drv->otherend_changed) drv->otherend_changed(dev, state); @@ -485,7 +372,7 @@ err = talk_to_otherend(dev); if (err) { - printk(KERN_WARNING + log(LOG_WARNING, "xenbus_probe: talk_to_otherend on %s failed.\n", dev->nodename); return err; @@ -495,9 +382,9 @@ if (err) goto fail; - err = drv->watch_otherend(dev); + err = watch_otherend(dev); if (err) { - printk(KERN_WARNING + log(LOG_WARNING, "xenbus_probe: watch_otherend on %s failed.\n", dev->nodename); return err; @@ -506,8 +393,8 @@ return 0; fail: xenbus_dev_error(dev, err, "xenbus_dev_probe on %s", dev->nodename); - xenbus_switch_state(dev, NULL, XenbusStateClosed); - return ENODEV; + xenbus_switch_state(dev, XenbusStateClosed); + return -ENODEV; } static void xenbus_dev_free(struct xenbus_device *xendev) @@ -529,7 +416,7 @@ if (drv->remove) drv->remove(dev); - xenbus_switch_state(dev, NULL, XenbusStateClosed); + xenbus_switch_state(dev, XenbusStateClosed); if (drv->cleanup_device) return drv->cleanup_device(dev); @@ -547,7 +434,7 @@ } #endif -static int xenbus_register_driver_common(struct xenbus_driver *drv, +int xenbus_register_driver_common(struct xenbus_driver *drv, struct xen_bus_type *bus) { struct xenbus_device *xdev; @@ -581,22 +468,11 @@ int xenbus_register_frontend(struct xenbus_driver *drv) { drv->read_otherend_details = read_backend_details; - drv->watch_otherend = watch_otherend_frontend; - drv->cleanup_device = NULL; return xenbus_register_driver_common(drv, &xenbus_frontend); } EXPORT_SYMBOL(xenbus_register_frontend); -int xenbus_register_backend(struct xenbus_driver *drv) -{ - drv->read_otherend_details = read_frontend_details; - drv->watch_otherend = watch_otherend_backend; - drv->cleanup_device = xenbus_cleanup_backend_device; - - return xenbus_register_driver_common(drv, &xenbus_backend); -} -EXPORT_SYMBOL(xenbus_register_backend); void xenbus_unregister_driver(struct xenbus_driver *drv) { @@ -672,7 +548,7 @@ } #endif /* Simplified asprintf. */ -static char *kasprintf(const char *fmt, ...) +char *kasprintf(const char *fmt, ...) { va_list ap; unsigned int len; @@ -706,8 +582,8 @@ DEVICE_ATTR(devtype, S_IRUSR | S_IRGRP | S_IROTH, xendev_show_devtype, NULL); #endif -static int xenbus_probe_node(struct xen_bus_type *bus, const char *type, - const char *nodename, int unit) +int xenbus_probe_node(struct xen_bus_type *bus, const char *type, + const char *nodename) { #define CHECK_FAIL \ do { \ @@ -734,7 +610,7 @@ stringlen = strlen(nodename) + 1 + strlen(type) + 1; xendev = kmalloc(sizeof(*xendev) + stringlen, GFP_KERNEL); if (!xendev) - return ENOMEM; + return -ENOMEM; memset(xendev, 0, sizeof(*xendev)); /* Copy the strings into the extra space. */ @@ -785,70 +661,22 @@ } /* device// */ -static int xenbus_probe_frontend(const char *type, const char *name, int unit) +static int xenbus_probe_frontend(const char *type, const char *name) { char *nodename; int err; nodename = kasprintf("%s/%s/%s", xenbus_frontend.root, type, name); if (!nodename) - return ENOMEM; + return -ENOMEM; DPRINTK("%s", nodename); - err = xenbus_probe_node(&xenbus_frontend, type, nodename, unit); + err = xenbus_probe_node(&xenbus_frontend, type, nodename); kfree(nodename); return err; } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 31 07:17:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B371816A4FF; Mon, 31 Dec 2007 07:17:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3778716A417 for ; Mon, 31 Dec 2007 07:17:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0F0C213C447 for ; Mon, 31 Dec 2007 07:17:48 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV7HlYH033862 for ; Mon, 31 Dec 2007 07:17:47 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV7Hlq8033859 for perforce@freebsd.org; Mon, 31 Dec 2007 07:17:47 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 31 Dec 2007 07:17:47 GMT Message-Id: <200712310717.lBV7Hlq8033859@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132156 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 07:17:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=132156 Change 132156 by kmacy@pandemonium:kmacy:xen31 on 2007/12/31 07:17:36 build probe backend code Affected files ... .. //depot/projects/xen31/sys/conf/files#12 edit Differences ... ==== //depot/projects/xen31/sys/conf/files#12 (text+ko) ==== @@ -2116,6 +2116,7 @@ xen/xenbus/xenbus_comms.c optional xen xen/xenbus/xenbus_dev.c optional xen xen/xenbus/xenbus_probe.c optional xen +xen/xenbus/xenbus_probe_backend.c optional xen xen/xenbus/xenbus_xs.c optional xen dev/xen/console/console.c optional xen dev/xen/console/xencons_ring.c optional xen From owner-p4-projects@FreeBSD.ORG Mon Dec 31 07:18:51 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9C9B16A469; Mon, 31 Dec 2007 07:18:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9F1F416A417 for ; Mon, 31 Dec 2007 07:18:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8E73313C45A for ; Mon, 31 Dec 2007 07:18:50 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV7In9q033907 for ; Mon, 31 Dec 2007 07:18:49 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV7InCN033904 for perforce@freebsd.org; Mon, 31 Dec 2007 07:18:49 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 31 Dec 2007 07:18:49 GMT Message-Id: <200712310718.lBV7InCN033904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132157 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 07:18:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=132157 Change 132157 by kmacy@pandemonium:kmacy:xen31 on 2007/12/31 07:18:47 update to newer evtchn interface sync up somewhat with linux implementation Affected files ... .. //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#5 edit .. //depot/projects/xen31/sys/dev/xen/blkfront/block.h#2 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/blkfront/blkfront.c#5 (text+ko) ==== @@ -89,7 +89,7 @@ static char *blkif_state_name[] = { [BLKIF_STATE_DISCONNECTED] = "disconnected", [BLKIF_STATE_CONNECTED] = "connected", - [BLKIF_STATE_SUSPENDED] = "closed", + [BLKIF_STATE_SUSPENDED] = "closed", }; static char * blkif_status_name[] = { @@ -238,14 +238,14 @@ struct blkfront_info *info; /* FIXME: Use dynamic device id if this is not set. */ - err = xenbus_scanf(NULL, dev->nodename, + err = xenbus_scanf(XBT_NIL, dev->nodename, "virtual-device", "%i", &vdevice); if (err != 1) { xenbus_dev_fatal(dev, err, "reading virtual-device"); return err; } - info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT); + info = malloc(sizeof(*info), M_DEVBUF, M_NOWAIT|M_ZERO); if (info == NULL) { xenbus_dev_fatal(dev, ENOMEM, "allocating info structure"); return ENOMEM; @@ -253,26 +253,20 @@ info->xbdev = dev; info->vdevice = vdevice; info->connected = BLKIF_STATE_DISCONNECTED; - info->mi = NULL; - info->gd = NULL; /* work queue needed ? */ - info->shadow_free = 0; - memset(info->shadow, 0, sizeof(info->shadow)); for (i = 0; i < BLK_RING_SIZE; i++) info->shadow[i].req.id = i+1; info->shadow[BLK_RING_SIZE-1].req.id = 0x0fffffff; - info->users = 0; - /* Front end dir is a number, which is used as the id. */ info->handle = strtoul(strrchr(dev->nodename,'/')+1, NULL, 0); - dev->data = info; + dev->dev_driver_data = info; err = talk_to_backend(dev, info); if (err) { free(info, M_DEVBUF); - dev->data = NULL; + dev->dev_driver_data = NULL; return err; } @@ -282,7 +276,7 @@ static int blkfront_resume(struct xenbus_device *dev) { - struct blkfront_info *info = dev->data; + struct blkfront_info *info = dev->dev_driver_data; int err; DPRINTK("blkfront_resume: %s\n", dev->nodename); @@ -301,7 +295,7 @@ struct blkfront_info *info) { const char *message = NULL; - struct xenbus_transaction *xbt; + struct xenbus_transaction xbt; int err; /* Create shared ring, alloc event channel. */ @@ -310,8 +304,8 @@ goto out; again: - xbt = xenbus_transaction_start(); - if (IS_ERR(xbt)) { + err = xenbus_transaction_start(&xbt); + if (err) { xenbus_dev_fatal(dev, err, "starting transaction"); goto destroy_blkring; } @@ -323,17 +317,12 @@ goto abort_transaction; } err = xenbus_printf(xbt, dev->nodename, - "event-channel", "%u", info->evtchn); + "event-channel", "%u", irq_to_evtchn_port(info->irq)); if (err) { message = "writing event-channel"; goto abort_transaction; } - err = xenbus_switch_state(dev, xbt, XenbusStateInitialised); - if (err) { - goto abort_transaction; - } - err = xenbus_transaction_end(xbt, 0); if (err) { if (err == -EAGAIN) @@ -341,7 +330,8 @@ xenbus_dev_fatal(dev, err, "completing transaction"); goto destroy_blkring; } - + xenbus_switch_state(dev, XenbusStateInitialised); + return 0; abort_transaction: @@ -377,7 +367,7 @@ goto fail; } info->ring_ref = err; - + err = bind_listening_port_to_irqhandler(dev->otherend_id, "xbd", (driver_intr_t *)blkif_int, info, INTR_TYPE_BIO | INTR_MPSAFE, NULL); @@ -401,7 +391,7 @@ static void backend_changed(struct xenbus_device *dev, XenbusState backend_state) { - struct blkfront_info *info = dev->data; + struct blkfront_info *info = dev->dev_driver_data; DPRINTK("blkfront:backend_changed.\n"); @@ -457,7 +447,7 @@ DPRINTK("blkfront.c:connect:%s.\n", info->xbdev->otherend); - err = xenbus_gather(NULL, info->xbdev->otherend, + err = xenbus_gather(XBT_NIL, info->xbdev->otherend, "sectors", "%lu", §ors, "info", "%u", &binfo, "sector-size", "%lu", §or_size, @@ -468,10 +458,15 @@ info->xbdev->otherend); return; } + err = xenbus_gather(XBT_NIL, info->xbdev->otherend, + "feature-barrier", "%lu", &info->feature_barrier, + NULL); + if (err) + info->feature_barrier = 0; - xlvbd_add(sectors, info->vdevice, binfo, sector_size, info); + xlvbd_add(sectors, info->vdevice, binfo, sector_size, info); - (void)xenbus_switch_state(info->xbdev, NULL, XenbusStateConnected); + (void)xenbus_switch_state(info->xbdev, XenbusStateConnected); /* Kick pending requests. */ mtx_lock(&blkif_io_lock); @@ -492,7 +487,7 @@ */ static void blkfront_closing(struct xenbus_device *dev) { - struct blkfront_info *info = dev->data; + struct blkfront_info *info = dev->dev_driver_data; DPRINTK("blkfront_closing: %s removed\n", dev->nodename); @@ -502,13 +497,13 @@ info->mi = NULL; } - xenbus_switch_state(dev, NULL, XenbusStateClosed); + xenbus_switch_state(dev, XenbusStateClosed); } static int blkfront_remove(struct xenbus_device *dev) { - struct blkfront_info *info = dev->data; + struct blkfront_info *info = dev->dev_driver_data; DPRINTK("blkfront_remove: %s removed\n", dev->nodename); @@ -893,7 +888,7 @@ } if (info->irq) unbind_from_irqhandler(info->irq, info); - info->evtchn = info->irq = 0; + info->irq = 0; } @@ -955,7 +950,7 @@ free(copy, M_DEVBUF); - (void)xenbus_switch_state(info->xbdev, NULL, XenbusStateConnected); + xenbus_switch_state(info->xbdev, XenbusStateConnected); /* Now safe for us to use the shared ring */ mtx_lock(&blkif_io_lock); @@ -971,6 +966,14 @@ mtx_unlock(&blkif_io_lock); } +static int +blkfront_is_ready(struct xenbus_device *dev) +{ + struct blkfront_info *info = dev->dev_driver_data; + + return info->is_ready; +} + static struct xenbus_device_id blkfront_ids[] = { { "vbd" }, { "" } @@ -984,6 +987,7 @@ .remove = blkfront_remove, .resume = blkfront_resume, .otherend_changed = backend_changed, + .is_ready = blkfront_is_ready, }; ==== //depot/projects/xen31/sys/dev/xen/blkfront/block.h#2 (text+ko) ==== @@ -53,7 +53,7 @@ int connected; int ring_ref; blkif_front_ring_t ring; - unsigned int evtchn, irq; + unsigned int irq; struct xlbd_major_info *mi; #if 0 request_queue_t *rq; @@ -63,6 +63,8 @@ struct blk_shadow shadow[BLK_RING_SIZE]; unsigned long shadow_free; struct xb_softc *sc; + int feature_barrier; + int is_ready; /** * The number of people holding this device open. We won't allow a * hot-unplug unless this is 0. From owner-p4-projects@FreeBSD.ORG Mon Dec 31 07:20:52 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 819C716A468; Mon, 31 Dec 2007 07:20:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4754116A418 for ; Mon, 31 Dec 2007 07:20:52 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE03F13C461 for ; Mon, 31 Dec 2007 07:20:51 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV7Kpnl034289 for ; Mon, 31 Dec 2007 07:20:51 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV7Kped034286 for perforce@freebsd.org; Mon, 31 Dec 2007 07:20:51 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 31 Dec 2007 07:20:51 GMT Message-Id: <200712310720.lBV7Kped034286@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132158 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 07:20:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=132158 Change 132158 by kmacy@pandemonium:kmacy:xen31 on 2007/12/31 07:20:04 use updated xenbus interface Affected files ... .. //depot/projects/xen31/sys/i386/xen/xen_machdep.c#10 edit Differences ... ==== //depot/projects/xen31/sys/i386/xen/xen_machdep.c#10 (text+ko) ==== @@ -969,15 +969,15 @@ const char **vec, unsigned int len) { char *str; - struct xenbus_transaction *xbt; + struct xenbus_transaction xbt; int err, howto; struct reboot_args uap; howto = 0; again: - xbt = xenbus_transaction_start(); - if (IS_ERR(xbt)) + err = xenbus_transaction_start(&xbt); + if (err) return; str = (char *)xenbus_read(xbt, "control", "shutdown", NULL); /* Ignore read errors and empty reads. */ From owner-p4-projects@FreeBSD.ORG Mon Dec 31 07:22:54 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 925F616A420; Mon, 31 Dec 2007 07:22:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5746216A418 for ; Mon, 31 Dec 2007 07:22:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4698E13C448 for ; Mon, 31 Dec 2007 07:22:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV7Mr5I035114 for ; Mon, 31 Dec 2007 07:22:53 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV7MrDp035110 for perforce@freebsd.org; Mon, 31 Dec 2007 07:22:53 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 31 Dec 2007 07:22:53 GMT Message-Id: <200712310722.lBV7MrDp035110@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132159 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 07:22:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=132159 Change 132159 by kmacy@pandemonium:kmacy:xen31 on 2007/12/31 07:22:14 make interrupts work by having find_unbound_irq look at the dynirq range only register pic template on demand for devices Affected files ... .. //depot/projects/xen31/sys/i386/include/xen/evtchn.h#4 edit .. //depot/projects/xen31/sys/xen/evtchn/evtchn.c#4 edit Differences ... ==== //depot/projects/xen31/sys/i386/include/xen/evtchn.h#4 (text+ko) ==== @@ -56,6 +56,8 @@ void unmask_evtchn(int port); + + static inline void clear_evtchn(int port) { @@ -71,6 +73,13 @@ } /* + * Use these to access the event channel underlying the IRQ handle returned + * by bind_*_to_irqhandler(). + */ +int irq_to_evtchn_port(int irq); + + +/* * CHARACTER-DEVICE DEFINITIONS */ ==== //depot/projects/xen31/sys/xen/evtchn/evtchn.c#4 (text+ko) ==== @@ -219,16 +219,18 @@ static int find_unbound_irq(void) { - int irq; - - for (irq = 0; irq < NR_IRQS; irq++) + int dynirq, irq; + + for (dynirq = 0; dynirq < NR_IRQS; dynirq++) { + irq = dynirq_to_irq(dynirq); if (irq_bindcount[irq] == 0) break; - + } + if (irq == NR_IRQS) panic("No available IRQ to bind to: increase NR_IRQS!\n"); - return irq; + return (irq); } static int @@ -509,6 +511,7 @@ int retval; irq = bind_ipi_to_irq(ipi, cpu); + intr_register_source(&xp->xp_pins[irq].xp_intsrc); retval = intr_add_handler(devname, irq, NULL, handler, NULL, irqflags, NULL); if (retval != 0) { unbind_from_irq(irq); @@ -718,8 +721,8 @@ TODO; } - -void notify_remote_via_irq(int irq) +void +notify_remote_via_irq(int irq) { int evtchn = evtchn_from_irq(irq); @@ -877,6 +880,12 @@ mtx_unlock_spin(&irq_mapping_update_lock); } +int +irq_to_evtchn_port(int irq) +{ + return evtchn_from_irq(irq); +} + void mask_evtchn(int port) { @@ -1041,7 +1050,6 @@ tpin->xp_intsrc.is_pic = xp->xp_dynirq_pic; tpin->xp_vector = dynirq_to_irq(i); - intr_register_source(&tpin->xp_intsrc); } /* * Now, we go ahead and claim every PIRQ there is. @@ -1061,7 +1069,6 @@ tpin->xp_intsrc.is_pic = xp->xp_pirq_pic; tpin->xp_vector = pirq_to_irq(i); - intr_register_source(&tpin->xp_intsrc); } } From owner-p4-projects@FreeBSD.ORG Mon Dec 31 07:22:55 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED35416A513; Mon, 31 Dec 2007 07:22:54 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6639716A41A for ; Mon, 31 Dec 2007 07:22:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5667313C44B for ; Mon, 31 Dec 2007 07:22:54 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBV7MsT2035124 for ; Mon, 31 Dec 2007 07:22:54 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBV7MsTa035120 for perforce@freebsd.org; Mon, 31 Dec 2007 07:22:54 GMT (envelope-from kmacy@freebsd.org) Date: Mon, 31 Dec 2007 07:22:54 GMT Message-Id: <200712310722.lBV7MsTa035120@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 132160 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 07:22:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=132160 Change 132160 by kmacy@pandemonium:kmacy:xen31 on 2007/12/31 07:22:44 make console input polling work for the first time ever so that ddb and the mountroot prompt will behave correctly Affected files ... .. //depot/projects/xen31/sys/dev/xen/console/console.c#4 edit .. //depot/projects/xen31/sys/dev/xen/console/xencons_ring.c#4 edit .. //depot/projects/xen31/sys/dev/xen/console/xencons_ring.h#2 edit Differences ... ==== //depot/projects/xen31/sys/dev/xen/console/console.c#4 (text+ko) ==== @@ -146,6 +146,9 @@ xccncheckc(struct consdev *dev) { int ret = (xc_mute ? 0 : -1); + if (xencons_has_input()) + xencons_handle_input(NULL); + CN_LOCK(cn_mtx); if ((rp - rc)) { /* we need to return only one char */ ==== //depot/projects/xen31/sys/dev/xen/console/xencons_ring.c#4 (text+ko) ==== @@ -33,6 +33,18 @@ return (struct xencons_interface *)console_page; } + +int +xencons_has_input(void) +{ + struct xencons_interface *intf; + + intf = xencons_interface(); + + return (intf->in_cons != intf->in_prod); +} + + int xencons_ring_send(const char *data, unsigned len) { @@ -63,8 +75,8 @@ static xencons_receiver_func *xencons_receiver; -static void -handle_input(void *unused) +void +xencons_handle_input(void *unused) { struct xencons_interface *intf; XENCONS_RING_IDX cons, prod; @@ -74,6 +86,7 @@ cons = intf->in_cons; prod = intf->in_prod; + /* XXX needs locking */ while (cons != prod) { xencons_rx(intf->in + MASK_XENCONS_IDX(cons, intf->in), 1); cons++; @@ -102,7 +115,7 @@ return 0; err = bind_caller_port_to_irqhandler(xen_start_info->console_evtchn, - "xencons", handle_input, NULL, + "xencons", xencons_handle_input, NULL, INTR_TYPE_MISC | INTR_MPSAFE, NULL); if (err) { XENPRINTF("XEN console request irq failed %i\n", err); ==== //depot/projects/xen31/sys/dev/xen/console/xencons_ring.h#2 (text+ko) ==== @@ -10,4 +10,7 @@ typedef void (xencons_receiver_func)(char *buf, unsigned len); void xencons_ring_register_receiver(xencons_receiver_func *f); +void xencons_handle_input(void *unused); +int xencons_has_input(void); + #endif /* _XENCONS_RING_H */ From owner-p4-projects@FreeBSD.ORG Mon Dec 31 22:39:49 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DD3A16A46C; Mon, 31 Dec 2007 22:39: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 C56EE16A420 for ; Mon, 31 Dec 2007 22:39:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B12D713C478 for ; Mon, 31 Dec 2007 22:39:48 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBVMdmYQ097687 for ; Mon, 31 Dec 2007 22:39:48 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBVMdgOB097683 for perforce@freebsd.org; Mon, 31 Dec 2007 22:39:42 GMT (envelope-from jb@freebsd.org) Date: Mon, 31 Dec 2007 22:39:42 GMT Message-Id: <200712312239.lBVMdgOB097683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 132207 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 31 Dec 2007 22:39:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=132207 Change 132207 by jb@jb_freebsd1 on 2007/12/31 22:39:30 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#56 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/fdp-primer/sgml-primer/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/basics/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#6 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#4 integrate .. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#5 integrate .. //depot/projects/dtrace/doc/ja_JP.eucJP/man/man8/Makefile#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/advanced-networking/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/audit/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/basics/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/config/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/desktop/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/disks/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/geom/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/install/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/mirrors/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/network-servers/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/mn_MN.UTF-8/books/handbook/ports/chapter.sgml#2 integrate .. //depot/projects/dtrace/doc/nl_NL.ISO8859-1/books/handbook/firewalls/chapter.sgml#3 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/advanced-networking/chapter.sgml#14 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/basics/chapter.sgml#15 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/config/chapter.sgml#13 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/desktop/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/disks/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/firewalls/chapter.sgml#12 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/geom/chapter.sgml#10 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/ports/chapter.sgml#11 integrate .. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/serialcomms/chapter.sgml#9 integrate .. //depot/projects/dtrace/ports/COPYRIGHT#4 integrate .. //depot/projects/dtrace/ports/UPDATING#43 integrate .. //depot/projects/dtrace/src/contrib/cvs/src/filesubr.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/dtrace/src/contrib/ncurses/INSTALL#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/MANIFEST#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/NEWS#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/TO-DO#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/aclocal.m4#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/config.guess#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/config.sub#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/configure#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/configure.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/dist.mk#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/doc/hackguide.doc#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/doc/html/ncurses-intro.html#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/doc/ncurses-intro.doc#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_def.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_dup.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_ftlink.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_link.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fld_newftyp.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_def.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/frm_driver.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_alnum.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_alpha.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_enum.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_int.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_num.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/fty_regex.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/headers#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/form/modules#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/MKterm.h.awk.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/curses.h.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/curses.tail#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/curses.wide#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/headers#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/nc_alloc.h#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/ncurses_defs#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/ncurses_dll.h#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/include/tic.h#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/install-sh#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/captoinfo.1m#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/clear.1#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_add_wch.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_addch.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_attr.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_border.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_deleteln.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_extend.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_getcchar.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_getyx.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_insstr.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_legacy.3x#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_mouse.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_opaque.3x#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_outopts.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_printw.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_scanw.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_scr_dump.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_slk.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_termattrs.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_termcap.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_terminfo.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_trace.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/curs_util.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/default_colors.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_driver.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_new.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_opts.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_field_validation.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_hook.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/form_opts.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/infocmp.1m#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/infotocap.1m#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/legacy_coding.3x#2 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/man_db.renames#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_driver.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_hook.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/menu_opts.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/mitem_opts.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/ncurses.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/panel.3x#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/term.5#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/term.7#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/terminfo.head#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/terminfo.tail#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/tic.1m#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/toe.1m#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/tput.1#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/man/tset.1#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/headers#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/menu.h#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/menu/modules#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/ncurses-config.in#2 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/shlib#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/misc/terminfo.src#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/mk-1st.awk#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/mk-hdr.awk#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/mkdirs.sh#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/mkinstalldirs#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/MKkeyname.awk#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/MKlib_gen.sh#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/MKunctrl.awk#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/define_key.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/key_defined.c#2 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/keyok.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_addstr.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_color.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_delwin.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_freeall.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_getch.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_initscr.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_instr.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_mouse.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newterm.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_newwin.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_overlay.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_redrawln.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_refresh.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_restart.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_screen.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_set_term.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkinit.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_slkset.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_ungetch.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/lib_window.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/memmove.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/resizeterm.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/safe_sprintf.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/tries.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/use_window.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/base/wresize.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/curses.priv.h#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/llib-lncurses#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/llib-lncursesw#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/modules#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/MKcaptab.awk#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/MKcaptab.sh#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/MKcodes.awk#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/MKnames.awk#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/access.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/add_tries.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/comp_error.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/comp_hash.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/comp_parse.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/db_iterator.c#2 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/entries.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/home_terminfo.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/init_keytry.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_acs.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_data.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_options.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_raw.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_setup.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_termcap.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_tparm.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_tputs.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/make_keys.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/name_match.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/parse_entry.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/read_entry.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/setbuf.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/strings.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/trim_sgr0.c#2 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/use_screen.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tinfo/write_entry.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_trace.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_traceatr.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_tracebits.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_tracechr.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_tracedmp.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/lib_tracemse.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/trace_buf.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/trace_tries.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/varargs.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/trace/visbuf.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/hardscroll.c#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/hashmap.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_mvcur.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_tstp.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_twait.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/lib_vidattr.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/tty/tty_update.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_cchar.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_get_wch.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_in_wchnstr.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_key_name.c#1 branch .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_vid_attr.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/ncurses/widechar/lib_wunctrl.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/headers#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/panel/modules#4 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/Makefile.in#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/clear.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/dump_entry.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/infocmp.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/modules#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/progs.priv.h#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/tic.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/toe.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/tput.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/progs/tset.c#5 integrate .. //depot/projects/dtrace/src/contrib/ncurses/tack/COPYING#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/HISTORY#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/Makefile.in#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/README#4 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/ansi.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/charset.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/color.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/control.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/crum.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/edit.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/fun.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/init.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/menu.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/modes.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/modules#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/output.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/pad.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/scan.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/sync.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/sysdep.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/tack.1#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/tack.c#5 delete .. //depot/projects/dtrace/src/contrib/ncurses/tack/tack.h#5 delete .. //depot/projects/dtrace/src/games/fortune/datfiles/gerrold.limerick#4 integrate .. //depot/projects/dtrace/src/lib/libarchive/Makefile#9 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive.h.in#10 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry.h#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry_link_resolver.c#1 branch .. //depot/projects/dtrace/src/lib/libarchive/archive_entry_private.h#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_entry_strmode.c#1 branch .. //depot/projects/dtrace/src/lib/libarchive/archive_platform.h#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read.c#9 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_compression_none.c#10 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_all.c#6 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_ar.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_cpio.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_iso9660.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_mtree.c#1 branch .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_tar.c#11 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_read_support_format_zip.c#9 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_util.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_disk.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_compression_bzip2.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_compression_gzip.c#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_compression_none.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_cpio.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_pax.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/archive_write_set_format_ustar.c#8 integrate .. //depot/projects/dtrace/src/lib/libarchive/cpio.5#1 branch .. //depot/projects/dtrace/src/lib/libarchive/filter_fork.c#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/libarchive-formats.5#7 integrate .. //depot/projects/dtrace/src/lib/libarchive/libarchive_internals.3#2 integrate .. //depot/projects/dtrace/src/lib/libarchive/mtree.5#1 branch .. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#15 integrate .. //depot/projects/dtrace/src/lib/libkvm/kvm_file.c#5 integrate .. //depot/projects/dtrace/src/lib/ncurses/ncurses/Makefile#4 integrate .. //depot/projects/dtrace/src/lib/ncurses/ncurses/ncurses_cfg.h#3 integrate .. //depot/projects/dtrace/src/share/man/man4/ng_pppoe.4#7 integrate .. //depot/projects/dtrace/src/share/timedef/am_ET.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/be_BY.CP1131.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/be_BY.CP1251.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/be_BY.ISO8859-5.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/be_BY.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/bg_BG.CP1251.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/bg_BG.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ca_ES.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ca_ES.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/cs_CZ.ISO8859-2.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/cs_CZ.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/da_DK.ISO8859-1.src#5 integrate .. //depot/projects/dtrace/src/share/timedef/da_DK.UTF-8.src#5 integrate .. //depot/projects/dtrace/src/share/timedef/de_AT.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/de_AT.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/de_DE.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/de_DE.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/el_GR.ISO8859-7.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/el_GR.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/en_GB.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/en_US.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/es_ES.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/es_ES.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/et_EE.ISO8859-15.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/et_EE.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/eu_ES.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/fi_FI.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/fi_FI.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/fr_FR.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/fr_FR.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/he_IL.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/hi_IN.ISCII-DEV.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/hr_HR.ISO8859-2.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/hr_HR.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/hu_HU.ISO8859-2.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/hu_HU.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/hy_AM.ARMSCII-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/hy_AM.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/is_IS.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/is_IS.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/it_IT.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/it_IT.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ja_JP.SJIS.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ja_JP.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ja_JP.eucJP.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/kk_KZ.PT154.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/kk_KZ.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ko_KR.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ko_KR.eucKR.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/la_LN.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/lt_LT.ISO8859-13.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/lt_LT.ISO8859-4.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/lt_LT.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/mn_MN.UTF-8.src#3 integrate .. //depot/projects/dtrace/src/share/timedef/nl_NL.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/nn_NO.ISO8859-1.src#2 integrate .. //depot/projects/dtrace/src/share/timedef/nn_NO.UTF-8.src#2 integrate .. //depot/projects/dtrace/src/share/timedef/no_NO.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/no_NO.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/pl_PL.ISO8859-2.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/pl_PL.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/pt_BR.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/pt_BR.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/pt_PT.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/pt_PT.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ro_RO.ISO8859-2.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ro_RO.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ru_RU.CP1251.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ru_RU.CP866.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ru_RU.ISO8859-5.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ru_RU.KOI8-R.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/ru_RU.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/sk_SK.ISO8859-2.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/sk_SK.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/sl_SI.ISO8859-2.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/sl_SI.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/sr_YU.ISO8859-2.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/sr_YU.ISO8859-5.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/sr_YU.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/sv_SE.ISO8859-1.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/sv_SE.UTF-8.src#5 integrate .. //depot/projects/dtrace/src/share/timedef/tr_TR.ISO8859-9.src#5 integrate .. //depot/projects/dtrace/src/share/timedef/tr_TR.UTF-8.src#5 integrate .. //depot/projects/dtrace/src/share/timedef/uk_UA.CP1251.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/uk_UA.ISO8859-5.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/uk_UA.KOI8-U.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/uk_UA.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/zh_CN.GB18030.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/zh_CN.GB2312.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/zh_CN.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/zh_CN.eucCN.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/zh_TW.Big5.src#4 integrate .. //depot/projects/dtrace/src/share/timedef/zh_TW.UTF-8.src#4 integrate .. //depot/projects/dtrace/src/sys/amd64/conf/NOTES#14 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#11 integrate .. //depot/projects/dtrace/src/sys/compat/linux/linux_stats.c#10 integrate .. //depot/projects/dtrace/src/sys/compat/svr4/svr4_stream.c#9 integrate .. //depot/projects/dtrace/src/sys/conf/files#61 integrate .. //depot/projects/dtrace/src/sys/dev/acpica/acpi_thermal.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbd.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/atkbdc/atkbd_atkbdc.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ed/if_ed_pci.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/ed/if_ed_rtl80x9.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/fb/creator.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/fb/fb.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/fb/fbreg.h#5 integrate .. //depot/projects/dtrace/src/sys/dev/fb/machfb.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/fb/splash_bmp.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/fb/splash_pcx.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/fb/vga.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gem.c#9 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gem_pci.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gemreg.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/gem/if_gemvar.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/ichwd/ichwd.h#6 integrate .. //depot/projects/dtrace/src/sys/dev/kbd/kbd.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/kbd/kbdreg.h#4 integrate .. //depot/projects/dtrace/src/sys/dev/kbdmux/kbdmux.c#7 integrate .. //depot/projects/dtrace/src/sys/dev/le/am7990.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/le/am79900.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/streams/streams.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/blank/blank_saver.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/daemon/daemon_saver.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/dragon/dragon_saver.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/fade/fade_saver.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/fire/fire_saver.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/green/green_saver.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/logo/logo_saver.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/rain/rain_saver.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/scgfbrndr.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/scvgarndr.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/scvidctl.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/snake/snake_saver.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/star/star_saver.c#4 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/syscons.c#12 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/syscons/warp/warp_saver.c#5 integrate .. //depot/projects/dtrace/src/sys/dev/usb/ukbd.c#11 integrate .. //depot/projects/dtrace/src/sys/dev/vkbd/vkbd.c#5 integrate .. //depot/projects/dtrace/src/sys/fs/devfs/devfs_vnops.c#12 integrate .. //depot/projects/dtrace/src/sys/fs/fifofs/fifo_vnops.c#5 integrate .. //depot/projects/dtrace/src/sys/i386/conf/NOTES#17 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#25 integrate .. //depot/projects/dtrace/src/sys/i386/xbox/xboxfb.c#5 integrate .. //depot/projects/dtrace/src/sys/isa/vga_isa.c#4 integrate .. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#13 integrate .. //depot/projects/dtrace/src/sys/kern/kern_event.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/kern_exec.c#20 integrate .. //depot/projects/dtrace/src/sys/kern/kern_mib.c#7 integrate .. //depot/projects/dtrace/src/sys/kern/subr_lock.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/sys_generic.c#10 integrate .. //depot/projects/dtrace/src/sys/kern/sys_pipe.c#11 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_mqueue.c#9 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_syscalls.c#19 integrate .. //depot/projects/dtrace/src/sys/kern/uipc_usrreq.c#18 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_bio.c#15 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_syscalls.c#16 integrate .. //depot/projects/dtrace/src/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/dtrace/src/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/dtrace/src/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/dtrace/src/sys/net/if_lagg.c#7 integrate .. //depot/projects/dtrace/src/sys/net/netisr.h#4 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_pppoe.c#9 integrate .. //depot/projects/dtrace/src/sys/netgraph/ng_socket.c#10 integrate .. //depot/projects/dtrace/src/sys/opencrypto/cryptodev.c#7 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/gdc.c#4 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/pckbd.c#6 integrate .. //depot/projects/dtrace/src/sys/pc98/cbus/scgdcrndr.c#4 integrate .. //depot/projects/dtrace/src/sys/sys/file.h#6 integrate .. //depot/projects/dtrace/src/sys/sys/sysctl.h#14 integrate .. //depot/projects/dtrace/src/sys/sys/unpcb.h#7 integrate .. //depot/projects/dtrace/src/sys/ufs/ffs/ffs_balloc.c#5 integrate .. //depot/projects/dtrace/src/sys/vm/vm_fault.c#12 integrate .. //depot/projects/dtrace/src/sys/vm/vm_object.c#17 integrate .. //depot/projects/dtrace/src/sys/vm/vm_page.c#29 integrate .. //depot/projects/dtrace/src/sys/vm/vm_reserv.c#1 branch .. //depot/projects/dtrace/src/sys/vm/vm_reserv.h#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_gc/Makefile#1 branch .. //depot/projects/dtrace/src/tools/regression/sockets/unix_gc/unix_gc.c#1 branch .. //depot/projects/dtrace/src/usr.bin/calendar/io.c#6 integrate .. //depot/projects/dtrace/src/usr.bin/colldef/parse.y#4 integrate .. //depot/projects/dtrace/src/usr.bin/colldef/scan.l#4 integrate .. //depot/projects/dtrace/src/usr.sbin/portsnap/portsnap/portsnap.8#6 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/index.c#9 integrate .. //depot/projects/dtrace/src/usr.sbin/sysinstall/main.c#7 integrate .. //depot/projects/dtrace/www/de/developers.sgml#6 integrate .. //depot/projects/dtrace/www/de/share/sgml/news.xml#16 integrate .. //depot/projects/dtrace/www/share/sgml/news.xml#31 integrate .. //depot/projects/dtrace/www/share/sgml/release.ent#17 integrate .. //depot/projects/dtrace/www/tools/portsgrowth/ports.log#8 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#56 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -986,7 +986,7 @@ Like general entities, parameter entities are used to assign names to - reusable chunks of text. However, where as general entities can only + reusable chunks of text. However, whereas general entities can only be used within your document, parameter entities can only be used within an SGML context. ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#10 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -994,11 +994,11 @@ KMyMoney is a personal finance - manager built for KDE. KMyMoney intends to provide and + manager built for KDE. KMyMoney intends to provide and incorporate all the important features found in commercial personal finance manager applications. It also highlights ease-of-use and proper double-entry accounting among its - features. KMyMoney imports from standard Quicken Interchange + features. KMyMoney imports from standard Quicken Interchange Format (QIF) files, tracks investments, handles multiple currencies, and provides a wealth of reports. OFX import capabilities are also available through a separate plugin. @@ -1008,8 +1008,8 @@ &prompt.root; pkg_add -r kmymoney2 - If the package is not available, you can use the ports - collection by doing: + If the package is not available, you can use the Ports + Collection by doing: &prompt.root; cd /usr/ports/finance/kmymoney2 &prompt.root; make install clean ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml#2 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.1 2007/07/08 10:41:38 blackend Exp $ - Original revision: 1.28 + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/audit/chapter.sgml,v 1.2 2007/12/30 15:47:25 blackend Exp $ + Original revision: 1.31 --> @@ -345,6 +345,44 @@ en jeu. + + + Modifier la résolution de la console + + La résolution (ou encore le mode vidéo) de + la console &os; peut être réglée à + 1024x768, 1280x1024, ou tout autre résolution + supportée par le circuit graphique et le moniteur. + Pour utiliser une résolution vidéo + différente vous devez en premier lieu recompiler votre + noyau en ajoutant deux options supplémentaires: + + options VESA +options SC_PIXEL_MODE + + Une fois votre noyau recompilé avec ces deux + options, vous pouvez déterminer quels sont les modes + vidéo supportés par votre matériel en + utilisant l'outil &man.vidcontrol.1;. Pour obtenir une liste + des modes supportés, tapez la ligne suivante: + + &prompt.root; vidcontrol -i mode + + La sortie de cette commande est une liste des modes + vidéo que supporte votre matériel. Vous pouvez + ensuite décider d'utiliser un nouveau mode en le + passant à la commande &man.vidcontrol.1; tout en ayant + les droits de root: + + &prompt.root; vidcontrol MODE_279 + + Si le nouveau mode vidéo est satisfaisant, il peut + être activé au démarrage de manière + permanente en le configurant dans le fichier + /etc/rc.conf: + + allscreens_flags="MODE_279" + @@ -2137,8 +2175,8 @@ comme vous pourriez l'imaginer. Parfois vous devrez communiquer avec un processus daemon. - Une manière de procéder est de lui (ou à tout processus en cours - d'exécution) envoyer ce que l'on appelle un + Une manière de procéder est de lui (ou à tout processus en cours + d'exécution) envoyer ce que l'on appelle un signal. Il existe un certain nombre de signaux différents que vous pouvez envoyer—certains d'entre eux ont une signification précise, ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml#4 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.12 2007/02/21 20:55:19 blackend Exp $ - Original revision: 1.78 + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/bibliography/chapter.sgml,v 1.13 2007/12/30 15:47:25 blackend Exp $ + Original revision: 1.85 --> @@ -27,31 +27,38 @@ Utiliser FreeBSD (en Chinois). + url="http://jdli.tw.FreeBSD.org/publication/book/freebsd2/index.htm">Utiliser + FreeBSD (en chinois traditionnel), publié par + Drmaster., + 1997. ISBN 9-578-39435-7. - FreeBSD Unleashed (traduction Chinoise), publié par + FreeBSD Unleashed (traduction en chinois + simplifié), publié par China Machine Press. ISBN 7-111-10201-0. - FreeBSD From Scratch First Edition (en Chinois), + FreeBSD From Scratch First Edition (en chinois + simplifié), publié par China Machine Press. ISBN 7-111-07482-3. - FreeBSD From Scratch Second Edition (en Chinois), + FreeBSD From Scratch Second Edition (en chinois + simplifié), publié par China Machine Press. ISBN 7-111-10286-X. - Manuel FreeBSD (traduction Chinoise), publié par + Manuel FreeBSD (traduction en chinois simplifié), + publié par Posts & Telecom Press. ISBN 7-115-10541-3. @@ -59,19 +66,20 @@ - FreeBSD 3.x Internet (en Chinois), publié par + FreeBSD 3.x Internet (en chinois simplifié), + publié par Tsinghua University Press. ISBN 7-900625-66-6. - FreeBSD & Windows (en Chinois), ISBN - 7-113-03845-X + FreeBSD & Windows (en chinois simplifié), + ISBN 7-113-03845-X - FreeBSD Internet Services HOWTO (en Chinois), ISBN - 7-113-03423-3 + FreeBSD Internet Services HOWTO (en chinois + simplifié), ISBN 7-113-03423-3 @@ -143,7 +151,7 @@ url="http://www.pc.mycom.co.jp/FreeBSD/install-manual.html">Manuel d'installation et d'utilisation de FreeBSD (en Japonais), publié par Mainichi - Communications Inc.. + Communications Inc., 1998. ISBN 4-8399-0112-0. @@ -154,6 +162,20 @@ par Elex Media Komputindo. + + Absolute BSD: The Ultimate Guide to FreeBSD (traduction + en chinois traditionnel), publié par GrandTech Press, + 2003. ISBN 986-7944-92-5. + + + + The FreeBSD 6.0 + Book (en chinois traditionnel), publié par + Drmaster, 2006. ISBN 9-575-27878-X. + + Livres & revues en langue anglaise: @@ -237,9 +259,9 @@ L'Université de l'Etat + url="http://www.osu.edu/">L'Université de l'Etat d'Ohio a écrit un Cours + url="http://8help.osu.edu/wks/unix_course/unix.html">Cours d'introduction à Unix qui est disponible en ligne aux formats HTML et PostScript. ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml#6 (text+ko) ==== @@ -2,8 +2,8 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.18 2007/07/14 17:53:04 blackend Exp $ - Original revision: 1.73 + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.19 2007/12/30 15:47:25 blackend Exp $ + Original revision: 1.75 --> @@ -929,7 +929,7 @@ applications puissantes et simples d'emploi prêtes à être installées. Certaines d'entre elles sont compatibles avec des formats de fichiers très - répandus comme ceux utilisés par Quicken ou Excel pour stocker des documents. + répandus comme ceux utilisés par Quicken ou Excel pour stocker des documents. Cette section couvre les programmes suivants: @@ -966,6 +966,13 @@ légère Tcl/Tk + + + KMyMoney + faibles + lourde + KDE + @@ -1074,6 +1081,44 @@ &prompt.root; cd /usr/ports/deskutils/abacus &prompt.root; make install clean + + + KMyMoney + + KMyMoney + + + tableur + KMyMoney + + + KMyMoney est un programme de + comptabilité personnelle pour + KDE. + KMyMoney a pour objectif de fournir + et d'incorporer toutes les fonctionnalités importantes + que l'on retrouve dans les applications de comptabilité + personnelle commerciales. Il met également l'accent + sur la facilité d'utilisation et la mise en place d'une + comptabilité en partie double. + KMyMoney peut importer les fichiers + au format Quicken (QIF), suivre des placements, gérer + plusieurs monnaies et fournir une quantité de + compte-rendus. La possibilité d'importer des fichiers + au format OFX est également disponible à l'aide + d'un greffon séparé. + + Pour installer KMyMoney sous + forme d'un paquetage: + + &prompt.root; pkg_add -r kmymoney2 + + Si le paquetage n'est pas disponible, vous pouvez utiliser + le catalogue des logiciels portés: + + &prompt.root; cd /usr/ports/finance/kmymoney2 +&prompt.root; make install clean + ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml#4 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.4 2007/12/05 12:21:50 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/printing/chapter.sgml,v 1.5 2007/12/30 16:04:20 blackend Exp $ Original revision: 1.96 --> @@ -51,7 +51,7 @@ d'impression (jobs) en provenance de différents ordinateurs, comprenant d'autres machines sous &os; et des machines sous &windows; ou &macos;. &os; - s'assurera à ce qu'un seul travail d'impression ne soit + veillera à ce qu'un seul travail d'impression ne soit imprimé à la fois, et pourra tenir des statistiques sur les utilisateurs et les machines lançant le plus d'impressions, produire des pages ==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml#5 (text+ko) ==== @@ -2,7 +2,7 @@ The FreeBSD Documentation Project The FreeBSD French Documentation Project - $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml,v 1.12 2007/03/11 19:40:01 blackend Exp $ + $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/security/chapter.sgml,v 1.13 2007/12/30 16:12:55 blackend Exp $ Original revision: 1.155 --> @@ -1900,7 +1900,7 @@ Cela créera une paire de clés DSA pour les sessions SSH utilisant le protocole 2. La clé publique est conservée dans ~/.ssh/id_dsa.pub, - tandis que la clé publique se trouve dans + tandis que la clé privée se trouve dans ~/.ssh/id_dsa. Les clés publiques DSA sont placées dans le >>> TRUNCATED FOR MAIL (1000 lines) <<<