From owner-p4-projects@FreeBSD.ORG Sun Mar 1 08:21:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C63071065670; Sun, 1 Mar 2009 08:21: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 85F91106566B for ; Sun, 1 Mar 2009 08:21:51 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5A2AB8FC13 for ; Sun, 1 Mar 2009 08:21:51 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n218LpEZ046569 for ; Sun, 1 Mar 2009 08:21:51 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n218LpGw046567 for perforce@freebsd.org; Sun, 1 Mar 2009 08:21:51 GMT (envelope-from lulf@FreeBSD.org) Date: Sun, 1 Mar 2009 08:21:51 GMT Message-Id: <200903010821.n218LpGw046567@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2009 08:21:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=158517 Change 158517 by lulf@lulf_carrot on 2009/03/01 08:21:27 - Move sleep mode definitions into the general headers for ap700x, since the implementations doesn't differ that much. - Fix broken sleep mode conditions. There are several ways to do this, but for now, disallow sleep mode if global, exception, i1 or i2 masks are set. Discussed with: antab Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#9 edit .. //depot/projects/avr32/src/sys/avr32/include/at32ap7000.h#2 delete .. //depot/projects/avr32/src/sys/avr32/include/at32ap700x.h#3 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#9 (text+ko) ==== @@ -63,7 +63,6 @@ #include #include #include -#include extern vm_offset_t _evba; @@ -90,17 +89,12 @@ void cpu_idle(int busy) { - uint32_t gm; - - gm = bit_offset(SYS, SR, GM); - /* Make sure interrupts are enabled before we do this. */ - if (gm == 1 || (sysreg_read(SR) & INTR_MASK) == gm) - panic("sleeping with interrupts disabled"); -#if defined(CPU_AT32AP7000) - __asm__ __volatile ("sleep %0" : : "i"(AT32AP7000_SLEEP_IDLE)); -#else - avr32_impl(); -#endif + /* Make sure important interrupts are enabled before we do this. */ + if (sysreg_read(SR) & (bit_offset(SYS, SR, GM) | + bit_offset(SYS, SR, EM) | bit_offset(SYS, SR, I0M) | + bit_offset(SYS, SR, I1M))) + panic("sleeping with critical interrupts masked"); + __asm__ __volatile ("sleep %0" : : "i"(AT32AP700X_SLEEP_IDLE)); } void ==== //depot/projects/avr32/src/sys/avr32/include/at32ap700x.h#3 (text+ko) ==== @@ -119,4 +119,11 @@ #define AT32AP700X_EEC0_OFFSET 0xF03C00 #define AT32AP700X_EEC0_SIZE 0x100 +/* Sleep modes. */ +#define AT32AP700X_SLEEP_IDLE 0 +#define AT32AP700X_SLEEP_FROZEN 1 +#define AT32AP700X_SLEEP_STANDBY 2 +#define AT32AP700X_SLEEP_STOP 3 +#define AT32AP700X_SLEEP_STATIC 5 /* Not a typo. */ + #endif /* !_MACHINE_AT32AP700X_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Mar 1 08:50:17 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1584A1065672 for ; Sun, 1 Mar 2009 08:50:17 +0000 (UTC) (envelope-from chiimo4@yahoo.co.jp) Received: from web4102.mail.ogk.yahoo.co.jp (web4102.mail.ogk.yahoo.co.jp [124.83.200.64]) by mx1.freebsd.org (Postfix) with SMTP id 826AC8FC08 for ; Sun, 1 Mar 2009 08:50:16 +0000 (UTC) (envelope-from chiimo4@yahoo.co.jp) Received: (qmail 72141 invoked by uid 60001); 1 Mar 2009 08:20:50 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=yj20050223; d=yahoo.co.jp; h=Message-ID:Received:X-RocketDSI:Date:From:Reply-To:Subject:To:MIME-Version:Content-Type; b=X3tYrJbP1dluGGGI5NIFhKC0ipNC7s4LO6H+qYlrfZaARlTjGq53PW9nuBBTW7Ymg7T71/XV7lNVDmbvR4ssmfdWTro8ZxlrtO0rQM2/76owoQiaRTXH+bG/6ts6/zTA ; Message-ID: <20090301082050.72139.qmail@web4102.mail.ogk.yahoo.co.jp> Received: from [205.138.18.80] by web4102.mail.ogk.yahoo.co.jp via HTTP; Sun, 01 Mar 2009 17:20:50 JST X-RocketDSI: i=124.83.200.64;s=w Date: Sun, 1 Mar 2009 17:20:50 +0900 (JST) From: "Dr. Chidi Imo Office" To: p4-projects@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=iso-2022-jp X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Subject: GET BACK. X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: chidiimo@gmail.com List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Mar 2009 08:50:17 -0000 $B?7$7$$%a!<%k%"%I%l%9$r$*CN$i$;$7$^$9?7$7$$%a!<%k%"%I%l%9!'(B chiimo4@yahoo.co.jp This is to officially inform you that we have verified your payment & discovered why you have not received your contract/inheritance fund which will now be paid irrevocably following an irrevocable instruction by the presidency and UN.Reply. Dr.Chidi Imo Director of Int. Operations CBN - Dr. Chidi Imo Office From owner-p4-projects@FreeBSD.ORG Sun Mar 1 09:57:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EF8FB10656DD; Sun, 1 Mar 2009 09:57: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 9310510656DA for ; Sun, 1 Mar 2009 09:57:31 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 80CBF8FC1A for ; Sun, 1 Mar 2009 09:57:31 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n219vVLv064823 for ; Sun, 1 Mar 2009 09:57:31 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n219vVk1064821 for perforce@freebsd.org; Sun, 1 Mar 2009 09:57:31 GMT (envelope-from lulf@FreeBSD.org) Date: Sun, 1 Mar 2009 09:57:31 GMT Message-Id: <200903010957.n219vVk1064821@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2009 09:57:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=158521 Change 158521 by lulf@lulf_carrot on 2009/03/01 09:57:00 - Implement cache handling used by busdma. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/cache.c#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/cache.c#2 (text+ko) ==== @@ -41,9 +41,24 @@ #include #include -/* TODO: - - Implement l1 cache handling. -*/ +/* Valid cache op codes. */ +#define ICACHE_INVALIDATE 0x01 +#define DCACHE_INVALIDATE 0x0b +#define DCACHE_WRITEBACK 0x0c +#define DCACHE_WRITEBACK_INVALIDATE 0x0d + +/* Next line boundary. */ +#define round_line(va, size) (((va) + ((size) - 1)) & ~((size) - 1)) +/* Previous line boundary. */ +#define trunc_line(va, size) ((va) & ~((size) - 1)) + +/* Perform operation on cache line. */ +#define cache_line_op(va, op) \ + __asm__ __volatile( \ + "cache %0[0], %1" \ + : \ + : "r" (va), "n" (op) \ + : "memory") struct avr32_cache_ops avr32_cache_ops; @@ -58,14 +73,14 @@ void avr32_nocache_wb_range(vm_offset_t, vm_size_t); /* For l1 cache. */ -void avr32_l1cache_sync_all(void); -void avr32_l1cache_sync_range(vm_offset_t, vm_size_t); -void avr32_l1cache_sync_range_index(vm_offset_t, vm_size_t); -void avr32_l1cache_wbinv_all(void); -void avr32_l1cache_wbinv_range(vm_offset_t, vm_size_t); -void avr32_l1cache_wbinv_range_index(vm_offset_t, vm_size_t); -void avr32_l1cache_inv_range(vm_offset_t, vm_size_t); -void avr32_l1cache_wb_range(vm_offset_t, vm_size_t); +void avr32_l1icache_sync_all(void); +void avr32_l1icache_sync_range(vm_offset_t, vm_size_t); +void avr32_l1icache_sync_range_index(vm_offset_t, vm_size_t); +void avr32_l1dcache_wbinv_all(void); +void avr32_l1dcache_wbinv_range(vm_offset_t, vm_size_t); +void avr32_l1dcache_wbinv_range_index(vm_offset_t, vm_size_t); +void avr32_l1dcache_inv_range(vm_offset_t, vm_size_t); +void avr32_l1dcache_wb_range(vm_offset_t, vm_size_t); u_int avr32_icache_size; u_int avr32_icache_line_size; @@ -116,11 +131,11 @@ avr32_cache_ops.mco_icache_sync_range_index = avr32_nocache_sync_range_index; } else { - avr32_cache_ops.mco_icache_sync_all = avr32_l1cache_sync_all; + avr32_cache_ops.mco_icache_sync_all = avr32_l1icache_sync_all; avr32_cache_ops.mco_icache_sync_range = - avr32_l1cache_sync_range; + avr32_l1icache_sync_range; avr32_cache_ops.mco_icache_sync_range_index = - avr32_l1cache_sync_range_index; + avr32_l1icache_sync_range_index; } if (avr32_dcache_line_size == 1) { @@ -132,13 +147,13 @@ avr32_cache_ops.mco_dcache_inv_range = avr32_nocache_inv_range; avr32_cache_ops.mco_dcache_wb_range = avr32_nocache_wb_range; } else { - avr32_cache_ops.mco_dcache_wbinv_all = avr32_l1cache_wbinv_all; + avr32_cache_ops.mco_dcache_wbinv_all = avr32_l1dcache_wbinv_all; avr32_cache_ops.mco_dcache_wbinv_range = - avr32_l1cache_wbinv_range; + avr32_l1dcache_wbinv_range; avr32_cache_ops.mco_dcache_wbinv_range_index = - avr32_l1cache_wbinv_range_index; - avr32_cache_ops.mco_dcache_inv_range = avr32_l1cache_inv_range; - avr32_cache_ops.mco_dcache_wb_range = avr32_l1cache_wb_range; + avr32_l1dcache_wbinv_range_index; + avr32_cache_ops.mco_dcache_inv_range = avr32_l1dcache_inv_range; + avr32_cache_ops.mco_dcache_wb_range = avr32_l1dcache_wb_range; } } @@ -155,35 +170,77 @@ /* Operations for l1 cache. */ void -avr32_l1cache_sync_all(void) +avr32_l1icache_sync_all(void) { + avr32_impl(); } void -avr32_l1cache_sync_range(vm_offset_t from, vm_size_t size) +avr32_l1icache_sync_range(vm_offset_t from, vm_size_t size) { + avr32_impl(); } void -avr32_l1cache_sync_range_index(vm_offset_t from, vm_size_t size) -{} +avr32_l1icache_sync_range_index(vm_offset_t from, vm_size_t size) +{ + avr32_impl(); +} void -avr32_l1cache_wbinv_all(void) -{} +avr32_l1dcache_wbinv_all(void) +{ + avr32_impl(); +} void -avr32_l1cache_wbinv_range(vm_offset_t from, vm_size_t size) -{} +avr32_l1dcache_wbinv_range_index(vm_offset_t from, vm_size_t size) +{ + avr32_impl(); +} void -avr32_l1cache_wbinv_range_index(vm_offset_t from, vm_size_t size) -{} +avr32_l1dcache_wbinv_range(vm_offset_t from, vm_size_t size) +{ + vm_offset_t va, va_end; + + /* Put address at a cache line boundary. */ + va = trunc_line(from, avr32_dcache_line_size); + va_end = round_line(from + size, avr32_dcache_line_size); + + while (va < va_end) { + cache_line_op(va, DCACHE_WRITEBACK_INVALIDATE); + va += avr32_dcache_line_size; + } +} + void -avr32_l1cache_inv_range(vm_offset_t from, vm_size_t size) -{} +avr32_l1dcache_inv_range(vm_offset_t from, vm_size_t size) +{ + vm_offset_t va, va_end; + + /* Put address at a cache line boundary. */ + va = trunc_line(from, avr32_dcache_line_size); + va_end = round_line(from + size, avr32_dcache_line_size); + + while (va < va_end) { + cache_line_op(va, DCACHE_INVALIDATE); + va += avr32_dcache_line_size; + } +} void -avr32_l1cache_wb_range(vm_offset_t from, vm_size_t size) -{} +avr32_l1dcache_wb_range(vm_offset_t from, vm_size_t size) +{ + vm_offset_t va, va_end; + + /* Put address at a cache line boundary. */ + va = trunc_line(from, avr32_dcache_line_size); + va_end = round_line(from + size, avr32_dcache_line_size); + + while (va < va_end) { + cache_line_op(va, DCACHE_WRITEBACK); + va += avr32_dcache_line_size; + } +} From owner-p4-projects@FreeBSD.ORG Sun Mar 1 16:07:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF033106567A; Sun, 1 Mar 2009 16:07: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 6AB34106564A for ; Sun, 1 Mar 2009 16:07:49 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 57FA78FC17 for ; Sun, 1 Mar 2009 16:07:49 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n21G7lKp021981 for ; Sun, 1 Mar 2009 16:07:47 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n21G7l08021978 for perforce@freebsd.org; Sun, 1 Mar 2009 16:07:47 GMT (envelope-from antab@FreeBSD.org) Date: Sun, 1 Mar 2009 16:07:47 GMT Message-Id: <200903011607.n21G7l08021978@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 158533 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2009 16:07:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=158533 Change 158533 by antab@antab_farm on 2009/03/01 16:07:06 Add arch dependent files to misc libs to make world build Affected files ... .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 edit .. //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 edit .. //depot/projects/avr32/src/gnu/lib/libgomp/Makefile#2 edit .. //depot/projects/avr32/src/gnu/lib/libgomp/config.h#2 edit .. //depot/projects/avr32/src/gnu/lib/libstdc++/config.h#2 edit .. //depot/projects/avr32/src/lib/csu/avr32/Makefile#1 add .. //depot/projects/avr32/src/lib/csu/avr32/crt1.c#1 add .. //depot/projects/avr32/src/lib/csu/avr32/crti.S#1 add .. //depot/projects/avr32/src/lib/csu/avr32/crtn.S#1 add .. //depot/projects/avr32/src/lib/libc/avr32/_fpmath.h#1 add .. //depot/projects/avr32/src/lib/libc/avr32/arith.h#1 add .. //depot/projects/avr32/src/lib/libc/avr32/gd_qnan.h#1 add .. //depot/projects/avr32/src/lib/libc/gen/tls.c#2 edit .. //depot/projects/avr32/src/lib/libc/quad/Makefile.inc#2 edit .. //depot/projects/avr32/src/lib/libc/xdr/xdr_float.c#2 edit .. //depot/projects/avr32/src/lib/libdisk/disk.c#2 edit .. //depot/projects/avr32/src/lib/libdisk/libdisk.h#2 edit .. //depot/projects/avr32/src/lib/libdisk/write_avr32_disk.c#1 add .. //depot/projects/avr32/src/lib/libkvm/kvm_avr32.c#1 add .. //depot/projects/avr32/src/lib/libstand/avr32/_setjmp.S#1 add .. //depot/projects/avr32/src/lib/libthr/arch/avr32/include/pthread_md.h#2 edit .. //depot/projects/avr32/src/lib/libthread_db/arch/avr32/libpthread_md.c#1 add .. //depot/projects/avr32/src/libexec/rtld-elf/avr32/rtld_machdep.h#1 add .. //depot/projects/avr32/src/secure/lib/libcrypto/opensslconf-avr32.h#1 add .. //depot/projects/avr32/src/sys/avr32/include/_inttypes.h#1 add .. //depot/projects/avr32/src/sys/avr32/include/atomic.h#5 edit .. //depot/projects/avr32/src/sys/avr32/include/cpufunc.h#3 edit .. //depot/projects/avr32/src/sys/avr32/include/float.h#1 add .. //depot/projects/avr32/src/sys/avr32/include/ieeefp.h#1 add .. //depot/projects/avr32/src/sys/avr32/include/pcpu.h#4 edit .. //depot/projects/avr32/src/sys/avr32/include/reloc.h#1 add .. //depot/projects/avr32/src/sys/avr32/include/sysarch.h#1 add .. //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 edit Differences ... ==== //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 (text+ko) ==== @@ -224,7 +224,7 @@ s = &dofs[dofrh->dofr_tgtsec]; for (j = 0; j < nrel; j++) { -#if defined(__arm__) +#if defined(__arm__) || defined(__avr32__) /* XXX */ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); #elif defined(__ia64__) @@ -794,7 +794,7 @@ return (ret); } -#if defined(__arm__) +#if defined(__arm__) || defined(__avr32__) /* XXX */ static int dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela, ==== //depot/projects/avr32/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 (text+ko) ==== @@ -306,7 +306,7 @@ case sizeof (double): return (dt_printf(dtp, fp, format, *((double *)addr) / n)); -#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__) +#if !defined(__arm__) && !defined(__avr32__) && !defined(__powerpc__) && !defined(__mips__) case sizeof (long double): return (dt_printf(dtp, fp, format, *((long double *)addr) / ldn)); ==== //depot/projects/avr32/src/gnu/lib/libgomp/Makefile#2 (text+ko) ==== @@ -24,7 +24,8 @@ # Target-specific OpenMP configuration .if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == i386 || \ - ${MACHINE_ARCH} == mips || ${MACHINE_ARCH} == powerpc + ${MACHINE_ARCH} == mips || ${MACHINE_ARCH} == powerpc || \ + ${MACHINE_ARCH} == avr32 OMP_LOCK_ALIGN = 4 OMP_LOCK_KIND= 4 OMP_LOCK_SIZE= 4 ==== //depot/projects/avr32/src/gnu/lib/libgomp/config.h#2 (text+ko) ==== @@ -59,7 +59,8 @@ #define HAVE_SYS_TYPES_H 1 /* Define to 1 if the target supports thread-local storage. */ -#if !defined(__sparc64__) && !defined(__arm__) && !defined(__mips__) +#if !defined(__sparc64__) && !defined(__arm__) && !defined(__avr32__) && \ + !defined(__mips__) #define HAVE_TLS 1 #endif ==== //depot/projects/avr32/src/gnu/lib/libstdc++/config.h#2 (text+ko) ==== @@ -371,7 +371,8 @@ /* #undef HAVE_TANL */ /* Define to 1 if the target supports thread-local storage. */ -#if !defined(__sparc64__) && !defined(__arm__) && !defined(__mips__) +#if !defined(__sparc64__) && !defined(__arm__) && !defined(__avr32__) && \ + !defined(__mips__) #define HAVE_TLS 1 #endif ==== //depot/projects/avr32/src/lib/libc/gen/tls.c#2 (text+ko) ==== @@ -60,7 +60,7 @@ #if defined(__ia64__) || defined(__amd64__) #define TLS_TCB_ALIGN 16 #elif defined(__powerpc__) || defined(__i386__) || defined(__arm__) || \ - defined(__sparc64__) || defined(__mips__) + defined(__sparc64__) || defined(__mips__) || defined(__avr32__) #define TLS_TCB_ALIGN sizeof(void *) #else #error TLS_TCB_ALIGN undefined for target architecture @@ -70,7 +70,7 @@ #define TLS_VARIANT_I #endif #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__) || \ - defined(__arm__) || defined(__mips__) + defined(__arm__) || defined(__mips__) || defined(__avr32__) #define TLS_VARIANT_II #endif ==== //depot/projects/avr32/src/lib/libc/quad/Makefile.inc#2 (text+ko) ==== @@ -8,6 +8,12 @@ SRCS+= cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c +.elif ${MACHINE_ARCH} == "avr32" +/* TODO: Look at this when toolchain import is finished */ +SRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c fixdfdi.c fixsfdi.c \ + fixunsdfdi.c floatdisf.c floatunsdidf.c iordi3.c lshldi3.c lshrdi3.c \ + muldi3.c negdi2.c notdi2.c qdivrem.c subdi3.c ucmpdi2.c xordi3.c + .else SRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \ ==== //depot/projects/avr32/src/lib/libc/xdr/xdr_float.c#2 (text+ko) ==== @@ -64,7 +64,8 @@ #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \ defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \ defined(__arm__) || defined(__ppc__) || defined(__ia64__) || \ - defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) + defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) || \ + defined(__avr32__) #include #define IEEEFP #endif ==== //depot/projects/avr32/src/lib/libdisk/disk.c#2 (text+ko) ==== @@ -52,6 +52,8 @@ p_amd64 #elif defined(__arm__) p_arm +#elif defined(__avr32__) + p_avr32 #elif defined(__mips__) p_mips #else ==== //depot/projects/avr32/src/lib/libdisk/libdisk.h#2 (text+ko) ==== @@ -33,7 +33,8 @@ p_ppc, p_amd64, p_arm, - p_mips + p_mips, + p_avr32, }; extern const enum platform platform; ==== //depot/projects/avr32/src/lib/libthr/arch/avr32/include/pthread_md.h#2 (text+ko) ==== @@ -35,6 +35,7 @@ #include #include +#include #include #define CPU_SPINWAIT @@ -60,7 +61,7 @@ static __inline void _tcb_set(struct tcb *tcb) { - mips_tcb_set(tcb); + breakpoint(); /* TODO: finish this */ } /* @@ -69,7 +70,8 @@ static __inline struct tcb * _tcb_get(void) { - return (mips_tcb_get()); + breakpoint(); + return (NULL); /* TODO: Finish this */ } extern struct pthread *_thr_initial; ==== //depot/projects/avr32/src/sys/avr32/include/atomic.h#5 (text+ko) ==== @@ -178,6 +178,19 @@ return 0; } +static __inline int +atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) +{ + return (atomic_cmpset_32((volatile u_int *)dst, (u_int)exp, + (u_int)src)); +} + +static __inline u_long +atomic_fetchadd_long(volatile u_long *p, u_long v) +{ + return (atomic_fetchadd_32((volatile u_int *)p, (u_int)v)); +} + #define atomic_add_long(p, v) \ atomic_add_32((volatile u_int *)(p), (u_int)(v)) #define atomic_add_acq_long atomic_add_long @@ -194,12 +207,8 @@ atomic_set_32((volatile u_int *)(p), (u_int)(v)) #define atomic_set_acq_long atomic_set_long #define atomic_set_rel_long atomic_set_long -#define atomic_cmpset_long(dst, old, new) \ - atomic_cmpset_32((volatile u_int *)(dst), (u_int)(old), (u_int)(new)) #define atomic_cmpset_acq_long atomic_cmpset_long #define atomic_cmpset_rel_long atomic_cmpset_long -#define atomic_fetchadd_long(p, v) \ - atomic_fetchadd_32((volatile u_int *)(p), (u_int)(v)) #define atomic_readandclear_long(p) \ atomic_readandclear_long((volatile u_int *)(p)) #define atomic_load_long(p) \ ==== //depot/projects/avr32/src/sys/avr32/include/cpufunc.h#3 (text+ko) ==== @@ -45,11 +45,12 @@ register_t intr_disable(void); void intr_restore(register_t s); +#endif /* _KERNEL */ + static __inline void breakpoint(void) { __asm __volatile ("breakpoint"); } -#endif /* _KERNEL */ #endif /* _MACHINE_CPUFUNC_H_ */ ==== //depot/projects/avr32/src/sys/avr32/include/pcpu.h#4 (text+ko) ==== @@ -32,16 +32,16 @@ #ifndef _MACHINE_PCPU_H_ #define _MACHINE_PCPU_H_ +#define PCPU_MD_FIELDS \ + struct pmap *pc_curpmap; /* pmap of curthread */ \ + u_int32_t pc_asid_next; /* next ASID to alloc */ \ + u_int32_t pc_asid_generation; /* current ASID generation */ + #ifdef _KERNEL #include #define ALT_STACK_SIZE 128 -#define PCPU_MD_FIELDS \ - struct pmap *pc_curpmap; /* pmap of curthread */ \ - u_int32_t pc_asid_next; /* next ASID to alloc */ \ - u_int32_t pc_asid_generation; /* current ASID generation */ - struct vmspace; struct pcb; struct pcpu; ==== //depot/projects/avr32/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 (text+ko) ==== @@ -344,7 +344,7 @@ #define _DONT_USE_1275_GENERIC_NAMES #define _HAVE_CPUID_INSN -#elif defined(__arm__) +#elif defined(__arm__) || defined(__avr32__) /* * Define the appropriate "processor characteristics" From owner-p4-projects@FreeBSD.ORG Sun Mar 1 16:07:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB618106572E; Sun, 1 Mar 2009 16:07: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 7E6B4106566B for ; Sun, 1 Mar 2009 16:07:49 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6AB288FC19 for ; Sun, 1 Mar 2009 16:07:49 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n21G7n35021989 for ; Sun, 1 Mar 2009 16:07:49 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n21G7mIA021985 for perforce@freebsd.org; Sun, 1 Mar 2009 16:07:48 GMT (envelope-from antab@FreeBSD.org) Date: Sun, 1 Mar 2009 16:07:48 GMT Message-Id: <200903011607.n21G7mIA021985@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 158534 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2009 16:07:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=158534 Change 158534 by antab@antab_farm on 2009/03/01 16:07:14 IFC @158479 Affected files ... .. //depot/projects/avr32/src/ObsoleteFiles.inc#3 integrate .. //depot/projects/avr32/src/UPDATING#3 integrate .. //depot/projects/avr32/src/bin/ps/extern.h#2 integrate .. //depot/projects/avr32/src/bin/ps/keyword.c#2 integrate .. //depot/projects/avr32/src/bin/ps/print.c#2 integrate .. //depot/projects/avr32/src/contrib/less/line.c#2 integrate .. //depot/projects/avr32/src/contrib/telnet/libtelnet/pk.c#2 integrate .. //depot/projects/avr32/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate .. //depot/projects/avr32/src/include/stdio.h#2 integrate .. //depot/projects/avr32/src/include/string.h#3 integrate .. //depot/projects/avr32/src/include/wchar.h#3 integrate .. //depot/projects/avr32/src/lib/libc/stdio/Makefile.inc#2 integrate .. //depot/projects/avr32/src/lib/libc/stdio/Symbol.map#2 integrate .. //depot/projects/avr32/src/lib/libc/stdio/fgetln.3#2 integrate .. //depot/projects/avr32/src/lib/libc/stdio/fgets.3#2 integrate .. //depot/projects/avr32/src/lib/libc/stdio/getdelim.c#1 branch .. //depot/projects/avr32/src/lib/libc/stdio/getline.3#1 branch .. //depot/projects/avr32/src/lib/libc/stdio/getline.c#1 branch .. //depot/projects/avr32/src/lib/libc/stdio/printf-pos.c#2 integrate .. //depot/projects/avr32/src/lib/libc/stdio/stdio.3#2 integrate .. //depot/projects/avr32/src/lib/libc/stdio/vfprintf.c#3 integrate .. //depot/projects/avr32/src/lib/libc/stdio/vfwprintf.c#3 integrate .. //depot/projects/avr32/src/lib/libc/string/Makefile.inc#2 integrate .. //depot/projects/avr32/src/lib/libc/string/Symbol.map#2 integrate .. //depot/projects/avr32/src/lib/libc/string/stpcpy.c#2 integrate .. //depot/projects/avr32/src/lib/libc/string/stpncpy.c#1 branch .. //depot/projects/avr32/src/lib/libc/string/strcpy.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strlcat.c#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strlcpy.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strlcpy.c#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strlen.3#2 integrate .. //depot/projects/avr32/src/lib/libc/string/strnlen.c#1 branch .. //depot/projects/avr32/src/lib/libc/string/wcscasecmp.c#1 branch .. //depot/projects/avr32/src/lib/libc/string/wcsncasecmp.c#1 branch .. //depot/projects/avr32/src/lib/libc/string/wcsnlen.c#1 branch .. //depot/projects/avr32/src/lib/libc/string/wmemchr.3#2 integrate .. //depot/projects/avr32/src/lib/libc/sys/open.2#2 integrate .. //depot/projects/avr32/src/lib/libcompat/4.3/rexec.c#2 integrate .. //depot/projects/avr32/src/lib/libmp/Makefile#2 integrate .. //depot/projects/avr32/src/lib/libmp/Symbol.map#1 branch .. //depot/projects/avr32/src/lib/libmp/libmp.3#2 integrate .. //depot/projects/avr32/src/lib/libmp/mp.h#2 integrate .. //depot/projects/avr32/src/lib/libmp/mpasbn.c#2 integrate .. //depot/projects/avr32/src/lib/librpcsvc/rnusers.c#2 integrate .. //depot/projects/avr32/src/lib/librpcsvc/rstat.c#2 integrate .. //depot/projects/avr32/src/lib/librpcsvc/rwall.c#2 integrate .. //depot/projects/avr32/src/lib/librpcsvc/secretkey.c#2 integrate .. //depot/projects/avr32/src/lib/librpcsvc/xcrypt.c#2 integrate .. //depot/projects/avr32/src/lib/libtelnet/Makefile#2 integrate .. //depot/projects/avr32/src/lib/libusb20/libusb20.3#3 integrate .. //depot/projects/avr32/src/lib/libusb20/libusb20.c#3 integrate .. //depot/projects/avr32/src/lib/libusb20/libusb20.h#3 integrate .. //depot/projects/avr32/src/lib/libusb20/libusb20_int.h#3 integrate .. //depot/projects/avr32/src/lib/libusb20/libusb20_ugen20.c#3 integrate .. //depot/projects/avr32/src/lib/libusbhid/descr.c#3 integrate .. //depot/projects/avr32/src/sbin/ifconfig/ifclone.c#2 integrate .. //depot/projects/avr32/src/sbin/ifconfig/ifconfig.h#2 integrate .. //depot/projects/avr32/src/sbin/ifconfig/ifieee80211.c#3 integrate .. //depot/projects/avr32/src/sbin/ifconfig/ifvlan.c#2 integrate .. //depot/projects/avr32/src/sbin/newfs_msdos/newfs_msdos.c#2 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/avr32/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/avr32/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/avr32/src/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/avr32/src/sys/compat/linux/linux_ioctl.c#2 integrate .. //depot/projects/avr32/src/sys/compat/svr4/svr4_sockio.c#2 integrate .. //depot/projects/avr32/src/sys/conf/files.amd64#3 integrate .. //depot/projects/avr32/src/sys/conf/files.i386#3 integrate .. //depot/projects/avr32/src/sys/conf/files.ia64#3 integrate .. //depot/projects/avr32/src/sys/conf/files.mips#2 integrate .. //depot/projects/avr32/src/sys/conf/files.pc98#3 integrate .. //depot/projects/avr32/src/sys/conf/files.powerpc#3 integrate .. //depot/projects/avr32/src/sys/conf/files.sparc64#3 integrate .. //depot/projects/avr32/src/sys/conf/files.sun4v#2 integrate .. //depot/projects/avr32/src/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/avr32/src/sys/contrib/altq/altq/altq_subr.c#3 integrate .. //depot/projects/avr32/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/pf/net/pf_if.c#2 integrate .. //depot/projects/avr32/src/sys/contrib/pf/net/pf_ioctl.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/avr32/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/avr32/src/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/avr32/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/avr32/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/avr32/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_bufs.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_drv.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_irq.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/drm_lock.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/i915_dma.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/i915_drv.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/i915_drv.h#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/i915_irq.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/i915_reg.h#1 branch .. //depot/projects/avr32/src/sys/dev/drm/mach64_drv.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/mach64_drv.h#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/mach64_irq.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/mga_dma.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/mga_irq.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/r128_drv.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/r128_drv.h#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/r128_irq.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/radeon_cp.c#2 integrate .. //depot/projects/avr32/src/sys/dev/drm/radeon_irq.c#2 integrate .. //depot/projects/avr32/src/sys/dev/pci/pci.c#2 integrate .. //depot/projects/avr32/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/avr32/src/sys/dev/syscons/scterm-teken.c#3 integrate .. //depot/projects/avr32/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/image/uscanner.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/avr32/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/avr32/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfs_vfsops.c#3 integrate .. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate .. //depot/projects/avr32/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/avr32/src/sys/fs/udf/udf.h#3 integrate .. //depot/projects/avr32/src/sys/fs/udf/udf_vfsops.c#3 integrate .. //depot/projects/avr32/src/sys/fs/udf/udf_vnops.c#3 integrate .. //depot/projects/avr32/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/avr32/src/sys/i386/i386/mp_machdep.c#3 integrate .. //depot/projects/avr32/src/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_condvar.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_cons.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_exec.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_exit.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_malloc.c#3 integrate .. //depot/projects/avr32/src/sys/kern/kern_poll.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_priv.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_rwlock.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_sig.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_synch.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_thr.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_time.c#2 integrate .. //depot/projects/avr32/src/sys/kern/kern_uuid.c#2 integrate .. //depot/projects/avr32/src/sys/kern/subr_prf.c#3 integrate .. //depot/projects/avr32/src/sys/kern/subr_witness.c#3 integrate .. //depot/projects/avr32/src/sys/kern/tty.c#3 integrate .. //depot/projects/avr32/src/sys/kern/tty_info.c#3 integrate .. //depot/projects/avr32/src/sys/kern/tty_inq.c#3 integrate .. //depot/projects/avr32/src/sys/kern/tty_outq.c#3 integrate .. //depot/projects/avr32/src/sys/kern/tty_pts.c#3 integrate .. //depot/projects/avr32/src/sys/kern/tty_pty.c#3 integrate .. //depot/projects/avr32/src/sys/kern/tty_ttydisc.c#2 integrate .. //depot/projects/avr32/src/sys/libkern/memmove.c#1 branch .. //depot/projects/avr32/src/sys/libkern/strtouq.c#2 integrate .. //depot/projects/avr32/src/sys/net/bridgestp.c#2 integrate .. //depot/projects/avr32/src/sys/net/if.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_ef.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_ethersubr.c#3 integrate .. //depot/projects/avr32/src/sys/net/if_loop.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_mib.c#2 integrate .. //depot/projects/avr32/src/sys/net/if_vlan.c#3 integrate .. //depot/projects/avr32/src/sys/net/raw_cb.c#2 integrate .. //depot/projects/avr32/src/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/avr32/src/sys/net/vnet.h#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/avr32/src/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/avr32/src/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/avr32/src/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_ether.c#2 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_gif.c#2 integrate .. //depot/projects/avr32/src/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/if_ether.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/igmp.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/in_mcast.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/in_proto.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_fw2.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/ip_input.c#2 integrate .. //depot/projects/avr32/src/sys/netinet/ip_output.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/avr32/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/avr32/src/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/avr32/src/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/avr32/src/sys/netinet6/in6.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/avr32/src/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_input.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/avr32/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/avr32/src/sys/netinet6/scope6.c#2 integrate .. //depot/projects/avr32/src/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/avr32/src/sys/netipsec/keysock.c#2 integrate .. //depot/projects/avr32/src/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/bootp_subr.c#2 integrate .. //depot/projects/avr32/src/sys/nfsclient/nfs_diskless.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/machdep.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/pmap.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/swtch.S#2 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/trap.c#2 integrate .. //depot/projects/avr32/src/sys/powerpc/booke/trap_subr.S#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/avr32/src/sys/powerpc/include/pcb.h#3 integrate .. //depot/projects/avr32/src/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/avr32/src/sys/sys/cdefs.h#3 integrate .. //depot/projects/avr32/src/sys/sys/fcntl.h#2 integrate .. //depot/projects/avr32/src/sys/sys/param.h#3 integrate .. //depot/projects/avr32/src/sys/sys/priv.h#2 integrate .. //depot/projects/avr32/src/sys/sys/systm.h#2 integrate .. //depot/projects/avr32/src/sys/xdr/xdr_mem.c#2 integrate .. //depot/projects/avr32/src/tools/regression/lib/libc/stdio/Makefile#2 integrate .. //depot/projects/avr32/src/tools/regression/lib/libc/stdio/test-getdelim.c#1 branch .. //depot/projects/avr32/src/tools/regression/lib/libc/stdio/test-printbasic.c#1 branch .. //depot/projects/avr32/src/tools/regression/lib/libc/string/Makefile#2 integrate .. //depot/projects/avr32/src/tools/regression/lib/libc/string/test-stpncpy.c#1 branch .. //depot/projects/avr32/src/tools/regression/lib/libc/string/test-wcscasecmp.c#1 branch .. //depot/projects/avr32/src/tools/regression/lib/libc/string/test-wcsnlen.c#1 branch .. //depot/projects/avr32/src/tools/regression/lib/libmp/test-libmp.c#2 integrate .. //depot/projects/avr32/src/tools/tools/ath/Makefile.inc#2 integrate .. //depot/projects/avr32/src/tools/tools/ath/athregs/dumpregs_5416.c#2 integrate .. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/Files/root/updatep1#1 branch .. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/Files/root/updatep2#1 branch .. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/G2348#2 integrate .. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/G2358#2 integrate .. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/avila#2 integrate .. //depot/projects/avr32/src/tools/tools/nanobsd/gateworks/cambria#2 integrate .. //depot/projects/avr32/src/usr.bin/chkey/Makefile#2 integrate .. //depot/projects/avr32/src/usr.bin/fstat/msdosfs.c#2 integrate .. //depot/projects/avr32/src/usr.bin/newkey/Makefile#2 integrate .. //depot/projects/avr32/src/usr.bin/newkey/generic.c#2 integrate .. //depot/projects/avr32/src/usr.bin/newkey/newkey.c#2 integrate .. //depot/projects/avr32/src/usr.bin/newkey/update.c#2 integrate .. //depot/projects/avr32/src/usr.bin/nl/nl.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/keyserv/Makefile#2 integrate .. //depot/projects/avr32/src/usr.sbin/keyserv/setkey.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/makefs/ffs/ufs_bswap.h#2 integrate .. //depot/projects/avr32/src/usr.sbin/pppd/cbcp.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/timed/timed/Makefile#2 integrate .. //depot/projects/avr32/src/usr.sbin/timed/timed/networkdelta.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/timed/timedc/Makefile#2 integrate .. //depot/projects/avr32/src/usr.sbin/trpt/trpt.c#2 integrate .. //depot/projects/avr32/src/usr.sbin/usbconfig/dump.c#3 integrate .. //depot/projects/avr32/src/usr.sbin/usbconfig/dump.h#3 integrate .. //depot/projects/avr32/src/usr.sbin/usbconfig/usbconfig.c#3 integrate Differences ... ==== //depot/projects/avr32/src/ObsoleteFiles.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.173 2009/02/24 16:47:59 thompsa Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.174 2009/02/26 21:43:15 ed Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20090226: libmp(3) functions renamed +OLD_LIBS+=usr/lib/libmp.so.6 # 20090223: changeover of USB stacks OLD_FILES+=usr/include/dev/usb2/include/ufm2_ioctl.h OLD_FILES+=usr/include/dev/usb2/include/urio2_ioctl.h ==== //depot/projects/avr32/src/UPDATING#3 (text+ko) ==== @@ -22,6 +22,10 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20090227: + The /dev handling for the new USB stack has changed, a + buildworld/installworld is required for libusb20. + 20090223: The new USB2 stack has now been permanently moved in and all kernel and module names reverted to their previous values (eg, usb, ehci, ohci, @@ -1255,4 +1259,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.569 2009/02/23 19:30:00 thompsa Exp $ +$FreeBSD: src/UPDATING,v 1.570 2009/02/27 17:32:49 thompsa Exp $ ==== //depot/projects/avr32/src/bin/ps/extern.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD: src/bin/ps/extern.h,v 1.38 2007/10/26 08:00:40 julian Exp $ + * $FreeBSD: src/bin/ps/extern.h,v 1.39 2009/02/26 18:01:07 attilio Exp $ */ struct kinfo; @@ -71,6 +71,7 @@ void rgroupname(KINFO *, VARENT *); void runame(KINFO *, VARENT *); void rvar(KINFO *, VARENT *); +int s_comm(KINFO *); int s_label(KINFO *); int s_rgroupname(KINFO *); int s_runame(KINFO *); ==== //depot/projects/avr32/src/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.78 2007/10/28 17:10:36 julian Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.79 2009/02/26 18:01:07 attilio Exp $"); #include #include @@ -79,8 +79,8 @@ CHAR, NULL, 0}, {"blocked", "", "sigmask", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"caught", "", "sigcatch", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"comm", "COMMAND", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, - NULL, 0}, + {"comm", "COMMAND", NULL, LJUST|DSIZ, ucomm, s_comm, + COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0}, {"command", "COMMAND", NULL, COMM|LJUST|USER, command, NULL, 16, 0, CHAR, NULL, 0}, {"cpu", "CPU", NULL, 0, kvar, NULL, 3, KOFF(ki_estcpu), UINT, "d", @@ -135,12 +135,13 @@ LONG, "ld", 0}, {"nvcsw", "NVCSW", NULL, USER, rvar, NULL, 5, ROFF(ru_nvcsw), LONG, "ld", 0}, - {"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, 8, 0, CHAR, NULL, 0}, + {"nwchan", "NWCHAN", NULL, LJUST, nwchan, NULL, sizeof(void *) * 2, 0, + CHAR, NULL, 0}, {"oublk", "OUBLK", NULL, USER, rvar, NULL, 4, ROFF(ru_oublock), LONG, "ld", 0}, {"oublock", "", "oublk", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"paddr", "PADDR", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR, - "lx", 0}, + {"paddr", "PADDR", NULL, 0, kvar, NULL, sizeof(void *) * 2, + KOFF(ki_paddr), KPTR, "lx", 0}, {"pagein", "PAGEIN", NULL, USER, pagein, NULL, 6, 0, CHAR, NULL, 0}, {"pcpu", "", "%cpu", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"pending", "", "sig", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -195,13 +196,13 @@ {"tsiz", "TSIZ", NULL, 0, kvar, NULL, 4, KOFF(ki_tsize), PGTOK, "ld", 0}, {"tt", "TT ", NULL, 0, tname, NULL, 4, 0, CHAR, NULL, 0}, {"tty", "TTY", NULL, LJUST, longtname, NULL, 8, 0, CHAR, NULL, 0}, - {"ucomm", "UCOMM", NULL, LJUST, ucomm, NULL, MAXCOMLEN, 0, CHAR, NULL, - 0}, + {"ucomm", "UCOMM", NULL, LJUST|DSIZ, ucomm, s_comm, + COMMLEN + OCOMMLEN + 1, 0, CHAR, NULL, 0}, {"uid", "UID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_uid), UINT, UIDFMT, 0}, {"upr", "UPR", NULL, 0, upr, NULL, 3, 0, CHAR, NULL, 0}, - {"uprocp", "UPROCP", NULL, 0, kvar, NULL, 8, KOFF(ki_paddr), KPTR, - "lx", 0}, + {"uprocp", "UPROCP", NULL, 0, kvar, NULL, sizeof(void *) * 2, + KOFF(ki_paddr), KPTR, "lx", 0}, {"user", "USER", NULL, LJUST|DSIZ, uname, s_uname, USERLEN, 0, CHAR, NULL, 0}, {"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, @@ -325,6 +326,8 @@ */ rflen = strlen(v->alias) + strlen(hp) + 2; realfmt = malloc(rflen); + if (realfmt == NULL) + errx(1, "malloc failed"); snprintf(realfmt, rflen, "%s=%s", v->alias, hp); parsefmt(realfmt, user); } ==== //depot/projects/avr32/src/bin/ps/print.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ #endif #include -__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.97 2008/11/13 15:06:40 emaste Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.98 2009/02/26 18:01:07 attilio Exp $"); #include #include @@ -177,6 +177,7 @@ void ucomm(KINFO *k, VARENT *ve) { + char tmpbuff[COMMLEN + OCOMMLEN + 2]; VAR *v; v = ve->var; @@ -184,8 +185,15 @@ (void)printf("%s", k->ki_p->ki_comm); if (showthreads && k->ki_p->ki_numthreads > 1) printf("/%s", k->ki_p->ki_ocomm); - } else - (void)printf("%-*s", v->width, k->ki_p->ki_comm); + } else { + bzero(tmpbuff, sizeof(tmpbuff)); + if (showthreads && k->ki_p->ki_numthreads > 1) + sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm, + k->ki_p->ki_ocomm); + else + sprintf(tmpbuff, "%s", k->ki_p->ki_comm); + (void)printf("%-*s", v->width, tmpbuff); + } } void @@ -821,6 +829,20 @@ } int +s_comm(KINFO *k) +{ + char tmpbuff[COMMLEN + OCOMMLEN + 2]; + + bzero(tmpbuff, sizeof(tmpbuff)); + if (showthreads && k->ki_p->ki_numthreads > 1) + sprintf(tmpbuff, "%s/%s", k->ki_p->ki_comm, + k->ki_p->ki_ocomm); + else + sprintf(tmpbuff, "%s", k->ki_p->ki_comm); + return (strlen(tmpbuff)); +} + +int s_label(KINFO *k) { char *string = NULL; ==== //depot/projects/avr32/src/contrib/less/line.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/line.c,v 1.6 2007/11/16 22:24:31 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/line.c,v 1.7 2009/02/28 06:27:23 das Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -601,9 +601,11 @@ { if (!is_ansi_end(ch) && !is_ansi_middle(ch)) { /* Remove whole unrecognized sequence. */ - do { + while (curr) { --curr; - } while (!IS_CSI_START(linebuf[curr])); + if (IS_CSI_START(linebuf[curr])) + break; + } return 0; } a = AT_ANSI; /* Will force re-AT_'ing around it. */ ==== //depot/projects/avr32/src/contrib/telnet/libtelnet/pk.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ #include -__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/pk.c,v 1.10 2002/08/22 06:19:07 nsayer Exp $"); +__FBSDID("$FreeBSD: src/contrib/telnet/libtelnet/pk.c,v 1.11 2009/02/26 21:43:15 ed Exp $"); /* public key routines */ /* functions: @@ -68,19 +68,19 @@ short base = (1 << 8); char *k; - z = itom(0); - a = itom(0); - madd(ck, z, a); + z = mp_itom(0); + a = mp_itom(0); + mp_madd(ck, z, a); for (i = 0; i < ((KEYSIZE - 128) / 8); i++) { - sdiv(a, base, a, &r); + mp_sdiv(a, base, a, &r); } k = (char *)ideakey; for (i = 0; i < 16; i++) { - sdiv(a, base, a, &r); + mp_sdiv(a, base, a, &r); *k++ = r; } - mfree(z); - mfree(a); + mp_mfree(z); + mp_mfree(a); } /* @@ -97,19 +97,19 @@ short base = (1 << 8); char *k; - z = itom(0); - a = itom(0); - madd(ck, z, a); + z = mp_itom(0); + a = mp_itom(0); + mp_madd(ck, z, a); for (i = 0; i < ((KEYSIZE - 64) / 2) / 8; i++) { - sdiv(a, base, a, &r); + mp_sdiv(a, base, a, &r); } k = (char *)deskey; for (i = 0; i < 8; i++) { - sdiv(a, base, a, &r); + mp_sdiv(a, base, a, &r); *k++ = r; } - mfree(z); - mfree(a); + mp_mfree(z); + mp_mfree(a); } /* @@ -121,19 +121,19 @@ MINT *public; MINT *secret; MINT *common; - MINT *modulus = xtom(HEXMODULUS); + MINT *modulus = mp_xtom(HEXMODULUS); - public = xtom(xpublic); - secret = xtom(xsecret); - common = itom(0); - pow(public, secret, modulus, common); + public = mp_xtom(xpublic); + secret = mp_xtom(xsecret); + common = mp_itom(0); + mp_pow(public, secret, modulus, common); extractdeskey(common, deskey); extractideakey(common, ideakey); des_set_odd_parity(deskey); - mfree(common); - mfree(secret); - mfree(public); - mfree(modulus); + mp_mfree(common); + mp_mfree(secret); + mp_mfree(public); + mp_mfree(modulus); } /* @@ -161,12 +161,12 @@ # define BASEBITS (8*sizeof(short) - 1) # define BASE (1 << BASEBITS) - MINT *pk = itom(0); - MINT *sk = itom(0); + MINT *pk = mp_itom(0); + MINT *sk = mp_itom(0); MINT *tmp; - MINT *base = itom(BASE); - MINT *root = itom(PROOT); - MINT *modulus = xtom(HEXMODULUS); + MINT *base = mp_itom(BASE); + MINT *root = mp_itom(PROOT); + MINT *modulus = mp_xtom(HEXMODULUS); short r; unsigned short seed[KEYSIZE/BASEBITS + 1]; char *xkey; @@ -174,24 +174,24 @@ getseed((char *)seed, sizeof(seed)); for (i = 0; i < KEYSIZE/BASEBITS + 1; i++) { r = seed[i] % BASE; - tmp = itom(r); - mult(sk, base, sk); - madd(sk, tmp, sk); - mfree(tmp); + tmp = mp_itom(r); + mp_mult(sk, base, sk); + mp_madd(sk, tmp, sk); + mp_mfree(tmp); } - tmp = itom(0); - mdiv(sk, modulus, tmp, sk); - mfree(tmp); - pow(root, sk, modulus, pk); - xkey = mtox(sk); + tmp = mp_itom(0); + mp_mdiv(sk, modulus, tmp, sk); + mp_mfree(tmp); + mp_pow(root, sk, modulus, pk); + xkey = mp_mtox(sk); adjust(secret, xkey); - xkey = mtox(pk); + xkey = mp_mtox(pk); adjust(public, xkey); - mfree(sk); - mfree(base); - mfree(pk); - mfree(root); - mfree(modulus); + mp_mfree(sk); + mp_mfree(base); + mp_mfree(pk); + mp_mfree(root); + mp_mfree(modulus); } /* ==== //depot/projects/avr32/src/gnu/usr.bin/groff/tmac/mdoc.local#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.66 2008/12/13 16:13:37 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.67 2009/02/28 05:47:41 das Exp $ .\" .\" %beginstrip% . @@ -73,6 +73,10 @@ .ds doc-operating-system-FreeBSD-7.1 7.1 .ds doc-operating-system-FreeBSD-8.0 8.0 . +.\" Definitions not (yet) in doc-syms +.ds doc-str-St--p1003.1-2008 \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1-2008 +.as doc-str-St--p1003.1-2008 " (\*[Lq]\)\*[Px]\*[doc-str-St].1\*[Rq]) +. .ec . .\" Locale support ==== //depot/projects/avr32/src/include/stdio.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)stdio.h 8.5 (Berkeley) 4/29/95 - * $FreeBSD: src/include/stdio.h,v 1.73 2008/05/07 15:12:45 jhb Exp $ + * $FreeBSD: src/include/stdio.h,v 1.74 2009/02/28 06:00:58 das Exp $ */ #ifndef _STDIO_H_ @@ -51,6 +51,17 @@ #define _SIZE_T_DECLARED #endif +#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809 +#ifndef _OFF_T_DECLARED +#define _OFF_T_DECLARED +typedef __off_t off_t; +#endif +#ifndef _SSIZE_T_DECLARED +#define _SSIZE_T_DECLARED +typedef __ssize_t ssize_t; +#endif +#endif + #if __BSD_VISIBLE || __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE #ifndef _VA_LIST_DECLARED typedef __va_list va_list; @@ -330,6 +341,34 @@ char *tempnam(const char *, const char *); #endif +#if __BSD_VISIBLE || __POSIX_VISIBLE >= 200809 +ssize_t getdelim(char ** __restrict, size_t * __restrict, int, + FILE * __restrict); + +/* + * Every programmer and his dog wrote functions called getline() + * before POSIX.1-2008 came along and decided to usurp the name, so we + * don't prototype getline() by default unless one of the following is true: + * a) the app has requested it specifically by defining _WITH_GETLINE + * b) the app has requested a POSIX.1-2008 environment via _POSIX_C_SOURCE + * c) the app defines a GNUism such as _BSD_SOURCE or _GNU_SOURCE + */ +#ifndef _WITH_GETLINE +#if defined(_BSD_SOURCE) || defined(_GNU_SOURCE) +#define _WITH_GETLINE +#elif defined(_POSIX_C_SOURCE) +#if _POSIX_C_SOURCE > 200809 +#define _WITH_GETLINE +#endif +#endif +#endif + +#ifdef _WITH_GETLINE +ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict); +#endif + +#endif /* __BSD_VISIBLE || __POSIX_VISIBLE >= 200809 */ + /* * Routines that are purely local. */ ==== //depot/projects/avr32/src/include/string.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)string.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/string.h,v 1.28 2009/01/31 18:27:02 das Exp $ + * $FreeBSD: src/include/string.h,v 1.31 2009/02/28 06:00:58 das Exp $ */ #ifndef _STRING_H_ @@ -63,12 +63,15 @@ int memcmp(const void *, const void *, size_t) __pure; void *memcpy(void * __restrict, const void * __restrict, size_t); #if __BSD_VISIBLE -void *memmem(const void *, size_t, const void *, size_t); +void *memmem(const void *, size_t, const void *, size_t) __pure; #endif void *memmove(void *, const void *, size_t); void *memset(void *, int, size_t); +#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE +char *stpcpy(char * __restrict, const char * __restrict); +char *stpncpy(char * __restrict, const char * __restrict, size_t); +#endif #if __BSD_VISIBLE -char *stpcpy(char *, const char *); char *strcasestr(const char *, const char *) __pure; #endif char *strcat(char * __restrict, const char * __restrict); @@ -85,8 +88,8 @@ int strerror_r(int, char *, size_t); #endif #if __BSD_VISIBLE -size_t strlcat(char *, const char *, size_t); -size_t strlcpy(char *, const char *, size_t); +size_t strlcat(char * __restrict, const char * __restrict, size_t); +size_t strlcpy(char * __restrict, const char * __restrict, size_t); #endif size_t strlen(const char *) __pure; #if __BSD_VISIBLE @@ -95,14 +98,19 @@ char *strncat(char * __restrict, const char * __restrict, size_t); int strncmp(const char *, const char *, size_t) __pure; char *strncpy(char * __restrict, const char * __restrict, size_t); +#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE +char *strndup(const char *, size_t) __malloc_like; +size_t strnlen(const char *, size_t) __pure; +#endif #if __BSD_VISIBLE -char *strndup(const char *, size_t) __malloc_like; char *strnstr(const char *, const char *, size_t) __pure; #endif char *strpbrk(const char *, const char *) __pure; char *strrchr(const char *, int) __pure; #if __BSD_VISIBLE char *strsep(char **, const char *); +#endif +#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE char *strsignal(int); #endif size_t strspn(const char *, const char *) __pure; ==== //depot/projects/avr32/src/include/wchar.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.47 2009/01/31 18:27:02 das Exp $ + * $FreeBSD: src/include/wchar.h,v 1.48 2009/02/28 06:00:58 das Exp $ */ /*- @@ -210,13 +210,19 @@ #define wcwidth(_c) __wcwidth(_c) #endif -#if __BSD_VISIBLE -wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict); +#if __POSIX_VISIBLE >= 200809 || __BSD_VISIBLE size_t mbsnrtowcs(wchar_t * __restrict, const char ** __restrict, size_t, size_t, mbstate_t * __restrict); wchar_t *wcsdup(const wchar_t *) __malloc_like; +int wcscasecmp(const wchar_t *, const wchar_t *); +int wcsncasecmp(const wchar_t *, const wchar_t *, size_t n); +size_t wcsnlen(const wchar_t *, size_t) __pure; size_t wcsnrtombs(char * __restrict, const wchar_t ** __restrict, size_t, size_t, mbstate_t * __restrict); +#endif + +#if __BSD_VISIBLE +wchar_t *fgetwln(struct __sFILE * __restrict, size_t * __restrict); size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); #endif ==== //depot/projects/avr32/src/lib/libc/stdio/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.3 (Berkeley) 4/17/94 -# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.39 2008/06/29 21:52:40 das Exp $ +# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.40 2009/02/28 06:00:58 das Exp $ # stdio sources .PATH: ${.CURDIR}/stdio @@ -10,8 +10,8 @@ fileno.c findfp.c flags.c fopen.c fprintf.c fpurge.c fputc.c fputs.c \ fputwc.c fputws.c fread.c freopen.c fscanf.c fseek.c fsetpos.c \ ftell.c funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwscanf.c \ - fwrite.c getc.c \ - getchar.c gets.c getw.c getwc.c getwchar.c makebuf.c mktemp.c \ + fwrite.c getc.c getchar.c getdelim.c getline.c \ + gets.c getw.c getwc.c getwchar.c makebuf.c mktemp.c \ perror.c printf.c printf-pos.c putc.c putchar.c \ puts.c putw.c putwc.c putwchar.c \ refill.c remove.c rewind.c rget.c scanf.c setbuf.c setbuffer.c \ @@ -33,7 +33,8 @@ MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \ flockfile.3 \ fopen.3 fputs.3 \ - fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 getwc.3 mktemp.3 \ + fputws.3 fread.3 fseek.3 funopen.3 fwide.3 getc.3 \ + getline.3 getwc.3 mktemp.3 \ printf.3 putc.3 putwc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 \ ungetc.3 ungetwc.3 wprintf.3 wscanf.3 @@ -53,6 +54,7 @@ MLINKS+=funopen.3 fropen.3 funopen.3 fwopen.3 MLINKS+=getc.3 fgetc.3 getc.3 getc_unlocked.3 getc.3 getchar.3 \ getc.3 getchar_unlocked.3 getc.3 getw.3 +MLINKS+=getline.3 getdelim.3 MLINKS+=getwc.3 fgetwc.3 getwc.3 getwchar.3 MLINKS+=mktemp.3 mkdtemp.3 mktemp.3 mkstemp.3 mktemp.3 mkstemps.3 MLINKS+=printf.3 asprintf.3 printf.3 fprintf.3 \ ==== //depot/projects/avr32/src/lib/libc/stdio/Symbol.map#2 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.8 2008/05/05 16:14:02 jhb Exp $ + * $FreeBSD: src/lib/libc/stdio/Symbol.map,v 1.9 2009/02/28 06:00:58 das Exp $ */ FBSD_1.0 { @@ -110,6 +110,11 @@ wscanf; }; +FBSD_1.1 { + getdelim; + getline; +}; + FBSDprivate_1.0 { _flockfile; _flockfile_debug_stub; ==== //depot/projects/avr32/src/lib/libc/stdio/fgetln.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fgetln.3 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.9 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fgetln.3,v 1.10 2009/02/28 06:00:58 das Exp $ .\" .Dd April 19, 1994 .Dt FGETLN 3 @@ -116,6 +116,7 @@ .Xr fgets 3 , .Xr fgetwln 3 , .Xr fopen 3 , +.Xr getline 3 , .Xr putc 3 .Sh HISTORY The ==== //depot/projects/avr32/src/lib/libc/stdio/fgets.3#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fgets.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdio/fgets.3,v 1.21 2007/01/09 00:28:06 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/fgets.3,v 1.22 2009/02/28 06:00:58 das Exp $ .\" .Dd June 4, 1993 .Dt FGETS 3 @@ -147,7 +147,8 @@ .Xr feof 3 , .Xr ferror 3 , .Xr fgetln 3 , -.Xr fgetws 3 +.Xr fgetws 3 , +.Xr getline 3 .Sh STANDARDS The functions .Fn fgets ==== //depot/projects/avr32/src/lib/libc/stdio/printf-pos.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/printf-pos.c,v 1.4 2008/06/29 23:46:06 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/printf-pos.c,v 1.5 2009/02/28 04:58:18 das Exp $"); /* * This is the code responsible for handling positional arguments @@ -61,7 +61,7 @@ enum typeid { T_UNUSED, TP_SHORT, T_INT, T_U_INT, TP_INT, T_LONG, T_U_LONG, TP_LONG, T_LLONG, T_U_LLONG, TP_LLONG, - T_PTRDIFFT, TP_PTRDIFFT, T_SIZET, TP_SIZET, + T_PTRDIFFT, TP_PTRDIFFT, T_SSIZET, T_SIZET, TP_SIZET, T_INTMAXT, T_UINTMAXT, TP_INTMAXT, TP_VOID, TP_CHAR, TP_SCHAR, T_DOUBLE, T_LONG_DOUBLE, T_WINT, TP_WCHAR }; @@ -145,7 +145,7 @@ if (flags & INTMAXT) types->table[types->nextarg++] = T_INTMAXT; else if (flags & SIZET) - types->table[types->nextarg++] = T_SIZET; + types->table[types->nextarg++] = T_SSIZET; else if (flags & PTRDIFFT) types->table[types->nextarg++] = T_PTRDIFFT; else if (flags & LLONGINT) @@ -168,7 +168,7 @@ else if (flags & SIZET) types->table[types->nextarg++] = T_SIZET; else if (flags & PTRDIFFT) - types->table[types->nextarg++] = T_PTRDIFFT; + types->table[types->nextarg++] = T_SIZET; else if (flags & LLONGINT) types->table[types->nextarg++] = T_U_LLONG; else if (flags & LONGINT) @@ -716,6 +716,9 @@ case T_SIZET: (*argtable) [n].sizearg = va_arg (ap, size_t); break; + case T_SSIZET: + (*argtable) [n].sizearg = va_arg (ap, ssize_t); + break; case TP_SIZET: (*argtable) [n].psizearg = va_arg (ap, size_t *); break; ==== //depot/projects/avr32/src/lib/libc/stdio/stdio.3#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)stdio.3 8.7 (Berkeley) 4/19/94 -.\" $FreeBSD: src/lib/libc/stdio/stdio.3,v 1.28 2007/01/09 00:28:07 imp Exp $ +.\" $FreeBSD: src/lib/libc/stdio/stdio.3,v 1.29 2009/02/28 06:00:58 das Exp $ .\" -.Dd January 10, 2003 +.Dd February 28, 2009 .Dt STDIO 3 .Os .Sh NAME @@ -276,6 +276,8 @@ .It "fwrite binary stream input/output" .It "getc get next character or word from input stream" .It "getchar get next character or word from input stream" +.It "getdelim get a line from a stream" +.It "getline get a line from a stream" .It "gets get a line from a stream" .It "getw get next character or word from input stream" .It "getwc get next wide character from input stream" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Mar 1 16:07:52 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDCF21065744; Sun, 1 Mar 2009 16:07: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 8F906106566C for ; Sun, 1 Mar 2009 16:07:49 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7E3668FC1A for ; Sun, 1 Mar 2009 16:07:49 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n21G7noj021994 for ; Sun, 1 Mar 2009 16:07:49 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n21G7nxb021992 for perforce@freebsd.org; Sun, 1 Mar 2009 16:07:49 GMT (envelope-from antab@FreeBSD.org) Date: Sun, 1 Mar 2009 16:07:49 GMT Message-Id: <200903011607.n21G7nxb021992@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 158535 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2009 16:07:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=158535 Change 158535 by antab@antab_farm on 2009/03/01 16:07:43 Add arch dependent files to build world, needs more work later. Able to build and link libs, fails when it tries to link atrun. Affected files ... .. //depot/projects/avr32/src/libexec/rtld-elf/avr32/reloc.c#1 add .. //depot/projects/avr32/src/libexec/rtld-elf/avr32/rtld_start.S#1 add .. //depot/projects/avr32/src/sys/avr32/avr32/support.S#8 edit .. //depot/projects/avr32/src/sys/avr32/include/floatingpoint.h#1 add .. //depot/projects/avr32/src/usr.bin/Makefile#3 edit .. //depot/projects/avr32/src/usr.bin/xlint/lint1/param.h#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/support.S#8 (text+ko) ==== @@ -49,6 +49,7 @@ /* * memcpy/bcopy and bzero use byte access, this is slow and needs rewriting * later on + * NOTE: This need more work, memmove is wrong (need to check for overlapping) */ /** * memcpy(to, from, len) @@ -56,6 +57,7 @@ * r11: from * r10: len */ +ENTRY(memmove) ENTRY(memcpy) /* Swap to and from parameters and continue to copy */ mov r8, r12 ==== //depot/projects/avr32/src/usr.bin/Makefile#3 (text+ko) ==== @@ -233,7 +233,7 @@ ${_ypmatch} \ ${_ypwhich} -.if ${MACHINE_ARCH} != "arm" +.if ${MACHINE_ARCH} != "arm" && ${MACHINE_ARCH} != "avr32" _truss= truss .endif ==== //depot/projects/avr32/src/usr.bin/xlint/lint1/param.h#2 (text+ko) ==== @@ -98,6 +98,9 @@ #elif __mips__ #define PTRDIFF_IS_LONG 0 #define SIZEOF_IS_ULONG 0 +#elif __avr32__ +#define PTRDIFF_IS_LONG 0 +#define SIZEOF_IS_ULONG 0 #else #error unknown machine type #endif From owner-p4-projects@FreeBSD.ORG Sun Mar 1 18:48:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A02A710656CC; Sun, 1 Mar 2009 18:48:39 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56CBF10656BB for ; Sun, 1 Mar 2009 18:48:39 +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 450D98FC1C for ; Sun, 1 Mar 2009 18:48:39 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n21ImdrE046520 for ; Sun, 1 Mar 2009 18:48:39 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n21ImdMt046518 for perforce@freebsd.org; Sun, 1 Mar 2009 18:48:39 GMT (envelope-from pgj@FreeBSD.org) Date: Sun, 1 Mar 2009 18:48:39 GMT Message-Id: <200903011848.n21ImdMt046518@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 158551 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2009 18:48:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=158551 Change 158551 by pgj@beehive on 2009/03/01 18:47:38 MFen (www): 1.228 -> 1.229 www/hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#2 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#2 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -19,6 +19,19 @@ 2009 + 3 + + + 1 + + +

Új tag: Dmitry + Chagin (src)

+ + + + + 2 From owner-p4-projects@FreeBSD.ORG Sun Mar 1 20:02:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C9B81065848; Sun, 1 Mar 2009 20:02:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B6D41065759 for ; Sun, 1 Mar 2009 20:02:03 +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 6D3478FC14 for ; Sun, 1 Mar 2009 20:02:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n21K22Cw054730 for ; Sun, 1 Mar 2009 20:02:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n21K226O054728 for perforce@freebsd.org; Sun, 1 Mar 2009 20:02:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 1 Mar 2009 20:02:02 GMT Message-Id: <200903012002.n21K226O054728@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 158561 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2009 20:02:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=158561 Change 158561 by hselasky@hselasky_laptop001 on 2009/03/01 20:01:18 Add new device ID to usbdevs. Requested by: Rainer Hurling Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#45 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#45 (text+ko) ==== @@ -1630,6 +1630,7 @@ product LOGITECH QUICKCAMPRO 0x0810 QuickCam Pro product LOGITECH QUICKCAMEXP 0x0840 QuickCam Express product LOGITECH QUICKCAM 0x0850 QuickCam +product LOGITECH QUICKCAMPRO2 0x0990 QuickCam 9000 Pro product LOGITECH N43 0xc000 N43 product LOGITECH N48 0xc001 N48 mouse product LOGITECH MBA47 0xc002 M-BA47 mouse From owner-p4-projects@FreeBSD.ORG Sun Mar 1 21:28:32 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9D2701065677; Sun, 1 Mar 2009 21:28: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 38F771065676 for ; Sun, 1 Mar 2009 21:28: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 24A798FC13 for ; Sun, 1 Mar 2009 21:28:30 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n21LSUq9087392 for ; Sun, 1 Mar 2009 21:28:30 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n21LSU7l087390 for perforce@freebsd.org; Sun, 1 Mar 2009 21:28:30 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 1 Mar 2009 21:28:30 GMT Message-Id: <200903012128.n21LSU7l087390@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 158563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 01 Mar 2009 21:28:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=158563 Change 158563 by hselasky@hselasky_laptop001 on 2009/03/01 21:28:08 usbdevs: Correct last commit. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#46 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#46 (text+ko) ==== @@ -1630,7 +1630,7 @@ product LOGITECH QUICKCAMPRO 0x0810 QuickCam Pro product LOGITECH QUICKCAMEXP 0x0840 QuickCam Express product LOGITECH QUICKCAM 0x0850 QuickCam -product LOGITECH QUICKCAMPRO2 0x0990 QuickCam 9000 Pro +product LOGITECH QUICKCAMPRO3 0x0990 QuickCam Pro 9000 product LOGITECH N43 0xc000 N43 product LOGITECH N48 0xc001 N48 mouse product LOGITECH MBA47 0xc002 M-BA47 mouse From owner-p4-projects@FreeBSD.ORG Mon Mar 2 09:36:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E59461065712; Mon, 2 Mar 2009 09: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 92E0E106570D for ; Mon, 2 Mar 2009 09:36:56 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 819548FC25 for ; Mon, 2 Mar 2009 09:36:56 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n229auYr042959 for ; Mon, 2 Mar 2009 09:36:56 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n229auZu042957 for perforce@freebsd.org; Mon, 2 Mar 2009 09:36:56 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 2 Mar 2009 09:36:56 GMT Message-Id: <200903020936.n229auZu042957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158580 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 09:36:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=158580 Change 158580 by lulf@lulf_carrot on 2009/03/02 09:36:20 - Add macro for flushing write buffer. - Flush writebuffer after cleaning cache. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/cache.c#3 edit .. //depot/projects/avr32/src/sys/avr32/include/cache.h#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/cache.c#3 (text+ko) ==== @@ -122,6 +122,10 @@ avr32_dcache_line_size = pow(2, bit_value(SYS, CONFIG1, DLSZ, config) + 1); avr32_dcache_ways = pow(2, bit_value(SYS, CONFIG1, DASS, config)); + printf("ICACHE: sz %d lsz %d assoc %d\n", avr32_icache_size, + avr32_icache_line_size, avr32_icache_ways); + printf("DCACHE: sz %d lsz %d assoc %d\n", avr32_dcache_size, + avr32_dcache_line_size, avr32_dcache_ways); /* log2(1) = 0, meaning no cache present. */ if (avr32_icache_line_size == 1) { @@ -207,7 +211,6 @@ /* Put address at a cache line boundary. */ va = trunc_line(from, avr32_dcache_line_size); va_end = round_line(from + size, avr32_dcache_line_size); - while (va < va_end) { cache_line_op(va, DCACHE_WRITEBACK_INVALIDATE); va += avr32_dcache_line_size; @@ -223,7 +226,6 @@ /* Put address at a cache line boundary. */ va = trunc_line(from, avr32_dcache_line_size); va_end = round_line(from + size, avr32_dcache_line_size); - while (va < va_end) { cache_line_op(va, DCACHE_INVALIDATE); va += avr32_dcache_line_size; @@ -243,4 +245,5 @@ cache_line_op(va, DCACHE_WRITEBACK); va += avr32_dcache_line_size; } + avr32_wbflush(); } ==== //depot/projects/avr32/src/sys/avr32/include/cache.h#2 (text+ko) ==== @@ -152,5 +152,8 @@ #define avr32_dcache_wb_range(v, s) \ __mco_2args(, dcache_wb_range, (v), (s)) +/* For flushing the write buffer. */ +#define avr32_wbflush() __asm__ __volatile("sync 0" : : : "memory") + void avr32_config_cache(void); void avr32_dcache_compute_align(void); From owner-p4-projects@FreeBSD.ORG Mon Mar 2 09:41:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 84CFD1065673; Mon, 2 Mar 2009 09:41: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 42E08106564A for ; Mon, 2 Mar 2009 09:41:01 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 31AE48FC08 for ; Mon, 2 Mar 2009 09:41:01 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n229f0rn043352 for ; Mon, 2 Mar 2009 09:41:00 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n229f0Cg043350 for perforce@freebsd.org; Mon, 2 Mar 2009 09:41:00 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 2 Mar 2009 09:41:00 GMT Message-Id: <200903020941.n229f0Cg043350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158581 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 09:41:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=158581 Change 158581 by lulf@lulf_carrot on 2009/03/02 09:40:24 - Use uncached segment for tmpaddr. - Flush write buffer before sync to make sure. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/busdma_machdep.c#3 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/busdma_machdep.c#3 (text+ko) ==== @@ -460,7 +460,8 @@ void *tmpaddr = (void *)*vaddr; if (tmpaddr) { - tmpaddr = (void *)AVR32_PHYS_TO_P1(vtophys(tmpaddr)); + /* XXX: */ + tmpaddr = (void *)AVR32_PHYS_TO_P2(vtophys(tmpaddr)); newmap->origbuffer = *vaddr; newmap->allocbuffer = tmpaddr; avr32_dcache_wbinv_range((vm_offset_t)*vaddr, @@ -799,7 +800,7 @@ * Flush the write buffer. * XXX Is this always necessary? */ - //avr32_wbflush(); + avr32_wbflush(); op &= (BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); if (op == 0) From owner-p4-projects@FreeBSD.ORG Mon Mar 2 15:39:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CE34106567E; Mon, 2 Mar 2009 15:39: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 3C4CD1065672 for ; Mon, 2 Mar 2009 15:39:04 +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 282E28FC26 for ; Mon, 2 Mar 2009 15:39:04 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22Fd3kG093344 for ; Mon, 2 Mar 2009 15:39:03 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22Fd3S2093342 for perforce@freebsd.org; Mon, 2 Mar 2009 15:39:03 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 2 Mar 2009 15:39:03 GMT Message-Id: <200903021539.n22Fd3S2093342@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 158584 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 15:39:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=158584 Change 158584 by pgj@beehive on 2009/03/02 15:38:54 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#22 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/dchagin.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#16 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#16 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#18 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#14 integrate .. //depot/projects/docproj_hu/www/en/ports/categories#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#10 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#9 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.software.xml#2 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#39 integrate .. //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#5 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#22 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.471 2009/02/19 22:04:29 mva Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.472 2009/03/01 11:17:00 dchagin Exp $ --> aaron@FreeBSD.org"> @@ -244,6 +244,8 @@ dburr@FreeBSD.org"> +dchagin@FreeBSD.org"> + dcs@FreeBSD.org"> dd@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1411,3 +1411,7 @@ &pgpkey.mva; + + &a.dchagin; + &pgpkey.dchagin; + ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#16 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -66,6 +66,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#18 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.213 2009/02/19 22:11:01 mva Exp $ +$FreeBSD: www/en/developers.sgml,v 1.214 2009/03/01 11:45:35 dchagin Exp $ --> @@ -124,6 +124,7 @@ + ==== //depot/projects/docproj_hu/www/en/donations/donors.sgml#14 (text+ko) ==== @@ -1,6 +1,6 @@ - + %developers; @@ -2553,6 +2553,18 @@ marcel Received + + + Charles Smeijer + HP/CPQ Gb NIC NC7770, PCI-X 133 HP p/n 284685-003 Rev 0G
+ HP/CPQ Gb NIC NC7770, PCI-X 133 HP p/n 284685-003 Rev 0E
+ HP/CPQ Dual port Gb NIC NC7170, PCI-X 133 HP p/n 313559-001 Rev 0A
+ SMC Fast ethernet USB NIC p/n 98-012084-585
+ IBM Gb NIC PCI-X 133 p/n 00P6130
+ HP DAT72 data cartridge 72 GB + ed + Received + &footer; ==== //depot/projects/docproj_hu/www/en/ports/categories#2 (text+ko) ==== @@ -1,5 +1,5 @@ #Originally from src/release/sysinstall/index.c,v 1.57 1998/10/15 -#$FreeBSD: www/en/ports/categories,v 1.38 2008/04/23 02:09:56 linimon Exp $ +#$FreeBSD: www/en/ports/categories,v 1.39 2009/02/26 01:44:43 linimon Exp $ # See categories.descriptions for the meaning of the abbrevations at the # end of each category. @@ -20,6 +20,7 @@ deskutils,"Various Desktop utilities.",EU devel,"Software development utilities and libraries.",SAAD dns,"DNS client and server utilities.",CCATI +docs,"Meta-ports for FreeBSD documentation.",VC editors,"Common text editors.",EU elisp,"Things related to Emacs Lisp.",VC emulators,"Utilities for emulating other OS types.",SAAD ==== //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#10 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.57 2008/11/14 21:12:47 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.58 2009/02/26 19:21:53 jkois Exp $ @@ -86,6 +86,20 @@ + + Acadix, LLC + http://www.acadix.biz + + Acadix, LLC offers a full range of services for FreeBSD and other + platforms, including system integration, file servers, WEB servers, + and programming/porting. Acadix provides on-site services to + businesses, schools, and charitable organizations in the Milwaukee + metro area. Programming services are available to all locations in + the U.S. For more information, please visit our website. + + + Advance Systems Group http://www.advansys.net/ ==== //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#9 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.40 2008/11/14 21:37:31 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.43 2009/02/26 21:01:20 jkois Exp $ @@ -890,14 +890,49 @@ http://www.rootbsd.net RootBSD is a hosting company specializing in virtual FreeBSD - servers. The FreeBSD Virtual Private Servers were created with - FreeBSD jails, and some custom development we have done on top - of that. Each VPS includes root access and a web-based control - panel for managing and monitoring the virtual FreeBSD environment. - Technical support is handled in-house by FreeBSD experts who can - diagnose problems and help you get up and running quickly. RootBSD - has donated multiple jails to FreeBSD developers to support the - community. + hosting and managed services. The FreeBSD Virtual Private + Servers allow users to modify the kernel, setup a firewall and + many more options. Each VPS includes root access and a web-based + control panel for managing the virtual environment. Technical + support is handled in-house by FreeBSD experts who can diagnose + problems and help you get up and running quickly. RootBSD has + donated services to FreeBSD developers to support the community. + + + + + ServerBeach + http://www.serverbeach.com + + Founded in 2002, ServerBeach was launched to serve the market's + thirst for self-managed servers equipped with powerful hardware, + fast and reliable bandwidth, convenient automation tools, and + first-class support - all at an affordable price. Self-managed + servers are not an afterthought at the Beach, it's our business. + And we do whatever we can to satisfy the needs of our core + customers, the "Geeks" - people like you. People like us. In 2004, + the picture improved even more when ServerBeach was acquired by + PEER 1. This allowed us to connect our data centers to the + rock-solid, ultra-fast PEER 1 network with our 100% Uptime + Guarantee. ServerBeach is the only self-managed hosting company + in the world that offers servers in three geographically diverse + locations: WEST COAST, CENTRAL US, and EAST COAST. Now offering + FreeBSD, Ubuntu, and other Linux Operating Systems. + + + + + SimpleRezo + http://www.simplerezo.com + + SimpleRezo, a French company, provides web hosting solutions based + exclusively on FreeBSD and technologies (jails or dedicated + server, Apache, PHP, Tomcat, MySQL, pgSQL...). Other services + include: Network architecture consulting (fail-over, high + availability), FreeBSD server administration or support (fileserver, + firewalls, mailserver) and others more. Please visit our website + to get more information. ==== //depot/projects/docproj_hu/www/share/sgml/commercial.software.xml#2 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.software.xml,v 1.10 2007/09/01 21:29:59 gabor Exp $ + $FreeBSD: www/share/sgml/commercial.software.xml,v 1.11 2009/02/26 20:48:10 jkois Exp $ @@ -1052,6 +1052,20 @@ + + Pacific Timesheet + http://www.pacifictimesheet.com/ + + Pacific Timesheet is a web-based timesheet software that provides + payroll, project, job costing, time and attendance features in one + system. Other modules include automated approvals, billing and + pay rates, time-off scheduling, custom reporting, iPhone timesheet, + IVR integration, time clock integration and payroll integration. + We support all major operating systems and browsers. Our software + is available as a licensed or as a ASP/online version. + + + PACT http://pact.insider.org/ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#39 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.228 2009/02/19 22:15:41 miwi Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.229 2009/03/01 11:45:35 dchagin Exp $ @@ -33,6 +33,20 @@ 2009 + 3 + + + 1 + + +

New committer: Dmitry + Chagin (src)

+ + + + + + 2 ==== //depot/projects/docproj_hu/www/share/sgml/usergroups.xml#5 (text+ko) ==== @@ -5,7 +5,7 @@ - $FreeBSD: www/share/sgml/usergroups.xml,v 1.75 2008/12/27 04:29:01 murray Exp $ + $FreeBSD: www/share/sgml/usergroups.xml,v 1.76 2009/02/27 17:07:01 jkois Exp $ @@ -325,18 +325,6 @@ - - BSD User Group Ekaterinburg (E#BUG) - http://bsdekaterinburg.ru/ - - The BSD User Group Ekaterinburg (E#BUG) is a - community of BSD users in Ekaterinburg, Russia. We distribute - BSD releases to all who asks us for it in our city, and we are - trying to help everyone to discover and use BSD. Please visit - our web site and learn more about us. - - - Russian UNIX Forums http://unixforums.org.ru From owner-p4-projects@FreeBSD.ORG Mon Mar 2 16:16:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D7A71065676; Mon, 2 Mar 2009 16:16:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D55B106566B for ; Mon, 2 Mar 2009 16:16:42 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1085C8FC15 for ; Mon, 2 Mar 2009 16:16:42 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22GGffm097104 for ; Mon, 2 Mar 2009 16:16:41 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22GGfrP097102 for perforce@freebsd.org; Mon, 2 Mar 2009 16:16:41 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 2 Mar 2009 16:16:41 GMT Message-Id: <200903021616.n22GGfrP097102@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 158585 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 16:16:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=158585 Change 158585 by pgj@beehive on 2009/03/02 16:15:56 MFen (doc): 1.420 -> 1.421 hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#27 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#27 (text+ko) ==== @@ -7,7 +7,7 @@ @@ -1213,6 +1213,14 @@ wlan_scan_ap_load="YES" wlan_scan_sta_load="YES" + + A &os; 7.X + változataiban mind a wlan_scan_ap + és wlan_scan_sta modulokra + szükségünk van, más verziók + esetén nem kell megadnunk ezeket. + + Emellett még azokra a modulokra is szükségünk van, amelyek a használni kívánt biztonsági protokollokhoz @@ -1267,9 +1275,16 @@ device wlan_ccmp # AES-CCMP titkosítás támogatása a 802.11 eszközök számára device wlan_tkip # TKIP és Michael titkosítás támogatása a 802.11 eszközök számára - A fentiek megadásával fordítsuk - újra és telepítsük a - rendszermagot, majd indítsuk újra a + Hozzátesszük, hogy a &os; + 7.X változatában a + wlan_scan_ap és + wlan_scan_sta modulok megadása + egyaránt kötelezõ, más + verzióknál viszont nem. + + Az elõbbiek megadásával + fordítsuk újra és telepítsük + a rendszermagot, majd indítsuk újra a számítógépünket. @@ -1283,7 +1298,6 @@ ath0: <Atheros 5212> mem 0xff9f0000-0xff9fffff irq 17 at device 2.0 on pci2 ath0: Ethernet address: 00:11:95:d5:43:62 ath0: mac 7.9 phy 4.5 radio 5.6 - From owner-p4-projects@FreeBSD.ORG Mon Mar 2 18:23:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 925911065690; Mon, 2 Mar 2009 18:23: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 481C4106568A for ; Mon, 2 Mar 2009 18:23:55 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 3555D8FC1E for ; Mon, 2 Mar 2009 18:23:55 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22INsS6024538 for ; Mon, 2 Mar 2009 18:23:54 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22INs3j024536 for perforce@freebsd.org; Mon, 2 Mar 2009 18:23:54 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 2 Mar 2009 18:23:54 GMT Message-Id: <200903021823.n22INs3j024536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 18:23:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=158590 Change 158590 by lulf@lulf_carrot on 2009/03/02 18:23:47 - Return the complete physical address, not just the page. This fixes a panic caused by busdma trying to convert the translated address into the uncached P2 segment, but the conversion modified the physical address, causing troubles when the memory was being used. This was later detected by uma. - Return 0 in case the lookup is unsuccessful. - P1 and P2 segments are only accessible to kernel processes, so is only handled in pmap_kextract. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#11 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#11 (text+ko) ==== @@ -284,7 +284,14 @@ vm_paddr_t pmap_kextract(vm_offset_t va) { - return pmap_extract(kernel_pmap, va); + + /* Don't lookup in page tables for P1 and P2 segments. */ + if ((va & AVR32_SEG_MASK) == AVR32_SEG_P1) + return (AVR32_P1_TO_PHYS(va)); + else if ((va & AVR32_SEG_MASK) == AVR32_SEG_P2) + return (AVR32_P2_TO_PHYS(va)); + + return (pmap_extract(kernel_pmap, va)); } /* @@ -735,14 +742,10 @@ { pt_entry_t *ent; - /* Don't lookup in page tables for P1 and P2 segments. */ - if ((va & AVR32_SEG_MASK) == AVR32_SEG_P1) - return (AVR32_P1_TO_PHYS(va)); - else if ((va & AVR32_SEG_MASK) == AVR32_SEG_P2) - return (AVR32_P2_TO_PHYS(va)); - ent = pmap_pte(pmap, va); - return pfn_get(*ent); + if (ent == NULL) + return (0); + return (pfn_get(*ent) | (va & PAGE_MASK)); } vm_page_t From owner-p4-projects@FreeBSD.ORG Mon Mar 2 18:41:14 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 065CA1065689; Mon, 2 Mar 2009 18:41: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 B23871065676 for ; Mon, 2 Mar 2009 18:41:12 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9F8488FC0A for ; Mon, 2 Mar 2009 18:41:12 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22IfCWK025920 for ; Mon, 2 Mar 2009 18:41:12 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22IfCNL025918 for perforce@freebsd.org; Mon, 2 Mar 2009 18:41:12 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 2 Mar 2009 18:41:12 GMT Message-Id: <200903021841.n22IfCNL025918@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 18:41:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=158591 Change 158591 by lulf@lulf_carrot on 2009/03/02 18:40:59 - Remove remains of arm busdma code. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#5 edit .. //depot/projects/avr32/src/sys/avr32/include/bus_dma.h#3 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#5 (text+ko) ==== @@ -369,16 +369,3 @@ { /* TODO: Implement */ } - -struct avr32_dma_range * -bus_dma_get_range(void) -{ - - return (NULL); -} - -int -bus_dma_get_range_nb(void) -{ - return (0); -} ==== //depot/projects/avr32/src/sys/avr32/include/bus_dma.h#3 (text+ko) ==== @@ -7,31 +7,4 @@ #include -#ifdef _AVR32_BUS_DMA_PRIVATE -/* - * avr32_dma_range - * - * This structure describes a valid DMA range. - */ -struct avr32_dma_range { - bus_addr_t dr_sysbase; /* system base address */ - bus_addr_t dr_busbase; /* appears here on bus */ - bus_size_t dr_len; /* length of range */ -}; - -/* _dm_buftype */ -#define AVR32_BUFTYPE_INVALID 0 -#define AVR32_BUFTYPE_LINEAR 1 -#define AVR32_BUFTYPE_MBUF 2 -#define AVR32_BUFTYPE_UIO 3 -#define AVR32_BUFTYPE_RAW 4 - -struct avr32_dma_range *bus_dma_get_range(void); -int bus_dma_get_range_nb(void); - -extern bus_dma_tag_t avr32_root_dma_tag; - -#endif /* _AVR32_BUS_DMA_PRIVATE */ - - #endif /* !_AVR32_BUS_DMA_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Mar 2 18:46:18 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7226010657CF; Mon, 2 Mar 2009 18:46:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 073BA10657C6 for ; Mon, 2 Mar 2009 18:46:18 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E7DC08FC13 for ; Mon, 2 Mar 2009 18:46:17 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22IkHD8026337 for ; Mon, 2 Mar 2009 18:46:17 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22IkHtB026335 for perforce@freebsd.org; Mon, 2 Mar 2009 18:46:17 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 2 Mar 2009 18:46:17 GMT Message-Id: <200903021846.n22IkHtB026335@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 18:46:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=158592 Change 158592 by lulf@lulf_carrot on 2009/03/02 18:46:02 - Make a comment about how it works, now that I think I understand it. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/busdma_machdep.c#4 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/busdma_machdep.c#4 (text+ko) ==== @@ -460,7 +460,10 @@ void *tmpaddr = (void *)*vaddr; if (tmpaddr) { - /* XXX: */ + /* + * Put it in the uncached area to make the sync + * operations as cheap as possible for DMA. + */ tmpaddr = (void *)AVR32_PHYS_TO_P2(vtophys(tmpaddr)); newmap->origbuffer = *vaddr; newmap->allocbuffer = tmpaddr; From owner-p4-projects@FreeBSD.ORG Mon Mar 2 19:25:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C232C1065B79; Mon, 2 Mar 2009 19:25: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 368301065A4A for ; Mon, 2 Mar 2009 19:25:58 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 20F1B8FC2E for ; Mon, 2 Mar 2009 19:25:58 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22JPwmT030818 for ; Mon, 2 Mar 2009 19:25:58 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22JPv9c030815 for perforce@freebsd.org; Mon, 2 Mar 2009 19:25:57 GMT (envelope-from antab@FreeBSD.org) Date: Mon, 2 Mar 2009 19:25:57 GMT Message-Id: <200903021925.n22JPv9c030815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 158593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 19:26:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=158593 Change 158593 by antab@antab_farm on 2009/03/02 19:25:27 Move readX and writeX around to make world build Add avr32 to gprof Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/cpufunc.h#4 edit .. //depot/projects/avr32/src/usr.bin/gprof/avr32.h#1 add .. //depot/projects/avr32/src/usr.bin/gprof/gprof.h#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/cpufunc.h#4 (text+ko) ==== @@ -34,6 +34,11 @@ #include +register_t intr_disable(void); +void intr_restore(register_t s); + +#endif /* _KERNEL */ + #define readb(va) (*(volatile uint8_t *) (va)) #define readw(va) (*(volatile uint16_t *) (va)) #define readl(va) (*(volatile uint32_t *) (va)) @@ -42,11 +47,6 @@ #define writew(va, d) (*(volatile uint16_t *) (va) = (d)) #define writel(va, d) (*(volatile uint32_t *) (va) = (d)) -register_t intr_disable(void); -void intr_restore(register_t s); - -#endif /* _KERNEL */ - static __inline void breakpoint(void) { ==== //depot/projects/avr32/src/usr.bin/gprof/gprof.h#2 (text+ko) ==== @@ -47,6 +47,9 @@ #if __arm__ # include "arm.h" #endif +#if __avr32__ +# include "avr32.h" +#endif #if __i386__ # include "i386.h" #endif From owner-p4-projects@FreeBSD.ORG Mon Mar 2 19:27:00 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E6381065A76; Mon, 2 Mar 2009 19:27: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 78F371065A5C for ; Mon, 2 Mar 2009 19:26:59 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 499108FC13 for ; Mon, 2 Mar 2009 19:26:59 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22JQxMj030902 for ; Mon, 2 Mar 2009 19:26:59 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22JQx6t030900 for perforce@freebsd.org; Mon, 2 Mar 2009 19:26:59 GMT (envelope-from antab@FreeBSD.org) Date: Mon, 2 Mar 2009 19:26:59 GMT Message-Id: <200903021926.n22JQx6t030900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 158594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 19:27:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=158594 Change 158594 by antab@antab_farm on 2009/03/02 19:26:31 - Add dummy SYS.h Affected files ... .. //depot/projects/avr32/src/lib/libc/avr32/SYS.h#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Mon Mar 2 19:48:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 69E061065738; Mon, 2 Mar 2009 19:48:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C9B761065736 for ; Mon, 2 Mar 2009 19:48:22 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D5DF8FC12 for ; Mon, 2 Mar 2009 19:48:22 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22JmMhw034103 for ; Mon, 2 Mar 2009 19:48:22 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22JmMBn034101 for perforce@freebsd.org; Mon, 2 Mar 2009 19:48:22 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 2 Mar 2009 19:48:22 GMT Message-Id: <200903021948.n22JmMBn034101@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 158596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 19:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=158596 Change 158596 by gonzo@gonzo_figaro on 2009/03/02 19:48:11 - -O2 is bad idea for new archs. Affected files ... .. //depot/projects/avr32/src/share/mk/sys.mk#2 edit Differences ... ==== //depot/projects/avr32/src/share/mk/sys.mk#2 (text+ko) ==== @@ -35,7 +35,7 @@ CFLAGS ?= -O .else CC ?= cc -.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" +.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "avr32" CFLAGS ?= -O -pipe .else CFLAGS ?= -O2 -pipe From owner-p4-projects@FreeBSD.ORG Mon Mar 2 19:54:29 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6A158106567C; Mon, 2 Mar 2009 19:54: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 21CD71065670 for ; Mon, 2 Mar 2009 19:54:29 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E96AF8FC08 for ; Mon, 2 Mar 2009 19:54:28 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22JsSie034629 for ; Mon, 2 Mar 2009 19:54:28 GMT (envelope-from gonzo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22JsSOe034627 for perforce@freebsd.org; Mon, 2 Mar 2009 19:54:28 GMT (envelope-from gonzo@FreeBSD.org) Date: Mon, 2 Mar 2009 19:54:28 GMT Message-Id: <200903021954.n22JsSOe034627@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko To: Perforce Change Reviews Cc: Subject: PERFORCE change 158597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 19:54:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=158597 Change 158597 by gonzo@gonzo_pd on 2009/03/02 19:53:46 - add __avr32__ section Affected files ... .. //depot/projects/avr32/src/lib/libc/stdlib/malloc.c#2 edit Differences ... ==== //depot/projects/avr32/src/lib/libc/stdlib/malloc.c#2 (text+ko) ==== @@ -245,6 +245,11 @@ # define SIZEOF_PTR_2POW 2 # define NO_TLS #endif +#ifdef __avr32__ +# define QUANTUM_2POW 3 +# define SIZEOF_PTR_2POW 2 +# define NO_TLS +#endif #ifdef __mips__ # define QUANTUM_2POW 3 # define SIZEOF_PTR_2POW 2 From owner-p4-projects@FreeBSD.ORG Mon Mar 2 22:12:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C4ABC106567C; Mon, 2 Mar 2009 22:12: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 7616D106566B for ; Mon, 2 Mar 2009 22:12:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 62F7A8FC30 for ; Mon, 2 Mar 2009 22:12:23 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n22MCNm1067172 for ; Mon, 2 Mar 2009 22:12:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n22MCNpv067170 for perforce@freebsd.org; Mon, 2 Mar 2009 22:12:23 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 2 Mar 2009 22:12:23 GMT Message-Id: <200903022212.n22MCNpv067170@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 158607 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.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, 02 Mar 2009 22:12:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=158607 Change 158607 by rwatson@rwatson_cinnamon_macosx on 2009/03/02 22:11:28 Style tweak. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#29 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#29 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004,2009 Apple Inc. + * Copyright (c) 2004, 2009 Apple Inc. * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#28 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#29 $ */ #include From owner-p4-projects@FreeBSD.ORG Tue Mar 3 01:52:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F0471065670; Tue, 3 Mar 2009 01:52: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 C1615106566B for ; Tue, 3 Mar 2009 01:52:05 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AE22B8FC0A for ; Tue, 3 Mar 2009 01:52:05 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n231q5Om035686 for ; Tue, 3 Mar 2009 01:52:05 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n231q5IR035684 for perforce@freebsd.org; Tue, 3 Mar 2009 01:52:05 GMT (envelope-from sson@FreeBSD.org) Date: Tue, 3 Mar 2009 01:52:05 GMT Message-Id: <200903030152.n231q5IR035684@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 158608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2009 01:52:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=158608 Change 158608 by sson@sson_amd64 on 2009/03/03 01:51:56 Add wrapper functions for auditon(2) that will revert back to using old commands if new commands are not supported. Fix au_poltostr() and au_strtopol() to int instead of long for the 'policy' argument. Fix typo in auditpinfo and auditpinfo_addr struct. Add prototypes for audit_session_self() and audit_session_join(). Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#15 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#45 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#5 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#4 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#43 edit .. //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#9 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#11 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#36 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#30 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#17 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#91 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#30 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#15 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#15 $ */ /* * Program to trigger the audit daemon with a message that is either: @@ -54,7 +54,7 @@ #include -static int send_trigger(unsigned int); +static int send_trigger(int); #ifdef USE_MACH_IPC #include @@ -79,7 +79,7 @@ #endif static int -send_trigger(unsigned int trigger) +send_trigger(int trigger) { mach_port_t serverPort; kern_return_t error; @@ -107,11 +107,11 @@ #else /* ! USE_MACH_IPC */ static int -send_trigger(unsigned int trigger) +send_trigger(int trigger) { int error; - error = auditon(A_SENDTRIGGER, &trigger, sizeof(trigger)); + error = audit_send_trigger(&trigger); if (error != 0) { if (error == EPERM) perror("audit requires root privileges"); ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#45 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#44 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#45 $ */ #include @@ -357,7 +357,7 @@ /* Flush contents. */ cond = AUC_DISABLED; - err_ret = auditon(A_SETCOND, &cond, sizeof(cond)); + err_ret = audit_set_cond(&cond); if (err_ret != 0) { auditd_log_err("Disabling audit failed! : %s", strerror(errno)); err_ret = 1; ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_darwin.c#5 $ */ #include @@ -180,7 +180,7 @@ { int au_cond; - if (auditon(A_GETCOND, &au_cond, sizeof(au_cond)) < 0) { + if (audit_get_cond(&au_cond) < 0) { if (errno != ENOSYS) { auditd_log_err("Audit status check failed (%s)", strerror(errno)); ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#3 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd_fbsd.c#4 $ */ #include @@ -135,7 +135,7 @@ { int au_cond; - if (auditon(A_GETCOND, &au_cond, sizeof(au_cond)) < 0) { + if (audit_get_cond(&au_cond) < 0) { if (errno != ENOSYS) { auditd_log_err("Audit status check failed (%s)", strerror(errno)); ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#43 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#42 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#43 $ */ #ifndef _LIBBSM_H_ @@ -773,8 +773,8 @@ int verbose); int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf, int flag); -ssize_t au_poltostr(long policy, size_t maxsize, char *buf); -int au_strtopol(const char *polstr, long *policy); +ssize_t au_poltostr(int policy, size_t maxsize, char *buf); +int au_strtopol(const char *polstr, int *policy); /* * Functions relating to querying audit event information. @@ -1262,6 +1262,33 @@ au_tid_t *tidp); #endif /* !__APPLE__ */ +/* + * Wrapper functions to auditon(2). + */ +int audit_get_car(char *path, size_t sz); +int audit_get_class(au_evclass_map_t *evc_map, size_t sz); +int audit_set_class(au_evclass_map_t *evc_map, size_t sz); +int audit_get_cond(int *cond); +int audit_set_cond(int *cond); +int audit_get_cwd(char *path, size_t sz); +int audit_get_fsize(au_fstat_t *fstat, size_t sz); +int audit_set_fsize(au_fstat_t *fstat, size_t sz); +int audit_get_kmask(au_mask_t *kmask, size_t sz); +int audit_set_kmask(au_mask_t *kmask, size_t sz); +int audit_get_kaudit(auditinfo_addr_t *aia, size_t sz); +int audit_set_kaudit(auditinfo_addr_t *aia, size_t sz); +int audit_set_pmask(auditpinfo_t *api, size_t sz); +int audit_get_pinfo(auditpinfo_t *api, size_t sz); +int audit_get_pinfo_addr(auditpinfo_addr_t *apia, size_t sz); +int audit_get_policy(int *policy); +int audit_set_policy(int *policy); +int audit_get_qctrl(au_qctrl_t *qctrl, size_t sz); +int audit_set_qctrl(au_qctrl_t *qctrl, size_t sz); +int audit_get_sinfo_addr(auditinfo_addr_t *aia, size_t sz); +int audit_get_stat(au_stat_t *stats, size_t sz); +int audit_set_stat(au_stat_t *stats, size_t sz); +int audit_send_trigger(int *trigger); + __END_DECLS #endif /* !_LIBBSM_H_ */ ==== //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#9 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#8 $ + * $P4: //depot/projects/trustedbsd/openbsm/libauditd/auditd_lib.c#9 $ */ #include @@ -247,7 +247,7 @@ */ bzero(&aia, sizeof(aia)); aia.ai_termid.at_type = AU_IPv4; - error = auditon(A_SETKAUDIT, &aia, sizeof(aia)); + error = audit_set_kaudit(&aia, sizeof(aia)); if (error < 0 && errno != ENOSYS) ret = ADE_AUDITON; return (ret); @@ -277,7 +277,7 @@ return (ADE_ADDRFAM); } - if (auditon(A_SETKAUDIT, &aia, sizeof(aia)) < 0) + if (audit_set_kaudit(&aia, sizeof(aia)) < 0) ret = ADE_AUDITON; return (ret); @@ -298,12 +298,12 @@ if (getacmin(&auditd_minval) != 0) return (ADE_PARSE); - if (auditon(A_GETQCTRL, &qctrl, sizeof(qctrl)) != 0) + if (audit_get_qctrl(&qctrl, sizeof(qctrl)) != 0) return (ADE_AUDITON); if (qctrl.aq_minfree != auditd_minval) { qctrl.aq_minfree = auditd_minval; - if (auditon(A_SETQCTRL, &qctrl, sizeof(qctrl)) != 0) + if (audit_set_qctrl(&qctrl, sizeof(qctrl)) != 0) return (ADE_AUDITON); } @@ -687,7 +687,7 @@ while ((evp = getauevent_r(evp)) != NULL) { evc_map.ec_number = evp->ae_number; evc_map.ec_class = evp->ae_class; - if (auditon(A_SETCLASS, &evc_map, sizeof(evc_map)) == 0) + if (audit_set_class(&evc_map, sizeof(evc_map)) == 0) ctr++; } endauevent(); @@ -713,7 +713,7 @@ (getauditflagsbin(naeventstr, &aumask) != 0)) return (ADE_PARSE); - if (auditon(A_SETKMASK, &aumask, sizeof(aumask))) + if (audit_set_kmask(&aumask, sizeof(aumask)) != 0) return (ADE_AUDITON); return (ADE_NOERR); @@ -737,12 +737,12 @@ if ((getacpol(polstr, POL_STR_SIZE) != 0) || (au_strtopol(polstr, &policy) != 0)) { policy = AUDIT_CNT; - if (auditon(A_SETPOLICY, &policy, sizeof(policy))) + if (audit_set_policy(&policy) != 0) return (ADE_AUDITON); return (ADE_PARSE); } - if (auditon(A_SETPOLICY, &policy, sizeof(policy))) + if (audit_set_policy(&policy) != 0) return (ADE_AUDITON); return (ADE_NOERR); @@ -768,7 +768,7 @@ bzero(&au_fstat, sizeof(au_fstat)); au_fstat.af_filesz = filesz; - if (auditon(A_SETFSIZE, &au_fstat, sizeof(au_fstat)) < 0) + if (audit_set_fsize(&au_fstat, sizeof(au_fstat)) != 0) return (ADE_AUDITON); return (ADE_NOERR); @@ -1133,7 +1133,7 @@ /* * Auditing already disabled? */ - if (auditon(A_GETCOND, &cond, sizeof(cond)) < 0) + if (audit_get_cond(&cond) != 0) return (-1); if (cond == AUC_NOAUDIT) return (0); @@ -1147,7 +1147,7 @@ * Shutdown auditing in the kernel. */ cond = AUC_DISABLED; - if (auditon(A_SETCOND, &cond, sizeof(cond)) != 0) + if (audit_set_cond(&cond) != 0) return (-1); #ifdef __BSM_INTERNAL_NOTIFY_KEY notify_post(__BSM_INTERNAL_NOTIFY_KEY); ==== //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#11 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#10 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#11 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -64,9 +64,9 @@ .Ft int .Fn getacpol "char *auditstr" "size_t len" .Ft ssize_t -.Fn au_poltostr "long policy" "size_t maxsize" "char *buf" +.Fn au_poltostr "int policy" "size_t maxsize" "char *buf" .Ft int -.Fn au_strtopol "const char *polstr" "long *policy" +.Fn au_strtopol "const char *polstr" "int *policy" .Sh DESCRIPTION These interfaces may be used to look up information from the .Xr audit_control 5 ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#36 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#35 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#36 $ */ #include @@ -237,7 +237,7 @@ */ aia.ai_termid.at_type = AU_IPv4; aia.ai_termid.at_addr[0] = INADDR_ANY; - if (auditon(A_GETKAUDIT, &aia, sizeof(aia)) < 0) { + if (audit_get_kaudit(&aia, sizeof(aia)) != 0) { if (errno != ENOSYS && errno != EPERM) return (-1); #endif /* HAVE_AUDIT_SYSCALLS */ ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#30 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004, 2009 Apple Inc. + * Copyright (c) 2004,2009 Apple Inc. * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#30 $ */ #include @@ -220,7 +220,7 @@ * nul). */ ssize_t -au_poltostr(long policy, size_t maxsize, char *buf) +au_poltostr(int policy, size_t maxsize, char *buf) { int first = 1; int i = 0; @@ -248,7 +248,7 @@ * ENOMEM) or 0 on success. */ int -au_strtopol(const char *polstr, long *policy) +au_strtopol(const char *polstr, int *policy) { char *bufp, *string; char *buffer; ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#17 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#16 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#17 $ */ /* @@ -77,7 +77,7 @@ return (status); #endif - if (auditon(A_GETCOND, &au_cond, sizeof(au_cond)) < 0) { + if (audit_get_cond(&au_cond) != 0) { syslog(LOG_ERR, "Initial audit status check failed (%s)", strerror(errno)); if (errno == ENOSYS) /* auditon() unimplemented. */ @@ -137,7 +137,7 @@ return (au_cond); #endif - if (auditon(A_GETCOND, &au_cond, sizeof(au_cond)) < 0) { + if (audit_get_cond(&au_cond) != 0) { /* XXX Reset au_cond to AUC_UNSET? */ syslog(LOG_ERR, "Audit status check failed (%s)", strerror(errno)); @@ -167,7 +167,7 @@ #else int cond; - if (auditon(A_GETCOND, &cond, sizeof(cond)) < 0) { + if (audit_get_cond(&cond) != 0) { if (errno != ENOSYS) { syslog(LOG_ERR, "Audit status check failed (%s)", strerror(errno)); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#91 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#90 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#91 $ */ #include @@ -1503,7 +1503,7 @@ if (gettimeofday(&tm, NULL) == -1) return (NULL); - if (auditon(A_GETKAUDIT, &aia, sizeof(aia)) < 0) { + if (audit_get_kaudit(&aia, sizeof(aia)) != 0) { if (errno != ENOSYS) return (NULL); return (au_to_header32_tm(rec_size, e_type, e_mod, tm)); ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#30 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#29 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#30 $ */ #ifdef __APPLE__ @@ -71,7 +71,7 @@ struct auditinfo_addr aia; au_tid_t atid; - if (auditon(A_GETCOND, &acond, sizeof(acond)) < 0) { + if (audit_get_cond(&acond) != 0) { /* * If auditon(2) returns ENOSYS, then audit has not been * compiled into the kernel, so just return. @@ -488,3 +488,336 @@ } } #endif /* !__APPLE__ */ + +int +audit_get_cond(int *cond) +{ + int ret; + + ret = auditon(A_GETCOND, cond, sizeof(*cond)); +#ifdef A_OLDGETCOND + if ((0 != ret) && EINVAL == errno) { + long lcond = *cond; + + ret = auditon(A_OLDGETCOND, &lcond, sizeof(lcond)); + *cond = (int)lcond; + } +#endif + return (ret); +} + +int +audit_set_cond(int *cond) +{ + int ret; + + ret = auditon(A_SETCOND, cond, sizeof(*cond)); +#ifdef A_OLDSETCOND + if ((0 != ret) && (EINVAL == errno)) { + long lcond = (long)*cond; + + ret = auditon(A_OLDSETCOND, &lcond, sizeof(lcond)); + *cond = (int)lcond; + } +#endif + return (ret); +} + +int +audit_get_policy(int *policy) +{ + int ret; + + ret = auditon(A_GETPOLICY, policy, sizeof(*policy)); +#ifdef A_OLDGETPOLICY + if ((0 != ret) && (EINVAL == errno)){ + long lpolicy = (long)*policy; + + ret = auditon(A_OLDGETPOLICY, &lpolicy, sizeof(lpolicy)); + *policy = (int)lpolicy; + } +#endif + return (ret); +} + +int +audit_set_policy(int *policy) +{ + int ret; + + ret = auditon(A_SETPOLICY, policy, sizeof(*policy)); +#ifdef A_OLDSETPOLICY + if ((0 != ret) && (EINVAL == errno)){ + long lpolicy = (long)*policy; + + ret = auditon(A_OLDSETPOLICY, &lpolicy, sizeof(lpolicy)); + *policy = (int)lpolicy; + } +#endif + return (ret); +} + +int +audit_get_qctrl(au_qctrl_t *qctrl, size_t sz) +{ + int ret; + + if (sizeof(*qctrl) != sz) { + errno = EINVAL; + return (-1); + } + + ret = auditon(A_GETQCTRL, qctrl, sizeof(*qctrl)); +#ifdef A_OLDGETQCTRL + if ((0 != ret) && (EINVAL == errno)){ + struct old_qctrl { + size_t oq_hiwater; + size_t oq_lowater; + size_t oq_bufsz; + clock_t oq_delay; + int oq_minfree; + } oq; + + oq.oq_hiwater = (size_t)qctrl->aq_hiwater; + oq.oq_lowater = (size_t)qctrl->aq_lowater; + oq.oq_bufsz = (size_t)qctrl->aq_bufsz; + oq.oq_delay = (clock_t)qctrl->aq_delay; + oq.oq_minfree = qctrl->aq_minfree; + + ret = auditon(A_OLDGETQCTRL, &oq, sizeof(oq)); + + qctrl->aq_hiwater = (int)oq.oq_hiwater; + qctrl->aq_lowater = (int)oq.oq_lowater; + qctrl->aq_bufsz = (int)oq.oq_bufsz; + qctrl->aq_delay = (int)oq.oq_delay; + qctrl->aq_minfree = oq.oq_minfree; + } +#endif /* A_OLDGETQCTRL */ + return (ret); +} + +int +audit_set_qctrl(au_qctrl_t *qctrl, size_t sz) +{ + int ret; + + if (sizeof(*qctrl) != sz) { + errno = EINVAL; + return (-1); + } + + ret = auditon(A_SETQCTRL, qctrl, sz); +#ifdef A_OLDSETQCTRL + if ((0 != ret) && (EINVAL == errno)) { + struct old_qctrl { + size_t oq_hiwater; + size_t oq_lowater; + size_t oq_bufsz; + clock_t oq_delay; + int oq_minfree; + } oq; + + oq.oq_hiwater = (size_t)qctrl->aq_hiwater; + oq.oq_lowater = (size_t)qctrl->aq_lowater; + oq.oq_bufsz = (size_t)qctrl->aq_bufsz; + oq.oq_delay = (clock_t)qctrl->aq_delay; + oq.oq_minfree = qctrl->aq_minfree; + + ret = auditon(A_OLDSETQCTRL, &oq, sizeof(oq)); + + qctrl->aq_hiwater = (int)oq.oq_hiwater; + qctrl->aq_lowater = (int)oq.oq_lowater; + qctrl->aq_bufsz = (int)oq.oq_bufsz; + qctrl->aq_delay = (int)oq.oq_delay; + qctrl->aq_minfree = oq.oq_minfree; + } +#endif /* A_OLDSETQCTRL */ + return (ret); +} + +int +audit_send_trigger(int *trigger) +{ + + return (auditon(A_SENDTRIGGER, trigger, sizeof(*trigger))); +} + +int +audit_get_kaudit(auditinfo_addr_t *aia, size_t sz) +{ + + if (sizeof(*aia) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_GETKAUDIT, aia, sz)); +} + +int +audit_set_kaudit(auditinfo_addr_t *aia, size_t sz) +{ + + if (sizeof(*aia) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_SETKAUDIT, aia, sz)); +} + +int +audit_get_class(au_evclass_map_t *evc_map, size_t sz) +{ + + if (sizeof(*evc_map) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_GETCLASS, evc_map, sz)); +} + +int +audit_set_class(au_evclass_map_t *evc_map, size_t sz) +{ + + if (sizeof(*evc_map) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_SETCLASS, evc_map, sz)); +} + +int +audit_get_kmask(au_mask_t *kmask, size_t sz) +{ + if (sizeof(*kmask) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_GETKMASK, kmask, sz)); +} + +int +audit_set_kmask(au_mask_t *kmask, size_t sz) +{ + if (sizeof(*kmask) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_SETKMASK, kmask, sz)); +} + +int +audit_get_fsize(au_fstat_t *fstat, size_t sz) +{ + + if (sizeof(*fstat) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_GETFSIZE, fstat, sz)); +} + +int +audit_set_fsize(au_fstat_t *fstat, size_t sz) +{ + + if (sizeof(*fstat) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_SETFSIZE, fstat, sz)); +} + +int +audit_set_pmask(auditpinfo_t *api, size_t sz) +{ + + if (sizeof(*api) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_SETPMASK, api, sz)); +} + +int +audit_get_pinfo(auditpinfo_t *api, size_t sz) +{ + + if (sizeof(*api) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_GETPINFO, api, sz)); +} + +int +audit_get_pinfo_addr(auditpinfo_addr_t *apia, size_t sz) +{ + + if (sizeof(*apia) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_GETPINFO_ADDR, apia, sz)); +} + +int +audit_get_sinfo_addr(auditinfo_addr_t *aia, size_t sz) +{ + + if (sizeof(*aia) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_GETSINFO_ADDR, aia, sz)); +} + +int +audit_get_stat(au_stat_t *stats, size_t sz) +{ + + if (sizeof(*stats) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_GETSTAT, stats, sz)); +} + +int +audit_set_stat(au_stat_t *stats, size_t sz) +{ + + if (sizeof(*stats) != sz) { + errno = EINVAL; + return (-1); + } + + return (auditon(A_GETSTAT, stats, sz)); +} + +int +audit_get_cwd(char *path, size_t sz) +{ + + return (auditon(A_GETCWD, path, sz)); +} + +int +audit_get_car(char *path, size_t sz) +{ + + return (auditon(A_GETCAR, path, sz)); +} ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#7 (text+ko) ==== @@ -26,12 +26,15 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#6 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#7 $ */ #ifndef _BSM_AUDIT_H #define _BSM_AUDIT_H +#include +#include + #define AUDIT_RECORD_MAGIC 0x828a0f1b #define MAX_AUDIT_RECORDS 20 #define MAXAUDITDATA (0x8000 - 1) @@ -212,7 +215,6 @@ au_mask_t ap_mask; /* Audit masks. */ au_tid_t ap_termid; /* Terminal ID. */ au_asid_t ap_asid; /* Audit session ID. */ - u_int64_t ap_flags; /* Audit session flags. */ }; typedef struct auditpinfo auditpinfo_t; @@ -222,6 +224,7 @@ au_mask_t ap_mask; /* Audit masks. */ au_tid_addr_t ap_termid; /* Terminal ID. */ au_asid_t ap_asid; /* Audit session ID. */ + u_int64_t ap_flags; /* Audit session flags. */ }; typedef struct auditpinfo_addr auditpinfo_addr_t; @@ -230,6 +233,7 @@ #define as_asid as_aia_p->ai_asid #define as_auid as_aia_p->ai_auid #define as_termid as_aia_p->ai_termid +#define as_flags as_aia_p->ai_flags au_mask_t as_mask; /* Process Audit Masks. */ }; @@ -313,6 +317,13 @@ int setaudit(const struct auditinfo *); int getaudit_addr(struct auditinfo_addr *, int); int setaudit_addr(const struct auditinfo_addr *, int); + +#ifdef __APPLE_API_PRIVATE +#include +mach_port_name_t audit_session_self(void); +au_asid_t audit_sesison_join(mach_port_name_t port); +#endif /* __APPLE_API_PRIVATE */ + #endif /* defined(_KERNEL) || defined(KERNEL) */ __END_DECLS From owner-p4-projects@FreeBSD.ORG Tue Mar 3 03:20:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAEB01065674; Tue, 3 Mar 2009 03:20:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5E137106564A for ; Tue, 3 Mar 2009 03:20:35 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4C4788FC0A for ; Tue, 3 Mar 2009 03:20:35 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n233KZXc045222 for ; Tue, 3 Mar 2009 03:20:35 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n233KZiT045220 for perforce@freebsd.org; Tue, 3 Mar 2009 03:20:35 GMT (envelope-from sson@FreeBSD.org) Date: Tue, 3 Mar 2009 03:20:35 GMT Message-Id: <200903030320.n233KZiT045220@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 158609 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2009 03:20:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=158609 Change 158609 by sson@sson_amd64 on 2009/03/03 03:19:44 Add default for 'expire_after' in audit_control to expire trails when there is more than 10M is used in the audit directory. Make the default for 'filesz' more readable by changing it from '2097152' to '2M'. Update NEWS. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#34 edit .. //depot/projects/trustedbsd/openbsm/etc/audit_control#7 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#34 (text+ko) ==== @@ -4,6 +4,10 @@ - Change auditon(2) parameters and data structures to be 32/64-bit architecture independent. Add more information to man page about auditon(2) parameters. +- Add wrapper functions for auditon(2) to use legecy commands when the new + commands are not supported. +- Add default for 'expire-after' in audit_control to expire trails files when + the audit directory is more than 10 megabytes ('10M'). OpenBSM 1.1 beta 1 @@ -436,4 +440,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#33 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#34 $ ==== //depot/projects/trustedbsd/openbsm/etc/audit_control#7 (text+ko) ==== @@ -1,9 +1,10 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#6 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#7 $ # dir:/var/audit flags:lo minfree:5 naflags:lo policy:cnt,argv -filesz:2097152 +filesz:2M +expire-after:10M From owner-p4-projects@FreeBSD.ORG Tue Mar 3 03:28:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 630021065677; Tue, 3 Mar 2009 03:28: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 1CBFA1065675 for ; Tue, 3 Mar 2009 03:28:44 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0ACB48FC27 for ; Tue, 3 Mar 2009 03:28:44 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n233Sh2f045900 for ; Tue, 3 Mar 2009 03:28:43 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n233Shfg045898 for perforce@freebsd.org; Tue, 3 Mar 2009 03:28:43 GMT (envelope-from sson@FreeBSD.org) Date: Tue, 3 Mar 2009 03:28:43 GMT Message-Id: <200903030328.n233Shfg045898@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 158610 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2009 03:28:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=158610 Change 158610 by sson@sson_amd64 on 2009/03/03 03:27:56 Style change. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#31 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#31 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2004,2009 Apple Inc. + * Copyright (c) 2004, 2009 Apple Inc. * Copyright (c) 2006 Robert N. M. Watson * All rights reserved. * @@ -27,7 +27,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#30 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#31 $ */ #include From owner-p4-projects@FreeBSD.ORG Tue Mar 3 17:03:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 057F110657AB; Tue, 3 Mar 2009 17:03:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A12151065783 for ; Tue, 3 Mar 2009 17:03:36 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8F55D8FC08 for ; Tue, 3 Mar 2009 17:03:36 +0000 (UTC) (envelope-from brueffer@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n23H3aPw088053 for ; Tue, 3 Mar 2009 17:03:36 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n23H3aAT088051 for perforce@freebsd.org; Tue, 3 Mar 2009 17:03:36 GMT (envelope-from brueffer@freebsd.org) Date: Tue, 3 Mar 2009 17:03:36 GMT Message-Id: <200903031703.n23H3aAT088051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer To: Perforce Change Reviews Cc: Subject: PERFORCE change 158612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2009 17:03:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=158612 Change 158612 by brueffer@brueffer_haakonia on 2009/03/03 17:03:08 Fix typos. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#35 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#35 (text+ko) ==== @@ -4,9 +4,9 @@ - Change auditon(2) parameters and data structures to be 32/64-bit architecture independent. Add more information to man page about auditon(2) parameters. -- Add wrapper functions for auditon(2) to use legecy commands when the new +- Add wrapper functions for auditon(2) to use legacy commands when the new commands are not supported. -- Add default for 'expire-after' in audit_control to expire trails files when +- Add default for 'expire-after' in audit_control to expire trail files when the audit directory is more than 10 megabytes ('10M'). OpenBSM 1.1 beta 1 @@ -440,4 +440,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#34 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#35 $ From owner-p4-projects@FreeBSD.ORG Tue Mar 3 20:57:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 488A1106568C; Tue, 3 Mar 2009 20:57:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07657106568A for ; Tue, 3 Mar 2009 20:57:51 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E74638FC1A for ; Tue, 3 Mar 2009 20:57:50 +0000 (UTC) (envelope-from zec@icir.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n23Kvou1035606 for ; Tue, 3 Mar 2009 20:57:50 GMT (envelope-from zec@icir.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n23Kvo5T035604 for perforce@freebsd.org; Tue, 3 Mar 2009 20:57:50 GMT (envelope-from zec@icir.org) Date: Tue, 3 Mar 2009 20:57:50 GMT Message-Id: <200903032057.n23Kvo5T035604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@icir.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2009 20:57:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=158634 Change 158634 by zec@zec_tpx32 on 2009/03/03 20:57:26 IFC @ 158633 (merging VIMAGE_CTASSERT() and related infrastructure) Affected files ... .. //depot/projects/vimage/src/share/man/man4/crypto.4#2 integrate .. //depot/projects/vimage/src/share/man/man9/Makefile#3 integrate .. //depot/projects/vimage/src/share/man/man9/vfs_getopt.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#15 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/arm/at91/files.at91#4 integrate .. //depot/projects/vimage/src/sys/bsm/audit.h#9 integrate .. //depot/projects/vimage/src/sys/bsm/audit_kevents.h#10 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#18 integrate .. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#34 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#19 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#11 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#20 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#27 integrate .. //depot/projects/vimage/src/sys/conf/files.ia64#9 integrate .. //depot/projects/vimage/src/sys/conf/files.mips#6 integrate .. //depot/projects/vimage/src/sys/conf/files.pc98#18 integrate .. //depot/projects/vimage/src/sys/conf/files.powerpc#19 integrate .. //depot/projects/vimage/src/sys/conf/files.sparc64#17 integrate .. //depot/projects/vimage/src/sys/conf/files.sun4v#10 integrate .. //depot/projects/vimage/src/sys/conf/kern.mk#8 integrate .. //depot/projects/vimage/src/sys/conf/kern.pre.mk#15 integrate .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#16 integrate .. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#15 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#16 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#22 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#14 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-usb.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cam.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-cd.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-fd.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/atapi-tape.c#8 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#20 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcefw.h#8 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#13 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#10 integrate .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#8 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#11 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_irq.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_dma.c#10 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.h#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_irq.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_irq.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ofw/ofw_iicbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard.c#6 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccardvarp.h#5 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#19 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_private.h#7 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#13 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#29 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#9 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scterm-teken.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/image/uscanner.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_ioctl.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/denode.h#6 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_denode.c#8 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#18 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfsmount.h#3 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_dbregs.c#4 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_fpregs.c#3 integrate .. //depot/projects/vimage/src/sys/fs/procfs/procfs_regs.c#3 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf.h#4 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#10 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_condvar.c#9 integrate .. //depot/projects/vimage/src/sys/kern/kern_cons.c#2 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#28 integrate .. //depot/projects/vimage/src/sys/kern/kern_malloc.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_poll.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_priv.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#28 integrate .. //depot/projects/vimage/src/sys/kern/kern_thr.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_time.c#7 integrate .. //depot/projects/vimage/src/sys/kern/kern_uuid.c#14 integrate .. //depot/projects/vimage/src/sys/kern/subr_prf.c#8 integrate .. //depot/projects/vimage/src/sys/kern/subr_smp.c#13 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#23 integrate .. //depot/projects/vimage/src/sys/kern/sys_process.c#11 integrate .. //depot/projects/vimage/src/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#32 integrate .. //depot/projects/vimage/src/sys/kern/tty_info.c#4 integrate .. //depot/projects/vimage/src/sys/kern/tty_inq.c#4 integrate .. //depot/projects/vimage/src/sys/kern/tty_outq.c#4 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#13 integrate .. //depot/projects/vimage/src/sys/kern/tty_pty.c#9 integrate .. //depot/projects/vimage/src/sys/kern/tty_ttydisc.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_mount.c#28 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/vimage/src/sys/libkern/memmove.c#1 branch .. //depot/projects/vimage/src/sys/libkern/strtouq.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/pmap.c#9 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#32 integrate .. //depot/projects/vimage/src/sys/net/bridgestp.c#18 integrate .. //depot/projects/vimage/src/sys/net/if.c#67 integrate .. //depot/projects/vimage/src/sys/net/if_ef.c#12 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#38 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#38 integrate .. //depot/projects/vimage/src/sys/net/if_mib.c#12 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#29 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#17 integrate .. //depot/projects/vimage/src/sys/net/raw_cb.c#13 integrate .. //depot/projects/vimage/src/sys/net/raw_usrreq.c#12 integrate .. //depot/projects/vimage/src/sys/net/vnet.h#20 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#19 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#14 integrate .. //depot/projects/vimage/src/sys/netgraph/atm/ng_atm.c#11 integrate .. //depot/projects/vimage/src/sys/netgraph/atm/ng_ccatm.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ether.c#20 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#13 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_l2tp.c#9 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pppoe.c#7 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_pppoe.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#36 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#25 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#18 integrate .. //depot/projects/vimage/src/sys/netinet/in_proto.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/ip6.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#27 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#69 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#48 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#41 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_crc32.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#33 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#27 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#38 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.h#15 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#36 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#27 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#48 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#40 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#35 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#39 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#31 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#49 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#21 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#45 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#31 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#37 integrate .. //depot/projects/vimage/src/sys/netinet6/route6.c#13 integrate .. //depot/projects/vimage/src/sys/netinet6/scope6.c#23 integrate .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#34 integrate .. //depot/projects/vimage/src/sys/netipsec/key_debug.c#4 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.c#25 integrate .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#25 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#25 integrate .. //depot/projects/vimage/src/sys/nfsclient/bootp_subr.c#15 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_diskless.c#14 integrate .. //depot/projects/vimage/src/sys/pci/viapm.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#6 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/swtch.S#2 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/trap.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/booke/trap_subr.S#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/frame.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/include/pcb.h#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/genassym.c#8 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm_token.c#12 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#5 integrate .. //depot/projects/vimage/src/sys/sys/cdefs.h#6 integrate .. //depot/projects/vimage/src/sys/sys/fcntl.h#5 integrate .. //depot/projects/vimage/src/sys/sys/mount.h#18 integrate .. //depot/projects/vimage/src/sys/sys/param.h#43 integrate .. //depot/projects/vimage/src/sys/sys/priv.h#13 integrate .. //depot/projects/vimage/src/sys/sys/sdt.h#2 integrate .. //depot/projects/vimage/src/sys/sys/shm.h#3 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#16 integrate .. //depot/projects/vimage/src/sys/sys/tree.h#5 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#80 integrate .. //depot/projects/vimage/src/sys/xdr/xdr_mem.c#2 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/crypto.4#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/crypto.4,v 1.8 2008/06/16 14:33:54 gnn Exp $ +.\" $FreeBSD: src/share/man/man4/crypto.4,v 1.9 2009/03/03 07:58:01 brueffer Exp $ .\" -.Dd August 1, 2007 +.Dd March 3, 2009 .Dt CRYPTO 4 .Os .Sh NAME @@ -106,6 +106,7 @@ crypto access device .El .Sh SEE ALSO +.Xr glxsb 4 , .Xr hifn 4 , .Xr ipsec 4 , .Xr padlock 4 , ==== //depot/projects/vimage/src/share/man/man9/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.346 2009/02/22 13:38:16 trasz Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.347 2009/03/02 23:26:30 jamie Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1243,7 +1243,10 @@ vfs_getopt.9 vfs_filteropt.9 \ vfs_getopt.9 vfs_flagopt.9 \ vfs_getopt.9 vfs_getopts.9 \ - vfs_getopt.9 vfs_scanopt.9 + vfs_getopt.9 vfs_scanopt.9 \ + vfs_getopt.9 vfs_setopt.9 \ + vfs_getopt.9 vfs_setopt_part.9 \ + vfs_getopt.9 vfs_setopts.9 MLINKS+=VFS_LOCK_GIANT.9 VFS_UNLOCK_GIANT.9 MLINKS+=vgone.9 vgonel.9 MLINKS+=vhold.9 vdrop.9 \ ==== //depot/projects/vimage/src/share/man/man9/vfs_getopt.9#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/vfs_getopt.9,v 1.2 2007/03/04 19:04:39 ru Exp $ +.\" $FreeBSD: src/share/man/man9/vfs_getopt.9,v 1.3 2009/03/02 23:26:30 jamie Exp $ .\" -.Dd February 28, 2007 +.Dd March 2, 2009 .Dt VFS_GETOPT 9 .Os .Sh NAME @@ -35,7 +35,10 @@ .Nm vfs_flagopt , .Nm vfs_scanopt , .Nm vfs_copyopt , -.Nm vfs_filteropt +.Nm vfs_filteropt , +.Nm vfs_setopt , +.Nm vfs_setopt_part , +.Nm vfs_setopts .Nd "manipulate mount options and their values" .Sh SYNOPSIS .In sys/param.h @@ -62,6 +65,18 @@ .Fo vfs_filteropt .Fa "struct vfsoptlist *opts" "const char **legal" .Fc +.Ft int +.Fo vfs_setopt +.Fa "struct vfsoptlist *opts" "const char *name" "void *value" "int len" +.Fc +.Ft int +.Fo vfs_setopt_part +.Fa "struct vfsoptlist *opts" "const char *name" "void *value" "int len" +.Fc +.Ft int +.Fo vfs_setopts +.Fa "struct vfsoptlist *opts" "const char *name" "const char *value" +.Fc .Sh DESCRIPTION The .Fn vfs_getopt @@ -111,7 +126,7 @@ .Fn vfs_scanopt function performs a .Xr vsscanf 3 -with the options value, using the given format, +with the option's value, using the given format, into the specified variable arguments. The value must be a string (i.e., .Dv NUL @@ -119,10 +134,10 @@ .Pp The .Fn vfs_copyopt -function creates a copy of the options value. +function creates a copy of the option's value. The .Fa len -argument must match the length of the options value exactly +argument must match the length of the option's value exactly (i.e., a larger buffer will still cause .Fn vfs_copyout to fail with @@ -134,6 +149,28 @@ A option is valid if its name matches one of the names in the list of legal names. An option may be prefixed with 'no', and still be considered valid. +.Pp +The +.Fn vfs_setopt +and +.Fn vfs_setopt_part +functions copy new data into the option's value. +In +.Fn vfs_setopt , +the +.Fa len +argument must match the length of the option's value exactly +(i.e., a larger buffer will still cause +.Fn vfs_copyout +to fail with +.Er EINVAL ) . +.Pp +The +.Fn vfs_setopts +function copies a new string into the option's value. +The string, including +.Dv NUL +byte, must be no longer than the option's length. .Sh RETURN VALUES The .Fn vfs_getopt @@ -179,7 +216,9 @@ .Pp The .Fn vfs_copyopt -function returns 0 if the copy was successful, +and +.Fn vfs_setopt +functions return 0 if the copy was successful, .Er EINVAL if the option was found but the lengths did not match, and .Er ENOENT @@ -190,6 +229,14 @@ function returns 0 if all of the options are legal; otherwise, .Er EINVAL is returned. +.Pp +The +.Fn vfs_setopts +function returns 0 if the copy was successful, +.Er EINVAL +if the option was found but the string was too long, and +.Er ENOENT +if the option was not found. .Sh AUTHORS .An -nosplit This manual page was written by ==== //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.298 2009/02/25 01:49:01 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.299 2009/02/25 22:24:56 sobomax Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -1227,7 +1227,7 @@ #ifdef SCHED_ULE /* * SCHED_ULE doesn't allow enabling/disabling HT cores at - * tun time. + * run time. */ if (allowed != hyperthreading_allowed) return (ENOTSUP); ==== //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#8 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.260 2009/03/02 18:43:50 kib Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -80,12 +81,6 @@ #include -#ifdef COMPAT_IA32 - -extern struct sysentvec ia32_freebsd_sysvec; - -#endif - static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -331,7 +326,7 @@ cpu_thread_clean(td); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { /* * Set the trap frame to point at the beginning of the uts * function. @@ -377,7 +372,7 @@ return (EINVAL); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { if (td == curthread) { critical_enter(); td->td_pcb->pcb_gsbase = (register_t)tls_base; ==== //depot/projects/vimage/src/sys/arm/at91/files.at91#4 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.9 2008/11/25 19:05:46 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.10 2009/02/27 23:12:28 imp Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91_machdep.c standard @@ -15,10 +15,10 @@ arm/at91/at91_twi.c optional at91_twi arm/at91/at91_udp.c optional at91_udp arm/at91/if_ate.c optional ate -arm/at91/ohci_atmelarm.c optional ohci arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart +dev/usb/controller/ohci_atmelarm.c optional ohci # # All the boards we support # ==== //depot/projects/vimage/src/sys/bsm/audit.h#9 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#4 - * $FreeBSD: src/sys/bsm/audit.h,v 1.14 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#5 + * $FreeBSD: src/sys/bsm/audit.h,v 1.15 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -66,8 +66,9 @@ #define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ #define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ #define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests rotate. */ -#define AUDIT_TRIGGER_INITIALIZE 7 /* Initialize audit. */ -#define AUDIT_TRIGGER_MAX 7 +#define AUDIT_TRIGGER_INITIALIZE 7 /* User initialize of auditd. */ +#define AUDIT_TRIGGER_EXPIRE_TRAILS 8 /* User expiration of trails. */ +#define AUDIT_TRIGGER_MAX 8 /* * The special device filename (FreeBSD). ==== //depot/projects/vimage/src/sys/bsm/audit_kevents.h#10 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#4 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.18 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#5 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.19 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -587,6 +587,8 @@ #define AUE_CAP_GETMODE 43189 /* TrustedBSD. */ #define AUE_POSIX_SPAWN 43190 /* Darwin. */ #define AUE_FSGETPATH 43191 /* Darwin. */ +#define AUE_PREAD 43192 /* Darwin/FreeBSD. */ +#define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -658,7 +660,6 @@ /* * Possible desired future values based on review of BSD/Darwin system calls. */ -#define AUE_ACCESSEXTENDED AUE_NULL #define AUE_ATGETMSG AUE_NULL #define AUE_ATPUTMSG AUE_NULL #define AUE_ATSOCKET AUE_NULL @@ -669,11 +670,9 @@ #define AUE_BSDTHREADCREATE AUE_NULL #define AUE_BSDTHREADTERMINATE AUE_NULL #define AUE_BSDTHREADREGISTER AUE_NULL -#define AUE_CHMODEXTENDED AUE_NULL #define AUE_CHUD AUE_NULL #define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL -#define AUE_FCHMODEXTENDED AUE_NULL #define AUE_FDATASYNC AUE_NULL #define AUE_FFSCTL AUE_NULL #define AUE_FGETATTRLIST AUE_NULL @@ -683,11 +682,10 @@ #define AUE_FSCTL AUE_NULL #define AUE_FSETATTRLIST AUE_NULL #define AUE_FSETXATTR AUE_NULL -#define AUE_FSTATEXTENDED AUE_NULL #define AUE_FSTATFS64 AUE_NULL #define AUE_FSTATV AUE_NULL #define AUE_FSTAT64 AUE_NULL -#define AUE_FSTAT64EXTENDED AUE_NULL +#define AUE_FSTAT64_EXTENDED AUE_NULL #define AUE_GCCONTROL AUE_NULL #define AUE_GETDIRENTRIES64 AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL @@ -721,21 +719,15 @@ #define AUE_ISSETUGID AUE_NULL #define AUE_LIOLISTIO AUE_NULL #define AUE_LISTXATTR AUE_NULL -#define AUE_LSTATEXTENDED AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_LSTAT64 AUE_NULL -#define AUE_LSTAT64EXTENDED AUE_NULL +#define AUE_LSTAT64_EXTENDED AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MKDIREXTENDED AUE_NULL -#define AUE_MKFIFOEXTENDED AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_OPENEXTENDED AUE_NULL -#define AUE_PREAD AUE_NULL -#define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL #define AUE_PROCINFO AUE_NULL #define AUE_PTHREADCANCELED AUE_NULL @@ -779,15 +771,13 @@ #define AUE_SIGWAIT AUE_NULL #define AUE_SSTK AUE_NULL #define AUE_STACKSNAPSHOT AUE_NULL -#define AUE_STATEXTENDED AUE_NULL #define AUE_STATFS64 AUE_NULL #define AUE_STATV AUE_NULL #define AUE_STAT64 AUE_NULL -#define AUE_STAT64EXTENDED AUE_NULL +#define AUE_STAT64_EXTENDED AUE_NULL #define AUE_SYNC AUE_NULL #define AUE_SYSCALL AUE_NULL #define AUE_TABLE AUE_NULL -#define AUE_UMASKEXTENDED AUE_NULL #define AUE_VMPRESSUREMONITOR AUE_NULL #define AUE_WAITEVENT AUE_NULL #define AUE_WAITID AUE_NULL ==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.13 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.14 2009/03/02 23:26:30 jamie Exp $"); #include #include @@ -39,14 +39,6 @@ MALLOC_DECLARE(M_MOUNT); -TAILQ_HEAD(vfsoptlist, vfsopt); -struct vfsopt { - TAILQ_ENTRY(vfsopt) link; - char *name; - void *value; - int len; -}; - void vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg, int flags __unused) @@ -64,6 +56,8 @@ namesize = strlen(name) + 1; opt->name = malloc(namesize, M_MOUNT, M_WAITOK); strlcpy(opt->name, name, namesize); + opt->pos = -1; + opt->seen = 1; if (arg == NULL) { opt->value = NULL; @@ -80,22 +74,9 @@ void vfs_clearmntopt(vfs_t *vfsp, const char *name) { - struct vfsopt *opt; - if (vfsp->mnt_opt == NULL) - return; /* TODO: Locking. */ - TAILQ_FOREACH(opt, vfsp->mnt_opt, link) { - if (strcmp(opt->name, name) == 0) - break; - } - if (opt != NULL) { - TAILQ_REMOVE(vfsp->mnt_opt, opt, link); - free(opt->name, M_MOUNT); - if (opt->value != NULL) - free(opt->value, M_MOUNT); - free(opt, M_MOUNT); - } + vfs_deleteopt(vfsp->mnt_opt, name); } int ==== //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.4 2008/11/17 20:49:29 pjd Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.5 2009/02/28 16:21:25 ed Exp $ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ @@ -97,10 +97,6 @@ #define P2SAMEHIGHBIT_TYPED(x, y, type) \ (((type)(x) ^ (type)(y)) < ((type)(x) & (type)(y))) -#ifdef _KERNEL -#define memmove(dst, src, size) bcopy((src), (dst), (size)) -#endif - /* * Find highest one bit set. * Returns bit number + 1 of highest bit that is set, otherwise returns 0. ==== //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_misc.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.86 2008/12/29 12:58:45 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.87 2009/03/02 23:26:30 jamie Exp $"); #include "opt_compat.h" @@ -2639,8 +2639,7 @@ } */ *uap) { struct uio *auio; - struct iovec *iov; - int error, k; + int error; AUDIT_ARG(fflags, uap->flags); @@ -2662,14 +2661,8 @@ error = freebsd32_copyinuio(uap->iovp, uap->iovcnt, &auio); if (error) return (error); - for (iov = auio->uio_iov, k = 0; k < uap->iovcnt; ++k, ++iov) { - if (iov->iov_len > MMAXOPTIONLEN) { - free(auio, M_IOV); - return (EINVAL); - } - } + error = vfs_donmount(td, uap->flags, auio); - error = vfs_donmount(td, uap->flags, auio); free(auio, M_IOV); return error; } ==== //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#34 (text+ko) ==== @@ -39,10 +39,11 @@ * @(#)procfs_status.c 8.4 (Berkeley) 6/15/94 */ +#include "opt_route.h" #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.135 2009/02/13 15:32:03 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.136 2009/02/27 14:12:05 bz Exp $"); #include #include @@ -76,6 +77,7 @@ #include #include +#include #include #include ==== //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#19 (text+ko) ==== @@ -26,10 +26,11 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "opt_route.h" #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.146 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.147 2009/02/27 14:12:05 bz Exp $"); #include #include @@ -63,6 +64,7 @@ #include #include #include +#include #include #ifdef COMPAT_LINUX32 ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_sockio.c#11 (text+ko) ==== @@ -27,7 +27,9 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.22 2008/12/02 21:37:28 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_sockio.c,v 1.23 2009/02/27 14:12:05 bz Exp $"); + +#include "opt_route.h" #include #include @@ -39,6 +41,7 @@ #include #include +#include #include #include ==== //depot/projects/vimage/src/sys/conf/files.amd64#20 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.130 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.131 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -271,4 +271,5 @@ i386/cpufreq/est.c optional cpufreq i386/cpufreq/p4tcc.c optional cpufreq # +libkern/memmove.c standard libkern/memset.c standard ==== //depot/projects/vimage/src/sys/conf/files.i386#27 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.614 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.615 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -366,6 +366,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard ==== //depot/projects/vimage/src/sys/conf/files.ia64#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.97 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.98 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -130,4 +130,5 @@ libkern/ia64/__umodsi3.S standard libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard +libkern/memmove.c standard libkern/memset.c standard ==== //depot/projects/vimage/src/sys/conf/files.mips#6 (text+ko) ==== @@ -18,7 +18,7 @@ # Copyright (c) 2001, 2004-2005, Juniper Networks, Inc. # All rights reserved. # JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta -# $FreeBSD: src/sys/conf/files.mips,v 1.6 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.mips,v 1.7 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -82,6 +82,7 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memmove.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/udivdi3.c standard ==== //depot/projects/vimage/src/sys/conf/files.pc98#18 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.372 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.373 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -224,6 +224,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard ==== //depot/projects/vimage/src/sys/conf/files.powerpc#19 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.93 2009/02/21 02:15:08 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.94 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -63,6 +63,7 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard ==== //depot/projects/vimage/src/sys/conf/files.sparc64#17 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.105 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.106 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -65,6 +65,7 @@ libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard +libkern/memmove.c standard sparc64/central/central.c optional central sparc64/ebus/ebus.c optional ebus sparc64/fhc/clkbrd.c optional fhc ==== //depot/projects/vimage/src/sys/conf/files.sun4v#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sun4v,v 1.18 2008/12/20 00:33:10 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.19 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -34,6 +34,7 @@ libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard +libkern/memmove.c standard sparc64/sparc64/autoconf.c standard sun4v/sun4v/bus_machdep.c standard sun4v/sun4v/clock.c standard ==== //depot/projects/vimage/src/sys/conf/kern.mk#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.58 2009/02/22 18:45:30 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.59 2009/03/03 18:53:47 imp Exp $ # # Warning flags for compiling the kernel and components of the kernel. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Mar 3 22:47:42 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4E0A1065675; Tue, 3 Mar 2009 22:47:42 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5C762106564A for ; Tue, 3 Mar 2009 22:47:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 49EEE8FC1A for ; Tue, 3 Mar 2009 22:47:42 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n23MlgLh048370 for ; Tue, 3 Mar 2009 22:47:42 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n23MlgTI048368 for perforce@freebsd.org; Tue, 3 Mar 2009 22:47:42 GMT (envelope-from jhb@freebsd.org) Date: Tue, 3 Mar 2009 22:47:42 GMT Message-Id: <200903032247.n23MlgTI048368@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 158635 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2009 22:47:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=158635 Change 158635 by jhb@jhb_jhbbsd on 2009/03/03 22:47:27 Compile. Affected files ... .. //depot/projects/multipass/sys/kern/subr_bus.c#4 edit .. //depot/user/jhb/acpipci/dev/pci/pci.c#118 edit Differences ... ==== //depot/projects/multipass/sys/kern/subr_bus.c#4 (text+ko) ==== @@ -3281,8 +3281,11 @@ void bus_generic_new_pass(device_t dev) { + driverlink_t dl; + devclass_t dc; device_t child; + dc = dev->devclass; TAILQ_FOREACH(dl, &dc->drivers, link) { if (dl->pass == bus_current_pass) DEVICE_IDENTIFY(dl->driver, dev); ==== //depot/user/jhb/acpipci/dev/pci/pci.c#118 (text+ko) ==== @@ -2279,8 +2279,7 @@ int b, int s, int f, int reg, struct resource_list *rl, int force, int prefetch) { - uint32_t map; - pci_addr_t base; + pci_addr_t base, map; pci_addr_t start, end, count; uint8_t ln2size; uint8_t ln2range; From owner-p4-projects@FreeBSD.ORG Tue Mar 3 23:10:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83B8C10656C3; Tue, 3 Mar 2009 23:10: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 400BD10656C1 for ; Tue, 3 Mar 2009 23:10:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E3408FC14 for ; Tue, 3 Mar 2009 23:10:10 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n23NAAqw050969 for ; Tue, 3 Mar 2009 23:10:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n23NAAtv050967 for perforce@freebsd.org; Tue, 3 Mar 2009 23:10:10 GMT (envelope-from jhb@freebsd.org) Date: Tue, 3 Mar 2009 23:10:10 GMT Message-Id: <200903032310.n23NAAtv050967@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 158637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Mar 2009 23:10:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=158637 Change 158637 by jhb@jhb_jhbbsd on 2009/03/03 23:09:20 Update. Affected files ... .. //depot/projects/multipass/notes#5 edit Differences ... ==== //depot/projects/multipass/notes#5 (text+ko) ==== @@ -44,6 +44,21 @@ any drivers for the current pass (only == current pass). Right now this is just in bus_generic_new_pass(). +Simple Cases of Early Drivers +----------------------------- +- Change nexus0 to be an early driver +- Change acpi0 to be an early driver (BUS_PASS_BUSSES) + - cpu drivers should become BUS_PASS_CPUS (but not cpufreq drivers) + - system resource (apic0, ram0, acpi_sysres0) should become BUS_PASS_RESOURCE + - pci_link should become BUS_PASS_INTERRUPT_CONTROLLERS + - embedded controller? +- Change pci to be an early driver (BUS_PASS_BUSSES) + - pci_pci should be BUS_PASS_BUSSES as well + - isab should be BUS_PASS_BUSSES + - isa0 should be BUS_PASS_BUSSES (this is harder) + - have to decide when to enumerate hinted children +- legacy0 + Guidelines for Writing an Early Driver: --------------------------------------- - Use bus_generic_new_pass() for 'bus_new_pass' device method in bus_if.m. From owner-p4-projects@FreeBSD.ORG Wed Mar 4 09:07:34 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A72621065674; Wed, 4 Mar 2009 09:07: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 5C18D106566C for ; Wed, 4 Mar 2009 09:07:33 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 40B708FC0A for ; Wed, 4 Mar 2009 09:07:33 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2497XAJ067135 for ; Wed, 4 Mar 2009 09:07:33 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2497X1U067133 for perforce@freebsd.org; Wed, 4 Mar 2009 09:07:33 GMT (envelope-from antab@FreeBSD.org) Date: Wed, 4 Mar 2009 09:07:33 GMT Message-Id: <200903040907.n2497X1U067133@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 158659 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 09:07:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=158659 Change 158659 by antab@antab_farm on 2009/03/04 09:07:28 Update dirty bit when page is written to. Move handler for protection fault from trap.c to pmap.c. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/exception.S#7 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#12 edit .. //depot/projects/avr32/src/sys/avr32/avr32/trap.c#7 edit .. //depot/projects/avr32/src/sys/avr32/include/pmap.h#5 edit .. //depot/projects/avr32/src/sys/avr32/include/reg.h#6 edit .. //depot/projects/avr32/src/sys/avr32/include/trap.h#5 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/exception.S#7 (text+ko) ==== @@ -27,8 +27,10 @@ #include #include +#include #include #include +#include #include "assym.s" __FBSDID("$FreeBSD: $"); @@ -181,20 +183,39 @@ rete handle_protection_fault: - breakpoint PUSH_TRAPFRAME(EX) mfsr r12, AT32_SYS_ECR mov r11, sp - rcall trap_handle_protection_fault + rcall pmap_tlb_protection_fault POP_TRAPFRAME(EX) rete +/* + * Data TLB Modified. Called when memory write hits a clean page + */ handle_dtlb_modified: - PUSH_TRAPFRAME(EX) - mfsr r12, AT32_SYS_ECR - mov r11, sp - rcall trap_handle_dtlb_modified - POP_TRAPFRAME(EX) + pushm r10-r12 + /* + * Get Page table entry and set Dirty bit + */ + mfsr r10, AT32_SYS_PTBR /* Page directory */ + mfsr r11, AT32_SYS_TLBEAR /* VA */ + lsr r12, r11, PD_SHIFT + ld.w r10, r10[r12 << 2] /* Get page table */ + bfextu r12, r11, PT_SHIFT, 8 + ld.w r11, r10[r12 << 2] /* Load page entry */ + sbr r11, AT32_SYS_TLBELO_D /* Mark as durty */ + st.w r10[r12 << 2], r11 /* Store page entry */ + + /* + * Update TLB + */ + andl r11, lo(~PTE_SOFTWARE_MASK) /* Mask out software */ + sbr r11, 2 /* 4k page */ + mtsr AT32_SYS_TLBELO, r11 + tlbw /* Update tlb */ + + popm r10-r12 rete handle_breakpoint: ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#12 (text+ko) ==== @@ -222,6 +222,7 @@ { mtx_assert(&vm_page_queue_mtx, MA_OWNED); if (m->md.pv_flags & PV_TABLE_MOD) { + avr32_impl(); //pmap_changebit(m, PTE_M, FALSE); TODO m->md.pv_flags &= ~PV_TABLE_MOD; } @@ -622,9 +623,9 @@ if (*pte & PTE_WIRED) { pv->pv_pmap->pm_stats.wired_count--; } - //if (*pte & PTE_M) { - // vm_page_dirty(m); - //} TODO + if (*pte & PTE_DIRTY) { + vm_page_dirty(m); + } *pte = 0; tlb_remove_entry(pv->pv_pmap, pv->pv_va); @@ -677,7 +678,7 @@ * pmap_remove_pte: do the things to unmap a page in a process */ static int -pmap_remove_pte(struct pmap *pmap, pt_entry_t *ptq, vm_offset_t va) +pmap_remove_pte(struct pmap *pmap, pt_entry_t *pte, vm_offset_t va) { vm_page_t m; vm_offset_t pa; @@ -685,18 +686,18 @@ mtx_assert(&vm_page_queue_mtx, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - if (*ptq & PTE_WIRED) { + if (*pte & PTE_WIRED) { pmap->pm_stats.wired_count--; } pmap->pm_stats.resident_count--; - pa = pfn_get(*ptq); + pa = pfn_get(*pte); if (page_is_managed(pa)) { m = PHYS_TO_VM_PAGE(pa); - //if (oldpte & PTE_M) { - // vm_page_dirty(m); - //} TODO + if (*pte & PTE_DIRTY) { + vm_page_dirty(m); + } if (m->md.pv_flags & PV_TABLE_REF) { vm_page_flag_set(m, PG_REFERENCED); } @@ -706,7 +707,7 @@ pmap_remove_entry(pmap, m, va); } } - *ptq = 0; + *pte = 0; return (1); } @@ -1014,12 +1015,15 @@ /** * Called when we need to update the TLB + * XXX: Split this up, with short path written in assembly and long path + * here to call vm_fault. */ static int tlb_at = KSTACK_PAGES; void pmap_tlb_miss(uint32_t ecr, uint32_t tlbear, uint32_t tlbehi, struct trapframe *tf) { pd_entry_t* pd = (pd_entry_t *)sysreg_read(PTBR); + struct thread *td = curthread; pt_entry_t *ent; - register_t mmucr; + register_t mmucr, intr; ent = (pt_entry_t *)pd[pd_index_from_va(tlbear)]; if (ent) { @@ -1034,10 +1038,6 @@ __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_EM)); __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_GM)); - if (tlbear == 0x0) { - panic("Access to 0x0! OMG!\n"); - } - struct thread *td = curthread; struct proc *p = curproc; vm_prot_t ftype; vm_map_t map; @@ -1068,44 +1068,40 @@ PROC_UNLOCK(p); } else { map = kernel_map; - rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); } - if (rv == KERN_SUCCESS) { + if (rv != KERN_SUCCESS) { if (!TRAPF_USERMODE(tf)) { - return; + panic("Fault in kernel at 0x%x", tlbear); } + + /* + * Generate signal + */ + td->td_frame->regs.pc = tf->regs.pc; + ksiginfo_init_trap(&ksi); + ksi.ksi_signo = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV; + ksi.ksi_code = ftype; + ksi.ksi_addr = (void *)tf->regs.pc; + ksi.ksi_trapno = ecr; + trapsignal(td, &ksi); + goto out; } - if (!TRAPF_USERMODE(tf)) { - panic("Fault in kernel at 0x%x", tlbear); - } - /* - * Generate signal - */ - td->td_frame->regs.pc = tf->regs.pc; - ksiginfo_init_trap(&ksi); - ksi.ksi_signo = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV; - ksi.ksi_code = ftype; - ksi.ksi_addr = (void *)tf->regs.pc; - ksi.ksi_trapno = ecr; - trapsignal(td, &ksi); -out: - userret(td, tf); - return; + ent = (pt_entry_t *)pd[pd_index_from_va(tlbear)]; + KASSERT(ent != NULL, ("Empty pte after success from vm_fault")); + ent += pt_index_from_va(tlbear); + } -/* printf("\nTLB miss: %x\n", ecr); - printf("pd: %x\n", sysreg_read(PTBR)); - printf("TLBEAR: %x\n", tlbear); - printf("TLBEHI: %x\n", tlbehi); - printf("PC: %x\n", sysreg_read(RAR_EX)); - printf("SR: %x\n", sysreg_read(RSR_EX)); */ + /* Write miss, mark page as dirty */ + if (ecr == T_TLB_MISS_WRITE) { + *ent |= PTE_DIRTY; + } - breakpoint(); - panic("pmap_tlb_miss: address 0x%x not in pd %p\n", tlbear, pd); - } + /* XXX: Exceptions are enabled in the long path */ + intr = intr_disable(); mmucr = sysreg_read(MMUCR); mmucr &= ~bit_mask(SYS, MMUCR, DRP); @@ -1115,8 +1111,7 @@ sysreg_write(TLBEHI, (tlbear & bit_mask(SYS, TLBEHI, VPN)) | bit_offset(SYS, TLBEHI, V) | (bit_mask(SYS, TLBEHI, ASID) & tlbehi)); - sysreg_write(TLBELO, (*ent & ~bit_mask(SYS, TLBELO, SZ)) | PTE_DIRTY | - PTE_SIZE_4K); + sysreg_write(TLBELO, (*ent & ~PTE_SOFTWARE_MASK) | PTE_SIZE_4K); sysreg_write(MMUCR, mmucr); nop(); @@ -1128,5 +1123,28 @@ if (tlb_at == TLB_SIZE) { tlb_at = KSTACK_PAGES; } + + /* XXX */ + intr_restore(intr); + +out: + if (!TRAPF_USERMODE(tf)) { + return; + } + userret(td, tf); } +/* + * Handle protection fault + */ +void pmap_tlb_protection_fault(uint32_t ecr, struct trapframe *tf) { + pd_entry_t* pd = (pd_entry_t *)sysreg_read(PTBR); + uint32_t va = sysreg_read(TLBEAR); + pt_entry_t *ent; + + ent = (pt_entry_t *)pd[pd_index_from_va(va)]; + ent += pt_index_from_va(va); + KASSERT(ent || *ent, ("Page table entry missing in protection fault")); + + panic("Finish implementing protection fault"); +} ==== //depot/projects/avr32/src/sys/avr32/avr32/trap.c#7 (text+ko) ==== @@ -104,16 +104,3 @@ avr32_impl(); } -void trap_handle_protection_fault(uint32_t ecr, struct trapframe *frame) { - printf("Protection fault, ecr: %x\n", ecr); - trapframe_dump(frame); - tlb_dump(); - avr32_impl(); -} - -void trap_handle_dtlb_modified(uint32_t ecr, struct trapframe *frame) { - printf("DTLB modified, ecr: %x\n", ecr); - trapframe_dump(frame); - avr32_impl(); -} - ==== //depot/projects/avr32/src/sys/avr32/include/pmap.h#5 (text+ko) ==== @@ -198,6 +198,7 @@ pt_entry_t* pmap_pte(pmap_t pmap, vm_offset_t va); void pmap_tlb_miss(uint32_t ecr, uint32_t tlbear, uint32_t tlbehi, struct trapframe *); +void pmap_tlb_protection_fault(uint32_t ecr, struct trapframe *tf); #define pmap_resident_count(pm) ((pm)->pm_stats.resident_count) #define vtophys(va) pmap_kextract((vm_offset_t)(va)) ==== //depot/projects/avr32/src/sys/avr32/include/reg.h#6 (text+ko) ==== @@ -65,6 +65,17 @@ #define reg_write(offset, par, reg, value) \ __raw_write((void *)(offset + AT32_##par##_##reg), (value)) +static inline uint32_t __raw_read(const volatile void *addr) { + return *(const volatile uint32_t *)addr; +} + +static inline void __raw_write(volatile void *addr, uint32_t value) { + *(volatile uint32_t *)addr = value; +} + +#endif +#endif + #define bit_shift(par, reg, bit) \ AT32_##par##_##reg##_##bit @@ -77,14 +88,4 @@ #define bit_value(par, reg, bit, value) \ ((value >> AT32_##par##_##reg##_##bit ) & ((1 << AT32_##par##_##reg##_##bit##_SIZE) - 1)) -static inline uint32_t __raw_read(const volatile void *addr) { - return *(const volatile uint32_t *)addr; -} - -static inline void __raw_write(volatile void *addr, uint32_t value) { - *(volatile uint32_t *)addr = value; -} -#endif -#endif - #endif /* !MACHINE_REG_H */ ==== //depot/projects/avr32/src/sys/avr32/include/trap.h#5 (text+ko) ==== @@ -34,8 +34,6 @@ void trap_handle_illegal_opcode(uint32_t ecr, struct trapframe *reg); void trap_handle_breakpoint(uint32_t ecr, struct trapframe *reg); void trap_handle_address_fault(uint32_t ecr, struct trapframe *reg); -void trap_handle_protection_fault(uint32_t ecr, struct trapframe *reg); -void trap_handle_dtlb_modified(uint32_t ecr, struct trapframe *reg); void trapframe_dump(struct trapframe *frame); #define T_BREAKPOINT 0x07 From owner-p4-projects@FreeBSD.ORG Wed Mar 4 09:20:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 201171065673; Wed, 4 Mar 2009 09:20: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 CE31E1065670 for ; Wed, 4 Mar 2009 09:20:46 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BBFB28FC17 for ; Wed, 4 Mar 2009 09:20:46 +0000 (UTC) (envelope-from antab@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n249Kkpe068145 for ; Wed, 4 Mar 2009 09:20:46 GMT (envelope-from antab@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n249Kkit068143 for perforce@freebsd.org; Wed, 4 Mar 2009 09:20:46 GMT (envelope-from antab@FreeBSD.org) Date: Wed, 4 Mar 2009 09:20:46 GMT Message-Id: <200903040920.n249Kkit068143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to antab@FreeBSD.org using -f From: Arnar Mar Sig To: Perforce Change Reviews Cc: Subject: PERFORCE change 158660 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 09:20:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=158660 Change 158660 by antab@antab_farm on 2009/03/04 09:19:58 Implement whats needed for WITNESS and enable it. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/db_trace.c#3 edit .. //depot/projects/avr32/src/sys/avr32/avr32/stack_machdep.c#2 edit .. //depot/projects/avr32/src/sys/avr32/avr32/support.S#9 edit .. //depot/projects/avr32/src/sys/avr32/conf/NGW100#11 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/db_trace.c#3 (text+ko) ==== @@ -42,6 +42,8 @@ #include #include +static void db_backtrace(struct thread *thr, struct db_frame *frame); + int db_md_set_watchpoint(db_expr_t addr, db_expr_t size) { @@ -64,25 +66,32 @@ void db_trace_self(void) { - db_trace_thread(curthread, -1); + register_t fp; + + __asm__ __volatile__("mov %0, r7" : "=r" (fp)); + db_backtrace(curthread, (struct db_frame *)fp); } int db_trace_thread(struct thread *thr, int count) { - struct db_frame *frame, head; struct pcb *ctx; + + ctx = kdb_thr_ctx(thr); + db_backtrace(thr, (struct db_frame *)ctx->pcb_regs.regs.r7); + return (0); +} + +static void +db_backtrace(struct thread *thr, struct db_frame *frame) +{ c_db_sym_t sym; const char *name; db_expr_t value; db_expr_t offset; int i; - ctx = kdb_thr_ctx(thr); i = 0; - head.lr = ctx->pcb_regs.regs.pc; - head.fp = (struct db_frame *)ctx->pcb_regs.regs.r7; - frame = &head; do { db_printf("#%-2d 0x%x in ", i++, frame->lr); @@ -99,14 +108,14 @@ frame = frame->fp; if (frame == NULL) { - return (0); + return; } } while ((vm_offset_t)frame >= thr->td_kstack && (vm_offset_t)frame <= thr->td_kstack + (KSTACK_PAGES * PAGE_SIZE)); db_printf("Frame pointer %p not in stack\n", frame); - return (0); + return; } void ==== //depot/projects/avr32/src/sys/avr32/avr32/stack_machdep.c#2 (text+ko) ==== @@ -7,7 +7,28 @@ #include #include #include +#include + +static void +stack_capture(struct thread *td, struct stack *st, struct db_frame *frame) +{ + stack_zero(st); + for (; frame != NULL; frame = frame->fp) { + if ((vm_offset_t)frame < td->td_kstack && + (vm_offset_t)frame > td->td_kstack + + (KSTACK_PAGES * PAGE_SIZE)) { + break; + } + if (frame->lr == NULL) { + break; + } + if (stack_put(st, frame->lr) == -1) { + break; + } + } +} + void stack_save_td(struct stack *st, struct thread *td) { @@ -17,5 +38,12 @@ void stack_save(struct stack *st) { - avr32_impl(); + register_t fp; + + if (curthread == NULL) { + panic("stack_save: curthread == NULL"); + } + + __asm__ __volatile__("mov %0, r7" : "=r" (fp)); + stack_capture(curthread, st, (struct db_frame *)fp); } ==== //depot/projects/avr32/src/sys/avr32/avr32/support.S#9 (text+ko) ==== ==== //depot/projects/avr32/src/sys/avr32/conf/NGW100#11 (text+ko) ==== @@ -36,7 +36,7 @@ options DIAGNOSTIC options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS -#options WITNESS #Enable checks to detect deadlocks and cycles +options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed #options WITNESS_KDB From owner-p4-projects@FreeBSD.ORG Wed Mar 4 09:31:02 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 705531065673; Wed, 4 Mar 2009 09:31: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 2A21A106566C for ; Wed, 4 Mar 2009 09:31:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 164138FC14 for ; Wed, 4 Mar 2009 09:31:02 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n249V1wu068866 for ; Wed, 4 Mar 2009 09:31:01 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n249UvvB068852 for perforce@freebsd.org; Wed, 4 Mar 2009 09:30:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 4 Mar 2009 09:30:57 GMT Message-Id: <200903040930.n249UvvB068852@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 158661 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 09:31:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=158661 Change 158661 by hselasky@hselasky_laptop001 on 2009/03/04 09:30:30 IFC @ 158658 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#10 integrate .. //depot/projects/usb/src/sys/bsm/audit.h#10 integrate .. //depot/projects/usb/src/sys/bsm/audit_kevents.h#11 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#14 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#17 integrate .. //depot/projects/usb/src/sys/conf/files.i386#19 integrate .. //depot/projects/usb/src/sys/conf/files.ia64#11 integrate .. //depot/projects/usb/src/sys/conf/files.mips#6 integrate .. //depot/projects/usb/src/sys/conf/files.pc98#16 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#18 integrate .. //depot/projects/usb/src/sys/conf/files.sparc64#13 integrate .. //depot/projects/usb/src/sys/conf/files.sun4v#8 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#10 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#11 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-raid.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#40 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#17 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcefw.h#7 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#11 integrate .. //depot/projects/usb/src/sys/dev/ichwd/ichwd.c#7 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_iicbus.c#3 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccard.c#6 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/usb/src/sys/dev/pccard/pccardvarp.h#5 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#15 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#11 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#37 integrate .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ng_ubt.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#29 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#47 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_dbregs.c#4 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_fpregs.c#3 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_regs.c#3 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/usb/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#3 integrate .. //depot/projects/usb/src/sys/kern/kern_priv.c#6 integrate .. //depot/projects/usb/src/sys/kern/subr_smp.c#10 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#17 integrate .. //depot/projects/usb/src/sys/kern/sys_process.c#10 integrate .. //depot/projects/usb/src/sys/kern/sysv_shm.c#7 integrate .. //depot/projects/usb/src/sys/kern/tty.c#18 integrate .. //depot/projects/usb/src/sys/kern/tty_info.c#5 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#11 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#18 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#18 integrate .. //depot/projects/usb/src/sys/libkern/memmove.c#1 branch .. //depot/projects/usb/src/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/usb/src/sys/net/bpf.c#14 integrate .. //depot/projects/usb/src/sys/net/if_var.h#12 integrate .. //depot/projects/usb/src/sys/net/netisr.h#4 integrate .. //depot/projects/usb/src/sys/net/vnet.h#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_freebsd.h#12 integrate .. //depot/projects/usb/src/sys/netgraph/atm/ng_ccatm.h#2 integrate .. //depot/projects/usb/src/sys/netgraph/atm/uni/ng_uni_cust.h#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_l2tp.c#8 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pppoe.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_pppoe.h#4 integrate .. //depot/projects/usb/src/sys/netinet/igmp.h#3 integrate .. //depot/projects/usb/src/sys/netinet/in.h#9 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ip6.h#5 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#12 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#19 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#15 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#9 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#6 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#12 integrate .. //depot/projects/usb/src/sys/netinet6/route6.c#8 integrate .. //depot/projects/usb/src/sys/netinet6/vinet6.h#6 integrate .. //depot/projects/usb/src/sys/netipsec/vipsec.h#4 integrate .. //depot/projects/usb/src/sys/pci/viapm.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#7 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_errno.c#3 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_token.c#12 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#5 integrate .. //depot/projects/usb/src/sys/sys/cdefs.h#7 integrate .. //depot/projects/usb/src/sys/sys/fcntl.h#4 integrate .. //depot/projects/usb/src/sys/sys/mbuf.h#11 integrate .. //depot/projects/usb/src/sys/sys/mount.h#15 integrate .. //depot/projects/usb/src/sys/sys/param.h#23 integrate .. //depot/projects/usb/src/sys/sys/priv.h#11 integrate .. //depot/projects/usb/src/sys/sys/sdt.h#2 integrate .. //depot/projects/usb/src/sys/sys/shm.h#3 integrate .. //depot/projects/usb/src/sys/sys/stat.h#5 integrate .. //depot/projects/usb/src/sys/sys/systm.h#12 integrate .. //depot/projects/usb/src/sys/sys/tree.h#5 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#5 integrate .. //depot/projects/usb/src/sys/xdr/xdr_mem.c#2 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#10 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.260 2009/03/02 18:43:50 kib Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -80,12 +81,6 @@ #include -#ifdef COMPAT_IA32 - -extern struct sysentvec ia32_freebsd_sysvec; - -#endif - static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -331,7 +326,7 @@ cpu_thread_clean(td); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { /* * Set the trap frame to point at the beginning of the uts * function. @@ -377,7 +372,7 @@ return (EINVAL); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { if (td == curthread) { critical_enter(); td->td_pcb->pcb_gsbase = (register_t)tls_base; ==== //depot/projects/usb/src/sys/bsm/audit.h#10 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#4 - * $FreeBSD: src/sys/bsm/audit.h,v 1.14 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#5 + * $FreeBSD: src/sys/bsm/audit.h,v 1.15 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -66,8 +66,9 @@ #define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ #define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ #define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests rotate. */ -#define AUDIT_TRIGGER_INITIALIZE 7 /* Initialize audit. */ -#define AUDIT_TRIGGER_MAX 7 +#define AUDIT_TRIGGER_INITIALIZE 7 /* User initialize of auditd. */ +#define AUDIT_TRIGGER_EXPIRE_TRAILS 8 /* User expiration of trails. */ +#define AUDIT_TRIGGER_MAX 8 /* * The special device filename (FreeBSD). ==== //depot/projects/usb/src/sys/bsm/audit_kevents.h#11 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#4 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.18 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#5 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.19 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -587,6 +587,8 @@ #define AUE_CAP_GETMODE 43189 /* TrustedBSD. */ #define AUE_POSIX_SPAWN 43190 /* Darwin. */ #define AUE_FSGETPATH 43191 /* Darwin. */ +#define AUE_PREAD 43192 /* Darwin/FreeBSD. */ +#define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -658,7 +660,6 @@ /* * Possible desired future values based on review of BSD/Darwin system calls. */ -#define AUE_ACCESSEXTENDED AUE_NULL #define AUE_ATGETMSG AUE_NULL #define AUE_ATPUTMSG AUE_NULL #define AUE_ATSOCKET AUE_NULL @@ -669,11 +670,9 @@ #define AUE_BSDTHREADCREATE AUE_NULL #define AUE_BSDTHREADTERMINATE AUE_NULL #define AUE_BSDTHREADREGISTER AUE_NULL -#define AUE_CHMODEXTENDED AUE_NULL #define AUE_CHUD AUE_NULL #define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL -#define AUE_FCHMODEXTENDED AUE_NULL #define AUE_FDATASYNC AUE_NULL #define AUE_FFSCTL AUE_NULL #define AUE_FGETATTRLIST AUE_NULL @@ -683,11 +682,10 @@ #define AUE_FSCTL AUE_NULL #define AUE_FSETATTRLIST AUE_NULL #define AUE_FSETXATTR AUE_NULL -#define AUE_FSTATEXTENDED AUE_NULL #define AUE_FSTATFS64 AUE_NULL #define AUE_FSTATV AUE_NULL #define AUE_FSTAT64 AUE_NULL -#define AUE_FSTAT64EXTENDED AUE_NULL +#define AUE_FSTAT64_EXTENDED AUE_NULL #define AUE_GCCONTROL AUE_NULL #define AUE_GETDIRENTRIES64 AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL @@ -721,21 +719,15 @@ #define AUE_ISSETUGID AUE_NULL #define AUE_LIOLISTIO AUE_NULL #define AUE_LISTXATTR AUE_NULL -#define AUE_LSTATEXTENDED AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_LSTAT64 AUE_NULL -#define AUE_LSTAT64EXTENDED AUE_NULL +#define AUE_LSTAT64_EXTENDED AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MKDIREXTENDED AUE_NULL -#define AUE_MKFIFOEXTENDED AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_OPENEXTENDED AUE_NULL -#define AUE_PREAD AUE_NULL -#define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL #define AUE_PROCINFO AUE_NULL #define AUE_PTHREADCANCELED AUE_NULL @@ -779,15 +771,13 @@ #define AUE_SIGWAIT AUE_NULL #define AUE_SSTK AUE_NULL #define AUE_STACKSNAPSHOT AUE_NULL -#define AUE_STATEXTENDED AUE_NULL #define AUE_STATFS64 AUE_NULL #define AUE_STATV AUE_NULL #define AUE_STAT64 AUE_NULL -#define AUE_STAT64EXTENDED AUE_NULL +#define AUE_STAT64_EXTENDED AUE_NULL #define AUE_SYNC AUE_NULL #define AUE_SYSCALL AUE_NULL #define AUE_TABLE AUE_NULL -#define AUE_UMASKEXTENDED AUE_NULL #define AUE_VMPRESSUREMONITOR AUE_NULL #define AUE_WAITEVENT AUE_NULL #define AUE_WAITID AUE_NULL ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.13 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.14 2009/03/02 23:26:30 jamie Exp $"); #include #include @@ -39,14 +39,6 @@ MALLOC_DECLARE(M_MOUNT); -TAILQ_HEAD(vfsoptlist, vfsopt); -struct vfsopt { - TAILQ_ENTRY(vfsopt) link; - char *name; - void *value; - int len; -}; - void vfs_setmntopt(vfs_t *vfsp, const char *name, const char *arg, int flags __unused) @@ -64,6 +56,8 @@ namesize = strlen(name) + 1; opt->name = malloc(namesize, M_MOUNT, M_WAITOK); strlcpy(opt->name, name, namesize); + opt->pos = -1; + opt->seen = 1; if (arg == NULL) { opt->value = NULL; @@ -80,22 +74,9 @@ void vfs_clearmntopt(vfs_t *vfsp, const char *name) { - struct vfsopt *opt; - if (vfsp->mnt_opt == NULL) - return; /* TODO: Locking. */ - TAILQ_FOREACH(opt, vfsp->mnt_opt, link) { - if (strcmp(opt->name, name) == 0) - break; - } - if (opt != NULL) { - TAILQ_REMOVE(vfsp->mnt_opt, opt, link); - free(opt->name, M_MOUNT); - if (opt->value != NULL) - free(opt->value, M_MOUNT); - free(opt, M_MOUNT); - } + vfs_deleteopt(vfsp->mnt_opt, name); } int ==== //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.4 2008/11/17 20:49:29 pjd Exp $ + * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.5 2009/02/28 16:21:25 ed Exp $ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ @@ -97,10 +97,6 @@ #define P2SAMEHIGHBIT_TYPED(x, y, type) \ (((type)(x) ^ (type)(y)) < ((type)(x) & (type)(y))) -#ifdef _KERNEL -#define memmove(dst, src, size) bcopy((src), (dst), (size)) -#endif - /* * Find highest one bit set. * Returns bit number + 1 of highest bit that is set, otherwise returns 0. ==== //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.86 2008/12/29 12:58:45 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.87 2009/03/02 23:26:30 jamie Exp $"); #include "opt_compat.h" @@ -2639,8 +2639,7 @@ } */ *uap) { struct uio *auio; - struct iovec *iov; - int error, k; + int error; AUDIT_ARG(fflags, uap->flags); @@ -2662,14 +2661,8 @@ error = freebsd32_copyinuio(uap->iovp, uap->iovcnt, &auio); if (error) return (error); - for (iov = auio->uio_iov, k = 0; k < uap->iovcnt; ++k, ++iov) { - if (iov->iov_len > MMAXOPTIONLEN) { - free(auio, M_IOV); - return (EINVAL); - } - } + error = vfs_donmount(td, uap->flags, auio); - error = vfs_donmount(td, uap->flags, auio); free(auio, M_IOV); return error; } ==== //depot/projects/usb/src/sys/conf/files.amd64#17 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.130 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.131 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -271,4 +271,5 @@ i386/cpufreq/est.c optional cpufreq i386/cpufreq/p4tcc.c optional cpufreq # +libkern/memmove.c standard libkern/memset.c standard ==== //depot/projects/usb/src/sys/conf/files.i386#19 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.614 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.615 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -366,6 +366,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard ==== //depot/projects/usb/src/sys/conf/files.ia64#11 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.97 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.98 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -130,4 +130,5 @@ libkern/ia64/__umodsi3.S standard libkern/ia64/bswap16.S standard libkern/ia64/bswap32.S standard +libkern/memmove.c standard libkern/memset.c standard ==== //depot/projects/usb/src/sys/conf/files.mips#6 (text+ko) ==== @@ -18,7 +18,7 @@ # Copyright (c) 2001, 2004-2005, Juniper Networks, Inc. # All rights reserved. # JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta -# $FreeBSD: src/sys/conf/files.mips,v 1.6 2008/12/01 16:53:01 sam Exp $ +# $FreeBSD: src/sys/conf/files.mips,v 1.7 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -82,6 +82,7 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memmove.c standard libkern/moddi3.c standard libkern/qdivrem.c standard libkern/udivdi3.c standard ==== //depot/projects/usb/src/sys/conf/files.pc98#16 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.372 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.373 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -224,6 +224,7 @@ libkern/divdi3.c standard libkern/ffsl.c standard libkern/flsl.c standard +libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard ==== //depot/projects/usb/src/sys/conf/files.powerpc#18 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.93 2009/02/21 02:15:08 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.94 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -63,6 +63,7 @@ libkern/fls.c standard libkern/flsl.c standard libkern/lshrdi3.c standard +libkern/memmove.c standard libkern/memset.c standard libkern/moddi3.c standard libkern/qdivrem.c standard ==== //depot/projects/usb/src/sys/conf/files.sparc64#13 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.105 2009/02/15 20:24:21 thompsa Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.106 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -65,6 +65,7 @@ libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard +libkern/memmove.c standard sparc64/central/central.c optional central sparc64/ebus/ebus.c optional ebus sparc64/fhc/clkbrd.c optional fhc ==== //depot/projects/usb/src/sys/conf/files.sun4v#8 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sun4v,v 1.18 2008/12/20 00:33:10 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.19 2009/02/28 16:21:25 ed Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -34,6 +34,7 @@ libkern/ffsl.c standard libkern/fls.c standard libkern/flsl.c standard +libkern/memmove.c standard sparc64/sparc64/autoconf.c standard sun4v/sun4v/bus_machdep.c standard sun4v/sun4v/clock.c standard ==== //depot/projects/usb/src/sys/conf/kern.mk#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.58 2009/02/22 18:45:30 nwhitehorn Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.59 2009/03/03 18:53:47 imp Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -91,7 +91,7 @@ # .if ${MACHINE_ARCH} == "mips" CFLAGS+= -msoft-float -mno-dsp -INLINE_LIMIT?= 15000 +INLINE_LIMIT?= 8000 .endif # ==== //depot/projects/usb/src/sys/dev/ata/ata-all.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.301 2009/02/26 23:07:40 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.303 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include @@ -291,7 +291,7 @@ ATA_LOCKING(dev, ATA_LF_UNLOCK); /* Add new children. */ - ata_identify(dev); +/* ata_identify(dev); */ if (bootverbose) device_printf(dev, "reinit done ..\n"); @@ -627,7 +627,7 @@ request->timeout = 1; request->retries = 0; request->u.ata.command = command; - request->flags = (ATA_R_READ|ATA_R_AT_HEAD|ATA_R_THREAD); + request->flags = (ATA_R_READ|ATA_R_AT_HEAD|ATA_R_DIRECT); if (!bootverbose) request->flags |= ATA_R_QUIET; request->data = (void *)&atadev->param; ==== //depot/projects/usb/src/sys/dev/ata/ata-all.h#11 (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/ata/ata-all.h,v 1.140 2009/02/26 21:33:48 mav Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.142 2009/02/28 22:07:15 mav Exp $ */ /* ATA register defines */ @@ -367,6 +367,7 @@ #define ATA_R_AT_HEAD 0x00000200 #define ATA_R_REQUEUE 0x00000400 #define ATA_R_THREAD 0x00000800 +#define ATA_R_DIRECT 0x00001000 #define ATA_R_DEBUG 0x10000000 #define ATA_R_DANGER1 0x20000000 ==== //depot/projects/usb/src/sys/dev/ata/ata-disk.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.213 2009/02/21 16:39:26 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.215 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/usb/src/sys/dev/ata/ata-queue.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.82 2009/02/26 23:21:32 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.83 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include @@ -237,8 +237,14 @@ void ata_finish(struct ata_request *request) { + struct ata_channel *ch = device_get_softc(request->parent); - if (dumping) { + /* + * if in ATA_STALL_QUEUE state or request has ATA_R_DIRECT flags set + * we need to call ata_complete() directly here (no taskqueue involvement) + */ + if (dumping || + (ch->state & ATA_STALL_QUEUE) || (request->flags & ATA_R_DIRECT)) { ATA_DEBUG_RQ(request, "finish directly"); ata_completed(request, 0); } ==== //depot/projects/usb/src/sys/dev/ata/ata-raid.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.132 2009/02/26 21:33:48 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.133 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include @@ -275,7 +275,7 @@ request->u.ata.feature = 0; request->timeout = 1; request->retries = 0; - request->flags |= ATA_R_ORDERED | ATA_R_THREAD; + request->flags |= ATA_R_ORDERED | ATA_R_DIRECT; ata_queue_request(request); } return 0; @@ -1570,7 +1570,7 @@ if (!(meta = malloc(size, M_AR, M_NOWAIT | M_ZERO))) return ENOMEM; if (ata_raid_rw(rdp->disks[disk].dev, lba, meta, size, - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "wipe metadata failed\n"); error = EIO; } @@ -2264,7 +2264,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, HPTV2_LBA(rdp->disks[disk].dev), meta, sizeof(struct promise_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -2710,7 +2710,7 @@ if (rdp->disks[disk].dev) { if (ata_raid_rw(rdp->disks[disk].dev, INTEL_LBA(rdp->disks[disk].dev), - meta, 1024, ATA_R_WRITE | ATA_R_THREAD)) { + meta, 1024, ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -3055,7 +3055,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, JMICRON_LBA(rdp->disks[disk].dev), meta, sizeof(struct jmicron_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -3778,7 +3778,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, PROMISE_LBA(rdp->disks[disk].dev), meta, sizeof(struct promise_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -4126,7 +4126,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, SIS_LBA(rdp->disks[disk].dev), meta, sizeof(struct sis_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } @@ -4351,7 +4351,7 @@ if (ata_raid_rw(rdp->disks[disk].dev, VIA_LBA(rdp->disks[disk].dev), meta, sizeof(struct via_raid_conf), - ATA_R_WRITE | ATA_R_THREAD)) { + ATA_R_WRITE | ATA_R_DIRECT)) { device_printf(rdp->disks[disk].dev, "write metadata failed\n"); error = EIO; } ==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#40 (text) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.13 2009/02/27 19:27:33 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.14 2009/03/02 05:37:05 thompsa Exp $"); #include "usbdevs.h" #include @@ -271,7 +271,7 @@ .size = sizeof(struct atausb2_softc), }; -DRIVER_MODULE(atausb, ushub, atausb2_driver, atausb2_devclass, 0, 0); +DRIVER_MODULE(atausb, uhub, atausb2_driver, atausb2_devclass, 0, 0); MODULE_DEPEND(atausb, usb, 1, 1, 1); MODULE_VERSION(atausb, 1); ==== //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.59 2009/02/04 20:23:42 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cam.c,v 1.61 2009/02/28 22:07:15 mav Exp $"); #include #include ==== //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.203 2009/02/21 16:39:26 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-cd.c,v 1.205 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.117 2009/02/21 16:39:26 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.119 2009/02/28 22:07:15 mav Exp $"); #include #include ==== //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.111 2009/02/21 16:39:26 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/atapi-tape.c,v 1.113 2009/02/28 22:07:15 mav Exp $"); #include "opt_ata.h" #include ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.16 2009/02/23 08:19:30 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.18 2009/03/01 22:50:14 mav Exp $"); #include "opt_ata.h" #include @@ -470,7 +470,7 @@ clp->cmd_table_phys = htole64(ch->dma.work_bus + ATA_AHCI_CT_OFFSET); /* set PM port */ - ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001); + //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001); /* issue command to controller */ ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CI + offset, 1); @@ -683,8 +683,7 @@ ctp->cfis[1] = port & 0x0f; //ctp->cfis[7] = ATA_D_LBA | ATA_D_IBM; ctp->cfis[15] = ATA_A_4BIT; - if (ata_ahci_issue_cmd(dev, 0, 0)) - return -1; + ata_ahci_issue_cmd(dev, 0, 1000); if (ata_ahci_wait_ready(dev, 1000)) { device_printf(dev, "software reset clear timeout\n"); ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.6 2009/02/23 08:19:30 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-promise.c,v 1.7 2009/03/03 06:39:38 mav Exp $"); #include "opt_ata.h" #include @@ -690,8 +690,11 @@ ATA_OUTL(ctlr->r_res2, (ch->unit + 1) << 2, 0x00000001); - /* set portmultiplier port */ - ATA_OUTB(ctlr->r_res2, 0x4e8 + (ch->unit << 8), atadev->unit & 0x0f); + if ((ctlr->chip->cfg2 == PR_SATA2) || + ((ctlr->chip->cfg2 == PR_CMBO2) && (ch->unit < 2))) { + /* set portmultiplier port */ + ATA_OUTB(ctlr->r_res2, 0x4e8 + (ch->unit << 8), atadev->unit & 0x0f); + } /* XXX SOS add ATAPI commands support later */ switch (request->u.ata.command) { ==== //depot/projects/usb/src/sys/dev/bce/if_bce.c#17 (text) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.51 2009/02/27 19:25:06 davidch Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bce/if_bce.c,v 1.52 2009/03/04 00:05:40 davidch Exp $"); /* * The following controllers are supported by this driver: @@ -38,7 +38,7 @@ * BCM5708C B1, B2 * BCM5708S B1, B2 * BCM5709C A1, C0 - * BCM5716 C0 + * BCM5716C C0 * * The following controllers are not supported by this driver: * BCM5706C A0, A1 (pre-production) @@ -71,19 +71,19 @@ /* 1073741824 = 1 in 2 */ /* Controls how often the l2_fhdr frame error check will fail. */ - int bce_debug_l2fhdr_status_check = 0; + int l2fhdr_error_sim_control = 0; /* Controls how often the unexpected attention check will fail. */ - int bce_debug_unexpected_attention = 0; + int unexpected_attention_sim_control = 0; /* Controls how often to simulate an mbuf allocation failure. */ - int bce_debug_mbuf_allocation_failure = 0; + int mbuf_alloc_failed_sim_control = 0; /* Controls how often to simulate a DMA mapping failure. */ - int bce_debug_dma_map_addr_failure = 0; + int dma_map_addr_failed_sim_control = 0; /* Controls how often to simulate a bootcode failure. */ - int bce_debug_bootcode_running_failure = 0; + int bootcode_running_failure_sim_control = 0; #endif /****************************************************************************/ @@ -495,7 +495,8 @@ /* ToDo: Add tunable to enable/disable strict MTU handling. */ /* Currently allows "loose" RX MTU checking (i.e. sets the */ /* H/W RX MTU to the size of the largest receive buffer, or */ -/* 2048 bytes). */ +/* 2048 bytes). This will cause a UNH failure but is more */ +/* desireable from a functional perspective. */ /****************************************************************************/ @@ -595,7 +596,7 @@ } /* Firmware version and device features. */ - printf("F/W (0x%08X); Flags( ", sc->bce_fw_ver); + printf("B/C (0x%08X); Flags( ", sc->bce_bc_ver); #ifdef ZERO_COPY_SOCKETS printf("SPLT "); #endif @@ -846,7 +847,7 @@ __FUNCTION__, sc->bce_shmem_base); /* Fetch the bootcode revision. */ - sc->bce_fw_ver = REG_RD_IND(sc, sc->bce_shmem_base + + sc->bce_bc_ver = REG_RD_IND(sc, sc->bce_shmem_base + BCE_DEV_INFO_BC_REV); /* Check if any management firmware is running. */ @@ -2863,20 +2864,16 @@ bus_addr_t *busaddr = arg; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 4 11:20:59 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25DE71065670; Wed, 4 Mar 2009 11:20: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 932A6106564A for ; Wed, 4 Mar 2009 11:20:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 66B9C8FC08 for ; Wed, 4 Mar 2009 11:20:58 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24BKwwk078801 for ; Wed, 4 Mar 2009 11:20:58 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24BKw8I078799 for perforce@freebsd.org; Wed, 4 Mar 2009 11:20:58 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 4 Mar 2009 11:20:58 GMT Message-Id: <200903041120.n24BKw8I078799@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 158662 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 11:21:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=158662 Change 158662 by hselasky@hselasky_laptop001 on 2009/03/04 11:20:48 Temporary msdosfs fix. Affected files ... .. //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_denode.c#9 edit Differences ... ==== //depot/projects/usb/src/sys/fs/msdosfs/msdosfs_denode.c#9 (text+ko) ==== @@ -138,8 +138,10 @@ return (error); if (nvp != NULL) { *depp = VTODE(nvp); +#if 0 KASSERT((*depp)->de_dirclust == dirclust, ("wrong dirclust")); KASSERT((*depp)->de_diroffset == diroffset, ("wrong diroffset")); +#endif return (0); } From owner-p4-projects@FreeBSD.ORG Wed Mar 4 12:06:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A7C01065913; Wed, 4 Mar 2009 12:06: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 09D2E1065927 for ; Wed, 4 Mar 2009 12:06:51 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E4BA08FC15 for ; Wed, 4 Mar 2009 12:06:50 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24C6o3l083134 for ; Wed, 4 Mar 2009 12:06:50 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24C6odp083132 for perforce@freebsd.org; Wed, 4 Mar 2009 12:06:50 GMT (envelope-from zec@fer.hr) Date: Wed, 4 Mar 2009 12:06:50 GMT Message-Id: <200903041206.n24C6odp083132@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 12:07:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=158665 Change 158665 by zec@zec_amdx2 on 2009/03/04 12:06:18 Unbreak build. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#76 edit .. //depot/projects/vimage/src/sys/net/if.c#68 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#76 (text+ko) ==== @@ -60,6 +60,7 @@ #include #include #include +#include #include struct vnet_modlink; @@ -586,7 +587,7 @@ struct vimage *vip = TD_TO_VIMAGE(td); struct vimage *vip_r = NULL; - error = priv_check(td, PRIV_ROOT); + error = priv_check(td, PRIV_REBOOT); /* XXX fixme MARKO */ if (error) return (error); ==== //depot/projects/vimage/src/sys/net/if.c#68 (text+ko) ==== @@ -2093,7 +2093,7 @@ switch (cmd) { #ifdef VIMAGE case SIOCSIFVIMAGE: - error = priv_check(td, PRIV_ROOT); + error = priv_check(td, PRIV_REBOOT); /* XXX fixme */ if (error == 0) error = vi_if_move((struct vi_req *) data, NULL, TD_TO_VIMAGE(td)); From owner-p4-projects@FreeBSD.ORG Wed Mar 4 12:48:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D2F81065673; Wed, 4 Mar 2009 12:48: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 A4E02106564A for ; Wed, 4 Mar 2009 12:48:35 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 912A48FC18 for ; Wed, 4 Mar 2009 12:48:35 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24CmZnm096354 for ; Wed, 4 Mar 2009 12:48:35 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24CmXQU096348 for perforce@freebsd.org; Wed, 4 Mar 2009 12:48:33 GMT (envelope-from zec@fer.hr) Date: Wed, 4 Mar 2009 12:48:33 GMT Message-Id: <200903041248.n24CmXQU096348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 12:48:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=158667 Change 158667 by zec@zec_amdx2 on 2009/03/04 12:48:29 IFC @ 158633 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/USB2#2 delete .. //depot/projects/vimage-commit2/src/sys/arm/at91/files.at91#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/files.mv#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#16 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#23 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#13 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.ia64#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.mips#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.pc98#9 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sparc64#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kern.mk#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-jmicron.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_internal.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_irq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_lock.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_reg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_irq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mca/mca_bus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_iicbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/3c990img.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/if_txpreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ng_ubt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/image/uscanner.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/usb_rdesc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#13 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/USB2#2 delete .. //depot/projects/vimage-commit2/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_cons.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_priv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_thr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_time.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_prf.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_smp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_process.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_info.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_inq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_outq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pty.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_ttydisc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usbdevs#2 delete .. //depot/projects/vimage-commit2/src/sys/libkern/memmove.c#1 branch .. //depot/projects/vimage-commit2/src/sys/libkern/strtouq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_ccatm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip6.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_crc32.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#22 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#19 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/pci/viapm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/swtch.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/trap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/trap_subr.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/pcb.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/cdefs.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/fcntl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#27 integrate .. //depot/projects/vimage-commit2/src/sys/sys/priv.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sdt.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/shm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/systm.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/tree.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#28 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_kern.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pager.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_unix.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/xdr/xdr_mem.c#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.297 2009/02/03 09:01:45 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.299 2009/02/25 22:24:56 sobomax Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -151,6 +151,7 @@ int cpu_present:1; int cpu_bsp:1; int cpu_disabled:1; + int cpu_hyperthread:1; } static cpu_info[MAX_APIC_ID + 1]; int cpu_apic_ids[MAXCPU]; int apic_cpuids[MAX_APIC_ID + 1]; @@ -353,11 +354,6 @@ cpu_apic_ids[0] = boot_cpu_id; apic_cpuids[boot_cpu_id] = 0; - assign_cpu_ids(); - - /* Start each Application Processor */ - start_all_aps(); - /* Setup the initial logical CPUs info. */ logical_cpus = logical_cpus_mask = 0; if (cpu_feature & CPUID_HTT) @@ -404,6 +400,11 @@ hyperthreading_cpus = logical_cpus; } + assign_cpu_ids(); + + /* Start each Application Processor */ + start_all_aps(); + set_interrupt_apic_ids(); } @@ -415,18 +416,26 @@ cpu_mp_announce(void) { int i, x; + const char *hyperthread; /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) continue; + if (cpu_info[x].cpu_hyperthread) { + hyperthread = "/HT"; + } else { + hyperthread = ""; + } if (cpu_info[x].cpu_disabled) - printf(" cpu (AP): APIC ID: %2d (disabled)\n", x); + printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", + hyperthread, x); else { KASSERT(i < mp_ncpus, ("mp_ncpus and actual cpus are out of whack")); - printf(" cpu%d (AP): APIC ID: %2d\n", i++, x); + printf(" cpu%d (AP%s): APIC ID: %2d\n", i++, + hyperthread, x); } } } @@ -642,11 +651,28 @@ { u_int i; + TUNABLE_INT_FETCH("machdep.hyperthreading_allowed", + &hyperthreading_allowed); + /* Check for explicitly disabled CPUs. */ for (i = 0; i <= MAX_APIC_ID; i++) { if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp) continue; + if (hyperthreading_cpus > 1 && i % hyperthreading_cpus != 0) { + cpu_info[i].cpu_hyperthread = 1; +#if defined(SCHED_ULE) + /* + * Don't use HT CPU if it has been disabled by a + * tunable. + */ + if (hyperthreading_allowed == 0) { + cpu_info[i].cpu_disabled = 1; + continue; + } +#endif + } + /* Don't use this CPU if it has been disabled by a tunable. */ if (resource_disabled("lapic", i)) { cpu_info[i].cpu_disabled = 1; @@ -1198,6 +1224,16 @@ if (error || !req->newptr) return (error); +#ifdef SCHED_ULE + /* + * SCHED_ULE doesn't allow enabling/disabling HT cores at + * run time. + */ + if (allowed != hyperthreading_allowed) + return (ENOTSUP); + return (error); +#endif + if (allowed) hlt_cpus_mask &= ~hyperthreading_cpus_mask; else @@ -1242,8 +1278,6 @@ * of hlt_logical_cpus. */ if (hyperthreading_cpus_mask) { - TUNABLE_INT_FETCH("machdep.hyperthreading_allowed", - &hyperthreading_allowed); SYSCTL_ADD_PROC(&logical_cpu_clist, SYSCTL_STATIC_CHILDREN(_machdep), OID_AUTO, "hyperthreading_allowed", CTLTYPE_INT|CTLFLAG_RW, ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.648 2009/02/23 06:00:24 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.649 2009/02/25 20:26:48 jkim Exp $"); /* * Manages physical address maps. @@ -594,7 +594,6 @@ if (!(cpu_feature & CPUID_PAT)) panic("no PAT??"); -#ifdef PAT_WORKS /* * Leave the indices 0-3 at the default of WB, WT, UC, and UC-. * Program 4 and 5 as WP and WC. @@ -604,23 +603,6 @@ pat_msr &= ~(PAT_MASK(4) | PAT_MASK(5)); pat_msr |= PAT_VALUE(4, PAT_WRITE_PROTECTED) | PAT_VALUE(5, PAT_WRITE_COMBINING); -#else - /* - * Due to some Intel errata, we can only safely use the lower 4 - * PAT entries. Thus, just replace PAT Index 2 with WC instead - * of UC-. - * - * Intel Pentium III Processor Specification Update - * Errata E.27 (Upper Four PAT Entries Not Usable With Mode B - * or Mode C Paging) - * - * Intel Pentium IV Processor Specification Update - * Errata N46 (PAT Index MSB May Be Calculated Incorrectly) - */ - pat_msr = rdmsr(MSR_PAT); - pat_msr &= ~PAT_MASK(2); - pat_msr |= PAT_VALUE(2, PAT_WRITE_COMBINING); -#endif wrmsr(MSR_PAT, pat_msr); } @@ -783,10 +765,9 @@ break; } } - + /* Map the caching mode to a PAT index. */ switch (mode) { -#ifdef PAT_WORKS case PAT_UNCACHEABLE: pat_index = 3; break; @@ -805,25 +786,9 @@ case PAT_WRITE_PROTECTED: pat_index = 4; break; -#else - case PAT_UNCACHED: - case PAT_UNCACHEABLE: - case PAT_WRITE_PROTECTED: - pat_index = 3; - break; - case PAT_WRITE_THROUGH: - pat_index = 1; - break; - case PAT_WRITE_BACK: - pat_index = 0; - break; - case PAT_WRITE_COMBINING: - pat_index = 2; - break; -#endif default: panic("Unknown caching mode %d\n", mode); - } + } /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ cache_bits = 0; ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.260 2009/03/02 18:43:50 kib Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include @@ -80,12 +81,6 @@ #include -#ifdef COMPAT_IA32 - -extern struct sysentvec ia32_freebsd_sysvec; - -#endif - static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -331,7 +326,7 @@ cpu_thread_clean(td); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { /* * Set the trap frame to point at the beginning of the uts * function. @@ -377,7 +372,7 @@ return (EINVAL); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { if (td == curthread) { critical_enter(); td->td_pcb->pcb_gsbase = (register_t)tls_base; ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#5 (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.86 2009/02/07 00:01:10 wkoszek Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.87 2009/02/24 00:39:48 thompsa Exp $ # # @@ -509,5 +509,5 @@ options VM_KMEM_SIZE_SCALE # Enable NDIS binary driver support -options NDISAPI -device ndis +#options NDISAPI +#device ndis ==== //depot/projects/vimage-commit2/src/sys/arm/at91/files.at91#3 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.9 2008/11/25 19:05:46 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.10 2009/02/27 23:12:28 imp Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91_machdep.c standard @@ -15,10 +15,10 @@ arm/at91/at91_twi.c optional at91_twi arm/at91/at91_udp.c optional at91_udp arm/at91/if_ate.c optional ate -arm/at91/ohci_atmelarm.c optional ohci arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart +dev/usb/controller/ohci_atmelarm.c optional ohci # # All the boards we support # ==== //depot/projects/vimage-commit2/src/sys/arm/mv/files.mv#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/mv/files.mv,v 1.4 2009/02/16 21:42:41 marcel Exp $ +# $FreeBSD: src/sys/arm/mv/files.mv,v 1.5 2009/02/24 23:30:52 thompsa Exp $ # # The Marvell CPU cores # - Compliant with V5TE architecture @@ -32,5 +32,4 @@ dev/uart/uart_bus_mbus.c optional uart dev/uart/uart_cpu_mv.c optional uart dev/uart/uart_dev_ns8250.c optional uart -dev/usb/ehci_mbus.c optional ehci -dev/usb2/controller/ehci2_mbus.c optional usb2_core usb2_controller usb2_controller_ehci +dev/usb/controller/ehci_mbus.c optional ehci ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.ixp425#3 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.8 2009/02/03 19:16:04 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.9 2009/02/24 23:34:02 thompsa Exp $ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard @@ -46,4 +46,5 @@ # arm/xscale/ixp425/ixp425_qmgr.c optional qmgr # -dev/usb/ehci_ixp4xx.c optional ehci +dev/usb/controller/ehci_ixp4xx.c optional ehci usb +legacy/dev/usb/ehci_ixp4xx.c optional ehci ousb ==== //depot/projects/vimage-commit2/src/sys/boot/i386/btx/btx/btx.S#3 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.47 2008/08/08 19:39:11 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.48 2009/02/24 23:11:15 jhb Exp $ */ /* @@ -36,6 +36,7 @@ /* * Fields in %eflags. */ + .set PSL_RESERVED_DEFAULT,0x00000002 .set PSL_T,0x00000100 # Trap flag .set PSL_I,0x00000200 # Interrupt enable flag .set PSL_VM,0x00020000 # Virtual 8086 mode flag @@ -455,6 +456,18 @@ * -0x3c %fs * -0x40 %ds * -0x44 %es + * -0x48 zero %eax (hardware int only) + * -0x4c zero %ecx (hardware int only) + * -0x50 zero %edx (hardware int only) + * -0x54 zero %ebx (hardware int only) + * -0x58 zero %esp (hardware int only) + * -0x5c zero %ebp (hardware int only) + * -0x60 zero %esi (hardware int only) + * -0x64 zero %edi (hardware int only) + * -0x68 zero %gs (hardware int only) + * -0x6c zero %fs (hardware int only) + * -0x70 zero %ds (hardware int only) + * -0x74 zero %es (hardware int only) */ int_hw: cld # String ops inc pusha # Save gp regs @@ -467,12 +480,15 @@ pushl %ds # address popl %es # data leal 0x44(%esp,1),%esi # Base of frame + movl %esp,MEM_ESPR-0x04 # Save kernel stack pointer movl -0x14(%esi),%eax # Get Int no cmpl $-1,%eax # Hardware interrupt? - jne intusr.2 # Yes + jne intusr.1 # Yes /* - * v86 calls save the btx_v86 pointer on the real mode stack and read the - * address and flags from the btx_v86 structure. + * v86 calls save the btx_v86 pointer on the real mode stack and read + * the address and flags from the btx_v86 structure. For interrupt + * handler invocations (VM86 INTx requests), disable interrupts, + * tracing, and alignment checking while the handler runs. */ movl $MEM_USR,%ebx # User base movl %ebx,%edx # address @@ -482,35 +498,36 @@ movl %edx,MEM_ESPR-0x08 # Save btx_v86 ptr movl V86_ADDR(%edx),%eax # Get int no/address movl V86_CTL(%edx),%edx # Get control flags + movl -0x08(%esi),%ebx # Save user flags in %ebx + testl $V86F_ADDR,%edx # Segment:offset? + jnz intusr.4 # Yes + andl $~(PSL_I|PSL_T|PSL_AC),%ebx # Disable interrupts, tracing, + # and alignment checking for + # interrupt handler jmp intusr.3 # Skip hardware interrupt /* - * Hardware interrupts store a NULL btx_v86 pointer and use the address - * (interrupt number) from the stack with empty flags. Also, we clear - * the segment registers for the interrupt handler. + * Hardware interrupts store a NULL btx_v86 pointer and use the + * address (interrupt number) from the stack with empty flags. Also, + * push a dummy frame of zeros onto the stack for all the general + * purpose and segment registers and clear %eflags. This gives the + * hardware interrupt handler a clean slate. */ -intusr.2: xorl %edx,%edx # Control flags +intusr.1: xorl %edx,%edx # Control flags movl %edx,MEM_ESPR-0x08 # NULL btx_v86 ptr - movl %edx,-0x38(%esi) # Real mode %gs of 0 - movl %edx,-0x3c(%esi) # Real mode %fs of 0 - movl %edx,-0x40(%esi) # Real mode %ds of 0 - movl %edx,-0x44(%esi) # Real mode %es of 0 + movl $12,%ecx # Frame is 12 dwords +intusr.2: pushl $0x0 # Fill frame + loop intusr.2 # with zeros + movl $PSL_RESERVED_DEFAULT,%ebx # Set clean %eflags /* - * %eax now holds either the interrupt number or segment:offset of function. - * %edx now holds the V86F_* flags. - * - * For interrupt handler invocations (either hardware interrupts or VM86 - * INTx requests) we also disable interrupts, tracing, and alignment checking - * while the handler runs. + * Look up real mode IDT entry for hardware interrupts and VM86 INTx + * requests. */ -intusr.3: movl -0x08(%esi),%ebx # Save user flags in %ebx - testl $V86F_ADDR,%edx # Segment:offset? - jnz intusr.4 # Yes - shll $0x2,%eax # Scale +intusr.3: shll $0x2,%eax # Scale movl (%eax),%eax # Load int vector - andl $~(PSL_I|PSL_T|PSL_AC),%ebx # Disable interrupts, tracing, - # and alignment checking for - # interrupt handler jmp intusr.5 # Skip CALLF test +/* + * Panic if V86F_CALLF isn't set with V86F_ADDR. + */ intusr.4: testl $V86F_CALLF,%edx # Far call? jnz intusr.5 # Ok movl %edx,0x30(%esp,1) # Place VM86 flags in int no @@ -522,6 +539,11 @@ popl %gs popal # Restore gp regs jmp ex_noc # Panic +/* + * %eax now holds the segment:offset of the function. + * %ebx now holds the %eflags to pass to real mode. + * %edx now holds the V86F_* flags. + */ intusr.5: movw %bx,MEM_ESPR-0x12 # Pass user flags to real mode # target /* @@ -536,8 +558,7 @@ rep # from btx_v86 movsl # to kernel stack popl %esi # Restore -intusr.6: movl %esp,MEM_ESPR-0x04 # Save kernel stack pointer - movl -0x08(%esi),%ebx # Copy user flags to real +intusr.6: movl -0x08(%esi),%ebx # Copy user flags to real movl %ebx,MEM_ESPR-0x0c # mode return trampoline movl $rret_tramp,%ebx # Set return trampoline movl %ebx,MEM_ESPR-0x10 # CS:IP @@ -611,9 +632,16 @@ movb $SEL_TSS,%cl # Set task ltr %cx # register /* - * Now we are back in protected mode. Copy the registers off of the real - * mode stack onto the kernel stack. Also, initialize all the seg regs on - * the kernel stack. + * Now we are back in protected mode. The kernel stack frame set up + * before entering real mode is still intact. For hardware interrupts, + * leave the frame unchanged. + */ + cmpl $0,MEM_ESPR-0x08 # Leave saved regs unchanged + jz rret_tramp.3 # for hardware ints +/* + * For V86 calls, copy the registers off of the real mode stack onto + * the kernel stack as we want their updated values. Also, initialize + * the segment registers on the kernel stack. * * Note that the %esp in the kernel stack after this is garbage, but popa * ignores it, so we don't have to fix it up. @@ -624,20 +652,17 @@ movl $8,%ecx # Copy GP regs from rep # real mode stack movsl # to kernel stack - popl %esi # Restore movl $SEL_UDATA,%eax # Selector for data seg regs movl $4,%ecx # Initialize %ds, rep # %es, %fs, and stosl # %gs /* - * If this was a V86 call, copy the saved seg regs on the real mode stack - * back over to the btx_v86 structure. Also, conditionally update the saved - * eflags on the kernel stack based on the flags from the user. + * For V86 calls, copy the saved seg regs on the real mode stack back + * over to the btx_v86 structure. Also, conditionally update the + * saved eflags on the kernel stack based on the flags from the user. */ movl MEM_ESPR-0x08,%ecx # Get btx_v86 ptr - jecxz rret_tramp.3 # Skip for hardware ints leal V86_GS(%ecx),%edi # %edi => btx_v86 seg regs - pushl %esi # Save leal MEM_ESPR-0x2c,%esi # %esi => real mode seg regs xchgl %ecx,%edx # Save btx_v86 ptr movl $4,%ecx # Copy seg regs ==== //depot/projects/vimage-commit2/src/sys/bsm/audit.h#5 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#4 - * $FreeBSD: src/sys/bsm/audit.h,v 1.14 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#5 + * $FreeBSD: src/sys/bsm/audit.h,v 1.15 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -66,8 +66,9 @@ #define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ #define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ #define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests rotate. */ -#define AUDIT_TRIGGER_INITIALIZE 7 /* Initialize audit. */ -#define AUDIT_TRIGGER_MAX 7 +#define AUDIT_TRIGGER_INITIALIZE 7 /* User initialize of auditd. */ +#define AUDIT_TRIGGER_EXPIRE_TRAILS 8 /* User expiration of trails. */ +#define AUDIT_TRIGGER_MAX 8 /* * The special device filename (FreeBSD). ==== //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#6 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#4 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.18 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#5 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.19 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -587,6 +587,8 @@ #define AUE_CAP_GETMODE 43189 /* TrustedBSD. */ #define AUE_POSIX_SPAWN 43190 /* Darwin. */ #define AUE_FSGETPATH 43191 /* Darwin. */ +#define AUE_PREAD 43192 /* Darwin/FreeBSD. */ +#define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -658,7 +660,6 @@ /* * Possible desired future values based on review of BSD/Darwin system calls. */ -#define AUE_ACCESSEXTENDED AUE_NULL #define AUE_ATGETMSG AUE_NULL #define AUE_ATPUTMSG AUE_NULL #define AUE_ATSOCKET AUE_NULL @@ -669,11 +670,9 @@ #define AUE_BSDTHREADCREATE AUE_NULL #define AUE_BSDTHREADTERMINATE AUE_NULL #define AUE_BSDTHREADREGISTER AUE_NULL -#define AUE_CHMODEXTENDED AUE_NULL #define AUE_CHUD AUE_NULL #define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL -#define AUE_FCHMODEXTENDED AUE_NULL #define AUE_FDATASYNC AUE_NULL #define AUE_FFSCTL AUE_NULL #define AUE_FGETATTRLIST AUE_NULL @@ -683,11 +682,10 @@ #define AUE_FSCTL AUE_NULL #define AUE_FSETATTRLIST AUE_NULL #define AUE_FSETXATTR AUE_NULL -#define AUE_FSTATEXTENDED AUE_NULL #define AUE_FSTATFS64 AUE_NULL #define AUE_FSTATV AUE_NULL #define AUE_FSTAT64 AUE_NULL -#define AUE_FSTAT64EXTENDED AUE_NULL +#define AUE_FSTAT64_EXTENDED AUE_NULL #define AUE_GCCONTROL AUE_NULL #define AUE_GETDIRENTRIES64 AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL @@ -721,21 +719,15 @@ #define AUE_ISSETUGID AUE_NULL #define AUE_LIOLISTIO AUE_NULL #define AUE_LISTXATTR AUE_NULL -#define AUE_LSTATEXTENDED AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_LSTAT64 AUE_NULL -#define AUE_LSTAT64EXTENDED AUE_NULL +#define AUE_LSTAT64_EXTENDED AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MKDIREXTENDED AUE_NULL -#define AUE_MKFIFOEXTENDED AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_OPENEXTENDED AUE_NULL -#define AUE_PREAD AUE_NULL -#define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL #define AUE_PROCINFO AUE_NULL #define AUE_PTHREADCANCELED AUE_NULL @@ -779,15 +771,13 @@ #define AUE_SIGWAIT AUE_NULL #define AUE_SSTK AUE_NULL #define AUE_STACKSNAPSHOT AUE_NULL -#define AUE_STATEXTENDED AUE_NULL #define AUE_STATFS64 AUE_NULL #define AUE_STATV AUE_NULL #define AUE_STAT64 AUE_NULL -#define AUE_STAT64EXTENDED AUE_NULL +#define AUE_STAT64_EXTENDED AUE_NULL #define AUE_SYNC AUE_NULL #define AUE_SYSCALL AUE_NULL #define AUE_TABLE AUE_NULL -#define AUE_UMASKEXTENDED AUE_NULL #define AUE_VMPRESSUREMONITOR AUE_NULL #define AUE_WAITEVENT AUE_NULL #define AUE_WAITID AUE_NULL ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.13 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.14 2009/03/02 23:26:30 jamie Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 4 12:53:41 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51DD41065675; Wed, 4 Mar 2009 12:53:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0BD5B1065674 for ; Wed, 4 Mar 2009 12:53:41 +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 D3DAD8FC17 for ; Wed, 4 Mar 2009 12:53:40 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24Cre99096711 for ; Wed, 4 Mar 2009 12:53:40 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24CreeG096709 for perforce@freebsd.org; Wed, 4 Mar 2009 12:53:40 GMT (envelope-from pgj@FreeBSD.org) Date: Wed, 4 Mar 2009 12:53:40 GMT Message-Id: <200903041253.n24CreeG096709@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 158668 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 12:53:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=158668 Change 158668 by pgj@beehive on 2009/03/04 12:53:21 Fix a typo Affected files ... .. //depot/projects/docproj_hu/www/hu/events/rss.xsl#2 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/events/rss.xsl#2 (text+ko) ==== @@ -60,7 +60,7 @@ - A &os; Projekttel kapcsolatos közelõ + A &os; Projekttel kapcsolatos közelgõ események http://www.FreeBSD.org/hu/events/ From owner-p4-projects@FreeBSD.ORG Wed Mar 4 12:57:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92BD8106568B; Wed, 4 Mar 2009 12:57: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 4C7D1106567F for ; Wed, 4 Mar 2009 12:57:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 392CF8FC0A for ; Wed, 4 Mar 2009 12:57:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24CvjFF097026 for ; Wed, 4 Mar 2009 12:57:45 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24Cviwp097024 for perforce@freebsd.org; Wed, 4 Mar 2009 12:57:44 GMT (envelope-from zec@fer.hr) Date: Wed, 4 Mar 2009 12:57:44 GMT Message-Id: <200903041257.n24Cviwp097024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 12:57:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=158669 Change 158669 by zec@zec_amdx2 on 2009/03/04 12:56:53 Fix misintegrations. Affected files ... .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-usb.c#4 edit .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.h#3 edit .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio_pcm.c#3 edit .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudioreg.h#3 edit .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_if.m#3 edit .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#19 edit .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbhid.h#3 edit .. //depot/projects/vimage-commit2/src/sys/modules/usb/Makefile#5 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/dev/ata/ata-usb.c#4 (text) ==== ==== //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.8 2007/03/16 17:19:03 ariff Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.h,v 1.10 2009/02/23 21:19:18 thompsa Exp $ */ /*- * Copyright (c) 2000-2002 Hiroyuki Aizu @@ -25,32 +25,39 @@ * SUCH DAMAGE. */ -#if 0 -#define NO_RECORDING /* XXX: some routines missing from uaudio.c */ -#endif +/* prototypes from "uaudio.c" used by "uaudio_pcm.c" */ + +struct uaudio_chan; +struct uaudio_softc; +struct snd_dbuf; +struct snd_mixer; +struct pcm_channel; -/* Defined in uaudio.c, used in uaudio_pcm,c */ +extern int uaudio_attach_sub(device_t dev, kobj_class_t mixer_class, + kobj_class_t chan_class); +extern int uaudio_detach_sub(device_t dev); +extern void *uaudio_chan_init(struct uaudio_softc *sc, struct snd_dbuf *b, + struct pcm_channel *c, int dir); +extern int uaudio_chan_free(struct uaudio_chan *ch); +extern int uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, + uint32_t blocksize); +extern int uaudio_chan_set_param_fragments(struct uaudio_chan *ch, + uint32_t blocksize, uint32_t blockcount); +extern int uaudio_chan_set_param_speed(struct uaudio_chan *ch, + uint32_t speed); +extern int uaudio_chan_getptr(struct uaudio_chan *ch); +extern struct pcmchan_caps *uaudio_chan_getcaps(struct uaudio_chan *ch); +extern int uaudio_chan_set_param_format(struct uaudio_chan *ch, + uint32_t format); +extern int uaudio_chan_start(struct uaudio_chan *ch); +extern int uaudio_chan_stop(struct uaudio_chan *ch); +extern int uaudio_mixer_init_sub(struct uaudio_softc *sc, + struct snd_mixer *m); +extern int uaudio_mixer_uninit_sub(struct uaudio_softc *sc); +extern void uaudio_mixer_set(struct uaudio_softc *sc, unsigned type, + unsigned left, unsigned right); +extern uint32_t uaudio_mixer_setrecsrc(struct uaudio_softc *sc, uint32_t src); -void uaudio_chan_set_param_pcm_dma_buff(device_t dev, u_char *start, - u_char *end, struct pcm_channel *pc, int dir); -int uaudio_trigger_output(device_t dev); -int uaudio_halt_out_dma(device_t dev); -#ifndef NO_RECORDING -int uaudio_trigger_input(device_t dev); -int uaudio_halt_in_dma(device_t dev); -#endif -void uaudio_chan_set_param(device_t, u_char *, u_char *); -void uaudio_chan_set_param_blocksize(device_t dev, u_int32_t blocksize, int dir); -int uaudio_chan_set_param_speed(device_t dev, u_int32_t speed, int reqdir); -void uaudio_chan_set_param_format(device_t dev, u_int32_t format,int dir); -int uaudio_chan_getptr(device_t dev, int); -void uaudio_mixer_set(device_t dev, unsigned type, unsigned left, - unsigned right); -u_int32_t uaudio_mixer_setrecsrc(device_t dev, u_int32_t src); -u_int32_t uaudio_query_mix_info(device_t dev); -u_int32_t uaudio_query_recsrc_info(device_t dev); -unsigned uaudio_query_formats(device_t dev, int dir, unsigned maxfmt, struct pcmchan_caps *fmt); -void uaudio_sndstat_register(device_t dev); -int uaudio_get_vendor(device_t dev); -int uaudio_get_product(device_t dev); -int uaudio_get_release(device_t dev); +int uaudio_get_vendor(device_t dev); +int uaudio_get_product(device_t dev); +int uaudio_get_release(device_t dev); ==== //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio_pcm.c#3 (text+ko) ==== @@ -1,7 +1,8 @@ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.24 2007/06/17 06:10:43 ariff Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio_pcm.c,v 1.26 2009/02/23 21:19:18 thompsa Exp $ */ /*- * Copyright (c) 2000-2002 Hiroyuki Aizu + * Copyright (c) 2006 Hans Petter Selasky * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -29,241 +30,87 @@ #include #include #include - #include #include "mixer_if.h" -struct ua_info; - -struct ua_chinfo { - struct ua_info *parent; - struct pcm_channel *channel; - struct snd_dbuf *buffer; - u_char *buf; - int dir, hwch; - u_int32_t fmt, spd, blksz; /* XXXXX */ -}; - -struct ua_info { - device_t sc_dev; - u_int32_t bufsz; - struct ua_chinfo pch, rch; -#define FORMAT_NUM 32 - u_int32_t ua_playfmt[FORMAT_NUM*2+1]; /* FORMAT_NUM format * (stereo or mono) + endptr */ - u_int32_t ua_recfmt[FORMAT_NUM*2+1]; /* FORMAT_NUM format * (stereo or mono) + endptr */ - struct pcmchan_caps ua_playcaps; - struct pcmchan_caps ua_reccaps; - int vendor, product, release; -}; - -#define UAUDIO_DEFAULT_BUFSZ 16*1024 - -static const struct { - int vendor; - int product; - int release; - uint32_t dflags; -} ua_quirks[] = { - { 0x1130, 0xf211, 0x0101, SD_F_PSWAPLR }, -}; - /************************************************************/ static void * ua_chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c, int dir) { - device_t pa_dev; - - struct ua_info *sc = devinfo; - struct ua_chinfo *ch = (dir == PCMDIR_PLAY)? &sc->pch : &sc->rch; - - ch->parent = sc; - ch->channel = c; - ch->buffer = b; - ch->dir = dir; - - pa_dev = device_get_parent(sc->sc_dev); - - ch->buf = malloc(sc->bufsz, M_DEVBUF, M_NOWAIT); - if (ch->buf == NULL) - return NULL; - if (sndbuf_setup(b, ch->buf, sc->bufsz) != 0) { - free(ch->buf, M_DEVBUF); - return NULL; - } - uaudio_chan_set_param_pcm_dma_buff(pa_dev, ch->buf, ch->buf+sc->bufsz, ch->channel, dir); - if (bootverbose) - device_printf(pa_dev, "%s buf %p\n", (dir == PCMDIR_PLAY)? - "play" : "rec", sndbuf_getbuf(ch->buffer)); - - ch->dir = dir; -#ifndef NO_RECORDING - ch->hwch = 1; - if (dir == PCMDIR_PLAY) - ch->hwch = 2; -#else - ch->hwch = 2; -#endif - - return ch; + return (uaudio_chan_init(devinfo, b, c, dir)); } static int ua_chan_free(kobj_t obj, void *data) { - struct ua_chinfo *ua = data; - - if (ua->buf != NULL) - free(ua->buf, M_DEVBUF); - return 0; + return (uaudio_chan_free(data)); } static int -ua_chan_setformat(kobj_t obj, void *data, u_int32_t format) +ua_chan_setformat(kobj_t obj, void *data, uint32_t format) { - device_t pa_dev; - struct ua_info *ua; - - struct ua_chinfo *ch = data; - /* - * At this point, no need to query as we shouldn't select an unsorted format + * At this point, no need to query as we + * shouldn't select an unsorted format */ - ua = ch->parent; - pa_dev = device_get_parent(ua->sc_dev); - uaudio_chan_set_param_format(pa_dev, format, ch->dir); - - ch->fmt = format; - return 0; + return (uaudio_chan_set_param_format(data, format)); } static int -ua_chan_setspeed(kobj_t obj, void *data, u_int32_t speed) +ua_chan_setspeed(kobj_t obj, void *data, uint32_t speed) { - struct ua_chinfo *ch; - device_t pa_dev; - int bestspeed; - - ch = data; - pa_dev = device_get_parent(ch->parent->sc_dev); - - if ((bestspeed = uaudio_chan_set_param_speed(pa_dev, speed, ch->dir))) - ch->spd = bestspeed; - - return ch->spd; + return (uaudio_chan_set_param_speed(data, speed)); } static int -ua_chan_setfragments(kobj_t obj, void *data, u_int32_t blksz, u_int32_t blkcnt) +ua_chan_setblocksize(kobj_t obj, void *data, uint32_t blocksize) { - device_t pa_dev; - struct ua_chinfo *ch = data; - struct ua_info *ua = ch->parent; - - RANGE(blksz, 128, sndbuf_getmaxsize(ch->buffer) / 2); - RANGE(blkcnt, 2, 512); - - while ((blksz * blkcnt) > sndbuf_getmaxsize(ch->buffer)) { - if ((blkcnt >> 1) >= 2) - blkcnt >>= 1; - else if ((blksz >> 1) >= 128) - blksz >>= 1; - else - break; - } - - if ((sndbuf_getblksz(ch->buffer) != blksz || - sndbuf_getblkcnt(ch->buffer) != blkcnt) && - sndbuf_resize(ch->buffer, blkcnt, blksz) != 0) - device_printf(ua->sc_dev, "%s: failed blksz=%u blkcnt=%u\n", - __func__, blksz, blkcnt); - - ch->blksz = sndbuf_getblksz(ch->buffer); - - pa_dev = device_get_parent(ua->sc_dev); - uaudio_chan_set_param_pcm_dma_buff(pa_dev, ch->buf, - ch->buf + sndbuf_getsize(ch->buffer), ch->channel, ch->dir); - uaudio_chan_set_param_blocksize(pa_dev, ch->blksz, ch->dir); - - return 1; + return (uaudio_chan_set_param_blocksize(data, blocksize)); } static int -ua_chan_setblocksize(kobj_t obj, void *data, u_int32_t blksz) +ua_chan_setfragments(kobj_t obj, void *data, uint32_t blocksize, uint32_t blockcount) { - struct ua_chinfo *ch = data; - - ua_chan_setfragments(obj, data, blksz, - sndbuf_getmaxsize(ch->buffer) / blksz); - - return ch->blksz; + return (uaudio_chan_set_param_fragments(data, blocksize, blockcount)); } static int ua_chan_trigger(kobj_t obj, void *data, int go) { - device_t pa_dev; - struct ua_info *ua; - struct ua_chinfo *ch = data; - - if (!PCMTRIG_COMMON(go)) - return 0; - - ua = ch->parent; - pa_dev = device_get_parent(ua->sc_dev); - - /* XXXXX */ - if (ch->dir == PCMDIR_PLAY) { - if (go == PCMTRIG_START) { - uaudio_trigger_output(pa_dev); - } else { - uaudio_halt_out_dma(pa_dev); - } + if (!PCMTRIG_COMMON(go)) { + return (0); + } + if (go == PCMTRIG_START) { + return (uaudio_chan_start(data)); } else { -#ifndef NO_RECORDING - if (go == PCMTRIG_START) - uaudio_trigger_input(pa_dev); - else - uaudio_halt_in_dma(pa_dev); -#endif + return (uaudio_chan_stop(data)); } - - return 0; } static int ua_chan_getptr(kobj_t obj, void *data) { - device_t pa_dev; - struct ua_info *ua; - struct ua_chinfo *ch = data; - - ua = ch->parent; - pa_dev = device_get_parent(ua->sc_dev); - - return uaudio_chan_getptr(pa_dev, ch->dir); + return (uaudio_chan_getptr(data)); } static struct pcmchan_caps * ua_chan_getcaps(kobj_t obj, void *data) { - struct ua_chinfo *ch; - - ch = data; - return (ch->dir == PCMDIR_PLAY) ? &(ch->parent->ua_playcaps) : &(ch->parent->ua_reccaps); + return (uaudio_chan_getcaps(data)); } static kobj_method_t ua_chan_methods[] = { - KOBJMETHOD(channel_init, ua_chan_init), - KOBJMETHOD(channel_free, ua_chan_free), - KOBJMETHOD(channel_setformat, ua_chan_setformat), - KOBJMETHOD(channel_setspeed, ua_chan_setspeed), - KOBJMETHOD(channel_setblocksize, ua_chan_setblocksize), - KOBJMETHOD(channel_setfragments, ua_chan_setfragments), - KOBJMETHOD(channel_trigger, ua_chan_trigger), - KOBJMETHOD(channel_getptr, ua_chan_getptr), - KOBJMETHOD(channel_getcaps, ua_chan_getcaps), - { 0, 0 } + KOBJMETHOD(channel_init, ua_chan_init), + KOBJMETHOD(channel_free, ua_chan_free), + KOBJMETHOD(channel_setformat, ua_chan_setformat), + KOBJMETHOD(channel_setspeed, ua_chan_setspeed), + KOBJMETHOD(channel_setblocksize, ua_chan_setblocksize), + KOBJMETHOD(channel_setfragments, ua_chan_setfragments), + KOBJMETHOD(channel_trigger, ua_chan_trigger), + KOBJMETHOD(channel_getptr, ua_chan_getptr), + KOBJMETHOD(channel_getcaps, ua_chan_getcaps), + {0, 0} }; CHANNEL_DECLARE(ua_chan); @@ -272,62 +119,63 @@ static int ua_mixer_init(struct snd_mixer *m) { - u_int32_t mask; - device_t pa_dev; - struct ua_info *ua = mix_getdevinfo(m); + return (uaudio_mixer_init_sub(mix_getdevinfo(m), m)); +} - pa_dev = device_get_parent(ua->sc_dev); +static int +ua_mixer_set(struct snd_mixer *m, unsigned type, unsigned left, unsigned right) +{ + struct mtx *mtx = mixer_get_lock(m); + uint8_t do_unlock; - mask = uaudio_query_mix_info(pa_dev); - if (!(mask & SOUND_MASK_PCM)) { - /* - * Emulate missing pcm mixer controller - * through FEEDER_VOLUME - */ - pcm_setflags(ua->sc_dev, pcm_getflags(ua->sc_dev) | - SD_F_SOFTPCMVOL); + if (mtx_owned(mtx)) { + do_unlock = 0; + } else { + do_unlock = 1; + mtx_lock(mtx); } - if (!(mask & SOUND_MASK_VOLUME)) { - mix_setparentchild(m, SOUND_MIXER_VOLUME, SOUND_MASK_PCM); - mix_setrealdev(m, SOUND_MIXER_VOLUME, SOUND_MIXER_NONE); + uaudio_mixer_set(mix_getdevinfo(m), type, left, right); + if (do_unlock) { + mtx_unlock(mtx); } - mix_setdevs(m, mask); - - mask = uaudio_query_recsrc_info(pa_dev); - mix_setrecdevs(m, mask); - - return 0; + return (left | (right << 8)); } static int -ua_mixer_set(struct snd_mixer *m, unsigned type, unsigned left, unsigned right) +ua_mixer_setrecsrc(struct snd_mixer *m, uint32_t src) { - device_t pa_dev; - struct ua_info *ua = mix_getdevinfo(m); + struct mtx *mtx = mixer_get_lock(m); + int retval; + uint8_t do_unlock; - pa_dev = device_get_parent(ua->sc_dev); - uaudio_mixer_set(pa_dev, type, left, right); - - return left | (right << 8); + if (mtx_owned(mtx)) { + do_unlock = 0; + } else { + do_unlock = 1; + mtx_lock(mtx); + } + retval = uaudio_mixer_setrecsrc(mix_getdevinfo(m), src); + if (do_unlock) { + mtx_unlock(mtx); + } + return (retval); } static int -ua_mixer_setrecsrc(struct snd_mixer *m, u_int32_t src) +ua_mixer_uninit(struct snd_mixer *m) { - device_t pa_dev; - struct ua_info *ua = mix_getdevinfo(m); - - pa_dev = device_get_parent(ua->sc_dev); - return uaudio_mixer_setrecsrc(pa_dev, src); + return (uaudio_mixer_uninit_sub(mix_getdevinfo(m))); } static kobj_method_t ua_mixer_methods[] = { - KOBJMETHOD(mixer_init, ua_mixer_init), - KOBJMETHOD(mixer_set, ua_mixer_set), - KOBJMETHOD(mixer_setrecsrc, ua_mixer_setrecsrc), + KOBJMETHOD(mixer_init, ua_mixer_init), + KOBJMETHOD(mixer_uninit, ua_mixer_uninit), + KOBJMETHOD(mixer_set, ua_mixer_set), + KOBJMETHOD(mixer_setrecsrc, ua_mixer_setrecsrc), - { 0, 0 } + {0, 0} }; + MIXER_DECLARE(ua_mixer); /************************************************************/ @@ -335,137 +183,42 @@ static int ua_probe(device_t dev) { - char *s; struct sndcard_func *func; - /* The parent device has already been probed. */ + /* the parent device has already been probed */ func = device_get_ivars(dev); - if (func == NULL || func->func != SCF_PCM) + + if ((func == NULL) || + (func->func != SCF_PCM)) { return (ENXIO); + } + device_set_desc(dev, "USB audio"); - s = "USB Audio"; - - device_set_desc(dev, s); - return BUS_PROBE_DEFAULT; + return (BUS_PROBE_DEFAULT); } static int ua_attach(device_t dev) { - struct ua_info *ua; - struct sndcard_func *func; - char status[SND_STATUSLEN]; - device_t pa_dev; - u_int32_t nplay, nrec, flags; - int i; - - ua = malloc(sizeof(*ua), M_DEVBUF, M_WAITOK | M_ZERO); - ua->sc_dev = dev; - - /* Mark for existence */ - func = device_get_ivars(dev); - if (func != NULL) - func->varinfo = (void *)ua; - - pa_dev = device_get_parent(dev); - ua->vendor = uaudio_get_vendor(pa_dev); - ua->product = uaudio_get_product(pa_dev); - ua->release = uaudio_get_release(pa_dev); - - if (bootverbose) - device_printf(dev, - "USB Audio: " - "vendor=0x%04x, product=0x%04x, release=0x%04x\n", - ua->vendor, ua->product, ua->release); - - ua->bufsz = pcm_getbuffersize(dev, 4096, UAUDIO_DEFAULT_BUFSZ, 65536); - if (bootverbose) - device_printf(dev, "using a default buffer size of %jd\n", (intmax_t)ua->bufsz); - - if (mixer_init(dev, &ua_mixer_class, ua)) { - goto bad; - } - - snprintf(status, SND_STATUSLEN, "at ? %s", PCM_KLDSTRING(snd_uaudio)); - - ua->ua_playcaps.fmtlist = ua->ua_playfmt; - ua->ua_reccaps.fmtlist = ua->ua_recfmt; - nplay = uaudio_query_formats(pa_dev, PCMDIR_PLAY, FORMAT_NUM * 2, &ua->ua_playcaps); - nrec = uaudio_query_formats(pa_dev, PCMDIR_REC, FORMAT_NUM * 2, &ua->ua_reccaps); - - if (nplay > 1) - nplay = 1; - if (nrec > 1) - nrec = 1; - - flags = pcm_getflags(dev); - for (i = 0; i < (sizeof(ua_quirks) / sizeof(ua_quirks[0])); i++) { - if (ua->vendor == ua_quirks[i].vendor && - ua->product == ua_quirks[i].product && - ua->release == ua_quirks[i].release) - flags |= ua_quirks[i].dflags; - } - pcm_setflags(dev, flags); - -#ifndef NO_RECORDING - if (pcm_register(dev, ua, nplay, nrec)) { -#else - if (pcm_register(dev, ua, nplay, 0)) { -#endif - goto bad; - } - - sndstat_unregister(dev); - uaudio_sndstat_register(dev); - - for (i = 0; i < nplay; i++) { - pcm_addchan(dev, PCMDIR_PLAY, &ua_chan_class, ua); - } -#ifndef NO_RECORDING - for (i = 0; i < nrec; i++) { - pcm_addchan(dev, PCMDIR_REC, &ua_chan_class, ua); - } -#endif - pcm_setstatus(dev, status); - - return 0; - -bad: free(ua, M_DEVBUF); - return ENXIO; + return (uaudio_attach_sub(dev, &ua_mixer_class, &ua_chan_class)); } static int ua_detach(device_t dev) { - struct ua_info *sc; - struct sndcard_func *func; - int r; - - r = pcm_unregister(dev); - if (r) - return r; - - sc = pcm_getdevinfo(dev); - free(sc, M_DEVBUF); - - /* Mark for deletion */ - func = device_get_ivars(dev); - if (func != NULL) - func->varinfo = NULL; - - return 0; + return (uaudio_detach_sub(dev)); } /************************************************************/ static device_method_t ua_pcm_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, ua_probe), - DEVMETHOD(device_attach, ua_attach), - DEVMETHOD(device_detach, ua_detach), + DEVMETHOD(device_probe, ua_probe), + DEVMETHOD(device_attach, ua_attach), + DEVMETHOD(device_detach, ua_detach), - { 0, 0 } + {0, 0} }; static driver_t ua_pcm_driver = { @@ -474,7 +227,6 @@ PCM_SOFTC_SIZE, }; - DRIVER_MODULE(ua_pcm, uaudio, ua_pcm_driver, pcm_devclass, 0, 0); MODULE_DEPEND(ua_pcm, uaudio, 1, 1, 1); MODULE_DEPEND(ua_pcm, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); ==== //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudioreg.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudioreg.h,v 1.12 2004/11/05 19:08:29 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudioreg.h,v 1.4 2005/01/06 01:43:22 imp Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudioreg.h,v 1.6 2009/02/23 21:19:18 thompsa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -38,30 +38,30 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#define UAUDIO_VERSION 0x100 +#define UAUDIO_VERSION 0x100 -#define UDESC_CS_CONFIG 0x22 -#define UDESC_CS_STRING 0x23 -#define UDESC_CS_INTERFACE 0x24 -#define UDESC_CS_ENDPOINT 0x25 +#define UDESC_CS_CONFIG 0x22 +#define UDESC_CS_STRING 0x23 +#define UDESC_CS_INTERFACE 0x24 +#define UDESC_CS_ENDPOINT 0x25 -#define UDESCSUB_AC_HEADER 1 -#define UDESCSUB_AC_INPUT 2 -#define UDESCSUB_AC_OUTPUT 3 -#define UDESCSUB_AC_MIXER 4 -#define UDESCSUB_AC_SELECTOR 5 -#define UDESCSUB_AC_FEATURE 6 -#define UDESCSUB_AC_PROCESSING 7 -#define UDESCSUB_AC_EXTENSION 8 +#define UDESCSUB_AC_HEADER 1 +#define UDESCSUB_AC_INPUT 2 +#define UDESCSUB_AC_OUTPUT 3 +#define UDESCSUB_AC_MIXER 4 +#define UDESCSUB_AC_SELECTOR 5 +#define UDESCSUB_AC_FEATURE 6 +#define UDESCSUB_AC_PROCESSING 7 +#define UDESCSUB_AC_EXTENSION 8 -/* The first fields are identical to usb_endpoint_descriptor_t */ +/* The first fields are identical to struct usb2_endpoint_descriptor */ typedef struct { - uByte bLength; - uByte bDescriptorType; - uByte bEndpointAddress; - uByte bmAttributes; - uWord wMaxPacketSize; - uByte bInterval; + uByte bLength; + uByte bDescriptorType; + uByte bEndpointAddress; + uByte bmAttributes; + uWord wMaxPacketSize; + uByte bInterval; /* * The following two entries are only used by the Audio Class. * And according to the specs the Audio Class is the only one @@ -69,60 +69,62 @@ * Who knows what goes on in the minds of the people in the USB * standardization? :-( */ - uByte bRefresh; - uByte bSynchAddress; -} UPACKED usb_endpoint_descriptor_audio_t; + uByte bRefresh; + uByte bSynchAddress; +} __packed usb2_endpoint_descriptor_audio_t; -struct usb_audio_control_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uWord bcdADC; - uWord wTotalLength; - uByte bInCollection; - uByte baInterfaceNr[1]; -} UPACKED; +struct usb2_audio_control_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uWord bcdADC; + uWord wTotalLength; + uByte bInCollection; + uByte baInterfaceNr[1]; +} __packed; -struct usb_audio_streaming_interface_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalLink; - uByte bDelay; - uWord wFormatTag; -} UPACKED; +struct usb2_audio_streaming_interface_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalLink; + uByte bDelay; + uWord wFormatTag; +} __packed; -struct usb_audio_streaming_endpoint_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bmAttributes; -#define UA_SED_FREQ_CONTROL 0x01 -#define UA_SED_PITCH_CONTROL 0x02 -#define UA_SED_MAXPACKETSONLY 0x80 - uByte bLockDelayUnits; - uWord wLockDelay; -} UPACKED; +struct usb2_audio_streaming_endpoint_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bmAttributes; +#define UA_SED_FREQ_CONTROL 0x01 +#define UA_SED_PITCH_CONTROL 0x02 +#define UA_SED_MAXPACKETSONLY 0x80 + uByte bLockDelayUnits; + uWord wLockDelay; +} __packed; -struct usb_audio_streaming_type1_descriptor { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bFormatType; - uByte bNrChannels; - uByte bSubFrameSize; - uByte bBitResolution; - uByte bSamFreqType; -#define UA_SAMP_CONTNUOUS 0 - uByte tSamFreq[3*2]; /* room for low and high */ -#define UA_GETSAMP(p, n) ((p)->tSamFreq[(n)*3+0] | ((p)->tSamFreq[(n)*3+1] << 8) | ((p)->tSamFreq[(n)*3+2] << 16)) -#define UA_SAMP_LO(p) UA_GETSAMP(p, 0) -#define UA_SAMP_HI(p) UA_GETSAMP(p, 1) -} UPACKED; +struct usb2_audio_streaming_type1_descriptor { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bFormatType; + uByte bNrChannels; + uByte bSubFrameSize; + uByte bBitResolution; + uByte bSamFreqType; +#define UA_SAMP_CONTNUOUS 0 + uByte tSamFreq[0]; +#define UA_GETSAMP(p, n) (((p)->tSamFreq[((n)*3)+0]) | \ + ((p)->tSamFreq[((n)*3)+1] << 8) | \ + ((p)->tSamFreq[((n)*3)+2] << 16)) +#define UA_SAMP_LO(p) UA_GETSAMP(p, 0) +#define UA_SAMP_HI(p) UA_GETSAMP(p, 1) +} __packed; -struct usb_audio_cluster { - uByte bNrChannels; - uWord wChannelConfig; +struct usb2_audio_cluster { + uByte bNrChannels; + uWord wChannelConfig; #define UA_CHANNEL_LEFT 0x0001 #define UA_CHANNEL_RIGHT 0x0002 #define UA_CHANNEL_CENTER 0x0004 @@ -135,270 +137,270 @@ #define UA_CHANNEL_L_SIDE 0x0200 #define UA_CHANNEL_R_SIDE 0x0400 #define UA_CHANNEL_TOP 0x0800 - uByte iChannelNames; -} UPACKED; + uByte iChannelNames; +} __packed; /* Shared by all units and terminals */ -struct usb_audio_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; +struct usb2_audio_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; }; /* UDESCSUB_AC_INPUT */ -struct usb_audio_input_terminal { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalId; - uWord wTerminalType; - uByte bAssocTerminal; - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte iTerminal; -} UPACKED; +struct usb2_audio_input_terminal { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalId; + uWord wTerminalType; + uByte bAssocTerminal; + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; +/* uByte iTerminal; */ +} __packed; /* UDESCSUB_AC_OUTPUT */ -struct usb_audio_output_terminal { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bTerminalId; - uWord wTerminalType; - uByte bAssocTerminal; - uByte bSourceId; - uByte iTerminal; -} UPACKED; +struct usb2_audio_output_terminal { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bTerminalId; + uWord wTerminalType; + uByte bAssocTerminal; + uByte bSourceId; + uByte iTerminal; +} __packed; /* UDESCSUB_AC_MIXER */ -struct usb_audio_mixer_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_mixer_unit_1 */ -} UPACKED; -struct usb_audio_mixer_unit_1 { - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bmControls[255]; /* [bNrChannels] */ - /*uByte iMixer;*/ -} UPACKED; +struct usb2_audio_mixer_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_mixer_unit_1 */ +} __packed; +struct usb2_audio_mixer_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bmControls[0]; /* [see source code] */ + /* uByte iMixer; */ +} __packed; /* UDESCSUB_AC_SELECTOR */ -struct usb_audio_selector_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ +struct usb2_audio_selector_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ /* uByte iSelector; */ -} UPACKED; +} __packed; /* UDESCSUB_AC_FEATURE */ -struct usb_audio_feature_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uByte bSourceId; - uByte bControlSize; - uByte bmaControls[255]; /* size for more than enough */ +struct usb2_audio_feature_unit { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uByte bSourceId; + uByte bControlSize; + uByte bmaControls[0]; /* [bControlSize * x] */ /* uByte iFeature; */ -} UPACKED; +} __packed; /* UDESCSUB_AC_PROCESSING */ -struct usb_audio_processing_unit { - uByte bLength; - uByte bDescriptorType; - uByte bDescriptorSubtype; - uByte bUnitId; - uWord wProcessType; - uByte bNrInPins; - uByte baSourceId[255]; /* [bNrInPins] */ - /* struct usb_audio_processing_unit_1 */ -} UPACKED; -struct usb_audio_processing_unit_1{ - uByte bNrChannels; - uWord wChannelConfig; - uByte iChannelNames; - uByte bControlSize; - uByte bmControls[255]; /* [bControlSize] */ -#define UA_PROC_ENABLE_MASK 1 -} UPACKED; +struct usb2_audio_processing_unit_0 { + uByte bLength; + uByte bDescriptorType; + uByte bDescriptorSubtype; + uByte bUnitId; + uWord wProcessType; + uByte bNrInPins; + uByte baSourceId[0]; /* [bNrInPins] */ + /* struct usb2_audio_processing_unit_1 */ +} __packed; +struct usb2_audio_processing_unit_1 { + uByte bNrChannels; + uWord wChannelConfig; + uByte iChannelNames; + uByte bControlSize; + uByte bmControls[0]; /* [bControlSize] */ +#define UA_PROC_ENABLE_MASK 1 +} __packed; -struct usb_audio_processing_unit_updown { - uByte iProcessing; - uByte bNrModes; - uWord waModes[255]; /* [bNrModes] */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Mar 4 13:43:33 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 096471065672; Wed, 4 Mar 2009 13:43: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 3D8A6106566C for ; Wed, 4 Mar 2009 13:43:32 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 26CFD8FC12 for ; Wed, 4 Mar 2009 13:43:32 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24DhW98001809 for ; Wed, 4 Mar 2009 13:43:32 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24DhVYf001807 for perforce@freebsd.org; Wed, 4 Mar 2009 13:43:31 GMT (envelope-from zec@fer.hr) Date: Wed, 4 Mar 2009 13:43:31 GMT Message-Id: <200903041343.n24DhVYf001807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 13:43:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=158670 Change 158670 by zec@zec_amdx2 on 2009/03/04 13:43:09 Nuke V_ripcb_zone - it was / is shadowed already by V_ripcbinfo.ipi_zone Affected files ... .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#42 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#49 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#42 (text+ko) ==== @@ -83,7 +83,6 @@ #ifdef VIMAGE_GLOBALS struct inpcbhead ripcb; struct inpcbinfo ripcbinfo; -static struct uma_zone *ripcb_zone; #endif /* control hooks for ipfw and dummynet */ @@ -186,10 +185,6 @@ { INIT_VNET_INET(curvnet); - V_ripcb_zone = uma_zcreate("ripcb", sizeof(struct inpcb), - NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - V_ripcbinfo.ipi_vnet = curvnet; - INP_INFO_LOCK_INIT(&V_ripcbinfo, "rip"); LIST_INIT(&V_ripcb); V_ripcbinfo.ipi_listhead = &V_ripcb; @@ -197,7 +192,9 @@ hashinit(INP_PCBHASH_RAW_SIZE, M_PCB, &V_ripcbinfo.ipi_hashmask); V_ripcbinfo.ipi_porthashbase = hashinit(1, M_PCB, &V_ripcbinfo.ipi_porthashmask); - V_ripcbinfo.ipi_zone = V_ripcb_zone; + V_ripcbinfo.ipi_zone = uma_zcreate("ripcb", sizeof(struct inpcb), + NULL, NULL, rip_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + V_ripcbinfo.ipi_vnet = curvnet; uma_zone_set_max(V_ripcbinfo.ipi_zone, maxsockets); EVENTHANDLER_REGISTER(maxsockets_change, rip_zone_change, NULL, EVENTHANDLER_PRI_ANY); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#49 (text+ko) ==== @@ -156,7 +156,6 @@ struct inpcbhead _ripcb; struct inpcbinfo _ripcbinfo; - struct uma_zone *_ripcb_zone; struct socket *_ip_mrouter; struct socket *_ip_rsvpd; @@ -288,7 +287,6 @@ #define V_reply_src VNET_INET(reply_src) #define V_ripcb VNET_INET(ripcb) #define V_ripcbinfo VNET_INET(ripcbinfo) -#define V_ripcb_zone VNET_INET(ripcb_zone) #define V_router_info_head VNET_INET(router_info_head) #define V_rsvp_on VNET_INET(rsvp_on) #define V_rtq_minreallyold VNET_INET(rtq_minreallyold) From owner-p4-projects@FreeBSD.ORG Wed Mar 4 14:02:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8D451065673; Wed, 4 Mar 2009 14:02: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 6497A106574A for ; Wed, 4 Mar 2009 14:02:52 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E96628FC16 for ; Wed, 4 Mar 2009 14:02:51 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24E2pA6003291 for ; Wed, 4 Mar 2009 14:02:51 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24E2p3P003289 for perforce@freebsd.org; Wed, 4 Mar 2009 14:02:51 GMT (envelope-from zec@fer.hr) Date: Wed, 4 Mar 2009 14:02:51 GMT Message-Id: <200903041402.n24E2p3P003289@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158672 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 14:02:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=158672 Change 158672 by zec@zec_amdx2 on 2009/03/04 14:02:19 Nuke V_tcp_ipi_zone, shadowed by V_tcbinfo.ipi_zone. Affected files ... .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#75 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#50 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#75 (text+ko) ==== @@ -279,7 +279,6 @@ #ifdef VIMAGE_GLOBALS static uma_zone_t tcpcb_zone; -static struct uma_zone *tcp_ipi_zone; #endif /* @@ -290,7 +289,6 @@ { INIT_VNET_INET(curvnet); /* XXX */ - uma_zone_set_max(V_tcp_ipi_zone, maxsockets); uma_zone_set_max(V_tcpcb_zone, maxsockets); tcp_tw_zone_change(); } @@ -347,9 +345,6 @@ V_tcp_autosndbuf_max = 256*1024; - V_tcp_ipi_zone = uma_zcreate("inpcb", sizeof(struct inpcb), - NULL, NULL, tcp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(V_tcp_ipi_zone, maxsockets); /* * These have to be type stable for the benefit of the timers. */ @@ -395,7 +390,9 @@ &V_tcbinfo.ipi_hashmask); V_tcbinfo.ipi_porthashbase = hashinit(hashsize, M_PCB, &V_tcbinfo.ipi_porthashmask); - V_tcbinfo.ipi_zone = V_tcp_ipi_zone; + V_tcbinfo.ipi_zone = uma_zcreate("inpcb", sizeof(struct inpcb), + NULL, NULL, tcp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); V_tcbinfo.ipi_vnet = curvnet; #ifdef INET6 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr)) ==== //depot/projects/vimage/src/sys/netinet/vinet.h#50 (text+ko) ==== @@ -86,7 +86,6 @@ struct tcp_hostcache _tcp_hostcache; struct callout _tcp_hc_callout; - struct uma_zone *_tcp_ipi_zone; struct uma_zone *_tcp_reass_zone; struct uma_zone *_tcpcb_zone; struct uma_zone *_tcptw_zone; @@ -326,7 +325,6 @@ #define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh) #define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab) #define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) -#define V_tcp_ipi_zone VNET_INET(tcp_ipi_zone) #define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval) #define V_tcp_minmss VNET_INET(tcp_minmss) #define V_tcp_mssdflt VNET_INET(tcp_mssdflt) From owner-p4-projects@FreeBSD.ORG Wed Mar 4 15:12:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ADCB9106567B; Wed, 4 Mar 2009 15:12:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 621001065679 for ; Wed, 4 Mar 2009 15:12:03 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 508F48FC24 for ; Wed, 4 Mar 2009 15:12:03 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24FC3pa011310 for ; Wed, 4 Mar 2009 15:12:03 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24FC2pY011308 for perforce@freebsd.org; Wed, 4 Mar 2009 15:12:02 GMT (envelope-from zec@fer.hr) Date: Wed, 4 Mar 2009 15:12:02 GMT Message-Id: <200903041512.n24FC2pY011308@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 158673 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 15:12:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=158673 Change 158673 by zec@zec_amdx2 on 2009/03/04 15:11:08 Nuke V_udp_ipi_zone Affected files ... .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#49 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#51 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#49 (text+ko) ==== @@ -152,16 +152,12 @@ static int udp_output(struct inpcb *, struct mbuf *, struct sockaddr *, struct mbuf *, struct thread *); -#ifdef VIMAGE_GLOBALS -static struct uma_zone *udp_ipi_zone; -#endif - static void udp_zone_change(void *tag) { INIT_VNET_INET(curvnet); /* XXX */ - uma_zone_set_max(V_udp_ipi_zone, maxsockets); + uma_zone_set_max(V_udbinfo.ipi_zone, maxsockets); } static int @@ -181,12 +177,8 @@ V_udp_blackhole = 0; - V_udp_ipi_zone = uma_zcreate("udpcb", sizeof(struct inpcb), NULL, - NULL, udp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(V_udp_ipi_zone, maxsockets); EVENTHANDLER_REGISTER(maxsockets_change, udp_zone_change, NULL, EVENTHANDLER_PRI_ANY); - V_udbinfo.ipi_vnet = curvnet; INP_INFO_LOCK_INIT(&V_udbinfo, "udp"); LIST_INIT(&V_udb); @@ -195,7 +187,10 @@ &V_udbinfo.ipi_hashmask); V_udbinfo.ipi_porthashbase = hashinit(UDBHASHSIZE, M_PCB, &V_udbinfo.ipi_porthashmask); - V_udbinfo.ipi_zone = V_udp_ipi_zone; + V_udbinfo.ipi_zone = uma_zcreate("udpcb", sizeof(struct inpcb), NULL, + NULL, udp_inpcb_init, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + V_udbinfo.ipi_vnet = curvnet; + uma_zone_set_max(V_udbinfo.ipi_zone, maxsockets); } #ifdef VIMAGE ==== //depot/projects/vimage/src/sys/netinet/vinet.h#51 (text+ko) ==== @@ -90,7 +90,6 @@ struct uma_zone *_tcpcb_zone; struct uma_zone *_tcptw_zone; struct uma_zone *_sack_hole_zone; - struct uma_zone *_udp_ipi_zone; struct tcp_syncache _tcp_syncache; int _tcp_syncookies; @@ -348,7 +347,6 @@ #define V_udb VNET_INET(udb) #define V_udbinfo VNET_INET(udbinfo) #define V_udp_blackhole VNET_INET(udp_blackhole) -#define V_udp_ipi_zone VNET_INET(udp_ipi_zone) #define V_udpstat VNET_INET(udpstat) #define V_useloopback VNET_INET(useloopback) From owner-p4-projects@FreeBSD.ORG Wed Mar 4 20:11:11 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A1CE31065675; Wed, 4 Mar 2009 20:11:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B5B3106566B for ; Wed, 4 Mar 2009 20:11:11 +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 2EA2F8FC15 for ; Wed, 4 Mar 2009 20:11:11 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24KBBqD055234 for ; Wed, 4 Mar 2009 20:11:11 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24KB9CA055230 for perforce@freebsd.org; Wed, 4 Mar 2009 20:11:09 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 4 Mar 2009 20:11:09 GMT Message-Id: <200903042011.n24KB9CA055230@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 158685 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 20:11:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=158685 Change 158685 by hselasky@hselasky_laptop001 on 2009/03/04 20:10:25 Make sure that userland applications wake up from select when the device is gone! Else they might end up sleeping forever. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#6 edit .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#16 edit .. //depot/projects/usb/src/sys/kern/kern_conf.c#13 edit .. //depot/projects/usb/src/sys/sys/conf.h#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#6 (text+ko) ==== @@ -1077,11 +1077,11 @@ err = devfs_get_cdevpriv((void **)&cpd); if (err != 0) - return (err); + return (devfs_no_poll(dev, events, td)); err = usb2_ref_device(cpd, 0 /* no uref */ ); if (err) - return (POLLHUP); + return (devfs_no_poll(dev, events, td)); fflags = cpd->fflags; ==== //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#16 (text+ko) ==== @@ -1014,7 +1014,7 @@ fpop = td->td_fpop; error = devfs_fp_check(fp, &dev, &dsw); if (error) - return (error); + return (devfs_no_poll(dev, events, td)); error = dsw->d_poll(dev, events, td); td->td_fpop = fpop; dev_relthread(dev); ==== //depot/projects/usb/src/sys/kern/kern_conf.c#13 (text+ko) ==== @@ -263,7 +263,7 @@ #define dead_read (d_read_t *)enxio #define dead_write (d_write_t *)enxio #define dead_ioctl (d_ioctl_t *)enxio -#define dead_poll (d_poll_t *)enodev +#define dead_poll (d_poll_t *)devfs_no_poll #define dead_mmap (d_mmap_t *)enodev static void @@ -309,8 +309,8 @@ biofinish(bp, NULL, ENODEV); } -static int -no_poll(struct cdev *dev __unused, int events, struct thread *td __unused) +int +devfs_no_poll(struct cdev *dev __unused, int events, struct thread *td __unused) { /* * Return true for read/write. If the user asked for something @@ -619,7 +619,7 @@ FIXUP(d_read, no_read, giant_read); FIXUP(d_write, no_write, giant_write); FIXUP(d_ioctl, no_ioctl, giant_ioctl); - FIXUP(d_poll, no_poll, giant_poll); + FIXUP(d_poll, devfs_no_poll, giant_poll); FIXUP(d_mmap, no_mmap, giant_mmap); FIXUP(d_strategy, no_strategy, giant_strategy); FIXUP(d_kqfilter, no_kqfilter, giant_kqfilter); ==== //depot/projects/usb/src/sys/sys/conf.h#16 (text+ko) ==== @@ -279,6 +279,7 @@ int devfs_set_cdevpriv(void *priv, cdevpriv_dtr_t dtr); void devfs_clear_cdevpriv(void); void devfs_fpdrop(struct file *fp); /* XXX This is not public KPI */ +d_poll_t devfs_no_poll; #define UID_ROOT 0 #define UID_BIN 3 From owner-p4-projects@FreeBSD.ORG Wed Mar 4 22:06:12 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79E1D1065670; Wed, 4 Mar 2009 22:06: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 396B1106564A for ; Wed, 4 Mar 2009 22:06:12 +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 27AB08FC1A for ; Wed, 4 Mar 2009 22:06:12 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24M6CYt077007 for ; Wed, 4 Mar 2009 22:06:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24M6C74077005 for perforce@freebsd.org; Wed, 4 Mar 2009 22:06:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 4 Mar 2009 22:06:12 GMT Message-Id: <200903042206.n24M6C74077005@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 158692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 22:06:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=158692 Change 158692 by hselasky@hselasky_laptop001 on 2009/03/04 22:05:57 USB controller: EHCI performance quirk. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#2 (text+ko) ==== @@ -2189,12 +2189,23 @@ ehci_device_bulk_start(struct usb2_xfer *xfer) { ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus); + uint32_t temp; /* setup TD's and QH */ ehci_setup_standard_chain(xfer, &sc->sc_async_p_last); /* put transfer on interrupt queue */ ehci_transfer_intr_enqueue(xfer); + + /* Performance quirk: Some Host Controllers have a too low + * interrupt rate. Issue an IAAD to stimulate the Host + * Controller after queueing the BULK transfer. Performance + * increase seen using an off the shelf flash stick: 9 + * Mbytes/second. --hps + */ + temp = EOREAD4(sc, EHCI_USBCMD); + if (!(temp & EHCI_CMD_IAAD)) + EOWRITE4(sc, EHCI_USBCMD, temp | EHCI_CMD_IAAD); } struct usb2_pipe_methods ehci_device_bulk_methods = From owner-p4-projects@FreeBSD.ORG Wed Mar 4 22:16:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 469DB106567C; Wed, 4 Mar 2009 22:16: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 03A74106567A for ; Wed, 4 Mar 2009 22:16:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E42428FC2C for ; Wed, 4 Mar 2009 22:16:22 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n24MGMNl077823 for ; Wed, 4 Mar 2009 22:16:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n24MGMov077821 for perforce@freebsd.org; Wed, 4 Mar 2009 22:16:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 4 Mar 2009 22:16:22 GMT Message-Id: <200903042216.n24MGMov077821@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 158695 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Mar 2009 22:16:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=158695 Change 158695 by hselasky@hselasky_laptop001 on 2009/03/04 22:16:12 IFC @ 158694 (Need vga_pci.c patch) Affected files ... .. //depot/projects/usb/src/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#14 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#17 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#16 integrate .. //depot/projects/usb/src/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#15 integrate .. //depot/projects/usb/src/sys/i386/linux/linux.h#10 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#10 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#10 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#14 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/linux32/linux.h#10 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.22 2008/11/29 17:14:06 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.23 2009/03/04 12:14:33 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -108,6 +108,10 @@ #define LINUX_CTL_MAXNAME 10 +#define LINUX_AT_COUNT 16 /* Count of used aux entry types. + * Keep this synchronized with + * elf_linux_fixup() code. + */ struct l___sysctl_args { l_uintptr_t name; ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.41 2009/01/31 20:46:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.42 2009/03/04 12:14:33 dchagin Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -78,6 +78,7 @@ #include #include #include +#include #include #include @@ -106,6 +107,8 @@ #define LINUX_SYS_linux_rt_sendsig 0 #define LINUX_SYS_linux_sendsig 0 +const char *linux_platform = "i686"; +static int linux_szplatform; extern char linux_sigcode[]; extern int linux_szsigcode; @@ -246,7 +249,12 @@ { Elf32_Auxargs *args; Elf32_Addr *base; - Elf32_Addr *pos; + Elf32_Addr *pos, *uplatform; + struct linux32_ps_strings *arginfo; + + arginfo = (struct linux32_ps_strings *)LINUX32_PS_STRINGS; + uplatform = (Elf32_Addr *)((caddr_t)arginfo - linux_szsigcode - + linux_szplatform); KASSERT(curthread->td_proc == imgp->proc, ("unsafe elf_linux_fixup(), should be curproc")); @@ -254,8 +262,8 @@ args = (Elf32_Auxargs *)imgp->auxargs; pos = base + (imgp->args->argc + imgp->args->envc + 2); - if (args->execfd != -1) - AUXARGS_ENTRY_32(pos, AT_EXECFD, args->execfd); + AUXARGS_ENTRY_32(pos, LINUX_AT_HWCAP, cpu_feature); + AUXARGS_ENTRY_32(pos, LINUX_AT_CLKTCK, hz); AUXARGS_ENTRY_32(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY_32(pos, AT_PHENT, args->phent); AUXARGS_ENTRY_32(pos, AT_PHNUM, args->phnum); @@ -263,10 +271,14 @@ AUXARGS_ENTRY_32(pos, AT_FLAGS, args->flags); AUXARGS_ENTRY_32(pos, AT_ENTRY, args->entry); AUXARGS_ENTRY_32(pos, AT_BASE, args->base); + AUXARGS_ENTRY_32(pos, LINUX_AT_SECURE, 0); AUXARGS_ENTRY_32(pos, AT_UID, imgp->proc->p_ucred->cr_ruid); AUXARGS_ENTRY_32(pos, AT_EUID, imgp->proc->p_ucred->cr_svuid); AUXARGS_ENTRY_32(pos, AT_GID, imgp->proc->p_ucred->cr_rgid); AUXARGS_ENTRY_32(pos, AT_EGID, imgp->proc->p_ucred->cr_svgid); + AUXARGS_ENTRY_32(pos, LINUX_AT_PLATFORM, PTROUT(uplatform)); + if (args->execfd != -1) + AUXARGS_ENTRY_32(pos, AT_EXECFD, args->execfd); AUXARGS_ENTRY_32(pos, AT_NULL, 0); free(imgp->auxargs, M_TEMP); @@ -857,23 +869,27 @@ char *stringp, *destp; u_int32_t *stack_base; struct linux32_ps_strings *arginfo; - int sigcodesz; /* * Calculate string base and vector table pointers. * Also deal with signal trampoline code for this exec type. */ arginfo = (struct linux32_ps_strings *)LINUX32_PS_STRINGS; - sigcodesz = *(imgp->proc->p_sysent->sv_szsigcode); - destp = (caddr_t)arginfo - sigcodesz - SPARE_USRSPACE - - roundup((ARG_MAX - imgp->args->stringspace), sizeof(char *)); + destp = (caddr_t)arginfo - linux_szsigcode - SPARE_USRSPACE - + linux_szplatform - roundup((ARG_MAX - imgp->args->stringspace), + sizeof(char *)); /* * install sigcode */ - if (sigcodesz) - copyout(imgp->proc->p_sysent->sv_sigcode, - ((caddr_t)arginfo - sigcodesz), sigcodesz); + copyout(imgp->proc->p_sysent->sv_sigcode, + ((caddr_t)arginfo - linux_szsigcode), linux_szsigcode); + + /* + * Install LINUX_PLATFORM + */ + copyout(linux_platform, ((caddr_t)arginfo - linux_szsigcode - + linux_szplatform), linux_szplatform); /* * If we have a valid auxargs ptr, prepare some room @@ -885,7 +901,7 @@ * lower compatibility. */ imgp->auxarg_size = (imgp->auxarg_size) ? imgp->auxarg_size : - (AT_COUNT * 2); + (LINUX_AT_COUNT * 2); /* * The '+ 2' is for the null pointers at the end of each of * the arg and env vector sets,and imgp->auxarg_size is room @@ -919,14 +935,14 @@ /* * Fill in "ps_strings" struct for ps, w, etc. */ - suword32(&arginfo->ps_argvstr, (u_int32_t)(intptr_t)vectp); + suword32(&arginfo->ps_argvstr, (uint32_t)(intptr_t)vectp); suword32(&arginfo->ps_nargvstr, argc); /* * Fill in argument portion of vector table. */ for (; argc > 0; --argc) { - suword32(vectp++, (u_int32_t)(intptr_t)destp); + suword32(vectp++, (uint32_t)(intptr_t)destp); while (*stringp++ != 0) destp++; destp++; @@ -935,14 +951,14 @@ /* a null vector table pointer separates the argp's from the envp's */ suword32(vectp++, 0); - suword32(&arginfo->ps_envstr, (u_int32_t)(intptr_t)vectp); + suword32(&arginfo->ps_envstr, (uint32_t)(intptr_t)vectp); suword32(&arginfo->ps_nenvstr, envc); /* * Fill in environment portion of vector table. */ for (; envc > 0; --envc) { - suword32(vectp++, (u_int32_t)(intptr_t)destp); + suword32(vectp++, (uint32_t)(intptr_t)destp); while (*stringp++ != 0) destp++; destp++; @@ -1089,6 +1105,8 @@ linux_schedtail, NULL, 1000); linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, NULL, 1000); + linux_szplatform = roundup(strlen(linux_platform) + 1, + sizeof(char *)); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else ==== //depot/projects/usb/src/sys/compat/linux/linux_misc.c#17 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.231 2008/12/29 12:58:45 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.232 2009/03/04 12:14:33 dchagin Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -92,10 +92,6 @@ #include #include -#ifdef __i386__ -#include -#endif - #define BSD_TO_LINUX_SIGNAL(sig) \ (((sig) <= LINUX_SIGTBLSZ) ? bsd_to_linux_signal[_SIG_IDX(sig)] : sig) @@ -731,34 +727,8 @@ *p = '\0'; break; } -#ifdef __i386__ - { - const char *class; + strlcpy(utsname.machine, linux_platform, LINUX_MAX_UTSNAME); - switch (cpu_class) { - case CPUCLASS_686: - class = "i686"; - break; - case CPUCLASS_586: - class = "i586"; - break; - case CPUCLASS_486: - class = "i486"; - break; - default: - class = "i386"; - } - strlcpy(utsname.machine, class, LINUX_MAX_UTSNAME); - } -#elif defined(__amd64__) /* XXX: Linux can change 'personality'. */ -#ifdef COMPAT_LINUX32 - strlcpy(utsname.machine, "i686", LINUX_MAX_UTSNAME); -#else - strlcpy(utsname.machine, "x86_64", LINUX_MAX_UTSNAME); -#endif /* COMPAT_LINUX32 */ -#else /* something other than i386 or amd64 - assume we and Linux agree */ - strlcpy(utsname.machine, machine, LINUX_MAX_UTSNAME); -#endif /* __i386__ */ mtx_lock(&hostname_mtx); strlcpy(utsname.domainname, V_domainname, LINUX_MAX_UTSNAME); mtx_unlock(&hostname_mtx); ==== //depot/projects/usb/src/sys/compat/linux/linux_misc.h#3 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_misc.h,v 1.3 2008/02/22 11:47:56 kib Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.h,v 1.4 2009/03/04 12:14:33 dchagin Exp $ */ #ifndef _LINUX_MISC_H_ @@ -45,4 +45,19 @@ #define LINUX_MREMAP_MAYMOVE 1 #define LINUX_MREMAP_FIXED 2 +extern const char *linux_platform; + +/* + * Non-standard aux entry types used in Linux ELF binaries. + */ + +#define LINUX_AT_PLATFORM 15 /* String identifying CPU */ +#define LINUX_AT_HWCAP 16 /* CPU capabilities */ +#define LINUX_AT_CLKTCK 17 /* frequency at which times() increments */ +#define LINUX_AT_SECURE 23 /* secure mode boolean */ +#define LINUX_AT_BASE_PLATFORM 24 /* string identifying real platform, may + * differ from AT_PLATFORM. + */ +#define LINUX_AT_EXECFN 31 /* filename of program */ + #endif /* _LINUX_MISC_H_ */ ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acerlabs.c,v 1.3 2009/02/19 00:32:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-acerlabs.c,v 1.4 2009/03/04 18:25:39 rnoland Exp $"); #include "opt_ata.h" #include @@ -113,10 +113,6 @@ if ((ctlr->chip->chipid == ATA_ALI_5288) && (ata_ahci_chipinit(dev) != ENXIO)) return 0; - - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); break; case ALI_NEW: ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.18 2009/03/01 22:50:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-ahci.c,v 1.19 2009/03/04 18:25:39 rnoland Exp $"); #include "opt_ata.h" #include @@ -135,10 +135,6 @@ ctlr->suspend = ata_ahci_suspend; ctlr->resume = ata_ahci_ctlr_reset; - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); - /* announce we support the HW */ version = ATA_INL(ctlr->r_res2, ATA_AHCI_VS); device_printf(dev, ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.3 2009/02/19 00:32:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-intel.c,v 1.4 2009/03/04 18:25:39 rnoland Exp $"); #include "opt_ata.h" #include @@ -213,10 +213,6 @@ ctlr->setmode = ata_intel_sata_setmode; else ctlr->setmode = ata_sata_setmode; - - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); } return 0; } ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.5 2009/02/19 00:32:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-marvell.c,v 1.6 2009/03/04 18:25:39 rnoland Exp $"); #include "opt_ata.h" #include @@ -212,9 +212,6 @@ ATA_OUTL(ctlr->r_res1, 0x01d64, 0x000000ff/*HC0*/ | 0x0001fe00/*HC1*/ | /*(1<<19) | (1<<20) | (1<<21) |*/(1<<22) | (1<<24) | (0x7f << 25)); - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); return 0; } ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.4 2009/02/20 08:49:56 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-nvidia.c,v 1.5 2009/03/04 18:25:39 rnoland Exp $"); #include "opt_ata.h" #include @@ -183,11 +183,6 @@ /* enable device and PHY state change interrupts */ ATA_OUTB(ctlr->r_res2, offset + 1, 0xdd); } - - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400,2); - } ctlr->setmode = ata_sata_setmode; } ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.4 2009/02/21 23:46:34 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-siliconimage.c,v 1.5 2009/03/04 18:25:39 rnoland Exp $"); #include "opt_ata.h" #include @@ -150,10 +150,6 @@ ATA_OUTL(ctlr->r_res1, 0x0040, 0x80000000); DELAY(10000); ATA_OUTL(ctlr->r_res1, 0x0040, 0x0000000f); - - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400, 2); break; case SII_MEMIO: ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-sis.c,v 1.4 2009/02/19 00:32:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-sis.c,v 1.5 2009/03/04 18:25:39 rnoland Exp $"); #include "opt_ata.h" #include @@ -189,10 +189,6 @@ ctlr->ch_attach = ata_sis_ch_attach; ctlr->ch_detach = ata_pci_ch_detach; ctlr->reset = ata_sis_reset; - - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400,2); } ctlr->setmode = ata_sata_setmode; return 0; ==== //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.3 2009/02/19 00:32:55 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-via.c,v 1.4 2009/03/04 18:25:39 rnoland Exp $"); #include "opt_ata.h" #include @@ -143,10 +143,6 @@ ctlr->ch_attach = ata_via_ch_attach; ctlr->ch_detach = ata_via_ch_detach; ctlr->reset = ata_via_reset; - - /* enable PCI interrupt */ - pci_write_config(dev, PCIR_COMMAND, - pci_read_config(dev, PCIR_COMMAND, 2) & ~0x0400,2); } if (ctlr->chip->cfg2 & VIABAR) { ==== //depot/projects/usb/src/sys/dev/pci/pci.c#16 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.371 2009/03/03 16:38:59 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.372 2009/03/04 18:23:48 rnoland Exp $"); #include "opt_bus.h" @@ -2825,14 +2825,24 @@ if (error) return (error); - /* - * If this is a direct child, check to see if the interrupt is - * MSI or MSI-X. If so, ask our parent to map the MSI and give - * us the address and data register values. If we fail for some - * reason, teardown the interrupt handler. - */ + /* If this is not a direct child, just bail out. */ + if (device_get_parent(child) != dev) { + *cookiep = cookie; + return(0); + } + rid = rman_get_rid(irq); - if (device_get_parent(child) == dev && rid > 0) { + if (rid == 0) { + /* Make sure that INTx is enabled */ + pci_clear_command_bit(dev, child, PCIM_CMD_INTxDIS); + } else { + /* + * Check to see if the interrupt is MSI or MSI-X. + * Ask our parent to map the MSI and give + * us the address and data register values. + * If we fail for some reason, teardown the + * interrupt handler. + */ dinfo = device_get_ivars(child); if (dinfo->cfg.msi.msi_alloc > 0) { if (dinfo->cfg.msi.msi_addr == 0) { @@ -2874,7 +2884,8 @@ } mte->mte_handlers++; } - /* Disable INTx if we are using MSI/MSIX */ + + /* Make sure that INTx is disabled if we are using MSI/MSIX */ pci_set_command_bit(dev, child, PCIM_CMD_INTxDIS); bad: if (error) { @@ -2896,16 +2907,24 @@ struct pci_devinfo *dinfo; int error, rid; - /* - * If this is a direct child, check to see if the interrupt is - * MSI or MSI-X. If so, decrement the appropriate handlers - * count and mask the MSI-X message, or disable MSI messages - * if the count drops to 0. - */ if (irq == NULL || !(rman_get_flags(irq) & RF_ACTIVE)) return (EINVAL); + + /* If this isn't a direct child, just bail out */ + if (device_get_parent(child) != dev) + return(bus_generic_teardown_intr(dev, child, irq, cookie)); + rid = rman_get_rid(irq); - if (device_get_parent(child) == dev && rid > 0) { + if (rid > 0) { + /* Mask INTx */ + pci_set_command_bit(dev, child, PCIM_CMD_INTxDIS); + } else { + /* + * Check to see if the interrupt is MSI or MSI-X. If so, + * decrement the appropriate handlers count and mask the + * MSI-X message, or disable MSI messages if the count + * drops to 0. + */ dinfo = device_get_ivars(child); rle = resource_list_find(&dinfo->resources, SYS_RES_IRQ, rid); if (rle->res != irq) @@ -2930,11 +2949,9 @@ if (mte->mte_handlers == 0) pci_mask_msix(child, rid - 1); } - /* Restore INTx capability for MSI/MSIX */ - pci_clear_command_bit(dev, child, PCIM_CMD_INTxDIS); } error = bus_generic_teardown_intr(dev, child, irq, cookie); - if (device_get_parent(child) == dev && rid > 0) + if (rid > 0) KASSERT(error == 0, ("%s: generic teardown failed for MSI/MSI-X", __func__)); return (error); ==== //depot/projects/usb/src/sys/dev/pci/vga_pci.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/vga_pci.c,v 1.7 2008/09/19 19:11:35 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/vga_pci.c,v 1.8 2009/03/04 21:04:52 jhb Exp $"); /* * Simple driver for PCI VGA display devices. Drivers such as agp(4) and @@ -42,12 +42,20 @@ #include #include #include +#include +#include #include #include +struct vga_resource { + struct resource *vr_res; + int vr_refs; +}; + struct vga_pci_softc { device_t vga_msi_child; /* Child driver using MSI. */ + struct vga_resource vga_res[PCIR_MAX_BAR_0 + 1]; }; static int @@ -130,7 +138,27 @@ vga_pci_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) { + struct vga_pci_softc *sc; + int bar; + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + /* + * For BARs, we cache the resource so that we only allocate it + * from the PCI bus once. + */ + bar = PCI_RID2BAR(*rid); + if (bar < 0 || bar > PCIR_MAX_BAR_0) + return (NULL); + sc = device_get_softc(dev); + if (sc->vga_res[bar].vr_res == NULL) + sc->vga_res[bar].vr_res = bus_alloc_resource(dev, type, + rid, start, end, count, flags); + if (sc->vga_res[bar].vr_res != NULL) + sc->vga_res[bar].vr_refs++; + return (sc->vga_res[bar].vr_res); + } return (bus_alloc_resource(dev, type, rid, start, end, count, flags)); } @@ -138,6 +166,37 @@ vga_pci_release_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { + struct vga_pci_softc *sc; + int bar, error; + + switch (type) { + case SYS_RES_MEMORY: + case SYS_RES_IOPORT: + /* + * For BARs, we release the resource from the PCI bus + * when the last child reference goes away. + */ + bar = PCI_RID2BAR(rid); + if (bar < 0 || bar > PCIR_MAX_BAR_0) + return (EINVAL); + sc = device_get_softc(dev); + if (sc->vga_res[bar].vr_res == NULL) + return (EINVAL); + KASSERT(sc->vga_res[bar].vr_res == r, + ("vga_pci resource mismatch")); + if (sc->vga_res[bar].vr_refs > 1) { + sc->vga_res[bar].vr_refs--; + return (0); + } + KASSERT(sc->vga_res[bar].vr_refs > 0, + ("vga_pci resource reference count underflow")); + error = bus_release_resource(dev, type, rid, r); + if (error == 0) { + sc->vga_res[bar].vr_res = NULL; + sc->vga_res[bar].vr_refs = 0; + } + return (error); + } return (bus_release_resource(dev, type, rid, r)); } ==== //depot/projects/usb/src/sys/fs/udf/udf_vnops.c#15 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.85 2009/03/03 13:10:25 avg Exp $ + * $FreeBSD: src/sys/fs/udf/udf_vnops.c,v 1.87 2009/03/04 13:54:10 avg Exp $ */ /* udf_vnops.c */ @@ -738,7 +738,7 @@ * Update the offset. Align on a 4 byte boundary because the * UDF spec says so. */ - ds->this_off = ds->off; + ds->this_off = ds->offset + ds->off; if (!ds->fid_fragment) { ds->off += (total_fid_size + 3) & ~0x03; } else { @@ -1018,10 +1018,6 @@ node = VTON(vp); if (bp->b_blkno == bp->b_lblkno) { - /* - * Files that are embedded in the fentry don't translate well - * to a block number. Reject. - */ offset = lblktosize(node->udfmp, bp->b_lblkno); error = udf_bmap_internal(node, offset, §or, &maxsize); if (error) { ==== //depot/projects/usb/src/sys/i386/linux/linux.h#10 (text+ko) ==== @@ -25,7 +25,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/i386/linux/linux.h,v 1.83 2008/11/29 17:14:06 kib Exp $ + * $FreeBSD: src/sys/i386/linux/linux.h,v 1.84 2009/03/04 12:14:33 dchagin Exp $ */ #ifndef _I386_LINUX_H_ @@ -102,6 +102,10 @@ #define LINUX_CTL_MAXNAME 10 +#define LINUX_AT_COUNT 16 /* Count of used aux entry types. + * Keep this synchronized with + * elf_linux_fixup() code. + */ struct l___sysctl_args { l_int *name; ==== //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#10 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.158 2008/12/17 06:11:42 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.159 2009/03/04 12:14:33 dchagin Exp $"); #include #include @@ -58,6 +58,7 @@ #include #include +#include #include #include @@ -65,6 +66,7 @@ #include #include #include +#include #include #include @@ -107,7 +109,11 @@ static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); static void exec_linux_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); +static register_t *linux_copyout_strings(struct image_params *imgp); +static int linux_szplatform; +const char *linux_platform; + extern LIST_HEAD(futex_list, futex) futex_list; extern struct sx futex_sx; @@ -231,22 +237,30 @@ **stack_base = (intptr_t)(void *)argv; (*stack_base)--; **stack_base = imgp->args->argc; - return 0; + return (0); } static int elf_linux_fixup(register_t **stack_base, struct image_params *imgp) { + struct proc *p; Elf32_Auxargs *args; + Elf32_Addr *uplatform; + struct ps_strings *arginfo; register_t *pos; KASSERT(curthread->td_proc == imgp->proc, ("unsafe elf_linux_fixup(), should be curproc")); + + p = imgp->proc; + arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings; + uplatform = (Elf32_Addr *)((caddr_t)arginfo - linux_szsigcode - + linux_szplatform); args = (Elf32_Auxargs *)imgp->auxargs; pos = *stack_base + (imgp->args->argc + imgp->args->envc + 2); - if (args->execfd != -1) - AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd); + AUXARGS_ENTRY(pos, LINUX_AT_HWCAP, cpu_feature); + AUXARGS_ENTRY(pos, LINUX_AT_CLKTCK, hz); AUXARGS_ENTRY(pos, AT_PHDR, args->phdr); AUXARGS_ENTRY(pos, AT_PHENT, args->phent); AUXARGS_ENTRY(pos, AT_PHNUM, args->phnum); @@ -254,10 +268,14 @@ AUXARGS_ENTRY(pos, AT_FLAGS, args->flags); AUXARGS_ENTRY(pos, AT_ENTRY, args->entry); AUXARGS_ENTRY(pos, AT_BASE, args->base); + AUXARGS_ENTRY(pos, LINUX_AT_SECURE, 0); AUXARGS_ENTRY(pos, AT_UID, imgp->proc->p_ucred->cr_ruid); AUXARGS_ENTRY(pos, AT_EUID, imgp->proc->p_ucred->cr_svuid); AUXARGS_ENTRY(pos, AT_GID, imgp->proc->p_ucred->cr_rgid); AUXARGS_ENTRY(pos, AT_EGID, imgp->proc->p_ucred->cr_svgid); + AUXARGS_ENTRY(pos, LINUX_AT_PLATFORM, PTROUT(uplatform)); + if (args->execfd != -1) + AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd); AUXARGS_ENTRY(pos, AT_NULL, 0); free(imgp->auxargs, M_TEMP); @@ -265,9 +283,125 @@ (*stack_base)--; **stack_base = (register_t)imgp->args->argc; - return 0; + return (0); +} + +/* + * Copied from kern/kern_exec.c + */ +static register_t * +linux_copyout_strings(struct image_params *imgp) +{ + int argc, envc; + char **vectp; + char *stringp, *destp; + register_t *stack_base; + struct ps_strings *arginfo; + struct proc *p; + + /* + * Calculate string base and vector table pointers. + * Also deal with signal trampoline code for this exec type. + */ + p = imgp->proc; + arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings; + destp = (caddr_t)arginfo - linux_szsigcode - SPARE_USRSPACE - + linux_szplatform - roundup((ARG_MAX - imgp->args->stringspace), + sizeof(char *)); + + /* + * install sigcode + */ + copyout(p->p_sysent->sv_sigcode, ((caddr_t)arginfo - + linux_szsigcode), linux_szsigcode); + + /* + * install LINUX_PLATFORM + */ + copyout(linux_platform, ((caddr_t)arginfo - linux_szsigcode - + linux_szplatform), linux_szplatform); + + /* + * If we have a valid auxargs ptr, prepare some room + * on the stack. + */ + if (imgp->auxargs) { + /* + * 'AT_COUNT*2' is size for the ELF Auxargs data. This is for + * lower compatibility. + */ + imgp->auxarg_size = (imgp->auxarg_size) ? imgp->auxarg_size : + (LINUX_AT_COUNT * 2); + /* + * The '+ 2' is for the null pointers at the end of each of + * the arg and env vector sets,and imgp->auxarg_size is room + * for argument of Runtime loader. + */ + vectp = (char **)(destp - (imgp->args->argc + + imgp->args->envc + 2 + imgp->auxarg_size) * sizeof(char *)); + } else { + /* + * The '+ 2' is for the null pointers at the end of each of + * the arg and env vector sets + */ + vectp = (char **)(destp - (imgp->args->argc + imgp->args->envc + 2) * + sizeof(char *)); + } + + /* + * vectp also becomes our initial stack base + */ + stack_base = (register_t *)vectp; + + stringp = imgp->args->begin_argv; + argc = imgp->args->argc; + envc = imgp->args->envc; + + /* + * Copy out strings - arguments and environment. + */ + copyout(stringp, destp, ARG_MAX - imgp->args->stringspace); + + /* + * Fill in "ps_strings" struct for ps, w, etc. + */ + suword(&arginfo->ps_argvstr, (long)(intptr_t)vectp); + suword(&arginfo->ps_nargvstr, argc); + + /* + * Fill in argument portion of vector table. + */ + for (; argc > 0; --argc) { + suword(vectp++, (long)(intptr_t)destp); + while (*stringp++ != 0) + destp++; + destp++; + } + + /* a null vector table pointer separates the argp's from the envp's */ + suword(vectp++, 0); + + suword(&arginfo->ps_envstr, (long)(intptr_t)vectp); + suword(&arginfo->ps_nenvstr, envc); + + /* + * Fill in environment portion of vector table. + */ + for (; envc > 0; --envc) { + suword(vectp++, (long)(intptr_t)destp); + while (*stringp++ != 0) + destp++; + destp++; + } + + /* end of vector table is a null pointer */ + suword(vectp, 0); + + return (stack_base); } + + extern int _ucodesel, _udatasel; extern unsigned long linux_sznonrtsigcode; @@ -808,6 +942,25 @@ fldcw(&control); } +static void +linux_get_machine(const char **dst) +{ + + switch (cpu_class) { + case CPUCLASS_686: + *dst = "i686"; + break; + case CPUCLASS_586: + *dst = "i586"; + break; + case CPUCLASS_486: + *dst = "i486"; + break; + default: + *dst = "i386"; + } +} + struct sysentvec linux_sysvec = { .sv_size = LINUX_SYS_MAXSYSCALL, .sv_table = linux_sysent, @@ -863,7 +1016,7 @@ .sv_usrstack = USRSTACK, .sv_psstrings = PS_STRINGS, .sv_stackprot = VM_PROT_ALL, - .sv_copyout_strings = exec_copyout_strings, + .sv_copyout_strings = linux_copyout_strings, .sv_setregs = exec_linux_setregs, .sv_fixlimit = NULL, .sv_maxssiz = NULL, @@ -929,6 +1082,9 @@ NULL, 1000); linux_exec_tag = EVENTHANDLER_REGISTER(process_exec, linux_proc_exec, NULL, 1000); + linux_get_machine(&linux_platform); + linux_szplatform = roundup(strlen(linux_platform) + 1, + sizeof(char *)); if (bootverbose) printf("Linux ELF exec handler installed\n"); } else ==== //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#10 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Mar 5 15:18:56 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 801151065674; Thu, 5 Mar 2009 15:18: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 20B4C1065670 for ; Thu, 5 Mar 2009 15:18:56 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0CF848FC12 for ; Thu, 5 Mar 2009 15:18:56 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n25FIuPD019680 for ; Thu, 5 Mar 2009 15:18:56 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n25FIt0a019678 for perforce@freebsd.org; Thu, 5 Mar 2009 15:18:55 GMT (envelope-from jhb@freebsd.org) Date: Thu, 5 Mar 2009 15:18:55 GMT Message-Id: <200903051518.n25FIt0a019678@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 158716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2009 15:18:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=158716 Change 158716 by jhb@jhb_jhbbsd on 2009/03/05 15:18:29 Take a first stab at making x86 bus drivers probe early along with system resource-type devices. This removes some kludges such as the explicit ordering of device attach using device orders for x86 nexus. It also mostly removes the need for acpi_probe_order(). Affected files ... .. //depot/projects/multipass/notes#6 edit .. //depot/projects/multipass/sys/amd64/acpica/acpi_machdep.c#2 edit .. //depot/projects/multipass/sys/amd64/amd64/io_apic.c#2 edit .. //depot/projects/multipass/sys/amd64/amd64/legacy.c#2 edit .. //depot/projects/multipass/sys/amd64/amd64/mptable_pci.c#2 edit .. //depot/projects/multipass/sys/amd64/amd64/nexus.c#2 edit .. //depot/projects/multipass/sys/amd64/pci/pci_bus.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi_cpu.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi_ec.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi_hpet.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi_isab.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi_pci.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi_pci_link.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi_pcib_acpi.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi_pcib_pci.c#2 edit .. //depot/projects/multipass/sys/dev/acpica/acpi_resource.c#2 edit .. //depot/projects/multipass/sys/dev/pci/eisa_pci.c#2 edit .. //depot/projects/multipass/sys/dev/pci/hostb_pci.c#2 edit .. //depot/projects/multipass/sys/dev/pci/isa_pci.c#2 edit .. //depot/projects/multipass/sys/dev/pci/pci.c#2 edit .. //depot/projects/multipass/sys/dev/pci/pci_pci.c#2 edit .. //depot/projects/multipass/sys/dev/pci/vga_pci.c#2 edit .. //depot/projects/multipass/sys/i386/acpica/acpi_machdep.c#2 edit .. //depot/projects/multipass/sys/i386/bios/smapi.c#2 edit .. //depot/projects/multipass/sys/i386/bios/smbios.c#2 edit .. //depot/projects/multipass/sys/i386/bios/vpd.c#2 edit .. //depot/projects/multipass/sys/i386/i386/io_apic.c#2 edit .. //depot/projects/multipass/sys/i386/i386/legacy.c#2 edit .. //depot/projects/multipass/sys/i386/i386/mptable_pci.c#2 edit .. //depot/projects/multipass/sys/i386/i386/nexus.c#2 edit .. //depot/projects/multipass/sys/i386/pci/pci_bus.c#2 edit .. //depot/projects/multipass/sys/i386/pci/pci_pir.c#2 edit .. //depot/projects/multipass/sys/isa/orm.c#2 edit .. //depot/projects/multipass/sys/isa/pnp.c#2 edit Differences ... ==== //depot/projects/multipass/notes#6 (text+ko) ==== @@ -46,18 +46,19 @@ Simple Cases of Early Drivers ----------------------------- -- Change nexus0 to be an early driver -- Change acpi0 to be an early driver (BUS_PASS_BUSSES) - - cpu drivers should become BUS_PASS_CPUS (but not cpufreq drivers) - - system resource (apic0, ram0, acpi_sysres0) should become BUS_PASS_RESOURCE - - pci_link should become BUS_PASS_INTERRUPT_CONTROLLERS ++ Change nexus0 to be an early driver ++ Change acpi0 to be an early driver (BUS_PASS_BUSSES) + + cpu drivers should become BUS_PASS_CPUS (but not cpufreq drivers) + + system resource (apic0, ram0, acpi_sysres0) should become BUS_PASS_RESOURCE + + pci_link should become BUS_PASS_INTERRUPT - embedded controller? -- Change pci to be an early driver (BUS_PASS_BUSSES) - - pci_pci should be BUS_PASS_BUSSES as well - - isab should be BUS_PASS_BUSSES ++ Change pci to be an early driver (BUS_PASS_BUSSES) + + pci_pci should be BUS_PASS_BUSSES as well + + isab should be BUS_PASS_BUSSES - isa0 should be BUS_PASS_BUSSES (this is harder) - have to decide when to enumerate hinted children -- legacy0 ++ legacy0 + + cpu Guidelines for Writing an Early Driver: --------------------------------------- ==== //depot/projects/multipass/sys/amd64/acpica/acpi_machdep.c#2 (text+ko) ==== @@ -93,7 +93,7 @@ nexus_init_resources(); bus_generic_probe(dev); - if (BUS_ADD_CHILD(dev, 10, "acpi", 0) == NULL) + if (BUS_ADD_CHILD(dev, 0, "acpi", 0) == NULL) panic("failed to add acpi0 device"); return (bus_generic_attach(dev)); @@ -110,4 +110,5 @@ DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver); static devclass_t nexus_devclass; -DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0); +EARLY_DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0, + BUS_PASS_BUS); ==== //depot/projects/multipass/sys/amd64/amd64/io_apic.c#2 (text+ko) ==== @@ -807,12 +807,8 @@ apic_identify(driver_t *driver, device_t parent) { - /* - * Add at order 12. acpi0 is probed at order 10 and legacy0 - * is probed at order 11. - */ if (lapic_paddr != 0) - BUS_ADD_CHILD(parent, 12, "apic", 0); + BUS_ADD_CHILD(parent, 0, "apic", 0); } static int @@ -864,4 +860,5 @@ DEFINE_CLASS_0(apic, apic_driver, apic_methods, 0); static devclass_t apic_devclass; -DRIVER_MODULE(apic, nexus, apic_driver, apic_devclass, 0, 0); +EARLY_DRIVER_MODULE(apic, nexus, apic_driver, apic_devclass, 0, 0, + BUS_PASS_RESOURCE); ==== //depot/projects/multipass/sys/amd64/amd64/legacy.c#2 (text+ko) ==== @@ -96,7 +96,8 @@ }; static devclass_t legacy_devclass; -DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0); +EARLY_DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0, + BUS_PASS_BUS); static int legacy_probe(device_t dev) @@ -256,7 +257,7 @@ 1, /* no softc */ }; static devclass_t cpu_devclass; -DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0); +EARLY_DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0, BUS_PASS_CPU); static void cpu_identify(driver_t *driver, device_t parent) @@ -264,14 +265,9 @@ device_t child; int i; - /* - * Attach a cpuX device for each CPU. We use an order of 150 - * so that these devices are attached after the Host-PCI - * bridges (which are added at order 100). - */ for (i = 0; i <= mp_maxid; i++) if (!CPU_ABSENT(i)) { - child = BUS_ADD_CHILD(parent, 150, "cpu", i); + child = BUS_ADD_CHILD(parent, 0, "cpu", i); if (child == NULL) panic("legacy_attach cpu"); } ==== //depot/projects/multipass/sys/amd64/amd64/mptable_pci.c#2 (text+ko) ==== @@ -139,7 +139,8 @@ static devclass_t hostb_devclass; DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1); -DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0); +EARLY_DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, + 0, 0, BUS_PASS_BUS); /* PCI to PCI bridge driver. */ @@ -197,4 +198,5 @@ DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods, sizeof(struct pcib_softc)); -DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0); +EARLY_DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0, + BUS_PASS_BUS); ==== //depot/projects/multipass/sys/amd64/amd64/nexus.c#2 (text+ko) ==== @@ -153,7 +153,8 @@ DEFINE_CLASS_0(nexus, nexus_driver, nexus_methods, 1); static devclass_t nexus_devclass; -DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0); +EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0, + BUS_PASS_BUS); static int nexus_probe(device_t dev) @@ -251,7 +252,7 @@ * types (such as ACPI), use their own nexus(4) subclass * driver to override this routine and add their own root bus. */ - if (BUS_ADD_CHILD(dev, 10, "legacy", 0) == NULL) + if (BUS_ADD_CHILD(dev, 0, "legacy", 0) == NULL) panic("legacy: could not attach"); bus_generic_attach(dev); return 0; @@ -639,7 +640,8 @@ static devclass_t ram_devclass; -DRIVER_MODULE(ram, nexus, ram_driver, ram_devclass, 0, 0); +EARLY_DRIVER_MODULE(ram, nexus, ram_driver, ram_devclass, 0, 0, + BUS_PASS_RESOURCE); #ifdef DEV_ISA /* @@ -688,5 +690,6 @@ static devclass_t sysresource_devclass; -DRIVER_MODULE(sysresource, isa, sysresource_driver, sysresource_devclass, 0, 0); +EARLY_DRIVER_MODULE(sysresource, isa, sysresource_driver, sysresource_devclass, + 0, 0, BUS_PASS_RESOURCE - 1); #endif /* DEV_ISA */ ==== //depot/projects/multipass/sys/amd64/pci/pci_bus.c#2 (text+ko) ==== @@ -216,12 +216,7 @@ if (s == NULL) continue; - /* - * Add at priority 100 to make sure we - * go after any motherboard resources - */ - child = BUS_ADD_CHILD(parent, 100, - "pcib", busnum); + child = BUS_ADD_CHILD(parent, 0, "pcib", busnum); device_set_desc(child, s); legacy_set_pcibus(child, busnum); @@ -246,7 +241,7 @@ if (bootverbose) printf( "legacy_pcib_identify: no bridge found, adding pcib0 anyway\n"); - child = BUS_ADD_CHILD(parent, 100, "pcib", 0); + child = BUS_ADD_CHILD(parent, 0, "pcib", 0); legacy_set_pcibus(child, 0); } } @@ -371,7 +366,8 @@ static devclass_t hostb_devclass; DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1); -DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0); +EARLY_DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0, + BUS_PASS_BUS); /* ==== //depot/projects/multipass/sys/dev/acpica/acpi.c#2 (text+ko) ==== @@ -213,7 +213,8 @@ }; static devclass_t acpi_devclass; -DRIVER_MODULE(acpi, nexus, acpi_driver, acpi_devclass, acpi_modevent, 0); +EARLY_DRIVER_MODULE(acpi, nexus, acpi_driver, acpi_devclass, acpi_modevent, 0, + BUS_PASS_BUS); MODULE_VERSION(acpi, 1); ACPI_SERIAL_DECL(acpi, "ACPI root bus"); @@ -1662,23 +1663,12 @@ static void acpi_probe_order(ACPI_HANDLE handle, int *order) { - ACPI_OBJECT_TYPE type; /* - * 1. I/O port and memory system resource holders * 2. Embedded controllers (to handle early accesses) - * 3. PCI Link Devices - * 100000. CPUs */ - AcpiGetType(handle, &type); - if (acpi_MatchHid(handle, "PNP0C01") || acpi_MatchHid(handle, "PNP0C02")) - *order = 1; - else if (acpi_MatchHid(handle, "PNP0C09")) + if (acpi_MatchHid(handle, "PNP0C09")) *order = 2; - else if (acpi_MatchHid(handle, "PNP0C0F")) - *order = 3; - else if (type == ACPI_TYPE_PROCESSOR) - *order = 100000; } /* ==== //depot/projects/multipass/sys/dev/acpica/acpi_cpu.c#2 (text+ko) ==== @@ -199,7 +199,8 @@ }; static devclass_t acpi_cpu_devclass; -DRIVER_MODULE(cpu, acpi, acpi_cpu_driver, acpi_cpu_devclass, 0, 0); +EARLY_DRIVER_MODULE(cpu, acpi, acpi_cpu_driver, acpi_cpu_devclass, 0, 0, + BUS_PASS_CPU); MODULE_DEPEND(cpu, acpi, 1, 1, 1); static int ==== //depot/projects/multipass/sys/dev/acpica/acpi_ec.c#2 (text+ko) ==== @@ -265,7 +265,8 @@ }; static devclass_t acpi_ec_devclass; -DRIVER_MODULE(acpi_ec, acpi, acpi_ec_driver, acpi_ec_devclass, 0, 0); +EARLY_DRIVER_MODULE(acpi_ec, acpi, acpi_ec_driver, acpi_ec_devclass, 0, 0, + BUS_PASS_SCHEDULER); MODULE_DEPEND(acpi_ec, acpi, 1, 1, 1); /* ==== //depot/projects/multipass/sys/dev/acpica/acpi_hpet.c#2 (text+ko) ==== @@ -122,7 +122,7 @@ if (hpet->Sequence != 0) printf("ACPI HPET table warning: Sequence is non-zero (%d)\n", hpet->Sequence); - child = BUS_ADD_CHILD(parent, ACPI_DEV_BASE_ORDER, "acpi_hpet", 0); + child = BUS_ADD_CHILD(parent, 0, "acpi_hpet", 0); if (child == NULL) { printf("%s: can't add child\n", __func__); return; @@ -310,5 +310,6 @@ }; -DRIVER_MODULE(acpi_hpet, acpi, acpi_hpet_driver, acpi_hpet_devclass, 0, 0); +EARLY_DRIVER_MODULE(acpi_hpet, acpi, acpi_hpet_driver, acpi_hpet_devclass, 0, 0, + BUS_PASS_TIMER); MODULE_DEPEND(acpi_hpet, acpi, 1, 1, 1); ==== //depot/projects/multipass/sys/dev/acpica/acpi_isab.c#2 (text+ko) ==== @@ -84,7 +84,8 @@ sizeof(struct acpi_isab_softc), }; -DRIVER_MODULE(acpi_isab, acpi, acpi_isab_driver, isab_devclass, 0, 0); +EARLY_DRIVER_MODULE(acpi_isab, acpi, acpi_isab_driver, isab_devclass, 0, 0, + BUS_PASS_BUS); MODULE_DEPEND(acpi_isab, acpi, 1, 1, 1); static int ==== //depot/projects/multipass/sys/dev/acpica/acpi_pci.c#2 (text+ko) ==== @@ -98,7 +98,8 @@ static devclass_t pci_devclass; DEFINE_CLASS_1(pci, acpi_pci_driver, acpi_pci_methods, 0, pci_driver); -DRIVER_MODULE(acpi_pci, pcib, acpi_pci_driver, pci_devclass, 0, 0); +EARLY_DRIVER_MODULE(acpi_pci, pcib, acpi_pci_driver, pci_devclass, 0, 0, + BUS_PASS_BUS); MODULE_DEPEND(acpi_pci, acpi, 1, 1, 1); MODULE_DEPEND(acpi_pci, pci, 1, 1, 1); MODULE_VERSION(acpi_pci, 1); ==== //depot/projects/multipass/sys/dev/acpica/acpi_pci_link.c#2 (text+ko) ==== @@ -1117,6 +1117,6 @@ static devclass_t pci_link_devclass; -DRIVER_MODULE(acpi_pci_link, acpi, acpi_pci_link_driver, pci_link_devclass, 0, - 0); +EARLY_DRIVER_MODULE(acpi_pci_link, acpi, acpi_pci_link_driver, + pci_link_devclass, 0, 0, BUS_PASS_INTERRUPT); MODULE_DEPEND(acpi_pci_link, acpi, 1, 1, 1); ==== //depot/projects/multipass/sys/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ==== @@ -122,7 +122,8 @@ DEFINE_CLASS_0(pcib, acpi_pcib_acpi_driver, acpi_pcib_acpi_methods, sizeof(struct acpi_hpcib_softc)); -DRIVER_MODULE(acpi_pcib, acpi, acpi_pcib_acpi_driver, pcib_devclass, 0, 0); +EARLY_DRIVER_MODULE(acpi_pcib, acpi, acpi_pcib_acpi_driver, pcib_devclass, 0, 0, + BUS_PASS_BUS); MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1); static int ==== //depot/projects/multipass/sys/dev/acpica/acpi_pcib_pci.c#2 (text+ko) ==== @@ -106,7 +106,8 @@ DEFINE_CLASS_0(pcib, acpi_pcib_pci_driver, acpi_pcib_pci_methods, sizeof(struct acpi_pcib_softc)); -DRIVER_MODULE(acpi_pcib, pci, acpi_pcib_pci_driver, pcib_devclass, 0, 0); +EARLY_DRIVER_MODULE(acpi_pcib, pci, acpi_pcib_pci_driver, pcib_devclass, 0, 0, + BUS_PASS_BUS); MODULE_DEPEND(acpi_pcib, acpi, 1, 1, 1); static int ==== //depot/projects/multipass/sys/dev/acpica/acpi_resource.c#2 (text+ko) ==== @@ -673,8 +673,8 @@ }; static devclass_t acpi_sysres_devclass; -DRIVER_MODULE(acpi_sysresource, acpi, acpi_sysres_driver, acpi_sysres_devclass, - 0, 0); +EARLY_DRIVER_MODULE(acpi_sysresource, acpi, acpi_sysres_driver, + acpi_sysres_devclass, 0, 0, BUS_PASS_RESOURCE - 1); MODULE_DEPEND(acpi_sysresource, acpi, 1, 1, 1); static int ==== //depot/projects/multipass/sys/dev/pci/eisa_pci.c#2 (text+ko) ==== @@ -74,7 +74,8 @@ static devclass_t eisab_devclass; -DRIVER_MODULE(eisab, pci, eisab_driver, eisab_devclass, 0, 0); +EARLY_DRIVER_MODULE(eisab, pci, eisab_driver, eisab_devclass, 0, 0, + BUS_PASS_BUS); static int eisab_probe(device_t dev) ==== //depot/projects/multipass/sys/dev/pci/hostb_pci.c#2 (text+ko) ==== @@ -246,4 +246,5 @@ static devclass_t pci_hostb_devclass; -DRIVER_MODULE(hostb, pci, pci_hostb_driver, pci_hostb_devclass, 0, 0); +EARLY_DRIVER_MODULE(hostb, pci, pci_hostb_driver, pci_hostb_devclass, 0, 0, + BUS_PASS_BUS); ==== //depot/projects/multipass/sys/dev/pci/isa_pci.c#2 (text+ko) ==== @@ -74,7 +74,7 @@ 0, }; -DRIVER_MODULE(isab, pci, isab_driver, isab_devclass, 0, 0); +EARLY_DRIVER_MODULE(isab, pci, isab_driver, isab_devclass, 0, 0, BUS_PASS_BUS); /* * XXX we need to add a quirk list here for bridges that don't correctly ==== //depot/projects/multipass/sys/dev/pci/pci.c#2 (text+ko) ==== @@ -167,7 +167,8 @@ DEFINE_CLASS_0(pci, pci_driver, pci_methods, 0); static devclass_t pci_devclass; -DRIVER_MODULE(pci, pcib, pci_driver, pci_devclass, pci_modevent, 0); +EARLY_DRIVER_MODULE(pci, pcib, pci_driver, pci_devclass, pci_modevent, 0, + BUS_PASS_BUS); MODULE_VERSION(pci, 1); static char *pci_vendordata; ==== //depot/projects/multipass/sys/dev/pci/pci_pci.c#2 (text+ko) ==== @@ -91,7 +91,7 @@ static devclass_t pcib_devclass; DEFINE_CLASS_0(pcib, pcib_driver, pcib_methods, sizeof(struct pcib_softc)); -DRIVER_MODULE(pcib, pci, pcib_driver, pcib_devclass, 0, 0); +EARLY_DRIVER_MODULE(pcib, pci, pcib_driver, pcib_devclass, 0, 0, BUS_PASS_BUS); /* * Is the prefetch window open (eg, can we allocate memory in it?) ==== //depot/projects/multipass/sys/dev/pci/vga_pci.c#2 (text+ko) ==== @@ -366,4 +366,5 @@ static devclass_t vga_devclass; -DRIVER_MODULE(vgapci, pci, vga_pci_driver, vga_devclass, 0, 0); +EARLY_DRIVER_MODULE(vgapci, pci, vga_pci_driver, vga_devclass, 0, 0, + BUS_PASS_BUS); ==== //depot/projects/multipass/sys/i386/acpica/acpi_machdep.c#2 (text+ko) ==== @@ -574,7 +574,7 @@ nexus_init_resources(); bus_generic_probe(dev); - if (BUS_ADD_CHILD(dev, 10, "acpi", 0) == NULL) + if (BUS_ADD_CHILD(dev, 0, "acpi", 0) == NULL) panic("failed to add acpi0 device"); return (bus_generic_attach(dev)); @@ -591,4 +591,5 @@ DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver); static devclass_t nexus_devclass; -DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0); +EARLY_DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0, + BUS_PASS_BUS); ==== //depot/projects/multipass/sys/i386/bios/smapi.c#2 (text+ko) ==== @@ -166,7 +166,7 @@ rid = 0; length = ADDR2HDR(addr)->length; - child = BUS_ADD_CHILD(parent, 5, "smapi", -1); + child = BUS_ADD_CHILD(parent, 0, "smapi", -1); device_set_driver(child, driver); bus_set_resource(child, SYS_RES_MEMORY, rid, addr, length); device_set_desc(child, "SMAPI BIOS"); ==== //depot/projects/multipass/sys/i386/bios/smbios.c#2 (text+ko) ==== @@ -131,7 +131,7 @@ return; } - child = BUS_ADD_CHILD(parent, 5, "smbios", -1); + child = BUS_ADD_CHILD(parent, 0, "smbios", -1); device_set_driver(child, driver); bus_set_resource(child, SYS_RES_MEMORY, rid, addr, length); device_set_desc(child, "System Management BIOS"); ==== //depot/projects/multipass/sys/i386/bios/vpd.c#2 (text+ko) ==== @@ -128,7 +128,7 @@ rid = 0; length = ADDR2VPD(addr)->Length; - child = BUS_ADD_CHILD(parent, 5, "vpd", -1); + child = BUS_ADD_CHILD(parent, 0, "vpd", -1); device_set_driver(child, driver); bus_set_resource(child, SYS_RES_MEMORY, rid, addr, length); device_set_desc(child, "Vital Product Data Area"); ==== //depot/projects/multipass/sys/i386/i386/io_apic.c#2 (text+ko) ==== @@ -807,12 +807,8 @@ apic_identify(driver_t *driver, device_t parent) { - /* - * Add at order 12. acpi0 is probed at order 10 and legacy0 - * is probed at order 11. - */ if (lapic_paddr != 0) - BUS_ADD_CHILD(parent, 12, "apic", 0); + BUS_ADD_CHILD(parent, 0, "apic", 0); } static int @@ -872,4 +868,5 @@ DEFINE_CLASS_0(apic, apic_driver, apic_methods, 0); static devclass_t apic_devclass; -DRIVER_MODULE(apic, nexus, apic_driver, apic_devclass, 0, 0); +DRIVER_MODULE(apic, nexus, apic_driver, apic_devclass, 0, 0, + BUS_PASS_RESOURCE); ==== //depot/projects/multipass/sys/i386/i386/legacy.c#2 (text+ko) ==== @@ -101,7 +101,8 @@ }; static devclass_t legacy_devclass; -DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0); +EARLY_DRIVER_MODULE(legacy, nexus, legacy_driver, legacy_devclass, 0, 0, + BUS_PASS_BUS); static int legacy_probe(device_t dev) @@ -277,7 +278,7 @@ 1, /* no softc */ }; static devclass_t cpu_devclass; -DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0); +EARLY_DRIVER_MODULE(cpu, legacy, cpu_driver, cpu_devclass, 0, 0, BUS_PASS_CPU); static void cpu_identify(driver_t *driver, device_t parent) @@ -285,14 +286,9 @@ device_t child; int i; - /* - * Attach a cpuX device for each CPU. We use an order of 150 - * so that these devices are attached after the Host-PCI - * bridges (which are added at order 100). - */ for (i = 0; i <= mp_maxid; i++) if (!CPU_ABSENT(i)) { - child = BUS_ADD_CHILD(parent, 150, "cpu", i); + child = BUS_ADD_CHILD(parent, 0, "cpu", i); if (child == NULL) panic("legacy_attach cpu"); } ==== //depot/projects/multipass/sys/i386/i386/mptable_pci.c#2 (text+ko) ==== @@ -139,7 +139,8 @@ static devclass_t hostb_devclass; DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1); -DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0); +EARLY_DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, + 0, 0, BUS_PASS_BUS); /* PCI to PCI bridge driver. */ ==== //depot/projects/multipass/sys/i386/i386/nexus.c#2 (text+ko) ==== @@ -161,7 +161,8 @@ DEFINE_CLASS_0(nexus, nexus_driver, nexus_methods, 1); static devclass_t nexus_devclass; -DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0); +EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0, + BUS_PASS_BUS); static int nexus_probe(device_t dev) @@ -263,7 +264,7 @@ * types (such as ACPI), use their own nexus(4) subclass * driver to override this routine and add their own root bus. */ - if (BUS_ADD_CHILD(dev, 10, "legacy", 0) == NULL) + if (BUS_ADD_CHILD(dev, 0, "legacy", 0) == NULL) panic("legacy: could not attach"); bus_generic_attach(dev); return 0; @@ -693,7 +694,8 @@ static devclass_t ram_devclass; -DRIVER_MODULE(ram, nexus, ram_driver, ram_devclass, 0, 0); +EARLY_DRIVER_MODULE(ram, nexus, ram_driver, ram_devclass, 0, 0, + BUS_PASS_RESOURCE); #ifdef DEV_ISA /* @@ -742,5 +744,6 @@ static devclass_t sysresource_devclass; -DRIVER_MODULE(sysresource, isa, sysresource_driver, sysresource_devclass, 0, 0); +EARLY_DRIVER_MODULE(sysresource, isa, sysresource_driver, sysresource_devclass, + 0, 0, BUS_PASS_RESOURCE - 1); #endif /* DEV_ISA */ ==== //depot/projects/multipass/sys/i386/pci/pci_bus.c#2 (text+ko) ==== @@ -418,12 +418,7 @@ if (s == NULL) continue; - /* - * Add at priority 100 to make sure we - * go after any motherboard resources - */ - child = BUS_ADD_CHILD(parent, 100, - "pcib", busnum); + child = BUS_ADD_CHILD(parent, 0, "pcib", busnum); device_set_desc(child, s); legacy_set_pcibus(child, busnum); @@ -448,7 +443,7 @@ if (bootverbose) printf( "legacy_pcib_identify: no bridge found, adding pcib0 anyway\n"); - child = BUS_ADD_CHILD(parent, 100, "pcib", 0); + child = BUS_ADD_CHILD(parent, 0, "pcib", 0); legacy_set_pcibus(child, 0); } } @@ -583,7 +578,8 @@ static devclass_t hostb_devclass; DEFINE_CLASS_0(pcib, legacy_pcib_driver, legacy_pcib_methods, 1); -DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0); +EARLY_DRIVER_MODULE(pcib, legacy, legacy_pcib_driver, hostb_devclass, 0, 0, + BUS_PASS_BUS); /* @@ -678,7 +674,8 @@ DEFINE_CLASS_0(pcib, pcibios_pcib_driver, pcibios_pcib_pci_methods, sizeof(struct pcib_softc)); -DRIVER_MODULE(pcibios_pcib, pci, pcibios_pcib_driver, pcib_devclass, 0, 0); +EARLY_DRIVER_MODULE(pcibios_pcib, pci, pcibios_pcib_driver, pcib_devclass, 0, 0, + BUS_PASS_BUS); static int pcibios_pcib_probe(device_t dev) ==== //depot/projects/multipass/sys/i386/pci/pci_pir.c#2 (text+ko) ==== @@ -752,4 +752,10 @@ static devclass_t pir_devclass; -DRIVER_MODULE(pir, legacy, pir_driver, pir_devclass, 0, 0); +/* + * XXX: This has to be BUS_PASS_BUS for now. It should really be + * BUS_PASS_INTERRUPT, but we can't do that until we rework PCI to + * not route interrupts until after BUS_PASS_INTERRUPT. + */ +EARLY_DRIVER_MODULE(pir, legacy, pir_driver, pir_devclass, 0, 0, + BUS_PASS_BUS); ==== //depot/projects/multipass/sys/isa/orm.c#2 (text+ko) ==== @@ -182,4 +182,5 @@ static devclass_t orm_devclass; -DRIVER_MODULE(orm, isa, orm_driver, orm_devclass, 0, 0); +EARLY_DRIVER_MODULE(orm, isa, orm_driver, orm_devclass, 0, 0, + BUS_PASS_RESOURCE); ==== //depot/projects/multipass/sys/isa/pnp.c#2 (text+ko) ==== @@ -824,4 +824,4 @@ static devclass_t pnp_devclass; -DRIVER_MODULE(pnp, isa, pnp_driver, pnp_devclass, 0, 0); +EARLY_DRIVER_MODULE(pnp, isa, pnp_driver, pnp_devclass, 0, 0, BUS_PASS_BUS); From owner-p4-projects@FreeBSD.ORG Thu Mar 5 15:19:58 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA91E1065678; Thu, 5 Mar 2009 15:19: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 636DE1065674 for ; Thu, 5 Mar 2009 15:19:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 38E898FC16 for ; Thu, 5 Mar 2009 15:19:57 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n25FJv0m019747 for ; Thu, 5 Mar 2009 15:19:57 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n25FJve9019745 for perforce@freebsd.org; Thu, 5 Mar 2009 15:19:57 GMT (envelope-from jhb@freebsd.org) Date: Thu, 5 Mar 2009 15:19:57 GMT Message-Id: <200903051519.n25FJve9019745@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 158717 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2009 15:19:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=158717 Change 158717 by jhb@jhb_jhbbsd on 2009/03/05 15:19:38 ia64 will need to probe its nexus early as well so acpi will DTRT since acpi_probe_order() is mostly gone. Affected files ... .. //depot/projects/multipass/sys/ia64/ia64/nexus.c#2 edit Differences ... ==== //depot/projects/multipass/sys/ia64/ia64/nexus.c#2 (text+ko) ==== @@ -151,7 +151,8 @@ }; static devclass_t nexus_devclass; -DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0); +EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0, + BUS_PASS_BUS); static int nexus_probe(device_t dev) From owner-p4-projects@FreeBSD.ORG Thu Mar 5 15:46:49 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F043E10656FC; Thu, 5 Mar 2009 15:46: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 4996510656E1 for ; Thu, 5 Mar 2009 15:46:46 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 320208FC9F for ; Thu, 5 Mar 2009 15:46:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n25FkRXC021905 for ; Thu, 5 Mar 2009 15:46:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n25FkRDf021903 for perforce@freebsd.org; Thu, 5 Mar 2009 15:46:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 5 Mar 2009 15:46:27 GMT Message-Id: <200903051546.n25FkRDf021903@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 158721 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2009 15:46:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=158721 Change 158721 by hselasky@hselasky_laptop001 on 2009/03/05 15:46:16 USB serial: Patch for Nokia phones PR: usb/117185 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#3 (text+ko) ==== @@ -69,6 +69,7 @@ /* * Comm Class spec: http://www.usb.org/developers/devclass_docs/usbccs10.pdf * http://www.usb.org/developers/devclass_docs/usbcdc11.pdf + * http://www.usb.org/developers/devclass_docs/cdc_wmc10.zip */ /* @@ -253,8 +254,6 @@ umodem_probe(device_t dev) { struct usb2_attach_arg *uaa = device_get_ivars(dev); - uint8_t cm; - uint8_t acm; int error; DPRINTFN(11, "\n"); @@ -263,19 +262,6 @@ return (ENXIO); } error = usb2_lookup_id_by_uaa(umodem_devs, sizeof(umodem_devs), uaa); - if (error) { - return (error); - } - if (uaa->driver_info == NULL) { - /* some modems do not have any capabilities */ - return (error); - } - umodem_get_caps(uaa, &cm, &acm); - if (!(cm & USB_CDC_CM_DOES_CM) || - !(cm & USB_CDC_CM_OVER_DATA) || - !(acm & USB_CDC_ACM_HAS_LINE)) { - error = ENXIO; - } return (error); } @@ -285,6 +271,7 @@ struct usb2_attach_arg *uaa = device_get_ivars(dev); struct umodem_softc *sc = device_get_softc(dev); struct usb2_cdc_cm_descriptor *cmd; + struct usb2_cdc_union_descriptor *cud; uint8_t i; int error; @@ -302,10 +289,20 @@ cmd = umodem_get_desc(uaa, UDESC_CS_INTERFACE, UDESCSUB_CDC_CM); if ((cmd == NULL) || (cmd->bLength < sizeof(*cmd))) { - device_printf(dev, "no CM descriptor!\n"); - goto detach; + + cud = usb2_find_descriptor(uaa->device, NULL, + uaa->info.bIfaceIndex, UDESC_CS_INTERFACE, + 0 - 1, UDESCSUB_CDC_UNION, 0 - 1); + + if ((cud == NULL) || (cud->bLength < sizeof(*cud))) { + device_printf(dev, "no CM or union descriptor!\n"); + goto detach; + } + + sc->sc_data_iface_no = cud->bSlaveInterface[0]; + } else { + sc->sc_data_iface_no = cmd->bDataInterface; } - sc->sc_data_iface_no = cmd->bDataInterface; device_printf(dev, "data interface %d, has %sCM over " "data, has %sbreak\n", @@ -419,21 +416,19 @@ struct usb2_cdc_cm_descriptor *cmd; struct usb2_cdc_acm_descriptor *cad; - *cm = *acm = 0; - cmd = umodem_get_desc(uaa, UDESC_CS_INTERFACE, UDESCSUB_CDC_CM); if ((cmd == NULL) || (cmd->bLength < sizeof(*cmd))) { - DPRINTF("no CM desc\n"); - return; - } - *cm = cmd->bmCapabilities; + DPRINTF("no CM desc (faking one)\n"); + *cm = USB_CDC_CM_DOES_CM | USB_CDC_CM_OVER_DATA; + } else + *cm = cmd->bmCapabilities; cad = umodem_get_desc(uaa, UDESC_CS_INTERFACE, UDESCSUB_CDC_ACM); if ((cad == NULL) || (cad->bLength < sizeof(*cad))) { DPRINTF("no ACM desc\n"); - return; - } - *acm = cad->bmCapabilities; + *acm = 0; + } else + *acm = cad->bmCapabilities; } static void From owner-p4-projects@FreeBSD.ORG Thu Mar 5 17:27:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D70FB1065673; Thu, 5 Mar 2009 17:27: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 9826B1065670 for ; Thu, 5 Mar 2009 17:27:15 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 863198FC1E for ; Thu, 5 Mar 2009 17:27:15 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n25HRFcM041752 for ; Thu, 5 Mar 2009 17:27:15 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n25HRFch041750 for perforce@freebsd.org; Thu, 5 Mar 2009 17:27:15 GMT (envelope-from sson@FreeBSD.org) Date: Thu, 5 Mar 2009 17:27:15 GMT Message-Id: <200903051727.n25HRFch041750@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 158731 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2009 17:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=158731 Change 158731 by sson@sson_amd64 on 2009/03/05 17:26:39 Add function names to AUE_ADDPROFILE and AUE_KDEBUGTRACE. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#37 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#37 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#36 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#37 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -319,8 +319,8 @@ 321:AUE_DARWIN_NFSSVC:nfssvc(2):ad 322:AUE_DARWIN_GETFH:getfh(2):fa 323:AUE_DARWIN_QUOTACTL:quotactl(2):ad -324:AUE_DARWIN_ADDPROFILE:system call:pc -325:AUE_DARWIN_KDEBUGTRACE:system call:pc +324:AUE_DARWIN_ADDPROFILE:add_profil():pc +325:AUE_DARWIN_KDEBUGTRACE:kdebug_trace():pc 326:AUE_DARWIN_FSTAT:fstat(2):fa 327:AUE_DARWIN_FPATHCONF:fpathconf(2):fa 328:AUE_DARWIN_GETDIRENTRIES:getdirentries(2):no @@ -375,8 +375,8 @@ 43013:AUE_FUTIMES:futimes(2):fm 43014:AUE_SETSID:setsid(2):pc 43015:AUE_SETPRIVEXEC:setprivexec(2):pc -43016:AUE_ADDPROFILE:system call:pc -43017:AUE_KDEBUGTRACE:system call:pc +43016:AUE_ADDPROFILE:add_profil():pc +43017:AUE_KDEBUGTRACE:kdebug_trace():pc 43018:AUE_OPENBSM_FSTAT:fstat(2):fa 43019:AUE_FPATHCONF:fpathconf(2):fa 43020:AUE_GETDIRENTRIES:getdirentries(2):no From owner-p4-projects@FreeBSD.ORG Thu Mar 5 21:46:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10E771065675; Thu, 5 Mar 2009 21:46: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 BCD9D1065670 for ; Thu, 5 Mar 2009 21:46:56 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A88A58FC14 for ; Thu, 5 Mar 2009 21:46:56 +0000 (UTC) (envelope-from peter@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n25LkuQA079061 for ; Thu, 5 Mar 2009 21:46:56 GMT (envelope-from peter@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n25Lkfdc079047 for perforce@freebsd.org; Thu, 5 Mar 2009 21:46:41 GMT (envelope-from peter@wemm.org) Date: Thu, 5 Mar 2009 21:46:41 GMT Message-Id: <200903052146.n25Lkfdc079047@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 158752 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2009 21:46:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=158752 Change 158752 by peter@peter_overcee on 2009/03/05 21:46:21 IFC @158751 Affected files ... .. //depot/projects/hammer/MAINTAINERS#49 integrate .. //depot/projects/hammer/Makefile.inc1#143 integrate .. //depot/projects/hammer/ObsoleteFiles.inc#64 integrate .. //depot/projects/hammer/UPDATING#129 integrate .. //depot/projects/hammer/bin/chmod/chmod.1#10 integrate .. //depot/projects/hammer/bin/dd/dd.1#12 integrate .. //depot/projects/hammer/bin/kenv/kenv.1#6 integrate .. //depot/projects/hammer/bin/ln/ln.1#10 integrate .. //depot/projects/hammer/bin/pax/file_subs.c#5 integrate .. //depot/projects/hammer/bin/ps/extern.h#12 integrate .. //depot/projects/hammer/bin/ps/keyword.c#19 integrate .. //depot/projects/hammer/bin/ps/print.c#21 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate .. //depot/projects/hammer/contrib/bind9/CHANGES#13 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/api#11 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/openssldsa_link.c#5 integrate .. //depot/projects/hammer/contrib/bind9/lib/dns/opensslrsa_link.c#4 integrate .. //depot/projects/hammer/contrib/bind9/lib/isc/unix/socket.c#9 integrate .. //depot/projects/hammer/contrib/bind9/version#13 integrate .. //depot/projects/hammer/contrib/bsnmp/snmp_mibII/mibII.c#13 integrate .. //depot/projects/hammer/contrib/csup/proto.c#4 integrate .. //depot/projects/hammer/contrib/csup/updater.c#4 integrate .. //depot/projects/hammer/contrib/gdtoa/README#5 integrate .. //depot/projects/hammer/contrib/gdtoa/g_Qfmt.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/g__fmt.c#4 integrate .. //depot/projects/hammer/contrib/gdtoa/g_ddfmt.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/g_dfmt.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/g_ffmt.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/g_xLfmt.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/g_xfmt.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoa.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoa.h#4 integrate .. //depot/projects/hammer/contrib/gdtoa/gdtoa_fltrnds.h#1 branch .. //depot/projects/hammer/contrib/gdtoa/gdtoaimp.h#10 integrate .. //depot/projects/hammer/contrib/gdtoa/gethex.c#7 integrate .. //depot/projects/hammer/contrib/gdtoa/makefile#3 integrate .. //depot/projects/hammer/contrib/gdtoa/smisc.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtod.c#7 integrate .. //depot/projects/hammer/contrib/gdtoa/strtodg.c#5 integrate .. //depot/projects/hammer/contrib/gdtoa/strtof.c#5 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopQ.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopd.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopdd.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopf.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopx.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/strtopxL.c#3 integrate .. //depot/projects/hammer/contrib/gdtoa/test/Q.ou0#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/Q.ou1#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/Qtest.c#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/README#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/d.out#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/dI.out#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/dIsi.out#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/dItest.c#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/dd.out#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/ddsi.out#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/ddtest.c#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/dt.c#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/dtest.c#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/dtst.out#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/f.out#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/ftest.c#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/getround.c#4 delete .. //depot/projects/hammer/contrib/gdtoa/test/makefile#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/rtestnos#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/strtoIdSI.c#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/strtoIddSI.c#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/strtodISI.c#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/strtodt.c#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/strtopddSI.c#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/strtorddSI.c#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/testnos#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/testnos1#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/testnos3#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/x.ou0#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/x.ou1#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/xL.ou0#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/xL.ou1#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/xLtest.c#3 delete .. //depot/projects/hammer/contrib/gdtoa/test/xQtest.c#2 delete .. //depot/projects/hammer/contrib/gdtoa/test/xsum0.out#4 delete .. //depot/projects/hammer/contrib/gdtoa/test/xtest.c#3 delete .. //depot/projects/hammer/contrib/gdtoa/xsum0.out#6 delete .. //depot/projects/hammer/contrib/hostapd/COPYING#3 delete .. //depot/projects/hammer/contrib/hostapd/ChangeLog#6 delete .. //depot/projects/hammer/contrib/hostapd/FREEBSD-Xlist#4 delete .. //depot/projects/hammer/contrib/hostapd/FREEBSD-upgrade#4 delete .. //depot/projects/hammer/contrib/hostapd/Makefile#6 delete .. //depot/projects/hammer/contrib/hostapd/README#5 delete .. //depot/projects/hammer/contrib/hostapd/accounting.c#4 delete .. //depot/projects/hammer/contrib/hostapd/accounting.h#3 delete .. //depot/projects/hammer/contrib/hostapd/aes.c#4 delete .. //depot/projects/hammer/contrib/hostapd/aes.h#2 delete .. //depot/projects/hammer/contrib/hostapd/aes_wrap.c#5 delete .. //depot/projects/hammer/contrib/hostapd/aes_wrap.h#5 delete .. //depot/projects/hammer/contrib/hostapd/ap.h#3 delete .. //depot/projects/hammer/contrib/hostapd/ap_list.c#2 delete .. //depot/projects/hammer/contrib/hostapd/ap_list.h#2 delete .. //depot/projects/hammer/contrib/hostapd/beacon.c#2 delete .. //depot/projects/hammer/contrib/hostapd/beacon.h#2 delete .. //depot/projects/hammer/contrib/hostapd/build_config.h#2 delete .. //depot/projects/hammer/contrib/hostapd/common.c#5 delete .. //depot/projects/hammer/contrib/hostapd/common.h#6 delete .. //depot/projects/hammer/contrib/hostapd/config.c#6 delete .. //depot/projects/hammer/contrib/hostapd/config.h#5 delete .. //depot/projects/hammer/contrib/hostapd/config_types.h#3 delete .. //depot/projects/hammer/contrib/hostapd/crypto.c#4 delete .. //depot/projects/hammer/contrib/hostapd/crypto.h#4 delete .. //depot/projects/hammer/contrib/hostapd/ctrl_iface.c#5 delete .. //depot/projects/hammer/contrib/hostapd/ctrl_iface.h#3 delete .. //depot/projects/hammer/contrib/hostapd/defconfig#5 delete .. //depot/projects/hammer/contrib/hostapd/defs.h#4 delete .. //depot/projects/hammer/contrib/hostapd/des.c#2 delete .. //depot/projects/hammer/contrib/hostapd/developer.txt#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/code_structure.doxygen#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/doxygen.fast#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/doxygen.full#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/eap.doxygen#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/hostapd.fig#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/mainpage.doxygen#2 delete .. //depot/projects/hammer/contrib/hostapd/doc/porting.doxygen#2 delete .. //depot/projects/hammer/contrib/hostapd/driver.h#5 delete .. //depot/projects/hammer/contrib/hostapd/driver_test.c#5 delete .. //depot/projects/hammer/contrib/hostapd/eap.c#4 delete .. //depot/projects/hammer/contrib/hostapd/eap.h#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_aka.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_defs.h#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_gpsk.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_gpsk_common.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_gpsk_common.h#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_gtc.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_i.h#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_identity.c#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_md5.c#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_methods.c#2 delete .. //depot/projects/hammer/contrib/hostapd/eap_methods.h#2 delete .. //depot/projects/hammer/contrib/hostapd/eap_mschapv2.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_pax.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_pax_common.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_pax_common.h#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_peap.c#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_psk.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_psk_common.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_psk_common.h#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_sake.c#2 delete .. //depot/projects/hammer/contrib/hostapd/eap_sake_common.c#2 delete .. //depot/projects/hammer/contrib/hostapd/eap_sake_common.h#2 delete .. //depot/projects/hammer/contrib/hostapd/eap_sim.c#5 delete .. //depot/projects/hammer/contrib/hostapd/eap_sim_common.c#5 delete .. //depot/projects/hammer/contrib/hostapd/eap_sim_common.h#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_sim_db.c#5 delete .. //depot/projects/hammer/contrib/hostapd/eap_sim_db.h#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_tls.c#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_tls_common.c#5 delete .. //depot/projects/hammer/contrib/hostapd/eap_tls_common.h#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_tlv.c#3 delete .. //depot/projects/hammer/contrib/hostapd/eap_ttls.c#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_ttls.h#4 delete .. //depot/projects/hammer/contrib/hostapd/eap_vendor_test.c#2 delete .. //depot/projects/hammer/contrib/hostapd/eapol_sm.c#5 delete .. //depot/projects/hammer/contrib/hostapd/eapol_sm.h#5 delete .. //depot/projects/hammer/contrib/hostapd/eloop.c#4 delete .. //depot/projects/hammer/contrib/hostapd/eloop.h#4 delete .. //depot/projects/hammer/contrib/hostapd/eloop_none.c#2 delete .. //depot/projects/hammer/contrib/hostapd/eloop_win.c#2 delete .. //depot/projects/hammer/contrib/hostapd/hlr_auc_gw.c#2 delete .. //depot/projects/hammer/contrib/hostapd/hlr_auc_gw.milenage_db#2 delete .. //depot/projects/hammer/contrib/hostapd/hostap_common.h#4 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.8#3 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.accept#2 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.c#5 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.conf#6 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.deny#2 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.eap_user#4 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.h#4 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.radius_clients#2 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.sim_db#2 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.vlan#2 delete .. //depot/projects/hammer/contrib/hostapd/hostapd.wpa_psk#2 delete .. //depot/projects/hammer/contrib/hostapd/hostapd_cli.1#3 delete .. //depot/projects/hammer/contrib/hostapd/hostapd_cli.c#4 delete .. //depot/projects/hammer/contrib/hostapd/hw_features.c#2 delete .. //depot/projects/hammer/contrib/hostapd/hw_features.h#2 delete .. //depot/projects/hammer/contrib/hostapd/iapp.c#4 delete .. //depot/projects/hammer/contrib/hostapd/iapp.h#3 delete .. //depot/projects/hammer/contrib/hostapd/ieee802_11.c#5 delete .. //depot/projects/hammer/contrib/hostapd/ieee802_11.h#3 delete .. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.c#5 delete .. //depot/projects/hammer/contrib/hostapd/ieee802_11_auth.h#3 delete .. //depot/projects/hammer/contrib/hostapd/ieee802_11h.c#2 delete .. //depot/projects/hammer/contrib/hostapd/ieee802_11h.h#2 delete .. //depot/projects/hammer/contrib/hostapd/ieee802_1x.c#6 delete .. //depot/projects/hammer/contrib/hostapd/ieee802_1x.h#4 delete .. //depot/projects/hammer/contrib/hostapd/includes.h#2 delete .. //depot/projects/hammer/contrib/hostapd/l2_packet.h#4 delete .. //depot/projects/hammer/contrib/hostapd/l2_packet_none.c#2 delete .. //depot/projects/hammer/contrib/hostapd/logwatch/README#2 delete .. //depot/projects/hammer/contrib/hostapd/logwatch/hostapd#2 delete .. //depot/projects/hammer/contrib/hostapd/logwatch/hostapd.conf#2 delete .. //depot/projects/hammer/contrib/hostapd/madwifi.conf#4 delete .. //depot/projects/hammer/contrib/hostapd/md4.c#2 delete .. //depot/projects/hammer/contrib/hostapd/md5.c#4 delete .. //depot/projects/hammer/contrib/hostapd/md5.h#4 delete .. //depot/projects/hammer/contrib/hostapd/milenage.c#2 delete .. //depot/projects/hammer/contrib/hostapd/milenage.h#2 delete .. //depot/projects/hammer/contrib/hostapd/mlme.c#2 delete .. //depot/projects/hammer/contrib/hostapd/mlme.h#2 delete .. //depot/projects/hammer/contrib/hostapd/ms_funcs.c#5 delete .. //depot/projects/hammer/contrib/hostapd/ms_funcs.h#4 delete .. //depot/projects/hammer/contrib/hostapd/os.h#3 delete .. //depot/projects/hammer/contrib/hostapd/os_internal.c#2 delete .. //depot/projects/hammer/contrib/hostapd/os_none.c#2 delete .. //depot/projects/hammer/contrib/hostapd/os_unix.c#3 delete .. //depot/projects/hammer/contrib/hostapd/pmksa_cache.c#2 delete .. //depot/projects/hammer/contrib/hostapd/pmksa_cache.h#2 delete .. //depot/projects/hammer/contrib/hostapd/preauth.c#2 delete .. //depot/projects/hammer/contrib/hostapd/preauth.h#2 delete .. //depot/projects/hammer/contrib/hostapd/radius.c#5 delete .. //depot/projects/hammer/contrib/hostapd/radius.h#5 delete .. //depot/projects/hammer/contrib/hostapd/radius_client.c#6 delete .. //depot/projects/hammer/contrib/hostapd/radius_client.h#4 delete .. //depot/projects/hammer/contrib/hostapd/radius_server.c#6 delete .. //depot/projects/hammer/contrib/hostapd/radius_server.h#4 delete .. //depot/projects/hammer/contrib/hostapd/rc4.c#4 delete .. //depot/projects/hammer/contrib/hostapd/rc4.h#4 delete .. //depot/projects/hammer/contrib/hostapd/reconfig.c#2 delete .. //depot/projects/hammer/contrib/hostapd/sha1.c#4 delete .. //depot/projects/hammer/contrib/hostapd/sha1.h#4 delete .. //depot/projects/hammer/contrib/hostapd/sha256.c#2 delete .. //depot/projects/hammer/contrib/hostapd/sha256.h#2 delete .. //depot/projects/hammer/contrib/hostapd/sta_info.c#4 delete .. //depot/projects/hammer/contrib/hostapd/sta_info.h#4 delete .. //depot/projects/hammer/contrib/hostapd/state_machine.h#2 delete .. //depot/projects/hammer/contrib/hostapd/tls.h#4 delete .. //depot/projects/hammer/contrib/hostapd/tls_gnutls.c#2 delete .. //depot/projects/hammer/contrib/hostapd/tls_none.c#4 delete .. //depot/projects/hammer/contrib/hostapd/tls_openssl.c#6 delete .. //depot/projects/hammer/contrib/hostapd/version.h#6 delete .. //depot/projects/hammer/contrib/hostapd/vlan_init.c#2 delete .. //depot/projects/hammer/contrib/hostapd/vlan_init.h#2 delete .. //depot/projects/hammer/contrib/hostapd/wired.conf#3 delete .. //depot/projects/hammer/contrib/hostapd/wme.c#2 delete .. //depot/projects/hammer/contrib/hostapd/wme.h#2 delete .. //depot/projects/hammer/contrib/hostapd/wpa.c#6 delete .. //depot/projects/hammer/contrib/hostapd/wpa.h#4 delete .. //depot/projects/hammer/contrib/hostapd/wpa_common.h#2 delete .. //depot/projects/hammer/contrib/hostapd/wpa_ctrl.c#3 delete .. //depot/projects/hammer/contrib/hostapd/wpa_ctrl.h#3 delete .. //depot/projects/hammer/contrib/less/line.c#8 integrate .. //depot/projects/hammer/contrib/ntp/ntpd/ntp_crypto.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/CREDITS#2 integrate .. //depot/projects/hammer/contrib/openbsm/INSTALL#2 integrate .. //depot/projects/hammer/contrib/openbsm/NEWS#3 integrate .. //depot/projects/hammer/contrib/openbsm/README#8 integrate .. //depot/projects/hammer/contrib/openbsm/VERSION#9 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.8#6 integrate .. //depot/projects/hammer/contrib/openbsm/bin/audit/audit.c#6 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/audit_warn.c#6 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.8#7 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.c#8 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd.h#6 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd_darwin.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditd/auditd_fbsd.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/bin/auditreduce/auditreduce.c#8 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/auditd_lib.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/bsm/libbsm.h#7 integrate .. //depot/projects/hammer/contrib/openbsm/config/config.h#9 integrate .. //depot/projects/hammer/contrib/openbsm/configure#9 integrate .. //depot/projects/hammer/contrib/openbsm/configure.ac#9 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_control#4 integrate .. //depot/projects/hammer/contrib/openbsm/etc/audit_event#10 integrate .. //depot/projects/hammer/contrib/openbsm/libauditd/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/openbsm/libauditd/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/openbsm/libauditd/auditd_lib.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/libauditd/libauditd.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.am#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/Makefile.in#6 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_control.3#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_domain.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_errno.3#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/au_socket_type.3#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/au_token.3#7 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_audit.c#6 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_control.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_domain.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_errno.c#2 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_io.c#9 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_socket_type.c#1 branch .. //depot/projects/hammer/contrib/openbsm/libbsm/bsm_token.c#8 integrate .. //depot/projects/hammer/contrib/openbsm/libbsm/libbsm.3#6 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit_control.5#5 integrate .. //depot/projects/hammer/contrib/openbsm/man/audit_user.5#4 integrate .. //depot/projects/hammer/contrib/openbsm/man/auditon.2#5 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/Makefile.am#3 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/Makefile.in#3 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit.h#3 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_domain.h#1 branch .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_errno.h#2 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_record.h#3 integrate .. //depot/projects/hammer/contrib/openbsm/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/hammer/contrib/openbsm/test/bsm/generate.c#5 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/E2BIG_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EACCES_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EBADF_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EBUSY_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ECHILD_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EDEADLK_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EEXIST_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EFAULT_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EFBIG_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EINTR_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EINVAL_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EIO_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EISDIR_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EMFILE_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EMLINK_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENFILE_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENODEV_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOENT_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOEXEC_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOMEM_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOSPC_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOTBLK_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOTDIR_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENOTTY_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ENXIO_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EPERM_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EPIPE_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EROFS_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ESPIPE_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ESRCH_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ETXTBSY_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/EXDEV_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/arg32_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/data_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/data_token#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/file_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/in_addr_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ip_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/ipc_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/iport_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/opaque_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/path_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process32_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process32ex_record-IPv4#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process32ex_record-IPv6#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process64_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process64ex_record-IPv4#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/process64ex_record-IPv6#3 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/return32_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/seq_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/socketex_record#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/socketex_token#2 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/subject32ex_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/text_record#4 integrate .. //depot/projects/hammer/contrib/openbsm/test/reference/zonename_record#3 integrate .. //depot/projects/hammer/contrib/openbsm/tools/audump.c#4 integrate .. //depot/projects/hammer/contrib/openpam/include/security/openpam.h#8 integrate .. //depot/projects/hammer/contrib/openpam/lib/openpam_dynamic.c#7 integrate .. //depot/projects/hammer/contrib/opie/opiekey.1#2 integrate .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.8#7 integrate .. //depot/projects/hammer/contrib/smbfs/mount_smbfs/mount_smbfs.c#7 integrate .. //depot/projects/hammer/contrib/telnet/libtelnet/pk.c#2 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/sys_term.c#3 integrate .. //depot/projects/hammer/contrib/wpa/COPYING#1 branch .. //depot/projects/hammer/contrib/wpa/README#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ChangeLog#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/README#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/README-WPS#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/accounting.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/accounting.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ap.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ap_list.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ap_list.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/beacon.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/beacon.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/config.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/config.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ctrl_iface.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ctrl_iface.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/defconfig#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/doxygen.full#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/driver.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/drivers.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/eap_testing.txt#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/eapol_sm.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/eapol_sm.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostap_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.8#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.accept#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.conf#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.deny#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.eap_user#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.sim_db#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.vlan#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd_cli.1#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hostapd_cli.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hw_features.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/hw_features.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/iapp.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/iapp.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ieee802_11.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ieee802_11.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ieee802_1x.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/ieee802_1x.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/logwatch/README#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/logwatch/hostapd#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/mlme.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/mlme.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/nt_password_hash.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/peerkey.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/pmksa_cache.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/pmksa_cache.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/preauth.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/preauth.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/sta_info.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/sta_info.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/vlan_init.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/vlan_init.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wired.conf#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wme.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wme.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wpa.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wpa.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wpa_auth_i.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wpa_auth_ie.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wpa_auth_ie.h#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wpa_ft.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wps_hostapd.c#1 branch .. //depot/projects/hammer/contrib/wpa/hostapd/wps_hostapd.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/defs.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/eapol_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/ieee802_11_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/ieee802_11_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/ieee802_11_defs.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/privsep_commands.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/version.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/wpa_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/wpa_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/wpa_ctrl.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/common/wpa_ctrl.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/aes.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/aes.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/aes_wrap.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/aes_wrap.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/crypto.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/crypto_cryptoapi.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/crypto_gnutls.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/crypto_internal.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/crypto_libtomcrypt.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/crypto_none.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/crypto_openssl.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/des.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/dh_groups.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/dh_groups.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/md4.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/md5.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/md5.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/ms_funcs.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/ms_funcs.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/rc4.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/rc4.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/sha1.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/sha1.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/sha256.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/sha256.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/tls.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/tls_gnutls.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/tls_internal.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/tls_none.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/tls_openssl.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/crypto/tls_schannel.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/drivers/driver.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/drivers/driver_ndis.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/drivers/driver_ndis.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/drivers/drivers.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/drivers/scan_helpers.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/chap.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/chap.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_defs.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_fast_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_fast_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_gpsk_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_gpsk_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_ikev2_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_ikev2_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_pax_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_pax_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_peap_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_peap_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_psk_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_psk_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_sake_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_sake_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_sim_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_sim_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_tlv_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_ttls.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_wsc_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/eap_wsc_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/ikev2_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_common/ikev2_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_aka.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_config.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_fast.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_fast_pac.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_fast_pac.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_gpsk.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_gtc.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_i.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_ikev2.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_leap.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_md5.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_methods.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_methods.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_mschapv2.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_otp.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_pax.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_peap.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_psk.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_sake.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_sim.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_tls.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_tls_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_tls_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_tnc.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_ttls.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_vendor_test.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/eap_wsc.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/ikev2.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/ikev2.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/mschapv2.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/mschapv2.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/tncc.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_peer/tncc.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_aka.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_fast.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_gpsk.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_gtc.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_i.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_identity.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_ikev2.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_md5.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_methods.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_methods.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_mschapv2.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_pax.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_peap.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_psk.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_sake.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_sim.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_sim_db.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_sim_db.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_tls.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_tls_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_tls_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_tnc.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_ttls.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_vendor_test.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/eap_wsc.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/ikev2.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/ikev2.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/tncs.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eap_server/tncs.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/eapol_supp/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/eapol_supp/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/eapol_supp/eapol_supp_sm.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/eapol_supp/eapol_supp_sm.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/hlr_auc_gw/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/hlr_auc_gw/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/hammer/contrib/wpa/src/hlr_auc_gw/milenage.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/hlr_auc_gw/milenage.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/l2_packet/l2_packet.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/radius/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/radius/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/radius/radius.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/radius/radius.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/radius/radius_client.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/radius/radius_client.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/radius/radius_server.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/radius/radius_server.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/peerkey.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/peerkey.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/pmksa_cache.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/pmksa_cache.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/preauth.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/preauth.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/wpa.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/wpa.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/wpa_ft.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/wpa_i.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/wpa_ie.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/rsn_supp/wpa_ie.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/asn1.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/asn1.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/asn1_test.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/bignum.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/bignum.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/libtommath.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/rsa.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/rsa.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_client.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_client.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_client_i.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_client_read.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_client_write.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_cred.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_cred.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_record.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_record.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_server.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_server.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_server_i.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_server_read.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/tlsv1_server_write.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/x509v3.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/tls/x509v3.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/base64.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/base64.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/build_config.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/common.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/eloop.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/eloop.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/includes.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/ip_addr.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/ip_addr.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/os.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/os_internal.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/os_unix.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/pcsc_funcs.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/pcsc_funcs.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/state_machine.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/uuid.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/uuid.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/wpa_debug.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/wpa_debug.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/wpabuf.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/utils/wpabuf.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/httpread.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/httpread.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_attr_build.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_attr_parse.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_attr_process.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_defs.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_dev_attr.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_dev_attr.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_enrollee.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_i.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_registrar.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_upnp.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_upnp.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_upnp_event.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_upnp_i.h#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_upnp_ssdp.c#1 branch .. //depot/projects/hammer/contrib/wpa/src/wps/wps_upnp_web.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/README#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/README-WPS#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/blacklist.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/blacklist.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/config.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/config.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/config_file.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/config_none.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.service#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/defconfig#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/manpage.links#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/manpage.refs#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/events.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/examples/openCryptoki.conf#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/examples/wpas-test.py#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/main.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/mlme.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/mlme.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/scan.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/link_test.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_wpa.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/todo.txt#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpa_priv.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpas_glue.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wpas_glue.h#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wps_supplicant.c#1 branch .. //depot/projects/hammer/contrib/wpa/wpa_supplicant/wps_supplicant.h#1 branch .. //depot/projects/hammer/contrib/wpa_supplicant/COPYING#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ChangeLog#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-Xlist#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/FREEBSD-upgrade#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/Makefile#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/README#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/aes.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/aes.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/aes_wrap.h#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/asn1.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/asn1.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/asn1_test.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/base64.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/base64.h#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/bignum.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/bignum.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/build_config.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/common.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/common.h#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/config.c#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/config.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/config_file.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/config_none.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/config_ssid.h#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/config_types.h#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/crypto.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/crypto.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_cryptoapi.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_gnutls.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_internal.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_libtomcrypt.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/crypto_none.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.c#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_udp.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ctrl_iface_unix.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/dbus-wpa_supplicant.service#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/dbus_dict_helpers.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/dbus_dict_helpers.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/defconfig#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/defs.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/des.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/code_structure.doxygen#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/Makefile#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_background.8#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/doxygen.fast#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/doxygen.full#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/eap.doxygen#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/mainpage.doxygen#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/porting.doxygen#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/testing_tools.doxygen#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/doc/wpa_supplicant.fig#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/driver.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.c#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/driver_ndis.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/driver_wired.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/drivers.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_aka.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_defs.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_fast.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_gpsk.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_gpsk_common.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_gpsk_common.h#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_gtc.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_i.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_leap.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_md5.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_methods.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_methods.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_mschapv2.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_otp.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_pax.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_pax_common.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_pax_common.h#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_peap.c#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk_common.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_psk_common.h#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sake.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sake_common.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sake_common.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim_common.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_sim_common.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_testing.txt#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tls_common.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_tlv.h#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_ttls.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eap_vendor_test.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.c#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_sm.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eapol_test.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eloop.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eloop.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/eloop_none.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/events.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/examples/ieee8021x.conf#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/examples/plaintext.conf#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/examples/wep.conf#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/hostapd.h#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/includes.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/l2_packet.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/libtommath.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/main.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/md4.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/md5.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/md5.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/mlme.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/mlme.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/ms_funcs.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/nmake.mak#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/openssl-tls-extensions.patch#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/os.h#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/os_internal.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/os_none.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/os_unix.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/pcsc_funcs.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/pcsc_funcs.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/pmksa_cache.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/pmksa_cache.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/preauth.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/preauth.h#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/preauth_test.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/radius.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/radius.h#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/radius_client.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/radius_client.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/rc4.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/rc4.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/rsa.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/rsa.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/sha1.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/sha1.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/sha256.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/sha256.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/state_machine.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_aes.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_eap_sim_common.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_md4.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_md5.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_ms_funcs.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_sha1.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_sha256.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tests/test_x509v3.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tls.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tls_gnutls.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tls_internal.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tls_none.c#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tls_openssl.c#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tls_schannel.c#3 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tlsv1_client.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tlsv1_client.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tlsv1_common.c#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/tlsv1_common.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/todo.txt#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/version.h#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa.c#6 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa.h#4 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_cli.c#5 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_common.h#2 delete .. //depot/projects/hammer/contrib/wpa_supplicant/wpa_ctrl.c#5 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 6 00:24:39 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DA664106568F; Fri, 6 Mar 2009 00:24: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 7AD7D106566C for ; Fri, 6 Mar 2009 00:24:38 +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 67E678FC13 for ; Fri, 6 Mar 2009 00:24:38 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n260OchM094008 for ; Fri, 6 Mar 2009 00:24:38 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n260Oc9C094006 for perforce@freebsd.org; Fri, 6 Mar 2009 00:24:38 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 6 Mar 2009 00:24:38 GMT Message-Id: <200903060024.n260Oc9C094006@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 158764 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2009 00:24:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=158764 Change 158764 by pgj@beehive on 2009/03/06 00:24:32 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#23 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#28 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#8 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/dhn.key#1 branch .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#17 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#17 integrate .. //depot/projects/docproj_hu/www/en/developers.sgml#19 integrate .. //depot/projects/docproj_hu/www/en/docproj/translations.sgml#7 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#6 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xsl#2 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#14 integrate .. //depot/projects/docproj_hu/www/hu/Makefile#3 edit .. //depot/projects/docproj_hu/www/share/sgml/news.xml#40 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#23 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.472 2009/03/01 11:17:00 dchagin Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.473 2009/03/05 21:38:01 dhn Exp $ --> aaron@FreeBSD.org"> @@ -270,6 +270,8 @@ dhartmei@FreeBSD.org"> +dhn@FreeBSD.org"> + dhw@FreeBSD.org"> dick@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/advanced-networking/chapter.sgml#28 (text+ko) ==== @@ -1,7 +1,7 @@ + @@ -1415,3 +1415,8 @@ &a.dchagin; &pgpkey.dchagin; + + + &a.dhn; + &pgpkey.dhn; + ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#17 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -75,6 +75,7 @@ + ==== //depot/projects/docproj_hu/www/en/developers.sgml#19 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.214 2009/03/01 11:45:35 dchagin Exp $ +$FreeBSD: www/en/developers.sgml,v 1.215 2009/03/05 21:46:33 dhn Exp $ --> @@ -137,6 +137,7 @@ + ==== //depot/projects/docproj_hu/www/en/docproj/translations.sgml#7 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -273,7 +273,8 @@ Web, some articles, Handbook, - FAQ. + FAQ, + FDP Primer.
Repositories of ongoing work
==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#6 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.90 2008/11/02 22:48:28 versus Exp $ + $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.91 2009/03/05 18:51:31 danger Exp $ @@ -980,6 +980,28 @@ + + Porting nouveau to &os; + + +

Technical contact: Roman Divacky, Robert Noland

+

URL: http://wiki.freebsd.org/NouveauPorting

+ +

Nouveau is an open source driver for NVIDIA graphic cards. + Its kernel currently supports Linux only. The goal of this + project is to port the in-kernel DRM to the &os; operating + system.

+

Requirements:

+
    +
  • Access to a testing hardware.
    • +
  • Some knowledge of inner kernel works.
    • +
  • Knowledge of DRM is an advantage.
    • +
+ + ==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xsl#2 (text+ko) ==== @@ -7,7 +7,7 @@ %developers; ]> - + @@ -127,7 +127,7 @@

Part of Summer of Code 2007 - Suggested Summer of Code 2008 project idea + Suggested Summer of Code 2009 project idea ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#14 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -55,13 +55,13 @@ --> - To be defined + May 2009 FreeBSD 7.2   - June 2009 + August 2009 FreeBSD 8.0   ==== //depot/projects/docproj_hu/www/hu/Makefile#3 (text+ko) ==== @@ -39,6 +39,7 @@ SUBDIR+= platforms SUBDIR+= projects SUBDIR+= search +SUBDIR+= security SUBDIR+= support .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= doc ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#40 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.229 2009/03/01 11:45:35 dchagin Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.230 2009/03/05 21:57:57 dhn Exp $ @@ -36,6 +36,20 @@ 3 + 3 + + +

New committer: Dennis + Herrmann (ports)

+ + + + + + + 3 + + 1 From owner-p4-projects@FreeBSD.ORG Fri Mar 6 00:38:55 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 990301065676; Fri, 6 Mar 2009 00:38:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52DAF106566B for ; Fri, 6 Mar 2009 00:38:53 +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 263D38FC14 for ; Fri, 6 Mar 2009 00:38:53 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n260cqwq095129 for ; Fri, 6 Mar 2009 00:38:52 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n260cqeK095127 for perforce@freebsd.org; Fri, 6 Mar 2009 00:38:52 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 6 Mar 2009 00:38:52 GMT Message-Id: <200903060038.n260cqeK095127@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 158765 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2009 00:38:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=158765 Change 158765 by pgj@beehive on 2009/03/06 00:37:57 Fix a previous mistake (and unbreak the build) Affected files ... .. //depot/projects/docproj_hu/www/hu/Makefile#4 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/Makefile#4 (text+ko) ==== @@ -39,7 +39,7 @@ SUBDIR+= platforms SUBDIR+= projects SUBDIR+= search -SUBDIR+= security +#SUBDIR+= security SUBDIR+= support .if !defined(WEB_ONLY) || empty(WEB_ONLY) SUBDIR+= doc From owner-p4-projects@FreeBSD.ORG Fri Mar 6 00:38:57 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3046510656C3; Fri, 6 Mar 2009 00: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 63B3E1065673 for ; Fri, 6 Mar 2009 00:38:53 +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 526EB8FC19 for ; Fri, 6 Mar 2009 00:38:53 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n260cqY4095134 for ; Fri, 6 Mar 2009 00:38:52 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n260cqmY095132 for perforce@freebsd.org; Fri, 6 Mar 2009 00:38:52 GMT (envelope-from pgj@FreeBSD.org) Date: Fri, 6 Mar 2009 00:38:52 GMT Message-Id: <200903060038.n260cqmY095132@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 158766 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2009 00:38:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=158766 Change 158766 by pgj@beehive on 2009/03/06 00:38:39 MFen (www): 1.229 -> 1.230 www/hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#3 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#3 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,15 @@ 3 + 3 + + +

Új tag: Dennis + Herrmann (ports)

+ + + + 1 From owner-p4-projects@FreeBSD.ORG Fri Mar 6 19:13:21 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1ED41065734; Fri, 6 Mar 2009 19:13:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 93B6A1065679 for ; Fri, 6 Mar 2009 19:13:20 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5FAB78FC24 for ; Fri, 6 Mar 2009 19:13:20 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n26JDKw2058179 for ; Fri, 6 Mar 2009 19:13:20 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n26JDK4I058177 for perforce@freebsd.org; Fri, 6 Mar 2009 19:13:20 GMT (envelope-from sson@FreeBSD.org) Date: Fri, 6 Mar 2009 19:13:20 GMT Message-Id: <200903061913.n26JDK4I058177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 158797 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2009 19:13:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=158797 Change 158797 by sson@sson_amd64 on 2009/03/06 19:12:24 Add audit events for fsctl() and ffsctl() system calls. Add AUE_IS_A_KEVENT() macro to check if audit event is a kernel event. Affected files ... .. //depot/projects/trustedbsd/openbsm/etc/audit_event#38 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#6 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/etc/audit_event#38 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#37 $ +# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#38 $ # # The mapping between event identifiers and values is also hard-coded in # audit_kevents.h and audit_uevents.h, so changes must occur in both places, @@ -553,6 +553,8 @@ 43191:AUE_FSGETPATH:fsgetpath(2):ot 43192:AUE_PREAD:pread(2):no 43193:AUE_PWRITE:pwrite(2):no +43194:AUE_FSCTL:fsctl():fm +43195:AUE_FFSCTL:ffsctl():fm # # Solaris userspace events. # ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Apple Inc. + * Copyright (c) 2005-2009 Apple Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -26,13 +26,19 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#5 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#6 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ #define _BSM_AUDIT_KEVENTS_H_ /* + * The reserved event numbers for kernel events are 1...2047 and 43001..44900. + */ +#define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \ + ((e) > 43000 && (e) < 45000)) + +/* * Values marked as AUE_NULL are not required to be audited as per CAPP. * * Some conflicts exist in the assignment of name to event number mappings @@ -588,6 +594,8 @@ #define AUE_FSGETPATH 43191 /* Darwin. */ #define AUE_PREAD 43192 /* Darwin/FreeBSD. */ #define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ +#define AUE_FSCTL 43194 /* Darwin. */ +#define AUE_FFSCTL 43195 /* Darwin. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -673,12 +681,10 @@ #define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL #define AUE_FDATASYNC AUE_NULL -#define AUE_FFSCTL AUE_NULL #define AUE_FGETATTRLIST AUE_NULL #define AUE_FGETXATTR AUE_NULL #define AUE_FLISTXATTR AUE_NULL #define AUE_FREMOVEXATTR AUE_NULL -#define AUE_FSCTL AUE_NULL #define AUE_FSETATTRLIST AUE_NULL #define AUE_FSETXATTR AUE_NULL #define AUE_FSTATFS64 AUE_NULL From owner-p4-projects@FreeBSD.ORG Fri Mar 6 19:14:22 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A3CE71065673; Fri, 6 Mar 2009 19:14: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 5FBFD1065670 for ; Fri, 6 Mar 2009 19:14:21 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4D3BB8FC24 for ; Fri, 6 Mar 2009 19:14:21 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n26JELQm058267 for ; Fri, 6 Mar 2009 19:14:21 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n26JELj1058265 for perforce@freebsd.org; Fri, 6 Mar 2009 19:14:21 GMT (envelope-from lulf@FreeBSD.org) Date: Fri, 6 Mar 2009 19:14:21 GMT Message-Id: <200903061914.n26JELj1058265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 158798 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2009 19:14:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=158798 Change 158798 by lulf@lulf_carrot on 2009/03/06 19:13:55 - Rename from at32_mci to atmel_mci to make it common for at91 and avr32. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32_mci.c#2 delete .. //depot/projects/avr32/src/sys/avr32/conf/NGW100#12 edit .. //depot/projects/avr32/src/sys/conf/files.avr32#11 edit .. //depot/projects/avr32/src/sys/dev/mmc/atmel_mci.c#1 add .. //depot/projects/avr32/src/sys/dev/mmc/mmc.c#4 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/conf/NGW100#12 (text+ko) ==== @@ -54,7 +54,7 @@ device uart # USART support #device atmel_twi # TWI (I2C) support #device atmel_ssc # Sync Serial controller -device at32_mci # Media card interface +device atmel_mci # Media card interface # Drivers for onboard parallel flash device cfi ==== //depot/projects/avr32/src/sys/conf/files.avr32#11 (text+ko) ==== @@ -35,7 +35,7 @@ avr32/avr32/at32_pio.c optional at32_pio avr32/avr32/at32_sdramc.c optional at32_sdramc avr32/avr32/at32_smc.c optional at32_smc -avr32/avr32/at32_mci.c optional at32_mci +dev/mmc/atmel_mci.c optional atmel_mci avr32/avr32/busdma_machdep.c optional at32_mci dev/cfi/cfi_bus_at32_smc.c optional at32_smc cfi ==== //depot/projects/avr32/src/sys/dev/mmc/mmc.c#4 (text+ko) ==== @@ -1528,6 +1528,5 @@ static devclass_t mmc_devclass; -DRIVER_MODULE(mmc, at32_mci, mmc_driver, mmc_devclass, NULL, NULL); -DRIVER_MODULE(mmc, at91_mci, mmc_driver, mmc_devclass, NULL, NULL); +DRIVER_MODULE(mmc, atmel_mci, mmc_driver, mmc_devclass, NULL, NULL); DRIVER_MODULE(mmc, sdhci, mmc_driver, mmc_devclass, NULL, NULL); From owner-p4-projects@FreeBSD.ORG Fri Mar 6 19:30:38 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 73E77106568E; Fri, 6 Mar 2009 19:30: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 0AD18106567A for ; Fri, 6 Mar 2009 19:30:38 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E9FB88FC21 for ; Fri, 6 Mar 2009 19:30:37 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n26JUbZw059652 for ; Fri, 6 Mar 2009 19:30:37 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n26JUbKb059650 for perforce@freebsd.org; Fri, 6 Mar 2009 19:30:37 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 6 Mar 2009 19:30:37 GMT Message-Id: <200903061930.n26JUbKb059650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 158799 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2009 19:30:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=158799 Change 158799 by thompsa@thompsa_burger on 2009/03/06 19:30:07 IFC @158796 Affected files ... .. //depot/projects/usb/src/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/fpu.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#17 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#11 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#7 integrate .. //depot/projects/usb/src/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/usb/src/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#15 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/usb/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#18 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#14 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#17 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#12 integrate .. //depot/projects/usb/src/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#48 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumfw.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumreg.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rumvar.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralreg.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uralvar.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydfw.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zydreg.h#4 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/usb_wlan.h#3 edit .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#17 integrate .. //depot/projects/usb/src/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#12 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#15 integrate .. //depot/projects/usb/src/sys/i386/include/npx.h#3 integrate .. //depot/projects/usb/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/usb/src/sys/i386/isa/npx.c#9 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/usb/src/sys/i386/xen/mp_machdep.c#7 integrate .. //depot/projects/usb/src/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_conf.c#14 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#12 integrate .. //depot/projects/usb/src/sys/kern/sysv_shm.c#8 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#8 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#17 integrate .. //depot/projects/usb/src/sys/netipsec/key.c#11 integrate .. //depot/projects/usb/src/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/usb/src/sys/sys/systm.h#13 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/acpica/madt.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.26 2008/03/16 10:58:02 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.27 2009/03/05 16:03:44 jhb Exp $"); #include #include @@ -483,6 +483,10 @@ apic->Id); if (ioapics[apic->Id].io_apic != NULL) panic("%s: Double APIC ID %u", __func__, apic->Id); + if (apic->GlobalIrqBase >= FIRST_MSI_INT) { + printf("MADT: Ignoring bogus I/O APIC ID %u", apic->Id); + break; + } ioapics[apic->Id].io_apic = ioapic_create(apic->Address, apic->Id, apic->GlobalIrqBase); ioapics[apic->Id].io_vector = apic->GlobalIrqBase; ==== //depot/projects/usb/src/sys/amd64/amd64/fpu.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.161 2009/02/23 15:39:24 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.163 2009/03/05 19:42:11 jhb Exp $"); #include #include @@ -102,10 +102,11 @@ NULL, 1, "Floating point instructions executed in hardware"); static struct savefpu fpu_cleanstate; -static bool_t fpu_cleanstate_ready; /* - * Initialize floating point unit. + * Initialize the floating point unit. On the boot CPU we generate a + * clean state that is used to initialize the floating point unit when + * it is first used by a process. */ void fpuinit(void) @@ -115,22 +116,22 @@ u_short control; savecrit = intr_disable(); - PCPU_SET(fpcurthread, 0); stop_emulating(); fninit(); control = __INITIAL_FPUCW__; fldcw(&control); mxcsr = __INITIAL_MXCSR__; ldmxcsr(mxcsr); - fxsave(&fpu_cleanstate); - if (fpu_cleanstate.sv_env.en_mxcsr_mask) - cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask; - else - cpu_mxcsr_mask = 0xFFBF; + if (PCPU_GET(cpuid) == 0) { + fxsave(&fpu_cleanstate); + if (fpu_cleanstate.sv_env.en_mxcsr_mask) + cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask; + else + cpu_mxcsr_mask = 0xFFBF; + bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); + bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); + } start_emulating(); - bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp)); - bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm)); - fpu_cleanstate_ready = 1; intr_restore(savecrit); } @@ -384,18 +385,17 @@ static int err_count = 0; -int -fpudna() +void +fpudna(void) { struct pcb *pcb; register_t s; - u_short control; if (PCPU_GET(fpcurthread) == curthread) { printf("fpudna: fpcurthread == curthread %d times\n", ++err_count); stop_emulating(); - return (1); + return; } if (PCPU_GET(fpcurthread) != NULL) { printf("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n", @@ -420,16 +420,12 @@ * explicitly load sanitized registers. */ fxrstor(&fpu_cleanstate); - if (pcb->pcb_flags & PCB_32BIT) { - control = __INITIAL_FPUCW_I386__; - fldcw(&control); - } + if (pcb->pcb_initial_fpucw != __INITIAL_FPUCW__) + fldcw(&pcb->pcb_initial_fpucw); pcb->pcb_flags |= PCB_FPUINITDONE; } else fxrstor(&pcb->pcb_save); intr_restore(s); - - return (1); } /* @@ -457,10 +453,8 @@ register_t s; if ((td->td_pcb->pcb_flags & PCB_FPUINITDONE) == 0) { - if (fpu_cleanstate_ready) - bcopy(&fpu_cleanstate, addr, sizeof(fpu_cleanstate)); - else - bzero(addr, sizeof(*addr)); + bcopy(&fpu_cleanstate, addr, sizeof(fpu_cleanstate)); + addr->sv_env.en_cw = td->td_pcb->pcb_initial_fpucw; return (_MC_FPOWNED_NONE); } s = intr_disable(); ==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.691 2009/02/03 09:01:45 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.692 2009/03/05 19:42:11 jhb Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -716,7 +716,7 @@ idle_sysctl, "A", "currently selected idle function"); /* - * Clear registers on exec + * Reset registers to default values on exec. */ void exec_setregs(td, entry, stack, ps_strings) @@ -743,6 +743,7 @@ pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; pcb->pcb_gs = _udatasel; + pcb->pcb_initial_fpucw = __INITIAL_FPUCW__; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; ==== //depot/projects/usb/src/sys/amd64/amd64/pmap.c#17 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.649 2009/02/25 20:26:48 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.651 2009/03/06 17:40:58 alc Exp $"); /* * Manages physical address maps. @@ -3481,9 +3481,6 @@ if (dst_addr != src_addr) return; - if (!pmap_is_current(src_pmap)) - return; - vm_page_lock_queues(); if (dst_pmap < src_pmap) { PMAP_LOCK(dst_pmap); @@ -3545,14 +3542,16 @@ continue; } - srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME); + srcptepaddr &= PG_FRAME; + srcmpte = PHYS_TO_VM_PAGE(srcptepaddr); KASSERT(srcmpte->wire_count > 0, ("pmap_copy: source page table page is unused")); if (va_next > end_addr) va_next = end_addr; - src_pte = vtopte(addr); + src_pte = (pt_entry_t *)PHYS_TO_DMAP(srcptepaddr); + src_pte = &src_pte[pmap_pte_index(addr)]; while (addr < va_next) { pt_entry_t ptetemp; ptetemp = *src_pte; @@ -3802,7 +3801,9 @@ if ((tpte & PG_PS) != 0) pte = pde; else { - pte = vtopte(pv->pv_va); + pte = (pt_entry_t *)PHYS_TO_DMAP(tpte & + PG_FRAME); + pte = &pte[pmap_pte_index(pv->pv_va)]; tpte = *pte & ~PG_PTE_PAT; } @@ -4495,7 +4496,7 @@ if (!pmap_demote_pde(kernel_pmap, pde, tmpva)) return (ENOMEM); } - pte = vtopte(tmpva); + pte = pmap_pde_to_pte(pde, tmpva); if (*pte == 0) return (EINVAL); tmpva += PAGE_SIZE; @@ -4571,7 +4572,7 @@ } else { if (cache_bits_pte < 0) cache_bits_pte = pmap_cache_bits(mode, 0); - pte = vtopte(tmpva); + pte = pmap_pde_to_pte(pde, tmpva); if ((*pte & PG_PTE_CACHE) != cache_bits_pte) { pmap_pte_attr(pte, cache_bits_pte); if (!changed) ==== //depot/projects/usb/src/sys/amd64/amd64/trap.c#11 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.328 2008/09/08 09:55:51 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.329 2009/03/05 16:56:16 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -416,13 +416,8 @@ case T_DNA: /* transparent fault (due to context switch "late") */ - if (fpudna()) - goto userout; - printf("pid %d killed due to lack of floating point\n", - p->p_pid); - i = SIGKILL; - ucode = 0; - break; + fpudna(); + goto userout; case T_FPOPFLT: /* FPU operand fetch fault */ ucode = ILL_COPROC; @@ -450,11 +445,9 @@ * XXX this should be fatal unless the kernel has * registered such use. */ - if (fpudna()) { - printf("fpudna in kernel mode!\n"); - goto out; - } - break; + fpudna(); + printf("fpudna in kernel mode!\n"); + goto out; case T_STKFLT: /* stack fault */ break; ==== //depot/projects/usb/src/sys/amd64/ia32/ia32_signal.c#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.20 2009/01/31 11:37:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.21 2009/03/05 19:42:11 jhb Exp $"); #include "opt_compat.h" @@ -729,6 +729,7 @@ pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; pcb->pcb_gs = _udatasel; + pcb->pcb_initial_fpucw = __INITIAL_FPUCW_I386__; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; ==== //depot/projects/usb/src/sys/amd64/include/fpu.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.34 2009/01/28 20:35:16 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.35 2009/03/05 16:56:16 jhb Exp $ */ /* @@ -97,7 +97,7 @@ #define __INITIAL_MXCSR_MASK__ 0xFFBF #ifdef _KERNEL -int fpudna(void); +void fpudna(void); void fpudrop(void); void fpuexit(struct thread *td); int fpuformat(void); ==== //depot/projects/usb/src/sys/amd64/include/pcb.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.66 2008/09/08 09:59:05 kib Exp $ + * $FreeBSD: src/sys/amd64/include/pcb.h,v 1.68 2009/03/05 19:42:11 jhb Exp $ */ #ifndef _AMD64_PCB_H_ @@ -56,6 +56,12 @@ register_t pcb_fsbase; register_t pcb_gsbase; u_long pcb_flags; +#define PCB_DBREGS 0x02 /* process using debug registers */ +#define PCB_FPUINITDONE 0x08 /* fpu state is initialized */ +#define PCB_GS32BIT 0x20 /* linux gs switch */ +#define PCB_32BIT 0x40 /* process has 32 bit context (segs etc) */ +#define PCB_FULLCTX 0x80 /* full context restore on sysret */ + u_int32_t pcb_ds; u_int32_t pcb_es; u_int32_t pcb_fs; @@ -68,11 +74,7 @@ u_int64_t pcb_dr7; struct savefpu pcb_save; -#define PCB_DBREGS 0x02 /* process using debug registers */ -#define PCB_FPUINITDONE 0x08 /* fpu state is initialized */ -#define PCB_GS32BIT 0x20 /* linux gs switch */ -#define PCB_32BIT 0x40 /* process has 32 bit context (segs etc) */ -#define PCB_FULLCTX 0x80 /* full context restore on sysret */ + uint16_t pcb_initial_fpucw; caddr_t pcb_onfault; /* copyin/out fault recovery */ ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.42 2009/03/04 12:14:33 dchagin Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.43 2009/03/05 19:42:11 jhb Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -841,6 +841,7 @@ pcb->pcb_es = _udatasel; pcb->pcb_fs = _udatasel; pcb->pcb_gs = _udatasel; + pcb->pcb_initial_fpucw = __LINUX_NPXCW__; bzero((char *)regs, sizeof(struct trapframe)); regs->tf_rip = entry; ==== //depot/projects/usb/src/sys/compat/linux/linux_misc.h#4 (text+ko) ==== @@ -25,7 +25,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/compat/linux/linux_misc.h,v 1.4 2009/03/04 12:14:33 dchagin Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.h,v 1.5 2009/03/05 19:42:11 jhb Exp $ */ #ifndef _LINUX_MISC_H_ @@ -60,4 +60,9 @@ */ #define LINUX_AT_EXECFN 31 /* filename of program */ +/* Linux sets the i387 to extended precision. */ +#if defined(__i386__) || defined(__amd64__) +#define __LINUX_NPXCW__ 0x37f +#endif + #endif /* _LINUX_MISC_H_ */ ==== //depot/projects/usb/src/sys/dev/ale/if_ale.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ /* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */ #include -__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.3 2008/12/03 09:01:12 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ale/if_ale.c,v 1.4 2009/03/05 00:04:32 yongari Exp $"); #include #include @@ -1543,20 +1543,11 @@ struct ale_softc *sc; struct ifnet *ifp; int pmc; - uint16_t cmd, pmstat; + uint16_t pmstat; sc = device_get_softc(dev); ALE_LOCK(sc); - /* - * Clear INTx emulation disable for hardwares that - * is set in resume event. From Linux. - */ - cmd = pci_read_config(sc->ale_dev, PCIR_COMMAND, 2); - if ((cmd & 0x0400) != 0) { - cmd &= ~0x0400; - pci_write_config(sc->ale_dev, PCIR_COMMAND, cmd, 2); - } if (pci_find_extcap(sc->ale_dev, PCIY_PMG, &pmc) == 0) { /* Disable PME and clear PME status. */ pmstat = pci_read_config(sc->ale_dev, ==== //depot/projects/usb/src/sys/dev/ath/if_ath.c#18 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.238 2009/02/24 00:12:16 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.239 2009/03/05 00:15:43 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -6861,6 +6861,22 @@ return !ath_hal_setintmit(sc->sc_ah, intmit) ? EINVAL : 0; } +#ifdef ATH_SUPPORT_TDMA +static int +ath_sysctl_setcca(SYSCTL_HANDLER_ARGS) +{ + struct ath_softc *sc = arg1; + int setcca, error; + + setcca = sc->sc_setcca; + error = sysctl_handle_int(oidp, &setcca, 0, req); + if (error || !req->newptr) + return error; + sc->sc_setcca = (setcca != 0); + return 0; +} +#endif /* ATH_SUPPORT_TDMA */ + static void ath_sysctlattach(struct ath_softc *sc) { @@ -6974,6 +6990,9 @@ SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, "superframe", CTLFLAG_RD, &sc->sc_tdmabintval, 0, "TDMA calculated super frame"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO, + "setcca", CTLTYPE_INT | CTLFLAG_RW, sc, 0, + ath_sysctl_setcca, "I", "enable CCA control"); } #endif } @@ -7423,7 +7442,8 @@ ath_hal_intrset(ah, 0); ath_beaconq_config(sc); /* setup h/w beacon q */ - ath_hal_setcca(ah, AH_FALSE); /* disable CCA */ + if (sc->sc_setcca) + ath_hal_setcca(ah, AH_FALSE); /* disable CCA */ ath_tdma_bintvalsetup(sc, tdma); /* calculate beacon interval */ ath_tdma_settimers(sc, sc->sc_tdmabintval, sc->sc_tdmabintval | HAL_BEACON_RESET_TSF); ==== //depot/projects/usb/src/sys/dev/ath/if_athvar.h#14 (text+ko) ==== @@ -26,7 +26,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGES. * - * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.80 2009/02/24 00:12:16 sam Exp $ + * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.81 2009/03/05 00:15:43 sam Exp $ */ /* @@ -255,6 +255,7 @@ sc_wmetkipmic:1,/* can do WME+TKIP MIC */ sc_resume_up: 1,/* on resume, start all vaps */ sc_tdma : 1,/* TDMA in use */ + sc_setcca : 1,/* set/clr CCA with TDMA */ sc_resetcal : 1;/* reset cal state next trip */ uint32_t sc_eerd; /* regdomain from EEPROM */ uint32_t sc_eecc; /* country code from EEPROM */ ==== //depot/projects/usb/src/sys/dev/pci/pci.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.372 2009/03/04 18:23:48 rnoland Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.375 2009/03/06 11:24:42 rnoland Exp $"); #include "opt_bus.h" @@ -71,10 +71,10 @@ #define ACPI_PWR_FOR_SLEEP(x, y, z) #endif -static uint32_t pci_mapbase(unsigned mapreg); -static const char *pci_maptype(unsigned mapreg); -static int pci_mapsize(unsigned testval); -static int pci_maprange(unsigned mapreg); +static pci_addr_t pci_mapbase(uint64_t mapreg); +static const char *pci_maptype(uint64_t mapreg); +static int pci_mapsize(uint64_t testval); +static int pci_maprange(uint64_t mapreg); static void pci_fixancient(pcicfgregs *cfg); static int pci_porten(device_t pcib, int b, int s, int f); @@ -316,8 +316,8 @@ /* return base address of memory or port map */ -static uint32_t -pci_mapbase(uint32_t mapreg) +static pci_addr_t +pci_mapbase(uint64_t mapreg) { if (PCI_BAR_MEM(mapreg)) @@ -329,7 +329,7 @@ /* return map type of memory or port map */ static const char * -pci_maptype(unsigned mapreg) +pci_maptype(uint64_t mapreg) { if (PCI_BAR_IO(mapreg)) @@ -342,7 +342,7 @@ /* return log2 of map size decoded for memory or port map */ static int -pci_mapsize(uint32_t testval) +pci_mapsize(uint64_t testval) { int ln2size; @@ -361,7 +361,7 @@ /* return log2 of address range supported by map register */ static int -pci_maprange(unsigned mapreg) +pci_maprange(uint64_t mapreg) { int ln2range = 0; @@ -2279,8 +2279,7 @@ int b, int s, int f, int reg, struct resource_list *rl, int force, int prefetch) { - uint32_t map; - pci_addr_t base; + pci_addr_t base, map; pci_addr_t start, end, count; uint8_t ln2size; uint8_t ln2range; @@ -2291,6 +2290,10 @@ struct resource *res; map = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); + ln2range = pci_maprange(map); + if (ln2range == 64) + map |= (uint64_t)PCIB_READ_CONFIG(pcib, b, s, f, reg + 4, 4) << + 32; /* * Disable decoding via the command register before @@ -2308,17 +2311,25 @@ */ PCIB_WRITE_CONFIG(pcib, b, s, f, reg, 0xffffffff, 4); testval = PCIB_READ_CONFIG(pcib, b, s, f, reg, 4); + if (ln2range == 64) { + PCIB_WRITE_CONFIG(pcib, b, s, f, reg + 4, 0xffffffff, 4); + testval |= (uint64_t)PCIB_READ_CONFIG(pcib, b, s, f, reg + 4, + 4) << 32; + } /* Restore the BAR and command register. */ PCIB_WRITE_CONFIG(pcib, b, s, f, reg, map, 4); + if (ln2range == 64) + PCIB_WRITE_CONFIG(pcib, b, s, f, reg + 4, map >> 32, 4); PCIB_WRITE_CONFIG(pcib, b, s, f, PCIR_COMMAND, cmd, 2); - if (PCI_BAR_MEM(map)) + if (PCI_BAR_MEM(map)) { type = SYS_RES_MEMORY; - else + if (map & PCIM_BAR_MEM_PREFETCH) + prefetch = 1; + } else type = SYS_RES_IOPORT; ln2size = pci_mapsize(testval); - ln2range = pci_maprange(testval); base = pci_mapbase(map); barlen = ln2range == 64 ? 2 : 1; @@ -2335,12 +2346,6 @@ (type == SYS_RES_IOPORT && ln2size < 2)) return (barlen); - if (ln2range == 64) - /* - * Read the other half of a 64bit map register. We - * assume that the size of the BAR is less than 2^32. - */ - base |= (uint64_t) PCIB_READ_CONFIG(pcib, b, s, f, reg + 4, 4) << 32; if (bootverbose) { printf("\tmap[%02x]: type %s, range %2d, base %#jx, size %2d", reg, pci_maptype(map), ln2range, (uintmax_t)base, ln2size); @@ -2915,7 +2920,7 @@ return(bus_generic_teardown_intr(dev, child, irq, cookie)); rid = rman_get_rid(irq); - if (rid > 0) { + if (rid == 0) { /* Mask INTx */ pci_set_command_bit(dev, child, PCIM_CMD_INTxDIS); } else { @@ -3419,7 +3424,7 @@ struct resource *res; pci_addr_t map, testval; uint16_t cmd; - int mapsize; + int maprange, mapsize; /* * Weed out the bogons, and figure out how large the BAR/map @@ -3430,6 +3435,9 @@ */ res = NULL; map = pci_read_config(child, *rid, 4); + maprange = pci_maprange(map); + if (maprange == 64) + map |= (pci_addr_t)pci_read_config(child, *rid + 4, 4) << 32; /* * Disable decoding via the command register before @@ -3443,8 +3451,11 @@ /* Determine the BAR's length. */ pci_write_config(child, *rid, 0xffffffff, 4); testval = pci_read_config(child, *rid, 4); - if (pci_maprange(testval) == 64) - map |= (pci_addr_t)pci_read_config(child, *rid + 4, 4) << 32; + if (maprange == 64) { + pci_write_config(child, *rid + 4, 0xffffffff, 4); + testval |= (pci_addr_t)pci_read_config(child, *rid + 4, 4) << + 32; + } /* * Restore the original value of the BAR. We may have reprogrammed @@ -3452,6 +3463,8 @@ * we need the console device addressable. */ pci_write_config(child, *rid, map, 4); + if (maprange == 64) + pci_write_config(child, *rid + 4, map, 4); pci_write_config(child, PCIR_COMMAND, cmd, 2); /* Ignore a BAR with a base of 0. */ @@ -3488,6 +3501,8 @@ count = 1UL << mapsize; if (RF_ALIGNMENT(flags) < mapsize) flags = (flags & ~RF_ALIGNMENT_MASK) | RF_ALIGNMENT_LOG2(mapsize); + if (PCI_BAR_MEM(testval) && (testval & PCIM_BAR_MEM_PREFETCH)) + flags |= RF_PREFETCHABLE; /* * Allocate enough resource, and then write back the @@ -3516,7 +3531,7 @@ count, *rid, type, rman_get_start(res)); map = rman_get_start(res); pci_write_config(child, *rid, map, 4); - if (pci_maprange(testval) == 64) + if (maprange == 64) pci_write_config(child, *rid + 4, map >> 32, 4); out:; return (res); ==== //depot/projects/usb/src/sys/dev/pci/pcireg.h#12 (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/pci/pcireg.h,v 1.70 2009/03/02 19:00:41 rnoland Exp $ + * $FreeBSD: src/sys/dev/pci/pcireg.h,v 1.71 2009/03/05 15:33:04 jhb Exp $ * */ @@ -132,7 +132,7 @@ #define PCIM_BAR_MEM_1MB 2 /* Locate below 1MB in PCI <= 2.1 */ #define PCIM_BAR_MEM_64 4 #define PCIM_BAR_MEM_PREFETCH 0x00000008 -#define PCIM_BAR_MEM_BASE 0xfffffff0 +#define PCIM_BAR_MEM_BASE 0xfffffffffffffff0ULL #define PCIM_BAR_IO_RESERVED 0x00000002 #define PCIM_BAR_IO_BASE 0xfffffffc #define PCIR_CIS 0x28 ==== //depot/projects/usb/src/sys/dev/puc/pucdata.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.70 2009/02/12 10:39:19 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/puc/pucdata.c,v 1.71 2009/03/05 16:43:33 jhb Exp $"); /* * PCI "universal" communications card driver configuration data (used to @@ -761,6 +761,18 @@ PUC_PORT_2P, 0x10, 8, 0, }, + /* + * This is more specific than the generic NM9835 entry that follows, and + * is placed here to _prevent_ puc from claiming this single port card. + * + * uart(4) will claim this device. + */ + { 0x9710, 0x9835, 0x1000, 1, + "NetMos NM9835 based 1-port serial", + DEFAULT_RCLK, + PUC_PORT_1S, 0x10, 4, 0, + }, + { 0x9710, 0x9835, 0xffff, 0, "NetMos NM9835 Dual UART and 1284 Printer port", DEFAULT_RCLK, ==== //depot/projects/usb/src/sys/dev/uart/uart_bus_pci.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.12 2009/02/11 00:08:03 kaiw Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_pci.c,v 1.13 2009/03/05 16:43:33 jhb Exp $"); #include #include @@ -110,6 +110,7 @@ { 0x1415, 0x950b, 0xffff, 0, "Oxford Semiconductor OXCB950 Cardbus 16950 UART", 0x10, 16384000 }, { 0x151f, 0x0000, 0xffff, 0, "TOPIC Semiconductor TP560 56k modem", 0x10 }, +{ 0x9710, 0x9835, 0x1000, 1, "NetMos NM9835 Serial Port", 0x10 }, { 0xdeaf, 0x9051, 0xffff, 0, "Middle Digital PC Weasel Serial Port", 0x10 }, { 0xffff, 0, 0xffff, 0, NULL, 0, 0} }; ==== //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci.c,v 1.2 2009/02/24 03:39:13 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci.c,v 1.3 2009/03/06 17:13:12 thompsa Exp $"); #include #include @@ -2197,11 +2197,9 @@ /* put transfer on interrupt queue */ ehci_transfer_intr_enqueue(xfer); - /* Performance quirk: Some Host Controllers have a too low + /* XXX Performance quirk: Some Host Controllers have a too low * interrupt rate. Issue an IAAD to stimulate the Host - * Controller after queueing the BULK transfer. Performance - * increase seen using an off the shelf flash stick: 9 - * Mbytes/second. --hps + * Controller after queueing the BULK transfer. */ temp = EOREAD4(sc, EHCI_USBCMD); if (!(temp & EHCI_CMD_IAAD)) ==== //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/uftdi.c,v 1.3 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/uftdi.c,v 1.4 2009/03/06 14:53:51 joerg Exp $"); /* * NOTE: all function names beginning like "uftdi_cfg_" can only @@ -201,7 +201,9 @@ MODULE_DEPEND(uftdi, usb, 1, 1, 1); static struct usb2_device_id uftdi_devs[] = { + {USB_VPI(USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_STK541, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_DRESDENELEKTRONIK, USB_PRODUCT_DRESDENELEKTRONIK_SENSORTERMINALBOARD, UFTDI_TYPE_8U232AM)}, + {USB_VPI(USB_VENDOR_DRESDENELEKTRONIK, USB_PRODUCT_DRESDENELEKTRONIK_WIRELESSHANDHELDTERMINAL, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX, UFTDI_TYPE_SIO)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C, UFTDI_TYPE_8U232AM)}, {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM, UFTDI_TYPE_8U232AM)}, ==== //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#4 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umodem.c,v 1.4 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/serial/umodem.c,v 1.5 2009/03/05 16:15:07 thompsa Exp $"); /*- * Copyright (c) 2003, M. Warner Losh . ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/usb_dev.c,v 1.7 2009/02/28 17:20:00 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/usb/usb_dev.c,v 1.8 2009/03/05 19:20:17 thompsa Exp $ */ /*- * Copyright (c) 2006-2008 Hans Petter Selasky. All rights reserved. * @@ -1072,16 +1072,12 @@ struct usb2_cdev_privdata* cpd; struct usb2_fifo *f; struct usb2_mbuf *m; - int fflags; - int err, revents; + int fflags, revents; - err = devfs_get_cdevpriv((void **)&cpd); - if (err != 0) - return (devfs_no_poll(dev, events, td)); - - err = usb2_ref_device(cpd, 0 /* no uref */ ); - if (err) - return (devfs_no_poll(dev, events, td)); + if (devfs_get_cdevpriv((void **)&cpd) != 0 || + usb2_ref_device(cpd, 0) != 0) + return (events & + (POLLHUP|POLLIN|POLLRDNORM|POLLOUT|POLLWRNORM)); fflags = cpd->fflags; ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#48 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.404 2009/03/04 03:47:57 thompsa Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.405 2009/03/06 14:53:51 joerg Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -911,6 +911,7 @@ product ATHEROS2 AR5523_3_NF 0x0006 AR5523 (no firmware) /* Atmel Comp. products */ +product ATMEL STK541 0x2109 Zigbee Controller product ATMEL UHB124 0x3301 UHB124 hub product ATMEL DWL120 0x7603 DWL-120 Wireless Adapter product ATMEL BW002 0x7605 BW002 Wireless Adapter @@ -1174,6 +1175,7 @@ /* dresden elektronik products */ product DRESDENELEKTRONIK SENSORTERMINALBOARD 0x0001 SensorTerminalBoard +product DRESDENELEKTRONIK WIRELESSHANDHELDTERMINAL 0x0004 Wireless Handheld Terminal /* Dynastream Innovations */ product DYNASTREAM ANTDEVBOARD 0x1003 ANT dev board ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#6 (text+ko) ==== @@ -1,9 +1,9 @@ -/* $FreeBSD: src/sys/dev/usb/wlan/if_rum.c,v 1.6 2009/03/02 05:37:05 thompsa Exp $ */ +/* $FreeBSD: head/sys/dev/usb/wlan/if_rum.c 189275 2009-03-02 05:37:05Z thompsa $ */ /*- * Copyright (c) 2005-2007 Damien Bergamini * Copyright (c) 2006 Niall O'Higgins - * Copyright (c) 2007-2008 Hans Petter Selasky + * Copyright (c) 2007-2008 Hans Petter Selasky * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/wlan/if_rum.c,v 1.6 2009/03/02 05:37:05 thompsa Exp $"); +__FBSDID("$FreeBSD: head/sys/dev/usb/wlan/if_rum.c 189275 2009-03-02 05:37:05Z thompsa $"); /*- * Ralink Technology RT2501USB/RT2601USB chipset driver @@ -172,7 +172,6 @@ static void rum_update_slot(struct ifnet *); static void rum_set_bssid(struct rum_softc *, const uint8_t *); static void rum_set_macaddr(struct rum_softc *, const uint8_t *); -static void rum_update_mcast(struct ifnet *); static void rum_update_promisc(struct ifnet *); static const char *rum_get_rf(int); static void rum_read_eeprom(struct rum_softc *); @@ -194,7 +193,7 @@ static void rum_amrr_start(struct rum_softc *, struct ieee80211_node *); static void rum_amrr_timeout(void *); -static uint8_t rum_pause(struct rum_softc *, unsigned int); +static int rum_pause(struct rum_softc *, int); static void rum_queue_command(struct rum_softc *, usb2_proc_callback_t *, struct usb2_proc_msg *, struct usb2_proc_msg *); @@ -450,7 +449,7 @@ uint8_t bands; /* retrieve RT2573 rev. no */ - for (ntries = 0; ntries != 100; ntries++) { + for (ntries = 0; ntries < 100; ntries++) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Mar 6 22:00:10 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E41D71065673; Fri, 6 Mar 2009 22:00: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 A34BB106566C for ; Fri, 6 Mar 2009 22:00:09 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8525C8FC0C for ; Fri, 6 Mar 2009 22:00:09 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n26M09le085662 for ; Fri, 6 Mar 2009 22:00:09 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n26M0932085660 for perforce@freebsd.org; Fri, 6 Mar 2009 22:00:09 GMT (envelope-from gabor@freebsd.org) Date: Fri, 6 Mar 2009 22:00:09 GMT Message-Id: <200903062200.n26M0932085660@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 158803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2009 22:00:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=158803 Change 158803 by gabor@gabor_server on 2009/03/06 21:59:39 - Clean up of NLS catalogs Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/Makefile#18 edit .. //depot/projects/soc2008/gabor_textproc/grep/file.c#40 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#82 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#7 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#6 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#6 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#18 (text+ko) ==== @@ -27,7 +27,8 @@ .endif .if !defined(WITHOUT_NLS) -NLS= hu_HU.ISO8859-2 +NLS= es_ES.ISO8859-1 +NLS+= hu_HU.ISO8859-2 NLS+= pt_BR.ISO8859-1 NLSSRCFILES= ${NLS:S@$@.msg@} .for lang in ${NLS} ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#40 (text+ko) ==== @@ -86,7 +86,7 @@ if (bzerr == BZ_STREAM_END) return (-1); else if (bzerr != BZ_SEQUENCE_ERROR && bzerr != BZ_OK) - errx(2, getstr(16)); + errx(2, getstr(2)); return (c); } return (-1); ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#82 (text+ko) ==== @@ -64,21 +64,17 @@ char *errstr[] = { "", /* 1*/ "(standard input)", -/* 2*/ "(fd %d)", -/* 3*/ "invalid file type", +/* 2*/ "cannot read bzip2 compressed file", +/* 3*/ "unknown --color option", /* 4*/ "usage: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n", /* 5*/ "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n", /* 6*/ "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n", /* 7*/ "\t[--null] [pattern] [file ...]\n", -/* 8*/ "parentheses not balanced", +/* 8*/ "value out of range", /* 9*/ "context out of range", /*10*/ "%s (BSD grep) %s\n", /*11*/ "unknown --binary-files option", -/*12*/ "Binary file %s matches\n", -/*13*/ "value out of range", -/*14*/ "unknown -d or --directory option", -/*15*/ "unknown --color option", -/*16*/ "cannot read bzip2 compressed file", +/*12*/ "Binary file %s matches\n" }; /* Flags passed to regcomp() and regexec() */ @@ -421,7 +417,7 @@ } else if (strcmp("skip", optarg) == 0) dirbehave = DIR_SKIP; else if (strcmp("read", optarg) != 0) - errx(2, getstr(13)); + errx(2, getstr(8)); break; case 'E': grepbehave = GREP_EXTENDED; @@ -470,7 +466,7 @@ mflag++; mcount = strtoull(optarg, (char **)NULL, 10); if ((errno == ERANGE) && (mcount == ULLONG_MAX)) - err(2, getstr(13)); + err(2, getstr(8)); break; case 'n': nflag = 1; @@ -540,7 +536,7 @@ } else if (strcmp("never", optarg) == 0) color = NULL; else - errx(2, getstr(15)); + errx(2, getstr(3)); break; case LABEL_OPT: label = optarg; ==== //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#7 (text+ko) ==== @@ -3,19 +3,14 @@ $set 1 $quote " 1 "(standard input)" -2 "(fd %d)" -3 "invalid file type" +2 "cannot read bzip2 compressed file" +3 "unknown --color option" 4 "usage: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n" 5 "\t[-e pattern] [-f file] [--binary-files=value] [--color=when]\n" 6 "\t[--context[=num]] [--directories=action] [--label] [--line-buffered]\n" 7 "\t[--null] [pattern] [file ...]\n" -8 "parentheses not balanced" +8 "value out of range" 9 "context out of range" 10 "%s (BSD grep) %s\n" 11 "unknown --binary-files option" 12 "Binary file %s matches\n" -13 "value out of range" -14 "unknown -d or --directory option" -15 "unknown --color option" -16 "cannot read bzip2 compressed file" -17 "PCRE is not enabled in this version of grep. To enable this feature, please install libpcre and recompile grep with WITH_PCRE set." ==== //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#6 (text+ko) ==== @@ -3,19 +3,14 @@ $set 1 $quote " 1 "(szabványos bemenet)" -2 "(fájlleíró %d)" -3 "érvénytelen fájltípus" +2 "bzip2 tömörített fájl nem olvasható" +3 "ismeretlen --color opció" 4 "használat: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-A szám] [-B szám] [-C[szám]]\n" 5 "\t[-e minta] [-f fájl] [--binary-files=érték] [--color=mikor]\n" 6 "\t[--context[=szám]] [--directories=művelet] [--label] [--line-buffered]\n" 7 "\t[--null] [minta] [fájl ...]\n" -8 "párosítatlan zárójelek" +8 "az érték a megengedett tartományon kívül esik" 9 "a kontextus a megengedett tartományon kívül esik" 10 "%s (BSD grep) %s\n" 11 "ismeretlen --binary-files opció" 12 "%s bináris fájl illeszkedik\n" -13 "az érték a megengedett tartományon kívül esik" -14 "ismeretlen -d vagy --directory opció" -15 "ismeretlen --color opció" -16 "bzip2 tömörített fájl nem olvasható" -17 "A PCRE nem aktivált a grep ezen verziójában. A funkció aktiválásához kérjük telepítse a libpcre könyvtárat és fordítsa újra a grep programot a WITH_PCRE opcióval." ==== //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#6 (text+ko) ==== @@ -3,18 +3,14 @@ $set 1 $quote " 1 "(entrada padrăo)" -2 "(fd %d)" -3 "tipo de arquivo inválido" +2 "năo se posso ler o fichero comprimido bzip2" +3 "opcăo năo conhecida de --color" 4 "uso: %s [-abcDEFGHhIiJLlmnOoPqRSsUVvwxZ] [-A num] [-B num] [-C[num]]\n" 5 "\t[-e padrăo] [-f arquivo] [--binary-files=valor] [--color=quando]\n" 6 "\t[--context[=num]] [--directories=açăo] [--label] [--line-buffered]\n" 7 "\t[--null] [padrăo] [arquivo ...]\n" -8 "paręnteses nâo balanceados" +8 "el valor está fora da escala" 9 "contexto está fora da escala" 10 "%s (BSD grep) %s\n" 11 "opcăo năo conhecida de --binary-files" 12 "arquivo binário %s casa com o padrăo\n" -13 "el valor está fora da escala" -14 "opcăo năo conhecida de -d ou --directory" -15 "opcăo năo conhecida de --color" -16 "năo se posso ler o fichero comprimido bzip2" From owner-p4-projects@FreeBSD.ORG Fri Mar 6 22:23:35 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 705091065672; Fri, 6 Mar 2009 22:23:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F620106566C for ; Fri, 6 Mar 2009 22:23:35 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1BF968FC13 for ; Fri, 6 Mar 2009 22:23:35 +0000 (UTC) (envelope-from sson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n26MNXOY088606 for ; Fri, 6 Mar 2009 22:23:33 GMT (envelope-from sson@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n26MNXjK088604 for perforce@freebsd.org; Fri, 6 Mar 2009 22:23:33 GMT (envelope-from sson@FreeBSD.org) Date: Fri, 6 Mar 2009 22:23:33 GMT Message-Id: <200903062223.n26MNXjK088604@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sson@FreeBSD.org using -f From: Stacey Son To: Perforce Change Reviews Cc: Subject: PERFORCE change 158804 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Mar 2009 22:23:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=158804 Change 158804 by sson@sson_amd64 on 2009/03/06 22:23:04 Add new routines to convert between local and BSM constants for fcntl(2) command value. Affected files ... .. //depot/projects/trustedbsd/openbsm/NEWS#36 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#44 edit .. //depot/projects/trustedbsd/openbsm/configure#51 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.am#9 edit .. //depot/projects/trustedbsd/openbsm/libbsm/Makefile.in#14 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_fcntl_cmd.3#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#1 add .. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.3#17 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.am#4 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.in#6 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#1 add .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/NEWS#36 (text+ko) ==== @@ -8,6 +8,9 @@ commands are not supported. - Add default for 'expire-after' in audit_control to expire trail files when the audit directory is more than 10 megabytes ('10M'). +- Interface to convert between local and BSM fcntl(2) command values has been + added: au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with + definitions of constants in audit_fcntl.h. OpenBSM 1.1 beta 1 @@ -440,4 +443,4 @@ to support reloading of kernel event table. - Allow comments in /etc/security configuration files. -$P4: //depot/projects/trustedbsd/openbsm/NEWS#35 $ +$P4: //depot/projects/trustedbsd/openbsm/NEWS#36 $ ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#44 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#43 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#44 $ */ #ifndef _LIBBSM_H_ @@ -831,10 +831,12 @@ */ int au_bsm_to_domain(u_short bsm_domain, int *local_domainp); int au_bsm_to_errno(u_char bsm_error, int *errorp); +int au_bsm_to_fcntl_cmd(u_short bsm_fcntl_cmd, int *local_fcntl_cmdp); int au_bsm_to_socket_type(u_short bsm_socket_type, int *local_socket_typep); u_short au_domain_to_bsm(int local_domain); u_char au_errno_to_bsm(int local_errno); +u_short au_fcntl_cmd_to_bsm(int local_fcntl_command); u_short au_socket_type_to_bsm(int local_socket_type); const char *au_strerror(u_char bsm_error); ==== //depot/projects/trustedbsd/openbsm/configure#51 (xtext) ==== @@ -1,12 +1,12 @@ #! /bin/sh -# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#49 . +# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#50 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for OpenBSM 1.1beta1. +# Generated by GNU Autoconf 2.62 for OpenBSM 1.1beta1. # # Report bugs to . # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -18,7 +18,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -40,17 +40,45 @@ as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' + else + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' + fi + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + # The user is always right. if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -66,8 +94,6 @@ # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -90,7 +116,7 @@ as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -103,17 +129,10 @@ PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -135,7 +154,7 @@ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -161,7 +180,7 @@ as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -243,7 +262,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -264,7 +283,7 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -344,10 +363,10 @@ if test "x$CONFIG_SHELL" != x; then for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -416,9 +435,10 @@ test \$exitcode = 0") || { echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. } @@ -454,7 +474,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -482,7 +502,6 @@ *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -495,19 +514,22 @@ rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir + mkdir conf$$.dir 2>/dev/null fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -532,10 +554,10 @@ as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -861,6 +883,7 @@ MAKEINFO install_sh INSTALL_STRIP_PROGRAM +MKDIR_P mkdir_p AWK SET_MAKE @@ -887,6 +910,19 @@ USE_MACH_IPC_FALSE LTLIBOBJS' ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_maintainer_mode +with_native_includes +enable_shared +enable_static +enable_fast_install +with_gnu_ld +enable_libtool_lock +with_pic +with_tags +enable_dependency_tracking +' ac_precious_vars='build_alias host_alias target_alias @@ -907,6 +943,8 @@ # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -1005,13 +1043,21 @@ datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -1024,13 +1070,21 @@ dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1221,22 +1275,38 @@ ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1256,7 +1326,7 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -1265,16 +1335,16 @@ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1283,22 +1353,38 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi -# Be sure to have absolute directory names. +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; + *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. + case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; } done @@ -1313,7 +1399,7 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1329,10 +1415,10 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 + { $as_echo "$as_me: error: Working directory cannot be determined" >&2 { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 { (exit 1); exit 1; }; } @@ -1340,12 +1426,12 @@ if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1372,12 +1458,12 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. @@ -1426,9 +1512,9 @@ Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1438,25 +1524,25 @@ For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/openbsm] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/openbsm] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1479,6 +1565,7 @@ cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-maintainer-mode enable make rules and dependencies not useful @@ -1527,15 +1614,17 @@ if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1571,7 +1660,7 @@ echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1581,10 +1670,10 @@ if $ac_init_version; then cat <<\_ACEOF OpenBSM configure 1.1beta1 -generated by GNU Autoconf 2.61 +generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1595,7 +1684,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by OpenBSM $as_me 1.1beta1, which was -generated by GNU Autoconf 2.61. Invocation command line was +generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ @@ -1631,7 +1720,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -1666,7 +1755,7 @@ | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; @@ -1718,11 +1807,12 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +$as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -1752,9 +1842,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1769,9 +1859,9 @@ do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1787,8 +1877,8 @@ echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -1830,21 +1920,24 @@ # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do + test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1854,16 +1947,16 @@ # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1880,29 +1973,38 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1912,10 +2014,10 @@ fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1969,8 +2071,8 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;} { (exit 1); exit 1; }; } fi @@ -1985,8 +2087,8 @@ ac_config_headers="$ac_config_headers config/config.h" -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval @@ -1994,8 +2096,8 @@ USE_MAINTAINER_MODE=no fi - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -2015,7 +2117,7 @@ withval=$with_native_includes; cat >>confdefs.h <<\_ACEOF -#define USE_NATIVE_INCLUDES +#define USE_NATIVE_INCLUDES /**/ _ACEOF use_native_includes=true @@ -2037,10 +2139,10 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_MIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MIG in [\\/]* | ?:[\\/]*) @@ -2055,7 +2157,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2067,11 +2169,11 @@ fi MIG=$ac_cv_path_MIG if test -n "$MIG"; then - { echo "$as_me:$LINENO: result: $MIG" >&5 -echo "${ECHO_T}$MIG" >&6; } + { $as_echo "$as_me:$LINENO: result: $MIG" >&5 +$as_echo "$MIG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2088,10 +2190,10 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2104,7 +2206,7 @@ for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2115,11 +2217,11 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } >>> TRUNCATED FOR MAIL (1000 lines) <<<