From lulf at FreeBSD.org Sun Mar 1 00:21:52 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Sun Mar 1 00:21:59 2009 Subject: PERFORCE change 158517 for review Message-ID: <200903010821.n218LpGw046567@repoman.freebsd.org> 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 chiimo4 at yahoo.co.jp Sun Mar 1 00:50:17 2009 From: chiimo4 at yahoo.co.jp (Dr. Chidi Imo Office) Date: Sun Mar 1 00:50:29 2009 Subject: GET BACK. Message-ID: <20090301082050.72139.qmail@web4102.mail.ogk.yahoo.co.jp> ????????????????????????????? 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 lulf at FreeBSD.org Sun Mar 1 01:57:33 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Sun Mar 1 01:57:39 2009 Subject: PERFORCE change 158521 for review Message-ID: <200903010957.n219vVk1064821@repoman.freebsd.org> 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 antab at FreeBSD.org Sun Mar 1 08:07:50 2009 From: antab at FreeBSD.org (Arnar Mar Sig) Date: Sun Mar 1 08:08:09 2009 Subject: PERFORCE change 158533 for review Message-ID: <200903011607.n21G7l08021978@repoman.freebsd.org> 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 antab at FreeBSD.org Sun Mar 1 08:07:52 2009 From: antab at FreeBSD.org (Arnar Mar Sig) Date: Sun Mar 1 08:08:09 2009 Subject: PERFORCE change 158534 for review Message-ID: <200903011607.n21G7mIA021985@repoman.freebsd.org> 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 antab at FreeBSD.org Sun Mar 1 08:07:53 2009 From: antab at FreeBSD.org (Arnar Mar Sig) Date: Sun Mar 1 08:08:09 2009 Subject: PERFORCE change 158535 for review Message-ID: <200903011607.n21G7nxb021992@repoman.freebsd.org> 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 pgj at FreeBSD.org Sun Mar 1 10:48:41 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Sun Mar 1 10:48:48 2009 Subject: PERFORCE change 158551 for review Message-ID: <200903011848.n21ImdMt046518@repoman.freebsd.org> 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 hselasky at FreeBSD.org Sun Mar 1 12:02:07 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Sun Mar 1 12:02:14 2009 Subject: PERFORCE change 158561 for review Message-ID: <200903012002.n21K226O054728@repoman.freebsd.org> 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 hselasky at FreeBSD.org Sun Mar 1 13:28:33 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Sun Mar 1 13:28:39 2009 Subject: PERFORCE change 158563 for review Message-ID: <200903012128.n21LSU7l087390@repoman.freebsd.org> 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 lulf at FreeBSD.org Mon Mar 2 01:36:59 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Mon Mar 2 01:37:05 2009 Subject: PERFORCE change 158580 for review Message-ID: <200903020936.n229auZu042957@repoman.freebsd.org> 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 lulf at FreeBSD.org Mon Mar 2 01:41:02 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Mon Mar 2 01:41:07 2009 Subject: PERFORCE change 158581 for review Message-ID: <200903020941.n229f0Cg043350@repoman.freebsd.org> 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 pgj at FreeBSD.org Mon Mar 2 07:39:06 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Mon Mar 2 07:39:18 2009 Subject: PERFORCE change 158584 for review Message-ID: <200903021539.n22Fd3S2093342@repoman.freebsd.org> 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 pgj at FreeBSD.org Mon Mar 2 08:16:43 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Mon Mar 2 08:16:49 2009 Subject: PERFORCE change 158585 for review Message-ID: <200903021616.n22GGfrP097102@repoman.freebsd.org> 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 lulf at FreeBSD.org Mon Mar 2 10:23:57 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Mon Mar 2 10:24:03 2009 Subject: PERFORCE change 158590 for review Message-ID: <200903021823.n22INs3j024536@repoman.freebsd.org> 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 lulf at FreeBSD.org Mon Mar 2 10:41:15 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Mon Mar 2 10:41:21 2009 Subject: PERFORCE change 158591 for review Message-ID: <200903021841.n22IfCNL025918@repoman.freebsd.org> 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 lulf at FreeBSD.org Mon Mar 2 10:46:22 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Mon Mar 2 10:46:28 2009 Subject: PERFORCE change 158592 for review Message-ID: <200903021846.n22IkHtB026335@repoman.freebsd.org> 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 antab at FreeBSD.org Mon Mar 2 11:26:02 2009 From: antab at FreeBSD.org (Arnar Mar Sig) Date: Mon Mar 2 11:26:09 2009 Subject: PERFORCE change 158593 for review Message-ID: <200903021925.n22JPv9c030815@repoman.freebsd.org> 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 antab at FreeBSD.org Mon Mar 2 11:27:04 2009 From: antab at FreeBSD.org (Arnar Mar Sig) Date: Mon Mar 2 11:27:10 2009 Subject: PERFORCE change 158594 for review Message-ID: <200903021926.n22JQx6t030900@repoman.freebsd.org> 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 gonzo at FreeBSD.org Mon Mar 2 11:48:25 2009 From: gonzo at FreeBSD.org (Oleksandr Tymoshenko) Date: Mon Mar 2 11:48:30 2009 Subject: PERFORCE change 158596 for review Message-ID: <200903021948.n22JmMBn034101@repoman.freebsd.org> 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 gonzo at FreeBSD.org Mon Mar 2 11:54:30 2009 From: gonzo at FreeBSD.org (Oleksandr Tymoshenko) Date: Mon Mar 2 11:54:38 2009 Subject: PERFORCE change 158597 for review Message-ID: <200903021954.n22JsSOe034627@repoman.freebsd.org> 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 rwatson at FreeBSD.org Mon Mar 2 14:12:25 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Mon Mar 2 14:13:43 2009 Subject: PERFORCE change 158607 for review Message-ID: <200903022212.n22MCNpv067170@repoman.freebsd.org> 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 sson at FreeBSD.org Mon Mar 2 17:52:07 2009 From: sson at FreeBSD.org (Stacey Son) Date: Mon Mar 2 17:52:14 2009 Subject: PERFORCE change 158608 for review Message-ID: <200903030152.n231q5IR035684@repoman.freebsd.org> 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 sson at FreeBSD.org Mon Mar 2 19:20:36 2009 From: sson at FreeBSD.org (Stacey Son) Date: Mon Mar 2 19:20:43 2009 Subject: PERFORCE change 158609 for review Message-ID: <200903030320.n233KZiT045220@repoman.freebsd.org> 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 sson at FreeBSD.org Mon Mar 2 19:28:46 2009 From: sson at FreeBSD.org (Stacey Son) Date: Mon Mar 2 19:28:52 2009 Subject: PERFORCE change 158610 for review Message-ID: <200903030328.n233Shfg045898@repoman.freebsd.org> 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 brueffer at FreeBSD.org Tue Mar 3 09:03:39 2009 From: brueffer at FreeBSD.org (Christian Brueffer) Date: Tue Mar 3 09:03:45 2009 Subject: PERFORCE change 158612 for review Message-ID: <200903031703.n23H3aAT088051@repoman.freebsd.org> 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 zec at FreeBSD.org Tue Mar 3 12:57:52 2009 From: zec at FreeBSD.org (Marko Zec) Date: Tue Mar 3 12:57:59 2009 Subject: PERFORCE change 158634 for review Message-ID: <200903032057.n23Kvo5T035604@repoman.freebsd.org> 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 jhb at FreeBSD.org Tue Mar 3 14:47:44 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Tue Mar 3 14:47:51 2009 Subject: PERFORCE change 158635 for review Message-ID: <200903032247.n23MlgTI048368@repoman.freebsd.org> 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 jhb at FreeBSD.org Tue Mar 3 15:10:11 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Tue Mar 3 15:10:17 2009 Subject: PERFORCE change 158637 for review Message-ID: <200903032310.n23NAAtv050967@repoman.freebsd.org> 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 antab at FreeBSD.org Wed Mar 4 01:07:35 2009 From: antab at FreeBSD.org (Arnar Mar Sig) Date: Wed Mar 4 01:07:42 2009 Subject: PERFORCE change 158659 for review Message-ID: <200903040907.n2497X1U067133@repoman.freebsd.org> 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 antab at FreeBSD.org Wed Mar 4 01:20:48 2009 From: antab at FreeBSD.org (Arnar Mar Sig) Date: Wed Mar 4 01:20:54 2009 Subject: PERFORCE change 158660 for review Message-ID: <200903040920.n249Kkit068143@repoman.freebsd.org> 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 hselasky at FreeBSD.org Wed Mar 4 01:31:04 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Wed Mar 4 01:31:12 2009 Subject: PERFORCE change 158661 for review Message-ID: <200903040930.n249UvvB068852@repoman.freebsd.org> 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 hselasky at FreeBSD.org Wed Mar 4 03:21:01 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Wed Mar 4 03:21:07 2009 Subject: PERFORCE change 158662 for review Message-ID: <200903041120.n24BKw8I078799@repoman.freebsd.org> 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 zec at FreeBSD.org Wed Mar 4 04:07:09 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Mar 4 04:07:17 2009 Subject: PERFORCE change 158665 for review Message-ID: <200903041206.n24C6odp083132@repoman.freebsd.org> 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 zec at FreeBSD.org Wed Mar 4 04:48:37 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Mar 4 04:48:45 2009 Subject: PERFORCE change 158667 for review Message-ID: <200903041248.n24CmXQU096348@repoman.freebsd.org> 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 pgj at FreeBSD.org Wed Mar 4 04:53:42 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Wed Mar 4 04:53:47 2009 Subject: PERFORCE change 158668 for review Message-ID: <200903041253.n24CreeG096709@repoman.freebsd.org> 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 zec at FreeBSD.org Wed Mar 4 04:57:47 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Mar 4 04:57:54 2009 Subject: PERFORCE change 158669 for review Message-ID: <200903041257.n24Cviwp097024@repoman.freebsd.org> 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 zec at FreeBSD.org Wed Mar 4 05:43:35 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Mar 4 05:43:41 2009 Subject: PERFORCE change 158670 for review Message-ID: <200903041343.n24DhVYf001807@repoman.freebsd.org> 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 zec at FreeBSD.org Wed Mar 4 06:02:55 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Mar 4 06:03:03 2009 Subject: PERFORCE change 158672 for review Message-ID: <200903041402.n24E2p3P003289@repoman.freebsd.org> 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 zec at FreeBSD.org Wed Mar 4 07:12:04 2009 From: zec at FreeBSD.org (Marko Zec) Date: Wed Mar 4 07:12:10 2009 Subject: PERFORCE change 158673 for review Message-ID: <200903041512.n24FC2pY011308@repoman.freebsd.org> 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 hselasky at FreeBSD.org Wed Mar 4 12:11:12 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Wed Mar 4 12:11:18 2009 Subject: PERFORCE change 158685 for review Message-ID: <200903042011.n24KB9CA055230@repoman.freebsd.org> 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 hselasky at FreeBSD.org Wed Mar 4 14:06:14 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Wed Mar 4 14:06:21 2009 Subject: PERFORCE change 158692 for review Message-ID: <200903042206.n24M6C74077005@repoman.freebsd.org> 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 hselasky at FreeBSD.org Wed Mar 4 14:16:24 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Wed Mar 4 14:16:32 2009 Subject: PERFORCE change 158695 for review Message-ID: <200903042216.n24MGMov077821@repoman.freebsd.org> 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 jhb at FreeBSD.org Thu Mar 5 07:18:57 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Thu Mar 5 07:19:04 2009 Subject: PERFORCE change 158716 for review Message-ID: <200903051518.n25FIt0a019678@repoman.freebsd.org> 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 jhb at FreeBSD.org Thu Mar 5 07:19:59 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Thu Mar 5 07:20:06 2009 Subject: PERFORCE change 158717 for review Message-ID: <200903051519.n25FJve9019745@repoman.freebsd.org> 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 hselasky at FreeBSD.org Thu Mar 5 07:46:53 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Thu Mar 5 07:47:07 2009 Subject: PERFORCE change 158721 for review Message-ID: <200903051546.n25FkRDf021903@repoman.freebsd.org> 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 sson at FreeBSD.org Thu Mar 5 09:27:17 2009 From: sson at FreeBSD.org (Stacey Son) Date: Thu Mar 5 09:27:23 2009 Subject: PERFORCE change 158731 for review Message-ID: <200903051727.n25HRFch041750@repoman.freebsd.org> 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 peter at FreeBSD.org Thu Mar 5 13:46:58 2009 From: peter at FreeBSD.org (Peter Wemm) Date: Thu Mar 5 13:47:06 2009 Subject: PERFORCE change 158752 for review Message-ID: <200903052146.n25Lkfdc079047@repoman.freebsd.org> 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 pgj at FreeBSD.org Thu Mar 5 16:24:39 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Thu Mar 5 16:24:46 2009 Subject: PERFORCE change 158764 for review Message-ID: <200903060024.n260Oc9C094006@repoman.freebsd.org> 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 pgj at FreeBSD.org Thu Mar 5 16:38:57 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Thu Mar 5 16:39:03 2009 Subject: PERFORCE change 158765 for review Message-ID: <200903060038.n260cqeK095127@repoman.freebsd.org> 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 pgj at FreeBSD.org Thu Mar 5 16:38:58 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Thu Mar 5 16:39:14 2009 Subject: PERFORCE change 158766 for review Message-ID: <200903060038.n260cqmY095132@repoman.freebsd.org> 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 sson at FreeBSD.org Fri Mar 6 11:13:22 2009 From: sson at FreeBSD.org (Stacey Son) Date: Fri Mar 6 11:13:28 2009 Subject: PERFORCE change 158797 for review Message-ID: <200903061913.n26JDK4I058177@repoman.freebsd.org> 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 lulf at FreeBSD.org Fri Mar 6 11:14:23 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Fri Mar 6 11:14:29 2009 Subject: PERFORCE change 158798 for review Message-ID: <200903061914.n26JELj1058265@repoman.freebsd.org> 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 thompsa at FreeBSD.org Fri Mar 6 11:30:40 2009 From: thompsa at FreeBSD.org (Andrew Thompson) Date: Fri Mar 6 11:30:47 2009 Subject: PERFORCE change 158799 for review Message-ID: <200903061930.n26JUbKb059650@repoman.freebsd.org> 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 gabor at FreeBSD.org Fri Mar 6 14:00:10 2009 From: gabor at FreeBSD.org (Gabor Kovesdan) Date: Fri Mar 6 14:00:17 2009 Subject: PERFORCE change 158803 for review Message-ID: <200903062200.n26M0932085660@repoman.freebsd.org> 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 sson at FreeBSD.org Fri Mar 6 14:23:36 2009 From: sson at FreeBSD.org (Stacey Son) Date: Fri Mar 6 14:23:44 2009 Subject: PERFORCE change 158804 for review Message-ID: <200903062223.n26MNXjK088604@repoman.freebsd.org> 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) <<< From pgj at FreeBSD.org Sat Mar 7 18:47:43 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Sat Mar 7 18:47:50 2009 Subject: PERFORCE change 158847 for review Message-ID: <200903080247.n282lg8n046895@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158847 Change 158847 by pgj@petymeg on 2009/03/08 02:46:58 IFC Affected files ... .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#7 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xsl#3 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#14 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#41 integrate Differences ... ==== //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#7 (text+ko) ==== @@ -15,7 +15,7 @@ - $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.91 2009/03/05 18:51:31 danger Exp $ + $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.93 2009/03/06 04:41:39 brooks Exp $ @@ -739,48 +739,6 @@ screen.

- - Improving the USB stack in FreeBSD - - -

Technical contact: Luigi Rizzo

- -

The USB stack in FreeBSD suffers from a few problems, including - lack of functionality (e.g. isochronous support for USB2 devices), - lack of documentation (most of the code is undocumented and - derives from other BSD implementations), lack of support (there - is not, to our knowledge, active development of the stack), - and the fact that it is still running under the Giant lock.

- -

There is an alternate USB stack under development but it also - suffers from its own share of problems: while it supports - isochronous transfers for USB2 and does not run under Giant, it is - also almost completely undocumented, and it exports a different API - from the current one, which in turn causes portability problems for - device drivers that run on top of USB. Additionally, it is not in - widespread use.

- -

The goal of this project is to improve the FreeBSD stack in one - of the following ways:

- -
    -
  • Add documentation and isochronous USB2 transfers to the existing - driver. Documentation also includes a detailed description of the - locking requirements to ease the move to a different locking - architecture;
    • -
  • Add documentation and a compatibility layer to the 'new' usb - stack, and verify that the basic functionality is preserved for - widely used drivers (umass, mouse, keyboard, etc.). - This work will likely require some debugging of the new code - which we expect to be less tested than the existing one, and so - more prone to undetected bugs.
    • -
- -

The production of suitable documentation in the source is a key - requirement of the project.

- - - PCI-Hotplug support @@ -1410,7 +1368,7 @@ - + Ports license auditing infrastructure @@ -1601,7 +1559,7 @@ - + NFSv4 ACLs @@ -2120,7 +2078,7 @@ - + SNTP

Technical contact: %developers; ]> - + @@ -106,6 +106,7 @@   (Summer of Code) (Summer of Code 2007) + (Summer of Code 2008) @@ -126,6 +127,7 @@

+ Part of Summer of Code 2008 Part of Summer of Code 2007 Suggested Summer of Code 2009 project idea ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#14 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.68 2009/02/22 02:10:57 jkoshy Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.69 2009/03/06 11:58:35 blackend Exp $ @@ -140,6 +140,33 @@ shared with the widest possible audience. + + Solutions Linux 2009 + http://www.solutionslinux.fr/ + + 2009 + 3 + 31 + + + 2009 + 4 + 2 + + + France + Paris + Paris Expo +
Porte de Versailles
+ + A 3 days event to promote GNU/Linux and Open Source + Software to companies. As usual, a French &os; User Group will + be there + to promote &os;. The access to the event is free of + charge. + + FreeBSD Kernel Internals: Intensive Evening Course http://www.mckusick.com/courses/adveveclass.html ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#41 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.230 2009/03/05 21:57:57 dhn Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.231 2009/03/07 16:04:16 jkois Exp $ @@ -44,11 +44,6 @@ - - - - 3 - 1 From pgj at FreeBSD.org Sat Mar 7 21:06:09 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Sat Mar 7 21:06:20 2009 Subject: PERFORCE change 158850 for review Message-ID: <200903080506.n28567Lj070519@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158850 Change 158850 by pgj@petymeg on 2009/03/08 05:06:06 MFen (www): 1.230 -> 1.231 hu/share/sgml/news.xml 1.68 -> 1.69 hu/share/sgml/events.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#2 edit .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#4 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/events.xml#2 (text+ko) ==== @@ -10,7 +10,7 @@ @@ -173,6 +173,36 @@ közönségre. + + Solutions Linux 2009 + http://www.solutionslinux.fr + + 2009 + 3 + 31 + + + 2009 + 4 + 2 + + + Franciaország + Párizs + Paris Expo +
Porte de Versailles
+ + A GNU/Linux rendszereket és a nyílt + forráskódot elsõsorban vállalatok + számára hirdetõ háromnapos + rendezvény. A szokásos módon + természetesen a &os; képviseletében jelen + lesz a Francia &os; Felhasználók Csoportja. A + rendezvény ingyenesen + látogatható. + + A &os; rendszermag belülrõl: intenzív estis elõadások ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#4 (text+ko) ==== @@ -5,7 +5,7 @@ From hselasky at FreeBSD.org Sun Mar 8 13:42:00 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Sun Mar 8 13:42:07 2009 Subject: PERFORCE change 158868 for review Message-ID: <200903082041.n28KfwFq009886@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158868 Change 158868 by hselasky@hselasky_laptop001 on 2009/03/08 20:41:05 USB CORE: Fix bugs and improve HID parsing. - fix possible memory leak found - fix possible NULL pointer access - fix possible invalid memory read - parsing improvements - reset item data position when a new report ID is detected. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#18 (text+ko) ==== @@ -57,19 +57,25 @@ #include static void hid_clear_local(struct hid_item *); +static uint8_t hid_get_byte(struct hid_data *s, const uint16_t wSize); -#define MAXUSAGE 100 +#define MAXUSAGE 64 +#define MAXPUSH 4 struct hid_data { const uint8_t *start; const uint8_t *end; const uint8_t *p; - struct hid_item cur; - int32_t usages[MAXUSAGE]; - int nu; - int minset; - int multi; - int multimax; + struct hid_item cur[MAXPUSH]; + int32_t usages_min[MAXUSAGE]; + int32_t usages_max[MAXUSAGE]; int kindset; + uint8_t pushlevel; /* current pushlevel */ + uint8_t ncount; /* end usage item count */ + uint8_t icount; /* current usage item count */ + uint8_t nusage; /* end "usages_min/max" index */ + uint8_t iusage; /* current "usages_min/max" index */ + uint8_t ousage; /* current "usages_min/max" offset */ + uint8_t susage; /* usage set flags */ }; /*------------------------------------------------------------------------* @@ -79,6 +85,8 @@ hid_clear_local(struct hid_item *c) { + c->loc.count = 0; + c->loc.size = 0; c->usage = 0; c->usage_minimum = 0; c->usage_maximum = 0; @@ -99,6 +107,12 @@ { struct hid_data *s; + if ((kindset-1) & kindset) { + DPRINTFN(0, "Only one bit can be " + "set in the kindset\n"); + return (NULL); + } + s = malloc(sizeof *s, M_TEMP, M_WAITOK | M_ZERO); s->start = s->p = d; s->end = ((const uint8_t *)d) + len; @@ -112,14 +126,40 @@ void hid_end_parse(struct hid_data *s) { + if (s == NULL) + return; + + free(s, M_TEMP); +} - while (s->cur.next != NULL) { - struct hid_item *hi = s->cur.next->next; +/*------------------------------------------------------------------------* + * get byte from HID descriptor + *------------------------------------------------------------------------*/ +static uint8_t +hid_get_byte(struct hid_data *s, const uint16_t wSize) +{ + const uint8_t *ptr; + uint8_t retval; + + ptr = s->p; + + /* check if end is reached */ + if (ptr == s->end) + return (0); + + /* read out a byte */ + retval = *ptr; + + /* check if data pointer can be advanced by "wSize" bytes */ + if ((s->end - ptr) < wSize) + ptr = s->end; + else + ptr += wSize; + + /* update pointer */ + s->p = ptr; - free(s->cur.next, M_TEMP); - s->cur.next = hi; - } - free(s, M_TEMP); + return (retval); } /*------------------------------------------------------------------------* @@ -128,44 +168,61 @@ int hid_get_item(struct hid_data *s, struct hid_item *h) { - struct hid_item *c = &s->cur; + struct hid_item *c; unsigned int bTag, bType, bSize; uint32_t oldpos; - const uint8_t *data; + int32_t mask; int32_t dval; - const uint8_t *p; - struct hid_item *hi; - int i; + + if (s == NULL) + return (0); + + c = &s->cur[s->pushlevel]; -top: - if (s->multimax != 0) { - if (s->multi < s->multimax) { - c->usage = s->usages[MIN(s->multi, s->nu - 1)]; - s->multi++; + top: + /* check if there is an array of items */ + if ((s->icount != s->ncount) && + (s->iusage != s->nusage)) { + dval = s->usages_min[s->iusage] + s->ousage; + c->usage = dval; + if (dval == s->usages_max[s->iusage]) { + s->iusage ++; + s->ousage = 0; + } else { + s->ousage ++; + } + s->icount ++; + /* + * Only copy HID item, increment position and return + * if correct kindset! + */ + if (s->kindset & (1 << c->kind)) { *h = *c; - c->loc.pos += c->loc.size; - h->next = 0; + DPRINTFN(1, "%u,%u,%u\n", h->loc.pos, + h->loc.size, h->loc.count); + c->loc.pos += c->loc.size * c->loc.count; return (1); - } else { - c->loc.count = s->multimax; - s->multimax = 0; - s->nu = 0; - hid_clear_local(c); } } - for (;;) { - p = s->p; - if ((p >= s->end) || (p < s->start)) - return (0); + + /* reset state variables */ + s->icount = 0; + s->ncount = 0; + s->iusage = 0; + s->nusage = 0; + s->susage = 0; + s->ousage = 0; + hid_clear_local(c); + + /* get next item */ + while (s->p != s->end) { - bSize = *p++; + bSize = hid_get_byte(s, 1); if (bSize == 0xfe) { /* long item */ - bSize = *p++; - bSize |= *p++ << 8; - bTag = *p++; - data = p; - p += bSize; + bSize = hid_get_byte(s, 1); + bSize |= hid_get_byte(s, 1) << 8; + bTag = hid_get_byte(s, 1); bType = 0xff; /* XXX what should it be */ } else { /* short item */ @@ -174,30 +231,33 @@ bSize &= 3; if (bSize == 3) bSize = 4; - data = p; - p += bSize; } - s->p = p; switch (bSize) { case 0: dval = 0; + mask = 0; break; case 1: - dval = (int8_t)*data++; + dval = (int8_t)hid_get_byte(s, 1); + mask = 0xFF; break; case 2: - dval = *data++; - dval |= *data++ << 8; + dval = hid_get_byte(s, 1); + dval |= hid_get_byte(s, 1) << 8; dval = (int16_t)dval; + mask = 0xFFFF; break; case 4: - dval = *data++; - dval |= *data++ << 8; - dval |= *data++ << 16; - dval |= *data++ << 24; + dval = hid_get_byte(s, 1); + dval |= hid_get_byte(s, 1) << 8; + dval |= hid_get_byte(s, 1) << 16; + dval |= hid_get_byte(s, 1) << 24; + mask = 0xFFFFFFFF; break; default: - printf("BAD LENGTH %d\n", bSize); + dval = hid_get_byte(s, bSize); + DPRINTFN(0, "bad length %u (data=0x%02x)\n", + bSize, dval); continue; } @@ -205,44 +265,35 @@ case 0: /* Main */ switch (bTag) { case 8: /* Input */ - if (!(s->kindset & (1 << hid_input))) { - if (s->nu > 0) - s->nu--; - continue; - } c->kind = hid_input; c->flags = dval; ret: if (c->flags & HIO_VARIABLE) { - s->multimax = c->loc.count; - s->multi = 0; + /* range check usage count */ + if (c->loc.count > 255) { + DPRINTFN(0, "Number of " + "items truncated to 255\n"); + s->ncount = 255; + } else + s->ncount = c->loc.count; + + /* + * The "top" loop will return + * one and one item: + */ c->loc.count = 1; - if (s->minset) { - for (i = c->usage_minimum; - i <= c->usage_maximum; - i++) { - s->usages[s->nu] = i; - if (s->nu < MAXUSAGE - 1) - s->nu++; - } - s->minset = 0; + } else { + /* make sure we have a usage */ + if (s->nusage == 0) { + s->usages_min[s->nusage] = 0; + s->usages_max[s->nusage] = 0; + s->nusage = 1; } - goto top; - } else { - *h = *c; - h->next = 0; - c->loc.pos += - c->loc.size * c->loc.count; - hid_clear_local(c); - s->minset = 0; - return (1); + s->ncount = 1; } + goto top; + case 9: /* Output */ - if (!(s->kindset & (1 << hid_output))) { - if (s->nu > 0) - s->nu--; - continue; - } c->kind = hid_output; c->flags = dval; goto ret; @@ -251,27 +302,22 @@ c->collection = dval; c->collevel++; *h = *c; - hid_clear_local(c); - s->nu = 0; return (1); case 11: /* Feature */ - if (!(s->kindset & (1 << hid_feature))) { - if (s->nu > 0) - s->nu--; - continue; - } c->kind = hid_feature; c->flags = dval; goto ret; case 12: /* End collection */ c->kind = hid_endcollection; + if (c->collevel == 0) { + DPRINTFN(0, "invalid end collection\n"); + return (0); + } c->collevel--; *h = *c; - hid_clear_local(c); - s->nu = 0; return (1); default: - printf("Main bTag=%d\n", bTag); + DPRINTFN(0, "Main bTag=%d\n", bTag); break; } break; @@ -303,53 +349,88 @@ break; case 8: c->report_ID = dval; + /* new report - reset position */ + c->loc.pos = 0; break; case 9: c->loc.count = dval; break; case 10: /* Push */ - hi = malloc(sizeof *hi, M_TEMP, M_WAITOK); - *hi = s->cur; - c->next = hi; + s->pushlevel ++; + if (s->pushlevel < MAXPUSH) { + s->cur[s->pushlevel] = *c; + c = &s->cur[s->pushlevel]; + } else { + DPRINTFN(0, "Cannot push " + "item @ %d!\n", s->pushlevel); + } break; case 11: /* Pop */ - hi = c->next; - oldpos = c->loc.pos; - s->cur = *hi; - c->loc.pos = oldpos; - free(hi, M_TEMP); + s->pushlevel --; + if (s->pushlevel < MAXPUSH) { + /* preserve position */ + oldpos = c->loc.pos; + c = &s->cur[s->pushlevel]; + c->loc.pos = oldpos; + } else { + DPRINTFN(0, "Cannot pop " + "item @ %d!\n", s->pushlevel); + } break; default: - printf("Global bTag=%d\n", bTag); + DPRINTFN(0, "Global bTag=%d\n", bTag); break; } break; case 2: /* Local */ switch (bTag) { case 0: - if (bSize == 1) - dval = c->_usage_page | (dval & 0xff); - else if (bSize == 2) - dval = c->_usage_page | (dval & 0xffff); - c->usage = dval; - if (s->nu < MAXUSAGE) - s->usages[s->nu++] = dval; - /* else XXX */ + if (bSize != 4) + dval = (dval & mask) | c->_usage_page; + + if (s->nusage < MAXUSAGE) { + s->usages_min[s->nusage] = dval; + s->usages_max[s->nusage] = dval; + s->nusage ++; + } else { + DPRINTFN(0, "max usage reached!\n"); + } + + /* clear any pending usage sets */ + s->susage = 0; break; case 1: - s->minset = 1; - if (bSize == 1) - dval = c->_usage_page | (dval & 0xff); - else if (bSize == 2) - dval = c->_usage_page | (dval & 0xffff); + s->susage |= 1; + + if (bSize != 4) + dval = (dval & mask) | c->_usage_page; c->usage_minimum = dval; - break; + + goto check_set; case 2: - if (bSize == 1) - dval = c->_usage_page | (dval & 0xff); - else if (bSize == 2) - dval = c->_usage_page | (dval & 0xffff); + s->susage |= 2; + + if (bSize != 4) + dval = (dval & mask) | c->_usage_page; c->usage_maximum = dval; + + check_set: + if (s->susage != 3) + break; + + /* sanity check */ + if ((s->nusage < MAXUSAGE) && + (c->usage_minimum < c->usage_maximum)) { + /* add usage range */ + s->usages_min[s->nusage] = + c->usage_minimum; + s->usages_max[s->nusage] = + c->usage_maximum; + s->nusage ++; + } else { + DPRINTFN(0, "Usage set dropped!\n"); + } + s->susage = 0; break; case 3: c->designator_index = dval; @@ -373,15 +454,16 @@ c->set_delimiter = dval; break; default: - printf("Local bTag=%d\n", bTag); + DPRINTFN(0, "Local bTag=%d\n", bTag); break; } break; default: - printf("default bType=%d\n", bType); + DPRINTFN(0, "default bType=%d\n", bType); break; } } + return (0); } /*------------------------------------------------------------------------* ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.h#13 (text+ko) ==== @@ -70,8 +70,6 @@ uint32_t flags; /* Location */ struct hid_location loc; - /* */ - struct hid_item *next; }; /* prototypes from "usb2_hid.c" */ From hselasky at FreeBSD.org Sun Mar 8 13:55:15 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Sun Mar 8 13:55:21 2009 Subject: PERFORCE change 158869 for review Message-ID: <200903082055.n28KtCJ8020638@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158869 Change 158869 by hselasky@hselasky_laptop001 on 2009/03/08 20:54:31 USB serial: Fix sael init code. Reported by: Alberto Mijares Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#3 (text+ko) ==== @@ -299,6 +299,7 @@ }; struct usb2_device_request req; + usb2_error_t err; uint16_t len; uint8_t buf[0x300]; uint8_t n; @@ -320,25 +321,28 @@ DPRINTFN(0, "too small buffer\n"); continue; } - if (usb2_do_request(udev, NULL, &req, buf)) { - DPRINTFN(0, "request %u failed\n", - (unsigned int)n); - break; - } + err = usb2_do_request(udev, NULL, &req, buf); } else { if (len > (sizeof(setup[0]) - 8)) { DPRINTFN(0, "too small buffer\n"); continue; } - if (usb2_do_request(udev, NULL, &req, - __DECONST(uint8_t *, &setup[n][8]))) { - DPRINTFN(0, "request %u failed\n", - (unsigned int)n); + err = usb2_do_request(udev, NULL, &req, + __DECONST(uint8_t *, &setup[n][8])); + } + if (err) { + DPRINTFN(1, "request %u failed\n", + (unsigned int)n); + /* + * Some of the requests will fail. Stop doing + * requests when we are getting timeouts so + * that we don't block the explore/attach + * thread forever. + */ + if (err == USB_ERR_TIMEOUT) break; - } } } - return; } static int From hselasky at FreeBSD.org Mon Mar 9 05:53:47 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Mon Mar 9 05:53:53 2009 Subject: PERFORCE change 158916 for review Message-ID: <200903091253.n29Crjeo076260@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158916 Change 158916 by hselasky@hselasky_laptop001 on 2009/03/09 12:53:04 USB input: USB mouse patch to address complicated data reporting descriptors. Reported by: Boris Kotzev Affected files ... .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/input/ums.c#4 (text+ko) ==== @@ -117,6 +117,12 @@ uint8_t sc_buttons; uint8_t sc_iid; + uint8_t sc_iid_w; + uint8_t sc_iid_x; + uint8_t sc_iid_y; + uint8_t sc_iid_z; + uint8_t sc_iid_t; + uint8_t sc_iid_btn[UMS_BUTTON_MAX]; uint8_t sc_temp[64]; }; @@ -168,6 +174,7 @@ int32_t dz; int32_t dt; uint8_t i; + uint8_t id; switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -190,42 +197,14 @@ (len > 4) ? buf[4] : 0, (len > 5) ? buf[5] : 0, (len > 6) ? buf[6] : 0, (len > 7) ? buf[7] : 0); - /* - * The M$ Wireless Intellimouse 2.0 sends 1 extra - * leading byte of data compared to most USB - * mice. This byte frequently switches from 0x01 - * (usual state) to 0x02. I assume it is to allow - * extra, non-standard, reporting (say battery-life). - * - * However at the same time it generates a left-click - * message on the button byte which causes spurious - * left-click's where there shouldn't be. This should - * sort that. Currently it's the only user of - * UMS_FLAG_T_AXIS so use it as an identifier. - * - * - * UPDATE: This problem affects the M$ Wireless - * Notebook Optical Mouse, too. However, the leading - * byte for this mouse is normally 0x11, and the - * phantom mouse click occurs when its 0x14. - * - * We probably should switch to some more official quirk. - */ if (sc->sc_iid) { - if (sc->sc_flags & UMS_FLAG_T_AXIS) { - if (*buf == 0x02) { - goto tr_setup; - } - } else { - if (*buf != sc->sc_iid) { - goto tr_setup; - } - } + id = *buf; len--; buf++; } else { + id = 0; if (sc->sc_flags & UMS_FLAG_SBU) { if ((*buf == 0x14) || (*buf == 0x15)) { goto tr_setup; @@ -233,25 +212,37 @@ } } - dw = (sc->sc_flags & UMS_FLAG_W_AXIS) ? - hid_get_data(buf, len, &sc->sc_loc_w) : 0; + if ((sc->sc_flags & UMS_FLAG_W_AXIS) && (id == sc->sc_iid_w)) + dw = hid_get_data(buf, len, &sc->sc_loc_w); + else + dw = 0; - dx = (sc->sc_flags & UMS_FLAG_X_AXIS) ? - hid_get_data(buf, len, &sc->sc_loc_x) : 0; + if ((sc->sc_flags & UMS_FLAG_X_AXIS) && (id == sc->sc_iid_x)) + dx = hid_get_data(buf, len, &sc->sc_loc_x); + else + dx = 0; - dy = (sc->sc_flags & UMS_FLAG_Y_AXIS) ? - -hid_get_data(buf, len, &sc->sc_loc_y) : 0; + if ((sc->sc_flags & UMS_FLAG_Y_AXIS) && (id == sc->sc_iid_y)) + dy = -hid_get_data(buf, len, &sc->sc_loc_y); + else + dy = 0; - dz = (sc->sc_flags & UMS_FLAG_Z_AXIS) ? - -hid_get_data(buf, len, &sc->sc_loc_z) : 0; + if ((sc->sc_flags & UMS_FLAG_Z_AXIS) && (id == sc->sc_iid_z)) + dz = -hid_get_data(buf, len, &sc->sc_loc_z); + else + dz = 0; - if (sc->sc_flags & UMS_FLAG_REVZ) { + if (sc->sc_flags & UMS_FLAG_REVZ) dz = -dz; - } - dt = (sc->sc_flags & UMS_FLAG_T_AXIS) ? - -hid_get_data(buf, len, &sc->sc_loc_t): 0; + + if ((sc->sc_flags & UMS_FLAG_T_AXIS) && (id == sc->sc_iid_t)) + dt = -hid_get_data(buf, len, &sc->sc_loc_t); + else + dt = 0; for (i = 0; i < sc->sc_buttons; i++) { + if (id != sc->sc_iid_btn[i]) + continue; if (hid_get_data(buf, len, &sc->sc_loc_btn[i])) { buttons |= (1 << UMS_BUT(i)); } @@ -413,14 +404,14 @@ goto detach; } if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X), - hid_input, &sc->sc_loc_x, &flags, &sc->sc_iid)) { + hid_input, &sc->sc_loc_x, &flags, &sc->sc_iid_x)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_X_AXIS; } } if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y), - hid_input, &sc->sc_loc_y, &flags, &sc->sc_iid)) { + hid_input, &sc->sc_loc_y, &flags, &sc->sc_iid_y)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_Y_AXIS; @@ -428,9 +419,9 @@ } /* Try the wheel first as the Z activator since it's tradition. */ if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_WHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid) || + HUG_WHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid_z) || hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_TWHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid)) { + HUG_TWHEEL), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid_z)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_Z_AXIS; } @@ -439,14 +430,14 @@ * put the Z on the W coordinate. */ if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_Z), hid_input, &sc->sc_loc_w, &flags, &sc->sc_iid)) { + HUG_Z), hid_input, &sc->sc_loc_w, &flags, &sc->sc_iid_w)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_W_AXIS; } } } else if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, - HUG_Z), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid)) { + HUG_Z), hid_input, &sc->sc_loc_z, &flags, &sc->sc_iid_z)) { if ((flags & MOUSE_FLAGS_MASK) == MOUSE_FLAGS) { sc->sc_flags |= UMS_FLAG_Z_AXIS; @@ -460,7 +451,7 @@ * TWHEEL */ if (hid_locate(d_ptr, d_len, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_TWHEEL), - hid_input, &sc->sc_loc_t, &flags, &sc->sc_iid)) { + hid_input, &sc->sc_loc_t, &flags, &sc->sc_iid_t)) { sc->sc_loc_t.pos += 8; @@ -472,14 +463,14 @@ for (i = 0; i < UMS_BUTTON_MAX; i++) { if (!hid_locate(d_ptr, d_len, HID_USAGE2(HUP_BUTTON, (i + 1)), - hid_input, &sc->sc_loc_btn[i], NULL, &sc->sc_iid)) { + hid_input, &sc->sc_loc_btn[i], NULL, &sc->sc_iid_btn[i])) { break; } } sc->sc_buttons = i; - isize = hid_report_size(d_ptr, d_len, hid_input, NULL); + isize = hid_report_size(d_ptr, d_len, hid_input, &sc->sc_iid); /* * The Microsoft Wireless Notebook Optical Mouse seems to be in worse @@ -495,6 +486,12 @@ sc->sc_buttons = 3; isize = 5; sc->sc_iid = 0; + sc->sc_iid_x = 0; + sc->sc_iid_y = 0; + sc->sc_iid_z = 0; + sc->sc_iid_btn[0] = 0; + sc->sc_iid_btn[1] = 0; + sc->sc_iid_btn[2] = 0; /* 1st byte of descriptor report contains garbage */ sc->sc_loc_x.pos = 16; sc->sc_loc_y.pos = 24; @@ -544,15 +541,21 @@ #if USB_DEBUG DPRINTF("sc=%p\n", sc); - DPRINTF("X\t%d/%d\n", sc->sc_loc_x.pos, sc->sc_loc_x.size); - DPRINTF("Y\t%d/%d\n", sc->sc_loc_y.pos, sc->sc_loc_y.size); - DPRINTF("Z\t%d/%d\n", sc->sc_loc_z.pos, sc->sc_loc_z.size); - DPRINTF("T\t%d/%d\n", sc->sc_loc_t.pos, sc->sc_loc_t.size); - DPRINTF("W\t%d/%d\n", sc->sc_loc_w.pos, sc->sc_loc_w.size); + DPRINTF("X\t%d/%d id=%d\n", sc->sc_loc_x.pos, + sc->sc_loc_x.size, sc->sc_iid_x); + DPRINTF("Y\t%d/%d id=%d\n", sc->sc_loc_y.pos, + sc->sc_loc_y.size, sc->sc_iid_y); + DPRINTF("Z\t%d/%d id=%d\n", sc->sc_loc_z.pos, + sc->sc_loc_z.size, sc->sc_iid_z); + DPRINTF("T\t%d/%d id=%d\n", sc->sc_loc_t.pos, + sc->sc_loc_t.size, sc->sc_iid_t); + DPRINTF("W\t%d/%d id=%d\n", sc->sc_loc_w.pos, + sc->sc_loc_w.size, sc->sc_iid_w); for (i = 0; i < sc->sc_buttons; i++) { - DPRINTF("B%d\t%d/%d\n", - i + 1, sc->sc_loc_btn[i].pos, sc->sc_loc_btn[i].size); + DPRINTF("B%d\t%d/%d id=%d\n", + i + 1, sc->sc_loc_btn[i].pos, + sc->sc_loc_btn[i].size, sc->sc_iid_btn[i]); } DPRINTF("size=%d, id=%d\n", isize, sc->sc_iid); #endif From lulf at FreeBSD.org Mon Mar 9 08:01:58 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Mon Mar 9 08:02:03 2009 Subject: PERFORCE change 158925 for review Message-ID: <200903091501.n29F1ui5004483@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158925 Change 158925 by lulf@lulf_carrot on 2009/03/09 15:01:26 - Bring atmel_spi into the game. It's intention is to work for at91 as well as avr32. Affected files ... .. //depot/projects/avr32/src/sys/conf/files.avr32#12 edit .. //depot/projects/avr32/src/sys/dev/spibus/atmel_spi.c#1 add .. //depot/projects/avr32/src/sys/dev/spibus/spibus.c#2 edit Differences ... ==== //depot/projects/avr32/src/sys/conf/files.avr32#12 (text+ko) ==== @@ -36,6 +36,7 @@ avr32/avr32/at32_sdramc.c optional at32_sdramc avr32/avr32/at32_smc.c optional at32_smc dev/mmc/atmel_mci.c optional atmel_mci +dev/spibus/atmel_spi.c optional atmel_spi 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/spibus/spibus.c#2 (text+ko) ==== @@ -194,5 +194,5 @@ devclass_t spibus_devclass; -DRIVER_MODULE(spibus, at91_spi, spibus_driver, spibus_devclass, 0, 0); +DRIVER_MODULE(spibus, atmel_spi, spibus_driver, spibus_devclass, 0, 0); MODULE_VERSION(spibus, 1); From antab at FreeBSD.org Mon Mar 9 08:50:49 2009 From: antab at FreeBSD.org (Arnar Mar Sig) Date: Mon Mar 9 08:50:55 2009 Subject: PERFORCE change 158933 for review Message-ID: <200903091550.n29Fol9N009785@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158933 Change 158933 by antab@antab_farm on 2009/03/09 15:49:56 Cleanup and bugfix in pmap and related code. PD_MASK and PT_MASK wrongly define causing overlappig in pmap_pte. Add updated version of cfi_disk from Sam Leffler. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/machdep.c#10 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#13 edit .. //depot/projects/avr32/src/sys/avr32/avr32/tlb.c#4 edit .. //depot/projects/avr32/src/sys/avr32/include/atomic.h#6 edit .. //depot/projects/avr32/src/sys/avr32/include/pmap.h#6 edit .. //depot/projects/avr32/src/sys/avr32/include/pte.h#5 edit .. //depot/projects/avr32/src/sys/avr32/include/tlb.h#4 edit .. //depot/projects/avr32/src/sys/dev/cfi/cfi_disk.c#2 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/machdep.c#10 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -282,8 +283,7 @@ u_int32_t get_cyclecount(void) { - avr32_impl(); - return (0); + return sysreg_read(COUNT); } int ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#13 (text+ko) ==== @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -31,6 +32,7 @@ #include #include #include +#include #include // antab: What does this stand for? @@ -42,15 +44,14 @@ static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex, int flags); static int page_is_managed(vm_offset_t pa); static void pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m, boolean_t wired); -static void pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va); +static void pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va); static void free_pv_entry(pv_entry_t pv); static pv_entry_t get_pv_entry(void); static int pmap_remove_pte(struct pmap *pmap, pt_entry_t *ptq, vm_offset_t va); static void pmap_remove_page(struct pmap *pmap, vm_offset_t va); -static struct pmap kernel_pmap_store; -pmap_t kernel_pmap; /**< Kernel pmap */ +struct pmap kernel_pmap_store; vm_offset_t kernel_vm_end = 0; vm_offset_t virtual_avail; /* VA of first avail page (after kernel bss) */ vm_offset_t virtual_end; /* VA of last avail page (end of kernel AS) */ @@ -61,8 +62,18 @@ static uma_zone_t pvzone; static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; +static int shpgperproc = PMAP_SHPGPERPROC; +/** + * Sysctl for tuneing + */ +// i386 and amd64 are using _vm_pmap but i cant find the declare for it.. +SYSCTL_INT(_vm, OID_AUTO, pv_entry_max, CTLFLAG_RD, &pv_entry_max, 0, + "Max number of PV entries"); +SYSCTL_INT(_vm, OID_AUTO, shpgperproc, CTLFLAG_RD, &shpgperproc, 0, + "Page share factor per proc"); + pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t va) { @@ -86,7 +97,6 @@ virtual_end = VM_MAX_KERNEL_ADDRESS; /* Setup kernel pmap */ - kernel_pmap = &kernel_pmap_store; PMAP_LOCK_INIT(kernel_pmap); kernel_pmap->pm_active = ~0; kernel_pmap->pm_asid = 0; @@ -137,10 +147,19 @@ void pmap_init(void) { + /* + * Initialize the address space (zone) for the pv entries. Set a + * high water mark so that the system can recover from excessive + * numbers of pv entries. + */ pvzone = uma_zcreate("PV_ENTRY", sizeof(struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); - pv_entry_max = PMAP_SHPGPERPROC * maxproc + cnt.v_page_count; + + TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); + TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); + pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; pv_entry_high_water = 9 * (pv_entry_max / 10); + uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } @@ -200,13 +219,16 @@ void pmap_activate(struct thread *td) { - struct proc *p; - pmap_t pmap; + pmap_t pmap, oldpmap; + + pmap = vmspace_pmap(td->td_proc->p_vmspace); + oldpmap = PCPU_GET(curpmap); - p = td->td_proc; - pmap = vmspace_pmap(p->p_vmspace); + oldpmap->pm_active = 0; + pmap->pm_active = 1; - pmap_asid_alloc(pmap); + pmap_asid_alloc(pmap); + /* XXX: Set tlbear here? */ PCPU_SET(curpmap, pmap); } @@ -220,10 +242,28 @@ void pmap_clear_modify(vm_page_t m) { + pv_entry_t pv; + pt_entry_t *pte; + + if (m->flags & PG_FICTITIOUS) { + return; + } + 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 + panic("Need to look more into this"); + /* + * Loop over all current mappings + */ + TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) { + PMAP_LOCK(pv->pv_pmap); + + pte = pmap_pte(pv->pv_pmap, pv->pv_va); + KASSERT((pte != NULL || pte != 0), ("Mapped page not found")); + *pte &= ~PTE_DIRTY; + + PMAP_UNLOCK(pv->pv_pmap); + } m->md.pv_flags &= ~PV_TABLE_MOD; } } @@ -291,6 +331,8 @@ return (AVR32_P1_TO_PHYS(va)); else if ((va & AVR32_SEG_MASK) == AVR32_SEG_P2) return (AVR32_P2_TO_PHYS(va)); + else if ((va & AVR32_SEG_MASK) == AVR32_SEG_P4) + return (AVR32_P2_TO_PHYS(va)); return (pmap_extract(kernel_pmap, va)); } @@ -413,6 +455,7 @@ vm_page_lock_queues(); PMAP_LOCK(pmap); + va &= ~PAGE_MASK; mpte = NULL; if (va < VM_MAXUSER_ADDRESS) { mpte = pmap_allocpte(pmap, va, M_WAITOK); @@ -491,13 +534,14 @@ update: newpte = 0; pfn_set(newpte, pa); - if (access & VM_PROT_READ) { + if (prot & VM_PROT_READ) { newpte |= PTE_PERM_READ; } - if (access & VM_PROT_WRITE) { + if (prot & VM_PROT_WRITE) { newpte |= PTE_PERM_WRITE; + vm_page_flag_set(m, PG_WRITEABLE); } - if (access & VM_PROT_EXECUTE) { + if (prot & VM_PROT_EXECUTE) { newpte |= PTE_PERM_EXECUTE; } @@ -530,6 +574,17 @@ } tlb_update_entry(pmap, va, newpte); + /* + * XXX: Sync I & D caches for executable pages. Do this only if the the + * target pmap belongs to the current process. Otherwise, an + * unresolvable TLB miss may occur. + */ + if (pmap == kernel_pmap && (pmap == &curproc->p_vmspace->vm_pmap) && + (prot & VM_PROT_EXECUTE)) { + avr32_icache_sync_range(va, PAGE_SIZE); + avr32_dcache_wbinv_range(va, PAGE_SIZE); + } + vm_page_unlock_queues(); PMAP_UNLOCK(pmap); } @@ -653,8 +708,9 @@ vm_offset_t va; pt_entry_t *pte; - if ((m->flags & PG_WRITEABLE) == 0) - return; + if ((m->flags & PG_WRITEABLE) == 0) { + return; + } /* * Loop over all current mappings setting/clearing as appropos. @@ -881,11 +937,11 @@ page->wire_count++; } else { page = _pmap_allocpte(pmap, pdindex, flags); - if (!page && flags & M_WAITOK) { + if (page == NULL && flags & M_WAITOK) { goto retry; } } - return page; + return (page); } static int @@ -922,7 +978,7 @@ } static void -pmap_remove_entry(struct pmap *pmap, vm_page_t m, vm_offset_t va) +pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va) { pv_entry_t pv; @@ -1005,9 +1061,9 @@ for (p = 0; p < 1024; p++) { ent = base + p; if (*ent) { - printf("0x%x -> 0x%x\n", + printf("0x%08x -> 0x%08x (flags 0x%08x)\n", (i << PD_SHIFT) | (p << PT_SHIFT), - *ent); + *ent & ~PAGE_MASK, *ent & PAGE_MASK); } } } ==== //depot/projects/avr32/src/sys/avr32/avr32/tlb.c#4 (text+ko) ==== @@ -98,6 +98,19 @@ } } +void +tlb_invalidate_range(pmap_t pmap, vm_offset_t start_va, vm_offset_t end_va) +{ + /* + * Look more into this. Maybe its batter to loop thru the tlb + * and invalidate entries that are within start_va and end_va, + * instead of trying to invalidate every page between them. + */ + for (; start_va < end_va; start_va += PAGE_SIZE) { + tlb_remove_entry(pmap, start_va); + } +} + static void tlb_dump_entry(uint32_t index, uint32_t tlbehi, uint32_t tlbelo) { ==== //depot/projects/avr32/src/sys/avr32/include/atomic.h#6 (text+ko) ==== @@ -171,11 +171,21 @@ } static __inline uint32_t -atomic_readandclear_32(volatile u_int32_t *p) +atomic_readandclear_32(volatile u_int32_t *address) { - avr32_impl(); - while(1); - return 0; + uint32_t ret, tmp; + __asm __volatile( + "1:" + "ssrf 5\n" + "ld.w %0, %3\n" + "mov %2, 0\n" + "stcond %1, %2\n" + "brne 1b\n" + : "=&r"(ret), "=m"(*address), "=r" (tmp) + : "m"(*address) + : "cc", "memory"); + + return (ret); } static __inline int ==== //depot/projects/avr32/src/sys/avr32/include/pmap.h#6 (text+ko) ==== @@ -134,7 +134,8 @@ } *pmap_t; #ifdef _KERNEL -#define pmap_kernel() kernel_pmap +extern struct pmap kernel_pmap_store; +#define kernel_pmap (&kernel_pmap_store) #define PMAP_LOCK(pmap) mtx_lock(&(pmap)->pm_mtx) #define PMAP_LOCK_ASSERT(pmap, type) mtx_assert(&(pmap)->pm_mtx, (type)) @@ -172,8 +173,6 @@ #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) -//extern struct segtab * segtab_active; -extern pmap_t kernel_pmap; extern vm_offset_t phys_avail[]; extern vm_offset_t virtual_avail; extern vm_offset_t virtual_end; ==== //depot/projects/avr32/src/sys/avr32/include/pte.h#5 (text+ko) ==== @@ -37,8 +37,8 @@ typedef uint32_t pt_entry_t; /* page table entry (TLBELO register) */ #endif -#define PD_MASK 0xfff00000 /* Bits used to index into page dir */ -#define PT_MASK 0x000ff000 /* Bits used to index into page table */ +#define PD_MASK 0xffe00000 /* Bits used to index into page dir */ +#define PT_MASK 0x003ff000 /* Bits used to index into page table */ #define PD_SHIFT 22 #define PT_SHIFT 12 ==== //depot/projects/avr32/src/sys/avr32/include/tlb.h#4 (text+ko) ==== @@ -35,6 +35,7 @@ void tlb_flush(void); /* Invalid all TLB entries */ void tlb_update_entry(pmap_t, vm_offset_t, pt_entry_t); void tlb_remove_entry(pmap_t, vm_offset_t); +void tlb_invalidate_range(pmap_t, vm_offset_t, vm_offset_t); #endif /* !_MACHINE_TLB_H_ */ ==== //depot/projects/avr32/src/sys/dev/cfi/cfi_disk.c#2 (text+ko) ==== @@ -32,10 +32,13 @@ #include #include #include -#include +#include +#include +#include #include #include #include +#include #include @@ -48,6 +51,10 @@ struct disk *disk; int flags; #define CFI_DISK_OPEN 0x0001 + struct bio_queue_head bioq; /* bio queue */ + struct mtx qlock; /* bioq lock */ + struct taskqueue *tq; /* private task queue for i/o request */ + struct task iotask; /* i/o processing */ }; #define CFI_DISK_SECSIZE 512 @@ -56,6 +63,7 @@ static int cfi_disk_detach(device_t); static int cfi_disk_open(struct disk *); static int cfi_disk_close(struct disk *); +static void cfi_io_proc(void *, int); static void cfi_disk_strategy(struct bio *); static int cfi_disk_ioctl(struct disk *, u_long, void *, int, struct thread *); @@ -98,6 +106,15 @@ sc->disk->d_drv1 = sc; disk_create(sc->disk, DISK_VERSION); + mtx_init(&sc->qlock, "CFID I/O lock", NULL, MTX_DEF); + bioq_init(&sc->bioq); + + sc->tq = taskqueue_create("cfid_taskq", M_NOWAIT, + taskqueue_thread_enqueue, &sc->tq); + taskqueue_start_threads(&sc->tq, 1, PI_DISK, "cfid taskq"); + + TASK_INIT(&sc->iotask, 0, cfi_io_proc, sc); + return 0; } @@ -108,7 +125,10 @@ if (sc->flags & CFI_DISK_OPEN) return EBUSY; + taskqueue_free(sc->tq); + /* XXX drain bioq */ disk_destroy(sc->disk); + mtx_destroy(&sc->qlock); return 0; } @@ -224,10 +244,34 @@ } static void +cfi_io_proc(void *arg, int pending) +{ + struct cfi_disk_softc *sc = arg; + struct cfi_softc *cfi = sc->parent; + struct bio *bp; + + for (;;) { + mtx_lock(&sc->qlock); + bp = bioq_takefirst(&sc->bioq); + mtx_unlock(&sc->qlock); + if (bp == NULL) + break; + + switch (bp->bio_cmd) { + case BIO_READ: + cfi_disk_read(cfi, bp); + break; + case BIO_WRITE: + cfi_disk_write(cfi, bp); + break; + } + } +} + +static void cfi_disk_strategy(struct bio *bp) { struct cfi_disk_softc *sc = bp->bio_disk->d_drv1; - struct cfi_softc *cfi = sc->parent; if (sc == NULL) goto invalid; @@ -238,10 +282,12 @@ } switch (bp->bio_cmd) { case BIO_READ: - cfi_disk_read(cfi, bp); - return; case BIO_WRITE: - cfi_disk_write(cfi, bp); + mtx_lock(&sc->qlock); + /* no value in sorting requests? */ + bioq_insert_tail(&sc->bioq, bp); + mtx_unlock(&sc->qlock); + taskqueue_enqueue(sc->tq, &sc->iotask); return; } /* fall thru... */ @@ -271,4 +317,3 @@ sizeof(struct cfi_disk_softc), }; DRIVER_MODULE(cfid, cfi, cfi_disk_driver, cfi_diskclass, 0, NULL); - From hselasky at FreeBSD.org Mon Mar 9 10:27:02 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Mon Mar 9 10:27:11 2009 Subject: PERFORCE change 158942 for review Message-ID: <200903091726.n29HQSTp033502@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158942 Change 158942 by hselasky@hselasky_laptop001 on 2009/03/09 17:25:29 USB CORE: - make sure we can compile USB without UGEN - remove some unused defines USB controller: - fix a misspelled include Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include -#include +#include #include ==== //depot/projects/usb/src/sys/dev/usb/usb_core.h#3 (text+ko) ==== @@ -38,6 +38,10 @@ #define USB_USE_CONDVAR 0 #endif +#ifndef USB_HAVE_UGEN +#define USB_HAVE_UGEN 1 +#endif + #ifndef USB_TD_GET_PROC #define USB_TD_GET_PROC(td) (td)->td_proc #endif @@ -46,24 +50,6 @@ #define USB_PROC_GET_GID(td) (td)->p_pgid #endif -#ifndef USB_VNOPS_FO_CLOSE -#define USB_VNOPS_FO_CLOSE(fp, td, perr) do { \ - (td)->td_fpop = (fp); \ - *(perr) = vnops.fo_close(fp, td); \ - (td)->td_fpop = NULL; \ -} while (0) -#endif - -#ifndef USB_VNOPS_FO_STAT -#define USB_VNOPS_FO_STAT(fp, sb, cred, td) \ - vnops.fo_stat(fp, sb, cred, td) -#endif - -#ifndef USB_VNOPS_FO_TRUNCATE -#define USB_VNOPS_FO_TRUNCATE(fp, length, cred, td) \ - vnops.fo_truncate(fp, length, cred, td) -#endif - /* Include files */ #include ==== //depot/projects/usb/src/sys/dev/usb/usb_device.c#5 (text+ko) ==== @@ -73,11 +73,14 @@ static usb2_error_t usb2_fill_iface_data(struct usb2_device *, uint8_t, uint8_t); static void usb2_notify_addq(const char *type, struct usb2_device *); + +#if USB_HAVE_UGEN static void usb2_fifo_free_wrap(struct usb2_device *, uint8_t, uint8_t); static struct cdev *usb2_make_dev(struct usb2_device *, int, int); static void usb2_cdev_create(struct usb2_device *); static void usb2_cdev_free(struct usb2_device *); static void usb2_cdev_cleanup(void *); +#endif /* This variable is global to allow easy access to it: */ @@ -543,11 +546,13 @@ /* detach all interface drivers */ usb2_detach_device(udev, USB_IFACE_INDEX_ANY, 1); +#if USB_HAVE_UGEN /* free all FIFOs except control endpoint FIFOs */ usb2_fifo_free_wrap(udev, USB_IFACE_INDEX_ANY, 0); /* free all configuration data structures */ usb2_cdev_free(udev); +#endif usb2_free_iface_data(udev); if (index == USB_UNCONFIG_INDEX) { @@ -657,13 +662,17 @@ goto done; } } +#if USB_HAVE_UGEN /* create device nodes for each endpoint */ usb2_cdev_create(udev); +#endif done: DPRINTF("error=%s\n", usb2_errstr(err)); if (err) { +#if USB_HAVE_UGEN usb2_cdev_free(udev); +#endif usb2_free_iface_data(udev); } if (do_unlock) { @@ -717,11 +726,13 @@ goto done; } } +#if USB_HAVE_UGEN /* * Free all generic FIFOs for this interface, except control * endpoint FIFOs: */ usb2_fifo_free_wrap(udev, iface_index, 0); +#endif err = usb2_fill_iface_data(udev, iface_index, alt_index); if (err) { @@ -1433,13 +1444,17 @@ /* set device index */ udev->device_index = device_index; + /* Create ugen name */ + snprintf(udev->ugen_name, sizeof(udev->ugen_name), + USB_GENERIC_NAME "%u.%u", device_get_unit(bus->bdev), + device_index); +#if USB_HAVE_UGEN /* Create the control endpoint device */ udev->default_dev = usb2_make_dev(udev, 0, FREAD|FWRITE); + /* Create a link from /dev/ugenX.X to the default endpoint */ - snprintf(udev->ugen_name, sizeof(udev->ugen_name), - USB_GENERIC_NAME "%u.%u", device_get_unit(bus->bdev), - device_index); make_dev_alias(udev->default_dev, udev->ugen_name); +#endif if (udev->flags.usb2_mode == USB_MODE_HOST) { @@ -1692,7 +1707,9 @@ parent_hub->hub->ports + port_index : NULL, udev, device_index); /* Link and announce the ugen device name */ +#if USB_HAVE_UGEN udev->ugen_symlink = usb2_alloc_symlink(udev->ugen_name); +#endif printf("%s: <%s> at %s\n", udev->ugen_name, udev->manufacturer, device_get_nameunit(udev->bus->bdev)); @@ -1706,6 +1723,7 @@ return (udev); } +#if USB_HAVE_UGEN static struct cdev * usb2_make_dev(struct usb2_device *udev, int ep, int mode) { @@ -1812,6 +1830,7 @@ { free(arg, M_USBDEV); } +#endif /*------------------------------------------------------------------------* * usb2_free_device @@ -1832,7 +1851,9 @@ /* Destroy UGEN symlink, if any */ if (udev->ugen_symlink) { +#if USB_HAVE_UGEN usb2_free_symlink(udev->ugen_symlink); +#endif udev->ugen_symlink = NULL; } /* @@ -1843,6 +1864,7 @@ udev->parent_hub->hub->ports + udev->port_index : NULL, NULL, USB_ROOT_HUB_ADDR); +#if USB_HAVE_UGEN /* wait for all pending references to go away: */ mtx_lock(&usb2_ref_lock); @@ -1851,11 +1873,13 @@ usb2_cv_wait(udev->default_cv + 1, &usb2_ref_lock); } mtx_unlock(&usb2_ref_lock); +#endif if (udev->flags.usb2_mode == USB_MODE_DEVICE) { /* stop receiving any control transfers (Device Side Mode) */ usb2_transfer_unsetup(udev->default_xfer, USB_DEFAULT_XFER_MAX); } +#if USB_HAVE_UGEN /* free all FIFOs */ usb2_fifo_free_wrap(udev, USB_IFACE_INDEX_ANY, 1); @@ -1863,9 +1887,12 @@ * Free all interface related data and FIFOs, if any. */ usb2_cdev_free(udev); +#endif usb2_free_iface_data(udev); +#if USB_HAVE_UGEN destroy_dev_sched_cb(udev->default_dev, usb2_cdev_cleanup, udev->default_dev->si_drv1); +#endif /* unsetup any leftover default USB transfers */ usb2_transfer_unsetup(udev->default_xfer, USB_DEFAULT_XFER_MAX); @@ -2263,6 +2290,7 @@ devctl_queue_data(data); } +#if USB_HAVE_UGEN /*------------------------------------------------------------------------* * usb2_fifo_free_wrap * @@ -2319,6 +2347,7 @@ usb2_fifo_free(f); } } +#endif /*------------------------------------------------------------------------* * usb2_peer_can_wakeup From hselasky at FreeBSD.org Mon Mar 9 11:18:24 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Mon Mar 9 11:18:30 2009 Subject: PERFORCE change 158948 for review Message-ID: <200903091818.n29IIMaR038855@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158948 Change 158948 by hselasky@hselasky_laptop001 on 2009/03/09 18:18:10 USB CORE: - Make sure we can compile without UGEN. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hub.c#3 (text+ko) ==== @@ -1324,9 +1324,13 @@ * Make relationships to our new device */ if (device_index != 0) { +#if USB_HAVE_UGEN mtx_lock(&usb2_ref_lock); +#endif bus->devices[device_index] = udev; +#if USB_HAVE_UGEN mtx_unlock(&usb2_ref_lock); +#endif } /* * Debug print From hselasky at FreeBSD.org Tue Mar 10 01:39:04 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Tue Mar 10 01:39:11 2009 Subject: PERFORCE change 158981 for review Message-ID: <200903100839.n2A8d3Gk065484@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158981 Change 158981 by hselasky@hselasky_laptop001 on 2009/03/10 08:38:54 USB controller: Add some missing ATMEGA DCI parts. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#2 (text+ko) ==== @@ -27,8 +27,9 @@ */ /* - * This file contains the driver for the ATMEGA series USB Device - * Controller + * This file contains the driver for the ATMEGA series USB OTG + * Controller. This driver currently only supports the DCI mode of the + * USB hardware. */ /* @@ -1277,6 +1278,11 @@ atmegadci_clocks_off(sc); + /* read initial VBUS state */ + + n = ATMEGA_READ_1(sc, ATMEGA_USBSTA); + atmegadci_vbus_interrupt(sc, n & ATMEGA_USBSTA_VBUS); + USB_BUS_UNLOCK(&sc->sc_bus); /* catch any lost interrupts */ ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 (text+ko) ==== @@ -25,3 +25,191 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +static device_probe_t atmegadci_probe; +static device_attach_t atmegadci_attach; +static device_detach_t atmegadci_detach; +static device_shutdown_t atmegadci_shutdown; + +struct atmegadci_super_softc { + struct atmegadci_softc sc_otg; /* must be first */ +}; + +static void +atmegadci_clocks_on(struct usb2_bus *bus) +{ + /* TODO */ +} + +static void +atmegadci_clocks_off(struct usb2_bus *bus) +{ + /* TODO */ +} + +static int +atmegadci_probe(device_t dev) +{ + device_set_desc(dev, "ATMEL OTG integrated USB controller"); + return (0); +} + +static int +atmegadci_attach(device_t dev) +{ + struct atmegadci_super_softc *sc = device_get_softc(dev); + int err; + int rid; + + /* setup MUSB OTG USB controller interface softc */ + sc->sc_otg.sc_clocks_on = &atmegadci_clocks_on; + sc->sc_otg.sc_clocks_off = &atmegadci_clocks_off; + + /* initialise some bus fields */ + sc->sc_otg.sc_bus.parent = dev; + sc->sc_otg.sc_bus.devices = sc->sc_otg.sc_devices; + sc->sc_otg.sc_bus.devices_max = ATMEGA_MAX_DEVICES; + + /* get all DMA memory */ + if (usb2_bus_mem_alloc_all(&sc->sc_otg.sc_bus, + USB_GET_DMA_TAG(dev), NULL)) { + return (ENOMEM); + } + rid = 0; + sc->sc_otg.sc_io_res = + bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); + + if (!(sc->sc_otg.sc_io_res)) { + err = ENOMEM; + goto error; + } + sc->sc_otg.sc_io_tag = rman_get_bustag(sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_hdl = rman_get_bushandle(sc->sc_otg.sc_io_res); + + rid = 0; + sc->sc_otg.sc_irq_res = + bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); + if (!(sc->sc_otg.sc_irq_res)) { + goto error; + } + sc->sc_otg.sc_bus.bdev = device_add_child(dev, "usbus", -1); + if (!(sc->sc_otg.sc_bus.bdev)) { + goto error; + } + device_set_ivars(sc->sc_otg.sc_bus.bdev, &sc->sc_otg.sc_bus); + + err = bus_setup_intr(dev, sc->sc_otg.sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE, + NULL, (void *)atmegadci_interrupt, sc, &sc->sc_otg.sc_intr_hdl); + if (err) { + sc->sc_otg.sc_intr_hdl = NULL; + goto error; + } + err = atmegadci_init(&sc->sc_otg); + if (!err) { + err = device_probe_and_attach(sc->sc_otg.sc_bus.bdev); + } + if (err) { + goto error; + } + return (0); + +error: + atmegadci_detach(dev); + return (ENXIO); +} + +static int +atmegadci_detach(device_t dev) +{ + struct atmegadci_super_softc *sc = device_get_softc(dev); + device_t bdev; + int err; + + if (sc->sc_otg.sc_bus.bdev) { + bdev = sc->sc_otg.sc_bus.bdev; + device_detach(bdev); + device_delete_child(dev, bdev); + } + /* during module unload there are lots of children leftover */ + device_delete_all_children(dev); + + if (sc->sc_otg.sc_irq_res && sc->sc_otg.sc_intr_hdl) { + /* + * only call atmegadci_uninit() after atmegadci_init() + */ + atmegadci_uninit(&sc->sc_otg); + + err = bus_teardown_intr(dev, sc->sc_otg.sc_irq_res, + sc->sc_otg.sc_intr_hdl); + sc->sc_otg.sc_intr_hdl = NULL; + } + /* free IRQ channel, if any */ + if (sc->sc_otg.sc_irq_res) { + bus_release_resource(dev, SYS_RES_IRQ, 0, + sc->sc_otg.sc_irq_res); + sc->sc_otg.sc_irq_res = NULL; + } + /* free memory resource, if any */ + if (sc->sc_otg.sc_io_res) { + bus_release_resource(dev, SYS_RES_MEMORY, 0, + sc->sc_otg.sc_io_res); + sc->sc_otg.sc_io_res = NULL; + } + usb2_bus_mem_free_all(&sc->sc_otg.sc_bus, NULL); + + return (0); +} + +static int +atmegadci_shutdown(device_t dev) +{ + struct atmegadci_super_softc *sc = device_get_softc(dev); + int err; + + err = bus_generic_shutdown(dev); + if (err) + return (err); + + atmegadci_uninit(&sc->sc_otg); + + return (0); +} + +static device_method_t atmegadci_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, atmegadci_probe), + DEVMETHOD(device_attach, atmegadci_attach), + DEVMETHOD(device_detach, atmegadci_detach), + DEVMETHOD(device_shutdown, atmegadci_shutdown), + + /* Bus interface */ + DEVMETHOD(bus_print_child, bus_generic_print_child), + + {0, 0} +}; + +static driver_t atmegadci_driver = { + "atmegadci", + atmegadci_methods, + sizeof(struct atmegadci_super_softc), +}; + +static devclass_t atmegadci_devclass; + +DRIVER_MODULE(atmegadci, atmelarm, atmegadci_driver, atmegadci_devclass, 0, 0); +MODULE_DEPEND(atmegadci, usb, 1, 1, 1); From lulf at FreeBSD.org Tue Mar 10 02:05:31 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Tue Mar 10 02:05:38 2009 Subject: PERFORCE change 158982 for review Message-ID: <200903100905.n2A95UvD078283@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158982 Change 158982 by lulf@lulf_carrot on 2009/03/10 09:04:50 - Set correct bitmask for page directory. Affected files ... .. //depot/projects/avr32/src/sys/avr32/include/pte.h#6 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/include/pte.h#6 (text+ko) ==== @@ -37,7 +37,7 @@ typedef uint32_t pt_entry_t; /* page table entry (TLBELO register) */ #endif -#define PD_MASK 0xffe00000 /* Bits used to index into page dir */ +#define PD_MASK 0xffc00000 /* Bits used to index into page dir */ #define PT_MASK 0x003ff000 /* Bits used to index into page table */ #define PD_SHIFT 22 #define PT_SHIFT 12 From lulf at FreeBSD.org Tue Mar 10 03:25:55 2009 From: lulf at FreeBSD.org (Ulf Lilleengen) Date: Tue Mar 10 03:26:01 2009 Subject: PERFORCE change 158984 for review Message-ID: <200903101025.n2AAPpT0085449@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158984 Change 158984 by lulf@lulf_carrot on 2009/03/10 10:25:31 - Add macros for the rest of the possible cache operations. - Change writeback to clean, to follow the techref manual. - Support flushing data and instruction cache, and perform this operation on initialization. Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/cache.c#4 edit .. //depot/projects/avr32/src/sys/avr32/avr32/machdep.c#11 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/cache.c#4 (text+ko) ==== @@ -41,23 +41,46 @@ #include #include -/* Valid cache op codes. */ +/* Valid instruction cache op codes. */ +#define ICACHE_FLUSH 0x00 #define ICACHE_INVALIDATE 0x01 +#define ICACHE_LOCK 0x02 +#define ICACHE_UNLOCK 0x03 +#define ICACHE_PREFETCH 0x04 + +/* Flush modes. */ +#define ICACHE_FLUSH_ALL 0 +#define ICACHE_FLUSH_UNLOCKED 1 +#define ICACHE_FLUSH_UNLOCK 2 + +/* Valid data cache op codes. */ +#define DCACHE_FLUSH 0x08 +#define DCACHE_LOCK 0x09 +#define DCACHE_UNLOCK 0x0a #define DCACHE_INVALIDATE 0x0b -#define DCACHE_WRITEBACK 0x0c -#define DCACHE_WRITEBACK_INVALIDATE 0x0d +#define DCACHE_CLEAN 0x0c +#define DCACHE_CLEAN_INVALIDATE 0x0d + +/* Flush modes. */ +#define DCACHE_FLUSH_INVALIDATE_ALL 0 +#define DCACHE_FLUSH_INVALIDATE_UNLOCKED 1 +#define DCACHE_FLUSH_CLEAN_ALL 2 +#define DCACHE_FLUSH_CLEAN_UNLOCKED 3 +#define DCACHE_FLUSH_CLEAN_INVALIDATE_ALL 4 +#define DCACHE_FLUSH_CLEAN_INVALIDATE_UNLOCKED 5 +#define DCACHE_FLUSH_UNLOCK_ALL 6 /* 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) \ +/* Perform operation a cache. */ +#define cache_op(arg, op) \ __asm__ __volatile( \ "cache %0[0], %1" \ : \ - : "r" (va), "n" (op) \ + : "r" (arg), "n" (op) \ : "memory") struct avr32_cache_ops avr32_cache_ops; @@ -176,7 +199,7 @@ void avr32_l1icache_sync_all(void) { - avr32_impl(); + cache_op(ICACHE_FLUSH_ALL, ICACHE_FLUSH); } void @@ -194,7 +217,7 @@ void avr32_l1dcache_wbinv_all(void) { - avr32_impl(); + cache_op(DCACHE_FLUSH_CLEAN_INVALIDATE_ALL, DCACHE_FLUSH); } void @@ -212,7 +235,7 @@ 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); + cache_op(va, DCACHE_CLEAN_INVALIDATE); va += avr32_dcache_line_size; } } @@ -227,7 +250,7 @@ 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); + cache_op(va, DCACHE_INVALIDATE); va += avr32_dcache_line_size; } } @@ -242,7 +265,7 @@ va_end = round_line(from + size, avr32_dcache_line_size); while (va < va_end) { - cache_line_op(va, DCACHE_WRITEBACK); + cache_op(va, DCACHE_CLEAN); va += avr32_dcache_line_size; } avr32_wbflush(); ==== //depot/projects/avr32/src/sys/avr32/avr32/machdep.c#11 (text+ko) ==== @@ -186,6 +186,8 @@ /* Set up cache handling. */ avr32_config_cache(); + avr32_icache_sync_all(); + avr32_dcache_wbinv_all(); /* * Set up buffers, so they can be used to read disk labels. From hselasky at FreeBSD.org Tue Mar 10 04:06:34 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Tue Mar 10 04:06:41 2009 Subject: PERFORCE change 158986 for review Message-ID: <200903101106.n2AB6Xvr092495@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158986 Change 158986 by hselasky@hselasky_laptop001 on 2009/03/10 11:05:41 USB CORE: Fix a possible NULL pointer access at controller attach. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/usb_controller.c#2 (text+ko) ==== @@ -346,7 +346,8 @@ err = usb2_probe_and_attach(child, USB_IFACE_INDEX_ANY); if (!err) { - if (!bus->devices[USB_ROOT_HUB_ADDR]->hub) { + if ((bus->devices[USB_ROOT_HUB_ADDR] == NULL) || + (bus->devices[USB_ROOT_HUB_ADDR]->hub == NULL)) { err = USB_ERR_NO_ROOT_HUB; } } From thompsa at FreeBSD.org Tue Mar 10 07:46:21 2009 From: thompsa at FreeBSD.org (Andrew Thompson) Date: Tue Mar 10 07:46:31 2009 Subject: PERFORCE change 158999 for review Message-ID: <200903101446.n2AEkIkO024866@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=158999 Change 158999 by thompsa@thompsa_burger on 2009/03/10 14:46:00 IFC @158996 Affected files ... .. //depot/projects/usb/src/lib/libusb20/Makefile#4 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.3#8 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.c#16 edit .. //depot/projects/usb/src/lib/libusb20/libusb20.h#11 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#12 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_compat01.h#4 delete .. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#3 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#3 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#6 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#5 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_int.h#9 edit .. //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#15 edit .. //depot/projects/usb/src/lib/libusb20/usb.h#1 add .. //depot/projects/usb/src/lib/libusbhid/Makefile#3 edit .. //depot/projects/usb/src/lib/libusbhid/data.c#2 edit .. //depot/projects/usb/src/lib/libusbhid/descr.c#6 edit .. //depot/projects/usb/src/lib/libusbhid/descr_compat.c#2 edit .. //depot/projects/usb/src/lib/libusbhid/parse.c#2 edit .. //depot/projects/usb/src/lib/libusbhid/usage.c#2 edit .. //depot/projects/usb/src/lib/libusbhid/usbhid.3#5 edit .. //depot/projects/usb/src/lib/libusbhid/usbhid.h#4 edit .. //depot/projects/usb/src/lib/libusbhid/usbvar.h#3 edit .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#18 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#18 integrate .. //depot/projects/usb/src/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#16 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#13 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/files.ixp425#8 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425_pci.c#5 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#7 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/devicename.c#6 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/Makefile#7 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/main.c#8 integrate .. //depot/projects/usb/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_ndis.c#12 integrate .. //depot/projects/usb/src/sys/compat/ndis/kern_windrv.c#7 integrate .. //depot/projects/usb/src/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/usb/src/sys/compat/ndis/ntoskrnl_var.h#8 integrate .. //depot/projects/usb/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ndis.c#15 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/usb/src/sys/compat/ndis/subr_usbd.c#8 integrate .. //depot/projects/usb/src/sys/compat/ndis/usbd_var.h#5 integrate .. //depot/projects/usb/src/sys/conf/files#54 integrate .. //depot/projects/usb/src/sys/ddb/db_expr.c#2 integrate .. //depot/projects/usb/src/sys/dev/agp/agp.c#6 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/usb/src/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#12 integrate .. //depot/projects/usb/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath.c#19 integrate .. //depot/projects/usb/src/sys/dev/ath/if_ath_pci.c#10 integrate .. //depot/projects/usb/src/sys/dev/ath/if_athvar.h#15 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#10 integrate .. //depot/projects/usb/src/sys/dev/cfi/cfi_core.c#4 integrate .. //depot/projects/usb/src/sys/dev/cfi/cfi_dev.c#3 integrate .. //depot/projects/usb/src/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/usb/src/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/usb/src/sys/dev/dc/if_dc.c#10 integrate .. //depot/projects/usb/src/sys/dev/drm/drmP.h#10 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/i915_drv.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/mga_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/r128_drv.c#5 integrate .. //depot/projects/usb/src/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/usb/src/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/usb/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drm.h#4 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/usb/src/sys/dev/drm/radeon_state.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/usb/src/sys/dev/exca/exca.c#6 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwohci_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#19 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pccard.c#6 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#14 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndisvar.h#10 integrate .. //depot/projects/usb/src/sys/dev/ipw/if_ipw.c#8 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#18 integrate .. //depot/projects/usb/src/sys/dev/puc/puc_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/ral/if_ral_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/re/if_re.c#16 integrate .. //depot/projects/usb/src/sys/dev/sio/sio_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/smbus/smbus.c#3 integrate .. //depot/projects/usb/src/sys/dev/smbus/smbus.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.c#9 integrate .. //depot/projects/usb/src/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.c#11 integrate .. //depot/projects/usb/src/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.c#5 integrate .. //depot/projects/usb/src/sys/dev/syscons/teken/teken.h#5 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/usb/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#6 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#14 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/usb/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_redboot.c#1 branch .. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#3 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#19 integrate .. //depot/projects/usb/src/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#16 integrate .. //depot/projects/usb/src/sys/i386/i386/trap.c#11 integrate .. //depot/projects/usb/src/sys/kern/kern_prot.c#9 integrate .. //depot/projects/usb/src/sys/kern/kern_tc.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#18 integrate .. //depot/projects/usb/src/sys/kern/subr_param.c#8 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#18 integrate .. //depot/projects/usb/src/sys/kern/sys_pipe.c#10 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#13 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#14 integrate .. //depot/projects/usb/src/sys/kern/vfs_cache.c#18 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_extattr.c#5 integrate .. //depot/projects/usb/src/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/usb/src/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/usb/src/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/usb/src/sys/modules/drm/radeon/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/if_ndis/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/ndis/Makefile#7 integrate .. //depot/projects/usb/src/sys/net/bpf.c#15 integrate .. //depot/projects/usb/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/usb/src/sys/net/if_gif.h#5 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#17 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#9 integrate .. //depot/projects/usb/src/sys/netinet/igmp_var.h#3 integrate .. //depot/projects/usb/src/sys/netinet/in.c#18 integrate .. //depot/projects/usb/src/sys/netinet/in.h#10 integrate .. //depot/projects/usb/src/sys/netinet/in_gif.c#10 integrate .. //depot/projects/usb/src/sys/netinet/in_mcast.c#10 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#15 integrate .. //depot/projects/usb/src/sys/netinet/in_proto.c#10 integrate .. //depot/projects/usb/src/sys/netinet/in_var.h#10 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#17 integrate .. //depot/projects/usb/src/sys/netinet/ip_var.h#8 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#19 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/usb/src/sys/netinet/vinet.h#7 integrate .. //depot/projects/usb/src/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/usb/src/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/usb/src/sys/security/audit/audit.c#12 integrate .. //depot/projects/usb/src/sys/security/audit/audit.h#10 integrate .. //depot/projects/usb/src/sys/security/audit/audit_syscalls.c#12 integrate .. //depot/projects/usb/src/sys/security/mac/mac_audit.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_framework.h#9 integrate .. //depot/projects/usb/src/sys/security/mac/mac_inet.c#10 integrate .. //depot/projects/usb/src/sys/security/mac/mac_internal.h#8 integrate .. //depot/projects/usb/src/sys/security/mac/mac_net.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_pipe.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_policy.h#10 integrate .. //depot/projects/usb/src/sys/security/mac/mac_posix_sem.c#8 integrate .. //depot/projects/usb/src/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/usb/src/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/usb/src/sys/security/mac/mac_process.c#10 integrate .. //depot/projects/usb/src/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_system.c#5 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_msg.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_sem.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_sysv_shm.c#6 integrate .. //depot/projects/usb/src/sys/security/mac/mac_vfs.c#8 integrate .. //depot/projects/usb/src/sys/security/mac_biba/mac_biba.c#11 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/mac_bsdextended.c#12 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/usb/src/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate .. //depot/projects/usb/src/sys/security/mac_lomac/mac_lomac.c#12 integrate .. //depot/projects/usb/src/sys/security/mac_mls/mac_mls.c#12 integrate .. //depot/projects/usb/src/sys/security/mac_stub/mac_stub.c#11 integrate .. //depot/projects/usb/src/sys/security/mac_test/mac_test.c#11 integrate .. //depot/projects/usb/src/sys/sys/buf.h#5 integrate .. //depot/projects/usb/src/sys/sys/param.h#24 integrate .. //depot/projects/usb/src/sys/sys/pipe.h#3 integrate .. //depot/projects/usb/src/sys/sys/proc.h#16 integrate .. //depot/projects/usb/src/sys/sys/sysctl.h#15 integrate .. //depot/projects/usb/src/sys/sys/vimage.h#6 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#17 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_snapshot.c#12 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#16 integrate .. //depot/projects/usb/src/sys/vm/vm_init.c#4 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#13 integrate .. //depot/projects/usb/src/usr.bin/usbhidaction/usbhidaction.c#2 edit .. //depot/projects/usb/src/usr.bin/usbhidctl/usbhid.c#2 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/Makefile#4 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.c#11 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/dump.h#6 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.8#3 edit .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#14 edit Differences ... ==== //depot/projects/usb/src/lib/libusb20/Makefile#4 (text+ko) ==== @@ -1,10 +1,10 @@ # -# $FreeBSD: src/lib/libusb20/Makefile,v 1.1 2008/11/04 02:31:03 alfred Exp $ +# $FreeBSD: head/lib/libusb/Makefile 189587 2009-03-09 17:09:46Z thompsa $ # # Makefile for the FreeBSD specific LibUSB 2.0 # -LIB= usb20 +LIB= usb SHLIB_MAJOR= 1 SHLIB_MINOR= 0 SRCS= libusb20.c @@ -14,11 +14,12 @@ SRCS+= libusb20_compat10.c INCS+= libusb20.h INCS+= libusb20_desc.h -INCS+= libusb20_compat01.h -INCS+= libusb20_compat10.h MAN= libusb20.3 MKLINT= no NOGCCERROR= +# libusb 0.1 compat +INCS+= usb.h + .include ==== //depot/projects/usb/src/lib/libusb20/libusb20.3#8 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb20/libusb20.3,v 1.1 2008/11/04 02:31:03 alfred Exp $ +.\" $FreeBSD: head/lib/libusb/libusb20.3 189587 2009-03-09 17:09:46Z thompsa $ .\" .Dd Feb 14, 2009 .Dt LIBUSB20 3 @@ -514,72 +514,6 @@ . .Pp . -.Fn libusb20_dev_set_owner pdev uid gid -This function will set the ownership of the given USB device. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_set_perm pdev mode -This function will set the permissions of the given USB device. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_set_iface_owner pdev iface_index uid gid -This function will set the ownership of the given USB interface. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_set_iface_perm pdev iface_index mode -This function will set the permissions of the given USB interface. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_get_owner pdev puid pgid -This function will retrieve the current USB device ownership. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_get_perm pdev pmode -This function will retrieve the current USB device permissions. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_get_iface_owner pdev iface_index puid pgid -This function will retrieve the current USB interface ownership for -the given USB interface. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_dev_get_iface_perm pdev iface_index pmode -This function will retrieve the current USB interface permissions for -the given USB interface. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. .Fn libusb20_dev_get_device_desc pdev This function returns a pointer to the decoded and host endian version of the device descriptor. @@ -663,39 +597,6 @@ .Xr 2 poll function. . -.Sh USB BUS OPERATIONS -. -.Fn libusb20_bus_set_owner pbackend bus_index uid gid -This function will set the ownership for the given USB bus. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_bus_set_perm pbackend bus_index mode -This function will set the permissions for the given USB bus. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_bus_get_owner pbackend bus_index puid pgid -This function will retrieve the ownership for the given USB bus. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_bus_get_perm pbackend bus_index pmode -This function will retrieve the permissions for the given USB bus. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -. .Sh USB BACKEND OPERATIONS . .Fn libusb20_be_get_template pbackend ptemp @@ -772,47 +673,6 @@ If the given quirk does not exist LIBUSB20_ERROR_NOT_FOUND is returned. . -.Pp -. -.Fn libusb20_be_set_owner pbackend uid gid -This function will set the ownership for the given backend. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_be_set_perm pbackend mode -This function will set the permissions for the given backend. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_be_get_owner pbackend puid pgid -This function will retrieve the ownership of the given backend. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_be_get_perm pbackend pmode -This function will retrieve the permissions of the given backend. -. -. -This function returns zero on success else a LIBUSB20_ERROR value is -returned. -. -.Pp -. -.Fn libusb20_be_alloc pmethods -This is an internal function to allocate a USB backend. -. -.Pp -.Fn libusb20_be_alloc_default void -.Fn libusb20_be_alloc_freebsd void .Fn libusb20_be_alloc_linux void These functions are used to allocate a specific USB backend or the operating system default USB backend. Allocating a backend is a way to ==== //depot/projects/usb/src/lib/libusb20/libusb20.c#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20.c 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -971,86 +971,6 @@ } int -libusb20_dev_set_owner(struct libusb20_device *pdev, uid_t user, gid_t group) -{ - return (pdev->beMethods->dev_set_owner(pdev, user, group)); -} - -int -libusb20_dev_set_perm(struct libusb20_device *pdev, mode_t mode) -{ - return (pdev->beMethods->dev_set_perm(pdev, mode)); -} - -int -libusb20_dev_set_iface_owner(struct libusb20_device *pdev, - uint8_t iface_index, uid_t user, gid_t group) -{ - return (pdev->beMethods->dev_set_iface_owner( - pdev, iface_index, user, group)); -} - -int -libusb20_dev_set_iface_perm(struct libusb20_device *pdev, - uint8_t iface_index, mode_t mode) -{ - return (pdev->beMethods->dev_set_iface_perm( - pdev, iface_index, mode)); -} - -int -libusb20_dev_get_owner(struct libusb20_device *pdev, uid_t *user, gid_t *group) -{ - uid_t a; - gid_t b; - - if (user == NULL) - user = &a; - if (group == NULL) - group = &b; - - return (pdev->beMethods->dev_get_owner(pdev, user, group)); -} - -int -libusb20_dev_get_perm(struct libusb20_device *pdev, mode_t *mode) -{ - mode_t a; - - if (mode == NULL) - mode = &a; - return (pdev->beMethods->dev_get_perm(pdev, mode)); -} - -int -libusb20_dev_get_iface_owner(struct libusb20_device *pdev, - uint8_t iface_index, uid_t *user, gid_t *group) -{ - uid_t a; - gid_t b; - - if (user == NULL) - user = &a; - if (group == NULL) - group = &b; - - return (pdev->beMethods->dev_get_iface_owner( - pdev, iface_index, user, group)); -} - -int -libusb20_dev_get_iface_perm(struct libusb20_device *pdev, - uint8_t iface_index, mode_t *mode) -{ - mode_t a; - - if (mode == NULL) - mode = &a; - return (pdev->beMethods->dev_get_iface_perm( - pdev, iface_index, mode)); -} - -int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len) { @@ -1061,45 +981,6 @@ pdev, iface_index, buf, len)); } -/* USB bus operations */ - -int -libusb20_bus_set_owner(struct libusb20_backend *pbe, - uint8_t bus, uid_t user, gid_t group) -{ - return (pbe->methods->bus_set_owner(pbe, bus, user, group)); -} - -int -libusb20_bus_set_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t mode) -{ - return (pbe->methods->bus_set_perm(pbe, bus, mode)); -} - -int -libusb20_bus_get_owner(struct libusb20_backend *pbe, - uint8_t bus, uid_t *user, gid_t *group) -{ - uid_t a; - gid_t b; - - if (user == NULL) - user = &a; - if (group == NULL) - group = &b; - return (pbe->methods->bus_get_owner(pbe, bus, user, group)); -} - -int -libusb20_bus_get_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode) -{ - mode_t a; - - if (mode == NULL) - mode = &a; - return (pbe->methods->bus_get_perm(pbe, bus, mode)); -} - /* USB backend operations */ int @@ -1131,41 +1012,6 @@ } int -libusb20_be_set_owner(struct libusb20_backend *pbe, uid_t user, gid_t group) -{ - return (pbe->methods->root_set_owner(pbe, user, group)); -} - -int -libusb20_be_set_perm(struct libusb20_backend *pbe, mode_t mode) -{ - return (pbe->methods->root_set_perm(pbe, mode)); -} - -int -libusb20_be_get_owner(struct libusb20_backend *pbe, uid_t *user, gid_t *group) -{ - uid_t a; - gid_t b; - - if (user == NULL) - user = &a; - if (group == NULL) - group = &b; - return (pbe->methods->root_get_owner(pbe, user, group)); -} - -int -libusb20_be_get_perm(struct libusb20_backend *pbe, mode_t *mode) -{ - mode_t a; - - if (mode == NULL) - mode = &a; - return (pbe->methods->root_get_perm(pbe, mode)); -} - -int libusb20_be_set_template(struct libusb20_backend *pbe, int temp) { return (pbe->methods->root_set_template(pbe, temp)); ==== //depot/projects/usb/src/lib/libusb20/libusb20.h#11 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20.h 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. @@ -253,14 +253,6 @@ int libusb20_dev_set_power_mode(struct libusb20_device *pdev, uint8_t power_mode); uint8_t libusb20_dev_get_power_mode(struct libusb20_device *pdev); int libusb20_dev_set_alt_index(struct libusb20_device *pdev, uint8_t iface_index, uint8_t alt_index); -int libusb20_dev_set_owner(struct libusb20_device *pdev, uid_t user, gid_t group); -int libusb20_dev_set_perm(struct libusb20_device *pdev, mode_t mode); -int libusb20_dev_set_iface_owner(struct libusb20_device *pdev, uint8_t iface_index, uid_t user, gid_t group); -int libusb20_dev_set_iface_perm(struct libusb20_device *pdev, uint8_t iface_index, mode_t mode); -int libusb20_dev_get_owner(struct libusb20_device *pdev, uid_t *user, gid_t *group); -int libusb20_dev_get_perm(struct libusb20_device *pdev, mode_t *mode); -int libusb20_dev_get_iface_owner(struct libusb20_device *pdev, uint8_t iface_index, uid_t *user, gid_t *group); -int libusb20_dev_get_iface_perm(struct libusb20_device *pdev, uint8_t iface_index, mode_t *mode); int libusb20_dev_get_info(struct libusb20_device *pdev, struct usb2_device_info *pinfo); int libusb20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); @@ -276,23 +268,12 @@ void libusb20_dev_set_debug(struct libusb20_device *pdev, int debug); void libusb20_dev_wait_process(struct libusb20_device *pdev, int timeout); -/* USB bus operations */ - -int libusb20_bus_set_owner(struct libusb20_backend *pbe, uint8_t bus, uid_t user, gid_t group); -int libusb20_bus_set_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t mode); -int libusb20_bus_get_owner(struct libusb20_backend *pbe, uint8_t bus, uid_t *user, gid_t *group); -int libusb20_bus_get_perm(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode); - /* USB global operations */ int libusb20_be_get_dev_quirk(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); int libusb20_be_get_quirk_name(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); int libusb20_be_add_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq); int libusb20_be_remove_dev_quirk(struct libusb20_backend *pbe, struct libusb20_quirk *pq); -int libusb20_be_set_owner(struct libusb20_backend *be, uid_t user, gid_t group); -int libusb20_be_set_perm(struct libusb20_backend *be, mode_t mode); -int libusb20_be_get_owner(struct libusb20_backend *be, uid_t *user, gid_t *group); -int libusb20_be_get_perm(struct libusb20_backend *be, mode_t *mode); /* USB backend operations */ ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat01.c#12 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_compat01.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_compat01.c 189621 2009-03-10 14:29:34Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -37,7 +37,7 @@ #include "libusb20.h" #include "libusb20_desc.h" #include "libusb20_int.h" -#include "libusb20_compat01.h" +#include "usb.h" /* * The two following macros were taken from the original LibUSB v0.1 ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat10.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_compat10.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_compat10.c 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb20/libusb20_compat10.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_compat10.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_compat10.h 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_desc.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_desc.c 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * ==== //depot/projects/usb/src/lib/libusb20/libusb20_desc.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_desc.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_desc.h 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * Copyright (c) 2007-2008 Daniel Drake. All rights reserved. ==== //depot/projects/usb/src/lib/libusb20/libusb20_int.h#9 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_int.h,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_int.h 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -48,27 +48,11 @@ typedef int (libusb20_root_get_quirk_name_t)(struct libusb20_backend *pbe, uint16_t index, struct libusb20_quirk *pq); typedef int (libusb20_root_add_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); typedef int (libusb20_root_remove_dev_quirk_t)(struct libusb20_backend *pbe, struct libusb20_quirk *pq); -typedef int (libusb20_bus_get_owner_t)(struct libusb20_backend *pbe, uint8_t bus, uid_t *user, gid_t *group); -typedef int (libusb20_bus_get_perm_t)(struct libusb20_backend *pbe, uint8_t bus, mode_t *mode); -typedef int (libusb20_bus_set_owner_t)(struct libusb20_backend *pbe, uint8_t bus, uid_t user, gid_t group); -typedef int (libusb20_bus_set_perm_t)(struct libusb20_backend *pbe, uint8_t bus, mode_t mode); typedef int (libusb20_close_device_t)(struct libusb20_device *pdev); -typedef int (libusb20_dev_get_iface_owner_t)(struct libusb20_device *pdev, uint8_t iface_index, uid_t *user, gid_t *group); -typedef int (libusb20_dev_get_iface_perm_t)(struct libusb20_device *pdev, uint8_t iface_index, mode_t *mode); -typedef int (libusb20_dev_get_owner_t)(struct libusb20_device *pdev, uid_t *user, gid_t *group); -typedef int (libusb20_dev_get_perm_t)(struct libusb20_device *pdev, mode_t *mode); typedef int (libusb20_dev_get_info_t)(struct libusb20_device *pdev, struct usb2_device_info *pinfo); typedef int (libusb20_dev_get_iface_desc_t)(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len); -typedef int (libusb20_dev_set_iface_owner_t)(struct libusb20_device *pdev, uint8_t iface_index, uid_t user, gid_t group); -typedef int (libusb20_dev_set_iface_perm_t)(struct libusb20_device *pdev, uint8_t iface_index, mode_t mode); -typedef int (libusb20_dev_set_owner_t)(struct libusb20_device *pdev, uid_t user, gid_t group); -typedef int (libusb20_dev_set_perm_t)(struct libusb20_device *pdev, mode_t mode); typedef int (libusb20_init_backend_t)(struct libusb20_backend *pbe); typedef int (libusb20_open_device_t)(struct libusb20_device *pdev, uint16_t transfer_count_max); -typedef int (libusb20_root_get_owner_t)(struct libusb20_backend *pbe, uid_t *user, gid_t *group); -typedef int (libusb20_root_get_perm_t)(struct libusb20_backend *pbe, mode_t *mode); -typedef int (libusb20_root_set_owner_t)(struct libusb20_backend *pbe, uid_t user, gid_t group); -typedef int (libusb20_root_set_perm_t)(struct libusb20_backend *pbe, mode_t mode); typedef void (libusb20_exit_backend_t)(struct libusb20_backend *pbe); typedef int (libusb20_root_set_template_t)(struct libusb20_backend *pbe, int temp); typedef int (libusb20_root_get_template_t)(struct libusb20_backend *pbe, int *ptemp); @@ -85,28 +69,12 @@ /* optional backend methods */ \ m(n, init_backend) \ m(n, exit_backend) \ - m(n, bus_set_owner) \ - m(n, bus_get_owner) \ - m(n, bus_set_perm) \ - m(n, bus_get_perm) \ m(n, dev_get_info) \ - m(n, dev_get_iface_owner) \ - m(n, dev_get_iface_perm) \ m(n, dev_get_iface_desc) \ - m(n, dev_get_owner) \ - m(n, dev_get_perm) \ - m(n, dev_set_iface_owner) \ - m(n, dev_set_iface_perm) \ - m(n, dev_set_owner) \ - m(n, dev_set_perm) \ m(n, root_get_dev_quirk) \ m(n, root_get_quirk_name) \ m(n, root_add_dev_quirk) \ m(n, root_remove_dev_quirk) \ - m(n, root_set_owner) \ - m(n, root_get_owner) \ - m(n, root_set_perm) \ - m(n, root_get_perm) \ m(n, root_set_template) \ m(n, root_get_template) \ /* mandatory device methods */ \ ==== //depot/projects/usb/src/lib/libusb20/libusb20_ugen20.c#15 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb20/libusb20_ugen20.c,v 1.1 2008/11/04 02:31:03 alfred Exp $ */ +/* $FreeBSD: head/lib/libusb/libusb20_ugen20.c 189587 2009-03-09 17:09:46Z thompsa $ */ /*- * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. * @@ -39,39 +39,23 @@ #include "libusb20_desc.h" #include "libusb20_int.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static libusb20_init_backend_t ugen20_init_backend; static libusb20_open_device_t ugen20_open_device; static libusb20_close_device_t ugen20_close_device; static libusb20_get_backend_name_t ugen20_get_backend_name; static libusb20_exit_backend_t ugen20_exit_backend; -static libusb20_bus_set_owner_t ugen20_bus_set_owner; -static libusb20_bus_get_owner_t ugen20_bus_get_owner; -static libusb20_bus_set_perm_t ugen20_bus_set_perm; -static libusb20_bus_get_perm_t ugen20_bus_get_perm; -static libusb20_dev_get_iface_owner_t ugen20_dev_get_iface_owner; -static libusb20_dev_get_iface_perm_t ugen20_dev_get_iface_perm; -static libusb20_dev_get_owner_t ugen20_dev_get_owner; -static libusb20_dev_get_perm_t ugen20_dev_get_perm; static libusb20_dev_get_iface_desc_t ugen20_dev_get_iface_desc; static libusb20_dev_get_info_t ugen20_dev_get_info; -static libusb20_dev_set_iface_owner_t ugen20_dev_set_iface_owner; -static libusb20_dev_set_iface_perm_t ugen20_dev_set_iface_perm; -static libusb20_dev_set_owner_t ugen20_dev_set_owner; -static libusb20_dev_set_perm_t ugen20_dev_set_perm; static libusb20_root_get_dev_quirk_t ugen20_root_get_dev_quirk; static libusb20_root_get_quirk_name_t ugen20_root_get_quirk_name; static libusb20_root_add_dev_quirk_t ugen20_root_add_dev_quirk; static libusb20_root_remove_dev_quirk_t ugen20_root_remove_dev_quirk; -static libusb20_root_set_owner_t ugen20_root_set_owner; -static libusb20_root_get_owner_t ugen20_root_get_owner; -static libusb20_root_set_perm_t ugen20_root_set_perm; -static libusb20_root_get_perm_t ugen20_root_get_perm; static libusb20_root_set_template_t ugen20_root_set_template; static libusb20_root_get_template_t ugen20_root_get_template; @@ -152,7 +136,7 @@ pdev->bus_number = ugen20_path_convert_one(&tmp); pdev->device_address = ugen20_path_convert_one(&tmp); - snprintf(buf, sizeof(buf), "/dev/ugen%u.%u", + snprintf(buf, sizeof(buf), "/dev/" USB_GENERIC_NAME "%u.%u", pdev->bus_number, pdev->device_address); f = open(buf, O_RDWR); @@ -218,7 +202,7 @@ /* generate a nice description for printout */ snprintf(pdev->usb_desc, sizeof(pdev->usb_desc), - "ugen%u.%u: <%s %s> at usbus%u", pdev->bus_number, + USB_GENERIC_NAME "%u.%u: <%s %s> at usbus%u", pdev->bus_number, pdev->device_address, devinfo.udi_product, devinfo.udi_vendor, pdev->bus_number); @@ -284,7 +268,7 @@ memset(&state, 0, sizeof(state)); - state.f = open("/dev/usb", O_RDONLY); + state.f = open("/dev/" USB_DEVICE_NAME, O_RDONLY); if (state.f < 0) return (LIBUSB20_ERROR_OTHER); @@ -379,7 +363,7 @@ int g; int error; - snprintf(buf, sizeof(buf), "/dev/ugen%u.%u", + snprintf(buf, sizeof(buf), "/dev/" USB_GENERIC_NAME "%u.%u", pdev->bus_number, pdev->device_address); /* @@ -873,7 +857,7 @@ int f; int error; - f = open("/dev/usb", O_RDONLY); + f = open("/dev/" USB_DEVICE_NAME, O_RDONLY); if (f < 0) return (LIBUSB20_ERROR_OTHER); error = ioctl(f, cmd, data); @@ -889,75 +873,6 @@ } static int -ugen20_be_do_perm(uint32_t get_cmd, uint32_t set_cmd, uint8_t bus, - uint8_t dev, uint8_t iface, uid_t *uid, - gid_t *gid, mode_t *mode) -{ - struct usb2_dev_perm perm; - int error; - - memset(&perm, 0, sizeof(perm)); - - perm.bus_index = bus; - perm.dev_index = dev; - perm.iface_index = iface; - - error = ugen20_be_ioctl(get_cmd, &perm); - if (error) - return (error); - - if (set_cmd == 0) { - if (uid) - *uid = perm.user_id; - if (gid) - *gid = perm.group_id; - if (mode) - *mode = perm.mode; - return (0); - } - if (uid) - perm.user_id = *uid; - if (gid) - perm.group_id = *gid; - if (mode) - perm.mode = *mode; - - return (ugen20_be_ioctl(set_cmd, &perm)); -} - -static int -ugen20_bus_set_owner(struct libusb20_backend *pbe, - uint8_t bus, uid_t user, gid_t group) -{ - return (ugen20_be_do_perm(USB_GET_BUS_PERM, USB_SET_BUS_PERM, - bus, 0, 0, &user, &group, NULL)); -} - -static int -ugen20_bus_get_owner(struct libusb20_backend *pbe, uint8_t bus, - uid_t *user, gid_t *group) -{ - return (ugen20_be_do_perm(USB_GET_BUS_PERM, 0, - bus, 0, 0, user, group, NULL)); -} - -static int -ugen20_bus_set_perm(struct libusb20_backend *pbe, - uint8_t bus, mode_t mode) -{ - return (ugen20_be_do_perm(USB_GET_BUS_PERM, USB_SET_BUS_PERM, - bus, 0, 0, NULL, NULL, &mode)); -} - -static int -ugen20_bus_get_perm(struct libusb20_backend *pbe, - uint8_t bus, mode_t *mode) -{ - return (ugen20_be_do_perm(USB_GET_BUS_PERM, 0, - bus, 0, 0, NULL, NULL, mode)); -} - -static int ugen20_dev_get_iface_desc(struct libusb20_device *pdev, uint8_t iface_index, char *buf, uint8_t len) { @@ -986,59 +901,6 @@ } static int -ugen20_dev_get_iface_owner(struct libusb20_device *pdev, - uint8_t iface_index, uid_t *user, gid_t *group) -{ - return (ugen20_be_do_perm(USB_GET_IFACE_PERM, 0, - pdev->bus_number, pdev->device_address, iface_index, - user, group, NULL)); -} - -static int -ugen20_dev_get_iface_perm(struct libusb20_device *pdev, - uint8_t iface_index, mode_t *mode) -{ - return (ugen20_be_do_perm(USB_GET_IFACE_PERM, 0, - pdev->bus_number, pdev->device_address, iface_index, - NULL, NULL, mode)); -} - -static int -ugen20_dev_get_owner(struct libusb20_device *pdev, - uid_t *user, gid_t *group) -{ >>> TRUNCATED FOR MAIL (1000 lines) <<< From hselasky at FreeBSD.org Tue Mar 10 08:18:55 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Tue Mar 10 08:19:01 2009 Subject: PERFORCE change 159001 for review Message-ID: <200903101518.n2AFIqDm028444@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159001 Change 159001 by hselasky@hselasky_laptop001 on 2009/03/10 15:18:10 USB CORE: Make sure HID has a default usage. Reported by: Paul Wootton Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#20 (text+ko) ==== @@ -283,14 +283,14 @@ */ c->loc.count = 1; } else { - /* make sure we have a usage */ - if (s->nusage == 0) { - s->usages_min[s->nusage] = 0; - s->usages_max[s->nusage] = 0; - s->nusage = 1; - } s->ncount = 1; } + /* make sure we have a usage */ + if (s->nusage == 0) { + s->usages_min[s->nusage] = 0; + s->usages_max[s->nusage] = 0; + s->nusage = 1; + } goto top; case 9: /* Output */ From hselasky at FreeBSD.org Tue Mar 10 08:37:13 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Tue Mar 10 08:37:19 2009 Subject: PERFORCE change 159004 for review Message-ID: <200903101537.n2AFbBwc031395@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159004 Change 159004 by hselasky@hselasky_laptop001 on 2009/03/10 15:36:37 USB CORE: Improve default HID usage selection. Add more documentation. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#21 (text+ko) ==== @@ -287,9 +287,10 @@ } /* make sure we have a usage */ if (s->nusage == 0) { - s->usages_min[s->nusage] = 0; - s->usages_max[s->nusage] = 0; - s->nusage = 1; + /* use the undefined HID PAGE */ + s->usages_min[s->nusage] = 0x0000; + s->usages_max[s->nusage] = 0xFFFF; + s->nusage = s->ncount; } goto top; From gabor at FreeBSD.org Tue Mar 10 11:16:08 2009 From: gabor at FreeBSD.org (Gabor Kovesdan) Date: Tue Mar 10 11:16:30 2009 Subject: PERFORCE change 159014 for review Message-ID: <200903101815.n2AIFsQF061858@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159014 Change 159014 by gabor@gabor_server on 2009/03/10 18:15:45 - Remove debug line Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#83 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#83 (text+ko) ==== @@ -632,10 +632,8 @@ if (dirbehave == DIR_RECURSE) c = grep_tree(aargv); else - for (c = 0; aargc--; ++aargv) { - printf("aargc: %d\n", aargc); + for (c = 0; aargc--; ++aargv) c+= procfile(*aargv); - } #ifndef WITHOUT_NLS catclose(catalog); From hselasky at FreeBSD.org Tue Mar 10 11:38:18 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Tue Mar 10 11:38:25 2009 Subject: PERFORCE change 159016 for review Message-ID: <200903101838.n2AIcHvQ063587@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159016 Change 159016 by hselasky@hselasky_laptop001 on 2009/03/10 18:38:16 USB controller: Patches to make ATMEGA DCI work. - add more debugging prints. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#3 (text+ko) ==== @@ -66,7 +66,7 @@ ATMEGA_BUS2SC((pc)->tag_parent->info->bus) #if USB_DEBUG -static int atmegadci_debug = 0; +static int atmegadci_debug = 6; SYSCTL_NODE(_hw_usb2, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); SYSCTL_INT(_hw_usb2_atmegadci, OID_AUTO, debug, CTLFLAG_RW, @@ -226,8 +226,6 @@ { DPRINTFN(5, "addr=%d\n", addr); - ATMEGA_WRITE_1(sc, ATMEGA_UDADDR, addr); - addr |= ATMEGA_UDADDR_ADDEN; ATMEGA_WRITE_1(sc, ATMEGA_UDADDR, addr); @@ -296,6 +294,8 @@ if ((req.bmRequestType == UT_WRITE_DEVICE) && (req.bRequest == UR_SET_ADDRESS)) { sc->sc_dv_addr = req.wValue[0] & 0x7F; + /* must write address before ZLP */ + ATMEGA_WRITE_1(sc, ATMEGA_UDADDR, sc->sc_dv_addr); } else { sc->sc_dv_addr = 0xFF; } @@ -652,6 +652,8 @@ /* clear all set interrupts */ ATMEGA_WRITE_1(sc, ATMEGA_UDINT, ~status); + DPRINTFN(14, "UDINT=0x%02x\n", status); + /* check for any bus state change interrupts */ if (status & ATMEGA_UDINT_EORSTI) { @@ -723,6 +725,8 @@ if (status & ATMEGA_USBINT_VBUSTI) { uint8_t temp; + DPRINTFN(5, "USBINT=0x%02x\n", status); + temp = ATMEGA_READ_1(sc, ATMEGA_USBSTA); atmegadci_vbus_interrupt(sc, temp & ATMEGA_USBSTA_VBUS); } @@ -734,7 +738,7 @@ if (status) { - DPRINTFN(5, "real endpoint interrupt 0x%02x\n", status); + DPRINTFN(5, "real endpoint interrupt UEINT=0x%02x\n", status); atmegadci_interrupt_poll(sc); } @@ -1086,7 +1090,7 @@ USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); - DPRINTFN(2, "xfer=%p, pipe=%p, error=%d\n", + DPRINTFN(9, "xfer=%p, pipe=%p, error=%d\n", xfer, xfer->pipe, error); if (xfer->flags_int.usb2_mode == USB_MODE_DEVICE) { @@ -1164,15 +1168,7 @@ ATMEGA_UECONX_EPEN | ATMEGA_UECONX_STALLRQC); - if (ep_type == UE_CONTROL) { - /* one bank, 64-bytes wMaxPacket */ - ATMEGA_WRITE_1(sc, ATMEGA_UECFG0X, - ATMEGA_UECFG0X_EPTYPE0); - ATMEGA_WRITE_1(sc, ATMEGA_UECFG1X, - ATMEGA_UECFG1X_ALLOC | - ATMEGA_UECFG1X_EPBK0 | - ATMEGA_UECFG1X_EPSIZE(7)); - } else { + do { temp = 0; if (ep_type == UE_BULK) { temp |= ATMEGA_UECFG0X_EPTYPE2; @@ -1189,13 +1185,13 @@ ATMEGA_WRITE_1(sc, ATMEGA_UECFG1X, ATMEGA_UECFG1X_ALLOC | ATMEGA_UECFG1X_EPBK1 | - ATMEGA_UECFG1X_EPSIZE(7)); + ATMEGA_UECFG1X_EPSIZE(3)); temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X); if (!(temp & ATMEGA_UESTA0X_CFGOK)) { DPRINTFN(0, "Chip rejected configuration\n"); } - } + } while (0); } static void @@ -1238,16 +1234,21 @@ sc->sc_bus.methods = &atmegadci_bus_methods; USB_BUS_LOCK(&sc->sc_bus); +#if 0 + /* XXX TODO - currently done by boot strap */ /* enable USB PAD regulator */ ATMEGA_WRITE_1(sc, ATMEGA_UHWCON, - ATMEGA_UHWCON_UVREGE); - + ATMEGA_UHWCON_UVREGE | ATMEGA_UHWCON_UIMOD); +#endif /* turn on clocks */ (sc->sc_clocks_on) (&sc->sc_bus); + /* make sure device is re-enumerated */ + ATMEGA_WRITE_1(sc, ATMEGA_UDCON, ATMEGA_UDCON_DETACH); + /* wait a little for things to stabilise */ - usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 1000); + usb2_pause_mtx(&sc->sc_bus.bus_mtx, hz / 20); /* enable interrupts */ ATMEGA_WRITE_1(sc, ATMEGA_UDIEN, @@ -1262,7 +1263,7 @@ ATMEGA_WRITE_1(sc, ATMEGA_UERST, 0); /* disable all endpoints */ - for (n = 1; n != ATMEGA_EP_MAX; n++) { + for (n = 0; n != ATMEGA_EP_MAX; n++) { /* select endpoint */ ATMEGA_WRITE_1(sc, ATMEGA_UENUM, n); @@ -1694,6 +1695,7 @@ struct atmegadci_softc *sc = ATMEGA_BUS2SC(xfer->xroot->bus); uint16_t value; uint16_t index; + uint8_t temp; USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED); @@ -1982,7 +1984,38 @@ atmegadci_clocks_off(sc); break; case UHF_C_PORT_CONNECTION: + /* clear connect change flag */ sc->sc_flags.change_connect = 0; + + /* configure the control endpoint */ + + /* select endpoint number */ + ATMEGA_WRITE_1(sc, ATMEGA_UENUM, 0); + + /* set endpoint reset */ + ATMEGA_WRITE_1(sc, ATMEGA_UERST, ATMEGA_UERST_MASK(0)); + + /* clear endpoint reset */ + ATMEGA_WRITE_1(sc, ATMEGA_UERST, 0); + + /* enable and stall endpoint */ + ATMEGA_WRITE_1(sc, ATMEGA_UECONX, + ATMEGA_UECONX_EPEN | + ATMEGA_UECONX_STALLRQ); + + /* one bank, 64-bytes wMaxPacket */ + ATMEGA_WRITE_1(sc, ATMEGA_UECFG0X, + ATMEGA_UECFG0X_EPTYPE0); + ATMEGA_WRITE_1(sc, ATMEGA_UECFG1X, + ATMEGA_UECFG1X_ALLOC | + ATMEGA_UECFG1X_EPBK0 | + ATMEGA_UECFG1X_EPSIZE(3)); + + /* check valid config */ + temp = ATMEGA_READ_1(sc, ATMEGA_UESTA0X); + if (!(temp & ATMEGA_UESTA0X_CFGOK)) { + DPRINTFN(0, "Chip rejected EP0 configuration\n"); + } break; case UHF_C_PORT_SUSPEND: sc->sc_flags.change_suspend = 0; @@ -2258,10 +2291,10 @@ { struct atmegadci_softc *sc = ATMEGA_BUS2SC(udev->bus); - DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d)\n", + DPRINTFN(2, "pipe=%p, addr=%d, endpt=%d, mode=%d (%d,%d)\n", pipe, udev->address, edesc->bEndpointAddress, udev->flags.usb2_mode, - sc->sc_rt_addr); + sc->sc_rt_addr, udev->device_index); if (udev->device_index == sc->sc_rt_addr) { ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.h#2 (text+ko) ==== @@ -155,6 +155,9 @@ #define ATMEGA_UHWCON 0xD7 #define ATMEGA_UHWCON_UVREGE (1 << 0) +#define ATMEGA_UHWCON_UVCONE (1 << 4) +#define ATMEGA_UHWCON_UIDE (1 << 6) +#define ATMEGA_UHWCON_UIMOD (1 << 7) #define ATMEGA_READ_1(sc, reg) \ bus_space_read_1((sc)->sc_io_tag, (sc)->sc_io_hdl, reg) From hselasky at FreeBSD.org Tue Mar 10 14:08:17 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Tue Mar 10 14:08:23 2009 Subject: PERFORCE change 159024 for review Message-ID: <200903102108.n2AL8EpZ005056@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159024 Change 159024 by hselasky@hselasky_laptop001 on 2009/03/10 21:07:14 USB controller: Turn off debugging by default. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/controller/atmegadci.c#4 (text+ko) ==== @@ -66,7 +66,7 @@ ATMEGA_BUS2SC((pc)->tag_parent->info->bus) #if USB_DEBUG -static int atmegadci_debug = 6; +static int atmegadci_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, atmegadci, CTLFLAG_RW, 0, "USB ATMEGA DCI"); SYSCTL_INT(_hw_usb2_atmegadci, OID_AUTO, debug, CTLFLAG_RW, From rene at FreeBSD.org Tue Mar 10 14:42:54 2009 From: rene at FreeBSD.org (Rene Ladan) Date: Tue Mar 10 14:43:00 2009 Subject: PERFORCE change 159028 for review Message-ID: <200903102142.n2ALgoQT008453@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159028 Change 159028 by rene@rene_self on 2009/03/10 21:42:31 Add a WIP text about the change of the src repository from CVS to SVN. Section 3 and 16 need to be updated. Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#16 edit Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#16 (text+ko) ==== @@ -121,10 +121,15 @@ RELENG_7 (7.X-STABLE), HEAD (-CURRENT) + - These tags correspond to the SVN tags - stable/6, stable/7, - and head respectively. + + Noteworthy SVN Tags + + + stable/6 (6.X-STABLE), + stable/7 (7.X-STABLE), + head (-CURRENT) @@ -438,49 +443,20 @@ Practical FreeBSD examples: - + Note that cvs stores metadata in subdirectories named CVS. @@ -906,8 +882,28 @@ + The following are some Subversion examples related to the + src repository. More (in-depth) information can be found at + Subversion + Primer and List of + things missing in Subversion when compared to CVS. + The notes at + might also be useful. + + + + Check out the head branch: + + &prompt.user; svn co svn+ssh://svn.freebsd.org/base/head /usr/src + + + Use the option if you realize that - you left out important information from the commit message. + you left out important information from the commit message. + This seems only possible with CVS. Good commit messages are important. They tell others why you did the changes you did, not just right here and now, From jhb at FreeBSD.org Tue Mar 10 14:56:16 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Tue Mar 10 14:56:24 2009 Subject: PERFORCE change 159031 for review Message-ID: <200903102156.n2ALu6Tq010397@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159031 Change 159031 by jhb@jhb_jhbbsd on 2009/03/10 21:55:15 IFC @159027 Affected files ... .. //depot/projects/smpng/sys/amd64/acpica/madt.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#13 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#74 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#52 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#90 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#64 integrate .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#40 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#49 integrate .. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#21 integrate .. //depot/projects/smpng/sys/amd64/include/fpu.h#5 integrate .. //depot/projects/smpng/sys/amd64/include/pcb.h#15 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#18 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#36 integrate .. //depot/projects/smpng/sys/arm/at91/files.at91#7 integrate .. //depot/projects/smpng/sys/arm/conf/AVILA#15 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/files.ixp425#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#10 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#10 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#20 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#18 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#18 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/devicename.c#9 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#27 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#19 integrate .. //depot/projects/smpng/sys/bsm/audit.h#13 integrate .. //depot/projects/smpng/sys/bsm/audit_kevents.h#14 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#56 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#95 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/smpng/sys/compat/ndis/hal_var.h#9 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#43 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#10 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#29 integrate .. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#26 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#11 integrate .. //depot/projects/smpng/sys/compat/ndis/resource_var.h#4 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#22 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#49 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#48 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#9 integrate .. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#7 integrate .. //depot/projects/smpng/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/smpng/sys/conf/files#231 integrate .. //depot/projects/smpng/sys/conf/files.amd64#62 integrate .. //depot/projects/smpng/sys/conf/files.i386#119 integrate .. //depot/projects/smpng/sys/conf/files.ia64#63 integrate .. //depot/projects/smpng/sys/conf/files.mips#6 integrate .. //depot/projects/smpng/sys/conf/files.pc98#96 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#48 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#73 integrate .. //depot/projects/smpng/sys/conf/files.sun4v#9 integrate .. //depot/projects/smpng/sys/conf/kern.mk#23 integrate .. //depot/projects/smpng/sys/ddb/db_expr.c#6 integrate .. //depot/projects/smpng/sys/dev/agp/agp.c#6 integrate .. //depot/projects/smpng/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/smpng/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/smpng/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/smpng/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/smpng/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#96 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#62 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#71 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#26 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#72 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#47 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#56 integrate .. //depot/projects/smpng/sys/dev/ata/ata-usb.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#39 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#71 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#40 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#41 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-marvell.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-sis.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#70 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#21 integrate .. //depot/projects/smpng/sys/dev/ath/if_athvar.h#43 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#26 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#8 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#15 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#37 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_core.c#4 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_dev.c#4 integrate .. //depot/projects/smpng/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/smpng/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#10 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#9 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_cpl.h#7 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#11 integrate .. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#13 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_ioctl.h#6 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#19 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#15 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/smpng/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/smpng/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/smpng/sys/dev/dc/if_dc.c#21 integrate .. //depot/projects/smpng/sys/dev/drm/drmP.h#22 integrate .. //depot/projects/smpng/sys/dev/drm/drm_bufs.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm_scatter.c#7 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/smpng/sys/dev/drm/i915_dma.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/i915_drv.h#8 integrate .. //depot/projects/smpng/sys/dev/drm/i915_irq.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_drv.h#4 integrate .. //depot/projects/smpng/sys/dev/drm/mach64_irq.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/mga_dma.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/mga_drv.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/mga_irq.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/r128_drv.h#12 integrate .. //depot/projects/smpng/sys/dev/drm/r128_irq.c#8 integrate .. //depot/projects/smpng/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/smpng/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#20 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#15 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.c#14 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#19 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/radeon_state.c#18 integrate .. //depot/projects/smpng/sys/dev/drm/savage_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm/sis_drv.c#10 integrate .. //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#12 integrate .. //depot/projects/smpng/sys/dev/exca/exca.c#26 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#43 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#88 integrate .. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#11 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#52 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#11 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#7 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#22 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#18 integrate .. //depot/projects/smpng/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/smpng/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_iicbus.c#3 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#48 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#29 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvarp.h#6 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#105 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#24 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#31 integrate .. //depot/projects/smpng/sys/dev/pci/vga_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/puc/puc_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#48 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#72 integrate .. //depot/projects/smpng/sys/dev/sio/sio_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/smbus/smbus.c#9 integrate .. //depot/projects/smpng/sys/dev/smbus/smbus.h#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#35 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#29 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#23 integrate .. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#69 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.h#22 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken.c#4 integrate .. //depot/projects/smpng/sys/dev/syscons/teken/teken.h#4 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/image/uscanner.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umct.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#130 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rumvar.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uralvar.h#3 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#23 integrate .. //depot/projects/smpng/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#76 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#39 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#18 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#17 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#17 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#50 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#25 integrate .. //depot/projects/smpng/sys/geom/geom_redboot.c#1 branch .. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_fs.h#4 integrate .. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#3 integrate .. //depot/projects/smpng/sys/i386/acpica/madt.c#24 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#140 integrate .. //depot/projects/smpng/sys/i386/i386/in_cksum.c#9 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#136 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#118 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#114 integrate .. //depot/projects/smpng/sys/i386/include/npx.h#10 integrate .. //depot/projects/smpng/sys/i386/include/pcb.h#15 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#65 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#25 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#65 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#8 integrate .. //depot/projects/smpng/sys/isa/syscons_isa.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_conf.c#58 integrate .. //depot/projects/smpng/sys/kern/kern_priv.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#107 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#60 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#47 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#74 integrate .. //depot/projects/smpng/sys/kern/subr_param.c#27 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#54 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#178 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#57 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#63 integrate .. //depot/projects/smpng/sys/kern/sys_process.c#64 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#41 integrate .. //depot/projects/smpng/sys/kern/tty.c#87 integrate .. //depot/projects/smpng/sys/kern/tty_info.c#5 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#16 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#86 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#116 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#50 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#58 integrate .. //depot/projects/smpng/sys/kern/vfs_extattr.c#6 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#89 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#163 integrate .. //depot/projects/smpng/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/smpng/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/smpng/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/smpng/sys/libkern/memmove.c#1 branch .. //depot/projects/smpng/sys/mips/mips/pmap.c#8 integrate .. //depot/projects/smpng/sys/modules/drm/radeon/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/if_ndis/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/ndis/Makefile#8 integrate .. //depot/projects/smpng/sys/net/bpf.c#82 integrate .. //depot/projects/smpng/sys/net/bpf_zerocopy.c#4 integrate .. //depot/projects/smpng/sys/net/if_gif.h#17 integrate .. //depot/projects/smpng/sys/net/if_var.h#58 integrate .. //depot/projects/smpng/sys/net/netisr.h#12 integrate .. //depot/projects/smpng/sys/net/vnet.h#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#16 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#9 integrate .. //depot/projects/smpng/sys/netgraph/atm/ng_ccatm.h#3 integrate .. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni_cust.h#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#19 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#34 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#15 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#66 integrate .. //depot/projects/smpng/sys/netinet/igmp.c#26 integrate .. //depot/projects/smpng/sys/netinet/igmp.h#6 integrate .. //depot/projects/smpng/sys/netinet/igmp_var.h#7 integrate .. //depot/projects/smpng/sys/netinet/in.c#49 integrate .. //depot/projects/smpng/sys/netinet/in.h#45 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#26 integrate .. //depot/projects/smpng/sys/netinet/in_mcast.c#9 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#59 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#32 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#24 integrate .. //depot/projects/smpng/sys/netinet/ip6.h#11 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#53 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#46 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#105 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#95 integrate .. //depot/projects/smpng/sys/netinet/ip_options.c#12 integrate .. //depot/projects/smpng/sys/netinet/ip_options.h#3 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#104 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#39 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#78 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#20 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#21 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#9 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#89 integrate .. //depot/projects/smpng/sys/netinet/vinet.h#6 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#22 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#61 integrate .. //depot/projects/smpng/sys/netinet6/route6.c#14 integrate .. //depot/projects/smpng/sys/netinet6/vinet6.h#6 integrate .. //depot/projects/smpng/sys/netipsec/key.c#29 integrate .. //depot/projects/smpng/sys/netipsec/vipsec.h#5 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#83 integrate .. //depot/projects/smpng/sys/pc98/cbus/scterm-sck.c#5 integrate .. //depot/projects/smpng/sys/pc98/cbus/syscons_cbus.c#6 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#29 integrate .. //depot/projects/smpng/sys/pci/viapm.c#18 integrate .. //depot/projects/smpng/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/smpng/sys/security/audit/audit.c#17 integrate .. //depot/projects/smpng/sys/security/audit/audit.h#11 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#14 integrate .. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#20 integrate .. //depot/projects/smpng/sys/security/mac/mac_audit.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.c#5 integrate .. //depot/projects/smpng/sys/security/mac/mac_framework.h#14 integrate .. //depot/projects/smpng/sys/security/mac/mac_inet.c#13 integrate .. //depot/projects/smpng/sys/security/mac/mac_internal.h#18 integrate .. //depot/projects/smpng/sys/security/mac/mac_net.c#22 integrate .. //depot/projects/smpng/sys/security/mac/mac_pipe.c#14 integrate .. //depot/projects/smpng/sys/security/mac/mac_policy.h#12 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#10 integrate .. //depot/projects/smpng/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/smpng/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/smpng/sys/security/mac/mac_process.c#20 integrate .. //depot/projects/smpng/sys/security/mac/mac_socket.c#11 integrate .. //depot/projects/smpng/sys/security/mac/mac_system.c#12 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#9 integrate .. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#8 integrate .. //depot/projects/smpng/sys/security/mac/mac_vfs.c#22 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#56 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#33 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#45 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#50 integrate .. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#30 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#46 integrate .. //depot/projects/smpng/sys/sys/buf.h#52 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#39 integrate .. //depot/projects/smpng/sys/sys/fcntl.h#11 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#80 integrate .. //depot/projects/smpng/sys/sys/mount.h#72 integrate .. //depot/projects/smpng/sys/sys/param.h#137 integrate .. //depot/projects/smpng/sys/sys/pipe.h#12 integrate .. //depot/projects/smpng/sys/sys/priv.h#15 integrate .. //depot/projects/smpng/sys/sys/proc.h#194 integrate .. //depot/projects/smpng/sys/sys/sdt.h#2 integrate .. //depot/projects/smpng/sys/sys/shm.h#11 integrate .. //depot/projects/smpng/sys/sys/stat.h#21 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#56 integrate .. //depot/projects/smpng/sys/sys/systm.h#91 integrate .. //depot/projects/smpng/sys/sys/tree.h#11 integrate .. //depot/projects/smpng/sys/sys/vimage.h#5 integrate .. //depot/projects/smpng/sys/sys/vnode.h#96 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#72 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#111 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#17 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#69 integrate .. //depot/projects/smpng/sys/xdr/xdr_mem.c#2 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/acpica/madt.c#17 (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/smpng/sys/amd64/amd64/fpu.c#13 (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/smpng/sys/amd64/amd64/machdep.c#74 (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/smpng/sys/amd64/amd64/mp_machdep.c#52 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.299 2009/02/25 22:24:56 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.300 2009/03/08 05:01:39 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 - * run time. + * run-time. */ if (allowed != hyperthreading_allowed) return (ENOTSUP); ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#90 (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.653 2009/03/10 02:12:03 alc Exp $"); /* * Manages physical address maps. @@ -1278,7 +1278,6 @@ _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t *free) { - vm_offset_t pteva; /* * unmap the page table page @@ -1287,19 +1286,16 @@ /* PDP page */ pml4_entry_t *pml4; pml4 = pmap_pml4e(pmap, va); - pteva = (vm_offset_t) PDPmap + amd64_ptob(m->pindex - (NUPDE + NUPDPE)); *pml4 = 0; } else if (m->pindex >= NUPDE) { /* PD page */ pdp_entry_t *pdp; pdp = pmap_pdpe(pmap, va); - pteva = (vm_offset_t) PDmap + amd64_ptob(m->pindex - NUPDE); *pdp = 0; } else { /* PTE page */ pd_entry_t *pd; pd = pmap_pde(pmap, va); - pteva = (vm_offset_t) PTmap + amd64_ptob(m->pindex); *pd = 0; } --pmap->pm_stats.resident_count; @@ -1325,12 +1321,6 @@ */ atomic_subtract_rel_int(&cnt.v_wire_count, 1); - /* - * Do an invltlb to make the invalidated mapping - * take effect immediately. - */ - pmap_invalidate_page(pmap, pteva); - /* * Put page on a list so that it is released after * *ALL* TLB shootdown is done @@ -2277,9 +2267,10 @@ pde_store(pde, newpde); /* - * Invalidate a stale mapping of the page table page. + * Invalidate a stale recursive mapping of the page table page. */ - pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va)); + if (va >= VM_MAXUSER_ADDRESS) + pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va)); /* * Demote the pv entry. This depends on the earlier demotion @@ -3253,17 +3244,12 @@ return (mpte); } } + pte = (pt_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(mpte)); + pte = &pte[pmap_pte_index(va)]; } else { mpte = NULL; + pte = vtopte(va); } - - /* - * This call to vtopte makes the assumption that we are - * entering the page into the current pmap. In order to support - * quick entry into any pmap, one would likely use pmap_pte. - * But that isn't as quick as vtopte. - */ - pte = vtopte(va); if (*pte) { if (mpte != NULL) { mpte->wire_count--; @@ -3481,9 +3467,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 +3528,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; @@ -3768,7 +3753,7 @@ void pmap_remove_pages(pmap_t pmap) { - pd_entry_t *pde; + pd_entry_t ptepde; pt_entry_t *pte, tpte; vm_page_t free = NULL; vm_page_t m, mpte, mt; @@ -3797,21 +3782,19 @@ pv = &pc->pc_pventry[idx]; inuse &= ~bitmask; - pde = vtopde(pv->pv_va); - tpte = *pde; - if ((tpte & PG_PS) != 0) - pte = pde; - else { - pte = vtopte(pv->pv_va); + pte = pmap_pdpe(pmap, pv->pv_va); + ptepde = *pte; + pte = pmap_pdpe_to_pde(pte, pv->pv_va); + tpte = *pte; + if ((tpte & (PG_PS | PG_V)) == PG_V) { + ptepde = tpte; + pte = (pt_entry_t *)PHYS_TO_DMAP(tpte & + PG_FRAME); + pte = &pte[pmap_pte_index(pv->pv_va)]; tpte = *pte & ~PG_PTE_PAT; } - - if (tpte == 0) { - printf( - "TPTE at %p IS ZERO @ VA %08lx\n", - pte, pv->pv_va); + if ((tpte & PG_V) == 0) panic("bad pte"); - } /* * We cannot remove wired pages from a process' mapping at this time @@ -3867,8 +3850,6 @@ pmap_add_delayed_free_list(mpte, &free, FALSE); atomic_subtract_int(&cnt.v_wire_count, 1); } - pmap_unuse_pt(pmap, pv->pv_va, - *pmap_pdpe(pmap, pv->pv_va), &free); } else { pmap->pm_stats.resident_count--; TAILQ_REMOVE(&m->md.pv_list, pv, pv_list); @@ -3877,8 +3858,8 @@ if (TAILQ_EMPTY(&pvh->pv_list)) vm_page_flag_clear(m, PG_WRITEABLE); } - pmap_unuse_pt(pmap, pv->pv_va, *pde, &free); } + pmap_unuse_pt(pmap, pv->pv_va, ptepde, &free); } } if (allfree) { @@ -4495,7 +4476,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 +4552,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/smpng/sys/amd64/amd64/trap.c#64 (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.330 2009/03/09 13:11:16 rwatson Exp $"); /* * AMD64 Trap and System call handling @@ -386,7 +386,6 @@ #ifdef DEV_ISA case T_NMI: /* machine/parity/power fail/"kitchen sink" faults */ - /* XXX Giant */ if (isa_nmi(code) == 0) { #ifdef KDB /* @@ -416,13 +415,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 +444,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; @@ -537,7 +529,6 @@ #ifdef DEV_ISA case T_NMI: - /* XXX Giant */ /* machine/parity/power fail/"kitchen sink" faults */ if (isa_nmi(code) == 0) { #ifdef KDB @@ -827,9 +818,6 @@ orig_tf_rflags = frame->tf_rflags; if (p->p_sysent->sv_prepsyscall) { - /* - * The prep code is MP aware. - */ (*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, ¶ms); } else { if (code == SYS_syscall || code == SYS___syscall) { @@ -848,10 +836,6 @@ callp = &p->p_sysent->sv_table[code]; narg = callp->sy_narg; - - /* - * copyin and the ktrsyscall()/ktrsysret() code is MP-aware - */ KASSERT(narg <= sizeof(args) / sizeof(args[0]), ("Too many syscall arguments!")); error = 0; ==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#40 (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/smpng/sys/amd64/conf/NOTES#49 (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.87 2009/02/24 00:39:48 thompsa Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.88 2009/03/07 19:54:30 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/smpng/sys/amd64/ia32/ia32_signal.c#21 (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/smpng/sys/amd64/include/fpu.h#5 (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/smpng/sys/amd64/include/pcb.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 >>> TRUNCATED FOR MAIL (1000 lines) <<< From jhb at FreeBSD.org Tue Mar 10 14:57:16 2009 From: jhb at FreeBSD.org (John Baldwin) Date: Tue Mar 10 14:57:22 2009 Subject: PERFORCE change 159033 for review Message-ID: <200903102157.n2ALvE6K010472@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159033 Change 159033 by jhb@jhb_jhbbsd on 2009/03/10 21:56:13 IFC @159032 Affected files ... .. //depot/projects/smpng/sys/arm/conf/CAMBRIA#5 integrate .. //depot/projects/smpng/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#13 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#6 integrate .. //depot/projects/smpng/sys/conf/options.arm#20 integrate Differences ... ==== //depot/projects/smpng/sys/arm/conf/CAMBRIA#5 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.7 2009/03/09 23:25:34 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.8 2009/03/10 21:49:51 sam Exp $ ident CAMBRIA @@ -67,6 +67,8 @@ device uart device ixpwdog # watchdog timer + +options IXP4XX_FLASH_SIZE=0x02000000 # stock 2358 comes w/ 32M device cfi # flash support device cfid # flash disk support device geom_redboot # redboot fis parser ==== //depot/projects/smpng/sys/arm/conf/CAMBRIA.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.1 2008/12/20 03:26:09 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA.hints,v 1.2 2009/03/10 21:49:51 sam Exp $ # # Device wiring for the Gateworks Cambria 2358. @@ -27,6 +27,10 @@ #hint.npe.1.mii="C" #hint.npe.1.phy=2 +# FLASH +hint.cfi.0.at="ixp0" +hint.cfi.0.addr=0x50000000 + # CF IDE controller hint.ata_avila.0.at="ixp0" ==== //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#13 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include -__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.17 2009/03/06 23:29:00 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_machdep.c,v 1.18 2009/03/10 21:47:17 sam Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -187,6 +187,10 @@ { IXP425_EXP_VBASE, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* CFI Flash on the Expansion Bus */ + { IXP425_EXP_BUS_CS0_VBASE, IXP425_EXP_BUS_CS0_HWBASE, + IXP425_EXP_BUS_CS0_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* IXP425 PCI Configuration */ { IXP425_PCI_VBASE, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, ==== //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425reg.h,v 1.6 2009/03/06 23:32:45 sam Exp $ + * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425reg.h,v 1.7 2009/03/10 21:49:22 sam Exp $ * */ @@ -660,7 +660,11 @@ /* NB: CS0 is special; it maps flash */ #define IXP425_EXP_BUS_CS0_HWBASE IXP425_EXP_BUS_CSx_HWBASE(0) #define IXP425_EXP_BUS_CS0_VBASE 0xFD000000UL +#ifndef IXP4XX_FLASH_SIZE #define IXP425_EXP_BUS_CS0_SIZE 0x01000000 /* NB: 16M */ +#else +#define IXP425_EXP_BUS_CS0_SIZE IXP4XX_FLASH_SIZE +#endif #define IXP425_EXP_BUS_CS1_HWBASE IXP425_EXP_BUS_CSx_HWBASE(1) #define IXP425_EXP_BUS_CS1_VBASE IXP425_EXP_BUS_CSx_VBASE(1) #define IXP425_EXP_BUS_CS1_SIZE IXP425_EXP_BUS_CSx_SIZE ==== //depot/projects/smpng/sys/conf/options.arm#20 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/conf/options.arm,v 1.23 2008/12/20 03:26:09 sam Exp $ +#$FreeBSD: src/sys/conf/options.arm,v 1.24 2009/03/10 21:49:22 sam Exp $ ARM9_CACHE_WRITE_THROUGH opt_global.h ARM_CACHE_LOCK_ENABLE opt_global.h ARMFPE opt_global.h @@ -18,6 +18,7 @@ CPU_XSCALE_IXP435 opt_global.h CPU_XSCALE_PXA2X0 opt_global.h FLASHADDR opt_global.h +IXP4XX_FLASH_SIZE opt_global.h KERNPHYSADDR opt_global.h KERNVIRTADDR opt_global.h LOADERRAMADDR opt_global.h From gabor at FreeBSD.org Tue Mar 10 16:01:22 2009 From: gabor at FreeBSD.org (Gabor Kovesdan) Date: Tue Mar 10 16:01:28 2009 Subject: PERFORCE change 159037 for review Message-ID: <200903102301.n2AN1KpR016618@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159037 Change 159037 by gabor@gabor_server on 2009/03/10 23:01:18 - Fix EOF handling Thanks to: ed, delphij, James Bailie Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#41 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#46 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#41 (text+ko) ==== @@ -60,9 +60,9 @@ /* Some global variable for the buffering and reading. */ static char *lnbuf; static size_t lnbuflen; -static char *binbuf; +static unsigned char *binbuf; static int binbufsiz; -char *binbufptr; +unsigned char *binbufptr; static int bzerr; #define iswbinary(ch) (!iswspace((ch)) && iswcntrl((ch)) && (ch != L'\b') && (ch != L'\0')) @@ -74,7 +74,7 @@ int grep_fgetc(struct file *f) { - char c; + int c; switch (filebehave) { case FILE_STDIO: @@ -141,8 +141,13 @@ binbuf = grep_malloc(sizeof(char) * bufsiz); - for (; i < bufsiz && !grep_feof(f); i++) - binbuf[i] = grep_fgetc(f); + while (i < bufsiz) { + ch = grep_fgetc(f); + if (ch == EOF) + break; + binbuf[i++] = ch; + } + f->binary = memchr(binbuf, (filebehave != FILE_GZIP) ? '\0' : '\200', i - 1) != 0; } binbufsiz = i; ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#46 (text+ko) ==== @@ -144,7 +144,7 @@ void clearqueue(void); /* file.c */ -char *binbufptr; +unsigned char *binbufptr; void grep_close(struct file *f); struct file *grep_stdin_open(void); From hselasky at FreeBSD.org Wed Mar 11 01:25:09 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Wed Mar 11 01:25:16 2009 Subject: PERFORCE change 159053 for review Message-ID: <200903110825.n2B8P7Fg093867@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159053 Change 159053 by hselasky@hselasky_laptop001 on 2009/03/11 08:24:55 USB CORE: More HID fixes: - preserve item size and count accross items - add some more debugging prints Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#22 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#22 (text+ko) ==== @@ -68,7 +68,9 @@ struct hid_item cur[MAXPUSH]; int32_t usages_min[MAXUSAGE]; int32_t usages_max[MAXUSAGE]; - int kindset; + uint32_t loc_size; /* last seen size */ + uint32_t loc_count; /* last seen count */ + uint8_t kindset; /* we have 5 kinds so 8 bits are enough */ uint8_t pushlevel; /* current pushlevel */ uint8_t ncount; /* end usage item count */ uint8_t icount; /* current usage item count */ @@ -268,6 +270,9 @@ c->kind = hid_input; c->flags = dval; ret: + c->loc.count = s->loc_count; + c->loc.size = s->loc_size; + if (c->flags & HIO_VARIABLE) { /* range check usage count */ if (c->loc.count > 255) { @@ -287,6 +292,7 @@ } /* make sure we have a usage */ if (s->nusage == 0) { + DPRINTFN(1, "Using default usage\n"); /* use the undefined HID PAGE */ s->usages_min[s->nusage] = 0x0000; s->usages_max[s->nusage] = 0xFFFF; @@ -346,7 +352,8 @@ c->unit = dval; break; case 7: - c->loc.size = dval; + /* mask because value is unsigned */ + s->loc_size = dval & mask; break; case 8: c->report_ID = dval; @@ -354,12 +361,17 @@ c->loc.pos = 0; break; case 9: - c->loc.count = dval; + /* mask because value is unsigned */ + s->loc_count = dval & mask; break; case 10: /* Push */ s->pushlevel ++; if (s->pushlevel < MAXPUSH) { s->cur[s->pushlevel] = *c; + /* store size and count */ + c->loc.size = s->loc_size; + c->loc.count = s->loc_count; + /* update current item pointer */ c = &s->cur[s->pushlevel]; } else { DPRINTFN(0, "Cannot push " @@ -372,7 +384,13 @@ /* preserve position */ oldpos = c->loc.pos; c = &s->cur[s->pushlevel]; + /* restore size and count */ + s->loc_size = c->loc.size; + s->loc_count = c->loc.count; + /* set default item location */ c->loc.pos = oldpos; + c->loc.size = 0; + c->loc.count = 0; } else { DPRINTFN(0, "Cannot pop " "item @ %d!\n", s->pushlevel); From hselasky at FreeBSD.org Wed Mar 11 15:22:44 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Wed Mar 11 15:22:50 2009 Subject: PERFORCE change 159091 for review Message-ID: <200903112222.n2BMMfP8054281@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159091 Change 159091 by hselasky@hselasky_laptop001 on 2009/03/11 22:21:41 USB CORE: Be less strict on the last HID item usage. Reported by: Andrey Chernov Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#23 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#23 (text+ko) ==== @@ -68,6 +68,7 @@ struct hid_item cur[MAXPUSH]; int32_t usages_min[MAXUSAGE]; int32_t usages_max[MAXUSAGE]; + int32_t usage_last; /* last seen usage */ uint32_t loc_size; /* last seen size */ uint32_t loc_count; /* last seen count */ uint8_t kindset; /* we have 5 kinds so 8 bits are enough */ @@ -183,15 +184,21 @@ top: /* check if there is an array of items */ - if ((s->icount != s->ncount) && - (s->iusage != s->nusage)) { - dval = s->usages_min[s->iusage] + s->ousage; - c->usage = dval; - if (dval == s->usages_max[s->iusage]) { - s->iusage ++; - s->ousage = 0; + if (s->icount < s->ncount) { + /* get current usage */ + if (s->iusage < s->nusage) { + dval = s->usages_min[s->iusage] + s->ousage; + c->usage = dval; + s->usage_last = dval; + if (dval == s->usages_max[s->iusage]) { + s->iusage ++; + s->ousage = 0; + } else { + s->ousage ++; + } } else { - s->ousage ++; + DPRINTFN(1, "Using last usage\n"); + dval = s->usage_last; } s->icount ++; /* @@ -290,14 +297,9 @@ } else { s->ncount = 1; } - /* make sure we have a usage */ - if (s->nusage == 0) { - DPRINTFN(1, "Using default usage\n"); - /* use the undefined HID PAGE */ - s->usages_min[s->nusage] = 0x0000; - s->usages_max[s->nusage] = 0xFFFF; - s->nusage = s->ncount; - } + /* set default usage */ + /* use the undefined HID PAGE */ + s->usage_last = 0; goto top; case 9: /* Output */ From antab at FreeBSD.org Thu Mar 12 05:53:42 2009 From: antab at FreeBSD.org (Arnar Mar Sig) Date: Thu Mar 12 05:53:49 2009 Subject: PERFORCE change 159118 for review Message-ID: <200903121253.n2CCrX1A090727@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159118 Change 159118 by antab@antab_farm on 2009/03/12 12:52:35 - Add at32_tc to serve as bus to attach TC channels to. Each TC module has 3 channels. - Add at32_tc_channel driver stub to test at32_tc. - Add clock driver for system clock, attaches to at32_tc. This driver calls hardclock(). - Changes to intr code to make interrupts work. - Rearrange NGW100 kernel config to match GENERIC on i386/amd64 Affected files ... .. //depot/projects/avr32/src/sys/avr32/avr32/at32.c#6 edit .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc.c#1 add .. //depot/projects/avr32/src/sys/avr32/avr32/at32_tc_channel.c#1 add .. //depot/projects/avr32/src/sys/avr32/avr32/clock.c#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/exception.S#8 edit .. //depot/projects/avr32/src/sys/avr32/avr32/intr.c#5 edit .. //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#14 edit .. //depot/projects/avr32/src/sys/avr32/avr32/stack_machdep.c#3 edit .. //depot/projects/avr32/src/sys/avr32/avr32/switch.S#8 edit .. //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#9 edit .. //depot/projects/avr32/src/sys/avr32/conf/NGW100#13 edit .. //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#2 edit .. //depot/projects/avr32/src/sys/avr32/include/reg_tc.h#1 add .. //depot/projects/avr32/src/sys/conf/files.avr32#13 edit Differences ... ==== //depot/projects/avr32/src/sys/avr32/avr32/at32.c#6 (text+ko) ==== @@ -240,11 +240,11 @@ switch (type) { case SYS_RES_IRQ: rle->res = rman_reserve_resource(&sc->sc_irq_rman, - start, end, count, flags, child); + start, end, count, flags, child); break; case SYS_RES_MEMORY: rle->res = rman_reserve_resource(&sc->sc_mem_rman, - start, end, count, flags, child); + start, end, count, flags, child); if (rle->res != NULL) { rman_set_bustag(rle->res, 0); rman_set_bushandle(rle->res, start); ==== //depot/projects/avr32/src/sys/avr32/avr32/clock.c#5 (text+ko) ==== @@ -24,6 +24,12 @@ * SUCH DAMAGE. */ +/* + * System clock. We use one TC channel to implement it. The channel used + * depends on device hints and can be any of the TC channels. Clock select 0 + * is wired to 32KHz osc on AT32AP700x + */ + #include __FBSDID("$FreeBSD: $"); @@ -40,29 +46,167 @@ #include #include #include +#include +#include #include +#include #include #include +#include +#include #include +#define RD4(off) \ + bus_space_read_4(sc->bst, sc->bsh, (off)) +#define WR4(off, val) \ + bus_space_write_4(sc->bst, sc->bsh, (off), (val)) + /* Prototypes */ -static unsigned count_get_timecount(struct timecounter *); +static int clock_probe(device_t); +static int clock_attach(device_t); +static int clock_detach(device_t); +static int clock_intr(void *arg); +static unsigned clock_get_timecount(struct timecounter *); /* Variable and private data */ -uint64_t clock_cpu_frequency; /* Finzd batter way for this */ +uint64_t clock_cpu_frequency; /* Find batter way for this */ static uint64_t cycles_per_usec; static uint64_t cycles_per_hz; -static struct timecounter count_timecounter = { - count_get_timecount, /* get_timecount */ +static struct timecounter clock_timecounter = { + clock_get_timecount, /* get_timecount */ 0, /* no poll_pps */ 0xffffffffu, /* counter_mask */ - 0, /* frequency */ + 32768, /* frequency */ "AVR32", /* name */ 1000, /* quality (adjusted in code) */ }; +struct clock_softc { + struct resource *regs_res; + struct resource *irq_res; + void *intrhand; + bus_space_tag_t bst; + bus_space_handle_t bsh; + uint32_t ticks; +} *clock_softc; +static device_method_t clock_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, clock_probe), + DEVMETHOD(device_attach, clock_attach), + DEVMETHOD(device_detach, clock_detach), + {0, 0}, +}; +static driver_t clock_driver = { + "clock", + clock_methods, + sizeof(struct clock_softc), +}; +static devclass_t clock_devclass; +DRIVER_MODULE(clock, at32_tc, clock_driver, clock_devclass, 0, 0); /* Code */ +static int +clock_probe(device_t dev) +{ + if (device_get_unit(dev) != 0) { + panic("Can't attach more then one system clock"); + } + + device_set_desc(dev, "System clock"); + return (0); +} + +static int +clock_attach(device_t dev) +{ + struct clock_softc *sc = device_get_softc(dev); + int rid, err = ENOMEM; + + /* Make sure device clock is enabled before writing */ + devclk_enable(dev); + + /* Setup register space */ + rid = 0; + sc->regs_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + RF_ACTIVE); + if (sc->regs_res == NULL) { + goto errout; + } + sc->bsh = rman_get_bushandle(sc->regs_res); + sc->bst = rman_get_bustag(sc->regs_res); + + /* Setup interrupt */ + rid = 0; + sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, + RF_ACTIVE | RF_SHAREABLE); + if (sc->irq_res == NULL) { + goto errout; + } + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_CLK, clock_intr, NULL, + NULL, &sc->intrhand); + if (err) { + goto errout; + } + + clock_softc = sc; + return (0); + +errout: + clock_detach(dev); + return (err); +} + +static int +clock_detach(device_t dev) +{ + struct clock_softc *sc = device_get_softc(dev); + + if (sc->intrhand != NULL) { + bus_teardown_intr(dev, sc->irq_res, sc->intrhand); + sc->intrhand = NULL; + } + if (sc->regs_res != NULL) { + bus_release_resource(dev, SYS_RES_IRQ, + rman_get_rid(sc->irq_res), sc->irq_res); + sc->irq_res = NULL; + } + if (sc->regs_res != NULL) { + bus_release_resource(dev, SYS_RES_MEMORY, + rman_get_rid(sc->regs_res), sc->regs_res); + sc->regs_res = NULL; + } + + /* Turn off device clock */ + devclk_disable(dev); + return (0); +} + +static int +clock_intr(void *arg) +{ + struct trapframe *tf = arg; + struct clock_softc *sc = clock_softc; + register_t sr; + int ret = FILTER_STRAY;; + + /* + * Clock interrupt is shared with other TC channels, check if this + * interrupt is for us, reading SR also clears any pending triggers + */ + + critical_enter(); + sr = RD4(AT32_TC_SR); + if (bit_value(TC, SR, CPCS, sr)) { + sc->ticks += clock_timecounter.tc_frequency / hz; + + hardclock(TRAPF_USERMODE(tf), TRAPF_PC(tf)); + ret = FILTER_HANDLED; + } + critical_exit(); + + return (ret); +} + void cpu_startprofclock(void) { @@ -85,16 +229,52 @@ void cpu_initclocks(void) { - count_timecounter.tc_frequency = clock_cpu_frequency; + struct clock_softc *sc = clock_softc; + uint32_t rel_value, new_hz; + + if (clock_softc == NULL) { + panic("No system clock set"); + } + + /* + * Calculate Register C compare value. + */ + rel_value = clock_timecounter.tc_frequency / hz; + if (rel_value < 1) { + rel_value = 1; + } + new_hz = clock_timecounter.tc_frequency / rel_value; + if (hz != new_hz) { + printf("Cannot get %d Hz clock; using %d Hz instead\n", hz, new_hz); + hz = new_hz; + tick = 1000000 / hz; + } + + /* Set counter mode */ + WR4(AT32_TC_CMR, + bit_offset(TC, CMR, WAVE) | + 2 << bit_shift(TC, CMR, WAVSEL)); + + /* RC value to interrupt on */ + WR4(AT32_TC_RC, rel_value); + + /* Enable interupt RC compare */ + WR4(AT32_TC_IER, bit_offset(TC, IER, CPCS)); + + /* Enable clock and reset counter */ + WR4(AT32_TC_CCR, + bit_offset(TC, CCR, CLKEN) | + bit_offset(TC, CCR, SWTRG)); + cycles_per_hz = clock_cpu_frequency / hz; cycles_per_usec = (clock_cpu_frequency / (1000 * 1000)); - tc_init(&count_timecounter); + tc_init(&clock_timecounter); } static unsigned -count_get_timecount(struct timecounter *tc) +clock_get_timecount(struct timecounter *tc) { - return sysreg_read(COUNT); + return (clock_softc->ticks); } /* ==== //depot/projects/avr32/src/sys/avr32/avr32/exception.S#8 (text+ko) ==== @@ -223,7 +223,6 @@ mov r12, AT32_SYS_ECR mov r11, sp csrf AT32_SYS_SR_EM - csrf AT32_SYS_SR_GM rcall trap_handle_breakpoint POP_TRAPFRAME(DBG) retd ==== //depot/projects/avr32/src/sys/avr32/avr32/intr.c#5 (text+ko) ==== @@ -46,6 +46,8 @@ /* Private data */ static struct intr_event *intr_event[IRQ_COUNT]; +static int intrcnt_tab[IRQ_COUNT]; +static int intrcnt_index = 0; extern vm_offset_t _evba; /* Code */ @@ -62,7 +64,10 @@ void intr_restore(register_t s) { - __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_GM)); + register_t sr; + + sr = sysreg_read(SR) & ~INTR_MASK; + sysreg_write(SR, sr | (s & INTR_MASK)); } void @@ -102,6 +107,7 @@ if (intr_event_handle(intr_event[irq], tf) != 0) { panic("stray interrupt %d, priority %d\n", irq, pri); } + intrcnt[intrcnt_tab[irq]]++; } void @@ -141,11 +147,16 @@ if (event == NULL) { error = intr_event_create(&event, (void *)irq, 0, irq, (mask_fn)avr32_mask_irq, (mask_fn)avr32_unmask_irq, - NULL, NULL, "intr%d:", irq); + NULL, NULL, "irq%d:", irq); if (error) { return; } intr_event[irq] = event; + snprintf(intrnames + (MAXCOMLEN + 1) * intrcnt_index, + MAXCOMLEN + 1, + "irq%d: %-*s", irq, MAXCOMLEN, name); + intrcnt_tab[irq] = intrcnt_index; + intrcnt_index++; } intr_event_add_handler(event, name, filt, hand, arg, intr_priority(flags), flags, cookiep); ==== //depot/projects/avr32/src/sys/avr32/avr32/pmap.c#14 (text+ko) ==== @@ -1079,7 +1079,7 @@ pd_entry_t* pd = (pd_entry_t *)sysreg_read(PTBR); struct thread *td = curthread; pt_entry_t *ent; - register_t mmucr, intr; + register_t mmucr; ent = (pt_entry_t *)pd[pd_index_from_va(tlbear)]; if (ent) { @@ -1092,7 +1092,6 @@ * hit memory needs tlb lookups from here one. */ __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_EM)); - __asm__ __volatile__ ("csrf %0" : : "i"(AT32_SYS_SR_GM)); struct proc *p = curproc; vm_prot_t ftype; @@ -1156,9 +1155,6 @@ *ent |= PTE_DIRTY; } - /* XXX: Exceptions are enabled in the long path */ - intr = intr_disable(); - mmucr = sysreg_read(MMUCR); mmucr &= ~bit_mask(SYS, MMUCR, DRP); mmucr |= tlb_at << bit_shift(SYS, MMUCR, DRP); @@ -1180,9 +1176,6 @@ tlb_at = KSTACK_PAGES; } - /* XXX */ - intr_restore(intr); - out: if (!TRAPF_USERMODE(tf)) { return; ==== //depot/projects/avr32/src/sys/avr32/avr32/stack_machdep.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ (KSTACK_PAGES * PAGE_SIZE)) { break; } - if (frame->lr == NULL) { + if (frame->lr == 0) { break; } ==== //depot/projects/avr32/src/sys/avr32/avr32/switch.S#8 (text+ko) ==== @@ -58,6 +58,7 @@ /** * r12: Pointer struct thread * r11: Pmap + * r10: Saved SR * NOTE: This code is messy and i need to find better way to do this. */ ENTRY(restorectx) @@ -72,8 +73,11 @@ * r4: Misc * r3: tlbehi save * r2: Address of PCB + * r1: Saved SR */ + mov r1, r10 + /* Load PCB and PD address */ ld.w r2, r12[TD_PCB] @@ -137,6 +141,7 @@ mtsr AT32_SYS_PTBR, r11 /* Point lookups to new pmap */ mtsr AT32_SYS_TLBEHI, r10 /* Set TLBEHI (ASID for new td) */ nop /* Wait for mtsr */ + mtsr AT32_SYS_SR, r1 /* Restore saved SR */ ld.w r4, r2++ /* Load status register */ musfr r4 /* Set status register */ sub r2, -4 /* Skip PC */ ==== //depot/projects/avr32/src/sys/avr32/avr32/vm_machdep.c#9 (text+ko) ==== @@ -50,7 +50,7 @@ #include #include -void restorectx(struct thread *td, pmap_t pmap); +void restorectx(struct thread *td, pmap_t pmap, register_t sr); /* * Finish a fork operation, with process p2 nearly set up. @@ -209,11 +209,16 @@ void cpu_switch(struct thread *old, struct thread *new, struct mtx *mtx) { + register_t sr; pmap_t pmap; + /* Disable interrupts, they will get enabled in restorectx() */ + sr = intr_disable(); + if (!savectx(old->td_pcb)) { old->td_lock = mtx; PCPU_SET(curthread, new); + PCPU_SET(curpcb, curthread->td_pcb); pmap = vmspace_pmap(new->td_proc->p_vmspace); pmap_activate(new); @@ -222,7 +227,7 @@ pmap, new->td_kstack, new->td_kstack + (KSTACK_PAGES * PAGE_SIZE) - 1); */ - restorectx(new, pmap); + restorectx(new, pmap, sr); /* We should not get here. */ panic("cpu_switch: restorectx() returned"); ==== //depot/projects/avr32/src/sys/avr32/conf/NGW100#13 (text+ko) ==== @@ -9,48 +9,69 @@ hints "cpu/at32ap700x.hints" # Hints for all buildin devices hints "cpu/at32ap7000.hints" # Hints for all buildin devices hints "NGW100.hints" + +# Uncomment to boot from onboard flash options ROOTDEVNAME=\"ufs:cfid0h1\" +# Uncomment to boot from ethernet +#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_COMPAT + makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -#options VERBOSE_SYSINIT -options DDB -options KDB -#options GDB -options SCHED_4BSD #4BSD scheduler -options INET #InterNETworking -options NFSCLIENT #Network Filesystem Client -options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options PSEUDOFS #Pseudo-filesystem framework +options SCHED_4BSD # 4BSD scheduler +#options PREEMPTION # Enable kernel thread preemption +options INET # InterNETworking +#options INET6 # IPv6 communications protocols +#options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores +options MD_ROOT # MD is a potential root device +options NFSCLIENT # Network Filesystem Client +options NFSSERVER # Network Filesystem Server +options NFSLOCKD # Network Lock Manager +options NFS_ROOT # NFS usable as /, requires NFSCLIENT +#options MSDOSFS # MSDOS Filesystem +#options PROCFS # Process filesystem (requires PSEUDOFS) +options PSEUDOFS # Pseudo-filesystem framework +#options KTRACE # ktrace(1) support +options STACK # stack(9) support +options SYSVSHM # SYSV-style shared memory +options SYSVMSG # SYSV-style message queues +options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions +#options KBD_INSTALL_CDEV # install a CDEV entry in /dev +#options AUDIT # Security event auditing +#options KDTRACE_HOOKS # Kernel DTrace hooks # Debugging for use in -current options DIAGNOSTIC +options KDB # Enable kernel debugger support. +options DDB # Support DDB +#options GDB # Support remote GDB 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_SKIPSPIN #Don't run witness on spinlocks for speed -#options WITNESS_KDB + device at32_intc # Interrupt controller device at32_hmatrix # HSB Bus Matrix device at32_sdramc # SDRAM controller device at32_smc # Static memory controller device at32_pm # Power Manager -device at32_rtc # Real Time Counter (System clock) +device at32_rtc # Real Time Counter device at32_pio # Peripheral IO -#device mii # Requred for ate -#device ate # MACB Ethernet driver +device at32_tc # Timer/Counter (REQUIRED: Used for system clock) +device at32_tc_channel # Timer/Counter channel +device mii # Requred for ate +device ate # MACB Ethernet driver -#device gpio # GPIO framework device uart # USART support #device atmel_twi # TWI (I2C) support #device atmel_ssc # Sync Serial controller @@ -62,9 +83,13 @@ device geom_hints # Pseudo devices. -device loop -device random -device ether -device md +device loop # Network loopback +device random # Entropy device +device ether # Ethernet support +#device tun # Packet tunnel. +#device pty # BSD-style compatibility pseudo ttys +#device md # Memory "disks" +#device gif # IPv6 and IPv4 tunneling +#device faith # IPv6-to-IPv4 relaying (translation) #device mmc #device mmcsd ==== //depot/projects/avr32/src/sys/avr32/conf/cpu/at32ap700x.hints#2 (text+ko) ==== @@ -122,11 +122,30 @@ hint.at32_tc.0.msize="0x400" hint.at32_tc.0.irq="22" +hint.at32_tc_channel.0.at="at32_tc0" +hint.at32_tc_channel.0.offset="0x00" + +hint.at32_tc_channel.1.at="at32_tc0" +hint.at32_tc_channel.1.offset="0x40" + +hint.at32_tc_channel.2.at="at32_tc0" +hint.at32_tc_channel.2.offset="0x80" + hint.at32_tc.1.at="at32bus0" hint.at32_tc.1.maddr="0xFFF01000" hint.at32_tc.1.msize="0x400" hint.at32_tc.1.irq="23" +hint.at32_tc_channel.3.at="at32_tc1" +hint.at32_tc_channel.3.offset="0x00" + +hint.at32_tc_channel.4.at="at32_tc1" +hint.at32_tc_channel.4.offset="0x40" + +# Channel 3 on TC1 is used for system clock +hint.clock.0.at="at32_tc1" +hint.clock.0.offset="0x80" + hint.at32_pwm.0.at="at32bus0" hint.at32_pwm.0.maddr="0xFFF01400" hint.at32_pwm.0.msize="0x400" ==== //depot/projects/avr32/src/sys/conf/files.avr32#13 (text+ko) ==== @@ -28,13 +28,15 @@ avr32/avr32/stack_machdep.c optional ddb | stack avr32/avr32/gdb_machdep.c optional gdb +avr32/avr32/at32_hmatrix.c optional at32_hmatrix avr32/avr32/at32_intc.c optional at32_intc +avr32/avr32/at32_pio.c optional at32_pio avr32/avr32/at32_pm.c optional at32_pm -avr32/avr32/at32_hmatrix.c optional at32_hmatrix avr32/avr32/at32_rtc.c optional at32_rtc -avr32/avr32/at32_pio.c optional at32_pio avr32/avr32/at32_sdramc.c optional at32_sdramc avr32/avr32/at32_smc.c optional at32_smc +avr32/avr32/at32_tc.c optional at32_tc +avr32/avr32/at32_tc_channel.c optional at32_tc_channel dev/mmc/atmel_mci.c optional atmel_mci dev/spibus/atmel_spi.c optional atmel_spi avr32/avr32/busdma_machdep.c optional at32_mci @@ -53,6 +55,7 @@ libkern/qdivrem.c standard #libkern/udivdi3.c standard #libkern/umoddi3.c standard +libkern/memset.c standard avr32/avr32/in_cksum.c optional inet From sson at FreeBSD.org Thu Mar 12 13:20:17 2009 From: sson at FreeBSD.org (Stacey Son) Date: Thu Mar 12 13:20:24 2009 Subject: PERFORCE change 159130 for review Message-ID: <200903122020.n2CKKGBa050532@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159130 Change 159130 by sson@sson_amd64 on 2009/03/12 20:19:42 Various fixes in audit_fcntl.h and bsm_fcntl.c: - Add missing F_GETXFL in audit_fcntl.h. - BSM_F_SETLK_NBMAND should be defined as 42 and BSM_F_SETLK64_NBMAND should be 44. - Note that BSM_F_DUF2FD is both FreeBSD and Solaris specific. - Add file system specific fcntl commands for darwin. - Many comment fixes. Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 edit .. //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 (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_fcntl.c#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_fcntl.c#2 $ */ #include @@ -121,14 +121,17 @@ #ifdef F_UNSHARE { BSM_F_UNSHARE, F_UNSHARE }, #endif -#ifdef F_SETLK64_NBMAND - { BSM_F_SETLK64_NBMAND, F_SETLK64_NBMAND }, +#ifdef F_SETLK_NBMAND + { BSM_F_SETLK_NBMAND, F_SETLK_NBMAND }, #endif #ifdef F_SHARE_NBMAND { BSM_F_SHARE_NBMAND, F_SHARE_NBMAND }, #endif -#ifdef F_SETLK_NBMAND - { BSM_F_SETLK_NBMAND, F_SETLK_NBMAND }, +#ifdef F_SETLK64_NBMAND + { BSM_F_SETLK64_NBMAND, F_SETLK64_NBMAND }, +#endif +#ifdef F_GETXFL + { BSM_F_GETXFL, F_GETXFL }, #endif #ifdef F_BADFD { BSM_F_BADFD, F_BADFD }, @@ -146,6 +149,13 @@ { BSM_F_SETLK_REMOTE, F_SETLK_REMOTE }, #endif +#ifdef F_SETSIG + { BSM_F_SETSIG, F_SETSIG }, +#endif +#ifdef F_GETSIG + { BSM_F_GETSIG, F_GETSIG }, +#endif + #ifdef F_CHKCLEAN { BSM_F_CHKCLEAN, F_CHKCLEAN }, #endif @@ -207,12 +217,24 @@ { BSM_F_MARKDEPENDENCY, F_MARKDEPENDENCY }, #endif -#ifdef F_SETSIG - { BSM_F_SETSIG, F_SETSIG }, -#endif -#ifdef F_GETSIG - { BSM_F_GETSIG, F_GETSIG }, -#endif +#ifdef FCNTL_FS_SPECIFIC_BASE + { BSM_F_FS_SPECIFIC_0, FCNTL_FS_SPECIFIC_BASE}, + { BSM_F_FS_SPECIFIC_1, FCNTL_FS_SPECIFIC_BASE + 1}, + { BSM_F_FS_SPECIFIC_2, FCNTL_FS_SPECIFIC_BASE + 2}, + { BSM_F_FS_SPECIFIC_3, FCNTL_FS_SPECIFIC_BASE + 3}, + { BSM_F_FS_SPECIFIC_4, FCNTL_FS_SPECIFIC_BASE + 4}, + { BSM_F_FS_SPECIFIC_5, FCNTL_FS_SPECIFIC_BASE + 5}, + { BSM_F_FS_SPECIFIC_6, FCNTL_FS_SPECIFIC_BASE + 6}, + { BSM_F_FS_SPECIFIC_7, FCNTL_FS_SPECIFIC_BASE + 7}, + { BSM_F_FS_SPECIFIC_8, FCNTL_FS_SPECIFIC_BASE + 8}, + { BSM_F_FS_SPECIFIC_9, FCNTL_FS_SPECIFIC_BASE + 9}, + { BSM_F_FS_SPECIFIC_10, FCNTL_FS_SPECIFIC_BASE + 10}, + { BSM_F_FS_SPECIFIC_11, FCNTL_FS_SPECIFIC_BASE + 11}, + { BSM_F_FS_SPECIFIC_12, FCNTL_FS_SPECIFIC_BASE + 12}, + { BSM_F_FS_SPECIFIC_13, FCNTL_FS_SPECIFIC_BASE + 13}, + { BSM_F_FS_SPECIFIC_14, FCNTL_FS_SPECIFIC_BASE + 14}, + { BSM_F_FS_SPECIFIC_15, FCNTL_FS_SPECIFIC_BASE + 15}, +#endif /* FCNTL_FS_SPECIFIC_BASE */ }; static const int bsm_fcntl_cmd_count = sizeof(bsm_fcntl_cmdtab) / sizeof(bsm_fcntl_cmdtab[0]); ==== //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 (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/sys/bsm/audit_fcntl.h#1 $ + * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_fcntl.h#2 $ */ #ifndef _BSM_AUDIT_FCNTL_H_ @@ -43,77 +43,98 @@ #define BSM_F_O_GETLK 5 /* Solaris-specific. */ #define BSM_F_SETLK 6 #define BSM_F_SETLKW 7 -#define BSM_F_CHKFL 8 /* Solaris-specific */ -#define BSM_F_DUP2FD 9 /* Solaris-specific */ -#define BSM_F_ALLOCSP 10 /* Solaris-specific */ -#define BSM_F_FREESP 11 /* Solaris-specific */ +#define BSM_F_CHKFL 8 /* Solaris-specific. */ +#define BSM_F_DUP2FD 9 /* FreeBSD/Solaris-specific. */ +#define BSM_F_ALLOCSP 10 /* Solaris-specific. */ +#define BSM_F_FREESP 11 /* Solaris-specific. */ -#define BSM_F_ISSTREAM 13 /* Solaris-specific */ +#define BSM_F_ISSTREAM 13 /* Solaris-specific. */ #define BSM_F_GETLK 14 -#define BSM_F_PRIV 15 /* Solaris-specific */ -#define BSM_F_NPRIV 16 /* Solaris-specific */ -#define BSM_F_QUOTACTL 17 /* Solaris-specific */ -#define BSM_F_BLOCKS 18 /* Solaris-specific */ -#define BSM_F_BLKSIZE 19 /* Solaris-specific */ +#define BSM_F_PRIV 15 /* Solaris-specific. */ +#define BSM_F_NPRIV 16 /* Solaris-specific. */ +#define BSM_F_QUOTACTL 17 /* Solaris-specific. */ +#define BSM_F_BLOCKS 18 /* Solaris-specific. */ +#define BSM_F_BLKSIZE 19 /* Solaris-specific. */ #define BSM_F_GETOWN 23 #define BSM_F_SETOWN 24 -#define BSM_F_REVOKE 25 /* Solaris-specific */ -#define BSM_F_HASREMOTELOCKS 26 /* Solaris-specific */ -#define BSM_F_FREESP64 27 /* Solaris-specific */ -#define BSM_F_ALLOCSP64 28 /* Solaris-specific */ +#define BSM_F_REVOKE 25 /* Solaris-specific. */ +#define BSM_F_HASREMOTELOCKS 26 /* Solaris-specific. */ +#define BSM_F_FREESP64 27 /* Solaris-specific. */ +#define BSM_F_ALLOCSP64 28 /* Solaris-specific. */ -#define BSM_F_GETLK64 33 /* Solaris-specific */ -#define BSM_F_SETLK64 34 /* Solaris-specific */ -#define BSM_F_SETLKW64 35 /* Solaris-specific */ +#define BSM_F_GETLK64 33 /* Solaris-specific. */ +#define BSM_F_SETLK64 34 /* Solaris-specific. */ +#define BSM_F_SETLKW64 35 /* Solaris-specific. */ -#define BSM_F_SHARE 40 /* Solaris-specific */ -#define BSM_F_UNSHARE 41 /* Solaris-specific */ -#define BSM_F_SETLK64_NBMAND 42 /* Solaris-specific */ -#define BSM_F_SHARE_NBMAND 43 /* Solaris-specific */ -#define BSM_F_SETLK_NBMAND 44 /* Solaris-specific */ - -#define BSM_F_BADFD 46 /* Solaris-specific */ +#define BSM_F_SHARE 40 /* Solaris-specific. */ +#define BSM_F_UNSHARE 41 /* Solaris-specific. */ +#define BSM_F_SETLK_NBMAND 42 /* Solaris-specific. */ +#define BSM_F_SHARE_NBMAND 43 /* Solaris-specific. */ +#define BSM_F_SETLK64_NBMAND 44 /* Solaris-specific. */ +#define BSM_F_GETXFL 45 /* Solaris-specific. */ +#define BSM_F_BADFD 46 /* Solaris-specific. */ /* * FreeBSD-specific (100-199). */ -#define BSM_F_OGETLK 107 /* FreeBSD-specific */ -#define BSM_F_OSETLK 108 /* FreeBSD-specific */ -#define BSM_F_OSETLKW 109 /* FreeBSD-specific */ +#define BSM_F_OGETLK 107 /* FreeBSD-specific. */ +#define BSM_F_OSETLK 108 /* FreeBSD-specific. */ +#define BSM_F_OSETLKW 109 /* FreeBSD-specific. */ + +#define BSM_F_SETLK_REMOTE 114 /* FreeBSD-specific. */ -#define BSM_F_SETLK_REMOTE 114 /* FreeBSD-specific */ +/* + * Linux-specific (200-299). + */ +#define BSM_F_SETSIG 210 /* Linux-specific. */ +#define BSM_F_GETSIG 211 /* Linux-specific. */ /* - * Darwin-specific (200-299). + * Darwin-specific (300-399). */ -#define BSM_F_CHKCLEAN 241 /* Darwin-specific */ -#define BSM_F_PREALLOCATE 242 /* Darwin-specific */ -#define BSM_F_SETSIZE 243 /* Darwin-specific */ -#define BSM_F_RDADVISE 244 /* Darwin-specific */ -#define BSM_F_RDAHEAD 245 /* Darwin-specific */ -#define BSM_F_READBOOTSTRAP 246 /* Darwin-specific */ -#define BSM_F_WRITEBOOTSTRAP 247 /* Darwin-specific */ -#define BSM_F_NOCACHE 248 /* Darwin-specific */ -#define BSM_F_LOG2PHYS 249 /* Darwin-specific */ -#define BSM_F_GETPATH 250 /* Darwin-specific */ -#define BSM_F_FULLFSYNC 251 /* Darwin-specific */ -#define BSM_F_PATHPKG_CHECK 252 /* Darwin-specific */ -#define BSM_F_FREEZE_FS 253 /* Darwin-specific */ -#define BSM_F_THAW_FS 254 /* Darwin-specific */ -#define BSM_F_GLOBAL_NOCACHE 255 /* Darwin-specific */ -#define BSM_F_OPENFROM 256 /* Darwin-specific */ -#define BSM_F_UNLINKFROM 257 /* Darwin-specific */ -#define BSM_F_CHECK_OPENEVT 258 /* Darwin-specific */ -#define BSM_F_ADDSIGS 259 /* Darwin-specific */ -#define BSM_F_MARKDEPENDENCY 260 /* Darwin-specific */ +#define BSM_F_CHKCLEAN 341 /* Darwin-specific. */ +#define BSM_F_PREALLOCATE 342 /* Darwin-specific. */ +#define BSM_F_SETSIZE 343 /* Darwin-specific. */ +#define BSM_F_RDADVISE 344 /* Darwin-specific. */ +#define BSM_F_RDAHEAD 345 /* Darwin-specific. */ +#define BSM_F_READBOOTSTRAP 346 /* Darwin-specific. */ +#define BSM_F_WRITEBOOTSTRAP 347 /* Darwin-specific. */ +#define BSM_F_NOCACHE 348 /* Darwin-specific. */ +#define BSM_F_LOG2PHYS 349 /* Darwin-specific. */ +#define BSM_F_GETPATH 350 /* Darwin-specific. */ +#define BSM_F_FULLFSYNC 351 /* Darwin-specific. */ +#define BSM_F_PATHPKG_CHECK 352 /* Darwin-specific. */ +#define BSM_F_FREEZE_FS 353 /* Darwin-specific. */ +#define BSM_F_THAW_FS 354 /* Darwin-specific. */ +#define BSM_F_GLOBAL_NOCACHE 355 /* Darwin-specific. */ +#define BSM_F_OPENFROM 356 /* Darwin-specific. */ +#define BSM_F_UNLINKFROM 357 /* Darwin-specific. */ +#define BSM_F_CHECK_OPENEVT 358 /* Darwin-specific. */ +#define BSM_F_ADDSIGS 359 /* Darwin-specific. */ +#define BSM_F_MARKDEPENDENCY 360 /* Darwin-specific. */ /* - * Linux-specific (300-399). + * Darwin file system specific (400-499). */ -#define BSM_F_SETSIG 310 /* Linux-specific */ -#define BSM_F_GETSIG 311 /* Linux-specific */ +#define BSM_F_FS_SPECIFIC_0 400 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_1 401 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_2 402 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_3 403 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_4 404 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_5 405 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_6 406 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_7 407 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_8 408 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_9 409 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_10 410 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_11 411 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_12 412 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_13 413 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_14 414 /* Darwin-fs-specific. */ +#define BSM_F_FS_SPECIFIC_15 415 /* Darwin-fs-specific. */ + -#define BSM_F_UNKNOWN 500 +#define BSM_F_UNKNOWN 0xFFFF #endif /* !_BSM_AUDIT_FCNTL_H_ */ From gabor at FreeBSD.org Thu Mar 12 13:42:41 2009 From: gabor at FreeBSD.org (Gabor Kovesdan) Date: Thu Mar 12 13:42:47 2009 Subject: PERFORCE change 159135 for review Message-ID: <200903122042.n2CKgd4e052259@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159135 Change 159135 by gabor@gabor_server on 2009/03/12 20:41:48 - use Big Endian safe fix Submitted by: Václav Haisman Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#42 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#42 (text+ko) ==== @@ -74,7 +74,7 @@ int grep_fgetc(struct file *f) { - int c; + unsigned char c; switch (filebehave) { case FILE_STDIO: From gabor at FreeBSD.org Thu Mar 12 13:54:54 2009 From: gabor at FreeBSD.org (Gabor Kovesdan) Date: Thu Mar 12 13:55:00 2009 Subject: PERFORCE change 159137 for review Message-ID: <200903122054.n2CKsqFR062928@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159137 Change 159137 by gabor@gabor_server on 2009/03/12 20:54:10 - Stricter checking after stroull() - Use libc messages through errno where possible Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#84 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#8 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/es_ES.ISO8859-1.msg#1 add .. //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#7 edit .. //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#7 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#84 (text+ko) ==== @@ -70,11 +70,9 @@ /* 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*/ "value out of range", -/* 9*/ "context out of range", +/* 8*/ "unknown --binary-files option", +/* 9*/ "Binary file %s matches\n" /*10*/ "%s (BSD grep) %s\n", -/*11*/ "unknown --binary-files option", -/*12*/ "Binary file %s matches\n" }; /* Flags passed to regcomp() and regexec() */ @@ -375,8 +373,10 @@ case '5': case '6': case '7': case '8': case '9': if (newarg || !isdigit(lastc)) Aflag = 0; - else if (Aflag > LLONG_MAX / 10) - errx(2, getstr(9)); + else if (Aflag > LLONG_MAX / 10) { + errno = ERANGE; + err(2, NULL); + } Aflag = Bflag = (Aflag * 10) + (c - '0'); break; case 'C': @@ -388,8 +388,13 @@ case 'A': case 'B': l = strtoull(optarg, &ep, 10); - if ((errno == ERANGE) && (l == ULLONG_MAX)) - errx(2, getstr(9)); + if (((errno == ERANGE) && (l == ULLONG_MAX)) || + ((errno == EINVAL) && (l == 0))) + err(2, NULL); + else if (ep[0] != '\0') { + errno = EINVAL; + err(2, NULL); + } if (c == 'A') Aflag = l; else if (c == 'B') @@ -416,8 +421,10 @@ dirbehave = DIR_RECURSE; } else if (strcmp("skip", optarg) == 0) dirbehave = DIR_SKIP; - else if (strcmp("read", optarg) != 0) - errx(2, getstr(8)); + else if (strcmp("read", optarg) != 0) { + errno = EINVAL; + err(2, NULL); + } break; case 'E': grepbehave = GREP_EXTENDED; @@ -464,9 +471,14 @@ break; case 'm': mflag++; - mcount = strtoull(optarg, (char **)NULL, 10); - if ((errno == ERANGE) && (mcount == ULLONG_MAX)) - err(2, getstr(8)); + mcount = strtoull(optarg, &ep, 10); + if (((errno == ERANGE) && (mcount == ULLONG_MAX)) || + ((errno == EINVAL) && (mcount == 0))) + err(2, NULL); + else if (ep[0] != '\0') { + errno = EINVAL; + err(2, NULL); + } break; case 'n': nflag = 1; ==== //depot/projects/soc2008/gabor_textproc/grep/nls/C.msg#8 (text+ko) ==== @@ -9,8 +9,6 @@ 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 "value out of range" -9 "context out of range" +8 "unknown --binary-files option" +9 "Binary file %s matches\n" 10 "%s (BSD grep) %s\n" -11 "unknown --binary-files option" -12 "Binary file %s matches\n" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/hu_HU.ISO8859-2.msg#7 (text+ko) ==== @@ -9,8 +9,6 @@ 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 "az érték a megengedett tartományon kívül esik" -9 "a kontextus a megengedett tartományon kívül esik" +8 "ismeretlen --binary-files opció" +9 "%s bináris fájl illeszkedik\n" 10 "%s (BSD grep) %s\n" -11 "ismeretlen --binary-files opció" -12 "%s bináris fájl illeszkedik\n" ==== //depot/projects/soc2008/gabor_textproc/grep/nls/pt_BR.ISO8859-1.msg#7 (text+ko) ==== @@ -9,8 +9,6 @@ 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 "el valor está fora da escala" -9 "contexto está fora da escala" +8 "opcão não conhecida de --binary-files" +9 "arquivo binário %s casa com o padrão\n" 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" From sson at FreeBSD.org Thu Mar 12 17:19:30 2009 From: sson at FreeBSD.org (Stacey Son) Date: Thu Mar 12 17:19:35 2009 Subject: PERFORCE change 159140 for review Message-ID: <200903130019.n2D0JSQA093900@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159140 Change 159140 by sson@sson_amd64 on 2009/03/13 00:18:47 Add support for parsing and printing AUT_SOCKINET128 tokens. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 (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#44 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 $ */ #ifndef _LIBBSM_H_ @@ -565,6 +565,12 @@ typedef struct { u_int16_t family; u_int16_t port; + u_int32_t addr[4]; +} au_socketinet_ex32_t; + +typedef struct { + u_int16_t family; + u_int16_t port; u_int32_t addr; } au_socketinet32_t; @@ -722,7 +728,7 @@ au_seq_t seq; au_socket_t socket; au_socket_ex32_t socket_ex32; - au_socketinet32_t sockinet32; + au_socketinet_ex32_t sockinet_ex32; au_socketunix_t sockunix; au_subject32_t subj32; au_subject32ex_t subj32_ex; ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 (text+ko) ==== @@ -32,7 +32,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#61 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 $ */ #include @@ -365,6 +365,10 @@ fprintf(fp, "/>"); break; + case AUT_SOCKINET128: + fprintf(fp, "/>"); + break; + case AUT_SUBJECT32: fprintf(fp, "/>"); break; @@ -529,13 +533,16 @@ break; case AUT_SOCKINET32: - fprintf(fp, "tt.sockinet32.family, tok->len, + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet_ex32.family, tok->len, err); if (err) return (-1); - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.port, + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.port, sizeof(uint16_t), tok->len, err); if (err) return (-1); - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.addr, - sizeof(tok->tt.sockinet32.addr), tok->len, err); + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.addr, + sizeof(tok->tt.sockinet_ex32.addr[0]), tok->len, err); if (err) return (-1); @@ -3093,22 +3100,77 @@ print_tok_type(fp, tok->id, "socket-inet", raw, xml); if (xml) { open_attr(fp, "type"); - print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); + close_attr(fp); + open_attr(fp, "port"); + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); + close_attr(fp); + open_attr(fp, "addr"); + print_ip_address(fp, tok->tt.sockinet_ex32.addr[0]); + close_attr(fp); + close_tag(fp, tok->id); + } else { + print_delim(fp, del); + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); + print_delim(fp, del); + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); + print_delim(fp, del); + print_ip_address(fp, tok->tt.sockinet_ex32.addr[0]); + } +} + +/* + * socket family 2 bytes + * local port 2 bytes + * socket address 16 bytes + */ +static int +fetch_sock_inet128_tok(tokenstr_t *tok, u_char *buf, int len) +{ + int err = 0; + + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet_ex32.family, tok->len, + err); + if (err) + return (-1); + + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.port, + sizeof(uint16_t), tok->len, err); + if (err) + return (-1); + + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.addr, + sizeof(tok->tt.sockinet_ex32.addr), tok->len, err); + if (err) + return (-1); + + return (0); +} + +static void +print_sock_inet128_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, + __unused char sfrm, int xml) +{ + + print_tok_type(fp, tok->id, "socket-inet6", raw, xml); + if (xml) { + open_attr(fp, "type"); + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); close_attr(fp); open_attr(fp, "port"); - print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); close_attr(fp); open_attr(fp, "addr"); - print_ip_address(fp, tok->tt.sockinet32.addr); + print_ip_ex_address(fp, AU_IPv6, tok->tt.sockinet_ex32.addr); close_attr(fp); close_tag(fp, tok->id); } else { print_delim(fp, del); - print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); print_delim(fp, del); - print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); print_delim(fp, del); - print_ip_address(fp, tok->tt.sockinet32.addr); + print_ip_ex_address(fp, AU_IPv6, tok->tt.sockinet_ex32.addr); } } @@ -4057,6 +4119,9 @@ case AUT_SOCKUNIX: return (fetch_sock_unix_tok(tok, buf, len)); + case AUT_SOCKINET128: + return (fetch_sock_inet128_tok(tok, buf, len)); + case AUT_SUBJECT32: return (fetch_subject32_tok(tok, buf, len)); @@ -4226,6 +4291,10 @@ print_sock_unix_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); return; + case AUT_SOCKINET128: + print_sock_inet128_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); + return; + case AUT_SUBJECT32: print_subject32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); return; From nwhitehorn at FreeBSD.org Thu Mar 12 19:47:08 2009 From: nwhitehorn at FreeBSD.org (Nathan Whitehorn) Date: Thu Mar 12 19:47:17 2009 Subject: PERFORCE change 159145 for review Message-ID: <200903130246.n2D2kwvO021533@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159145 Change 159145 by nwhitehorn@nwhitehorn_trantor on 2009/03/13 02:46:51 IFC. Apparently syscons no longer works on G5 systems: this is item #1 on the todo list. Affected files ... .. //depot/projects/ppc-g5/MAINTAINERS#2 integrate .. //depot/projects/ppc-g5/Makefile.inc1#7 edit .. //depot/projects/ppc-g5/ObsoleteFiles.inc#10 integrate .. //depot/projects/ppc-g5/UPDATING#11 integrate .. //depot/projects/ppc-g5/bin/ps/extern.h#2 integrate .. //depot/projects/ppc-g5/bin/ps/keyword.c#2 integrate .. //depot/projects/ppc-g5/bin/ps/print.c#3 integrate .. //depot/projects/ppc-g5/bin/sh/miscbltin.c#2 integrate .. //depot/projects/ppc-g5/contrib/csup/updater.c#4 integrate .. //depot/projects/ppc-g5/contrib/gdtoa/test/Q.ou0#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/Q.ou1#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/Qtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/README#4 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/d.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dI.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dIsi.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dItest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dd.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/ddsi.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/ddtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dt.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/dtst.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/f.out#3 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/ftest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/getround.c#4 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/makefile#3 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/obad/strtodt.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/obad/xL.out#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/rtestnos#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtoIdSI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtoIddSI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtodISI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtodt.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtopddSI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/strtorddSI.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/testnos#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/testnos1#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/testnos3#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/x.ou0#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/x.ou1#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xL.ou0#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xL.ou1#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xLtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xQtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xsum0.out#4 delete .. //depot/projects/ppc-g5/contrib/gdtoa/test/xtest.c#2 delete .. //depot/projects/ppc-g5/contrib/gdtoa/xsum0.out#4 delete .. //depot/projects/ppc-g5/contrib/hostapd/COPYING#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ChangeLog#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/FREEBSD-Xlist#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/FREEBSD-upgrade#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/Makefile#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/README#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/accounting.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/accounting.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/aes.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/aes.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/aes_wrap.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/aes_wrap.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ap.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ap_list.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ap_list.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/beacon.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/beacon.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/build_config.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/config.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/config.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/config_types.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/crypto.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/crypto.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ctrl_iface.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ctrl_iface.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/defconfig#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/defs.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/des.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/developer.txt#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/code_structure.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/doxygen.fast#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/doxygen.full#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/eap.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/hostapd.fig#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/mainpage.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/doc/porting.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/driver.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/driver_test.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_aka.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_defs.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_gpsk.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_gpsk_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_gpsk_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_gtc.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_i.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_identity.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_md5.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_methods.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_methods.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_mschapv2.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_pax.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_pax_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_pax_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_peap.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_psk.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_psk_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_psk_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sake.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sake_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sake_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim_db.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_sim_db.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_tls.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_tls_common.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_tls_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_tlv.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_ttls.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_ttls.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eap_vendor_test.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eapol_sm.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eapol_sm.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eloop.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eloop.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eloop_none.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/eloop_win.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hlr_auc_gw.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hlr_auc_gw.milenage_db#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostap_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.8#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.accept#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.conf#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.deny#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.eap_user#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.radius_clients#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.sim_db#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.vlan#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd.wpa_psk#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd_cli.1#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hostapd_cli.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hw_features.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/hw_features.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/iapp.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/iapp.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11_auth.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11_auth.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11h.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_11h.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_1x.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ieee802_1x.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/includes.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/l2_packet.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/l2_packet_none.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/logwatch/README#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/logwatch/hostapd#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/logwatch/hostapd.conf#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/madwifi.conf#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/md4.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/md5.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/md5.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/milenage.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/milenage.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/mlme.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/mlme.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ms_funcs.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/ms_funcs.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/os.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/os_internal.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/os_none.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/os_unix.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/pmksa_cache.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/pmksa_cache.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/preauth.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/preauth.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius_client.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius_client.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius_server.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/radius_server.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/rc4.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/rc4.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/reconfig.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sha1.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sha1.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sha256.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sha256.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sta_info.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/sta_info.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/state_machine.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/tls.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/tls_gnutls.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/tls_none.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/tls_openssl.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/version.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/vlan_init.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/vlan_init.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wired.conf#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wme.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wme.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa_common.h#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa_ctrl.c#2 delete .. //depot/projects/ppc-g5/contrib/hostapd/wpa_ctrl.h#2 delete .. //depot/projects/ppc-g5/contrib/less/line.c#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/CREDITS#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/NEWS#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/README#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/VERSION#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/audit/audit.8#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/audit/audit.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/audit_warn.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd.c#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bin/auditd/auditd.h#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/auditd_lib.h#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/bsm/libbsm.h#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/config/config.h#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/configure#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/configure.ac#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/etc/audit_control#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/etc/audit_event#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libauditd/auditd_lib.c#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_control.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_domain.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/au_errno.3#2 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_control.c#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_errno.c#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_io.c#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/libbsm/bsm_token.c#5 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/audit_control.5#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/man/auditon.2#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit.h#4 integrate .. //depot/projects/ppc-g5/contrib/openbsm/sys/bsm/audit_kevents.h#3 integrate .. //depot/projects/ppc-g5/contrib/openbsm/tools/audump.c#2 integrate .. //depot/projects/ppc-g5/contrib/telnet/libtelnet/pk.c#2 integrate .. //depot/projects/ppc-g5/contrib/top/install#2 delete .. //depot/projects/ppc-g5/contrib/top/install-sh#1 branch .. //depot/projects/ppc-g5/contrib/wpa/COPYING#1 branch .. //depot/projects/ppc-g5/contrib/wpa/README#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ChangeLog#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/README#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/README-WPS#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/accounting.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/accounting.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ap_list.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ap_list.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/beacon.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/beacon.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/config.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/config.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ctrl_iface.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ctrl_iface.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/defconfig#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/code_structure.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/doxygen.fast#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/doxygen.full#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/eap.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/hostapd.fig#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/mainpage.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/doc/porting.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/driver.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/drivers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/eap_testing.txt#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/eapol_sm.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/eapol_sm.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostap_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.accept#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.deny#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.eap_user#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.radius_clients#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.sim_db#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.vlan#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd.wpa_psk#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd_cli.1#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hostapd_cli.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hw_features.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/hw_features.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/iapp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/iapp.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_11.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_11.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_11_auth.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_11_auth.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_1x.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/ieee802_1x.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/logwatch/README#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/logwatch/hostapd#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/logwatch/hostapd.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/mlme.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/mlme.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/nt_password_hash.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/peerkey.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/pmksa_cache.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/pmksa_cache.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/preauth.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/preauth.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/sta_info.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/sta_info.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/vlan_init.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/vlan_init.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wired.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wme.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wme.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa_auth_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa_auth_ie.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa_auth_ie.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wpa_ft.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wps_hostapd.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/hostapd/wps_hostapd.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/defs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/eapol_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/ieee802_11_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/ieee802_11_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/ieee802_11_defs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/privsep_commands.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/version.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/wpa_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/wpa_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/wpa_ctrl.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/common/wpa_ctrl.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/aes.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/aes.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/aes_wrap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/aes_wrap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_cryptoapi.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_gnutls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_internal.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_libtomcrypt.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_none.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/crypto_openssl.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/des.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/dh_groups.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/dh_groups.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/md4.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/md5.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/md5.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/ms_funcs.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/ms_funcs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/rc4.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/rc4.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/sha1.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/sha1.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/sha256.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/sha256.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_gnutls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_internal.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_none.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_openssl.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/crypto/tls_schannel.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/driver.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/driver_ndis.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/driver_ndis.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/drivers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/drivers/scan_helpers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/chap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/chap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_defs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_fast_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_fast_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_gpsk_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_gpsk_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_ikev2_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_ikev2_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_pax_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_pax_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_peap_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_peap_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_psk_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_psk_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_sake_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_sake_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_sim_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_sim_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_tlv_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_ttls.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_wsc_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/eap_wsc_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/ikev2_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_common/ikev2_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_aka.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_config.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_fast.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_fast_pac.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_fast_pac.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_gpsk.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_gtc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_ikev2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_leap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_md5.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_methods.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_methods.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_mschapv2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_otp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_pax.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_peap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_psk.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_sake.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_sim.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_tls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_tls_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_tls_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_tnc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_ttls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_vendor_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/eap_wsc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/ikev2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/ikev2.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/mschapv2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/mschapv2.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/tncc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_peer/tncc.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_aka.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_fast.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_gpsk.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_gtc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_identity.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_ikev2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_md5.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_methods.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_methods.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_mschapv2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_pax.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_peap.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_psk.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_sake.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_sim.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_sim_db.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_sim_db.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_tls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_tls_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_tls_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_tnc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_ttls.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_vendor_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/eap_wsc.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/ikev2.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/ikev2.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/tncs.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eap_server/tncs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eapol_supp/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eapol_supp/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eapol_supp/eapol_supp_sm.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/eapol_supp/eapol_supp_sm.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/milenage.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/hlr_auc_gw/milenage.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/l2_packet/l2_packet.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius_client.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius_client.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius_server.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/radius/radius_server.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/peerkey.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/peerkey.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/pmksa_cache.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/pmksa_cache.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/preauth.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/preauth.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa_ft.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa_ie.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/rsn_supp/wpa_ie.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/asn1.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/asn1.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/asn1_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/bignum.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/bignum.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/libtommath.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/rsa.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/rsa.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client_read.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_client_write.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_cred.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_cred.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_record.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_record.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server_read.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/tlsv1_server_write.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/x509v3.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/tls/x509v3.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/base64.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/base64.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/build_config.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/common.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/eloop.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/eloop.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/includes.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/ip_addr.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/ip_addr.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/os.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/os_internal.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/os_unix.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/pcsc_funcs.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/pcsc_funcs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/state_machine.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/uuid.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/uuid.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/wpa_debug.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/wpa_debug.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/wpabuf.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/utils/wpabuf.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/httpread.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/httpread.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_attr_build.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_attr_parse.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_attr_process.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_defs.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_dev_attr.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_dev_attr.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_enrollee.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_registrar.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp_event.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp_ssdp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/src/wps/wps_upnp_web.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ChangeLog#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/README#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/README-WPS#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/blacklist.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/blacklist.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config_file.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config_none.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/config_ssid.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.service#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/dbus_dict_helpers.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/dbus_dict_helpers.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/defconfig#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/code_structure.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/ctrl_iface.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/Makefile#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/manpage.links#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/manpage.refs#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/doxygen.fast#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/doxygen.full#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/driver_wrapper.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/eap.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/mainpage.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/porting.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/testing_tools.doxygen#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/doc/wpa_supplicant.fig#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/eap_testing.txt#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/eapol_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/events.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/ieee8021x.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/openCryptoki.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/plaintext.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/wep.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/wpa-psk-tkip.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/wpa2-eap-ccmp.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/examples/wpas-test.py#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/main.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/mlme.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/mlme.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/preauth_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/scan.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/link_test.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_aes.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_md4.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_md5.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_ms_funcs.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_sha1.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_sha256.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_wpa.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_x509v3.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/todo.txt#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_cli.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_passphrase.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_priv.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_supplicant.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_supplicant.conf#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpas_glue.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wpas_glue.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wps_supplicant.c#1 branch .. //depot/projects/ppc-g5/contrib/wpa/wpa_supplicant/wps_supplicant.h#1 branch .. //depot/projects/ppc-g5/contrib/wpa_supplicant/COPYING#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ChangeLog#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/FREEBSD-Xlist#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/FREEBSD-upgrade#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/Makefile#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/README#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/aes.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/aes.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/aes_wrap.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/aes_wrap.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/asn1.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/asn1.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/asn1_test.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/base64.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/base64.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/bignum.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/bignum.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/build_config.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config_file.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config_none.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config_ssid.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/config_types.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_cryptoapi.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_gnutls.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_internal.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_libtomcrypt.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/crypto_none.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_dbus.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_dbus.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_udp.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ctrl_iface_unix.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/dbus-wpa_supplicant.service#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/dbus_dict_helpers.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/dbus_dict_helpers.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/defconfig#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/defs.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/des.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/code_structure.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/Makefile#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_background.8#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_background.sgml#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.sgml#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/doxygen.fast#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/doxygen.full#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/driver_wrapper.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/eap.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/kerneldoc2doxygen.pl#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/mainpage.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/porting.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/testing_tools.doxygen#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/doc/wpa_supplicant.fig#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/driver.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/driver_ndis.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/driver_ndis.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/driver_wired.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/drivers.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_aka.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_defs.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_fast.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_gpsk.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_gpsk_common.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_gpsk_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_gtc.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_i.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_leap.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_md5.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_methods.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_methods.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_mschapv2.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_otp.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_pax.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_pax_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_pax_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_peap.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_psk.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_psk_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_psk_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sake.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sake_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sake_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sim.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sim_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_sim_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_testing.txt#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tls.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tls_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tls_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tlv.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_tlv.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_ttls.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_ttls.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eap_vendor_test.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eapol_sm.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eapol_sm.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eapol_test.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eloop.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eloop.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/eloop_none.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/events.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/ieee8021x.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/plaintext.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/wep.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/wpa-psk-tkip.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/examples/wpa2-eap-ccmp.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/hostapd.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/includes.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/l2_packet.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/libtommath.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/main.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/md4.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/md5.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/md5.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/mlme.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/mlme.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ms_funcs.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/ms_funcs.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/nmake.mak#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/openssl-0.9.8d-tls-extensions.patch#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/openssl-0.9.8e-tls-extensions.patch#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/openssl-tls-extensions.patch#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/os.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/os_internal.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/os_none.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/os_unix.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/pcsc_funcs.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/pcsc_funcs.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/pmksa_cache.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/pmksa_cache.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/preauth.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/preauth.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/preauth_test.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/radius.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/radius.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/radius_client.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/radius_client.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/rc4.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/rc4.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/rsa.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/rsa.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/sha1.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/sha1.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/sha256.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/sha256.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/state_machine.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_aes.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_eap_sim_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_md4.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_md5.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_ms_funcs.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_sha1.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_sha256.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tests/test_x509v3.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_gnutls.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_internal.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_none.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_openssl.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tls_schannel.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tlsv1_client.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tlsv1_client.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tlsv1_common.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/tlsv1_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/todo.txt#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/version.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_cli.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_common.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_ctrl.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_ctrl.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/eventhistory.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/main.cpp#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui-qt4/wpamsg.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/eventhistory.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/eventhistory.ui.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/main.cpp#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/networkconfig.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/scanresults.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/scanresults.ui.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/wpa_gui.pro#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/wpagui.ui#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_gui/wpamsg.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_i.h#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_passphrase.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_supplicant.c#3 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_supplicant.conf#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_supplicant.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/wpa_supplicant_i.h#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/x509v3.c#2 delete .. //depot/projects/ppc-g5/contrib/wpa_supplicant/x509v3.h#2 delete .. //depot/projects/ppc-g5/etc/mtree/BSD.include.dist#4 integrate .. //depot/projects/ppc-g5/etc/rc.d/swap1#2 integrate .. //depot/projects/ppc-g5/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/ppc-g5/gnu/lib/csu/Makefile#5 edit .. //depot/projects/ppc-g5/gnu/lib/libssp/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/gdbserver/Makefile#3 integrate .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/gdbserver/fbsd-ppc-low.c#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/gdb/gdbserver/reg-ppc.c#1 branch .. //depot/projects/ppc-g5/gnu/usr.bin/groff/tmac/mdoc.local#3 integrate .. //depot/projects/ppc-g5/include/Makefile#5 integrate .. //depot/projects/ppc-g5/include/signal.h#2 integrate .. //depot/projects/ppc-g5/include/stdio.h#2 integrate .. //depot/projects/ppc-g5/include/stdlib.h#3 integrate .. //depot/projects/ppc-g5/include/string.h#4 integrate .. //depot/projects/ppc-g5/include/strings.h#3 integrate .. //depot/projects/ppc-g5/include/unistd.h#3 integrate .. //depot/projects/ppc-g5/include/wchar.h#3 integrate .. //depot/projects/ppc-g5/lib/Makefile#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/Makefile#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive.h#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_check_magic.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_endian.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry.c#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_copy_stat.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_entry_stat.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_platform.h#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_private.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_disk.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/archive_read_disk_entry_from_file.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/archive_read_disk_private.h#1 branch .. //depot/projects/ppc-g5/lib/libarchive/archive_read_disk_set_standard_lookup.c#1 branch .. //depot/projects/ppc-g5/lib/libarchive/archive_read_open_filename.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_private.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_all.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_bzip2.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_compress.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_gzip.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_compression_program.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_ar.c#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_cpio.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_empty.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_iso9660.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_mtree.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_read_support_format_zip.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_string.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_string_sprintf.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_util.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_virtual.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_disk.c#9 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_private.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_compression_bzip2.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_compression_gzip.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_compression_program.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_ar.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_cpio.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_cpio_newc.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_mtree.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_pax.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_shar.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/archive_write_set_format_ustar.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/config_freebsd.h#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/Makefile#8 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/main.c#5 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/read_open_memory.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test.h#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_acl_freebsd.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_acl_pax.c#3 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_bzip2.c#2 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gtar.c#4 integrate .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gtar_1.tar.uu#1 branch .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gtar_1.tgz.uu#2 delete .. //depot/projects/ppc-g5/lib/libarchive/test/test_compat_gzip.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From ed at 80386.nl Fri Mar 13 01:56:23 2009 From: ed at 80386.nl (Ed Schouten) Date: Fri Mar 13 01:56:32 2009 Subject: PERFORCE change 159145 for review In-Reply-To: <200903130246.n2D2kwvO021533@repoman.freebsd.org> References: <200903130246.n2D2kwvO021533@repoman.freebsd.org> Message-ID: <20090313084342.GT31961@hoeg.nl> * Nathan Whitehorn wrote: > IFC. Apparently syscons no longer works on G5 systems: this is item #1 > on the todo list. Woops! Maybe I wrecked something? -- Ed Schouten WWW: http://80386.nl/ -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 195 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/p4-projects/attachments/20090313/e31d218d/attachment.pgp From pgj at FreeBSD.org Fri Mar 13 10:21:22 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Fri Mar 13 10:21:30 2009 Subject: PERFORCE change 159174 for review Message-ID: <200903131721.n2DHLKfP045183@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159174 Change 159174 by pgj@beehive on 2009/03/13 17:20:33 IFC Affected files ... .. //depot/projects/docproj_hu/doc/share/sgml/freebsd-html.dsl#2 integrate .. //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/docproj_hu/www/en/community/social.xsl#4 integrate .. //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#7 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xml#8 integrate .. //depot/projects/docproj_hu/www/en/projects/ideas/ideas.xsl#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#42 integrate Differences ... ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd-html.dsl#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -203,7 +203,7 @@ (("xorg") (string-append u "&" "amp;" "manpath=X11R7.2")) (("netbsd") (string-append u "&" "amp;" "manpath=NetBSD+3.0")) (("openbsd") (string-append u "&" "amp;" "manpath=OpenBSD+4.1")) - (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+7.0-RELEASE+and+Ports")) + (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+7.1-RELEASE+and+Ports")) (else u)))) (element application ($bold-seq$)) ==== //depot/projects/docproj_hu/src/release/doc/share/misc/dev.archlist.txt#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/release/doc/share/misc/dev.archlist.txt,v 1.106 2008/10/12 08:22:53 simon Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.107 2009/03/12 09:52:42 brueffer Exp $ # # @@ -149,7 +149,6 @@ trm i386,amd64 twa i386,amd64 twe i386,amd64 -txp i386,pc98,ia64,amd64 ubsa i386,pc98,amd64 ubsec i386,pc98,amd64 ubser i386,pc98,amd64 ==== //depot/projects/docproj_hu/www/en/community/social.xsl#4 (text+ko) ==== @@ -6,7 +6,7 @@ ]> - + @@ -62,6 +62,14 @@ Users Group on Facebook and a FreeBSD Group on LinkedIn. +
  • You can follow @freebsdannounce, + @freebsdblogs, + @freebsd, or + @bsdevents + on Twitter.
    • +

    Blog Activity

    ==== //depot/projects/docproj_hu/www/en/multimedia/multimedia-input.xml#7 (text+ko) ==== @@ -10,6 +10,89 @@ + + Andrew Doran from the NetBSD Project + + Interview with Andrew Doran from the NetBSD Project. + We talk about the upcoming 5.0 release. + + http://bsdtalk.blogspot.com/2009/03/bsdtalk171-andrew-doran-from-netbsd.html + bsdtalk,interview,netbsd,andrew doran + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk171.mp3 + 10 Mb + 22 minutes + MP3 version + mp3 + + + bsdtalk171.ogg + 22 minutes + Ogg version + ogg + + + + + + Marshall Kirk McKusick at DCBSDCon + + You can get a much more complete history here: + http://www.mckusick.com/history/index.html + ]]> + http://bsdtalk.blogspot.com/2009/02/bsdtalk170-marshall-kirk-mckusick-at.html + bsdtalk,presentation,bsd,history,kirk mckusick + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk170.mp3 + 26 Mb + 55 minutes + MP3 version + mp3 + + + bsdtalk170.ogg + 55 minutes + Ogg version + ogg + + + + + + Justin Sherrill of the DragonFlyBSD Digest + + Interview with Justin Sherrill of the DragonFlyBSD + Digest, which can be found at + http://www.shiningsilence.com/dbsdlog/ + + http://bsdtalk.blogspot.com/2009/01/bsdtalk169-justin-sherrill-of.html + bsdtalk,interview,dragonflybsd,justin sherril + + http://cisx1.uma.maine.edu/~wbackman/bsdtalk/ + + bsdtalk169.mp3 + 10 Mb + 22 minutes + MP3 version + mp3 + + + bsdtalk169.ogg + 22 minutes + Ogg version + ogg + + + + Michael Lauth from iXsystems @@ -2955,6 +3038,150 @@ + + A Brief History of the BSD Fast Filesystem, Kirk McKusick + + AsiaBSDCon 2008, Dr. Kirk McKusick +
    + clive URL: http://www.youtube.com/watch?v=tzieR5MM06M + ]]>     + http://www.youtube.com/watch?v=tzieR5MM06M + youtube,presentation,asiabsdcon2008,asiabsdcon,bsd fast filesystem,kirk mckusick + + + http://www.youtube.com/watch?v=tzieR5MM06M + 42:01 + Flash + flash + + +     + + + PC-BSD, Matt Olander, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=N0q37X-MJzY + ]]> + http://www.youtube.com/watch?v=N0q37X-MJzY + youtube,presentation,asiabsdcon2008,asiabsdcon,pc-bsd,matt olander + + + http://www.youtube.com/watch?v=N0q37X-MJzY + 28:50 + Flash + flash + + + + + + Using FreeBSD to Promote Open Source Development Methods, Brooks Davis, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=4lcrinKBMas + ]]> + http://www.youtube.com/watch?v=4lcrinKBMas + youtube,presentation,asiabsdcon2008,asiabsdcon,freebsd,promotion,open source development models,brooks davis + + + http://www.youtube.com/watch?v=4lcrinKBMas + 30:07 + Flash + flash + + + + + + Keynote, Peter Losher, Internet Systems Consortium, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=vQbdG7TwhKo + ]]> + http://www.youtube.com/watch?v=vQbdG7TwhKo + youtube,keynote,asiabsdcon2008,asiabsdcon,peter losher + + + http://www.youtube.com/watch?v=vQbdG7TwhKo + 42:44 + Flash + flash + + + + + + GEOM - in Infrastructure We Trust, Pawel Jakub Dawidek, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=xMpmOezBJZo + ]]> + http://www.youtube.com/watch?v=xMpmOezBJZo + youtube,presentation,asiabsdcon2008,asiabsdcon,geom,pawel jakub dawidek + + + http://www.youtube.com/watch?v=xMpmOezBJZo + 46:38 + Flash + flash + + + + + + Reducing Lock Contention in a Multi-Core System, Randall Stewart, AsiaBSDCon 2008 + + clive URL: http://www.youtube.com/watch?v=OQOMva1SmbY + ]]> + http://www.youtube.com/watch?v=OQOMva1SmbY + youtube,presentation,asiabsdcon2008,asiabsdcon,multicore,lock contention,randall stewart + + + http://www.youtube.com/watch?v=OQOMva1SmbY + 28:12 + Flash + flash + + + + + + FreeBSD Kernel Internals, Dr. Marshall Kirk McKusick + + clive URL: http://www.youtube.com/watch?v=nwbqBdghh6E + ]]> + + http://www.youtube.com/watch?v=nwbqBdghh6E + youtube,course,freebsd,design and implementation of the freebsd operating system,kirk mckusick + + + http://www.youtube.com/watch?v=nwbqBdghh6E + 59:57 + Flash + flash + + + + May 2008 developer Vimage report + + What's your biggest Time Management problem? + + What's your biggest Time Management problem? +

    + Tom Limoncelli is a FreeBSD user and the author of + the O'Reilly book,"Time Management for System + Administrators". He`ll be giving a brief presentation + with highlights from his book then will take questions + from the audience. Whether you are a system + administrator, a developer (or even a Linux user) + this presentation will help you with something more + precious a quad-processor AMD box. +

    + ]]>     + http://www.nycbug.org/index.php?NAV=Home;SUBM=10172 + nycbug,presentation,time management,tom limoncelli + + + http://www.fetissov.org/public/nycbug/nycbug-03-04-09.mp3 + MP3 version + mp3 + 11 Mb + + +     + + + Postfix Performance Tuning + + Money can buy you bandwidth, but latency is forever! +

    + John Mashey, MIPS +

    + Victor will cover an array of issues connected to + Postfix performance tuning, including: +

    +
      +
    • Latency, concurrency and throughput +
    • Postfix input processing +
    • Queue file format rationale +
    • Input processing bottlenecks +
    • Pre-queue filters, milters, content filters +
    • Tuning for fast (enough) input +
    • Postfix on-disk queues, requirements and architecture +
    • What is a "transport"? +
    • Postfix "nqmgr" scheduler algorithm +
    • Per-destination in memory queues +
    • Per-destination scheduler controls +
    • SMTP delivery +
    • Understanding delay logging +
    • Transport process limits, concurrency limits +
    • Scaling to thousands of output processes +
    • Connection caching, TLS session caching, feedback controls +
    +

    + Speaker Bio +
    + Victor Duchovni trained in mathematics, switched + tracks to CS in 1980s leaving Princeton with a + master`s degree in mathematics and newly acquired + skills in Unix system administration and system + programming. In 1990 moved to Lehman Brothers, + worked on system management tooling, and network + engineering. Ported "Moira" from MIT to Lehman, + built efficient build systems that predated (and + partly inspired) Jumpstart. In 1994 joined ESM to + market "CMDB" tools to enterprise users, but this + did not pan out, in the mean time learned Tcl, and + contributed bunch of patches to the 7.x early 8.x + TCL releases. In 1997 returned to New York, working + in IT Security at Morgan Stanley since late 1999. + At Morgan Stanley, developed a hobby in perimeter + email security, becoming an active Postfix user and + very soon contributor in May of 2001. In addition + to many smaller feature improvements, contributed + initial implementation of SMTP connection caching, + overhauled and currently maintain LDAP and TLS + support. Made significant design contributions to + queue manager in collaboration with Wietse and + Patrik Raq. In 2.6 contributing support for TLS EC + ciphers and multi-instance management tooling, + ideally also TLS SNI if time permits. +

    + ]]>     + http://www.nycbug.org/index.php?NAV=Home;SUBM=10168 + nycbug,presentation,postfix,john mashey + + + http://www.fetissov.org/public/nycbug/nycbug-02-04-09.mp3 + MP3 version + mp3 + 11 Mb + + +     + + + Introduction to Puppet + + What it is and how can it make system administration + less painful +

    + About the speaker: +
    + Larry Ludwig - Principal Consultant/Founder of + Empowering Media. Empowering Media is a consulting + firm and managed hosting provider. Larry Ludwig + has been in the industry for over 15 years as a + system administration and system programmer. He`s + had previous experience working for many Fortune + 500 corporations and holds a BS in CS from Clemson + University. Larry, along with Eric E. Moore and + Brian Gupta are founding members of the NYC Puppet + usergroup. +

    + ]]>     + http://www.nycbug.org/index.php?NAV=Home;SUBM=10171 + nycbug,presentation,puppet,larry ludwig + + + http://www.fetissov.org/public/nycbug/nycbug-01-07-09.mp3 + MP3 version + mp3 + 11 Mb + + +     + Hardware Performance Monitoring Counters - $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.93 2009/03/06 04:41:39 brooks Exp $ + $FreeBSD: www/en/projects/ideas/ideas.xml,v 1.109 2009/03/13 15:28:47 brooks Exp $ Embedded - - Reduced FreeBSD for Embedded -

    Technical Contact: Warner Losh

    - -

    In the Linux world, there are a number of packages available - which will grab a bunch of software, including Linux, the tool - chains, packages, etc and create a firmware image for popular - devices. Since FreeBSD is an integrated system, many of these - elements are present in the base system or the ports tree.

    -

    There have been attempts at this problem over the years: - nanobsd, picobsd, and tinybsd are in the tree, Sam Leffler has - his own custom scripts, etc. This project would pick an - approach and use the existing scripts to make it simple to - create images that could be loaded into the firmware of these - devices. Many of the newer devices have 8MB or 16MB flash - parts, so that would be a good size to target for the kernel - and ram disk image. A good way to think of this project is - openwrt for FreeBSD images.

    -

    Requirements:

    -
      -
    • Strong C and scripting language programming skills.
      • -
    • No fear of the FreeBSD build process.
      • -
    • Good knowledge of how FreeBSD is put together.
      • -
    • Knowledge of the ports system.
      • -
    -     -     - - + Reduced FreeBSD kernel size for embedded

    Technical Contact: Warner Losh

    @@ -75,7 +46,7 @@     - + NAND Flash driver support

    Technical Contact: Warner Losh

    @@ -88,7 +59,7 @@     - + Make creating a bus easier

    Technical Contact: Warner Losh

    @@ -104,7 +75,7 @@     - + Variable hints

    Technical Contact: Warner Losh

    @@ -122,7 +93,7 @@     - + ARM cleanup

    Technical Contact: Warner Losh

    @@ -139,7 +110,7 @@     - + PPC/ARM/MIPS bring up

    Technical Contact: - + Overhaul the config system

    Technical Contact: General cleanup.

  • Introduce appropriate locking to make the file system operate without the Giant lock (MPSAFE).
    • -
  • Make msdosfs robust in the presence of unexpected disk removal, since - it is frequently used with removable devices.

    • It is unclear to what extent the last of these items, arguably the most useful, will require modifying surrounding infrastructure such as BIO, @@ -210,7 +179,7 @@ - + Improve the performance of dump/restore

    A performance evaluation of the split cache (as is) and an unified cache @@ -226,7 +195,7 @@ - + Extend UFS2 with on-disk indexing

    Technical Contact: - + Implement co-location for UFS2

    While FreeBSD's FFS implementation is pretty much @@ -539,9 +508,6 @@ (CDDL) that Sun has on their code. John will write a specification about the file format and the Summer of Code project is to implement that and write tests for the implementation without looking at the Sun code. -

  • We need someone to port the DTrace toolkit to FreeBSD. Part of this will - include adding additional probes to the kernel and to userland processes - to do what Sun does in OpenSolaris and also what Apple does in OS X.

    • Requirements:

      @@ -726,7 +692,7 @@ - + Interactive Splash Screen

      Improve upon / replace the existing static VESA splash @@ -788,30 +754,12 @@ - - Remove procfs dependencies

      Technical contact: Maxime Henrion

      + href="mailto:cognet@FreeBSD.org">Olivier Houchard

      Someone needs to finish the support for PT_SYSCALL in the ptrace() subsystem and remove the need for procfs in gcore. Removing the procfs(5) dependency from ps -e is also desirable.

      @@ -868,28 +816,6 @@ - - Syscons modularization - - -

      Separate the syscons code into distinct parts for input, output, - console handling (switching, screen savers etc.) and terminal - emulation. Introduce fine-grained locking. Also implement vt100 and - vt220 emulation to supplement the existing SCO emulation. Add a - gettytab(5) capability for specifying the terminal emulation, and add - entries to /etc/gettytab for the alternative emulations.

      -

      Optionally implement xterm emulation. The top line of the screen - should serve as a title bar, displaying the title set with the \e]0; - escape sequence as well as the vty number.

      -

      Requirements:

      -
        -
      • Ability to read and understand foreign C code.
        • -
      • Ability to write C code.
        • -
      • A good understanding of text terminals and terminal emulation.
        • -
      -       -       - Make optional kernel subsystems register themselves via sysctl @@ -938,28 +864,6 @@ - - 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.
        • -
      -       -       @@ -970,27 +874,26 @@

      Technical contact: Maxime Henrion

      + href="mailto:lulf@FreeBSD.org">Ulf Lilleengen

      URL's: csup homepage, CVSweb

      -

      Maxime Henrion is working on a rewrite of CVSup in C, called csup, and he - has imported csup into the FreeBSD base system. It should be ready for use - in a stable environment, but there are however still several missing - features. The following list should be a good starting point:

      +

      csup is a port of the cvsup high-speed CVS repository replication + application from the original Modula-3 to the C lanaguage. It is now + distributed with FreeBSD, but is missing some important features that would + make useful projects to work on:

      • Add support for authentication.
        • +
      • Working rsync support.
        • +
      • Optimize rcsfile handling.
        • +
      • Create a library out of the ports that might be of use in a C language + csupd.
      • Add support for shell commands sent by the server.
      • Add missing support for various CVSup options: -D, -a (requires authentication support), -e and -E (requires shell commands support) and the destDir parameter.
        • -
      • Add support for CVS mode. This is important for developers, since this - mode sends the actual RCS files themselves. Some parts of this has - already been implemented, such as an RCS parser and an interface to - edit RCS files. The remaining parts for this feature is RCS - correctness testing, protocol correctness testing, fixing bugs and - checking for memory leaks and performance issues.
        • +
      • Work on a new csupd.

      Requirements:

        @@ -1002,49 +905,6 @@ - - Magic tunnel daemon - - -

        Technical contact: Poul-Henning Kamp, Matus Harvan
        - WIP: http://wiki.freebsd.org/mtund

        -

        IP can be tunnelled over IP, UDP, TCP, SSH, DNS, HTTP and many other - protocols, and this means that it is often possible to get a - connection out through a firewall, but each of these encapsulations - require prior setup of a specific program for each encapsulation, and - the user must experiment to decide which one to use at any one time. - The super tunnel daemon should implement pluggable encapsulations and - make it automatically select the most efficient encapsulation that - works at any one time. The user should not notice transitions from one - encapsulation to another, apart from maybe a small delay.

        -

        Wanted features (not sorted or prioritized):

        -
          -
        • Autodetection of the environment (DHCP, DNS, routing, ...) in a - non-offensive way (no global portscans allowed; asking via DHCP, - zeroconf or similar technologies is ok) as far as possible.
          • -
        • Plugin architecture for easy addition of further encapsulations.
          • -
        • Failover from one encapsulation to another.
          • -
        • Distinct configuration files for encapsulations which need to be - configured (e.g. proxy, authentication, ...).
          • -
        • Possibility to disable installed encapsulations.
          • -
        • Print/log hints for protocols which require some configuration, - e.g. telling the user to use keys and perhaps the ssh-agent for ssh.
          • -
        • Configurable additional plugin directories (for plugins installed - via the ports collection).
          • -
        • Log how it is able to tunnel the traffic (this also makes it useful - for finding unwanted holes in the configuration of a firewall).
          • -
        -

        Requirements:

        -
          -
        • Good knowledge of C.
          • -
        • Good knowledge about networks.
          • -
        -         -         - TCP/IP regression test suite @@ -1063,7 +923,7 @@ - + Passive libpcap based TCP session anomaly detector @@ -1171,7 +1031,7 @@ Ports - + Add .db support to pkg_tools @@ -1214,73 +1074,6 @@ - - Collect the pkg-message output - - -

        Technical contact: Pav Lucistnik

        - -

        Collect the pkg-message output of dependencies and print them together - after the whole build finishes.

        - -

        Details: Change the current ad-hoc way of including pkg-message in - the stdout of the build process. Automatically display pkg-message - in post-install, if present. For the dependencies, save the copies - of pkg-messages, as displayed in post-install, in /var/db/pkg, and - display them collectively once the whole build finishes. Also - allow for manual review by user later (new flag to - pkg_info(1)).

        - -

        Requirements:

        - -
          -
        • Knowledge of shell and make coding, and basic overview of how - ports works.
          • -
        • Basic knowledge of C.
          • -
        - -         -         - - - Improvements of OPTIONS - - -

        The current OPTIONS infrastructure can be improved in several ways.

        -
          -
        • It should be possible to define OPTIONS after bsd.ports.pre.mk.
          • -
        • Add an API to override the current curses based interface with - a different GUI, e.g. zenity/gdialog instead of dialog.
          • -
        • More room for a description in the OPTIONS dialog - possibly some - sort of help dialog could be provided for each option, like in - sysinstall.
          • -
        • Better handling of cases where OPTIONS are changed/added/removed - between upgrades.
          • -
        • The ability to depend on, or at least test, OPTIONS set in other - ports. Possibly it would be nice to enforce setting variables that are - depended upon when the port is being installed as a dependency.
          • -
        • Other types of OPTIONS controls - A text box in particular would be - useful for entering variables that need real values.
          • -
        • The possibility for mutually exclusive OPTIONS.
          • -
        • Bugfixes: -
            -
          • If you attempt to run make config for a port with - ${PKGNAMEPREFIX} defined, the make config process will error out - with:
            - ===> Using wrong configuration file /path/options/file
            - The solution is to define LATEST_LINK to be prefix-${PORTNAME}, - but this should be done internally.
            • -
          • -
        -

        Requirements:

        -
          -
        • Strong knowledge of shell and make code.
          • -
        • A basic understanding of the inner workings of the ports tree.
          • -
        -         -         - Package tools improvements @@ -1297,7 +1090,7 @@         - + Parallelization in the Ports Collection @@ -1332,42 +1125,6 @@ - - Utility for safe updating of ports in base system - - -

        Also known as rewrite portupgrade in C.

        - -

        Write a new utility for the pkg_install suite, possibly named - pkg_upgrade(1), implementing a subset of existing portupgrade - functionality. The required functionality is:

        - -
          -
        • fixing @pkgdep records in +CONTENTS file
          • -
        • fixing +REQUIRED_BY records
          • -
        • storing old copies of shared libraries after shmajor number - change in /usr/local/lib/compat/pkg
          • -
        • upwards and downwards recursive modes
          • -
        • ability to work on a complete local ports tree without valid - INDEX file
          • -
        • ability to work on a remote (ftp) package set without local - ports tree
          • -
        - -

        Anything that existing portupgrade can do is a desired - functionality. It would be nice to be command line compatible with - portupgrade, but it's not a requirement.

        - -

        Requirements:

        - -
          -
        • Basic understanding of the Ports Collection design.
          • -
        • Good skills writing C code.
          • -
        • Ability to read Ruby will help.
          • -
        -         -         - Ports license auditing infrastructure @@ -1559,43 +1316,6 @@ - - NFSv4 ACLs - - -

        Technical contact: Robert Watson, Pawel Jakub Dawidek

        -

        The NFSv4 RFC and follow-on drafts specify a new Access Control - List (ACL) format loosely based on NTFS ACLs. This format is not - directly compatible with existing POSIX.1e ACLs, but has been - adopted by a number of recent UNIX file systems (including Apple's - HFS+ and Sun's ZFS file systems) in order to improve Windows - compatibility. This project is multi-part:

        -
          -
        • research current specifications and implementations of - NFSv4 ACLs,
          • -
        • implement an ACL library in userspace,
          • -
        • port the ACL implementation to the kernel and enhance the - kernel ACL infrastructure to support NFSv4 ACLs,
          • -
        • implement optional NFSv4 ACL support on UFS2 and ZFS,
          • -
        • investigate NFSv4 ACL support for Samba and smbfs,
          • -
        • implement a test suite exercising relevant aspects of NFSv4 - ACL implementation, both basic rule evaluation and its - integration with the nominally incompatible UNIX owner, group, - and mode.
          • -
        - -

        Requirements:

        -
          -
        • Strong C programming skills.
          • -
        • Tolerance for IETF specifications.
          • -
        • Appreciation for the nasty subtleties of access control.
          • -
        • Rigorous and devious mindset.
          • -
        -         -         - Audit and Jail @@ -1622,6 +1342,140 @@ + + A New Audit Parsing API + + +

        Technical contact: Robert Watson, TrustedBSD audit + mailing list

        + >>> TRUNCATED FOR MAIL (1000 lines) <<< From pgj at FreeBSD.org Fri Mar 13 10:39:41 2009 From: pgj at FreeBSD.org (Gabor Pali) Date: Fri Mar 13 10:39:48 2009 Subject: PERFORCE change 159176 for review Message-ID: <200903131739.n2DHddHe046580@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159176 Change 159176 by pgj@beehive on 2009/03/13 17:39:31 MFen (www): 1.231 -> 1.232 hu/share/sgml/news.xml Affected files ... .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#5 edit Differences ... ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#5 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,38 @@ 3 + 12 + + + &os; Twitteren is + +

        Mostantól számos félhivatalos Twitter + stream is elérhetõ a &os; Projekt legfrissebb + híreivel! A @freebsdannounce + stream a &os; híreit foglalja össze + röviden és linkeli be. A @freebsdblogs a + &os; fejlesztõk legfrissebb blogbejegyzéseit + közli közvetlenül a Planet + &os; oldalról. A @freebsd ez + elõbbi két forrásból és + más egyéb helyekrõl vesz át + híreket. Végezetül a nemrég + elindult @bsdevents stream + a Projekttel kapcsolatos eseményeket, + illetve egyéb BSD témájú + összejövetelekrõl szóló + további emlékeztetõket és + felhívásokat közvetít.

        +         +         + + 3 From hselasky at FreeBSD.org Fri Mar 13 13:09:17 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Fri Mar 13 13:09:24 2009 Subject: PERFORCE change 159179 for review Message-ID: <200903132009.n2DK9Bls060884@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159179 Change 159179 by hselasky@hselasky_laptop001 on 2009/03/13 20:08:12 USB CORE: HID usage minimum can be equal to the maximum. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#24 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_hid.c#24 (text+ko) ==== @@ -441,7 +441,7 @@ /* sanity check */ if ((s->nusage < MAXUSAGE) && - (c->usage_minimum < c->usage_maximum)) { + (c->usage_minimum <= c->usage_maximum)) { /* add usage range */ s->usages_min[s->nusage] = c->usage_minimum; From gabor at FreeBSD.org Sat Mar 14 07:20:42 2009 From: gabor at FreeBSD.org (Gabor Kovesdan) Date: Sat Mar 14 07:20:49 2009 Subject: PERFORCE change 159195 for review Message-ID: <200903141420.n2EEKf4F017859@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159195 Change 159195 by gabor@gabor_server on 2009/03/14 14:20:05 - Bump Copyright for files, which were modified in 2009 Affected files ... .. //depot/projects/soc2008/gabor_textproc/grep/file.c#43 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.c#85 edit .. //depot/projects/soc2008/gabor_textproc/grep/grep.h#47 edit .. //depot/projects/soc2008/gabor_textproc/grep/util.c#80 edit Differences ... ==== //depot/projects/soc2008/gabor_textproc/grep/file.c#43 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav - * Copyright (C) 2008 Gabor Kovesdan + * Copyright (C) 2008-2009 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#85 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav - * Copyright (C) 2008 Gabor Kovesdan + * Copyright (C) 2008-2009 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/gabor_textproc/grep/grep.h#47 (text+ko) ==== @@ -2,6 +2,7 @@ /* $FreeBSD$ */ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (c) 2008-2009 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without ==== //depot/projects/soc2008/gabor_textproc/grep/util.c#80 (text+ko) ==== @@ -1,6 +1,6 @@ /*- * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav - * Copyright (C) 2008 Gabor Kovesdan + * Copyright (C) 2008-2009 Gabor Kovesdan * All rights reserved. * * Redistribution and use in source and binary forms, with or without From rwatson at FreeBSD.org Sat Mar 14 15:21:39 2009 From: rwatson at FreeBSD.org (Robert Watson) Date: Sat Mar 14 15:21:45 2009 Subject: PERFORCE change 159140 for review In-Reply-To: <200903130019.n2D0JSQA093900@repoman.freebsd.org> References: <200903130019.n2D0JSQA093900@repoman.freebsd.org> Message-ID: On Fri, 13 Mar 2009, Stacey Son wrote: > http://perforce.freebsd.org/chv.cgi?CH=159140 > > Change 159140 by sson@sson_amd64 on 2009/03/13 00:18:47 > > Add support for parsing and printing AUT_SOCKINET128 tokens. Have you confirmed that this doesn't grow the size of struct tokenstr, which is (unfortunately) part of the ABI for libbsm? Robert N M Watson Computer Laboratory University of Cambridge > > Affected files ... > > .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 edit > .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 edit > > Differences ... > > ==== //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 (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#44 $ > + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#45 $ > */ > > #ifndef _LIBBSM_H_ > @@ -565,6 +565,12 @@ > typedef struct { > u_int16_t family; > u_int16_t port; > + u_int32_t addr[4]; > +} au_socketinet_ex32_t; > + > +typedef struct { > + u_int16_t family; > + u_int16_t port; > u_int32_t addr; > } au_socketinet32_t; > > @@ -722,7 +728,7 @@ > au_seq_t seq; > au_socket_t socket; > au_socket_ex32_t socket_ex32; > - au_socketinet32_t sockinet32; > + au_socketinet_ex32_t sockinet_ex32; > au_socketunix_t sockunix; > au_subject32_t subj32; > au_subject32ex_t subj32_ex; > > ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 (text+ko) ==== > > @@ -32,7 +32,7 @@ > * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE > * POSSIBILITY OF SUCH DAMAGE. > * > - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#61 $ > + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#62 $ > */ > > #include > @@ -365,6 +365,10 @@ > fprintf(fp, "/>"); > break; > > + case AUT_SOCKINET128: > + fprintf(fp, "/>"); > + break; > + > case AUT_SUBJECT32: > fprintf(fp, "/>"); > break; > @@ -529,13 +533,16 @@ > break; > > case AUT_SOCKINET32: > - fprintf(fp, " + fprintf(fp, " break; > > case AUT_SOCKUNIX: > - fprintf(fp, " + fprintf(fp, " break; > > + case AUT_SOCKINET128: > + fprintf(fp, " + > case AUT_SUBJECT32: > fprintf(fp, " break; > @@ -3067,18 +3074,18 @@ > { > int err = 0; > > - READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet32.family, tok->len, > + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet_ex32.family, tok->len, > err); > if (err) > return (-1); > > - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.port, > + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.port, > sizeof(uint16_t), tok->len, err); > if (err) > return (-1); > > - READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet32.addr, > - sizeof(tok->tt.sockinet32.addr), tok->len, err); > + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.addr, > + sizeof(tok->tt.sockinet_ex32.addr[0]), tok->len, err); > if (err) > return (-1); > > @@ -3093,22 +3100,77 @@ > print_tok_type(fp, tok->id, "socket-inet", raw, xml); > if (xml) { > open_attr(fp, "type"); > - print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); > + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); > + close_attr(fp); > + open_attr(fp, "port"); > + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); > + close_attr(fp); > + open_attr(fp, "addr"); > + print_ip_address(fp, tok->tt.sockinet_ex32.addr[0]); > + close_attr(fp); > + close_tag(fp, tok->id); > + } else { > + print_delim(fp, del); > + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); > + print_delim(fp, del); > + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); > + print_delim(fp, del); > + print_ip_address(fp, tok->tt.sockinet_ex32.addr[0]); > + } > +} > + > +/* > + * socket family 2 bytes > + * local port 2 bytes > + * socket address 16 bytes > + */ > +static int > +fetch_sock_inet128_tok(tokenstr_t *tok, u_char *buf, int len) > +{ > + int err = 0; > + > + READ_TOKEN_U_INT16(buf, len, tok->tt.sockinet_ex32.family, tok->len, > + err); > + if (err) > + return (-1); > + > + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.port, > + sizeof(uint16_t), tok->len, err); > + if (err) > + return (-1); > + > + READ_TOKEN_BYTES(buf, len, &tok->tt.sockinet_ex32.addr, > + sizeof(tok->tt.sockinet_ex32.addr), tok->len, err); > + if (err) > + return (-1); > + > + return (0); > +} > + > +static void > +print_sock_inet128_tok(FILE *fp, tokenstr_t *tok, char *del, char raw, > + __unused char sfrm, int xml) > +{ > + > + print_tok_type(fp, tok->id, "socket-inet6", raw, xml); > + if (xml) { > + open_attr(fp, "type"); > + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); > close_attr(fp); > open_attr(fp, "port"); > - print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); > + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); > close_attr(fp); > open_attr(fp, "addr"); > - print_ip_address(fp, tok->tt.sockinet32.addr); > + print_ip_ex_address(fp, AU_IPv6, tok->tt.sockinet_ex32.addr); > close_attr(fp); > close_tag(fp, tok->id); > } else { > print_delim(fp, del); > - print_2_bytes(fp, tok->tt.sockinet32.family, "%u"); > + print_2_bytes(fp, tok->tt.sockinet_ex32.family, "%u"); > print_delim(fp, del); > - print_2_bytes(fp, ntohs(tok->tt.sockinet32.port), "%u"); > + print_2_bytes(fp, ntohs(tok->tt.sockinet_ex32.port), "%u"); > print_delim(fp, del); > - print_ip_address(fp, tok->tt.sockinet32.addr); > + print_ip_ex_address(fp, AU_IPv6, tok->tt.sockinet_ex32.addr); > } > } > > @@ -4057,6 +4119,9 @@ > case AUT_SOCKUNIX: > return (fetch_sock_unix_tok(tok, buf, len)); > > + case AUT_SOCKINET128: > + return (fetch_sock_inet128_tok(tok, buf, len)); > + > case AUT_SUBJECT32: > return (fetch_subject32_tok(tok, buf, len)); > > @@ -4226,6 +4291,10 @@ > print_sock_unix_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); > return; > > + case AUT_SOCKINET128: > + print_sock_inet128_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); > + return; > + > case AUT_SUBJECT32: > print_subject32_tok(outfp, tok, del, raw, sfrm, AU_PLAIN); > return; > From hselasky at FreeBSD.org Sat Mar 14 18:07:44 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Sat Mar 14 18:07:51 2009 Subject: PERFORCE change 159225 for review Message-ID: <200903150107.n2F17hNe012582@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159225 Change 159225 by hselasky@hselasky_laptop001 on 2009/03/15 01:07:17 USB CORE: Fix regression issue in the USB file system interface. - Use cdev_privdata pointer as indicator of correct file handle. - Remove redundant FIFO opened flags. Reported by: Alexander Best Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#8 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#5 edit .. //depot/projects/usb/src/sys/dev/usb/usb_device.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#8 (text+ko) ==== @@ -72,7 +72,8 @@ /* prototypes */ -static int usb2_fifo_open(struct usb2_fifo *, int); +static int usb2_fifo_open(struct usb2_cdev_privdata *, + struct usb2_fifo *, int); static void usb2_fifo_close(struct usb2_fifo *, int); static void usb2_dev_init(void *); static void usb2_dev_init_post(void *); @@ -200,6 +201,8 @@ cpd->is_write = 1; /* ref */ if (f == NULL || f->refcount == USB_FIFO_REF_MAX) goto error; + if (f->curr_cpd != cpd) + goto error; /* check if USB-FS is active */ if (f->fs_ep_max != 0) { cpd->is_usbfs = 1; @@ -222,6 +225,8 @@ cpd->is_read = 1; /* ref */ if (f == NULL || f->refcount == USB_FIFO_REF_MAX) goto error; + if (f->curr_cpd != cpd) + goto error; /* check if USB-FS is active */ if (f->fs_ep_max != 0) { cpd->is_usbfs = 1; @@ -434,7 +439,7 @@ /* wrong endpoint index */ continue; } - if (f->opened) { + if (f->curr_cpd != NULL) { /* FIFO is opened */ is_busy = 1; continue; @@ -451,7 +456,7 @@ /* wrong endpoint index */ continue; } - if (f->opened) { + if (f->curr_cpd != NULL) { /* FIFO is opened */ is_busy = 1; continue; @@ -470,6 +475,16 @@ return (is_busy ? EBUSY : EINVAL); } } + + if ((ep != 0) && is_busy) { + /* + * Only the default control endpoint is allowed to be + * opened multiple times! + */ + DPRINTFN(5, "busy\n"); + return (EBUSY); + } + /* Check TX FIFO */ if (is_tx && (udev->fifo[n + USB_FIFO_TX] == NULL)) { @@ -639,7 +654,8 @@ * Else: Failure *------------------------------------------------------------------------*/ static int -usb2_fifo_open(struct usb2_fifo *f, int fflags) +usb2_fifo_open(struct usb2_cdev_privdata *cpd, + struct usb2_fifo *f, int fflags) { int err; @@ -660,7 +676,7 @@ /* check if we are already opened */ /* we don't need any locks when checking this variable */ - if (f->opened) { + if (f->curr_cpd != NULL) { err = EBUSY; goto done; } @@ -690,9 +706,9 @@ /* reset ASYNC proc flag */ f->async_p = NULL; + mtx_lock(&usb2_ref_lock); /* flag the fifo as opened to prevent others */ - mtx_lock(&usb2_ref_lock); - f->opened = 1; + f->curr_cpd = cpd; mtx_unlock(&usb2_ref_lock); /* reset queue */ @@ -733,14 +749,14 @@ int err; /* check if we are not opened */ - if (!f->opened) { + if (f->curr_cpd == NULL) { /* nothing to do - already closed */ return; } mtx_lock(f->priv_mtx); - /* clear current file flag */ - f->opened = 0; + /* clear current cdev private data pointer */ + f->curr_cpd = NULL; /* check if we are selected */ if (f->flag_isselect) { @@ -834,21 +850,6 @@ } cpd->fflags = fflags; /* access mode for open lifetime */ - /* Check if the endpoint is already open, we always allow EP0 */ - if (ep > 0) { - if ((fflags & FREAD && cpd->udev->ep_rd_opened & (1 << ep)) || - (fflags & FWRITE && cpd->udev->ep_wr_opened & (1 << ep))) { - DPRINTFN(2, "endpoint already open\n"); - usb2_unref_device(cpd); - free(cpd, M_USBDEV); - return (EBUSY); - } - if (fflags & FREAD) - cpd->udev->ep_rd_opened |= (1 << ep); - if (fflags & FWRITE) - cpd->udev->ep_wr_opened |= (1 << ep); - } - /* create FIFOs, if any */ err = usb2_fifo_create(cpd); /* check for error */ @@ -859,7 +860,7 @@ return (err); } if (fflags & FREAD) { - err = usb2_fifo_open(cpd->rxfifo, fflags); + err = usb2_fifo_open(cpd, cpd->rxfifo, fflags); if (err) { DPRINTFN(2, "read open failed\n"); usb2_unref_device(cpd); @@ -868,7 +869,7 @@ } } if (fflags & FWRITE) { - err = usb2_fifo_open(cpd->txfifo, fflags); + err = usb2_fifo_open(cpd, cpd->txfifo, fflags); if (err) { DPRINTFN(2, "write open failed\n"); if (fflags & FREAD) { @@ -906,13 +907,9 @@ udev = cpd->udev; if (cpd->fflags & FREAD) { usb2_fifo_close(cpd->rxfifo, cpd->fflags); - /* clear read bitmask */ - udev->ep_rd_opened &= ~(1 << cpd->ep_addr); } if (cpd->fflags & FWRITE) { usb2_fifo_close(cpd->txfifo, cpd->fflags); - /* clear write bitmask */ - udev->ep_wr_opened &= ~(1 << cpd->ep_addr); } usb2_unref_device(cpd); @@ -1762,7 +1759,9 @@ f_sc->fp[USB_FIFO_RX] = NULL; if (f_sc->dev != NULL) { - destroy_dev_sched_cb(f_sc->dev, usb2_fifo_cleanup, f_sc->dev->si_drv1); + destroy_dev_sched_cb(f_sc->dev, + usb2_fifo_cleanup, f_sc->dev->si_drv1); + f_sc->dev = NULL; } DPRINTFN(2, "detached %p\n", f_sc); ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#5 (text+ko) ==== @@ -93,12 +93,12 @@ int bus_index; /* bus index */ int dev_index; /* device index */ int ep_addr; /* endpoint address */ + int fflags; uint8_t fifo_index; /* FIFO index */ uint8_t is_read; /* location has read access */ uint8_t is_write; /* location has write access */ uint8_t is_uref; /* USB refcount decr. needed */ uint8_t is_usbfs; /* USB-FS is active */ - int fflags; }; struct usb2_fs_privdata { @@ -130,7 +130,8 @@ struct usb2_xfer *xfer[2]; struct usb2_xfer **fs_xfer; struct mtx *priv_mtx; /* client data */ - int opened; /* set if FIFO is opened by a FILE */ + /* set if FIFO is opened by a FILE: */ + struct usb2_cdev_privdata *curr_cpd; void *priv_sc0; /* client data */ void *priv_sc1; /* client data */ void *queue_data; ==== //depot/projects/usb/src/sys/dev/usb/usb_device.h#5 (text+ko) ==== @@ -127,8 +127,6 @@ uint32_t plugtime; /* copy of "ticks" */ - uint16_t ep_rd_opened; /* bitmask of endpoints opened */ - uint16_t ep_wr_opened; /* from the device nodes. */ uint16_t refcount; #define USB_DEV_REF_MAX 0xffff From julian at FreeBSD.org Sat Mar 14 23:44:33 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Sat Mar 14 23:44:41 2009 Subject: PERFORCE change 159228 for review Message-ID: <200903150644.n2F6iOf2055359@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159228 Change 159228 by julian@julian_trafmon1 on 2009/03/15 06:43:36 IFC latest Affected files ... .. //depot/projects/vimage/src/share/man/man4/Makefile#5 integrate .. //depot/projects/vimage/src/share/man/man4/altq.4#4 integrate .. //depot/projects/vimage/src/share/man/man4/amdtemp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/igmp.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ip.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/k8temp.4#2 delete .. //depot/projects/vimage/src/share/man/man4/multicast.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/txp.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/uplcom.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/usb2_bluetooth.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_controller.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_ethernet.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_image.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_input.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_misc.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_ndis.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_quirk.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_serial.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_sound.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_storage.4#2 delete .. //depot/projects/vimage/src/share/man/man4/usb2_wlan.4#2 delete .. //depot/projects/vimage/src/share/man/man5/rc.conf.5#5 integrate .. //depot/projects/vimage/src/share/man/man7/tuning.7#3 integrate .. //depot/projects/vimage/src/share/man/man8/diskless.8#2 integrate .. //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#2 integrate .. //depot/projects/vimage/src/sys/amd64/acpica/madt.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/fpu.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#14 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#26 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#16 integrate .. //depot/projects/vimage/src/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/vimage/src/sys/amd64/ia32/ia32_signal.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcb.h#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/pcpu.h#7 integrate .. //depot/projects/vimage/src/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage/src/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/vimage/src/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#13 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/arm/conf/AVILA#14 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA#4 integrate .. //depot/projects/vimage/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#14 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#8 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#10 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#9 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_pci.c#6 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/Makefile#6 integrate .. //depot/projects/vimage/src/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#29 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_misc.h#4 integrate .. //depot/projects/vimage/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_ndis.c#10 integrate .. //depot/projects/vimage/src/sys/compat/ndis/kern_windrv.c#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ndis_var.h#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/ntoskrnl_var.h#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#13 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#11 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/vimage/src/sys/compat/ndis/subr_usbd.c#5 integrate .. //depot/projects/vimage/src/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/vimage/src/sys/conf/files#58 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#21 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#28 integrate .. //depot/projects/vimage/src/sys/conf/options.amd64#7 integrate .. //depot/projects/vimage/src/sys/conf/options.arm#10 integrate .. //depot/projects/vimage/src/sys/ddb/db_expr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#7 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/vimage/src/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/vimage/src/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/vimage/src/sys/dev/ata/ata-card.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-cbus.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-isa.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-ahci.c#7 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-sis.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ah.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#31 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#19 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#21 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcefw.h#9 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#14 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#8 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_cis.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_core.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_dev.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/vimage/src/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#11 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#11 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_xgmac.c#10 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#16 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_ioctl.h#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#24 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#21 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/vimage/src/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#12 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#9 integrate .. //depot/projects/vimage/src/sys/dev/drm/drmP.h#9 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_bufs.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_drv.c#12 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_scatter.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_sysctl.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/i915_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/mach64_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/mga_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/r128_drv.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/vimage/src/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/vimage/src/sys/dev/drm/radeon_cp.c#7 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/vimage/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/vimage/src/sys/dev/drm/savage_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/sis_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/drm/tdfx_drv.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ed/if_ed_pccard.c#6 integrate .. //depot/projects/vimage/src/sys/dev/exca/exca.c#5 integrate .. //depot/projects/vimage/src/sys/dev/fe/if_fe_pccard.c#4 integrate .. //depot/projects/vimage/src/sys/dev/firewire/fwohci_pci.c#6 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#13 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#21 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pccard.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndisvar.h#9 integrate .. //depot/projects/vimage/src/sys/dev/ipw/if_ipw.c#11 integrate .. //depot/projects/vimage/src/sys/dev/k8temp/k8temp.c#6 delete .. //depot/projects/vimage/src/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/md/md.c#11 integrate .. //depot/projects/vimage/src/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mii/ip1000phyreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#13 integrate .. //depot/projects/vimage/src/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccard_cis.c#6 integrate .. //depot/projects/vimage/src/sys/dev/pccard/pccarddevs#10 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#11 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#20 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#13 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcib_private.h#8 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#14 integrate .. //depot/projects/vimage/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/ppbus/lpbb.c#6 integrate .. //depot/projects/vimage/src/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ral/if_ral_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/re/if_re.c#23 integrate .. //depot/projects/vimage/src/sys/dev/sio/sio_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10k1.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/emu10kx.c#9 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.h#5 delete .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio_pcm.c#6 delete .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudioreg.h#4 delete .. //depot/projects/vimage/src/sys/dev/syscons/scterm-teken.c#4 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#13 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#7 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.c#3 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken.h#3 integrate .. //depot/projects/vimage/src/sys/dev/txp/if_txp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_bus_pci.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_if.m#4 delete .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#44 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbhid.h#4 delete .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/vimage/src/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/vimage/src/sys/dev/xen/blkfront/blkfront.c#7 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/vimage/src/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/vimage/src/sys/dev/xen/netfront/netfront.c#10 integrate .. //depot/projects/vimage/src/sys/dev/xen/xenpci/evtchn.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/xenpci/machine_reboot.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/xenpci/xenpci.c#1 branch .. //depot/projects/vimage/src/sys/dev/xen/xenpci/xenpcivar.h#1 branch .. //depot/projects/vimage/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vfsops.c#11 integrate .. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#8 integrate .. //depot/projects/vimage/src/sys/geom/geom_redboot.c#1 branch .. //depot/projects/vimage/src/sys/geom/part/g_part_pc98.c#8 integrate .. //depot/projects/vimage/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/vimage/src/sys/i386/acpica/madt.c#7 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#28 integrate .. //depot/projects/vimage/src/sys/i386/i386/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/machdep.c#17 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#17 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#25 integrate .. //depot/projects/vimage/src/sys/i386/i386/trap.c#14 integrate .. //depot/projects/vimage/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/vimage/src/sys/i386/isa/npx.c#8 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux.h#10 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#9 integrate .. //depot/projects/vimage/src/sys/i386/xen/mp_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/isa/syscons_isa.c#4 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#18 integrate .. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_lock.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_prot.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#20 integrate .. //depot/projects/vimage/src/sys/kern/kern_tc.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_umtx.c#11 integrate .. //depot/projects/vimage/src/sys/kern/sched_ule.c#30 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#16 integrate .. //depot/projects/vimage/src/sys/kern/subr_param.c#8 integrate .. //depot/projects/vimage/src/sys/kern/subr_witness.c#24 integrate .. //depot/projects/vimage/src/sys/kern/sys_generic.c#13 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#10 integrate .. //depot/projects/vimage/src/sys/kern/sysv_shm.c#6 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sem.c#8 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#23 integrate .. //depot/projects/vimage/src/sys/kern/vfs_bio.c#18 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vfs_default.c#8 integrate .. //depot/projects/vimage/src/sys/kern/vfs_extattr.c#6 integrate .. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#19 integrate .. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#20 integrate .. //depot/projects/vimage/src/sys/kern/vnode_if.src#11 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#41 integrate .. //depot/projects/vimage/src/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/drm/radeon/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/vimage/src/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/usb/Makefile#6 delete .. //depot/projects/vimage/src/sys/net/bpf.c#33 integrate .. //depot/projects/vimage/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/vimage/src/sys/net/if.c#69 integrate .. //depot/projects/vimage/src/sys/net/if_gif.h#11 integrate .. //depot/projects/vimage/src/sys/net/netisr.h#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/igmp_var.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#28 integrate .. //depot/projects/vimage/src/sys/netinet/in.h#10 integrate .. //depot/projects/vimage/src/sys/netinet/in_gif.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#51 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#27 integrate .. //depot/projects/vimage/src/sys/netinet/in_proto.c#20 integrate .. //depot/projects/vimage/src/sys/netinet/in_var.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#49 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#19 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#32 integrate .. //depot/projects/vimage/src/sys/netinet/ip_var.h#17 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#43 integrate .. //depot/projects/vimage/src/sys/netinet/sctp.h#16 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#28 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#28 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#39 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#20 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#23 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#37 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#20 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#50 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#52 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#19 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#37 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#30 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/vimage/src/sys/pc98/cbus/syscons_cbus.c#4 integrate .. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#7 integrate .. //depot/projects/vimage/src/sys/powerpc/include/spr.h#6 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/vimage/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.c#16 integrate .. //depot/projects/vimage/src/sys/security/audit/audit.h#11 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#18 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_audit.c#5 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#16 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#12 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#9 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_pipe.c#7 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#17 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_sem.c#8 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_priv.c#4 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_process.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#9 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_system.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_msg.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_sem.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_sysv_shm.c#6 integrate .. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#14 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#17 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/vimage/src/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate .. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#15 integrate .. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#16 integrate .. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#10 integrate .. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#16 integrate .. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#16 integrate .. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#19 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#7 integrate .. //depot/projects/vimage/src/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/vimage/src/sys/sys/aio.h#3 integrate .. //depot/projects/vimage/src/sys/sys/buf.h#5 integrate .. //depot/projects/vimage/src/sys/sys/diskpc98.h#2 integrate .. //depot/projects/vimage/src/sys/sys/fcntl.h#6 integrate .. //depot/projects/vimage/src/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/vimage/src/sys/sys/ktrace.h#3 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#16 integrate .. //depot/projects/vimage/src/sys/sys/mount.h#19 integrate .. //depot/projects/vimage/src/sys/sys/param.h#44 integrate .. //depot/projects/vimage/src/sys/sys/pipe.h#3 integrate .. //depot/projects/vimage/src/sys/sys/proc.h#28 integrate .. //depot/projects/vimage/src/sys/sys/sem.h#2 integrate .. //depot/projects/vimage/src/sys/sys/shm.h#4 integrate .. //depot/projects/vimage/src/sys/sys/stat.h#4 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#33 integrate .. //depot/projects/vimage/src/sys/sys/syslog.h#2 integrate .. //depot/projects/vimage/src/sys/sys/systm.h#17 integrate .. //depot/projects/vimage/src/sys/sys/termios.h#7 integrate .. //depot/projects/vimage/src/sys/sys/time.h#6 integrate .. //depot/projects/vimage/src/sys/sys/uio.h#2 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#81 integrate .. //depot/projects/vimage/src/sys/sys/vnode.h#19 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#14 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#20 integrate .. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#15 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/vimage/src/sys/vm/vm_init.c#3 integrate .. //depot/projects/vimage/src/sys/vm/vnode_pager.c#12 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn.c#7 integrate .. //depot/projects/vimage/src/sys/xen/evtchn/evtchn_dev.c#4 integrate .. //depot/projects/vimage/src/sys/xen/features.c#3 integrate .. //depot/projects/vimage/src/sys/xen/features.h#1 branch .. //depot/projects/vimage/src/sys/xen/gnttab.c#7 integrate .. //depot/projects/vimage/src/sys/xen/gnttab.h#6 integrate .. //depot/projects/vimage/src/sys/xen/hypervisor.h#2 integrate .. //depot/projects/vimage/src/sys/xen/interface/arch-x86/xen.h#3 integrate .. //depot/projects/vimage/src/sys/xen/interface/hvm/params.h#3 integrate .. //depot/projects/vimage/src/sys/xen/reboot.c#1 branch .. //depot/projects/vimage/src/sys/xen/xen_intr.h#2 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_probe.c#6 integrate .. //depot/projects/vimage/src/sys/xen/xenbus/xenbus_xs.c#7 integrate .. //depot/projects/vimage/src/usr.bin/kdump/kdump.1#2 integrate .. //depot/projects/vimage/src/usr.bin/kdump/kdump.c#2 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.441 2009/01/23 05:53:49 weongyo Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.443 2009/03/13 16:42:24 rpaulo Exp $ MAN= aac.4 \ acpi.4 \ @@ -26,6 +26,7 @@ ale.4 \ altq.4 \ amd.4 \ + ${_amdtemp.4} \ ${_amdsmb.4} \ amr.4 \ an.4 \ @@ -129,6 +130,7 @@ if_bridge.4 \ ifmib.4 \ igb.4 \ + igmp.4 \ iic.4 \ iicbb.4 \ iicbus.4 \ @@ -155,7 +157,6 @@ ixgbe.4 \ jme.4 \ joy.4 \ - ${_k8temp.4} \ kbdmux.4 \ keyboard.4 \ kld.4 \ @@ -594,6 +595,7 @@ _acpi_sony.4= acpi_sony.4 _acpi_toshiba.4=acpi_toshiba.4 _amdsmb.4= amdsmb.4 +_amdtemp.4= amdtemp.4 _asmc.4= asmc.4 _coretemp.4= coretemp.4 _cpuctl.4= cpuctl.4 @@ -611,7 +613,6 @@ _io.4= io.4 _linux.4= linux.4 _ndis.4= ndis.4 -_k8temp.4= k8temp.4 _nfe.4= nfe.4 _nfsmb.4= nfsmb.4 _nve.4= nve.4 ==== //depot/projects/vimage/src/share/man/man4/altq.4#4 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.37 2008/11/12 10:31:06 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.38 2009/03/12 01:21:48 yongari Exp $ .\" -.Dd November 12, 2008 +.Dd March 12, 2009 .Dt ALTQ 4 .Os .Sh NAME @@ -152,6 +152,7 @@ .Xr sk 4 , .Xr ste 4 , .Xr stge 4 , +.Xr txp 4 , .Xr udav 4 , .Xr ural 4 , .Xr vge 4 , ==== //depot/projects/vimage/src/share/man/man4/ip.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.49 2007/06/12 16:24:55 bms Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.51 2009/03/09 17:53:05 bms Exp $ .\" -.Dd April 9, 2007 +.Dd March 9, 2009 .Dt IP 4 .Os .Sh NAME @@ -404,8 +404,9 @@ Multicast datagrams with TTL greater than 1 may be forwarded to other networks if a multicast router is attached to the local network. .Pp -For hosts with multiple interfaces, each multicast transmission is -sent from the primary network interface. +For hosts with multiple interfaces, where an interface has not +been specified for a multicast group membership, +each multicast transmission is sent from the primary network interface. The .Dv IP_MULTICAST_IF option overrides the default for @@ -423,12 +424,25 @@ .Pp To specify an interface by index, an instance of .Vt ip_mreqn -should be passed instead. +may be passed instead. The .Vt imr_ifindex member should be set to the index of the desired interface, or 0 to specify the default interface. The kernel differentiates between these two structures by their size. +.Pp +The use of +.Vt IP_MULTICAST_IF +is +.Em not recommended , +as multicast memberships are scoped to each +individual interface. +It is supported for legacy use only by applications, +such as routing daemons, which expect to +be able to transmit link-local IPv4 multicast datagrams (224.0.0.0/24) +on multiple interfaces, +without requesting an individual membership for each interface. +.Pp .\" An interface's local IP address and multicast capability can be obtained via the @@ -452,13 +466,19 @@ .Pp This option improves performance for applications that may have no more than one -instance on a single host (such as a router daemon), by eliminating +instance on a single host (such as a routing daemon), by eliminating the overhead of receiving their own transmissions. It should generally not be used by applications for which there may be more than one instance on a single host (such as a conferencing program) or for which the sender does not belong to the destination group (such as a time querying program). .Pp +The sysctl setting +.Va net.inet.ip.mcast.loop +controls the default setting of the +.Dv IP_MULTICAST_LOOP +socket option for new sockets. +.Pp A multicast datagram sent with an initial TTL greater than 1 may be delivered to the sending host on a different interface from that on which it was sent, if the host belongs to the destination group on that other interface. @@ -485,24 +505,32 @@ .Ed .Pp .Va imr_interface -should be set to -.Dv INADDR_ANY -to choose the default multicast interface, -or the +should be set to the .Tn IP address of a particular multicast-capable interface if the host is multihomed. -.\" TODO: Remove this piece when the RFC 3678 API is implemented and -.\" the RFC 1724 hack is removed. -Since -.Fx 4.4 , +It may be set to +.Dv INADDR_ANY +to choose the default interface, although this is not recommended; +this is considered to be the first interface corresponding +to the default route. +Otherwise, the first multicast-capable interface +configured in the system will be used. +.Pp +Prior to +.Fx 7.0 , if the .Va imr_interface member is within the network range .Li 0.0.0.0/8 , it is treated as an interface index in the system interface MIB, as per the RIP Version 2 MIB Extension (RFC-1724). -.\" TODO: Update this piece when IPv4 source-address selection is implemented. +In versions of +.Fx +since 7.0, this behavior is no longer supported. +Developers should +instead use the RFC 3678 multicast source filter APIs; in particular, +.Dv MCAST_JOIN_GROUP . .Pp Up to .Dv IP_MAX_MEMBERSHIPS @@ -511,24 +539,130 @@ programs running on multihomed hosts may need to join the same group on more than one interface. .Pp +To drop a membership, use: +.Bd -literal +struct ip_mreq mreq; +setsockopt(s, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)); +.Ed +.Pp +where +.Fa mreq +contains the same values as used to add the membership. +Memberships are dropped when the socket is closed or the process exits. +.\" TODO: Update this piece when IPv4 source-address selection is implemented. +.Pp The IGMP protocol uses the primary IP address of the interface as its identifier for group membership. +This is the first IP address configured on the interface. +If this address is removed or changed, the results are +undefined, as the IGMP membership state will then be inconsistent. If multiple IP aliases are configured on the same interface, they will be ignored. +.Pp This shortcoming was addressed in IPv6; MLDv2 requires that the unique link-local address for an interface is used to identify an MLDv2 listener. +.Ss "Source-Specific Multicast Options" +Since +.Fx 8.0 , +the use of Source-Specific Multicast (SSM) is supported. +These extensions require an IGMPv3 multicast router in order to +make best use of them. +If a legacy multicast router is present on the link, +.Fx +will simply downgrade to the version of IGMP spoken by the router, +and the benefits of source filtering on the upstream link +will not be present, although the kernel will continue to +squelch transmissions from blocked sources. +.Pp +Each group membership on a socket now has a filter mode: +.Bl -tag -width MCAST_EXCLUDE +.It Dv MCAST_EXCLUDE +Datagrams sent to this group are accepted, +unless the source is in a list of blocked source addresses. +.It Dv MCAST_INCLUDE +Datagrams sent to this group are accepted +only if the source is in a list of accepted source addresses. +.El +.Pp +Groups joined using the legacy +.Dv IP_ADD_MEMBERSHIP +option are placed in exclusive-mode, +and are able to request that certain sources are blocked or allowed. +This is known as the +.Em delta-based API . .Pp -To drop a membership, use: +To block a multicast source on an existing group membership: .Bd -literal -struct ip_mreq mreq; -setsockopt(s, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq)); +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_BLOCK_SOURCE, &mreqs, sizeof(mreqs)); .Ed .Pp where -.Fa mreq -contains the same values as used to add the membership. -Memberships are dropped when the socket is closed or the process exits. +.Fa mreqs +is the following structure: +.Bd -literal +struct ip_mreq_source { + struct in_addr imr_multiaddr; /* IP multicast address of group */ + struct in_addr imr_sourceaddr; /* IP address of source */ + struct in_addr imr_interface; /* local IP address of interface */ +} +.Ed +.Va imr_sourceaddr +should be set to the address of the source to be blocked. +.Pp +To unblock a multicast source on an existing group: +.Bd -literal +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_UNBLOCK_SOURCE, &mreqs, sizeof(mreqs)); +.Ed +.Pp +The +.Dv IP_BLOCK_SOURCE +and +.Dv IP_UNBLOCK_SOURCE +options are +.Em not permitted +for inclusive-mode group memberships. +.Pp +To join a multicast group in +.Dv MCAST_INCLUDE +mode with a single source, +or add another source to an existing inclusive-mode membership: +.Bd -literal +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_ADD_SOURCE_MEMBERSHIP, &mreqs, sizeof(mreqs)); +.Ed +.Pp +To leave a single source from an existing group in inclusive mode: +.Bd -literal +struct ip_mreq_source mreqs; +setsockopt(s, IPPROTO_IP, IP_DROP_SOURCE_MEMBERSHIP, &mreqs, sizeof(mreqs)); +.Ed +If this is the last accepted source for the group, the membership +will be dropped. +.Pp +The +.Dv IP_ADD_SOURCE_MEMBERSHIP +and +.Dv IP_DROP_SOURCE_MEMBERSHIP +options are +.Em not accepted +for exclusive-mode group memberships. +However, both exclusive and inclusive mode memberships +support the use of the +.Em full-state API +documented in RFC 3678. +For management of source filter lists using this API, +please refer to +.Xr sourcefilter 3 . +.Pp +The sysctl settings +.Va net.inet.ip.mcast.maxsocksrc +and +.Va net.inet.ip.mcast.maxgrpsrc +are used to specify an upper limit on the number of per-socket and per-group +source filter entries which the kernel may allocate. .\"----------------------- .Ss "Raw IP Sockets" .Pp @@ -674,9 +808,19 @@ .Xr send 2 , .Xr byteorder 3 , .Xr icmp 4 , +.Xr igmp 4 , .Xr inet 4 , .Xr intro 4 , -.Xr multicast 4 +.Xr multicast 4 , +.Xr sourcefilter 3 +.Rs +.%A D. Thaler +.%A B. Fenner +.%A B. Quinn +.%T "Socket Interface Extensions for Multicast Source Filters" +.%N RFC 3678 +.%D Jan 2004 +.Re .Sh HISTORY The .Nm ==== //depot/projects/vimage/src/share/man/man4/multicast.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.6 2007/03/18 15:34:57 bms Exp $ +.\" $FreeBSD: src/share/man/man4/multicast.4,v 1.8 2009/03/09 17:53:05 bms Exp $ .\" -.Dd March 18, 2007 +.Dd February 13, 2009 .Dt MULTICAST 4 .Os .\" @@ -954,7 +954,9 @@ .Xr recvmsg 2 , .Xr setsockopt 2 , .Xr socket 2 , +.Xr sourcefilter 3 , .Xr icmp6 4 , +.Xr igmp 4 , .Xr inet 4 , .Xr inet6 4 , .Xr intro 4 , ==== //depot/projects/vimage/src/share/man/man4/txp.4#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/txp.4,v 1.13 2005/11/18 10:52:22 ru Exp $ +.\" $FreeBSD: src/share/man/man4/txp.4,v 1.14 2009/03/12 01:27:15 yongari Exp $ .\" -.Dd July 16, 2005 +.Dd March 12, 2009 .Dt TXP 4 .Os .Sh NAME @@ -134,6 +134,7 @@ 3Com 3cR990B-SRV .El .Sh SEE ALSO +.Xr altq 4 , .Xr arp 4 , .Xr inet 4 , .Xr intro 4 , ==== //depot/projects/vimage/src/share/man/man4/uplcom.4#2 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.17 2008/06/10 19:33:31 imp Exp $ +.\" $FreeBSD: src/share/man/man4/uplcom.4,v 1.18 2009/03/04 03:47:57 thompsa Exp $ .\" .Dd November 22, 2006 .Dt UPLCOM 4 @@ -98,6 +98,8 @@ .It I/O DATA USB-RSAQ3 .It +Mobile Action MA-620 Infrared Adapter +.It PLANEX USB-RS232 URS-03 .It RATOC REX-USB60 ==== //depot/projects/vimage/src/share/man/man5/rc.conf.5#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.356 2009/02/17 11:55:50 mtm Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.357 2009/03/13 07:12:25 brooks Exp $ .\" .Dd January 27, 2009 .Dt RC.CONF 5 @@ -1169,6 +1169,15 @@ .Xr wlan 4 devices must be created for each wireless devices as of .Fx 8.0 . +Debugging flags for +.Xr wlan 4 +devices as set by +.Xr wlandebug 8 +may be specified with an +.Va wlandebug_ Ns Aq Ar interface +variable. +The contents of this variable will be passed directly to +.Xr wlandebug 8 . .Pp If the .Va ifconfig_ Ns Aq Ar interface @@ -4065,6 +4074,7 @@ .Xr sysctl 8 , .Xr syslogd 8 , .Xr timed 8 , +.Xr wlandebug 8 , .Xr yp 8 , .Xr ypbind 8 , .Xr ypserv 8 , ==== //depot/projects/vimage/src/share/man/man7/tuning.7#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.79 2009/01/27 00:23:43 trhodes Exp $ +.\" $FreeBSD: src/share/man/man7/tuning.7,v 1.80 2009/03/09 05:41:04 delphij Exp $ .\" .Dd January 23, 2009 .Dt TUNING 7 @@ -51,7 +51,9 @@ and use any remaining space for .Pa /home . .Pp -You should typically size your swap space to approximately 2x main memory. +You should typically size your swap space to approximately 2x main memory +for systems with less than 2GB of RAM, or approximately 1x main memory +if you have more. If you do not have a lot of RAM, though, you will generally want a lot more swap. It is not recommended that you configure any less than ==== //depot/projects/vimage/src/share/man/man8/diskless.8#2 (text+ko) ==== @@ -24,7 +24,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/share/man/man8/diskless.8,v 1.30 2005/12/30 14:43:31 ceri Exp $ +.\" $FreeBSD: src/share/man/man8/diskless.8,v 1.31 2009/03/13 23:42:34 rwatson Exp $ .\" .Dd December 10, 2005 .Dt DISKLESS 8 @@ -376,7 +376,6 @@ .Bd -literal -offset indent : / nfs ro 0 0 :/usr /usr nfs ro 0 0 -proc /proc procfs rw 0 0 .Ed .Pp You also need to create a customized version of ==== //depot/projects/vimage/src/share/man/man9/VOP_VPTOCNP.9#2 (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. .\" -.\" $FreeBSD: src/share/man/man9/VOP_VPTOCNP.9,v 1.1 2008/12/12 01:08:28 marcus Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_VPTOCNP.9,v 1.2 2009/03/08 19:07:44 marcus Exp $ .\" .Dd December 7, 2008 .Os @@ -57,7 +57,13 @@ .Pp The default implementation of .Nm -simply returns ENOENT. +scans through +.Fa vp Ns 's +parent directory looking for a dirent with a matching file number. If +.Fa vp +is not a directory, then +.Nm +returns ENOENT. .Sh LOCKS The vnode should be locked on entry and will still be locked on exit. The parent directory vnode will be unlocked on a successful exit. However, it ==== //depot/projects/vimage/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); >>> TRUNCATED FOR MAIL (1000 lines) <<< From julian at FreeBSD.org Sat Mar 14 23:49:38 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Sat Mar 14 23:50:40 2009 Subject: PERFORCE change 159230 for review Message-ID: <200903150649.n2F6nbu2055783@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159230 Change 159230 by julian@julian_trafmon1 on 2009/03/15 06:49:03 bring Makefile back from the dead Affected files ... .. //depot/projects/vimage/src/sys/modules/usb/Makefile#7 branch Differences ... From julian at FreeBSD.org Sun Mar 15 00:02:52 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Sun Mar 15 00:02:59 2009 Subject: PERFORCE change 159231 for review Message-ID: <200903150702.n2F72od6058368@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159231 Change 159231 by julian@julian_trafmon1 on 2009/03/15 07:01:51 Resurect more stuff from the dead Affected files ... .. //depot/projects/vimage/src/sys/dev/usb/README.TXT#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/TODO.TXT#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_mbus.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_atmelarm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/image/uscanner.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/ums.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/input/usb_rdesc.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/udbp.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/misc/ufm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_auereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_axereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cdcereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_cuereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kuefw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_kuereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_rue.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_ruereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_udav.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/if_udavreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uchcom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uftdi_reg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/rio500_usb.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_cdce.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_msc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/template/usb_template_mtp.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/ufm_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb.h#7 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_busdma.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_cdc.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_core.h#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_debug.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_defs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_device.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_endian.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_error.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_error.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_generic.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_hub.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_if.m#5 branch .. //depot/projects/vimage/src/sys/dev/usb/usb_ioctl.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_lookup.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mfunc.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_parse.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_pci.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_process.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_process.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_request.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_revision.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_util.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_util.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#45 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbhid.h#5 branch .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumfw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydfw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/wlan/usb_wlan.h#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/dev/usb/README.TXT#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/bluetooth/TODO.TXT#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/bluetooth/ng_ubt_var.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/at91dci.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/at91dci_atmelarm.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/atmegadci_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci_ixp4xx.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci_mbus.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ehci_pci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/musb_otg_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ohci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ohci.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ohci_atmelarm.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/ohci_pci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uhci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uhci.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uhci_pci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/usb_controller.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/controller/uss820dci_atmelarm.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/image/uscanner.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/input/uhid.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/input/ukbd.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/input/ums.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/input/usb_rdesc.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/misc/udbp.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/misc/udbp.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/misc/ufm.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_aue.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_auereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_axe.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_axereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_cdce.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_cdcereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_cue.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_cuereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_kue.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_kuefw.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_kuereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_rue.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_ruereg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_udav.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/if_udavreg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/net/usb_ethernet.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/quirk/usb_quirk.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/u3g.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uark.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ubsa.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ubser.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uchcom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ucycom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ufoma.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uftdi.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uftdi_reg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ugensa.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uipaq.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/ulpt.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/umct.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/umodem.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/umoscom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uplcom.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/usb_serial.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uslcom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uvisor.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/serial/uvscom.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/storage/rio500_usb.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/storage/umass.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/storage/urio.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/storage/ustorage_fs.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template_cdce.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template_msc.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/template/usb_template_mtp.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/ufm_ioctl.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb.h#7 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_bus.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_busdma.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_busdma.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_cdc.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_compat_linux.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_controller.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_core.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_core.h#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_debug.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_debug.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_defs.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_dev.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_dev.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_device.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_device.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_dynamic.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_endian.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_error.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_error.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_generic.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_generic.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_handle_request.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_hid.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_hid.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_hub.c#5 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_hub.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_ioctl.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_lookup.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_lookup.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_mbuf.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_mfunc.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_msctest.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_msctest.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_parse.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_parse.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_pci.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_process.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_process.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_request.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_request.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_revision.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_sw_transfer.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_transfer.c#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_transfer.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_util.c#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usb_util.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/usbdevs#45 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_rum.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumfw.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumreg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_rumvar.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_ural.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralreg.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_uralvar.h#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_zyd.c#4 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydfw.h#2 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/if_zydreg.h#3 (text+ko) ==== ==== //depot/projects/vimage/src/sys/dev/usb/wlan/usb_wlan.h#2 (text+ko) ==== From julian at FreeBSD.org Sun Mar 15 00:04:54 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Sun Mar 15 00:04:59 2009 Subject: PERFORCE change 159232 for review Message-ID: <200903150704.n2F74qOX059381@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159232 Change 159232 by julian@julian_trafmon1 on 2009/03/15 07:04:13 Fix more usb shrapnel Affected files ... .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.h#6 branch .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudio_pcm.c#7 branch .. //depot/projects/vimage/src/sys/dev/sound/usb/uaudioreg.h#5 branch Differences ... ==== //depot/projects/vimage/src/sys/dev/sound/usb/uaudio.c#10 (text+ko) ==== From julian at FreeBSD.org Sun Mar 15 00:43:34 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Sun Mar 15 00:43:40 2009 Subject: PERFORCE change 159233 for review Message-ID: <200903150743.n2F7hWiP062317@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159233 Change 159233 by julian@julian_trafmon1 on 2009/03/15 07:42:35 IFC@159229 Affected files ... .. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_thread.c#21 integrate .. //depot/projects/vimage/src/sys/kern/subr_lock.c#13 integrate .. //depot/projects/vimage/src/sys/sys/lock_profile.h#9 integrate Differences ... ==== //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#14 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.57 2009/03/14 14:08:53 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.58 2009/03/15 06:40:57 imp Exp $"); /* * PCI:PCI bridge support. @@ -413,12 +413,14 @@ } } else { ok = 1; +#if 0 /* * If we overlap with the subtractive range, then * pick the upper range to use. */ if (start < sc->iolimit && end > sc->iobase) start = sc->iolimit + 1; +#endif } if (end < start) { device_printf(dev, "ioport: end (%lx) < start (%lx)\n", @@ -478,6 +480,7 @@ } } else if (!ok) { ok = 1; /* subtractive bridge: always ok */ +#if 0 if (pcib_is_nonprefetch_open(sc)) { if (start < sc->memlimit && end > sc->membase) start = sc->memlimit + 1; @@ -486,6 +489,7 @@ if (start < sc->pmemlimit && end > sc->pmembase) start = sc->pmemlimit + 1; } +#endif } if (end < start) { device_printf(dev, "memory: end (%lx) < start (%lx)\n", ==== //depot/projects/vimage/src/sys/kern/kern_thread.c#21 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_witness.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.282 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.283 2009/03/15 06:41:47 jeff Exp $"); #include #include @@ -306,6 +306,8 @@ void thread_free(struct thread *td) { + + lock_profile_thread_exit(td); if (td->td_cpuset) cpuset_rel(td->td_cpuset); td->td_cpuset = NULL; @@ -439,6 +441,7 @@ /* Wait for any remaining threads to exit cpu_throw(). */ while (p->p_exitthreads) sched_relinquish(curthread); + lock_profile_thread_exit(td); cpuset_rel(td->td_cpuset); td->td_cpuset = NULL; cpu_thread_clean(td); ==== //depot/projects/vimage/src/sys/kern/subr_lock.c#13 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.24 2008/07/27 21:45:20 kmacy Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/subr_lock.c,v 1.25 2009/03/15 06:41:47 jeff Exp $"); #include "opt_ddb.h" #include "opt_mprof.h" @@ -46,9 +46,11 @@ #include #include #include +#include #include #include #include +#include #include #include @@ -186,7 +188,8 @@ struct lock_prof_cpu *lp_cpu[MAXCPU]; -int lock_prof_enable = 0; +volatile int lock_prof_enable = 0; +static volatile int lock_prof_resetting; /* SWAG: sbuf size = avg stat. line size * number of locks */ #define LPROF_SBUF_SIZE 256 * 400 @@ -239,25 +242,77 @@ } SYSINIT(lockprof, SI_SUB_SMP, SI_ORDER_ANY, lock_prof_init, NULL); +/* + * To be certain that lock profiling has idled on all cpus before we + * reset, we schedule the resetting thread on all active cpus. Since + * all operations happen within critical sections we can be sure that + * it is safe to zero the profiling structures. + */ +static void +lock_prof_idle(void) +{ + struct thread *td; + int cpu; + + td = curthread; + thread_lock(td); + for (cpu = 0; cpu <= mp_maxid; cpu++) { + if (CPU_ABSENT(cpu)) + continue; + sched_bind(td, cpu); + } + sched_unbind(td); + thread_unlock(td); +} + +static void +lock_prof_reset_wait(void) +{ + + /* + * Spin relinquishing our cpu so that lock_prof_idle may + * run on it. + */ + while (lock_prof_resetting) + sched_relinquish(curthread); +} + static void lock_prof_reset(void) { struct lock_prof_cpu *lpc; int enabled, i, cpu; + /* + * We not only race with acquiring and releasing locks but also + * thread exit. To be certain that threads exit without valid head + * pointers they must see resetting set before enabled is cleared. + * Otherwise a lock may not be removed from a per-thread list due + * to disabled being set but not wait for reset() to remove it below. + */ + atomic_store_rel_int(&lock_prof_resetting, 1); enabled = lock_prof_enable; lock_prof_enable = 0; - pause("lpreset", hz / 10); + lock_prof_idle(); + /* + * Some objects may have migrated between CPUs. Clear all links + * before we zero the structures. Some items may still be linked + * into per-thread lists as well. + */ for (cpu = 0; cpu <= mp_maxid; cpu++) { lpc = lp_cpu[cpu]; for (i = 0; i < LPROF_CACHE_SIZE; i++) { LIST_REMOVE(&lpc->lpc_types[0].lpt_objs[i], lpo_link); LIST_REMOVE(&lpc->lpc_types[1].lpt_objs[i], lpo_link); } + } + for (cpu = 0; cpu <= mp_maxid; cpu++) { + lpc = lp_cpu[cpu]; bzero(lpc, sizeof(*lpc)); lock_prof_init_type(&lpc->lpc_types[0]); lock_prof_init_type(&lpc->lpc_types[1]); } + atomic_store_rel_int(&lock_prof_resetting, 0); lock_prof_enable = enabled; } @@ -351,7 +406,7 @@ "max", "wait_max", "total", "wait_total", "count", "avg", "wait_avg", "cnt_hold", "cnt_lock", "name"); enabled = lock_prof_enable; lock_prof_enable = 0; - pause("lpreset", hz / 10); + lock_prof_idle(); t = ticks; for (cpu = 0; cpu <= mp_maxid; cpu++) { if (lp_cpu[cpu] == NULL) @@ -461,16 +516,13 @@ if (l->lpo_obj == lo && l->lpo_file == file && l->lpo_line == line) return (l); - critical_enter(); type = &lp_cpu[PCPU_GET(cpuid)]->lpc_types[spin]; l = LIST_FIRST(&type->lpt_lpoalloc); if (l == NULL) { lock_prof_rejected++; - critical_exit(); return (NULL); } LIST_REMOVE(l, lpo_link); - critical_exit(); l->lpo_obj = lo; l->lpo_file = file; l->lpo_line = line; @@ -497,18 +549,49 @@ spin = (LOCK_CLASS(lo)->lc_flags & LC_SPINLOCK) ? 1 : 0; if (spin && lock_prof_skipspin == 1) return; + critical_enter(); + /* Recheck enabled now that we're in a critical section. */ + if (lock_prof_enable == 0) + goto out; l = lock_profile_object_lookup(lo, spin, file, line); if (l == NULL) - return; + goto out; l->lpo_cnt++; if (++l->lpo_ref > 1) - return; + goto out; l->lpo_contest_locking = contested; l->lpo_acqtime = nanoseconds(); if (waittime && (l->lpo_acqtime > waittime)) l->lpo_waittime = l->lpo_acqtime - waittime; else l->lpo_waittime = 0; +out: + critical_exit(); +} + +void +lock_profile_thread_exit(struct thread *td) +{ +#ifdef INVARIANTS + struct lock_profile_object *l; + + MPASS(curthread->td_critnest == 0); +#endif + /* + * If lock profiling was disabled we have to wait for reset to + * clear our pointers before we can exit safely. + */ + lock_prof_reset_wait(); +#ifdef INVARIANTS + LIST_FOREACH(l, &td->td_lprof[0], lpo_link) + printf("thread still holds lock acquired at %s:%d\n", + l->lpo_file, l->lpo_line); + LIST_FOREACH(l, &td->td_lprof[1], lpo_link) + printf("thread still holds lock acquired at %s:%d\n", + l->lpo_file, l->lpo_line); +#endif + MPASS(LIST_FIRST(&td->td_lprof[0]) == NULL); + MPASS(LIST_FIRST(&td->td_lprof[1]) == NULL); } void @@ -521,11 +604,20 @@ struct lpohead *head; int spin; - if (!lock_prof_enable || (lo->lo_flags & LO_NOPROFILE)) + if (lo->lo_flags & LO_NOPROFILE) return; spin = (LOCK_CLASS(lo)->lc_flags & LC_SPINLOCK) ? 1 : 0; head = &curthread->td_lprof[spin]; + if (LIST_FIRST(head) == NULL) + return; critical_enter(); + /* Recheck enabled now that we're in a critical section. */ + if (lock_prof_enable == 0 && lock_prof_resetting == 1) + goto out; + /* + * If lock profiling is not enabled we still want to remove the + * lpo from our queue. + */ LIST_FOREACH(l, head, lpo_link) if (l->lpo_obj == lo) break; ==== //depot/projects/vimage/src/sys/sys/lock_profile.h#9 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/lock_profile.h,v 1.18 2007/12/16 06:07:34 kmacy Exp $ + * $FreeBSD: src/sys/sys/lock_profile.h,v 1.19 2009/03/15 06:41:47 jeff Exp $ */ @@ -43,11 +43,13 @@ u_int64_t nanoseconds(void); #endif -extern int lock_prof_enable; +extern volatile int lock_prof_enable; void lock_profile_obtain_lock_success(struct lock_object *lo, int contested, uint64_t waittime, const char *file, int line); void lock_profile_release_lock(struct lock_object *lo); +void lock_profile_thread_exit(struct thread *td); + static inline void lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested, @@ -61,21 +63,10 @@ #else /* !LOCK_PROFILING */ -static inline void -lock_profile_release_lock(struct lock_object *lo) -{ -} - -static inline void -lock_profile_obtain_lock_failed(struct lock_object *lo, int *contested, uint64_t *waittime) -{ -} - -static inline void -lock_profile_obtain_lock_success(struct lock_object *lo, int contested, uint64_t waittime, - const char *file, int line) -{ -} +#define lock_profile_release_lock(lo) +#define lock_profile_obtain_lock_failed(lo, contested, waittime) +#define lock_profile_obtain_lock_success(lo, contested, waittime, file, line) +#define lock_profile_thread_exit(td) #endif /* !LOCK_PROFILING */ From julian at FreeBSD.org Sun Mar 15 01:05:57 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Sun Mar 15 01:06:03 2009 Subject: PERFORCE change 159234 for review Message-ID: <200903150805.n2F85tgV064888@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159234 Change 159234 by julian@julian_trafmon1 on 2009/03/15 08:05:02 hey presto.. compile! Affected files ... .. //depot/projects/vimage/src/sys/netinet/igmp.c#27 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#20 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#53 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/igmp.c#27 (text+ko) ==== @@ -1132,10 +1132,12 @@ nsrc = ntohs(igmpv3->igmp_numsrc); +#if 0 /* MARKO, what is this? */ SLIST_INIT(&V_router_info_head); +#endif if (!IS_DEFAULT_VNET(curvnet)) - return; + return (retval); /* * Deal with group-specific queries upfront. ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#20 (text+ko) ==== @@ -209,8 +209,7 @@ return (ifp == NULL); } -static struct ifnet * - ip_multicast_if(struct in_addr *a); +static struct ifnet *ip_multicast_if(const struct in_addr *a); /* * Initialize an in_mfilter structure to a known state at t0, t1 @@ -1834,7 +1833,7 @@ ifp = NULL; if (!in_nullhost(ina)) { - ifp = ip_multicast_if(&mreqs.imr_interface); + ifp = ip_multicast_if(&ina); } else { struct route ro; @@ -2895,10 +2894,11 @@ #endif /* KTR */ RB_GENERATE(ip_msource_tree, ip_msource, ims_link, ip_msource_cmp); +/* * following RFC1724 section 3.3, 0.0.0.0/8 is interpreted as interface index. */ static struct ifnet * -ip_multicast_if(struct in_addr *a) +ip_multicast_if(const struct in_addr *a) { INIT_VNET_NET(curvnet); INIT_VNET_INET(curvnet); ==== //depot/projects/vimage/src/sys/netinet/vinet.h#53 (text+ko) ==== @@ -313,7 +313,7 @@ #define V_reply_src VNET_INET(reply_src) #define V_ripcb VNET_INET(ripcb) #define V_ripcbinfo VNET_INET(ripcbinfo) -#define V_router_info_head VNET_INET(router_info_head) +/* #define V_router_info_head VNET_INET(router_info_head) */ #define V_rsvp_on VNET_INET(rsvp_on) #define V_rtq_minreallyold VNET_INET(rtq_minreallyold) #define V_rtq_reallyold VNET_INET(rtq_reallyold) From julian at FreeBSD.org Sun Mar 15 01:24:15 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Sun Mar 15 01:24:23 2009 Subject: PERFORCE change 159237 for review Message-ID: <200903150824.n2F8OD4F066217@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159237 Change 159237 by julian@julian_trafmon1 on 2009/03/15 08:23:28 pretty please let GENERIC compile? Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_lock.c#15 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#14 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#15 integrate Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_lock.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.139 2009/03/14 11:43:02 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_lock.c,v 1.140 2009/03/15 08:03:54 jeff Exp $"); #include #include @@ -333,16 +333,17 @@ const char *wmesg, int pri, int timo, const char *file, int line) { GIANT_DECLARE; - uint64_t waittime; struct lock_class *class; const char *iwmesg; uintptr_t tid, v, x; u_int op; - int contested, error, ipri, itimo, queue, wakeup_swapper; + int error, ipri, itimo, queue, wakeup_swapper; +#ifdef LOCK_PROFILING + uint64_t waittime = 0; + int contested = 0; +#endif - contested = 0; error = 0; - waittime = 0; tid = (uintptr_t)curthread; op = (flags & LK_TYPE_MASK); iwmesg = (wmesg == LK_WMESG_DEFAULT) ? lk->lock_object.lo_name : wmesg; ==== //depot/projects/vimage/src/sys/kern/kern_mutex.c#14 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.208 2009/03/14 11:43:38 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mutex.c,v 1.209 2009/03/15 08:03:54 jeff Exp $"); #include "opt_adaptive_mutexes.h" #include "opt_ddb.h" @@ -254,8 +254,11 @@ int _mtx_trylock(struct mtx *m, int opts, const char *file, int line) { - int rval, contested = 0; +#ifdef LOCK_PROFILING uint64_t waittime = 0; + int contested = 0; +#endif + int rval; MPASS(curthread != NULL); KASSERT(m->mtx_lock != MTX_DESTROYED, @@ -296,15 +299,17 @@ int line) { struct turnstile *ts; + uintptr_t v; #ifdef ADAPTIVE_MUTEXES volatile struct thread *owner; #endif #ifdef KTR int cont_logged = 0; #endif +#ifdef LOCK_PROFILING int contested = 0; uint64_t waittime = 0; - uintptr_t v; +#endif if (mtx_owned(m)) { KASSERT((m->lock_object.lo_flags & LO_RECURSABLE) != 0, @@ -448,8 +453,11 @@ _mtx_lock_spin(struct mtx *m, uintptr_t tid, int opts, const char *file, int line) { - int i = 0, contested = 0; + int i = 0; +#ifdef LOCK_PROFILING + int contested = 0; uint64_t waittime = 0; +#endif if (LOCK_LOG_TEST(&m->lock_object, opts)) CTR1(KTR_LOCK, "_mtx_lock_spin: %p spinning", m); @@ -486,11 +494,13 @@ { struct mtx *m; uintptr_t tid; - int i, contested; - uint64_t waittime; + int i; +#ifdef LOCK_PROFILING + int contested = 0; + uint64_t waittime = 0; +#endif - contested = i = 0; - waittime = 0; + i = 0; tid = (uintptr_t)curthread; for (;;) { retry: ==== //depot/projects/vimage/src/sys/kern/kern_rwlock.c#16 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.43 2009/02/26 15:51:54 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_rwlock.c,v 1.44 2009/03/15 08:03:54 jeff Exp $"); #include "opt_ddb.h" #include "opt_no_adaptive_rwlocks.h" @@ -282,8 +282,10 @@ int spintries = 0; int i; #endif +#ifdef LOCK_PROFILING uint64_t waittime = 0; int contested = 0; +#endif uintptr_t v; KASSERT(rw->rw_lock != RW_DESTROYED, @@ -584,9 +586,11 @@ int spintries = 0; int i; #endif + uintptr_t v, x; +#ifdef LOCK_PROFILING uint64_t waittime = 0; - uintptr_t v, x; int contested = 0; +#endif if (rw_wlocked(rw)) { KASSERT(rw->lock_object.lo_flags & RW_RECURSE, ==== //depot/projects/vimage/src/sys/kern/kern_sx.c#15 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.62 2008/09/10 19:13:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.63 2009/03/15 08:03:54 jeff Exp $"); #include #include @@ -431,9 +431,12 @@ #ifdef ADAPTIVE_SX volatile struct thread *owner; #endif + uintptr_t x; +#ifdef LOCK_PROFILING uint64_t waittime = 0; - uintptr_t x; - int contested = 0, error = 0; + int contested = 0; +#endif + int error = 0; /* If we already hold an exclusive lock, then recurse. */ if (sx_xlocked(sx)) { @@ -652,8 +655,10 @@ #ifdef ADAPTIVE_SX volatile struct thread *owner; #endif +#ifdef LOCK_PROFILING uint64_t waittime = 0; int contested = 0; +#endif uintptr_t x; int error = 0; From hselasky at FreeBSD.org Sun Mar 15 01:38:30 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Sun Mar 15 01:38:37 2009 Subject: PERFORCE change 159238 for review Message-ID: <200903150838.n2F8cSDr067270@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159238 Change 159238 by hselasky@hselasky_laptop001 on 2009/03/15 08:37:29 USB mass storage quirk patches from: Michael Gmelin Affected files ... .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#49 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#3 (text+ko) ==== @@ -609,7 +609,7 @@ }, {USB_VENDOR_MYSON, USB_PRODUCT_MYSON_HEDEN, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, - NO_INQUIRY | IGNORE_RESIDUE + NO_INQUIRY | IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE }, {USB_VENDOR_MYSON, USB_PRODUCT_MYSON_STARREADER, RID_WILDCARD, UMASS_PROTO_SCSI | UMASS_PROTO_BBB, @@ -847,6 +847,10 @@ UMASS_PROTO_SCSI | UMASS_PROTO_BBB, NO_QUIRKS }, + {USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDE, RID_WILDCARD, + UMASS_PROTO_SCSI | UMASS_PROTO_BBB, + NO_INQUIRY | IGNORE_RESIDUE | NO_SYNCHRONIZE_CACHE + }, {USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE, RID_WILDCARD, UMASS_PROTO_SCSI, NO_QUIRKS ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#49 (text+ko) ==== @@ -593,6 +593,7 @@ vendor RALINK 0x148f Ralink Technology vendor IMAGINATION 0x149a Imagination Technologies vendor CONCEPTRONIC2 0x14b2 Conceptronic +vendor SUPERTOP 0x14cd Super Top vendor PLANEX3 0x14ea Planex Communications vendor SILICONPORTALS 0x1527 Silicon Portals vendor UBIQUAM 0x1529 UBIQUAM Co., Ltd. @@ -2313,6 +2314,9 @@ /* XXX The above is a North American PC style keyboard possibly */ product SUN MOUSE 0x0100 Type 6 USB mouse +/* Super Top products */ +product SUPERTOP IDE 0x6600 USB-IDE + /* Supra products */ product DIAMOND2 SUPRAEXPRESS56K 0x07da Supra Express 56K modem product DIAMOND2 SUPRA2890 0x0b4a SupraMax 2890 56K Modem From julian at FreeBSD.org Sun Mar 15 03:20:13 2009 From: julian at FreeBSD.org (Julian Elischer) Date: Sun Mar 15 03:20:20 2009 Subject: PERFORCE change 159240 for review Message-ID: <200903151020.n2FAKB85086611@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159240 Change 159240 by julian@julian_trafmon1 on 2009/03/15 10:19:29 Allow VIMAGE to compile Affected files ... .. //depot/projects/vimage/src/sys/netinet/igmp.c#28 edit .. //depot/projects/vimage/src/sys/netinet/in.c#29 edit .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#21 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#82 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/igmp.c#28 (text+ko) ==== @@ -335,6 +335,7 @@ static int sysctl_igmp_default_version(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error; int new; @@ -374,6 +375,7 @@ static int sysctl_igmp_gsr(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); int error; int i; @@ -415,6 +417,7 @@ sysctl_igmp_ifinfo(SYSCTL_HANDLER_ARGS) { INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); int *name; int error; u_int namelen; @@ -500,6 +503,7 @@ static __inline int igmp_isgroupreported(const struct in_addr addr) { + INIT_VNET_INET(curvnet); if (in_allhosts(addr) || ((!V_igmp_sendlocal && IN_LOCAL_GROUP(ntohl(addr.s_addr))))) @@ -562,6 +566,7 @@ static struct igmp_ifinfo * igi_alloc_locked(/*const*/ struct ifnet *ifp) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi; IGMP_LOCK_ASSERT(); @@ -701,6 +706,7 @@ static void igi_delete_locked(const struct ifnet *ifp) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi, *tigi; CTR3(KTR_IGMPV3, "%s: freeing igmp_ifinfo for ifp %p(%s)", @@ -824,6 +830,7 @@ igmp_input_v2_query(struct ifnet *ifp, const struct ip *ip, const struct igmp *igmp) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma; struct igmp_ifinfo *igi; struct in_multi *inm; @@ -915,6 +922,7 @@ static void igmp_v2_update_group(struct in_multi *inm, const int timer) { + INIT_VNET_INET(curvnet); CTR4(KTR_IGMPV3, "%s: %s/%s timer=%d", __func__, inet_ntoa(inm->inm_addr), inm->inm_ifp->if_xname, timer); @@ -962,6 +970,7 @@ igmp_input_v3_query(struct ifnet *ifp, const struct ip *ip, /*const*/ struct igmpv3 *igmpv3) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi; struct in_multi *inm; uint32_t maxresp, nsrc, qqi; @@ -1106,6 +1115,7 @@ igmp_input_v3_group_query(struct in_multi *inm, struct igmp_ifinfo *igi, int timer, /*const*/ struct igmpv3 *igmpv3) { + INIT_VNET_INET(curvnet); int retval; uint16_t nsrc; @@ -1215,6 +1225,7 @@ igmp_input_v1_report(struct ifnet *ifp, /*const*/ struct ip *ip, /*const*/ struct igmp *igmp) { + INIT_VNET_INET(curvnet); struct in_ifaddr *ia; struct in_multi *inm; @@ -1321,6 +1332,7 @@ igmp_input_v2_report(struct ifnet *ifp, /*const*/ struct ip *ip, /*const*/ struct igmp *igmp) { + INIT_VNET_INET(curvnet); struct in_ifaddr *ia; struct in_multi *inm; @@ -1612,7 +1624,6 @@ VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - INIT_VNET_INET(vnet_iter); igmp_fasttimo_vnet(); CURVNET_RESTORE(); } @@ -1632,6 +1643,7 @@ static void igmp_fasttimo_vnet(void) { + INIT_VNET_INET(curvnet); struct ifqueue scq; /* State-change packets */ struct ifqueue qrq; /* Query response packets */ struct ifnet *ifp; @@ -1758,6 +1770,7 @@ static void igmp_v1v2_process_group_timer(struct in_multi *inm, const int version) { + INIT_VNET_INET(curvnet); int report_timer_expired; IN_MULTI_LOCK_ASSERT(); @@ -1806,6 +1819,7 @@ struct ifqueue *qrq, struct ifqueue *scq, struct in_multi *inm, const int uri_fasthz) { + INIT_VNET_INET(curvnet); int query_response_timer_expired; int state_change_retransmit_timer_expired; @@ -1995,6 +2009,7 @@ static void igmp_v3_cancel_link_timers(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma; struct ifnet *ifp; struct in_multi *inm; @@ -2071,6 +2086,7 @@ igmp_v1v2_process_querier_timers(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); IGMP_LOCK_ASSERT(); if (igi->igi_v1_timer == 0 && igi->igi_v2_timer == 0) { @@ -2152,7 +2168,6 @@ VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); - INIT_VNET_INET(vnet_iter); igmp_slowtimo_vnet(); CURVNET_RESTORE(); } @@ -2168,6 +2183,7 @@ static void igmp_slowtimo_vnet(void) { + INIT_VNET_INET(curvnet); struct igmp_ifinfo *igi; IGMP_LOCK(); @@ -2195,9 +2211,6 @@ IGMP_LOCK_ASSERT(); ifp = inm->inm_ifp; - /* XXX are these needed ? */ - INIT_VNET_NET(ifp->if_vnet); - INIT_VNET_INET(ifp->if_vnet); MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) @@ -2335,6 +2348,7 @@ static int igmp_initial_join(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; struct ifqueue *ifq; int error, retval, syncstates; @@ -2463,6 +2477,7 @@ static int igmp_handle_state_change(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; int retval; @@ -2522,6 +2537,7 @@ static void igmp_final_leave(struct in_multi *inm, struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); int syncstates; syncstates = 1; @@ -3303,6 +3319,7 @@ static void igmp_v3_dispatch_general_query(struct igmp_ifinfo *igi) { + INIT_VNET_INET(curvnet); struct ifmultiaddr *ifma, *tifma; struct ifnet *ifp; struct in_multi *inm; @@ -3388,7 +3405,9 @@ * indexes to guard against interface detach, they are * unique to each VIMAGE and must be retrieved. */ - CURVNET_SET(m->m_pkthdr.header); + CURVNET_SET((struct vnet *)(m->m_pkthdr.header)); + INIT_VNET_INET(curvnet); + INIT_VNET_NET(curvnet); ifindex = igmp_restore_context(m); /* @@ -3471,7 +3490,6 @@ static struct mbuf * igmp_v3_encap_report(struct ifnet *ifp, struct mbuf *m) { - INIT_VNET_NET(curvnet); INIT_VNET_INET(curvnet); struct igmp_report *igmp; struct ip *ip; @@ -3650,14 +3668,28 @@ return (0); } +struct vnet_igmp { + int dummy; +}; +#ifndef VIMAGE +#ifndef VIMAGE_GLOBALS +struct vnet_igmp vnet_igmp_0; +#endif +#endif + +/* XXX VIMAGE [julian] + * BMS seems unsure if this should be a separate module or not as he's + * put the extra fields into vnet_inet instead of a vnet_igmp. + * yet it has module setup functions.. + */ #ifdef VIMAGE static struct vnet_symmap vnet_igmp_symmap[] = { - VNET_SYMMAP(igmp, igi_head), - VNET_SYMMAP(igmp, igmpstat), + VNET_SYMMAP(inet, igi_head), + VNET_SYMMAP(inet, igmpstat), VNET_SYMMAP_END }; VNET_MOD_DECLARE(IGMP, igmp, vnet_igmp_iattach, vnet_igmp_idetach, - vnet_igmp_symmap); + INET, vnet_igmp_symmap); #endif /* VIMAGE */ static int ==== //depot/projects/vimage/src/sys/netinet/in.c#29 (text+ko) ==== @@ -1024,7 +1024,6 @@ static void in_purgemaddrs(struct ifnet *ifp) { - INIT_VNET_INET(ifp->if_vnet); LIST_HEAD(,in_multi) purgeinms; struct in_multi *inm, *tinm; struct ifmultiaddr *ifma; ==== //depot/projects/vimage/src/sys/netinet/in_mcast.c#21 (text+ko) ==== @@ -394,7 +394,6 @@ in_getmulti(struct ifnet *ifp, const struct in_addr *group, struct in_multi **pinm) { - INIT_VNET_INET(ifp->if_vnet); struct sockaddr_in gsin; struct ifmultiaddr *ifma; struct in_ifinfo *ii; @@ -1825,6 +1824,7 @@ inp_lookup_mcast_ifp(const struct inpcb *inp, const struct sockaddr_in *gsin, const struct in_addr ina) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; KASSERT(gsin->sin_family == AF_INET, ("%s: not AF_INET", __func__)); @@ -1870,7 +1870,6 @@ inp_join_group(struct inpcb *inp, struct sockopt *sopt) { INIT_VNET_NET(curvnet); - INIT_VNET_INET(curvnet); struct group_source_req gsr; sockunion_t *gsa, *ssa; struct ifnet *ifp; ==== //depot/projects/vimage/src/sys/sys/vimage.h#82 (text+ko) ==== @@ -181,6 +181,7 @@ #define VNET_MOD_IPX 9 #define VNET_MOD_ATALK 10 #define VNET_MOD_ACCF_HTTP 11 +#define VNET_MOD_IGMP 12 /* stateless modules */ #define VNET_MOD_NG_ETHER 20 #define VNET_MOD_NG_IFACE 21 From hselasky at FreeBSD.org Sun Mar 15 03:36:29 2009 From: hselasky at FreeBSD.org (Hans Petter Selasky) Date: Sun Mar 15 03:36:35 2009 Subject: PERFORCE change 159241 for review Message-ID: <200903151036.n2FAaS9m088024@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159241 Change 159241 by hselasky@hselasky_laptop001 on 2009/03/15 10:35:49 USB ulpt+uscanner fix: - Only send a ZLP before close. Some printers and scanners appear to be choking on force_short_xfer ! - Cleanup usage of dev_ep_index variable. - Make sure that fifo_index does not contain any direction specific bits. Reported by: Alexander Best Affected files ... .. //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.c#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb_dev.h#6 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/image/uscanner.c#4 (text+ko) ==== @@ -149,7 +149,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .mh.bufsize = USCANNER_BSIZE, - .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,.proxy_buffer = 1,.force_short_xfer = 1,}, + .mh.flags = {.pipe_bof = 1,.proxy_buffer = 1,}, .mh.callback = &uscanner_write_callback, }, @@ -578,6 +578,7 @@ USCANNER_IFQ_MAXLEN)) { return (ENOMEM); } + usb2_fifo_set_close_zlp(fifo, 1); } return (0); } ==== //depot/projects/usb/src/sys/dev/usb/serial/ulpt.c#4 (text+ko) ==== @@ -200,7 +200,8 @@ DPRINTF("no FIFO\n"); return; } - DPRINTF("state=0x%x\n", USB_GET_STATE(xfer)); + DPRINTF("state=0x%x actlen=%u\n", + USB_GET_STATE(xfer), xfer->actlen); switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: @@ -208,7 +209,6 @@ tr_setup: if (usb2_fifo_get_data(f, xfer->frbuffers, 0, xfer->max_data_length, &actlen, 0)) { - xfer->frlengths[0] = actlen; usb2_start_hardware(xfer); } @@ -339,7 +339,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .mh.bufsize = ULPT_BSIZE, - .mh.flags = {.pipe_bof = 1,.force_short_xfer = 1,.proxy_buffer = 1}, + .mh.flags = {.pipe_bof = 1,.proxy_buffer = 1}, .mh.callback = &ulpt_write_callback, }, @@ -440,6 +440,7 @@ } /* set which FIFO is opened */ sc->sc_fifo_open[USB_FIFO_TX] = fifo; + usb2_fifo_set_close_zlp(fifo, 1); } sc->sc_fflags |= fflags & (FREAD | FWRITE); return (0); ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.c#9 (text+ko) ==== @@ -161,7 +161,6 @@ { struct usb2_fifo **ppf; struct usb2_fifo *f; - int dev_ep_index; DPRINTFN(2, "usb2_ref_device, cpd=%p need uref=%d\n", cpd, need_uref); @@ -181,7 +180,6 @@ goto error; } /* check if we are doing an open */ - dev_ep_index = cpd->ep_addr; if (cpd->fflags == 0) { /* set defaults */ cpd->txfifo = NULL; @@ -207,11 +205,6 @@ if (f->fs_ep_max != 0) { cpd->is_usbfs = 1; } - /* - * Get real endpoint index associated with - * this FIFO: - */ - dev_ep_index = f->dev_ep_index; } else { cpd->txfifo = NULL; cpd->is_write = 0; /* no ref */ @@ -231,11 +224,6 @@ if (f->fs_ep_max != 0) { cpd->is_usbfs = 1; } - /* - * Get real endpoint index associated with - * this FIFO: - */ - dev_ep_index = f->dev_ep_index; } else { cpd->rxfifo = NULL; cpd->is_read = 0; /* no ref */ @@ -471,7 +459,7 @@ if (no_null == 0) { if (ep >= (USB_EP_MAX / 2)) { /* we don't create any endpoints in this range */ - DPRINTFN(5, "dev_ep_index out of range\n"); + DPRINTFN(5, "ep out of range\n"); return (is_busy ? EBUSY : EINVAL); } } @@ -681,6 +669,9 @@ goto done; } + /* reset short flag before open */ + f->flag_short = 0; + /* call open method */ err = (f->methods->f_open) (f, fflags); if (err) { @@ -893,18 +884,15 @@ usb2_close(void *arg) { struct usb2_cdev_privdata *cpd = arg; - struct usb2_device *udev; int err; - DPRINTFN(2, "usb2_close, cpd=%p\n", cpd); + DPRINTFN(2, "cpd=%p\n", cpd); err = usb2_ref_device(cpd, 1); if (err) { free(cpd, M_USBDEV); return; } - - udev = cpd->udev; if (cpd->fflags & FREAD) { usb2_fifo_close(cpd->rxfifo, cpd->fflags); } @@ -1618,7 +1606,6 @@ /* initialise FIFO structures */ f_tx->fifo_index = n + USB_FIFO_TX; - f_tx->dev_ep_index = (n / 2) + (USB_EP_MAX / 2); f_tx->priv_mtx = priv_mtx; f_tx->priv_sc0 = priv_sc; f_tx->methods = pm; @@ -1626,7 +1613,6 @@ f_tx->udev = udev; f_rx->fifo_index = n + USB_FIFO_RX; - f_rx->dev_ep_index = (n / 2) + (USB_EP_MAX / 2); f_rx->priv_mtx = priv_mtx; f_rx->priv_sc0 = priv_sc; f_rx->methods = pm; @@ -1681,12 +1667,13 @@ pd->bus_index = device_get_unit(udev->bus->bdev); pd->dev_index = udev->device_index; pd->ep_addr = -1; /* not an endpoint */ - pd->fifo_index = f_tx->fifo_index; + pd->fifo_index = f_tx->fifo_index & f_rx->fifo_index; pd->mode = FREAD|FWRITE; /* Now, create the device itself */ f_sc->dev = make_dev(&usb2_devsw, 0, uid, gid, mode, devname); + /* XXX setting si_drv1 and creating the device is not atomic! */ f_sc->dev->si_drv1 = pd; } @@ -1948,6 +1935,13 @@ break; } if (f->flag_flushing) { + /* check if we should send a short packet */ + if (f->flag_short != 0) { + f->flag_short = 0; + tr_data = 1; + break; + } + /* flushing complete */ f->flag_flushing = 0; usb2_fifo_wakeup(f); } @@ -2006,6 +2000,13 @@ break; } if (f->flag_flushing) { + /* check if we should send a short packet */ + if (f->flag_short != 0) { + f->flag_short = 0; + tr_data = 1; + break; + } + /* flushing complete */ f->flag_flushing = 0; usb2_fifo_wakeup(f); } @@ -2185,3 +2186,13 @@ sx_unlock(&usb2_sym_lock); return (error); } + +void +usb2_fifo_set_close_zlp(struct usb2_fifo *f, uint8_t onoff) +{ + if (f == NULL) + return; + + /* send a Zero Length Packet, ZLP, before close */ + f->flag_short = onoff; +} ==== //depot/projects/usb/src/sys/dev/usb/usb_dev.h#6 (text+ko) ==== @@ -195,5 +195,6 @@ void usb2_free_symlink(struct usb2_symlink *ps); int usb2_read_symlink(uint8_t *user_ptr, uint32_t startentry, uint32_t user_len); +void usb2_fifo_set_close_zlp(struct usb2_fifo *, uint8_t); #endif /* _USB2_DEV_H_ */ From zec at FreeBSD.org Sun Mar 15 08:31:31 2009 From: zec at FreeBSD.org (Marko Zec) Date: Sun Mar 15 08:31:38 2009 Subject: PERFORCE change 159248 for review Message-ID: <200903151531.n2FFVT0F025787@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159248 Change 159248 by zec@zec_amdx2 on 2009/03/15 15:31:08 First pass at separating per-vnet initializer functions from existing functions for initializing global state. At this stage, the new initializer functions are directly called from the existing code, which should in most cases result in compiler inlining those new functions, hence yielding a near-zero functional change. Existing initializer functions which are invoked via protosw, like ip_init(), are modified to allow them to be invoked multiple times, i.e. per each vnet. Global state, if any, is initialized only if such functions are called within the context of vnet0 -> IS_DEFAULT_VNET(curvnet) check. While here, V_irtualize a few remaining global UMA zones used by net/netinet/netipsec networking code. While it is not yet clear to me or anybody else whether this is the right thing to do, at this stage this makes the code more readable, and makes it easier to track uncollected UMA-zone-backed objects on vnet removal. In the long run, it's quite possible that some form of shared use of UMA zone pools among multiple vnets should be considered. Affected files ... .. //depot/projects/vimage-commit2/src/sys/net/if.c#36 edit .. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#17 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#19 edit .. //depot/projects/vimage-commit2/src/sys/net/route.c#29 edit .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#27 edit .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#17 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#20 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#28 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#15 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#18 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#41 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#27 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#17 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#24 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#14 edit .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#29 edit .. //depot/projects/vimage/src/sys/net/route.c#41 edit .. //depot/projects/vimage/src/sys/net/vnet.h#21 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/net/if.c#36 (text+ko) ==== @@ -151,6 +151,8 @@ extern void nd6_setmtu(struct ifnet *); #endif +static int vnet_net_iattach(const void *); + #ifdef VIMAGE_GLOBALS struct ifnethead ifnet; /* depend on static init XXX */ struct ifgrouphead ifg_head; @@ -392,24 +394,33 @@ static void if_init(void *dummy __unused) { - INIT_VNET_NET(curvnet); #ifndef VIMAGE_GLOBALS vnet_mod_register(&vnet_net_modinfo); #endif + vnet_net_iattach(NULL); + IFNET_LOCK_INIT(); + ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, + 0600, "network")); + if_clone_init(); +} + +static int +vnet_net_iattach(const void *unused __unused) +{ + INIT_VNET_NET(curvnet); + V_if_index = 0; V_ifindex_table = NULL; V_if_indexlim = 8; - IFNET_LOCK_INIT(); TAILQ_INIT(&V_ifnet); TAILQ_INIT(&V_ifg_head); knlist_init(&V_ifklist, NULL, NULL, NULL, NULL); if_grow(); /* create initial table */ - ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, - 0600, "network")); - if_clone_init(); + + return (0); } static void ==== //depot/projects/vimage-commit2/src/sys/net/if_gif.c#17 (text+ko) ==== @@ -121,6 +121,7 @@ static void gif_start(struct ifnet *); static int gif_clone_create(struct if_clone *, int, caddr_t); static void gif_clone_destroy(struct ifnet *); +static int vnet_gif_iattach(const void *); IFC_SIMPLE_DECLARE(gif, 0); @@ -251,6 +252,26 @@ } static int +vnet_gif_iattach(const void *unused __unused) +{ + INIT_VNET_GIF(curvnet); + + LIST_INIT(&V_gif_softc_list); + V_max_gif_nesting = MAX_GIF_NEST; +#ifdef XBONEHACK + V_parallel_tunnels = 1; +#else + V_parallel_tunnels = 0; +#endif + V_ip_gif_ttl = GIF_TTL; +#ifdef INET6 + V_ip6_gif_hlim = GIF_HLIM; +#endif + + return (0); +} + +static int gifmodevent(mod, type, data) module_t mod; int type; @@ -261,19 +282,7 @@ case MOD_LOAD: mtx_init(&gif_mtx, "gif_mtx", NULL, MTX_DEF); - LIST_INIT(&V_gif_softc_list); - V_max_gif_nesting = MAX_GIF_NEST; -#ifdef XBONEHACK - V_parallel_tunnels = 1; -#else - V_parallel_tunnels = 0; -#endif -#ifdef INET - V_ip_gif_ttl = GIF_TTL; -#endif -#ifdef INET6 - V_ip6_gif_hlim = GIF_HLIM; -#endif + vnet_gif_iattach(NULL); if_clone_attach(&gif_cloner); break; @@ -281,7 +290,7 @@ if_clone_detach(&gif_cloner); mtx_destroy(&gif_mtx); #ifdef INET6 - V_ip6_gif_hlim = 0; + V_ip6_gif_hlim = 0; /* XXX -> vnet_gif_idetach() */ #endif break; default: ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#19 (text+ko) ==== @@ -100,6 +100,7 @@ struct sockaddr *dst, struct rtentry *rt); static int lo_clone_create(struct if_clone *, int, caddr_t); static void lo_clone_destroy(struct ifnet *); +static int vnet_loif_iattach(const void *); #ifdef VIMAGE_GLOBALS struct ifnet *loif; /* Used externally */ @@ -146,6 +147,15 @@ return (0); } +static int vnet_loif_iattach(const void *unused __unused) +{ + INIT_VNET_NET(curvnet); + + V_loif = NULL; + if_clone_attach(&lo_cloner); + return (0); +} + static int loop_modevent(module_t mod, int type, void *data) { @@ -153,8 +163,7 @@ switch (type) { case MOD_LOAD: - V_loif = NULL; - if_clone_attach(&lo_cloner); + vnet_loif_iattach(NULL); break; case MOD_UNLOAD: ==== //depot/projects/vimage-commit2/src/sys/net/route.c#29 (text+ko) ==== @@ -106,6 +106,7 @@ static void rt_maskedcopy(struct sockaddr *, struct sockaddr *, struct sockaddr *); +static int vnet_route_iattach(const void *); /* compare two sockaddr structures */ #define sa_equal(a1, a2) (bcmp((a1), (a2), (a1)->sa_len) == 0) @@ -122,7 +123,9 @@ */ #define RNTORT(p) ((struct rtentry *)(p)) +#ifdef VIMAGE_GLOBALS static uma_zone_t rtzone; /* Routing table UMA zone. */ +#endif #if 0 /* default fib for tunnels to use */ @@ -150,20 +153,26 @@ static void route_init(void) { - INIT_VNET_INET(curvnet); - int table; - struct domain *dom; - int fam; /* whack the tunable ints into line. */ if (rt_numfibs > RT_MAXFIBS) rt_numfibs = RT_MAXFIBS; if (rt_numfibs == 0) rt_numfibs = 1; - rtzone = uma_zcreate("rtentry", sizeof(struct rtentry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); rn_init(); /* initialize all zeroes, all ones, mask table */ + vnet_route_iattach(NULL); +} + +static int vnet_route_iattach(const void *unused __unused) +{ + INIT_VNET_INET(curvnet); + int table; + struct domain *dom; + int fam; + + V_rtzone = uma_zcreate("rtentry", sizeof(struct rtentry), NULL, NULL, + NULL, NULL, UMA_ALIGN_PTR, 0); for (dom = domains; dom; dom = dom->dom_next) { if (dom->dom_rtattach) { for (table = 0; table < rt_numfibs; table++) { @@ -186,6 +195,8 @@ } } } + + return (0); } #ifndef _SYS_SYSPROTO_H_ @@ -402,7 +413,7 @@ * and the rtentry itself of course */ RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); return; } done: @@ -958,7 +969,7 @@ if (info->rti_ifa == NULL && (error = rt_getifa_fib(info, fibnum))) senderr(error); ifa = info->rti_ifa; - rt = uma_zalloc(rtzone, M_NOWAIT | M_ZERO); + rt = uma_zalloc(V_rtzone, M_NOWAIT | M_ZERO); if (rt == NULL) senderr(ENOBUFS); RT_LOCK_INIT(rt); @@ -971,7 +982,7 @@ RT_LOCK(rt); if ((error = rt_setgate(rt, dst, gateway)) != 0) { RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); senderr(error); } @@ -1006,7 +1017,7 @@ } Free(rt_key(rt)); RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); senderr(EEXIST); } #endif @@ -1022,7 +1033,7 @@ IFAFREE(rt->rt_ifa); Free(rt_key(rt)); RT_LOCK_DESTROY(rt); - uma_zfree(rtzone, rt); + uma_zfree(V_rtzone, rt); senderr(EEXIST); } ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#14 (text+ko) ==== @@ -47,6 +47,7 @@ struct rtstat _rtstat; struct radix_node_head *_rt_tables[RT_MAXFIBS][AF_MAX+1]; int _rttrash; + uma_zone_t _rtzone; struct ifnet *_loif; LIST_HEAD(, lo_softc) _lo_list; @@ -86,5 +87,6 @@ #define V_rt_tables VNET_NET(rt_tables) #define V_rtstat VNET_NET(rtstat) #define V_rttrash VNET_NET(rttrash) +#define V_rtzone VNET_NET(rtzone) #endif /* !_NET_VNET_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#27 (text+ko) ==== @@ -110,6 +110,7 @@ "Enable proxy ARP for all suitable requests"); static void arp_init(void); +static int arp_iattach(const void *); void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); static void arpintr(struct mbuf *); @@ -789,8 +790,8 @@ ifa->ifa_rtrequest = NULL; } -static void -arp_init(void) +static int +arp_iattach(const void *unused __unused) { INIT_VNET_INET(curvnet); @@ -799,6 +800,15 @@ V_useloopback = 1; /* use loopback interface for local traffic */ V_arp_proxyall = 0; + return (0); +} + +static void +arp_init(void) +{ + + arp_iattach(NULL); + arpintrq.ifq_maxlen = 50; mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); netisr_register(NETISR_ARP, arpintr, &arpintrq, 0); ==== //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#17 (text+ko) ==== @@ -126,6 +126,11 @@ INIT_VNET_INET(curvnet); struct ipoption *ra; + SLIST_INIT(&V_router_info_head); + + if (!IS_DEFAULT_VNET(curvnet)) + return; + /* * To avoid byte-swapping the same value over and over again. */ @@ -147,7 +152,6 @@ router_alert->m_len = sizeof(ra->ipopt_dst) + ra->ipopt_list[1]; mtx_init(&igmp_mtx, "igmp_mtx", NULL, MTX_DEF); - SLIST_INIT(&V_router_info_head); } static struct router_info * ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#20 (text+ko) ==== @@ -696,6 +696,7 @@ int _fw_debug; /* actually unused */ int _autoinc_step; ipfw_dyn_rule **_ipfw_dyn_v; + uma_zone_t _ipfw_dyn_rule_zone; struct ip_fw_chain _layer3_chain; u_int32_t _dyn_buckets; u_int32_t _curr_dyn_buckets; @@ -740,6 +741,7 @@ #define V_fw_debug VNET_IPFW(fw_debug) #define V_autoinc_step VNET_IPFW(autoinc_step) #define V_ipfw_dyn_v VNET_IPFW(ipfw_dyn_v) +#define V_ipfw_dyn_rule_zone VNET_IPFW(ipfw_dyn_rule_zone) #define V_layer3_chain VNET_IPFW(layer3_chain) #define V_dyn_buckets VNET_IPFW(dyn_buckets) #define V_curr_dyn_buckets VNET_IPFW(curr_dyn_buckets) ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#28 (text+ko) ==== @@ -242,6 +242,7 @@ V_rsvp_on = 0; V_ip_defttl = IPDEFTTL; V_ip_do_randomid = 0; + V_ip_id = time_second & 0xffff; V_ipforwarding = 0; V_ipstealth = 0; V_nipq = 0; /* Total # of reass queues */ @@ -270,6 +271,20 @@ TAILQ_INIT(&V_in_ifaddrhead); V_in_ifaddrhashtbl = hashinit(INADDR_NHASH, M_IFADDR, &V_in_ifaddrhmask); + + /* Initialize IP reassembly queue. */ + for (i = 0; i < IPREASS_NHASH; i++) + TAILQ_INIT(&V_ipq[i]); + V_maxnipq = nmbclusters / 32; + V_maxfragsperpacket = 16; + V_ipq_zone = uma_zcreate("ipq", sizeof(struct ipq), NULL, NULL, NULL, + NULL, UMA_ALIGN_PTR, 0); + maxnipq_update(); + + /* Skip initialization of globals for non-default instances. */ + if (!IS_DEFAULT_VNET(curvnet)) + return; + pr = pffindproto(PF_INET, IPPROTO_RAW, SOCK_RAW); if (pr == NULL) panic("ip_init: PF_INET not found"); @@ -297,16 +312,6 @@ printf("%s: WARNING: unable to register pfil hook, " "error %d\n", __func__, i); - /* Initialize IP reassembly queue. */ - IPQ_LOCK_INIT(); - for (i = 0; i < IPREASS_NHASH; i++) - TAILQ_INIT(&V_ipq[i]); - V_maxnipq = nmbclusters / 32; - V_maxfragsperpacket = 16; - V_ipq_zone = uma_zcreate("ipq", sizeof(struct ipq), NULL, NULL, NULL, - NULL, UMA_ALIGN_PTR, 0); - maxnipq_update(); - /* Start ipport_tick. */ callout_init(&ipport_tick_callout, CALLOUT_MPSAFE); ipport_tick(NULL); @@ -316,7 +321,7 @@ NULL, EVENTHANDLER_PRI_ANY); /* Initialize various other remaining things. */ - V_ip_id = time_second & 0xffff; + IPQ_LOCK_INIT(); ipintrq.ifq_maxlen = ipqmaxlen; mtx_init(&ipintrq.ifq_mtx, "ip_inq", NULL, MTX_DEF); netisr_register(NETISR_IP, ip_input, &ipintrq, 0); ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#15 (text+ko) ==== @@ -108,10 +108,12 @@ INIT_VNET_INET(curvnet); V_tcp_reass_maxseg = nmbclusters / 16; - uma_zone_set_max(tcp_reass_zone, V_tcp_reass_maxseg); + uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg); } +#ifdef VIMAGE_GLOBALS uma_zone_t tcp_reass_zone; +#endif void tcp_reass_init(void) @@ -126,9 +128,9 @@ V_tcp_reass_maxseg = nmbclusters / 16; TUNABLE_INT_FETCH("net.inet.tcp.reass.maxsegments", &V_tcp_reass_maxseg); - tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), + V_tcp_reass_zone = uma_zcreate("tcpreass", sizeof (struct tseg_qent), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(tcp_reass_zone, V_tcp_reass_maxseg); + uma_zone_set_max(V_tcp_reass_zone, V_tcp_reass_maxseg); EVENTHANDLER_REGISTER(nmbclusters_change, tcp_reass_zone_change, NULL, EVENTHANDLER_PRI_ANY); } @@ -180,7 +182,7 @@ * Allocate a new queue entry. If we can't, or hit the zone limit * just drop the pkt. */ - te = uma_zalloc(tcp_reass_zone, M_NOWAIT); + te = uma_zalloc(V_tcp_reass_zone, M_NOWAIT); if (te == NULL) { V_tcpstat.tcps_rcvmemdrop++; m_freem(m); @@ -213,7 +215,7 @@ V_tcpstat.tcps_rcvduppack++; V_tcpstat.tcps_rcvdupbyte += *tlenp; m_freem(m); - uma_zfree(tcp_reass_zone, te); + uma_zfree(V_tcp_reass_zone, te); tp->t_segqlen--; V_tcp_reass_qsize--; /* @@ -250,7 +252,7 @@ nq = LIST_NEXT(q, tqe_q); LIST_REMOVE(q, tqe_q); m_freem(q->tqe_m); - uma_zfree(tcp_reass_zone, q); + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; V_tcp_reass_qsize--; q = nq; @@ -287,7 +289,7 @@ m_freem(q->tqe_m); else sbappendstream_locked(&so->so_rcv, q->tqe_m); - uma_zfree(tcp_reass_zone, q); + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; V_tcp_reass_qsize--; q = nq; ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#18 (text+ko) ==== @@ -123,9 +123,8 @@ #include +#ifdef VIMAGE_GLOBALS extern struct uma_zone *sack_hole_zone; - -#ifdef VIMAGE_GLOBALS int tcp_do_sack; int tcp_sack_maxholes; int tcp_sack_globalmaxholes; @@ -265,7 +264,7 @@ return NULL; } - hole = (struct sackhole *)uma_zalloc(sack_hole_zone, M_NOWAIT); + hole = (struct sackhole *)uma_zalloc(V_sack_hole_zone, M_NOWAIT); if (hole == NULL) return NULL; @@ -287,7 +286,7 @@ { INIT_VNET_INET(tp->t_vnet); - uma_zfree(sack_hole_zone, hole); + uma_zfree(V_sack_hole_zone, hole); tp->snd_numholes--; V_tcp_sack_globalholes--; ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#41 (text+ko) ==== @@ -243,7 +243,9 @@ CTLFLAG_RW, tcp_inflight_stab, 0, "Inflight Algorithm Stabilization 20 = 2 packets"); +#ifdef VIMAGE_GLOBALS uma_zone_t sack_hole_zone; +#endif static struct inpcb *tcp_notify(struct inpcb *, int); static void tcp_isn_tick(void *); @@ -269,7 +271,9 @@ struct tcp_timer tt; }; +#ifdef VIMAGE_GLOBALS static uma_zone_t tcpcb_zone; +#endif MALLOC_DEFINE(M_TCPLOG, "tcplog", "TCP address and flags print buffers"); struct callout isn_callout; static struct mtx isn_mtx; @@ -286,7 +290,7 @@ { uma_zone_set_max(V_tcbinfo.ipi_zone, maxsockets); - uma_zone_set_max(tcpcb_zone, maxsockets); + uma_zone_set_max(V_tcpcb_zone, maxsockets); tcp_tw_zone_change(); } @@ -348,18 +352,7 @@ V_tcp_sack_globalmaxholes = 65536; V_tcp_sack_globalholes = 0; - tcp_delacktime = TCPTV_DELACK; - tcp_keepinit = TCPTV_KEEP_INIT; - tcp_keepidle = TCPTV_KEEP_IDLE; - tcp_keepintvl = TCPTV_KEEPINTVL; - tcp_maxpersistidle = TCPTV_KEEP_IDLE; - tcp_msl = TCPTV_MSL; - tcp_rexmit_min = TCPTV_MIN; - if (tcp_rexmit_min < 1) - tcp_rexmit_min = 1; - tcp_rexmit_slop = TCPTV_CPU_VAR; V_tcp_inflight_rttthresh = TCPTV_INFLIGHT_RTTTHRESH; - tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT; TUNABLE_INT_FETCH("net.inet.tcp.sack.enable", &V_tcp_do_sack); @@ -372,7 +365,6 @@ printf("WARNING: TCB hash size not a power of 2\n"); hashsize = 512; /* safe default */ } - tcp_tcbhashsize = hashsize; V_tcbinfo.ipi_hashbase = hashinit(hashsize, M_PCB, &V_tcbinfo.ipi_hashmask); V_tcbinfo.ipi_porthashbase = hashinit(hashsize, M_PCB, @@ -380,6 +372,37 @@ 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); + /* + * These have to be type stable for the benefit of the timers. + */ + V_tcpcb_zone = uma_zcreate("tcpcb", sizeof(struct tcpcb_mem), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + uma_zone_set_max(V_tcpcb_zone, maxsockets); + tcp_tw_init(); + syncache_init(); + tcp_hc_init(); + tcp_reass_init(); + V_sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); + + /* Skip initialization of globals for non-default instances. */ + if (!IS_DEFAULT_VNET(curvnet)) + return; + + /* XXX virtualize those bellow? */ + tcp_delacktime = TCPTV_DELACK; + tcp_keepinit = TCPTV_KEEP_INIT; + tcp_keepidle = TCPTV_KEEP_IDLE; + tcp_keepintvl = TCPTV_KEEPINTVL; + tcp_maxpersistidle = TCPTV_KEEP_IDLE; + tcp_msl = TCPTV_MSL; + tcp_rexmit_min = TCPTV_MIN; + if (tcp_rexmit_min < 1) + tcp_rexmit_min = 1; + tcp_rexmit_slop = TCPTV_CPU_VAR; + tcp_finwait2_timeout = TCPTV_FINWAIT2_TIMEOUT; + tcp_tcbhashsize = hashsize; + #ifdef INET6 #define TCP_MINPROTOHDR (sizeof(struct ip6_hdr) + sizeof(struct tcphdr)) #else /* INET6 */ @@ -390,23 +413,12 @@ if (max_linkhdr + TCP_MINPROTOHDR > MHLEN) panic("tcp_init"); #undef TCP_MINPROTOHDR - /* - * These have to be type stable for the benefit of the timers. - */ - tcpcb_zone = uma_zcreate("tcpcb", sizeof(struct tcpcb_mem), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - uma_zone_set_max(tcpcb_zone, maxsockets); - tcp_tw_init(); - syncache_init(); - tcp_hc_init(); - tcp_reass_init(); + ISN_LOCK_INIT(); callout_init(&isn_callout, CALLOUT_MPSAFE); - tcp_isn_tick(NULL); + callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); EVENTHANDLER_REGISTER(shutdown_pre_sync, tcp_fini, NULL, SHUTDOWN_PRI_DEFAULT); - sack_hole_zone = uma_zcreate("sackhole", sizeof(struct sackhole), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); EVENTHANDLER_REGISTER(maxsockets_change, tcp_zone_change, NULL, EVENTHANDLER_PRI_ANY); } @@ -686,7 +698,7 @@ int isipv6 = (inp->inp_vflag & INP_IPV6) != 0; #endif /* INET6 */ - tm = uma_zalloc(tcpcb_zone, M_NOWAIT | M_ZERO); + tm = uma_zalloc(V_tcpcb_zone, M_NOWAIT | M_ZERO); if (tm == NULL) return (NULL); tp = &tm->tcb; @@ -846,7 +858,7 @@ while ((q = LIST_FIRST(&tp->t_segq)) != NULL) { LIST_REMOVE(q, tqe_q); m_freem(q->tqe_m); - uma_zfree(tcp_reass_zone, q); + uma_zfree(V_tcp_reass_zone, q); tp->t_segqlen--; V_tcp_reass_qsize--; } @@ -856,7 +868,7 @@ tcp_free_sackholes(tp); inp->inp_ppcb = NULL; tp->t_inpcb = NULL; - uma_zfree(tcpcb_zone, tp); + uma_zfree(V_tcpcb_zone, tp); } /* @@ -929,7 +941,7 @@ != NULL) { LIST_REMOVE(te, tqe_q); m_freem(te->tqe_m); - uma_zfree(tcp_reass_zone, te); + uma_zfree(V_tcp_reass_zone, te); tcpb->t_segqlen--; V_tcp_reass_qsize--; } @@ -1546,8 +1558,8 @@ VNET_ITERATOR_DECL(vnet_iter); u_int32_t projected_offset; + VNET_LIST_RLOCK(); ISN_LOCK(); - VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); /* XXX appease INVARIANTS */ INIT_VNET_INET(curvnet); @@ -1560,9 +1572,9 @@ V_isn_offset_old = V_isn_offset; CURVNET_RESTORE(); } + ISN_UNLOCK(); VNET_LIST_RUNLOCK(); callout_reset(&isn_callout, hz/100, tcp_isn_tick, NULL); - ISN_UNLOCK(); } /* ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#19 (text+ko) ==== @@ -94,7 +94,6 @@ #include -static uma_zone_t tcptw_zone; static int maxtcptw; /* @@ -104,6 +103,7 @@ * tcbinfo lock, which must be held over queue iteration and modification. */ #ifdef VIMAGE_GLOBALS +static uma_zone_t tcptw_zone; static TAILQ_HEAD(, tcptw) twq_2msl; int nolocaltimewait; #endif @@ -142,7 +142,7 @@ if (error == 0 && req->newptr) if (new >= 32) { maxtcptw = new; - uma_zone_set_max(tcptw_zone, maxtcptw); + uma_zone_set_max(V_tcptw_zone, maxtcptw); } return (error); } @@ -160,7 +160,7 @@ { if (maxtcptw == 0) - uma_zone_set_max(tcptw_zone, tcptw_auto_size()); + uma_zone_set_max(V_tcptw_zone, tcptw_auto_size()); } void @@ -168,13 +168,13 @@ { INIT_VNET_INET(curvnet); - tcptw_zone = uma_zcreate("tcptw", sizeof(struct tcptw), + V_tcptw_zone = uma_zcreate("tcptw", sizeof(struct tcptw), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); TUNABLE_INT_FETCH("net.inet.tcp.maxtcptw", &maxtcptw); if (maxtcptw == 0) - uma_zone_set_max(tcptw_zone, tcptw_auto_size()); + uma_zone_set_max(V_tcptw_zone, tcptw_auto_size()); else - uma_zone_set_max(tcptw_zone, maxtcptw); + uma_zone_set_max(V_tcptw_zone, maxtcptw); TAILQ_INIT(&V_twq_2msl); } @@ -204,7 +204,7 @@ return; } - tw = uma_zalloc(tcptw_zone, M_NOWAIT); + tw = uma_zalloc(V_tcptw_zone, M_NOWAIT); if (tw == NULL) { tw = tcp_tw_2msl_scan(1); if (tw == NULL) { @@ -477,7 +477,7 @@ tw->tw_cred = NULL; if (reuse) return; - uma_zfree(tcptw_zone, tw); + uma_zfree(V_tcptw_zone, tw); } int ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#27 (text+ko) ==== @@ -86,6 +86,11 @@ struct tcp_hostcache _tcp_hostcache; struct callout _tcp_hc_callout; + uma_zone_t _tcp_reass_zone; + uma_zone_t _tcpcb_zone; + uma_zone_t _tcptw_zone; + uma_zone_t _sack_hole_zone; + struct tcp_syncache _tcp_syncache; int _tcp_syncookies; int _tcp_syncookiesonly; @@ -287,12 +292,15 @@ #define V_rtq_timeout VNET_INET(rtq_timeout) #define V_rtq_timer VNET_INET(rtq_timer) #define V_rtq_toomany VNET_INET(rtq_toomany) +#define V_sack_hole_zone VNET_INET(sack_hole_zone) #define V_sameprefixcarponly VNET_INET(sameprefixcarponly) #define V_ss_fltsz VNET_INET(ss_fltsz) #define V_ss_fltsz_local VNET_INET(ss_fltsz_local) #define V_subnetsarelocal VNET_INET(subnetsarelocal) #define V_tcb VNET_INET(tcb) #define V_tcbinfo VNET_INET(tcbinfo) +#define V_tcpcb_zone VNET_INET(tcpcb_zone) +#define V_tcptw_zone VNET_INET(tcptw_zone) #define V_tcp_abc_l_var VNET_INET(tcp_abc_l_var) #define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) #define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max) @@ -325,6 +333,7 @@ #define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg) #define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) #define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) +#define V_tcp_reass_zone VNET_INET(tcp_reass_zone) #define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes) #define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes) #define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes) ==== //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#17 (text+ko) ==== @@ -109,14 +109,16 @@ { INIT_VNET_INET6(curvnet); + V_ip6q.ip6q_next = V_ip6q.ip6q_prev = &V_ip6q; V_ip6_maxfragpackets = nmbclusters / 4; V_ip6_maxfrags = nmbclusters / 4; + + if (!IS_DEFAULT_VNET(curvnet)) + return; + + IP6Q_LOCK_INIT(); EVENTHANDLER_REGISTER(nmbclusters_change, frag6_change, NULL, EVENTHANDLER_PRI_ANY); - - IP6Q_LOCK_INIT(); - - V_ip6q.ip6q_next = V_ip6q.ip6q_prev = &V_ip6q; } /* ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#19 (text+ko) ==== @@ -920,8 +920,6 @@ void addrsel_policy_init(void) { - ADDRSEL_LOCK_INIT(); - ADDRSEL_SXLOCK_INIT(); INIT_VNET_INET6(curvnet); V_ip6_prefer_tempaddr = 0; @@ -931,6 +929,12 @@ /* initialize the "last resort" policy */ bzero(&V_defaultaddrpolicy, sizeof(V_defaultaddrpolicy)); V_defaultaddrpolicy.label = ADDR_LABEL_NOTAPP; + + if (!IS_DEFAULT_VNET(curvnet)) + return; + + ADDRSEL_LOCK_INIT(); + ADDRSEL_SXLOCK_INIT(); } static struct in6_addrpolicy * ==== //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#24 (text+ko) ==== @@ -234,6 +234,17 @@ /* 40 1K datagrams */ V_dad_init = 0; + scope6_init(); + addrsel_policy_init(); + nd6_init(); + frag6_init(); + + V_ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR; + + /* Skip global initialization stuff for non-default instances. */ + if (!IS_DEFAULT_VNET(curvnet)) + return; + #ifdef DIAGNOSTIC if (sizeof(struct protosw) != sizeof(struct ip6protosw)) panic("sizeof(protosw) != sizeof(ip6protosw)"); @@ -265,18 +276,13 @@ printf("%s: WARNING: unable to register pfil hook, " "error %d\n", __func__, i); - ip6intrq.ifq_maxlen = V_ip6qmaxlen; + ip6intrq.ifq_maxlen = V_ip6qmaxlen; /* XXX */ mtx_init(&ip6intrq.ifq_mtx, "ip6_inq", NULL, MTX_DEF); netisr_register(NETISR_IPV6, ip6_input, &ip6intrq, 0); - scope6_init(); - addrsel_policy_init(); - nd6_init(); - frag6_init(); - V_ip6_desync_factor = arc4random() % MAX_TEMP_DESYNC_FACTOR; } -static void -ip6_init2(void *dummy) +static int +ip6_init2_vnet(const void *unused __unused) { INIT_VNET_INET6(curvnet); @@ -290,6 +296,15 @@ (V_ip6_temp_preferred_lifetime - V_ip6_desync_factor - V_ip6_temp_regen_advance) * hz, in6_tmpaddrtimer, NULL); + + return (0); +} + +static void +ip6_init2(void *dummy) +{ + + ip6_init2_vnet(NULL); } /* cheat */ ==== //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#13 (text+ko) ==== @@ -83,8 +83,12 @@ #else V_ip6_use_defzone = 0; #endif + bzero(&V_sid_default, sizeof(V_sid_default)); + + if (!IS_DEFAULT_VNET(curvnet)) + return; + SCOPE6_LOCK_INIT(); - bzero(&V_sid_default, sizeof(V_sid_default)); } struct scope6_id * ==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#24 (text+ko) ==== @@ -103,6 +103,8 @@ #endif #endif +static int ipsec_iattach(const void *); + #ifdef VIMAGE_GLOBALS /* NB: name changed so netstat doesn't use it. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From zec at FreeBSD.org Sun Mar 15 10:56:23 2009 From: zec at FreeBSD.org (Marko Zec) Date: Sun Mar 15 10:56:34 2009 Subject: PERFORCE change 159253 for review Message-ID: <200903151756.n2FHu3Hf049969@repoman.freebsd.org> http://perforce.freebsd.org/chv.cgi?CH=159253 Change 159253 by zec@zec_amdx2 on 2009/03/15 17:55:11 IFC @ 159251 Affected files ... .. //depot/projects/vimage-commit/src/sys/Makefile#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/amd64_mem.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/busdma_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/cpu_switch.S#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/db_trace.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/exception.S#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/initcpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/intr_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#9 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/DEFAULTS#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#9 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_signal.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/ia32/ia32_sigtramp.S#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/apicreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cpufunc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cputypes.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/elf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/intr_machdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/legacyvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcb.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcpu.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/specialreg.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_locore.s#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_proto.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_syscall.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysent.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/syscalls.master#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_feroceon.S#2 delete .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_sheeva.S#1 branch .. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_trampoline.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/genassym.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/identcpu.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/pmap.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/swtch.S#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/vm_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_mci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmc.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twireg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/files.at91#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_bus_at91usart.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA.hints#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/BWCT#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA#1 branch .. //depot/projects/vimage-commit/src/sys/arm/conf/CAMBRIA.hints#1 branch .. //depot/projects/vimage-commit/src/sys/arm/conf/CRB#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/EP80219#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/GUMSTIX#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/HL200#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/IQ31244#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/KB920X#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/NSLU#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SIMICS#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SKYEYE#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/armreg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/atomic.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/cpufunc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/elf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/ieee.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/intr.h#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/proc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/sysarch.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/common.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/files.mv#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mv_machdep.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/obio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/std.db88f5xxx#2 integrate .. //depot/projects/vimage-commit/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/crb_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/i81342_mcu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_ata.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_led.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/cambria_fled.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/cambria_led.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.avila#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_iic.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_intr.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_mem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_timer.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_wdog.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/std.avila#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/std.ixp435#1 branch .. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/Makefile.inc#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/arm_init.S#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/boot2.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/lib.h#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load.c#3 delete .. //depot/projects/vimage-commit/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/module.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/mips/sysdep.c#1 branch .. //depot/projects/vimage-commit/src/sys/boot/ficl/mips/sysdep.h#1 branch .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.4th#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/pnp.4th#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/support.4th#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0/boot0.S#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot2/boot1.S#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/btx/btx.S#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/btx/btxldr/btxldr.S#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/gptzfsboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bioscd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bootinfo64.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/devicename.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/libi386.h#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/main.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/pxeldr/pxeboot.8#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/zfsboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/common/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/efi/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/ia64/ski/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/pc98/loader/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/ofw/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/uboot/conf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#6 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/common/main.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/devicename.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit.h#4 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_domain.h#1 branch .. //depot/projects/vimage-commit/src/sys/bsm/audit_errno.h#1 branch .. //depot/projects/vimage-commit/src/sys/bsm/audit_internal.h#5 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_kevents.h#5 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_record.h#5 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_socket_type.h#1 branch .. //depot/projects/vimage-commit/src/sys/cam/cam_periph.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_sim.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_sim.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_xpt_sim.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_all.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_cd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ch.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_da.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_low.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_proto.h#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_signal.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/syscalls.master#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#10 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_file.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_getcwd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#10 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#12 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#7 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_stats.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/hal_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/pe_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/resource_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_pe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/winx32_wrap.S#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_misc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#10 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_types.h#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/Makefile.arm#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#11 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#15 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.amd64#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.arm#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#10 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.ia64#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.mips#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.pc98#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.powerpc#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.sparc64#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.sun4v#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/kern.mk#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/kern.post.mk#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/kmod.mk#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/newvers.sh#6 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#10 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.amd64#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.arm#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.i386#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.ia64#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.mips#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.pc98#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#8 integrate .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/COPYRIGHT#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/README#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/ah_desc.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/ah_devid.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/ah_soc.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/alpha-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/alpha-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/alpha-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap30.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap30.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap30.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap43.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap43.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap43.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap51.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap51.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap51.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap61.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap61.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/ap61.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/arm9-le-thumb-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/armv4-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/i386-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/i386-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/i386-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mips1-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-eabi.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/powerpc-le-eabi.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sh4-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sh4-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sh4-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc64-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wackelf.c#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#2 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wisoc.inc#2 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#2 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/x86_64-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/x86_64-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/x86_64-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-be-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-be-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-be-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-le-elf.hal.o.uu#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-le-elf.inc#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/xscale-le-elf.opt_ah.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/version.h#3 delete .. //depot/projects/vimage-commit/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#6 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_if.c#6 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ioctl.c#8 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_subr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_table.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/rdma/rdma_addr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/rdma/rdma_cma.c#5 integrate .. //depot/projects/vimage-commit/src/sys/crypto/rc4/rc4.c#3 integrate .. //depot/projects/vimage-commit/src/sys/crypto/via/padlock.c#6 integrate .. //depot/projects/vimage-commit/src/sys/crypto/via/padlock_hash.c#3 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_expr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac_debug.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac_pci.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aacreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_panasonic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_smbat.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_bus.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_kbd.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_mouse.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adbvar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_intel.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/an/if_an.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/an/if_anreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/arcmsr/arcmsr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/asmc/asmc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-raid-ddf.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-sata.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-acard.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-acerlabs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-ahci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-highpoint.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-intel.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-netcell.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-nvidia.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-serverworks.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-siliconimage.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-sis.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-via.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ah_osdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ah_osdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_debug.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_decode.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_devid.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v1.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v1.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v14.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v14.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v3.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_eeprom_v3.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_internal.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_regdomain.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_soc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_beacon.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_keycache.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_recv.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_xmit.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5k_0007.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_beacon.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_keycache.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_recv.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_xmit.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/boss.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar2316.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar2317.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar2413.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5111.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5112.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_beacon.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_eeprom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_keycache.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_rfgain.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_xmit.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5311reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_eeprom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5312reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_ani.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_beacon.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal_iq.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_eeprom.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_keycache.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_phy.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_power.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_recv.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_xmit.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416desc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416phy.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/amrr/amrr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/onoe/onoe.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/sample/sample.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/sample/sample.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_athioctl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bcefw.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/bm/if_bm.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbus_device.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbusvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ce/if_ce.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_console.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_bus_ixp4xx.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_core.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_dev.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_var.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ciss/ciss.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/cm/smc90cx6.c#3 integrate .. //depot/projects/vimage-commit/src/sy