Re: CVS commit: src
On Mon, Jul 5, 2010 at 1:53 PM, Nicolas Joly nj...@netbsd.org wrote: Module Name: src Committed By: njoly Date: Mon Jul 5 12:53:59 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.base src/tests/fs: Makefile Added Files: src/tests/fs/vfs: Atffile Makefile t_rmdirrace.c Log Message: Add test program that use sample code from kern/41937, and fs rump helpers to check currently supported filesystems. t_rmdirrace (1/1): 5 test cases ext2fs_race: Passed. ffs_race: Passed. msdosfs_race: Passed. sysvbfs_race: Passed. tmpfs_race: Passed. Neat! But one suggestion: test programs should have a generic name whereas the test cases should carry the more specific name. This makes it possible to reuse a test program to provide several test cases and, therefore, reduces the burden of adding new test programs every time we want to test something. In this particular case, it'd have made sense (imo) to name the test program t_rmdir and the test case race. This way, t_rmdir can very easily accommodate future tests for rmdir(2) without the need to create a test program -- and adding a single test case is trivial, but adding a test program currently is not. -- Julio Merino
Re: CVS commit: src
On Mon Jul 05 2010 at 14:10:12 +0100, Julio Merino wrote: Log Message: Add test program that use sample code from kern/41937, and fs rump helpers to check currently supported filesystems. t_rmdirrace (1/1): 5 test cases ext2fs_race: Passed. ffs_race: Passed. msdosfs_race: Passed. sysvbfs_race: Passed. tmpfs_race: Passed. Neat! Seconded! With even a modest amount of tests our file systems should start behaving dramatically better. Before it was easy'ish to partially test one file system after a global change by recompiling kernel, rebooting, and running an admittedly ad-hoc set of tests. With Nicolas' work it's trivial to test all of them within seconds of saving the source file in the editor! (well, dunno what we would do about e.g. smbfs, though, since there is no smb server in src, but at least the ones which can be serviced from src can be easily handled) But one suggestion: test programs should have a generic name whereas the test cases should carry the more specific name. This makes it possible to reuse a test program to provide several test cases and, therefore, reduces the burden of adding new test programs every time we want to test something. In this particular case, it'd have made sense (imo) to name the test program t_rmdir and the test case race. This way, t_rmdir can very easily accommodate future tests for rmdir(2) without the need to create a test program -- I'm still very unclear about the division between test program and test case. It seems rather arbitrary at times. Maybe you can point us to a set of suggested guidelines? and adding a single test case is trivial, but adding a test program currently is not. And minimizing this pain for myself has lead me to avoid adding new test programs, cf. t_pr.c.
Re: CVS commit: src
On Mon, Jul 05, 2010 at 04:43:14PM +0300, Antti Kantee wrote: Seconded! With even a modest amount of tests our file systems should start behaving dramatically better. Before it was easy'ish to partially test one file system after a global change by recompiling kernel, rebooting, and running an admittedly ad-hoc set of tests. With Nicolas' work it's trivial to test all of them within seconds of saving the source file in the editor! You can do a release build and anita run in seconds? Can I have a build machine like that? :-) In this particular case, it'd have made sense (imo) to name the test program t_rmdir and the test case race. This way, t_rmdir can very easily accommodate future tests for rmdir(2) without the need to create a test program -- I'm still very unclear about the division between test program and test case. It seems rather arbitrary at times. Maybe you can point us to a set of suggested guidelines? The way some of the tests are organized suggests that the intended model is one test program per test victim (or per test victim and substantially different testing harness) and then one test case per bug affecting that victim. Is that right? -- David A. Holland dholl...@netbsd.org
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: kiyohara Date: Mon Jul 5 06:50:02 UTC 2010 Modified Files: src/sys/arch/arm/arm: cpufunc.c Log Message: Fix set the control register. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/sys/arch/arm/arm/cpufunc.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/arch/arm/arm/cpufunc.c diff -u src/sys/arch/arm/arm/cpufunc.c:1.97 src/sys/arch/arm/arm/cpufunc.c:1.98 --- src/sys/arch/arm/arm/cpufunc.c:1.97 Sat Jun 19 20:42:43 2010 +++ src/sys/arch/arm/arm/cpufunc.c Mon Jul 5 06:50:01 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.c,v 1.97 2010/06/19 20:42:43 matt Exp $ */ +/* $NetBSD: cpufunc.c,v 1.98 2010/07/05 06:50:01 kiyohara Exp $ */ /* * arm7tdmi support code Copyright (c) 2001 John Fremlin @@ -49,7 +49,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.97 2010/06/19 20:42:43 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.98 2010/07/05 06:50:01 kiyohara Exp $); #include opt_compat_netbsd.h #include opt_cpuoptions.h @@ -2604,7 +2604,10 @@ /* Clear out the cache */ cpu_idcache_wbinv_all(); - /* set some cortrol register? */ + + /* Set the control register */ + curcpu()-ci_ctrl = cpuctrl; + cpu_control(0x, cpuctrl); } /* Clean the data cache to the level of coherency. Slow. */
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: kiyohara
Date: Mon Jul 5 06:54:48 UTC 2010
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
Remove unnecessary white-spaces.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/sys/arch/arm/arm/cpufunc.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/arch/arm/arm/cpufunc.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.98 src/sys/arch/arm/arm/cpufunc.c:1.99
--- src/sys/arch/arm/arm/cpufunc.c:1.98 Mon Jul 5 06:50:01 2010
+++ src/sys/arch/arm/arm/cpufunc.c Mon Jul 5 06:54:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.98 2010/07/05 06:50:01 kiyohara Exp $ */
+/* $NetBSD: cpufunc.c,v 1.99 2010/07/05 06:54:48 kiyohara Exp $ */
/*
* arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.98 2010/07/05 06:50:01 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpufunc.c,v 1.99 2010/07/05 06:54:48 kiyohara Exp $);
#include opt_compat_netbsd.h
#include opt_cpuoptions.h
@@ -102,7 +102,7 @@
#if (ARM_MMU_V6 + ARM_MMU_V7) != 0
int arm_cache_prefer_mask;
#endif
-
+
int arm_pcache_type;
int arm_pcache_unified;
@@ -116,7 +116,7 @@
#ifdef CPU_ARM2
struct cpu_functions arm2_cpufuncs = {
/* CPU functions */
-
+
.cf_id = arm2_id,
.cf_cpwait = cpufunc_nullop,
@@ -157,7 +157,7 @@
/* Soft functions */
- .cf_dataabt_fixup = early_abort_fixup,
+ .cf_dataabt_fixup = early_abort_fixup,
.cf_prefetchabt_fixup = cpufunc_null_fixup,
.cf_setup = (void *)cpufunc_nullop
@@ -168,7 +168,7 @@
#ifdef CPU_ARM250
struct cpu_functions arm250_cpufuncs = {
/* CPU functions */
-
+
.cf_id = arm250_id,
.cf_cpwait = cpufunc_nullop,
@@ -220,7 +220,7 @@
#ifdef CPU_ARM3
struct cpu_functions arm3_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = cpufunc_nullop,
@@ -272,10 +272,10 @@
#ifdef CPU_ARM6
struct cpu_functions arm6_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = cpufunc_nullop,
-
+
/* MMU functions */
.cf_control = cpufunc_control,
@@ -334,7 +334,7 @@
#ifdef CPU_ARM7
struct cpu_functions arm7_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = cpufunc_nullop,
@@ -392,7 +392,7 @@
#ifdef CPU_ARM7TDMI
struct cpu_functions arm7tdmi_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = cpufunc_nullop,
@@ -450,7 +450,7 @@
#ifdef CPU_ARM8
struct cpu_functions arm8_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = cpufunc_nullop,
@@ -501,7 +501,7 @@
.cf_context_switch = arm8_context_switch,
.cf_setup = arm8_setup
-};
+};
#endif /* CPU_ARM8 */
#ifdef CPU_ARM9
@@ -797,7 +797,7 @@
#ifdef CPU_SA110
struct cpu_functions sa110_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = cpufunc_nullop,
@@ -848,13 +848,13 @@
.cf_context_switch = sa110_context_switch,
.cf_setup = sa110_setup
-};
+};
#endif /* CPU_SA110 */
#if defined(CPU_SA1100) || defined(CPU_SA1110)
struct cpu_functions sa11x0_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = cpufunc_nullop,
@@ -905,13 +905,13 @@
.cf_context_switch = sa11x0_context_switch,
.cf_setup = sa11x0_setup
-};
+};
#endif /* CPU_SA1100 || CPU_SA1110 */
#if defined(CPU_FA526)
struct cpu_functions fa526_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = cpufunc_nullop,
@@ -962,13 +962,13 @@
.cf_context_switch = fa526_context_switch,
.cf_setup = fa526_setup
-};
+};
#endif /* CPU_FA526 */
#ifdef CPU_IXP12X0
struct cpu_functions ixp12x0_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = cpufunc_nullop,
@@ -1018,15 +1018,15 @@
.cf_context_switch = ixp12x0_context_switch,
- .cf_setup = ixp12x0_setup
-};
+ .cf_setup = ixp12x0_setup
+};
#endif /* CPU_IXP12X0 */
#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
defined(__CPU_XSCALE_PXA2XX) || defined(CPU_XSCALE_IXP425)
struct cpu_functions xscale_cpufuncs = {
/* CPU functions */
-
+
.cf_id = cpufunc_id,
.cf_cpwait = xscale_cpwait,
@@ -1086,7 +1086,7 @@
/* CPU functions */
.cf_id = cpufunc_id,
- .cf_cpwait = cpufunc_nullop,
+ .cf_cpwait = cpufunc_nullop,
/* MMU functions */
@@ -1114,7 +1114,7 @@
.cf_dcache_wb_range = armv7_dcache_wb_range,
.cf_dcache_wbinv_range = armv7_dcache_wbinv_range,
- .cf_icache_sync_range = armv7_icache_sync_range,
+ .cf_icache_sync_range = armv7_icache_sync_range,
.cf_idcache_wbinv_range = armv7_idcache_wbinv_range,
@@ -1202,7 +1202,7 @@
goto out;
#if (ARM_MMU_V6 + ARM_MMU_V7) 0
- if (CPU_CT_FORMAT(ctype) == 4) {
+ if (CPU_CT_FORMAT(ctype) == 4) {
u_int csid0,
CVS commit: src/sys/arch/prep/conf
Module Name:src Committed By: kiyohara Date: Mon Jul 5 07:55:55 UTC 2010 Modified Files: src/sys/arch/prep/conf: GENERIC Log Message: Remove unnecessary white-spaces. To generate a diff of this commit: cvs rdiff -u -r1.153 -r1.154 src/sys/arch/prep/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/prep/conf/GENERIC diff -u src/sys/arch/prep/conf/GENERIC:1.153 src/sys/arch/prep/conf/GENERIC:1.154 --- src/sys/arch/prep/conf/GENERIC:1.153 Sat May 8 22:16:29 2010 +++ src/sys/arch/prep/conf/GENERIC Mon Jul 5 07:55:55 2010 @@ -1,7 +1,7 @@ -# $NetBSD: GENERIC,v 1.153 2010/05/08 22:16:29 mrg Exp $ +# $NetBSD: GENERIC,v 1.154 2010/07/05 07:55:55 kiyohara Exp $ # # GENERIC machine description file -# +# # This machine description file is used to generate the default NetBSD # kernel. The generic kernel does not include all options, subsystems # and device drivers, but should be useful for most applications. @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.153 $ +#ident GENERIC-$Revision: 1.154 $ maxusers 32 @@ -49,7 +49,7 @@ #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -# Enable experimental buffer queue strategy for better responsiveness under +# Enable experimental buffer queue strategy for better responsiveness under # high disk I/O load. Use it with caution - it's not proven to be stable yet. #options BUFQ_READPRIO #options BUFQ_PRIOCSCAN
CVS commit: src/sys/netmpls
Module Name:src
Committed By: kefren
Date: Mon Jul 5 09:54:26 UTC 2010
Modified Files:
src/sys/netmpls: mpls_ttl.c
Log Message:
do some rudimentary checks on ip4 header before passing packet to
mpls_icmp_error
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/netmpls/mpls_ttl.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/netmpls/mpls_ttl.c
diff -u src/sys/netmpls/mpls_ttl.c:1.2 src/sys/netmpls/mpls_ttl.c:1.3
--- src/sys/netmpls/mpls_ttl.c:1.2 Fri Jul 2 12:25:54 2010
+++ src/sys/netmpls/mpls_ttl.c Mon Jul 5 09:54:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mpls_ttl.c,v 1.2 2010/07/02 12:25:54 kefren Exp $ */
+/* $NetBSD: mpls_ttl.c,v 1.3 2010/07/05 09:54:26 kefren Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -97,7 +97,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mpls_ttl.c,v 1.2 2010/07/02 12:25:54 kefren Exp $);
+__KERNEL_RCSID(0, $NetBSD: mpls_ttl.c,v 1.3 2010/07/05 09:54:26 kefren Exp $);
#include opt_inet.h
#include opt_mpls.h
@@ -160,10 +160,12 @@
union mpls_shim ms;
} __packed;
-static void mpls_icmp_error(struct mbuf*, int, int, n_long, int, union mpls_shim *);
+static void mpls_icmp_error(struct mbuf *, int, int, n_long, int,
+ union mpls_shim *);
+static bool ip4_check(struct mbuf *);
/*
- * http://www.ietf.org/proceedings/01aug/I-D/draft-ietf-mpls-icmp-02.txt
+ * Reference: http://tools.ietf.org/html/rfc4950
* This should be in sync with icmp_error() in sys/netinet/ip_icmp.c
*/
@@ -326,6 +328,45 @@
}
+static bool
+ip4_check(struct mbuf *m)
+{
+ struct ip *iph;
+ int hlen, len;
+
+ if (m-m_len sizeof(struct ip)
+ (m = m_pullup(m, sizeof(struct ip))) == NULL)
+ return false;
+
+ iph = mtod(m, struct ip *);
+
+ if (iph-ip_v != IPVERSION)
+ goto freeit;
+ hlen = iph-ip_hl 2;
+ if (hlen sizeof(struct ip))
+ goto freeit;
+ if (hlen m-m_len) {
+ if ((m = m_pullup(m, hlen)) == NULL)
+ return false;
+ iph = mtod(m, struct ip *);
+ }
+ if (IN_MULTICAST(iph-ip_src.s_addr) ||
+ (ntohl(iph-ip_dst.s_addr) IN_CLASSA_NSHIFT) == IN_LOOPBACKNET ||
+ (ntohl(iph-ip_src.s_addr) IN_CLASSA_NSHIFT) == IN_LOOPBACKNET ||
+ in_cksum(m, hlen) != 0)
+ goto freeit;
+
+ len = ntohs(iph-ip_len);
+ if (len hlen || m-m_pkthdr.len len)
+ goto freeit;
+
+ return true;
+freeit:
+ m_freem(m);
+ return false;
+
+}
+
#endif /* INET */
struct mbuf *
@@ -368,9 +409,10 @@
bossh.s_addr = ntohl(mtod(m, union mpls_shim *)-s_addr);
m_adj(m, sizeof(union mpls_shim));
}
-
- mpls_icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS,
- 0, 0, top_shim);
+
+ if (ip4_check(m) == true)
+ mpls_icmp_error(m, ICMP_TIMXCEED, ICMP_TIMXCEED_INTRANS,
+ 0, 0, top_shim);
#else
m_freem(m);
#endif
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Mon Jul 5 10:37:36 UTC 2010 Modified Files: src/doc: 3RDPARTY Log Message: ACPICA 20100702 is out. To generate a diff of this commit: cvs rdiff -u -r1.769 -r1.770 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.769 src/doc/3RDPARTY:1.770 --- src/doc/3RDPARTY:1.769 Sat Jun 19 06:47:09 2010 +++ src/doc/3RDPARTY Mon Jul 5 10:37:36 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.769 2010/06/19 06:47:09 mrg Exp $ +# $NetBSD: 3RDPARTY,v 1.770 2010/07/05 10:37:36 jruoho Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -26,7 +26,7 @@ Package: acpica Version: 20100528 -Current Vers: 20100528 +Current Vers: 20100702 Maintainer: INTEL Archive Site: http://www.acpica.org/downloads/unix_source_code.php Home Page: http://www.acpica.org/
CVS commit: src
Module Name:src
Committed By: njoly
Date: Mon Jul 5 12:53:59 UTC 2010
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.base
src/tests/fs: Makefile
Added Files:
src/tests/fs/vfs: Atffile Makefile t_rmdirrace.c
Log Message:
Add test program that use sample code from kern/41937, and fs rump
helpers to check currently supported filesystems.
t_rmdirrace (1/1): 5 test cases
ext2fs_race: Passed.
ffs_race: Passed.
msdosfs_race: Passed.
sysvbfs_race: Passed.
tmpfs_race: Passed.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.29 -r1.30 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.11 -r1.12 src/tests/fs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/vfs/Atffile src/tests/fs/vfs/Makefile \
src/tests/fs/vfs/t_rmdirrace.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.97 src/distrib/sets/lists/tests/mi:1.98
--- src/distrib/sets/lists/tests/mi:1.97 Sun Jul 4 19:34:44 2010
+++ src/distrib/sets/lists/tests/mi Mon Jul 5 12:53:58 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.97 2010/07/04 19:34:44 pooka Exp $
+# $NetBSD: mi,v 1.98 2010/07/05 12:53:58 njoly Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -211,6 +211,8 @@
./usr/libdata/debug/usr/tests/fs/union tests-fs-debug
./usr/libdata/debug/usr/tests/fs/union/t_basic.debug tests-fs-debug debug,atf
./usr/libdata/debug/usr/tests/fs/union/t_pr.debug tests-fs-debug debug,atf
+./usr/libdata/debug/usr/tests/fs/vfs tests-fs-debug
+./usr/libdata/debug/usr/tests/fs/vfs/t_rmdirrace.debug tests-fs-debug debug,atf
./usr/libdata/debug/usr/tests/ipf tests-ipf-tests
./usr/libdata/debug/usr/tests/kernel tests-kernel-tests
./usr/libdata/debug/usr/tests/kernel/kqueuetests-kernel-tests
@@ -919,6 +921,9 @@
./usr/tests/fs/union/Atffile tests-fs-tests atf
./usr/tests/fs/union/t_basic tests-fs-tests atf
./usr/tests/fs/union/t_pr tests-fs-tests atf
+./usr/tests/fs/vfstests-fs-tests
+./usr/tests/fs/vfs/Atffile tests-fs-tests atf
+./usr/tests/fs/vfs/t_rmdirrace tests-fs-tests atf
./usr/tests/gamestests-games-tests
./usr/tests/games/Atffile tests-games-tests
./usr/tests/games/t_factor tests-games-tests
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.29 src/etc/mtree/NetBSD.dist.base:1.30
--- src/etc/mtree/NetBSD.dist.base:1.29 Sun Jul 4 19:33:18 2010
+++ src/etc/mtree/NetBSD.dist.base Mon Jul 5 12:53:58 2010
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.29 2010/07/04 19:33:18 pooka Exp $
+# $NetBSD: NetBSD.dist.base,v 1.30 2010/07/05 12:53:58 njoly Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -210,6 +210,7 @@
./usr/libdata/debug/usr/tests/fs/tmpfs
./usr/libdata/debug/usr/tests/fs/umapfs
./usr/libdata/debug/usr/tests/fs/union
+./usr/libdata/debug/usr/tests/fs/vfs
./usr/libdata/debug/usr/tests/ipf
./usr/libdata/debug/usr/tests/kernel
./usr/libdata/debug/usr/tests/kernel/kqueue
@@ -1110,6 +,7 @@
./usr/tests/fs/tmpfs
./usr/tests/fs/umapfs
./usr/tests/fs/union
+./usr/tests/fs/vfs
./usr/tests/games
./usr/tests/ipf
./usr/tests/ipf/expected
Index: src/tests/fs/Makefile
diff -u src/tests/fs/Makefile:1.11 src/tests/fs/Makefile:1.12
--- src/tests/fs/Makefile:1.11 Mon Jun 28 09:45:06 2010
+++ src/tests/fs/Makefile Mon Jul 5 12:53:58 2010
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2010/06/28 09:45:06 pooka Exp $
+# $NetBSD: Makefile,v 1.12 2010/07/05 12:53:58 njoly Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/fs
SUBDIR+= ffs kernfs lfs msdosfs nullfs ptyfs puffs tmpfs umapfs union
+SUBDIR+= vfs
FILES= h_funcs.subr
FILESDIR= ${TESTSDIR}
Added files:
Index: src/tests/fs/vfs/Atffile
diff -u /dev/null src/tests/fs/vfs/Atffile:1.1
--- /dev/null Mon Jul 5 12:53:59 2010
+++ src/tests/fs/vfs/Atffile Mon Jul 5 12:53:58 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version=1
+X-NetBSD-Id: $NetBSD: Atffile,v 1.1 2010/07/05 12:53:58 njoly Exp $
+
+prop: test-suite = NetBSD
+
+tp: t_rmdirrace
Index: src/tests/fs/vfs/Makefile
diff -u /dev/null src/tests/fs/vfs/Makefile:1.1
--- /dev/null Mon Jul 5 12:53:59 2010
+++ src/tests/fs/vfs/Makefile Mon Jul 5 12:53:58 2010
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2010/07/05 12:53:58 njoly Exp $
+#
+
+TESTSDIR= ${TESTSBASE}/fs/vfs
+WARNS= 4
+
+TESTS_C= t_rmdirrace
+
+LDADD+=-lrumpfs_ext2fs # ext2fs
+LDADD+=-lrumpfs_ffs # ffs
+LDADD+=-lrumpfs_msdos # msdos
+LDADD+=-lrumpfs_sysvbfs # sysvbfs
+LDADD+=-lrumpfs_tmpfs # tmpfs
+LDADD+=-lrumpdev_disk -lrumpdev # disk device
+LDADD+=-lrumpvfs -lrump -lrumpuser -lpthread # base
+
+.include bsd.test.mk
Index:
CVS commit: src/tests/fs/vfs
Module Name:src Committed By: njoly Date: Mon Jul 5 13:03:19 UTC 2010 Modified Files: src/tests/fs/vfs: t_rmdirrace.c Log Message: Fix copyright, noted by Jukka Ruohonen. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/fs/vfs/t_rmdirrace.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/fs/vfs/t_rmdirrace.c diff -u src/tests/fs/vfs/t_rmdirrace.c:1.1 src/tests/fs/vfs/t_rmdirrace.c:1.2 --- src/tests/fs/vfs/t_rmdirrace.c:1.1 Mon Jul 5 12:53:58 2010 +++ src/tests/fs/vfs/t_rmdirrace.c Mon Jul 5 13:03:19 2010 @@ -1,11 +1,11 @@ -/* $NetBSD: t_rmdirrace.c,v 1.1 2010/07/05 12:53:58 njoly Exp $ */ +/* $NetBSD: t_rmdirrace.c,v 1.2 2010/07/05 13:03:19 njoly Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by + * by Nicolas Joly. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions
CVS commit: src/external/bsd/atf/dist/atf-version
Module Name:src Committed By: jmmv Date: Mon Jul 5 14:21:00 UTC 2010 Removed Files: src/external/bsd/atf/dist/atf-version: revision.h Log Message: Remove file that should not be in the distribution so that atf-version gets the correct output. Fixed upstream as well. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-version/revision.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: tsutsui
Date: Mon Jul 5 14:27:26 UTC 2010
Modified Files:
src/sys/dev/usb: if_upgt.c
Log Message:
Add a missing newline in error messages.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/if_upgt.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/usb/if_upgt.c
diff -u src/sys/dev/usb/if_upgt.c:1.1 src/sys/dev/usb/if_upgt.c:1.2
--- src/sys/dev/usb/if_upgt.c:1.1 Sun Jul 4 15:21:58 2010
+++ src/sys/dev/usb/if_upgt.c Mon Jul 5 14:27:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upgt.c,v 1.1 2010/07/04 15:21:58 tsutsui Exp $ */
+/* $NetBSD: if_upgt.c,v 1.2 2010/07/05 14:27:26 tsutsui Exp $ */
/* $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_upgt.c,v 1.1 2010/07/04 15:21:58 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_upgt.c,v 1.2 2010/07/05 14:27:26 tsutsui Exp $);
#include sys/param.h
#include sys/callout.h
@@ -665,7 +665,7 @@
sc-sc_fw_size);
if (error != 0) {
aprint_error_dev(sc-sc_dev,
- could not read firmware %s, name);
+ could not read firmware %s\n, name);
aprint_error_dev(sc-sc_dev,
see upgt(4) man page for details\n);
return EIO;
CVS commit: src/sys/arch/hpcarm/conf
Module Name:src Committed By: tsutsui Date: Mon Jul 5 14:30:00 UTC 2010 Modified Files: src/sys/arch/hpcarm/conf: WZERO3 Log Message: Add upgt(4) for WS003SH/WS004SH internal WLAN. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpcarm/conf/WZERO3 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/hpcarm/conf/WZERO3 diff -u src/sys/arch/hpcarm/conf/WZERO3:1.9 src/sys/arch/hpcarm/conf/WZERO3:1.10 --- src/sys/arch/hpcarm/conf/WZERO3:1.9 Sat Jun 26 00:25:02 2010 +++ src/sys/arch/hpcarm/conf/WZERO3 Mon Jul 5 14:30:00 2010 @@ -1,4 +1,4 @@ -# $NetBSD: WZERO3,v 1.9 2010/06/26 00:25:02 tsutsui Exp $ +# $NetBSD: WZERO3,v 1.10 2010/07/05 14:30:00 tsutsui Exp $ # # WZERO3 -- Sharp Windows Mobile 5 based PDA # @@ -7,7 +7,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.9 $ +#ident GENERIC-$Revision: 1.10 $ # estimated number of users maxusers 32 @@ -243,6 +243,7 @@ atu* at uhub? port ? # Atmel AT76C50XX based adapters #ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g +upgt* at uhub? port ? # Intersil PrismGT zyd* at uhub? port ? # Zydas ZD1211 # SCSI bus support
CVS commit: src/tests/fs/common
Module Name:src Committed By: njoly Date: Mon Jul 5 14:53:03 UTC 2010 Modified Files: src/tests/fs/common: ext2fs.c ffs.c h_fsmacros.h msdosfs.c sysvbfs.c tmpfs.c Log Message: Fix more copyrights, where i forgot to add my name. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/fs/common/ext2fs.c \ src/tests/fs/common/ffs.c src/tests/fs/common/h_fsmacros.h \ src/tests/fs/common/msdosfs.c src/tests/fs/common/sysvbfs.c \ src/tests/fs/common/tmpfs.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/fs/common/ext2fs.c diff -u src/tests/fs/common/ext2fs.c:1.1 src/tests/fs/common/ext2fs.c:1.2 --- src/tests/fs/common/ext2fs.c:1.1 Wed Jun 30 20:39:39 2010 +++ src/tests/fs/common/ext2fs.c Mon Jul 5 14:53:03 2010 @@ -1,11 +1,11 @@ -/* $NetBSD: ext2fs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */ +/* $NetBSD: ext2fs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by + * by Nicolas Joly. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Index: src/tests/fs/common/ffs.c diff -u src/tests/fs/common/ffs.c:1.1 src/tests/fs/common/ffs.c:1.2 --- src/tests/fs/common/ffs.c:1.1 Wed Jun 30 20:39:39 2010 +++ src/tests/fs/common/ffs.c Mon Jul 5 14:53:03 2010 @@ -1,11 +1,11 @@ -/* $NetBSD: ffs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */ +/* $NetBSD: ffs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by + * by Nicolas Joly. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Index: src/tests/fs/common/h_fsmacros.h diff -u src/tests/fs/common/h_fsmacros.h:1.1 src/tests/fs/common/h_fsmacros.h:1.2 --- src/tests/fs/common/h_fsmacros.h:1.1 Wed Jun 30 20:39:39 2010 +++ src/tests/fs/common/h_fsmacros.h Mon Jul 5 14:53:03 2010 @@ -1,11 +1,11 @@ -/* $NetBSD: h_fsmacros.h,v 1.1 2010/06/30 20:39:39 njoly Exp $ */ +/* $NetBSD: h_fsmacros.h,v 1.2 2010/07/05 14:53:03 njoly Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by + * by Nicolas Joly. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Index: src/tests/fs/common/msdosfs.c diff -u src/tests/fs/common/msdosfs.c:1.1 src/tests/fs/common/msdosfs.c:1.2 --- src/tests/fs/common/msdosfs.c:1.1 Wed Jun 30 20:39:39 2010 +++ src/tests/fs/common/msdosfs.c Mon Jul 5 14:53:03 2010 @@ -1,11 +1,11 @@ -/* $NetBSD: msdosfs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */ +/* $NetBSD: msdosfs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by + * by Nicolas Joly. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Index: src/tests/fs/common/sysvbfs.c diff -u src/tests/fs/common/sysvbfs.c:1.1 src/tests/fs/common/sysvbfs.c:1.2 --- src/tests/fs/common/sysvbfs.c:1.1 Wed Jun 30 20:39:39 2010 +++ src/tests/fs/common/sysvbfs.c Mon Jul 5 14:53:03 2010 @@ -1,11 +1,11 @@ -/* $NetBSD: sysvbfs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */ +/* $NetBSD: sysvbfs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by + * by Nicolas Joly. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Index: src/tests/fs/common/tmpfs.c diff -u src/tests/fs/common/tmpfs.c:1.1 src/tests/fs/common/tmpfs.c:1.2 --- src/tests/fs/common/tmpfs.c:1.1 Wed Jun 30 20:39:39 2010 +++ src/tests/fs/common/tmpfs.c Mon Jul 5 14:53:03 2010 @@ -1,11 +1,11 @@ -/* $NetBSD: tmpfs.c,v 1.1 2010/06/30 20:39:39 njoly Exp $ */ +/* $NetBSD: tmpfs.c,v 1.2 2010/07/05 14:53:03 njoly Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by + * by Nicolas Joly. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions
CVS commit: src/tests
Module Name:src
Committed By: jmmv
Date: Mon Jul 5 16:27:09 UTC 2010
Modified Files:
src/tests/fs/puffs: t_psshfs.sh
src/tests/fs/tmpfs: t_vnd.sh t_vnode_leak.sh
src/tests/kernel: t_umount.sh
src/tests/modules: t_modload.sh
Log Message:
Properly mark some test cases as having a cleanup routine. Stupidity of
the API? Most likely; will revise it.
Fixes atf-run breaking when running t_psshfs. This does not resolve the
underlying issue though, which is atf-run getting confused trying to
unmount the temporary mount point by itself (I think). (I'm now wondering
if atf should be bothering about unmounting stuff at all. Maybe not. It is
a tricky and uncommon thing.)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/fs/puffs/t_psshfs.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/fs/tmpfs/t_vnd.sh \
src/tests/fs/tmpfs/t_vnode_leak.sh
cvs rdiff -u -r1.3 -r1.4 src/tests/kernel/t_umount.sh
cvs rdiff -u -r1.6 -r1.7 src/tests/modules/t_modload.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/puffs/t_psshfs.sh
diff -u src/tests/fs/puffs/t_psshfs.sh:1.6 src/tests/fs/puffs/t_psshfs.sh:1.7
--- src/tests/fs/puffs/t_psshfs.sh:1.6 Fri Jun 4 08:39:40 2010
+++ src/tests/fs/puffs/t_psshfs.sh Mon Jul 5 16:27:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_psshfs.sh,v 1.6 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_psshfs.sh,v 1.7 2010/07/05 16:27:08 jmmv Exp $
#
# Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -125,7 +125,7 @@
# The test cases.
# -
-atf_test_case inode_nos
+atf_test_case inode_nos cleanup
inode_nos_head() {
atf_set descr Checks that different files get different inode \
numbers
@@ -169,7 +169,7 @@
stop_ssh
}
-atf_test_case pwd
+atf_test_case pwd cleanup
pwd_head() {
atf_set descr Checks that pwd works correctly
atf_set use.fs true
Index: src/tests/fs/tmpfs/t_vnd.sh
diff -u src/tests/fs/tmpfs/t_vnd.sh:1.4 src/tests/fs/tmpfs/t_vnd.sh:1.5
--- src/tests/fs/tmpfs/t_vnd.sh:1.4 Fri Jun 4 08:39:40 2010
+++ src/tests/fs/tmpfs/t_vnd.sh Mon Jul 5 16:27:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_vnd.sh,v 1.4 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_vnd.sh,v 1.5 2010/07/05 16:27:08 jmmv Exp $
#
# Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -28,7 +28,7 @@
# Verifies that vnd works with files stored in tmpfs.
#
-atf_test_case basic
+atf_test_case basic cleanup
basic_head() {
atf_set descr Verifies that vnd works with files stored in tmpfs
atf_set require.user root
Index: src/tests/fs/tmpfs/t_vnode_leak.sh
diff -u src/tests/fs/tmpfs/t_vnode_leak.sh:1.4 src/tests/fs/tmpfs/t_vnode_leak.sh:1.5
--- src/tests/fs/tmpfs/t_vnode_leak.sh:1.4 Fri Jun 4 08:39:40 2010
+++ src/tests/fs/tmpfs/t_vnode_leak.sh Mon Jul 5 16:27:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_vnode_leak.sh,v 1.4 2010/06/04 08:39:40 jmmv Exp $
+# $NetBSD: t_vnode_leak.sh,v 1.5 2010/07/05 16:27:08 jmmv Exp $
#
# Copyright (c) 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -25,7 +25,7 @@
# POSSIBILITY OF SUCH DAMAGE.
#
-atf_test_case main
+atf_test_case main cleanup
main_head() {
atf_set descr Verifies that vnodes are not leaked and that \
their reclaim operation works as expected: i.e., \
Index: src/tests/kernel/t_umount.sh
diff -u src/tests/kernel/t_umount.sh:1.3 src/tests/kernel/t_umount.sh:1.4
--- src/tests/kernel/t_umount.sh:1.3 Sat Jun 12 13:31:35 2010
+++ src/tests/kernel/t_umount.sh Mon Jul 5 16:27:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_umount.sh,v 1.3 2010/06/12 13:31:35 pooka Exp $
+# $NetBSD: t_umount.sh,v 1.4 2010/07/05 16:27:08 jmmv Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -33,7 +33,7 @@
CVND=/dev/r${VND}
MPART=a
-atf_test_case umount
+atf_test_case umount cleanup
umount_head()
{
atf_set descr Checks forced unmounting
Index: src/tests/modules/t_modload.sh
diff -u src/tests/modules/t_modload.sh:1.6 src/tests/modules/t_modload.sh:1.7
--- src/tests/modules/t_modload.sh:1.6 Fri Jun 4 08:39:41 2010
+++ src/tests/modules/t_modload.sh Mon Jul 5 16:27:08 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_modload.sh,v 1.6 2010/06/04 08:39:41 jmmv Exp $
+# $NetBSD: t_modload.sh,v 1.7 2010/07/05 16:27:08 jmmv Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,7 +30,7 @@
atf_check -s eq:0 -o file:expout -e empty sysctl ${1}
}
-atf_test_case plain
+atf_test_case plain cleanup
plain_head() {
atf_set descr Test load without arguments
atf_set require.user root
@@ -53,7 +53,7 @@
modunload k_helper /dev/null 21
}
-atf_test_case bflag
+atf_test_case bflag cleanup
bflag_head() {
atf_set descr Test the -b flag
atf_set require.user root
@@ -94,7 +94,7 @@
modunload
CVS commit: src/tests/fs/ffs
Module Name:src
Committed By: jmmv
Date: Mon Jul 5 16:34:41 UTC 2010
Modified Files:
src/tests/fs/ffs: t_mount.c
Log Message:
Use expect_fail instead of defining xfail. Looks like I missed this one
during the import of atf 0.10. Thanks po...@.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/ffs/t_mount.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/fs/ffs/t_mount.c
diff -u src/tests/fs/ffs/t_mount.c:1.1 src/tests/fs/ffs/t_mount.c:1.2
--- src/tests/fs/ffs/t_mount.c:1.1 Wed Jun 30 21:54:56 2010
+++ src/tests/fs/ffs/t_mount.c Mon Jul 5 16:34:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mount.c,v 1.1 2010/06/30 21:54:56 njoly Exp $ */
+/* $NetBSD: t_mount.c,v 1.2 2010/07/05 16:34:41 jmmv Exp $ */
/*
* Adapted for rump and atf from a testcase supplied
@@ -19,7 +19,6 @@
{
atf_tc_set_md_var(tc, descr, mount small 48K ffs image);
atf_tc_set_md_var(tc, use.fs, true);
- atf_tc_set_md_var(tc, xfail, No PR yet);
}
ATF_TC_BODY(48Kimage, tc)
@@ -29,8 +28,11 @@
if (ffs_newfs(tmp, IMGNAME, IMGSIZE) != 0)
atf_tc_fail(newfs failed);
- if (ffs_mount(tmp, MNTDIR, 0) != 0)
+ if (ffs_mount(tmp, MNTDIR, 0) != 0) {
+ atf_tc_expect_fail(No PR yet);
atf_tc_fail(mount failed);
+ atf_tc_expect_pass();
+ }
if (ffs_unmount(MNTDIR, 0) != 0)
atf_tc_fail(unmount failed);
CVS commit: src/tests/fs/ffs
Module Name:src
Committed By: pooka
Date: Mon Jul 5 17:12:49 UTC 2010
Modified Files:
src/tests/fs/ffs: t_mount.c
Log Message:
* fill PR number to xfail now that we have one -- let's try not
to add any xfail tests without an associated PR
* move xfail to the correct place
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/fs/ffs/t_mount.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/fs/ffs/t_mount.c
diff -u src/tests/fs/ffs/t_mount.c:1.2 src/tests/fs/ffs/t_mount.c:1.3
--- src/tests/fs/ffs/t_mount.c:1.2 Mon Jul 5 16:34:41 2010
+++ src/tests/fs/ffs/t_mount.c Mon Jul 5 17:12:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mount.c,v 1.2 2010/07/05 16:34:41 jmmv Exp $ */
+/* $NetBSD: t_mount.c,v 1.3 2010/07/05 17:12:48 pooka Exp $ */
/*
* Adapted for rump and atf from a testcase supplied
@@ -28,11 +28,12 @@
if (ffs_newfs(tmp, IMGNAME, IMGSIZE) != 0)
atf_tc_fail(newfs failed);
+ atf_tc_expect_fail(PR kern/43573);
if (ffs_mount(tmp, MNTDIR, 0) != 0) {
- atf_tc_expect_fail(No PR yet);
atf_tc_fail(mount failed);
- atf_tc_expect_pass();
}
+ atf_tc_expect_pass();
+
if (ffs_unmount(MNTDIR, 0) != 0)
atf_tc_fail(unmount failed);
CVS commit: src
Module Name:src Committed By: mrg Date: Mon Jul 5 20:32:24 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/sys/dev/microcode: Makefile src/sys/external/bsd/drm/dist/bsd-core: radeon_drv.c src/sys/external/bsd/drm/dist/shared-core: r600_cp.c radeon_cp.c radeon_drv.h Log Message: move all the radeondrm firmware images into the filesystem. check that some firmware sizes are the expected size. (XXX make all.) based upon similar changes seen in the linux radeon drm driver. this saves about 250KB in the kernel or module. To generate a diff of this commit: cvs rdiff -u -r1.873 -r1.874 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.7 -r1.8 src/sys/dev/microcode/Makefile cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/shared-core/r600_cp.c cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.873 src/distrib/sets/lists/base/mi:1.874 --- src/distrib/sets/lists/base/mi:1.873 Sat Jul 3 08:16:50 2010 +++ src/distrib/sets/lists/base/mi Mon Jul 5 20:32:23 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.873 2010/07/03 08:16:50 jmmv Exp $ +# $NetBSD: mi,v 1.874 2010/07/05 20:32:23 mrg Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -881,6 +881,48 @@ ./usr/libdata/debug/usr/mdec base-sys-usr ./usr/libdata/debug/usr/sbin base-sys-usr ./usr/libdata/firmwarebase-sys-usr +./usr/libdata/firmware/radeon base-sys-usr +./usr/libdata/firmware/radeon/CEDAR_me.bin base-sys-usr +./usr/libdata/firmware/radeon/CEDAR_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/CEDAR_rlc.bin base-sys-usr +./usr/libdata/firmware/radeon/CYPRESS_me.bin base-sys-usr +./usr/libdata/firmware/radeon/CYPRESS_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/CYPRESS_rlc.bin base-sys-usr +./usr/libdata/firmware/radeon/JUNIPER_me.bin base-sys-usr +./usr/libdata/firmware/radeon/JUNIPER_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/JUNIPER_rlc.bin base-sys-usr +./usr/libdata/firmware/radeon/R100_cp.bin base-sys-usr +./usr/libdata/firmware/radeon/R200_cp.bin base-sys-usr +./usr/libdata/firmware/radeon/R300_cp.bin base-sys-usr +./usr/libdata/firmware/radeon/R420_cp.bin base-sys-usr +./usr/libdata/firmware/radeon/R520_cp.bin base-sys-usr +./usr/libdata/firmware/radeon/R600_me.bin base-sys-usr +./usr/libdata/firmware/radeon/R600_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/R600_rlc.bin base-sys-usr +./usr/libdata/firmware/radeon/R700_rlc.bin base-sys-usr +./usr/libdata/firmware/radeon/REDWOOD_me.bin base-sys-usr +./usr/libdata/firmware/radeon/REDWOOD_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/REDWOOD_rlc.bin base-sys-usr +./usr/libdata/firmware/radeon/RS600_cp.bin base-sys-usr +./usr/libdata/firmware/radeon/RS690_cp.bin base-sys-usr +./usr/libdata/firmware/radeon/RS780_me.bin base-sys-usr +./usr/libdata/firmware/radeon/RS780_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/RV610_me.bin base-sys-usr +./usr/libdata/firmware/radeon/RV610_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/RV620_me.bin base-sys-usr +./usr/libdata/firmware/radeon/RV620_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/RV630_me.bin base-sys-usr +./usr/libdata/firmware/radeon/RV630_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/RV635_me.bin base-sys-usr +./usr/libdata/firmware/radeon/RV635_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/RV670_me.bin base-sys-usr +./usr/libdata/firmware/radeon/RV670_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/RV710_me.bin base-sys-usr +./usr/libdata/firmware/radeon/RV710_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/RV730_me.bin base-sys-usr +./usr/libdata/firmware/radeon/RV730_pfp.bin base-sys-usr +./usr/libdata/firmware/radeon/RV770_me.bin base-sys-usr +./usr/libdata/firmware/radeon/RV770_pfp.bin base-sys-usr ./usr/libdata/ldscriptsbase-c-usr ./usr/libdata/lintbase-c-usr ./usr/libexec base-sys-usr Index: src/sys/dev/microcode/Makefile diff -u src/sys/dev/microcode/Makefile:1.7 src/sys/dev/microcode/Makefile:1.8 --- src/sys/dev/microcode/Makefile:1.7 Sat Jun 9 11:20:56 2007 +++ src/sys/dev/microcode/Makefile Mon Jul 5 20:32:24 2010 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2007/06/09 11:20:56 kiyohara Exp $ +# $NetBSD: Makefile,v 1.8 2010/07/05 20:32:24 mrg Exp $ SUBDIR+= ral rum zyd +SUBDIR+= radeon .include bsd.subdir.mk Index: src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c diff -u src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.9 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c:1.10 ---
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Mon Jul 5 20:57:19 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: add ./usr/libdata/firmware/radeon To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.30 src/etc/mtree/NetBSD.dist.base:1.31 --- src/etc/mtree/NetBSD.dist.base:1.30 Mon Jul 5 12:53:58 2010 +++ src/etc/mtree/NetBSD.dist.base Mon Jul 5 20:57:19 2010 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.30 2010/07/05 12:53:58 njoly Exp $ +# $NetBSD: NetBSD.dist.base,v 1.31 2010/07/05 20:57:19 mrg Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -240,6 +240,7 @@ ./usr/libdata/debug/usr/tests/util/df ./usr/libdata/debug/usr/tests/util/id ./usr/libdata/firmware +./usr/libdata/firmware/radeon ./usr/libdata/ldscripts ./usr/libdata/lint ./usr/libexec
CVS commit: src/sys/fs/union
Module Name:src Committed By: pooka Date: Mon Jul 5 21:27:08 UTC 2010 Modified Files: src/sys/fs/union: union_vfsops.c Log Message: union doesn't use layerfs (avoids panic in kernel bootstrap when union is compiled in but none of the layer-using file systems are). To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/fs/union/union_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/union/union_vfsops.c diff -u src/sys/fs/union/union_vfsops.c:1.62 src/sys/fs/union/union_vfsops.c:1.63 --- src/sys/fs/union/union_vfsops.c:1.62 Wed Jun 30 13:10:35 2010 +++ src/sys/fs/union/union_vfsops.c Mon Jul 5 21:27:08 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: union_vfsops.c,v 1.62 2010/06/30 13:10:35 hannken Exp $ */ +/* $NetBSD: union_vfsops.c,v 1.63 2010/07/05 21:27:08 pooka Exp $ */ /* * Copyright (c) 1994 The Regents of the University of California. @@ -77,7 +77,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: union_vfsops.c,v 1.62 2010/06/30 13:10:35 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: union_vfsops.c,v 1.63 2010/07/05 21:27:08 pooka Exp $); #include sys/param.h #include sys/systm.h @@ -96,7 +96,7 @@ #include fs/union/union.h -MODULE(MODULE_CLASS_VFS, union, layerfs); +MODULE(MODULE_CLASS_VFS, union, NULL); VFS_PROTOS(union);
CVS commit: src/lib/csu
Module Name:src
Committed By: mrg
Date: Mon Jul 5 21:27:56 UTC 2010
Modified Files:
src/lib/csu: Makefile
Removed Files:
src/lib/csu/arm32: Makefile c++rt0.c crt0.c
src/lib/csu/c++: Makefile c++rt0.c
src/lib/csu/common_aout: Makefile.inc common.c common.h
src/lib/csu/i386: Makefile crt0.c
src/lib/csu/m68k: Makefile crt0.c
src/lib/csu/sh3: Makefile crt0.c
src/lib/csu/sparc: Makefile crt0.c
src/lib/csu/vax: Makefile crt0.c
Log Message:
delete all the a.out csu code.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/lib/csu/Makefile
cvs rdiff -u -r1.14 -r0 src/lib/csu/arm32/Makefile
cvs rdiff -u -r1.4 -r0 src/lib/csu/arm32/c++rt0.c
cvs rdiff -u -r1.13 -r0 src/lib/csu/arm32/crt0.c
cvs rdiff -u -r1.17 -r0 src/lib/csu/c++/Makefile
cvs rdiff -u -r1.11 -r0 src/lib/csu/c++/c++rt0.c
cvs rdiff -u -r1.10 -r0 src/lib/csu/common_aout/Makefile.inc
cvs rdiff -u -r1.20 -r0 src/lib/csu/common_aout/common.c
cvs rdiff -u -r1.15 -r0 src/lib/csu/common_aout/common.h
cvs rdiff -u -r1.26 -r0 src/lib/csu/i386/Makefile
cvs rdiff -u -r1.35 -r0 src/lib/csu/i386/crt0.c
cvs rdiff -u -r1.18 -r0 src/lib/csu/m68k/Makefile
cvs rdiff -u -r1.24 -r0 src/lib/csu/m68k/crt0.c
cvs rdiff -u -r1.1 -r0 src/lib/csu/sh3/Makefile
cvs rdiff -u -r1.3 -r0 src/lib/csu/sh3/crt0.c
cvs rdiff -u -r1.19 -r0 src/lib/csu/sparc/Makefile
cvs rdiff -u -r1.29 -r0 src/lib/csu/sparc/crt0.c
cvs rdiff -u -r1.11 -r0 src/lib/csu/vax/Makefile
cvs rdiff -u -r1.17 -r0 src/lib/csu/vax/crt0.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/Makefile
diff -u src/lib/csu/Makefile:1.25 src/lib/csu/Makefile:1.26
--- src/lib/csu/Makefile:1.25 Sun Dec 13 08:03:44 2009
+++ src/lib/csu/Makefile Mon Jul 5 21:27:55 2010
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.25 2009/12/13 08:03:44 mrg Exp $
+# $NetBSD: Makefile,v 1.26 2010/07/05 21:27:55 mrg Exp $
.include bsd.own.mk
-.if ${OBJECT_FMT} == ELF exists(${CSU_MACHINE_ARCH}_elf)
+.if exists(${CSU_MACHINE_ARCH}_elf)
SUBDIR= ${CSU_MACHINE_ARCH}_elf
-.elif ${OBJECT_FMT} == ELF exists(${MACHINE_ARCH}_elf)
+.elif exists(${MACHINE_ARCH}_elf)
SUBDIR= ${MACHINE_ARCH}_elf
-.elif ${OBJECT_FMT} == ELF exists(${MACHINE_CPU}_elf)
+.elif exists(${MACHINE_CPU}_elf)
SUBDIR= ${MACHINE_CPU}_elf
.elif exists(${MACHINE_ARCH})
SUBDIR= ${MACHINE_ARCH}
@@ -19,8 +19,4 @@
@false
.endif
-.if (${OBJECT_FMT} != ELF)
-SUBDIR+= c++
-.endif
-
.include bsd.subdir.mk
CVS commit: src/sys/dev/microcode/radeon
Module Name:src Committed By: mrg Date: Mon Jul 5 23:55:02 UTC 2010 Added Files: src/sys/dev/microcode/radeon: CEDAR_me.bin CEDAR_pfp.bin CEDAR_rlc.bin CYPRESS_me.bin CYPRESS_pfp.bin CYPRESS_rlc.bin JUNIPER_me.bin JUNIPER_pfp.bin JUNIPER_rlc.bin LICENSE.radeon Makefile R100_cp.bin R200_cp.bin R300_cp.bin R420_cp.bin R520_cp.bin R600_me.bin R600_pfp.bin R600_rlc.bin R700_rlc.bin REDWOOD_me.bin REDWOOD_pfp.bin REDWOOD_rlc.bin RS600_cp.bin RS690_cp.bin RS780_me.bin RS780_pfp.bin RV610_me.bin RV610_pfp.bin RV620_me.bin RV620_pfp.bin RV630_me.bin RV630_pfp.bin RV635_me.bin RV635_pfp.bin RV670_me.bin RV670_pfp.bin RV710_me.bin RV710_pfp.bin RV730_me.bin RV730_pfp.bin RV770_me.bin RV770_pfp.bin Log Message: add all the radeon firmware files. missed in the previous.. these were sourced from: - linux kernel sources, firmware/radeon/ - people.freedesktop.org/~agd5f/radeon_ucode/ LICENSE.radeon has the full license, which my simple reading sees as being largely similar to other re-distributable licenses for firmware (ie, does not include de-compliation or reverse engineering.) To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/dev/microcode/radeon/CEDAR_me.bin \ src/sys/dev/microcode/radeon/CEDAR_pfp.bin \ src/sys/dev/microcode/radeon/CEDAR_rlc.bin \ src/sys/dev/microcode/radeon/CYPRESS_me.bin \ src/sys/dev/microcode/radeon/CYPRESS_pfp.bin \ src/sys/dev/microcode/radeon/CYPRESS_rlc.bin \ src/sys/dev/microcode/radeon/JUNIPER_me.bin \ src/sys/dev/microcode/radeon/JUNIPER_pfp.bin \ src/sys/dev/microcode/radeon/JUNIPER_rlc.bin \ src/sys/dev/microcode/radeon/LICENSE.radeon \ src/sys/dev/microcode/radeon/Makefile \ src/sys/dev/microcode/radeon/R100_cp.bin \ src/sys/dev/microcode/radeon/R200_cp.bin \ src/sys/dev/microcode/radeon/R300_cp.bin \ src/sys/dev/microcode/radeon/R420_cp.bin \ src/sys/dev/microcode/radeon/R520_cp.bin \ src/sys/dev/microcode/radeon/R600_me.bin \ src/sys/dev/microcode/radeon/R600_pfp.bin \ src/sys/dev/microcode/radeon/R600_rlc.bin \ src/sys/dev/microcode/radeon/R700_rlc.bin \ src/sys/dev/microcode/radeon/REDWOOD_me.bin \ src/sys/dev/microcode/radeon/REDWOOD_pfp.bin \ src/sys/dev/microcode/radeon/REDWOOD_rlc.bin \ src/sys/dev/microcode/radeon/RS600_cp.bin \ src/sys/dev/microcode/radeon/RS690_cp.bin \ src/sys/dev/microcode/radeon/RS780_me.bin \ src/sys/dev/microcode/radeon/RS780_pfp.bin \ src/sys/dev/microcode/radeon/RV610_me.bin \ src/sys/dev/microcode/radeon/RV610_pfp.bin \ src/sys/dev/microcode/radeon/RV620_me.bin \ src/sys/dev/microcode/radeon/RV620_pfp.bin \ src/sys/dev/microcode/radeon/RV630_me.bin \ src/sys/dev/microcode/radeon/RV630_pfp.bin \ src/sys/dev/microcode/radeon/RV635_me.bin \ src/sys/dev/microcode/radeon/RV635_pfp.bin \ src/sys/dev/microcode/radeon/RV670_me.bin \ src/sys/dev/microcode/radeon/RV670_pfp.bin \ src/sys/dev/microcode/radeon/RV710_me.bin \ src/sys/dev/microcode/radeon/RV710_pfp.bin \ src/sys/dev/microcode/radeon/RV730_me.bin \ src/sys/dev/microcode/radeon/RV730_pfp.bin \ src/sys/dev/microcode/radeon/RV770_me.bin \ src/sys/dev/microcode/radeon/RV770_pfp.bin Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/dev/microcode/radeon/CEDAR_me.bin Index: src/sys/dev/microcode/radeon/CEDAR_pfp.bin Index: src/sys/dev/microcode/radeon/CEDAR_rlc.bin Index: src/sys/dev/microcode/radeon/CYPRESS_me.bin Index: src/sys/dev/microcode/radeon/CYPRESS_pfp.bin Index: src/sys/dev/microcode/radeon/CYPRESS_rlc.bin Index: src/sys/dev/microcode/radeon/JUNIPER_me.bin Index: src/sys/dev/microcode/radeon/JUNIPER_pfp.bin Index: src/sys/dev/microcode/radeon/JUNIPER_rlc.bin Index: src/sys/dev/microcode/radeon/LICENSE.radeon diff -u /dev/null src/sys/dev/microcode/radeon/LICENSE.radeon:1.1 --- /dev/null Mon Jul 5 23:55:02 2010 +++ src/sys/dev/microcode/radeon/LICENSE.radeon Mon Jul 5 23:55:02 2010 @@ -0,0 +1,51 @@ +Copyright (C) 2009, 2010 Advanced Micro Devices, Inc. All rights reserved. + +REDISTRIBUTION: Permission is hereby granted, free of any license fees, +to any person obtaining a copy of this microcode (the Software), to +install, reproduce, copy and distribute copies, in binary form only, of +the Software and to permit persons to whom the Software is provided to +do the same, provided that the following conditions are met: + +No reverse engineering, decompilation, or disassembly of this Software +is permitted. + +Redistributions must reproduce the above copyright notice, this +permission notice, and the following disclaimers and notices in the +Software documentation and/or other materials provided with the +Software. + +DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jul 6 00:02:28 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Advantech and Decision Computer's vendor IDs and their products. To generate a diff of this commit: cvs rdiff -u -r1.1036 -r1.1037 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1036 src/sys/dev/pci/pcidevs:1.1037 --- src/sys/dev/pci/pcidevs:1.1036 Fri Jul 2 08:25:05 2010 +++ src/sys/dev/pci/pcidevs Tue Jul 6 00:02:27 2010 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1036 2010/07/02 08:25:05 mrg Exp $ +$NetBSD: pcidevs,v 1.1037 2010/07/06 00:02:27 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -556,6 +556,7 @@ vendor NETBOOST 0x13dc NetBoost vendor SUNDANCETI 0x13f0 Sundance Technology vendor CMEDIA 0x13f6 C-Media Electronics +vendor ADVANTECH 0x13fe Advantech vendor LAVA 0x1407 Lava Semiconductor Manufacturing vendor ETIMEDIA 0x1409 eTIMedia Technology vendor ICENSEMBLE 0x1412 IC Ensemble / VIA Technologies @@ -633,6 +634,7 @@ vendor NETPOWER2 0x5700 NetPower (2nd PCI Vendor ID) vendor XENSOURCE 0x5853 XenSource, Inc. vendor C4T 0x6374 c't Magazin +vendor DCI 0x Decision Computer vendor KURUSUGAWA 0x6809 Kurusugawa Electronics vendor PCHDTV 0x7063 pcHDTV vendor QUANCM 0x8008 Quancm Electronic GmbH @@ -768,6 +770,10 @@ /* Acer products */ product ACER M1435 0x1435 M1435 VL-PCI Bridge +/* Advantech products */ +product ADVANTECH PCI1620AE0 0x1600 PCI-1620-AE 8 port serial (1-4) +product ADVANTECH PCI1620AE1 0x16ff PCI-1620-AE 8 port serial (5-8) + /* Acer Labs products */ product ALI M1445 0x1445 M1445 VL-PCI Bridge product ALI M1449 0x1449 M1449 PCI-ISA Bridge @@ -1796,6 +1802,11 @@ /* Davicom Semiconductor products */ product DAVICOM DM9102 0x9102 DM9102 10/100 Ethernet +/* Decision Computer Inc */ +product DCI APCI4 0x0001 PCCOM 4-port +product DCI APCI8 0x0002 PCCOM 8-port +product DCI APCI2 0x0004 PCCOM 2-port + /* DEC products */ product DEC 21050 0x0001 DC21050 PCI-PCI Bridge product DEC 21040 0x0002 DC21040 (\Tulip\) Ethernet
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Tue Jul 6 00:18:02 UTC 2010 Modified Files: src/share/man/man4: puc.4 Log Message: Sort by name. No any addititon in this change. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/puc.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/puc.4 diff -u src/share/man/man4/puc.4:1.23 src/share/man/man4/puc.4:1.24 --- src/share/man/man4/puc.4:1.23 Wed May 13 12:44:22 2009 +++ src/share/man/man4/puc.4 Tue Jul 6 00:18:02 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: puc.4,v 1.23 2009/05/13 12:44:22 wiz Exp $ +.\ $NetBSD: puc.4,v 1.24 2010/07/06 00:18:02 msaitoh Exp $ .\ .\ Copyright (c) 1998 Christopher G. Demetriou .\ All rights reserved. @@ -61,9 +61,33 @@ The driver currently supports the following cards: .Pp .Bl -tag -width Dv -offset indent -compact +.It Tn ADDI-DATA APCI-7800 (8-port serial) +.It Tn Actiontec 56K PCI Master +.It Tn Avlab Technology, Inc. Low Profile PCI 4 Serial (4-port serial) +.It Tn Boca Research Turbo Serial 654 (4-port serial) +.It Tn Boca Research Turbo Serial 658 (8-port serial) +.It Tn Chase Research / Perle PCI-FAST4 (4-port serial) +.It Tn Chase Research / Perle PCI-FAST8 (8-port serial) +.It Tn Digi International Digi Neo 4 (4-port serial) +.It Tn Digi International Digi Neo 8 (8-port serial) .It Tn Dolphin Peripherals 4014 (dual parallel) .It Tn Dolphin Peripherals 4035 (dual serial) +.It Tn EXAR XR17D152 (2-port serial) +.It Tn EXAR XR17D154 (4-port serial) +.It Tn EXAR XR17D158 (8-port serial) +.It Tn Lava Computers 2SP-PCI (single parallel) +.It Tn Lava Computers Octopus (8-port serial) +.It Tn Lava Computers dual serial +.It Tn Middle Digital, Inc. Weasel serial port +.It Tn Moxa Technologies SmartIO CP104/PCI (4-port serial) +.It Tn NEC PK-UG-X001 K56flex PCI Modem +.It Tn NEC PK-UG-X008 +.It Tn NetMos 1P PCI (single parallel) +.It Tn NetMos 2S1P PCI 16C650 (dual serial and single parallel) +.It Tn NetMos 4S1P PCI NM9845 (4-port serial and single parallel) .It Tn NetMos NM9835 (dual parallel and single serial) +.It Tn Oxford Semiconductor OX16PCI952 (dual serial and single parallel) +.It Tn Oxford Semiconductor OX16PCI954 (4-port serial) .It Tn SIIG Cyber 2P1S PCI (dual parallel and single serial) .It Tn SIIG Cyber 2S1P PCI (dual serial and single parallel) .It Tn SIIG Cyber 4S PCI (quad serial) @@ -72,36 +96,12 @@ .It Tn SIIG Cyber Parallel PCI (single parallel) .It Tn SIIG Cyber Serial Dual PCI (dual serial) .It Tn SIIG Cyber Serial PCI (single serial) +.It Tn Titan PCI-200 (dual serial) +.It Tn Titan PCI-800 (8-port serial) +.It Tn US Robotics (3Com) 3CP5609 PCI 16550 Modem .It Tn VScom PCI-200 (dual serial) .It Tn VScom PCI-400 (4-port serial .It Tn VScom PCI-800 (8-port serial) -.It Tn Titan PCI-800 (8-port serial) -.It Tn Titan PCI-200 (dual serial) -.It Tn NEC PK-UG-X001 K56flex PCI Modem -.It Tn NEC PK-UG-X008 -.It Tn Lava Computers 2SP-PCI (single parallel) -.It Tn Lava Computers dual serial -.It Tn Lava Computers Octopus (8-port serial) -.It Tn US Robotics (3Com) 3CP5609 PCI 16550 Modem -.It Tn Actiontec 56K PCI Master -.It Tn Oxford Semiconductor OX16PCI952 (dual serial and single parallel) -.It Tn Oxford Semiconductor OX16PCI954 (4-port serial) -.It Tn NetMos 1P PCI (single parallel) -.It Tn NetMos 2S1P PCI 16C650 (dual serial and single parallel) -.It Tn NetMos 4S1P PCI NM9845 (4-port serial and single parallel) -.It Tn Middle Digital, Inc. Weasel serial port -.It Tn Avlab Technology, Inc. Low Profile PCI 4 Serial (4-port serial) -.It Tn Boca Research Turbo Serial 654 (4-port serial) -.It Tn Chase Research / Perle PCI-FAST4 (4-port serial) -.It Tn Boca Research Turbo Serial 658 (8-port serial) -.It Tn Chase Research / Perle PCI-FAST8 (8-port serial) -.It Tn ADDI-DATA APCI-7800 (8-port serial) -.It Tn Moxa Technologies SmartIO CP104/PCI (4-port serial) -.It Tn EXAR XR17D152 (2-port serial) -.It Tn EXAR XR17D154 (4-port serial) -.It Tn EXAR XR17D158 (8-port serial) -.It Tn Digi International Digi Neo 4 (4-port serial) -.It Tn Digi International Digi Neo 8 (8-port serial) .El .Pp The driver does not support the cards:
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jul 6 00:35:55 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs Log Message: Fix the name of PCI-1620A-AE. To generate a diff of this commit: cvs rdiff -u -r1.1037 -r1.1038 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1037 src/sys/dev/pci/pcidevs:1.1038 --- src/sys/dev/pci/pcidevs:1.1037 Tue Jul 6 00:02:27 2010 +++ src/sys/dev/pci/pcidevs Tue Jul 6 00:35:55 2010 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1037 2010/07/06 00:02:27 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1038 2010/07/06 00:35:55 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -771,8 +771,8 @@ product ACER M1435 0x1435 M1435 VL-PCI Bridge /* Advantech products */ -product ADVANTECH PCI1620AE0 0x1600 PCI-1620-AE 8 port serial (1-4) -product ADVANTECH PCI1620AE1 0x16ff PCI-1620-AE 8 port serial (5-8) +product ADVANTECH PCI1620AAE0 0x1600 PCI-1620A-AE 8 port serial (1-4) +product ADVANTECH PCI1620AAE1 0x16ff PCI-1620A-AE 8 port serial (5-8) /* Acer Labs products */ product ALI M1445 0x1445 M1445 VL-PCI Bridge
CVS commit: src/usr.bin/make
Module Name:src Committed By: dholland Date: Tue Jul 6 03:56:59 UTC 2010 Modified Files: src/usr.bin/make: make.c Log Message: Revert 1.80, which somehow manages to produce different (wrong) behavior with -jN. Unfixes PR 43534. Need a different approach... To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/usr.bin/make/make.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/make/make.c diff -u src/usr.bin/make/make.c:1.80 src/usr.bin/make/make.c:1.81 --- src/usr.bin/make/make.c:1.80 Wed Jun 30 00:25:04 2010 +++ src/usr.bin/make/make.c Tue Jul 6 03:56:59 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: make.c,v 1.80 2010/06/30 00:25:04 dholland Exp $ */ +/* $NetBSD: make.c,v 1.81 2010/07/06 03:56:59 dholland Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = $NetBSD: make.c,v 1.80 2010/06/30 00:25:04 dholland Exp $; +static char rcsid[] = $NetBSD: make.c,v 1.81 2010/07/06 03:56:59 dholland Exp $; #else #include sys/cdefs.h #ifndef lint #if 0 static char sccsid[] = @(#)make.c 8.1 (Berkeley) 6/6/93; #else -__RCSID($NetBSD: make.c,v 1.80 2010/06/30 00:25:04 dholland Exp $); +__RCSID($NetBSD: make.c,v 1.81 2010/07/06 03:56:59 dholland Exp $); #endif #endif /* not lint */ #endif @@ -1331,7 +1331,6 @@ (void)Dir_MTime(gn); Var_Set(TARGET, gn-path ? gn-path : gn-name, gn, 0); - Var_Set(PREFIX, gn-name, gn, 0); Lst_ForEach(gn-children, MakeUnmark, gn); Lst_ForEach(gn-children, MakeHandleUse, gn);
CVS commit: src/sys/external/bsd/drm/dist/shared-core
Module Name:src Committed By: mrg Date: Tue Jul 6 04:15:45 UTC 2010 Removed Files: src/sys/external/bsd/drm/dist/shared-core: r600_microcode.h radeon_microcode.h radeonhd_microcode.h Log Message: kill these old built-in firmware headers; we use the ones installed into the filesystem from src/sys/microcode/radeon now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 \ src/sys/external/bsd/drm/dist/shared-core/r600_microcode.h cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/external/bsd/drm/dist/shared-core/radeon_microcode.h cvs rdiff -u -r1.1 -r0 \ src/sys/external/bsd/drm/dist/shared-core/radeonhd_microcode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: kiyohara Date: Mon Jul 5 06:50:02 UTC 2010 Modified Files: src/sys/arch/arm/arm: cpufunc.c Log Message: Fix set the control register. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/sys/arch/arm/arm/cpufunc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: kiyohara Date: Mon Jul 5 06:54:48 UTC 2010 Modified Files: src/sys/arch/arm/arm: cpufunc.c Log Message: Remove unnecessary white-spaces. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/sys/arch/arm/arm/cpufunc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netmpls
Module Name:src Committed By: kefren Date: Mon Jul 5 09:54:26 UTC 2010 Modified Files: src/sys/netmpls: mpls_ttl.c Log Message: do some rudimentary checks on ip4 header before passing packet to mpls_icmp_error To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/netmpls/mpls_ttl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: jruoho Date: Mon Jul 5 10:37:36 UTC 2010 Modified Files: src/doc: 3RDPARTY Log Message: ACPICA 20100702 is out. To generate a diff of this commit: cvs rdiff -u -r1.769 -r1.770 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: njoly Date: Mon Jul 5 12:53:59 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.base src/tests/fs: Makefile Added Files: src/tests/fs/vfs: Atffile Makefile t_rmdirrace.c Log Message: Add test program that use sample code from kern/41937, and fs rump helpers to check currently supported filesystems. t_rmdirrace (1/1): 5 test cases ext2fs_race: Passed. ffs_race: Passed. msdosfs_race: Passed. sysvbfs_race: Passed. tmpfs_race: Passed. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.29 -r1.30 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.11 -r1.12 src/tests/fs/Makefile cvs rdiff -u -r0 -r1.1 src/tests/fs/vfs/Atffile src/tests/fs/vfs/Makefile \ src/tests/fs/vfs/t_rmdirrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/vfs
Module Name:src Committed By: njoly Date: Mon Jul 5 13:03:19 UTC 2010 Modified Files: src/tests/fs/vfs: t_rmdirrace.c Log Message: Fix copyright, noted by Jukka Ruohonen. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/fs/vfs/t_rmdirrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/atf/dist/atf-version
Module Name:src Committed By: jmmv Date: Mon Jul 5 14:21:00 UTC 2010 Removed Files: src/external/bsd/atf/dist/atf-version: revision.h Log Message: Remove file that should not be in the distribution so that atf-version gets the correct output. Fixed upstream as well. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-version/revision.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: tsutsui Date: Mon Jul 5 14:27:26 UTC 2010 Modified Files: src/sys/dev/usb: if_upgt.c Log Message: Add a missing newline in error messages. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/if_upgt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hpcarm/conf
Module Name:src Committed By: tsutsui Date: Mon Jul 5 14:30:00 UTC 2010 Modified Files: src/sys/arch/hpcarm/conf: WZERO3 Log Message: Add upgt(4) for WS003SH/WS004SH internal WLAN. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hpcarm/conf/WZERO3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests
Module Name:src Committed By: jmmv Date: Mon Jul 5 16:27:09 UTC 2010 Modified Files: src/tests/fs/puffs: t_psshfs.sh src/tests/fs/tmpfs: t_vnd.sh t_vnode_leak.sh src/tests/kernel: t_umount.sh src/tests/modules: t_modload.sh Log Message: Properly mark some test cases as having a cleanup routine. Stupidity of the API? Most likely; will revise it. Fixes atf-run breaking when running t_psshfs. This does not resolve the underlying issue though, which is atf-run getting confused trying to unmount the temporary mount point by itself (I think). (I'm now wondering if atf should be bothering about unmounting stuff at all. Maybe not. It is a tricky and uncommon thing.) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/fs/puffs/t_psshfs.sh cvs rdiff -u -r1.4 -r1.5 src/tests/fs/tmpfs/t_vnd.sh \ src/tests/fs/tmpfs/t_vnode_leak.sh cvs rdiff -u -r1.3 -r1.4 src/tests/kernel/t_umount.sh cvs rdiff -u -r1.6 -r1.7 src/tests/modules/t_modload.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/ffs
Module Name:src Committed By: jmmv Date: Mon Jul 5 16:34:41 UTC 2010 Modified Files: src/tests/fs/ffs: t_mount.c Log Message: Use expect_fail instead of defining xfail. Looks like I missed this one during the import of atf 0.10. Thanks po...@. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/fs/ffs/t_mount.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/fs/ffs
Module Name:src Committed By: pooka Date: Mon Jul 5 17:12:49 UTC 2010 Modified Files: src/tests/fs/ffs: t_mount.c Log Message: * fill PR number to xfail now that we have one -- let's try not to add any xfail tests without an associated PR * move xfail to the correct place To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/fs/ffs/t_mount.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Mon Jul 5 20:32:24 UTC 2010 Modified Files: src/distrib/sets/lists/base: mi src/sys/dev/microcode: Makefile src/sys/external/bsd/drm/dist/bsd-core: radeon_drv.c src/sys/external/bsd/drm/dist/shared-core: r600_cp.c radeon_cp.c radeon_drv.h Log Message: move all the radeondrm firmware images into the filesystem. check that some firmware sizes are the expected size. (XXX make all.) based upon similar changes seen in the linux radeon drm driver. this saves about 250KB in the kernel or module. To generate a diff of this commit: cvs rdiff -u -r1.873 -r1.874 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.7 -r1.8 src/sys/dev/microcode/Makefile cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm/dist/bsd-core/radeon_drv.c cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm/dist/shared-core/r600_cp.c cvs rdiff -u -r1.7 -r1.8 \ src/sys/external/bsd/drm/dist/shared-core/radeon_cp.c cvs rdiff -u -r1.8 -r1.9 \ src/sys/external/bsd/drm/dist/shared-core/radeon_drv.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/mtree
Module Name:src Committed By: mrg Date: Mon Jul 5 20:57:19 UTC 2010 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: add ./usr/libdata/firmware/radeon To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/union
Module Name:src Committed By: pooka Date: Mon Jul 5 21:27:08 UTC 2010 Modified Files: src/sys/fs/union: union_vfsops.c Log Message: union doesn't use layerfs (avoids panic in kernel bootstrap when union is compiled in but none of the layer-using file systems are). To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/fs/union/union_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/csu
Module Name:src Committed By: mrg Date: Mon Jul 5 21:27:56 UTC 2010 Modified Files: src/lib/csu: Makefile Removed Files: src/lib/csu/arm32: Makefile c++rt0.c crt0.c src/lib/csu/c++: Makefile c++rt0.c src/lib/csu/common_aout: Makefile.inc common.c common.h src/lib/csu/i386: Makefile crt0.c src/lib/csu/m68k: Makefile crt0.c src/lib/csu/sh3: Makefile crt0.c src/lib/csu/sparc: Makefile crt0.c src/lib/csu/vax: Makefile crt0.c Log Message: delete all the a.out csu code. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/csu/Makefile cvs rdiff -u -r1.14 -r0 src/lib/csu/arm32/Makefile cvs rdiff -u -r1.4 -r0 src/lib/csu/arm32/c++rt0.c cvs rdiff -u -r1.13 -r0 src/lib/csu/arm32/crt0.c cvs rdiff -u -r1.17 -r0 src/lib/csu/c++/Makefile cvs rdiff -u -r1.11 -r0 src/lib/csu/c++/c++rt0.c cvs rdiff -u -r1.10 -r0 src/lib/csu/common_aout/Makefile.inc cvs rdiff -u -r1.20 -r0 src/lib/csu/common_aout/common.c cvs rdiff -u -r1.15 -r0 src/lib/csu/common_aout/common.h cvs rdiff -u -r1.26 -r0 src/lib/csu/i386/Makefile cvs rdiff -u -r1.35 -r0 src/lib/csu/i386/crt0.c cvs rdiff -u -r1.18 -r0 src/lib/csu/m68k/Makefile cvs rdiff -u -r1.24 -r0 src/lib/csu/m68k/crt0.c cvs rdiff -u -r1.1 -r0 src/lib/csu/sh3/Makefile cvs rdiff -u -r1.3 -r0 src/lib/csu/sh3/crt0.c cvs rdiff -u -r1.19 -r0 src/lib/csu/sparc/Makefile cvs rdiff -u -r1.29 -r0 src/lib/csu/sparc/crt0.c cvs rdiff -u -r1.11 -r0 src/lib/csu/vax/Makefile cvs rdiff -u -r1.17 -r0 src/lib/csu/vax/crt0.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jul 6 00:02:28 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Advantech and Decision Computer's vendor IDs and their products. To generate a diff of this commit: cvs rdiff -u -r1.1036 -r1.1037 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jul 6 00:04:21 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen. To generate a diff of this commit: cvs rdiff -u -r1.1033 -r1.1034 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1032 -r1.1033 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Tue Jul 6 00:18:02 UTC 2010 Modified Files: src/share/man/man4: puc.4 Log Message: Sort by name. No any addititon in this change. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/puc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jul 6 00:35:55 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs Log Message: Fix the name of PCI-1620A-AE. To generate a diff of this commit: cvs rdiff -u -r1.1037 -r1.1038 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jul 6 00:36:28 UTC 2010 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regen. To generate a diff of this commit: cvs rdiff -u -r1.1034 -r1.1035 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1033 -r1.1034 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm/dist/shared-core
Module Name:src Committed By: mrg Date: Tue Jul 6 04:15:45 UTC 2010 Removed Files: src/sys/external/bsd/drm/dist/shared-core: r600_microcode.h radeon_microcode.h radeonhd_microcode.h Log Message: kill these old built-in firmware headers; we use the ones installed into the filesystem from src/sys/microcode/radeon now. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 \ src/sys/external/bsd/drm/dist/shared-core/r600_microcode.h cvs rdiff -u -r1.1.1.1 -r0 \ src/sys/external/bsd/drm/dist/shared-core/radeon_microcode.h cvs rdiff -u -r1.1 -r0 \ src/sys/external/bsd/drm/dist/shared-core/radeonhd_microcode.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
