CVS commit: src/sys/net/npf
Module Name:src
Committed By: uebayasi
Date: Mon Dec 27 14:58:55 UTC 2010
Modified Files:
src/sys/net/npf: npf_ruleset.c
Log Message:
Fix build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/net/npf/npf_ruleset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_ruleset.c
diff -u src/sys/net/npf/npf_ruleset.c:1.4 src/sys/net/npf/npf_ruleset.c:1.5
--- src/sys/net/npf/npf_ruleset.c:1.4 Sat Dec 18 01:07:25 2010
+++ src/sys/net/npf/npf_ruleset.c Mon Dec 27 14:58:55 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ruleset.c,v 1.4 2010/12/18 01:07:25 rmind Exp $ */
+/* $NetBSD: npf_ruleset.c,v 1.5 2010/12/27 14:58:55 uebayasi Exp $ */
/*-
* Copyright (c) 2009-2010 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#ifdef _KERNEL
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_ruleset.c,v 1.4 2010/12/18 01:07:25 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_ruleset.c,v 1.5 2010/12/27 14:58:55 uebayasi Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -276,7 +276,9 @@
{
npf_rule_t *rl;
prop_object_t obj;
+#ifdef DIAGNOSTIC
int errat;
+#endif
/* Allocate a rule structure. */
rl = kmem_alloc(sizeof(npf_rule_t), KM_SLEEP);
CVS commit: src/tests/lib/libc
Module Name:src
Committed By: he
Date: Mon Dec 27 15:10:33 UTC 2010
Modified Files:
src/tests/lib/libc: Makefile
Log Message:
Don't try to build the SSP tests if the target doesn't have SSP.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/lib/libc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/Makefile
diff -u src/tests/lib/libc/Makefile:1.10 src/tests/lib/libc/Makefile:1.11
--- src/tests/lib/libc/Makefile:1.10 Mon Dec 27 02:04:19 2010
+++ src/tests/lib/libc/Makefile Mon Dec 27 15:10:33 2010
@@ -1,8 +1,13 @@
-# $NetBSD: Makefile,v 1.10 2010/12/27 02:04:19 pgoyette Exp $
+# $NetBSD: Makefile,v 1.11 2010/12/27 15:10:33 he Exp $
.include bsd.own.mk
+.include bsd.sys.mk
-TESTS_SUBDIRS+= gen hash ssp stdlib stdio string
+TESTS_SUBDIRS+= gen hash stdlib stdio string
+
+.if ${HAS_SSP} == yes
+TESTS_SUBDIRS+= ssp
+.endif
TESTSDIR= ${TESTSBASE}/lib/libc
CVS commit: src/sys/arch/hp300
Module Name:src Committed By: tsutsui Date: Mon Dec 27 15:23:37 UTC 2010 Modified Files: src/sys/arch/hp300/hp300: genassym.cf locore.s src/sys/arch/hp300/stand/common: srt0.S Log Message: With a quick test, HP9000/362 doesn't seem to have frodo utility chip, so probe code to identify HP362 taken from OpenBSD has never worked. Identify HP362 by probing device IDs of the on-board framebuffer instead. --- NetBSD/hp300 Primary Boot, Revision 1.16 (from NetBSD 5.99.41) HP 9000/362 SPU Enter reset to reset system. Boot: [[[sd0a:]netbsd][-a][-c][-d][-s][-v][-q]] :- 2836828+148212 [343504+216292]=0x361b24 Start @ 0xff003400 [1=0xff2dac50-0x361b24]... Entry point: 0xff003400 Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc. All rights reserved. Copyright (c) 1982, 1986, 1989, 1991, 1993 The Regents of the University of California. All rights reserved. NetBSD 5.99.41 (GENERIC) #135: Mon Dec 27 23:30:21 JST 2010 tsut...@mirage:/usr/src/sys/arch/hp300/compile/GENERIC HP 9000/362 (25MHz MC68030 CPU+MMU, 25MHz MC68882 FPU) total memory = 16372 KB avail memory = 11480 KB : To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/arch/hp300/hp300/genassym.cf cvs rdiff -u -r1.155 -r1.156 src/sys/arch/hp300/hp300/locore.s cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp300/stand/common/srt0.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hp300/hp300/genassym.cf diff -u src/sys/arch/hp300/hp300/genassym.cf:1.42 src/sys/arch/hp300/hp300/genassym.cf:1.43 --- src/sys/arch/hp300/hp300/genassym.cf:1.42 Mon Dec 20 00:25:33 2010 +++ src/sys/arch/hp300/hp300/genassym.cf Mon Dec 27 15:23:36 2010 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.42 2010/12/20 00:25:33 matt Exp $ +# $NetBSD: genassym.cf,v 1.43 2010/12/27 15:23:36 tsutsui Exp $ # # Copyright (c) 1982, 1990, 1993 @@ -58,6 +58,8 @@ include machine/pte.h include hp300/dev/intioreg.h +include hp300/dev/dioreg.h +include hp300/dev/diodevs.h include hp300/hp300/clockreg.h # values for mmutype @@ -257,8 +259,11 @@ define CLKMSB1 CLKMSB1 define CLKMSB3 CLKMSB3 -# frodo utility chip address (to identify HP362) -define FRODO_BASE FRODO_BASE +# DIO macro (to identify HP362) +define DIOII_BASE DIOII_BASE +define DIO_IDOFF DIO_IDOFF +define DIO_SECIDOFF DIO_SECIDOFF +define DIO_DEVICE_ID_FRAMEBUFFER DIO_DEVICE_ID_FRAMEBUFFER # SVR4 binary compatibility ifdef COMPAT_SVR4 Index: src/sys/arch/hp300/hp300/locore.s diff -u src/sys/arch/hp300/hp300/locore.s:1.155 src/sys/arch/hp300/hp300/locore.s:1.156 --- src/sys/arch/hp300/hp300/locore.s:1.155 Mon Dec 20 00:25:33 2010 +++ src/sys/arch/hp300/hp300/locore.s Mon Dec 27 15:23:36 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.155 2010/12/20 00:25:33 matt Exp $ */ +/* $NetBSD: locore.s,v 1.156 2010/12/27 15:23:36 tsutsui Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -251,14 +251,20 @@ Lisa36x: /* * If we found a 360, we need to check for a 362 (neither the 360 - * nor the 362 have a nonzero mmuid). Since the 362 has a frodo - * utility chip in the DIO hole, check for it. + * nor the 362 have a nonzero mmuid). Identify 362 by checking + * on-board VRX framebuffer which has secid 0x11 at dio scode 132. */ - movl #(INTIOBASE + FRODO_BASE),%a0 + movl #DIOII_BASE,%a0 | probe dio scode 132 ASRELOC(phys_badaddr,%a3) jbsr %a3@ - tstl %d0 | found a frodo? - jne Lstart1 | no, really a 360 + tstl %d0 | device at scode 132? + jne Lstart1 | no, not 362, assume 360 + movb %a0@(DIO_IDOFF),%d0 + cmpb #DIO_DEVICE_ID_FRAMEBUFFER,%d0 | framebuffer? + jne Lstart1 | no, not 362, assume 360 + movb %a0@(DIO_SECIDOFF),%d0 + cmpb #0x11,%d0 | VRX sti on 362? + jne Lstart1 | no, not 362, assume 360 RELOC(machineid,%a0) movl #HP_362,%a0@ jra Lstart1 Index: src/sys/arch/hp300/stand/common/srt0.S diff -u src/sys/arch/hp300/stand/common/srt0.S:1.15 src/sys/arch/hp300/stand/common/srt0.S:1.16 --- src/sys/arch/hp300/stand/common/srt0.S:1.15 Thu Jul 20 13:21:38 2006 +++ src/sys/arch/hp300/stand/common/srt0.S Mon Dec 27 15:23:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.S,v 1.15 2006/07/20 13:21:38 tsutsui Exp $ */ +/* $NetBSD: srt0.S,v 1.16 2010/12/27 15:23:37 tsutsui Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -183,11 +183,18 @@ movl #HP_400,%a0@ /* must be a 400 */ jra ihpibcheck isa36x: - movl #0x41c000,%...@- /* check (INTIOBASE + FRODO_BASE) */ + movl #0x0100,%...@- /* check DIOII_BASE (scode 132) */ jbsr _C_LABEL(badaddr) addql #4,%sp tstl %d0 - jne ihpibcheck + jne ihpibcheck /* no device, assume 360 */ + movl #0x0100,%a0 + movb %a0@(0x01),%d0 /* check device ID at DIO_IDOFF */ + cmpb #0x39,%d0 /* framebuffer? */ + jne ihpibcheck /* no, assume 360 */ + movb %a0@(0x15),%d0 /* check sec ID at DIO_SECIDOFF */ + cmpb
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: njoly
Date: Mon Dec 27 15:24:13 UTC 2010
Modified Files:
src/tests/lib/libc/gen: t_siginfo.c
Log Message:
Do use integer arithmetics to generate FPE_INTDIV in sigfpe_int testcase.
Ok pgoyette.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/gen/t_siginfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_siginfo.c
diff -u src/tests/lib/libc/gen/t_siginfo.c:1.3 src/tests/lib/libc/gen/t_siginfo.c:1.4
--- src/tests/lib/libc/gen/t_siginfo.c:1.3 Sun Dec 26 12:32:28 2010
+++ src/tests/lib/libc/gen/t_siginfo.c Mon Dec 27 15:24:13 2010
@@ -333,7 +333,7 @@
ATF_TC_BODY(sigfpe_int, tc)
{
struct sigaction sa;
- double d = strtod(0, NULL);
+ long l = strtol(0, NULL, 10);
sa.sa_flags = SA_SIGINFO;
sa.sa_sigaction = sigfpe_int_action;
@@ -342,7 +342,7 @@
#ifndef __vax__
fpsetmask(FP_X_INV|FP_X_DZ|FP_X_OFL|FP_X_UFL|FP_X_IMP);
#endif
- printf(%g\n, 1 / d);
+ printf(%ld\n, 1 / l);
if (intdiv_signalled == 0)
atf_tc_fail(FPE signal handler was not invoked);
}
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: njoly Date: Mon Dec 27 15:31:23 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Remove unneeded t_ssp.debug entry. To generate a diff of this commit: cvs rdiff -u -r1.192 -r1.193 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.192 src/distrib/sets/lists/tests/mi:1.193 --- src/distrib/sets/lists/tests/mi:1.192 Mon Dec 27 02:04:18 2010 +++ src/distrib/sets/lists/tests/mi Mon Dec 27 15:31:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.192 2010/12/27 02:04:18 pgoyette Exp $ +# $NetBSD: mi,v 1.193 2010/12/27 15:31:22 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -342,7 +342,6 @@ ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_strncpy.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_vsnprintf.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/ssp/h_vsprintf.debug tests-lib-debug debug,atf -./usr/libdata/debug/usr/tests/lib/libc/ssp/t_ssp.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdiotests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_fmemopen.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdio/t_format.debug tests-lib-debug debug,atf
CVS commit: src/sys/arch
Module Name:src Committed By: tsutsui Date: Mon Dec 27 15:39:07 UTC 2010 Modified Files: src/sys/arch/cesfic/cesfic: locore.s src/sys/arch/hp300/hp300: locore.s src/sys/arch/next68k/next68k: locore.s src/sys/arch/x68k/x68k: locore.s Log Message: Fix typo (and pasted lines). From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/cesfic/cesfic/locore.s cvs rdiff -u -r1.156 -r1.157 src/sys/arch/hp300/hp300/locore.s cvs rdiff -u -r1.57 -r1.58 src/sys/arch/next68k/next68k/locore.s cvs rdiff -u -r1.99 -r1.100 src/sys/arch/x68k/x68k/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/cesfic/cesfic/locore.s diff -u src/sys/arch/cesfic/cesfic/locore.s:1.24 src/sys/arch/cesfic/cesfic/locore.s:1.25 --- src/sys/arch/cesfic/cesfic/locore.s:1.24 Mon Dec 20 00:25:30 2010 +++ src/sys/arch/cesfic/cesfic/locore.s Mon Dec 27 15:39:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.24 2010/12/20 00:25:30 matt Exp $ */ +/* $NetBSD: locore.s,v 1.25 2010/12/27 15:39:07 tsutsui Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -1077,7 +1077,7 @@ /* * _delay(u_int N) * - * Delay for at least (N/256) microsecends. + * Delay for at least (N/256) microseconds. * This routine depends on the variable: delay_divisor * which should be set based on the CPU clock rate. */ Index: src/sys/arch/hp300/hp300/locore.s diff -u src/sys/arch/hp300/hp300/locore.s:1.156 src/sys/arch/hp300/hp300/locore.s:1.157 --- src/sys/arch/hp300/hp300/locore.s:1.156 Mon Dec 27 15:23:36 2010 +++ src/sys/arch/hp300/hp300/locore.s Mon Dec 27 15:39:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.156 2010/12/27 15:23:36 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.157 2010/12/27 15:39:07 tsutsui Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -1343,7 +1343,7 @@ /* * _delay(u_int N) * - * Delay for at least (N/256) microsecends. + * Delay for at least (N/256) microseconds. * This routine depends on the variable: delay_divisor * which should be set based on the CPU clock rate. */ Index: src/sys/arch/next68k/next68k/locore.s diff -u src/sys/arch/next68k/next68k/locore.s:1.57 src/sys/arch/next68k/next68k/locore.s:1.58 --- src/sys/arch/next68k/next68k/locore.s:1.57 Mon Dec 20 00:25:40 2010 +++ src/sys/arch/next68k/next68k/locore.s Mon Dec 27 15:39:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.57 2010/12/20 00:25:40 matt Exp $ */ +/* $NetBSD: locore.s,v 1.58 2010/12/27 15:39:07 tsutsui Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell @@ -1248,7 +1248,7 @@ /* * _delay(u_int N) * - * Delay for at least (N/256) microsecends. + * Delay for at least (N/256) microseconds. * This routine depends on the variable: delay_divisor * which should be set based on the CPU clock rate. */ Index: src/sys/arch/x68k/x68k/locore.s diff -u src/sys/arch/x68k/x68k/locore.s:1.99 src/sys/arch/x68k/x68k/locore.s:1.100 --- src/sys/arch/x68k/x68k/locore.s:1.99 Mon Dec 20 00:25:46 2010 +++ src/sys/arch/x68k/x68k/locore.s Mon Dec 27 15:39:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.99 2010/12/20 00:25:46 matt Exp $ */ +/* $NetBSD: locore.s,v 1.100 2010/12/27 15:39:07 tsutsui Exp $ */ /* * Copyright (c) 1980, 1990, 1993 @@ -1122,7 +1122,7 @@ /* * _delay(u_int N) * - * Delay for at least (N/256) microsecends. + * Delay for at least (N/256) microseconds. * This routine depends on the variable: delay_divisor * which should be set based on the CPU clock rate. */
CVS commit: xsrc/external/mit/xf86-video-intel/dist/src
Module Name:xsrc
Committed By: christos
Date: Mon Dec 27 15:40:21 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-intel/dist/src: i965_render.c
Log Message:
XXX: Fix crash with Firefox, where drawable is NULL.
There must be a better fix for this.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c:1.1.1.2 xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c:1.1.1.2 Mon Jun 8 22:54:33 2009
+++ xsrc/external/mit/xf86-video-intel/dist/src/i965_render.c Mon Dec 27 10:40:21 2010
@@ -183,6 +183,8 @@
static Bool i965_check_composite_texture(PicturePtr pPict, int unit)
{
+if (pPict-pDrawable == NULL)
+ return FALSE;
ScrnInfoPtr pScrn = xf86Screens[pPict-pDrawable-pScreen-myNum];
int w = pPict-pDrawable-width;
int h = pPict-pDrawable-height;
CVS commit: src/sys/modules
Module Name:src
Committed By: jmcneill
Date: Mon Dec 27 15:43:41 UTC 2010
Added Files:
src/sys/modules/au8522: Makefile
src/sys/modules/auvitek: Makefile auvitek.ioconf
src/sys/modules/xc5k: Makefile
Log Message:
xc5k, au8522, and auvitek modules
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/modules/au8522/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/auvitek/Makefile \
src/sys/modules/auvitek/auvitek.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/modules/xc5k/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/modules/au8522/Makefile
diff -u /dev/null src/sys/modules/au8522/Makefile:1.1
--- /dev/null Mon Dec 27 15:43:41 2010
+++ src/sys/modules/au8522/Makefile Mon Dec 27 15:43:41 2010
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2010/12/27 15:43:41 jmcneill Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/dev/i2c
+
+KMOD= au8522
+SRCS= au8522.c
+
+WARNS= 4
+
+.include bsd.kmodule.mk
Index: src/sys/modules/auvitek/Makefile
diff -u /dev/null src/sys/modules/auvitek/Makefile:1.1
--- /dev/null Mon Dec 27 15:43:41 2010
+++ src/sys/modules/auvitek/Makefile Mon Dec 27 15:43:41 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/12/27 15:43:41 jmcneill Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/dev/usb
+
+KMOD= auvitek
+IOCONF= auvitek.ioconf
+SRCS= auvitek.c auvitek_audio.c auvitek_board.c auvitek_i2c.c auvitek_video.c
+
+WARNS= 4
+
+.include bsd.kmodule.mk
Index: src/sys/modules/auvitek/auvitek.ioconf
diff -u /dev/null src/sys/modules/auvitek/auvitek.ioconf:1.1
--- /dev/null Mon Dec 27 15:43:41 2010
+++ src/sys/modules/auvitek/auvitek.ioconf Mon Dec 27 15:43:41 2010
@@ -0,0 +1,10 @@
+# $NetBSD: auvitek.ioconf,v 1.1 2010/12/27 15:43:41 jmcneill Exp $
+
+ioconf auvitek
+
+include conf/files
+include dev/usb/files.usb
+
+pseudo-root uhub*
+
+auvitek* at uhub?
Index: src/sys/modules/xc5k/Makefile
diff -u /dev/null src/sys/modules/xc5k/Makefile:1.1
--- /dev/null Mon Dec 27 15:43:41 2010
+++ src/sys/modules/xc5k/Makefile Mon Dec 27 15:43:41 2010
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2010/12/27 15:43:41 jmcneill Exp $
+
+.include ../Makefile.inc
+
+.PATH: ${S}/dev/i2c
+
+KMOD= xc5k
+SRCS= xc5k.c
+
+WARNS= 4
+
+.include bsd.kmodule.mk
CVS commit: src
Module Name:src Committed By: jmcneill Date: Mon Dec 27 15:48:29 UTC 2010 Modified Files: src/distrib/sets/lists/modules: mi src/sys/modules: Makefile Log Message: hook xc5k, au8522, and auvitek into build To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.54 -r1.55 src/sys/modules/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.18 src/distrib/sets/lists/modules/mi:1.19 --- src/distrib/sets/lists/modules/mi:1.18 Tue Oct 19 11:58:00 2010 +++ src/distrib/sets/lists/modules/mi Mon Dec 27 15:48:28 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.18 2010/10/19 11:58:00 pgoyette Exp $ +# $NetBSD: mi,v 1.19 2010/12/27 15:48:28 jmcneill Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -14,6 +14,10 @@ ./@MODULEDIR@/adosfs/adosfs.kmod base-kernel-modules kmod ./@MODULEDIR@/aiobase-kernel-modules kmod ./@MODULEDIR@/aio/aio.kmod base-kernel-modules kmod +./@MODULEDIR@/au8522base-kernel-modules kmod +./@MODULEDIR@/au8522/au8522.kmod base-kernel-modules kmod +./@MODULEDIR@/auvitekbase-kernel-modules kmod +./@MODULEDIR@/auvitek/auvitek.kmod base-kernel-modules kmod ./@MODULEDIR@/bpfbase-kernel-modules kmod ./@MODULEDIR@/bpf/bpf.kmod base-kernel-modules kmod ./@MODULEDIR@/cd9660base-kernel-modules kmod @@ -134,5 +138,7 @@ ./@MODULEDIR@/usbverbose/usbverbose.kmod base-kernel-modules kmod ./@MODULEDIR@/vnd base-kernel-modules kmod ./@MODULEDIR@/vnd/vnd.kmod base-kernel-modules kmod +./@MODULEDIR@/xc5kbase-kernel-modules kmod +./@MODULEDIR@/xc5k/xc5k.kmod base-kernel-modules kmod ./@MODULEDIR@/zfsbase-kernel-modules kmod,zfs ./@MODULEDIR@/zfs/zfs.kmod base-kernel-modules kmod,zfs Index: src/sys/modules/Makefile diff -u src/sys/modules/Makefile:1.54 src/sys/modules/Makefile:1.55 --- src/sys/modules/Makefile:1.54 Tue Oct 26 05:42:51 2010 +++ src/sys/modules/Makefile Mon Dec 27 15:48:28 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2010/10/26 05:42:51 jruoho Exp $ +# $NetBSD: Makefile,v 1.55 2010/12/27 15:48:28 jmcneill Exp $ .include bsd.own.mk @@ -8,6 +8,8 @@ SUBDIR+= accf_httpready SUBDIR+= adosfs SUBDIR+= aio +SUBDIR+= au8522 +SUBDIR+= auvitek SUBDIR+= bpf SUBDIR+= cd9660 SUBDIR+= coda @@ -60,6 +62,7 @@ SUBDIR+= union SUBDIR+= usbverbose SUBDIR+= vnd +SUBDIR+= xc5k SUBDIR+= tprof .if (defined(NOTYET)) SUBDIR+= unionfs
CVS commit: src/sys/arch
Module Name:src Committed By: jmcneill Date: Mon Dec 27 15:56:50 UTC 2010 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: GENERIC Log Message: add 'uaudio* at usbifif?' so uaudio can attach to something other than a hub To generate a diff of this commit: cvs rdiff -u -r1.293 -r1.294 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1001 -r1.1002 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.293 src/sys/arch/amd64/conf/GENERIC:1.294 --- src/sys/arch/amd64/conf/GENERIC:1.293 Sat Nov 27 20:19:41 2010 +++ src/sys/arch/amd64/conf/GENERIC Mon Dec 27 15:56:50 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.293 2010/11/27 20:19:41 christos Exp $ +# $NetBSD: GENERIC,v 1.294 2010/12/27 15:56:50 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.293 $ +#ident GENERIC-$Revision: 1.294 $ maxusers 64 # estimated number of users @@ -843,6 +843,7 @@ # USB audio uaudio* at uhub? port ? configuration ? +uaudio* at usbifif? # USB MIDI umidi* at uhub? port ? configuration ? Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1001 src/sys/arch/i386/conf/GENERIC:1.1002 --- src/sys/arch/i386/conf/GENERIC:1.1001 Sat Nov 27 20:18:46 2010 +++ src/sys/arch/i386/conf/GENERIC Mon Dec 27 15:56:50 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1001 2010/11/27 20:18:46 christos Exp $ +# $NetBSD: GENERIC,v 1.1002 2010/12/27 15:56:50 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1001 $ +#ident GENERIC-$Revision: 1.1002 $ maxusers 64 # estimated number of users @@ -1186,6 +1186,7 @@ # USB audio uaudio* at uhub? port ? configuration ? +uaudio* at usbifif? # USB MIDI umidi* at uhub? port ? configuration ?
CVS commit: src/usr.bin/find
Module Name:src
Committed By: christos
Date: Mon Dec 27 16:09:46 UTC 2010
Modified Files:
src/usr.bin/find: find.c
Log Message:
The SIGINFO changes made the sigprocmask syscalls dominate all the rest:
- Don't bother dealing with signal masks if we are not connected to a tty.
- Compute the blocking mask only once.
- Only do the block-unblock game only when we are going to do something
(execute, print a warning, etc.)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/find/find.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/find/find.c
diff -u src/usr.bin/find/find.c:1.25 src/usr.bin/find/find.c:1.26
--- src/usr.bin/find/find.c:1.25 Tue Sep 25 00:10:12 2007
+++ src/usr.bin/find/find.c Mon Dec 27 11:09:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: find.c,v 1.25 2007/09/25 04:10:12 lukem Exp $ */
+/* $NetBSD: find.c,v 1.26 2010/12/27 16:09:46 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = from: @(#)find.c 8.5 (Berkeley) 8/5/94;
#else
-__RCSID($NetBSD: find.c,v 1.25 2007/09/25 04:10:12 lukem Exp $);
+__RCSID($NetBSD: find.c,v 1.26 2010/12/27 16:09:46 christos Exp $);
#endif
#endif /* not lint */
@@ -51,14 +51,13 @@
#include stdio.h
#include string.h
#include stdlib.h
+#include stdbool.h
+#include unistd.h
#include find.h
static int ftscompare(const FTSENT **, const FTSENT **);
-static void sig_lock(sigset_t *);
-static void sig_unlock(const sigset_t *);
-
/*
* find_formplan --
* process the command line and create a plan corresponding to the
@@ -154,20 +153,33 @@
return (strcoll((*e1)-fts_name, (*e2)-fts_name));
}
-static void
-sig_lock(sigset_t *s)
+static sigset_t ss;
+static bool notty;
+
+static __inline void
+sig_init(void)
{
- sigset_t new;
+ notty = !(isatty(STDIN_FILENO) || isatty(STDOUT_FILENO) ||
+ isatty(STDERR_FILENO));
+ if (notty)
+ return;
+ sigemptyset(ss);
+ sigaddset(ss, SIGINFO); /* block SIGINFO */
+}
- sigemptyset(new);
- sigaddset(new, SIGINFO); /* block SIGINFO */
- sigprocmask(SIG_BLOCK, new, s);
+static __inline void
+sig_lock(sigset_t *s)
+{
+ if (notty)
+ return;
+ sigprocmask(SIG_BLOCK, ss, s);
}
-static void
+static __inline void
sig_unlock(const sigset_t *s)
{
-
+ if (notty)
+ return;
sigprocmask(SIG_SETMASK, s, NULL);
}
@@ -191,9 +203,9 @@
if (!(tree = fts_open(paths, ftsoptions, issort ? ftscompare : NULL)))
err(1, ftsopen);
+ sig_init();
sig_lock(s);
- for (rval = 0; cval (g_entry = fts_read(tree)) != NULL; sig_lock(s)) {
- sig_unlock(s);
+ for (rval = 0; cval (g_entry = fts_read(tree)) != NULL;) {
switch (g_entry-fts_info) {
case FTS_D:
if (isdepth)
@@ -206,17 +218,21 @@
case FTS_DNR:
case FTS_ERR:
case FTS_NS:
+ sig_unlock(s);
(void)fflush(stdout);
warnx(%s: %s,
g_entry-fts_path, strerror(g_entry-fts_errno));
rval = 1;
+ sig_lock(s);
continue;
}
#define BADCH \t\n\\'\
if (isxargs strpbrk(g_entry-fts_path, BADCH)) {
+ sig_unlock(s);
(void)fflush(stdout);
warnx(%s: illegal path, g_entry-fts_path);
rval = 1;
+ sig_lock(s);
continue;
}
@@ -225,11 +241,13 @@
* false or all have been executed. This is where we do all
* the work specified by the user on the command line.
*/
+ sig_unlock(s);
for (p = plan; p (p-eval)(p, g_entry); p = p-next)
if (p-type == N_EXIT) {
rval = p-exit_val;
cval = 0;
}
+ sig_lock(s);
}
sig_unlock(s);
CVS commit: src
Module Name:src Committed By: jmcneill Date: Mon Dec 27 17:26:58 UTC 2010 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Added Files: src/share/man/man4: auvitek.4 Log Message: add auvitek(4) man page To generate a diff of this commit: cvs rdiff -u -r1.1270 -r1.1271 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.539 -r1.540 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/auvitek.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1270 src/distrib/sets/lists/man/mi:1.1271 --- src/distrib/sets/lists/man/mi:1.1270 Sun Dec 26 11:31:45 2010 +++ src/distrib/sets/lists/man/mi Mon Dec 27 17:26:57 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1270 2010/12/26 11:31:45 jmcneill Exp $ +# $NetBSD: mi,v 1.1271 2010/12/27 17:26:57 jmcneill Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -803,6 +803,7 @@ ./usr/share/man/cat4/auixp.0 man-sys-catman .cat ./usr/share/man/cat4/autri.0 man-sys-catman .cat ./usr/share/man/cat4/auvia.0 man-sys-catman .cat +./usr/share/man/cat4/auvitek.0 man-sys-catman .cat ./usr/share/man/cat4/awi.0 man-sys-catman .cat ./usr/share/man/cat4/axe.0 man-sys-catman .cat ./usr/share/man/cat4/az.0 man-sys-catman .cat @@ -3530,6 +3531,7 @@ ./usr/share/man/html4/auixp.html man-sys-htmlman html ./usr/share/man/html4/autri.html man-sys-htmlman html ./usr/share/man/html4/auvia.html man-sys-htmlman html +./usr/share/man/html4/auvitek.html man-sys-htmlman html ./usr/share/man/html4/awi.html man-sys-htmlman html ./usr/share/man/html4/axe.html man-sys-htmlman html ./usr/share/man/html4/az.html man-sys-htmlman html @@ -6029,6 +6031,7 @@ ./usr/share/man/man4/auixp.4 man-sys-man .man ./usr/share/man/man4/autri.4 man-sys-man .man ./usr/share/man/man4/auvia.4 man-sys-man .man +./usr/share/man/man4/auvitek.4 man-sys-man .man ./usr/share/man/man4/awi.4 man-sys-man .man ./usr/share/man/man4/axe.4 man-sys-man .man ./usr/share/man/man4/az.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.539 src/share/man/man4/Makefile:1.540 --- src/share/man/man4/Makefile:1.539 Tue Dec 14 16:18:15 2010 +++ src/share/man/man4/Makefile Mon Dec 27 17:26:58 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.539 2010/12/14 16:18:15 jruoho Exp $ +# $NetBSD: Makefile,v 1.540 2010/12/27 17:26:58 jmcneill Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -10,7 +10,7 @@ an.4 arcmsr.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \ ath.4 atphy.4 atppc.4 attimer.4 atw.4 \ auacer.4 audio.4 audiocs.4 auich.4 \ - auixp.4 autri.4 auvia.4 awi.4 azalia.4 \ + auixp.4 autri.4 auvia.4 auvitek.4 awi.4 azalia.4 \ battery_pmu.4 bba.4 bce.4 bcsp.4 be.4 bge.4 bnx.4 bha.4 \ bio.4 bktr.4 bluetooth.4 bmtphy.4 bpf.4 \ brgphy.4 bridge.4 bthidev.4 bthub.4 btkbd.4 \ Added files: Index: src/share/man/man4/auvitek.4 diff -u /dev/null src/share/man/man4/auvitek.4:1.1 --- /dev/null Mon Dec 27 17:26:58 2010 +++ src/share/man/man4/auvitek.4 Mon Dec 27 17:26:58 2010 @@ -0,0 +1,90 @@ +.\ $NetBSD: auvitek.4,v 1.1 2010/12/27 17:26:58 jmcneill Exp $ +.\ +.\ Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Neither the name of the author nor the names of any +.\contributors may be used to endorse or promote products derived +.\from this software without specific prior written permission. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS +.\ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\ POSSIBILITY OF SUCH DAMAGE. +.\ +.Dd December 27, 2010 +.Dt AUVITEK 4 +.Os +.Sh NAME +.Nm auvitek +.Nd Auvitek AU0828 video capture device driver +.Sh SYNOPSIS +.Cd auvitek* at uhub? +.Cd video* at videobus? +.Cd uaudio* at auvitek? +.Cd audio* at uaudio?
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Dec 27 18:22:30 UTC 2010 Modified Files: src/share/man/man4: auvitek.4 Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/auvitek.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/auvitek.4 diff -u src/share/man/man4/auvitek.4:1.1 src/share/man/man4/auvitek.4:1.2 --- src/share/man/man4/auvitek.4:1.1 Mon Dec 27 17:26:58 2010 +++ src/share/man/man4/auvitek.4 Mon Dec 27 18:22:30 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: auvitek.4,v 1.1 2010/12/27 17:26:58 jmcneill Exp $ +.\ $NetBSD: auvitek.4,v 1.2 2010/12/27 18:22:30 wiz Exp $ .\ .\ Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca .\ All rights reserved. @@ -28,7 +28,7 @@ .Dt AUVITEK 4 .Os .Sh NAME -.Nm auvitek +.Nm auvitek .Nd Auvitek AU0828 video capture device driver .Sh SYNOPSIS .Cd auvitek* at uhub?
CVS commit: src/sys/dev
Module Name:src Committed By: hannken Date: Mon Dec 27 18:41:07 UTC 2010 Modified Files: src/sys/dev: fss.c Log Message: Remove an always true if-clause. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/dev/fss.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/fss.c diff -u src/sys/dev/fss.c:1.71 src/sys/dev/fss.c:1.72 --- src/sys/dev/fss.c:1.71 Fri Nov 19 06:44:39 2010 +++ src/sys/dev/fss.c Mon Dec 27 18:41:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: fss.c,v 1.71 2010/11/19 06:44:39 dholland Exp $ */ +/* $NetBSD: fss.c,v 1.72 2010/12/27 18:41:07 hannken Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.71 2010/11/19 06:44:39 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.72 2010/12/27 18:41:07 hannken Exp $); #include sys/param.h #include sys/systm.h @@ -796,9 +796,7 @@ microtime(sc-sc_time); - if (error == 0) - error = fscow_establish(sc-sc_mount, - fss_copy_on_write, sc); + error = fscow_establish(sc-sc_mount, fss_copy_on_write, sc); if (error == 0) sc-sc_flags |= FSS_ACTIVE;
CVS commit: src/sys
Module Name:src
Committed By: hannken
Date: Mon Dec 27 18:49:42 UTC 2010
Modified Files:
src/sys/fs/msdosfs: msdosfs_vfsops.c
src/sys/miscfs/genfs: genfs_vnops.c
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
Extend the range of fstrans transactions to a sequence of vnode operations
on a locked vnode. This leaves a suspended file system and therefore a
snapshot with either all or no operations of such a sequence done.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/fs/msdosfs/msdosfs_vfsops.c
cvs rdiff -u -r1.185 -r1.186 src/sys/miscfs/genfs/genfs_vnops.c
cvs rdiff -u -r1.262 -r1.263 src/sys/ufs/ffs/ffs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.88 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.89
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.88 Tue Dec 14 17:17:02 2010
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Mon Dec 27 18:49:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.88 2010/12/14 17:17:02 hannken Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.89 2010/12/27 18:49:42 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.88 2010/12/14 17:17:02 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.89 2010/12/27 18:49:42 hannken Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -938,8 +938,7 @@
struct vnode *vp, *mvp;
struct denode *dep;
struct msdosfsmount *pmp = VFSTOMSDOSFS(mp);
- int lk_flags, error, allerror = 0;
- bool is_suspending;
+ int error, allerror = 0;
/*
* If we ever switch to not updating all of the fats all the time,
@@ -956,15 +955,6 @@
if ((mvp = vnalloc(mp)) == NULL)
return ENOMEM;
fstrans_start(mp, FSTRANS_SHARED);
- is_suspending = (fstrans_getstate(mp) == FSTRANS_SUSPENDING);
- /*
- * We can't lock vnodes while the file system is suspending because
- * threads waiting on fstrans may have locked vnodes.
- */
- if (is_suspending)
- lk_flags = 0;
- else
- lk_flags = LK_EXCLUSIVE | LK_NOWAIT;
/*
* Write back each (modified) denode.
*/
@@ -985,7 +975,7 @@
continue;
}
mutex_exit(mntvnode_lock);
- error = vget(vp, lk_flags);
+ error = vget(vp, LK_EXCLUSIVE | LK_NOWAIT);
if (error) {
mutex_enter(mntvnode_lock);
if (error == ENOENT) {
@@ -997,10 +987,7 @@
if ((error = VOP_FSYNC(vp, cred,
waitfor == MNT_WAIT ? FSYNC_WAIT : 0, 0, 0)) != 0)
allerror = error;
- if (is_suspending)
- vrele(vp);
- else
- vput(vp);
+ vput(vp);
mutex_enter(mntvnode_lock);
}
mutex_exit(mntvnode_lock);
Index: src/sys/miscfs/genfs/genfs_vnops.c
diff -u src/sys/miscfs/genfs/genfs_vnops.c:1.185 src/sys/miscfs/genfs/genfs_vnops.c:1.186
--- src/sys/miscfs/genfs/genfs_vnops.c:1.185 Tue Nov 30 10:43:05 2010
+++ src/sys/miscfs/genfs/genfs_vnops.c Mon Dec 27 18:49:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_vnops.c,v 1.185 2010/11/30 10:43:05 dholland Exp $ */
+/* $NetBSD: genfs_vnops.c,v 1.186 2010/12/27 18:49:42 hannken Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -57,13 +57,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfs_vnops.c,v 1.185 2010/11/30 10:43:05 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfs_vnops.c,v 1.186 2010/12/27 18:49:42 hannken Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/proc.h
#include sys/kernel.h
#include sys/mount.h
+#include sys/fstrans.h
#include sys/namei.h
#include sys/vnode.h
#include sys/fcntl.h
@@ -293,10 +294,17 @@
KASSERT((flags ~(LK_EXCLUSIVE | LK_SHARED | LK_NOWAIT)) == 0);
op = ((flags LK_EXCLUSIVE) != 0 ? RW_WRITER : RW_READER);
+ if ((flags LK_NOWAIT) != 0) {
+ if (fstrans_start_nowait(vp-v_mount, FSTRANS_SHARED))
+ return EBUSY;
+ if (! rw_tryenter(vp-v_lock, op)) {
+ fstrans_done(vp-v_mount);
+ return EBUSY;
+ }
+ return 0;
+ }
- if ((flags LK_NOWAIT) != 0)
- return (rw_tryenter(vp-v_lock, op) ? 0 : EBUSY);
-
+ fstrans_start(vp-v_mount, FSTRANS_SHARED);
rw_enter(vp-v_lock, op);
return 0;
@@ -314,6 +322,7 @@
struct vnode *vp = ap-a_vp;
rw_exit(vp-v_lock);
+ fstrans_done(vp-v_mount);
return 0;
}
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.262 src/sys/ufs/ffs/ffs_vfsops.c:1.263
--- src/sys/ufs/ffs/ffs_vfsops.c:1.262 Mon Aug 9 17:12:18 2010
+++ src/sys/ufs/ffs/ffs_vfsops.c Mon Dec 27 18:49:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.262 2010/08/09 17:12:18 pooka Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.263 2010/12/27 18:49:42 hannken Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.262 2010/08/09 17:12:18 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: phx
Date: Mon Dec 27 19:02:33 UTC 2010
Modified Files:
src/sys/dev/pci: pccbb.c
Log Message:
Add TI PCI1510.
Enable TI12XX PCI interrupt in MFUNC when MFUNC pin0 and pin1 are zero.
Ignore the other pins, which may be non-zero (e.g. IRQSER in pin3).
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/dev/pci/pccbb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pccbb.c
diff -u src/sys/dev/pci/pccbb.c:1.199 src/sys/dev/pci/pccbb.c:1.200
--- src/sys/dev/pci/pccbb.c:1.199 Tue Apr 20 23:39:10 2010
+++ src/sys/dev/pci/pccbb.c Mon Dec 27 19:02:32 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pccbb.c,v 1.199 2010/04/20 23:39:10 dyoung Exp $ */
+/* $NetBSD: pccbb.c,v 1.200 2010/12/27 19:02:32 phx Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.199 2010/04/20 23:39:10 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: pccbb.c,v 1.200 2010/12/27 19:02:32 phx Exp $);
/*
#define CBB_DEBUG
@@ -278,6 +278,8 @@
PCCBB_PCMCIA_IO_RELOC | PCCBB_PCMCIA_MEM_32},
{ MAKEID(PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1451), CB_TI12XX,
PCCBB_PCMCIA_IO_RELOC | PCCBB_PCMCIA_MEM_32},
+ { MAKEID(PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1510), CB_TI12XX,
+ PCCBB_PCMCIA_IO_RELOC | PCCBB_PCMCIA_MEM_32},
{ MAKEID(PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1520), CB_TI12XX,
PCCBB_PCMCIA_IO_RELOC | PCCBB_PCMCIA_MEM_32},
{ MAKEID(PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI4410YENTA), CB_TI12XX,
@@ -836,14 +838,16 @@
* The TI125X parts have a different register.
*/
mfunc = pci_conf_read(pc, tag, PCI12XX_MFUNC);
- if (mfunc == 0) {
- mfunc = ~PCI12XX_MFUNC_PIN0;
+ if ((mfunc (PCI12XX_MFUNC_PIN0 | PCI12XX_MFUNC_PIN1)) == 0) {
+ /* Enable PCI interrupt /INTA */
mfunc |= PCI12XX_MFUNC_PIN0_INTA;
+
+ /* XXX this is TI1520 only */
if ((pci_conf_read(pc, tag, PCI_SYSCTRL)
- PCI12XX_SYSCTRL_INTRTIE) == 0) {
-mfunc = ~PCI12XX_MFUNC_PIN1;
+ PCI12XX_SYSCTRL_INTRTIE) == 0)
+/* Enable PCI interrupt /INTB */
mfunc |= PCI12XX_MFUNC_PIN1_INTB;
- }
+
pci_conf_write(pc, tag, PCI12XX_MFUNC, mfunc);
}
/* fallthrough */
CVS commit: src
Module Name:src
Committed By: pgoyette
Date: Mon Dec 27 19:35:31 UTC 2010
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/lib/libc: Makefile
Added Files:
src/tests/lib/libc/setjmp: Makefile t_setjmp.c
Log Message:
Move the various setjmp tests from regress to atf
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.8 -r1.9 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.11 -r1.12 src/tests/lib/libc/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/setjmp/Makefile \
src/tests/lib/libc/setjmp/t_setjmp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.193 src/distrib/sets/lists/tests/mi:1.194
--- src/distrib/sets/lists/tests/mi:1.193 Mon Dec 27 15:31:22 2010
+++ src/distrib/sets/lists/tests/mi Mon Dec 27 19:35:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.193 2010/12/27 15:31:22 njoly Exp $
+# $NetBSD: mi,v 1.194 2010/12/27 19:35:31 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -324,6 +324,8 @@
./usr/libdata/debug/usr/tests/lib/libc/gen/t_siginfo.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/hashtests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/hash/t_sha2.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/setjmptests-lib-debug
+./usr/libdata/debug/usr/tests/lib/libc/setjmp/t_setjmp.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/ssptests-lib-debug
./usr/libdata/debug/usr/tests/lib/libc/ssp/h_fgets.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/ssp/h_getcwd.debug tests-lib-debug debug,atf
@@ -1576,6 +1578,9 @@
./usr/tests/lib/libc/stdlib/t_environment_pth tests-lib-tests atf
./usr/tests/lib/libc/stdlib/t_mi_vector_hash tests-lib-tests atf
./usr/tests/lib/libc/stdlib/t_strtox tests-lib-tests atf
+./usr/tests/lib/libc/setjmp tests-lib-tests
+./usr/tests/lib/libc/setjmp/Atffile tests-lib-tests atf
+./usr/tests/lib/libc/setjmp/t_setjmp tests-lib-tests atf
./usr/tests/lib/libc/ssp tests-lib-tests
./usr/tests/lib/libc/ssp/Atffile tests-lib-tests atf
./usr/tests/lib/libc/ssp/h_fgets tests-lib-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.8 src/etc/mtree/NetBSD.dist.tests:1.9
--- src/etc/mtree/NetBSD.dist.tests:1.8 Mon Dec 27 02:04:19 2010
+++ src/etc/mtree/NetBSD.dist.tests Mon Dec 27 19:35:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.8 2010/12/27 02:04:19 pgoyette Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.9 2010/12/27 19:35:31 pgoyette Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -47,6 +47,7 @@
./usr/libdata/debug/usr/tests/lib/libc
./usr/libdata/debug/usr/tests/lib/libc/gen
./usr/libdata/debug/usr/tests/lib/libc/hash
+./usr/libdata/debug/usr/tests/lib/libc/setjmp
./usr/libdata/debug/usr/tests/lib/libc/ssp
./usr/libdata/debug/usr/tests/lib/libc/stdio
./usr/libdata/debug/usr/tests/lib/libc/stdlib
@@ -141,6 +142,7 @@
./usr/tests/lib/libc
./usr/tests/lib/libc/gen
./usr/tests/lib/libc/hash
+./usr/tests/lib/libc/setjmp
./usr/tests/lib/libc/ssp
./usr/tests/lib/libc/stdio
./usr/tests/lib/libc/stdlib
Index: src/tests/lib/libc/Makefile
diff -u src/tests/lib/libc/Makefile:1.11 src/tests/lib/libc/Makefile:1.12
--- src/tests/lib/libc/Makefile:1.11 Mon Dec 27 15:10:33 2010
+++ src/tests/lib/libc/Makefile Mon Dec 27 19:35:30 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2010/12/27 15:10:33 he Exp $
+# $NetBSD: Makefile,v 1.12 2010/12/27 19:35:30 pgoyette Exp $
.include bsd.own.mk
.include bsd.sys.mk
-TESTS_SUBDIRS+= gen hash stdlib stdio string
+TESTS_SUBDIRS+= gen hash setjmp stdlib stdio string
.if ${HAS_SSP} == yes
TESTS_SUBDIRS+= ssp
Added files:
Index: src/tests/lib/libc/setjmp/Makefile
diff -u /dev/null src/tests/lib/libc/setjmp/Makefile:1.1
--- /dev/null Mon Dec 27 19:35:31 2010
+++ src/tests/lib/libc/setjmp/Makefile Mon Dec 27 19:35:31 2010
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2010/12/27 19:35:31 pgoyette Exp $
+
+NOMAN= # defined
+
+.include bsd.own.mk
+
+WARNS= 4
+
+TESTSDIR= ${TESTSBASE}/lib/libc/setjmp
+
+TESTS_C+= t_setjmp
+
+.include bsd.test.mk
Index: src/tests/lib/libc/setjmp/t_setjmp.c
diff -u /dev/null src/tests/lib/libc/setjmp/t_setjmp.c:1.1
--- /dev/null Mon Dec 27 19:35:31 2010
+++ src/tests/lib/libc/setjmp/t_setjmp.c Mon Dec 27 19:35:31 2010
@@ -0,0 +1,196 @@
+/* $NetBSD: t_setjmp.c,v 1.1 2010/12/27 19:35:31 pgoyette Exp $ */
+
+/*-
+ * Copyright (c) 2008 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1.
CVS commit: src/regress/lib/libc
Module Name:src
Committed By: pgoyette
Date: Mon Dec 27 19:39:10 UTC 2010
Modified Files:
src/regress/lib/libc: Makefile
Removed Files:
src/regress/lib/libc/_setjmp: Makefile
src/regress/lib/libc/setjmp: Makefile jmptest.c
src/regress/lib/libc/sigsetjmp: Makefile
Log Message:
The *setjmp tests have moved to atf
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/regress/lib/libc/Makefile
cvs rdiff -u -r1.7 -r0 src/regress/lib/libc/_setjmp/Makefile
cvs rdiff -u -r1.7 -r0 src/regress/lib/libc/setjmp/Makefile
cvs rdiff -u -r1.8 -r0 src/regress/lib/libc/setjmp/jmptest.c
cvs rdiff -u -r1.7 -r0 src/regress/lib/libc/sigsetjmp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/regress/lib/libc/Makefile
diff -u src/regress/lib/libc/Makefile:1.63 src/regress/lib/libc/Makefile:1.64
--- src/regress/lib/libc/Makefile:1.63 Sun Dec 26 13:38:08 2010
+++ src/regress/lib/libc/Makefile Mon Dec 27 19:39:09 2010
@@ -1,16 +1,12 @@
-# $NetBSD: Makefile,v 1.63 2010/12/26 13:38:08 pgoyette Exp $
+# $NetBSD: Makefile,v 1.64 2010/12/27 19:39:09 pgoyette Exp $
-SUBDIR+= _setjmp atexit citrus clone context convfp db \
+SUBDIR+= atexit citrus clone context convfp db \
divrem gen gdtoa getaddrinfo hsearch inet int_fmtio locale md5sha \
- nsdispatch pty randomid regex rpc servent setjmp sigsetjmp \
- stdlib strptime sys time
+ nsdispatch pty randomid regex rpc servent stdlib strptime sys time
.include bsd.own.mk
.include bsd.sys.mk
-.if defined(USE_SSP) (${USE_SSP} == yes)
-SUBDIR+= ssp
-.endif
.if (${MACHINE_ARCH} != vax ${MACHINE_ARCH} != m68000)
SUBDIR+= ieeefp
.endif
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Mon Dec 27 19:48:02 UTC 2010 Modified Files: src/doc: 3RDPARTY Log Message: byacc-20101226 out. To generate a diff of this commit: cvs rdiff -u -r1.798 -r1.799 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.798 src/doc/3RDPARTY:1.799 --- src/doc/3RDPARTY:1.798 Sat Dec 25 12:12:49 2010 +++ src/doc/3RDPARTY Mon Dec 27 19:48:02 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.798 2010/12/25 12:12:49 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.799 2010/12/27 19:48:02 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -167,7 +167,7 @@ Package: byacc Version: 20101127 -Current Vers: 20101127 +Current Vers: 20101226 Maintainer: Thomas Dickey dic...@invisible-island.net Archive Site: http://www.invisible-island.net/byacc/byacc.html Home Page: http://www.invisible-island.net/byacc/byacc.html
CVS commit: src/external/bsd/atf/dist/atf-sh
Module Name:src
Committed By: jmmv
Date: Mon Dec 27 20:36:17 UTC 2010
Modified Files:
src/external/bsd/atf/dist/atf-sh: atf-check.cpp
Log Message:
Pull up revision 869e092e4986eb5dce90331ca9a64e125d7796eb from mainstream:
Revision: 869e092e4986eb5dce90331ca9a64e125d7796eb
Parent: cca40eb08e7469dfe9d6ca982613458f24c1de28
Author: j...@netbsd.org
Date: 12/27/10 21:19:19
Branch: org.NetBSD.atf.src
Changelog:
Recognize sigabrt in the signal checker
Problem found by Paul Goyette.
Changes against parent cca40eb08e7469dfe9d6ca982613458f24c1de28
patched atf-sh/atf-check.cpp
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/dist/atf-sh/atf-check.cpp
diff -u src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.3 src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.4
--- src/external/bsd/atf/dist/atf-sh/atf-check.cpp:1.3 Mon Dec 6 18:04:02 2010
+++ src/external/bsd/atf/dist/atf-sh/atf-check.cpp Mon Dec 27 20:36:17 2010
@@ -184,6 +184,7 @@
{ int, SIGINT },
{ quit, SIGQUIT },
{ trap, SIGTRAP },
+{ abrt, SIGABRT },
{ kill, SIGKILL },
{ segv, SIGSEGV },
{ pipe, SIGPIPE },
CVS commit: src/sys/dev
Module Name:src
Committed By: jmcneill
Date: Mon Dec 27 20:42:51 UTC 2010
Modified Files:
src/sys/dev/i2c: files.i2c
src/sys/dev/usb: files.usb
Log Message:
add au8522, xc5k, auvitek config glue
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/i2c/files.i2c
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/usb/files.usb
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.29 src/sys/dev/i2c/files.i2c:1.30
--- src/sys/dev/i2c/files.i2c:1.29 Sun Oct 10 05:17:44 2010
+++ src/sys/dev/i2c/files.i2c Mon Dec 27 20:42:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.29 2010/10/10 05:17:44 kiyohara Exp $
+# $NetBSD: files.i2c,v 1.30 2010/12/27 20:42:51 jmcneill Exp $
defflag opt_i2cbus.hI2C_SCAN
define i2cbus { }
@@ -13,6 +13,14 @@
define i2c_bitbang
file dev/i2c/i2c_bitbang.c i2c_bitbang
+# Auvitek AU8522 decoder
+define au8522: i2cexec
+file dev/i2c/au8522.c au8522
+
+# Xceive XC5000 tuner
+define xc5k: i2cexec
+file dev/i2c/xc5k.cxc5k
+
#
# I2C client devices
#
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.103 src/sys/dev/usb/files.usb:1.104
--- src/sys/dev/usb/files.usb:1.103 Wed Dec 15 23:38:15 2010
+++ src/sys/dev/usb/files.usb Mon Dec 27 20:42:51 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.103 2010/12/15 23:38:15 matt Exp $
+# $NetBSD: files.usb,v 1.104 2010/12/27 20:42:51 jmcneill Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -147,6 +147,15 @@
attach uvideo at usbifif
file dev/usb/uvideo.c uvideo
+# Auvitek AU0828
+device auvitek: videobus, i2cexec, usbifif, au8522, xc5k
+attach auvitek at usbdevif
+file dev/usb/auvitek.c auvitek
+file dev/usb/auvitek_audio.c auvitek
+file dev/usb/auvitek_board.c auvitek
+file dev/usb/auvitek_i2c.c auvitek
+file dev/usb/auvitek_video.c auvitek
+
#
# Misc
#
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jmcneill Date: Mon Dec 27 20:45:00 UTC 2010 Modified Files: src/sys/arch/i386/conf: ALL GENERIC Log Message: add auvitek at uhub To generate a diff of this commit: cvs rdiff -u -r1.281 -r1.282 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1002 -r1.1003 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.281 src/sys/arch/i386/conf/ALL:1.282 --- src/sys/arch/i386/conf/ALL:1.281 Thu Dec 16 07:51:21 2010 +++ src/sys/arch/i386/conf/ALL Mon Dec 27 20:45:00 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.281 2010/12/16 07:51:21 cegger Exp $ +# $NetBSD: ALL,v 1.282 2010/12/27 20:45:00 jmcneill Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.281 $ +#ident ALL-$Revision: 1.282 $ maxusers 64 # estimated number of users @@ -1497,6 +1497,7 @@ pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam uvideo* at uhub? # USB Video Class capture devices +auvitek* at uhub? # Auvitek AU0828 video capture devices video* at videobus? Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1002 src/sys/arch/i386/conf/GENERIC:1.1003 --- src/sys/arch/i386/conf/GENERIC:1.1002 Mon Dec 27 15:56:50 2010 +++ src/sys/arch/i386/conf/GENERIC Mon Dec 27 20:45:00 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1002 2010/12/27 15:56:50 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.1003 2010/12/27 20:45:00 jmcneill Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.1002 $ +#ident GENERIC-$Revision: 1.1003 $ maxusers 64 # estimated number of users @@ -1424,6 +1424,7 @@ pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam uvideo* at uhub? # USB Video Class capture devices +auvitek* at uhub? # Auvitek AU0828 video capture devices video* at videobus?
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Mon Dec 27 21:26:44 UTC 2010 Modified Files: src/doc: CHANGES Log Message: Add a driver for Auvitek AU0828 family USB video capture controllers. To generate a diff of this commit: cvs rdiff -u -r1.1481 -r1.1482 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1481 src/doc/CHANGES:1.1482 --- src/doc/CHANGES:1.1481 Fri Dec 24 18:58:17 2010 +++ src/doc/CHANGES Mon Dec 27 21:26:44 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1481 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1482 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -813,3 +813,5 @@ amigappc: Made onboard serial interface work. [phx 20101219] yacc(1): Import byacc-20101127 [christos 20091223] dm(4): Make LVM use non 512-byte sector devices. [mlelstv 20101223] + auvitek(4): Add a driver for Auvitek AU0828 family USB video + capture controllers. [jmcneill 20101227]
CVS commit: src/sys/dev
Module Name:src
Committed By: jmcneill
Date: Tue Dec 28 00:11:50 UTC 2010
Modified Files:
src/sys/dev/i2c: au8522.c xc5k.c
src/sys/dev/usb: auvitek.c
Log Message:
don't make module declaration conditional on _MODULE
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/i2c/au8522.c src/sys/dev/i2c/xc5k.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/auvitek.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/au8522.c
diff -u src/sys/dev/i2c/au8522.c:1.1 src/sys/dev/i2c/au8522.c:1.2
--- src/sys/dev/i2c/au8522.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/i2c/au8522.c Tue Dec 28 00:11:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: au8522.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: au8522.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: au8522.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: au8522.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -257,8 +257,6 @@
return (status AU8522_STATUS_LOCK) == AU8522_STATUS_LOCK ? 1 : 0;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, au8522, NULL);
static int
@@ -273,5 +271,3 @@
return ENOTTY;
}
}
-
-#endif /* !_MODULE */
Index: src/sys/dev/i2c/xc5k.c
diff -u src/sys/dev/i2c/xc5k.c:1.1 src/sys/dev/i2c/xc5k.c:1.2
--- src/sys/dev/i2c/xc5k.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/i2c/xc5k.c Tue Dec 28 00:11:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xc5k.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: xc5k.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xc5k.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: xc5k.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -322,8 +322,6 @@
return 0;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, xc5k, NULL);
static int
@@ -340,5 +338,3 @@
return ENOTTY;
}
}
-
-#endif /* !_MODULE */
Index: src/sys/dev/usb/auvitek.c
diff -u src/sys/dev/usb/auvitek.c:1.1 src/sys/dev/usb/auvitek.c:1.2
--- src/sys/dev/usb/auvitek.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/usb/auvitek.c Tue Dec 28 00:11:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: auvitek.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: auvitek.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: auvitek.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $);
#include sys/types.h
#include sys/param.h
@@ -285,25 +285,31 @@
usbd_errstr(err));
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, auvitek, au8522,xc5k);
+#ifdef _MODULE
#include ioconf.c
+#endif
static int
auvitek_modcmd(modcmd_t cmd, void *opaque)
{
switch (cmd) {
case MODULE_CMD_INIT:
+#ifdef _MODULE
return config_init_component(cfdriver_ioconf_auvitek,
cfattach_ioconf_auvitek, cfdata_ioconf_auvitek);
+#else
+ return 0;
+#endif
case MODULE_CMD_FINI:
+#ifdef _MODULE
return config_fini_component(cfdriver_ioconf_auvitek,
cfattach_ioconf_auvitek, cfdata_ioconf_auvitek);
+#else
+ return 0;
+#endif
default:
return ENOTTY;
}
}
-
-#endif /* !_MODULE */
CVS commit: src/sys
Module Name:src
Committed By: jmcneill
Date: Tue Dec 28 00:49:23 UTC 2010
Modified Files:
src/sys/dev/usb: pseye.c
src/sys/modules/pseye: Makefile
Added Files:
src/sys/modules/pseye: pseye.ioconf
Log Message:
use ioconf
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/pseye.c
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/pseye/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/pseye/pseye.ioconf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/pseye.c
diff -u src/sys/dev/usb/pseye.c:1.19 src/sys/dev/usb/pseye.c:1.20
--- src/sys/dev/usb/pseye.c:1.19 Fri Dec 24 20:54:28 2010
+++ src/sys/dev/usb/pseye.c Tue Dec 28 00:49:21 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pseye.c,v 1.19 2010/12/24 20:54:28 jmcneill Exp $ */
+/* $NetBSD: pseye.c,v 1.20 2010/12/28 00:49:21 jmcneill Exp $ */
/*-
* Copyright (c) 2008 Jared D. McNeill jmcne...@invisible.ca
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pseye.c,v 1.19 2010/12/24 20:54:28 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: pseye.c,v 1.20 2010/12/28 00:49:21 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -835,67 +835,31 @@
return 0;
}
-#ifdef _MODULE
-
MODULE(MODULE_CLASS_DRIVER, pseye, NULL);
-static const struct cfiattrdata videobuscf_iattrdata = {
- videobus, 0, { { NULL, NULL, 0 }, }
-};
-static const struct cfiattrdata * const pseye_attrs[] = {
- videobuscf_iattrdata, NULL
-};
-CFDRIVER_DECL(pseye, DV_DULL, pseye_attrs);
-extern struct cfattach video_ca;
-static int pseyeloc[6] = { -1, -1, -1, -1, -1, -1 };
-static struct cfparent uhubparent = {
- usbifif, NULL, DVUNIT_ANY
-};
-static struct cfdata pseye_cfdata[] = {
- {
- .cf_name = pseye,
- .cf_atname = pseye,
- .cf_unit = 0,
- .cf_fstate = FSTATE_STAR,
- .cf_loc = pseyeloc,
- .cf_flags = 0,
- .cf_pspec = uhubparent,
- },
- { NULL, NULL, 0, 0, NULL, 0, NULL }
-};
+#ifdef _MODULE
+#include ioconf.c
+#endif
static int
pseye_modcmd(modcmd_t cmd, void *opaque)
{
- int err;
-
switch (cmd) {
case MODULE_CMD_INIT:
- err = config_cfdriver_attach(pseye_cd);
- if (err)
- return err;
- err = config_cfattach_attach(pseye, pseye_ca);
- if (err) {
- config_cfdriver_detach(pseye_cd);
- return err;
- }
- err = config_cfdata_attach(pseye_cfdata, 1);
- if (err) {
- config_cfattach_detach(pseye, pseye_ca);
- config_cfdriver_detach(pseye_cd);
- return err;
- }
+#ifdef _MODULE
+ return config_init_component(cfdriver_ioconf_pseye,
+ cfattach_ioconf_pseye, cfdata_ioconf_pseye);
+#else
return 0;
+#endif
case MODULE_CMD_FINI:
- err = config_cfdata_detach(pseye_cfdata);
- if (err)
- return err;
- config_cfattach_detach(pseye, pseye_ca);
- config_cfdriver_detach(pseye_cd);
+#ifdef _MODULE
+ return config_fini_component(cfdriver_ioconf_pseye,
+ cfattach_ioconf_pseye, cfdata_ioconf_pseye);
+#else
return 0;
+#endif
default:
return ENOTTY;
}
}
-
-#endif /* !_MODULE */
Index: src/sys/modules/pseye/Makefile
diff -u src/sys/modules/pseye/Makefile:1.1 src/sys/modules/pseye/Makefile:1.2
--- src/sys/modules/pseye/Makefile:1.1 Tue Feb 3 13:32:30 2009
+++ src/sys/modules/pseye/Makefile Tue Dec 28 00:49:22 2010
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1 2009/02/03 13:32:30 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/28 00:49:22 jmcneill Exp $
.include ../Makefile.inc
.PATH: ${S}/dev/usb
KMOD= pseye
+IOCONF= pseye.ioconf
SRCS= pseye.c
.include bsd.kmodule.mk
Added files:
Index: src/sys/modules/pseye/pseye.ioconf
diff -u /dev/null src/sys/modules/pseye/pseye.ioconf:1.1
--- /dev/null Tue Dec 28 00:49:23 2010
+++ src/sys/modules/pseye/pseye.ioconf Tue Dec 28 00:49:22 2010
@@ -0,0 +1,10 @@
+# $NetBSD: pseye.ioconf,v 1.1 2010/12/28 00:49:22 jmcneill Exp $
+
+ioconf pseye
+
+include conf/files
+include dev/usb/files.usb
+
+pseudo-root uhub*
+
+pseye* at uhub?
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Tue Dec 28 04:02:33 UTC 2010
Modified Files:
src/sys/dev/usb: auvitek.c auvitek_board.c auvitek_video.c auvitekvar.h
Log Message:
Hauppauge HVR-850 analog should be identical to HVR-950Q, so support it too
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/auvitek.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/auvitek_board.c \
src/sys/dev/usb/auvitek_video.c src/sys/dev/usb/auvitekvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/auvitek.c
diff -u src/sys/dev/usb/auvitek.c:1.2 src/sys/dev/usb/auvitek.c:1.3
--- src/sys/dev/usb/auvitek.c:1.2 Tue Dec 28 00:11:50 2010
+++ src/sys/dev/usb/auvitek.c Tue Dec 28 04:02:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $ */
+/* $NetBSD: auvitek.c,v 1.3 2010/12/28 04:02:33 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: auvitek.c,v 1.2 2010/12/28 00:11:50 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: auvitek.c,v 1.3 2010/12/28 04:02:33 jmcneill Exp $);
#include sys/types.h
#include sys/param.h
@@ -67,6 +67,8 @@
} auvitek_devices[] = {
{ 0x2040, 0x7200,
WinTV HVR-950Q, AUVITEK_BOARD_HVR_950Q },
+ { 0x2040, 0x7240,
+ WinTV HVR-850, AUVITEK_BOARD_HVR_850 },
};
static int
Index: src/sys/dev/usb/auvitek_board.c
diff -u src/sys/dev/usb/auvitek_board.c:1.1 src/sys/dev/usb/auvitek_board.c:1.2
--- src/sys/dev/usb/auvitek_board.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/usb/auvitek_board.c Tue Dec 28 04:02:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_board.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: auvitek_board.c,v 1.2 2010/12/28 04:02:33 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: auvitek_board.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: auvitek_board.c,v 1.2 2010/12/28 04:02:33 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -53,6 +53,11 @@
uint16_t enable;
uint8_t clkdiv;
} auvitek_board_config[] = {
+ [AUVITEK_BOARD_HVR_850] = {
+ .reset = 0x02b0,
+ .enable = 0x02f0,
+ .clkdiv = AU0828_I2C_CLKDIV_30,
+ },
[AUVITEK_BOARD_HVR_950Q] = {
.reset = 0x02b0,
.enable = 0x02f0,
@@ -97,6 +102,7 @@
uint8_t val;
switch (sc-sc_board) {
+ case AUVITEK_BOARD_HVR_850:
case AUVITEK_BOARD_HVR_950Q:
val = auvitek_read_1(sc, AU0828_REG_GPIO2_OUTEN);
val = ~2;
Index: src/sys/dev/usb/auvitek_video.c
diff -u src/sys/dev/usb/auvitek_video.c:1.1 src/sys/dev/usb/auvitek_video.c:1.2
--- src/sys/dev/usb/auvitek_video.c:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/usb/auvitek_video.c Tue Dec 28 04:02:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_video.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: auvitek_video.c,v 1.2 2010/12/28 04:02:33 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: auvitek_video.c,v 1.1 2010/12/27 15:42:11 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: auvitek_video.c,v 1.2 2010/12/28 04:02:33 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -470,7 +470,7 @@
au8522_set_input(sc-sc_au8522, vinput, ainput);
- /* XXX HVR-950Q specific */
+ /* XXX HVR-850/950Q specific */
r = auvitek_read_1(sc, AU0828_REG_GPIO1_OUTEN);
if (ainput == AU8522_AINPUT_NONE)
r |= 0x10;
Index: src/sys/dev/usb/auvitekvar.h
diff -u src/sys/dev/usb/auvitekvar.h:1.1 src/sys/dev/usb/auvitekvar.h:1.2
--- src/sys/dev/usb/auvitekvar.h:1.1 Mon Dec 27 15:42:11 2010
+++ src/sys/dev/usb/auvitekvar.h Tue Dec 28 04:02:33 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitekvar.h,v 1.1 2010/12/27 15:42:11 jmcneill Exp $ */
+/* $NetBSD: auvitekvar.h,v 1.2 2010/12/28 04:02:33 jmcneill Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca
@@ -43,6 +43,7 @@
struct auvitek_softc;
enum auvitek_board {
+ AUVITEK_BOARD_HVR_850,
AUVITEK_BOARD_HVR_950Q,
};
CVS commit: src/share/man/man4
Module Name:src Committed By: jmcneill Date: Tue Dec 28 04:03:58 UTC 2010 Modified Files: src/share/man/man4: auvitek.4 Log Message: add Hauppauge HVR-850 to list of supported cards To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/auvitek.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/auvitek.4 diff -u src/share/man/man4/auvitek.4:1.2 src/share/man/man4/auvitek.4:1.3 --- src/share/man/man4/auvitek.4:1.2 Mon Dec 27 18:22:30 2010 +++ src/share/man/man4/auvitek.4 Tue Dec 28 04:03:58 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: auvitek.4,v 1.2 2010/12/27 18:22:30 wiz Exp $ +.\ $NetBSD: auvitek.4,v 1.3 2010/12/28 04:03:58 jmcneill Exp $ .\ .\ Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca .\ All rights reserved. @@ -69,6 +69,7 @@ .Pp .Bl -column .It Em VendorChip DecoderTuner +.ItHauppauge WinTV-HVR-850 AU8522 XC5000 .ItHauppauge WinTV-HVR-950Q AU8522 XC5000 .El .Pp
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Tue Dec 28 06:00:18 UTC 2010
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: handler.c
Log Message:
From Roman Hoog Antink r...@open.ch: Fix config reload to not delete
too many phase 2 handles, because wrong chain field is used when
enumerating the handles.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/crypto/dist/ipsec-tools/src/racoon/handler.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/handler.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.34 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.35
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.34 Wed Nov 17 10:40:41 2010
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c Tue Dec 28 06:00:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: handler.c,v 1.34 2010/11/17 10:40:41 tteras Exp $ */
+/* $NetBSD: handler.c,v 1.35 2010/12/28 06:00:18 tteras Exp $ */
/* Id: handler.c,v 1.28 2006/05/26 12:17:29 manubsd Exp */
@@ -1468,7 +1468,7 @@
if (iph1-status == PHASE1ST_ESTABLISHED ||
iph1-status == PHASE1ST_DYING) {
for (iph2 = LIST_FIRST(iph1-ph2tree); iph2; iph2 = iph2_next) {
- iph2_next = LIST_NEXT(iph2, chain);
+ iph2_next = LIST_NEXT(iph2, ph1bind);
remove_ph2(iph2);
}
isakmp_info_send_d1(iph1);
CVS commit: [ipsec-tools-0_7-branch] src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Tue Dec 28 06:02:45 UTC 2010
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_7-branch]:
handler.c
Log Message:
From Roman Hoog Antink r...@open.ch: Fix config reload to not delete too
many phase 2 handles, because wrong chain field is used when enumerating
the handles.
To generate a diff of this commit:
cvs rdiff -u -r1.9.6.8 -r1.9.6.9 \
src/crypto/dist/ipsec-tools/src/racoon/handler.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/handler.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.9.6.8 src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.9.6.9
--- src/crypto/dist/ipsec-tools/src/racoon/handler.c:1.9.6.8 Mon Apr 20 13:25:27 2009
+++ src/crypto/dist/ipsec-tools/src/racoon/handler.c Tue Dec 28 06:02:45 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: handler.c,v 1.9.6.8 2009/04/20 13:25:27 tteras Exp $ */
+/* $NetBSD: handler.c,v 1.9.6.9 2010/12/28 06:02:45 tteras Exp $ */
/* Id: handler.c,v 1.28 2006/05/26 12:17:29 manubsd Exp */
@@ -1306,7 +1306,7 @@
if (iph1-status == PHASE1ST_ESTABLISHED){
for (iph2 = LIST_FIRST(iph1-ph2tree); iph2; iph2 = iph2_next) {
- iph2_next = LIST_NEXT(iph2, chain);
+ iph2_next = LIST_NEXT(iph2, ph1bind);
remove_ph2(iph2);
}
isakmp_info_send_d1(iph1);
