CVS commit: src/external/bsd/liblzf/dist
Module Name:src
Committed By: agc
Date: Tue Apr 5 06:24:42 UTC 2011
Modified Files:
src/external/bsd/liblzf/dist: lzf_c.c lzf_d.c
Log Message:
get rid of most (but not all) lint on amd64
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/liblzf/dist/lzf_c.c \
src/external/bsd/liblzf/dist/lzf_d.c
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/liblzf/dist/lzf_c.c
diff -u src/external/bsd/liblzf/dist/lzf_c.c:1.2 src/external/bsd/liblzf/dist/lzf_c.c:1.3
--- src/external/bsd/liblzf/dist/lzf_c.c:1.2 Wed Feb 3 03:55:38 2010
+++ src/external/bsd/liblzf/dist/lzf_c.c Tue Apr 5 06:24:42 2011
@@ -148,7 +148,7 @@
hslot = htab + IDX (hval);
ref = *hslot; *hslot = ip;
- if (1
+ if (/*CONSTCOND*/1
#if INIT_HTAB
&& ref < ip /* the next test will actually take care of this, but this is faster */
#endif
@@ -160,14 +160,14 @@
&& ref[1] == ip[1]
&& ref[2] == ip[2]
#else
- && *(u16 *)ref == *(u16 *)ip
+ && *(const u16 *)(const void *)ref == *(const u16 *)(const void *)ip
&& ref[2] == ip[2]
#endif
)
{
/* match found at *ref++ */
unsigned int len = 2;
- unsigned int maxlen = in_end - ip - len;
+ unsigned int maxlen = (unsigned)(in_end - ip) - len;
maxlen = maxlen > MAX_REF ? MAX_REF : maxlen;
if (expect_false (op + 3 + 1 >= out_end)) /* first a faster conservative test */
@@ -214,15 +214,15 @@
if (len < 7)
{
- *op++ = (off >> 8) + (len << 5);
+ *op++ = (unsigned char)((off >> 8) + (len << 5));
}
else
{
- *op++ = (off >> 8) + ( 7 << 5);
+ *op++ = (unsigned char)((off >> 8) + ( 7 << 5));
*op++ = len - 7;
}
- *op++ = off;
+ *op++ = (unsigned char)off;
lit = 0; op++; /* start run */
ip += len + 1;
@@ -266,6 +266,7 @@
lit++; *op++ = *ip++;
+ /*LINTED*/
if (expect_false (lit == MAX_LIT))
{
op [- lit - 1] = lit - 1; /* stop run */
@@ -281,6 +282,7 @@
{
lit++; *op++ = *ip++;
+ /*LINTED*/
if (expect_false (lit == MAX_LIT))
{
op [- lit - 1] = lit - 1; /* stop run */
@@ -291,6 +293,6 @@
op [- lit - 1] = lit - 1; /* end run */
op -= !lit; /* undo run if length is zero */
- return op - (u8 *)out_data;
+ return (unsigned)(op - (u8 *)out_data);
}
Index: src/external/bsd/liblzf/dist/lzf_d.c
diff -u src/external/bsd/liblzf/dist/lzf_d.c:1.2 src/external/bsd/liblzf/dist/lzf_d.c:1.3
--- src/external/bsd/liblzf/dist/lzf_d.c:1.2 Wed Feb 3 03:55:38 2010
+++ src/external/bsd/liblzf/dist/lzf_d.c Tue Apr 5 06:24:42 2011
@@ -143,6 +143,6 @@
}
while (ip < in_end);
- return op - (u8 *)out_data;
+ return (unsigned)(op - (u8 *)out_data);
}
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: riz Date: Tue Apr 5 06:23:45 UTC 2011 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.1 Log Message: Ticket 1593 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-5.1.1 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-5.1.1 diff -u src/doc/CHANGES-5.1.1:1.1.2.19 src/doc/CHANGES-5.1.1:1.1.2.20 --- src/doc/CHANGES-5.1.1:1.1.2.19 Sun Apr 3 06:11:28 2011 +++ src/doc/CHANGES-5.1.1 Tue Apr 5 06:23:45 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.1,v 1.1.2.19 2011/04/03 06:11:28 jdc Exp $ +# $NetBSD: CHANGES-5.1.1,v 1.1.2.20 2011/04/05 06:23:45 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.1.1 release: @@ -2358,3 +2358,9 @@ mitigation for CVE-2011-1547 [spz, ticket #1590] +lib/libc/net/getservbyname_r.c patch +lib/libc/net/getservbyport_r.c patch + + Protect against stack smashes. + [christos, ticket #1593] +
CVS commit: [netbsd-5-1] src/lib/libc/net
Module Name:src
Committed By: riz
Date: Tue Apr 5 06:23:25 UTC 2011
Modified Files:
src/lib/libc/net [netbsd-5-1]: getservbyname_r.c getservbyport_r.c
Log Message:
Apply patch (requested by christos in ticket #1593):
lib/libc/net/getservbyname_r.c patch
lib/libc/net/getservbyport_r.c patch
Protect against stack smashes (from Maksymilian Arciemowicz)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.28.1 src/lib/libc/net/getservbyname_r.c \
src/lib/libc/net/getservbyport_r.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/libc/net/getservbyname_r.c
diff -u src/lib/libc/net/getservbyname_r.c:1.6 src/lib/libc/net/getservbyname_r.c:1.6.28.1
--- src/lib/libc/net/getservbyname_r.c:1.6 Wed Mar 21 02:35:39 2007
+++ src/lib/libc/net/getservbyname_r.c Tue Apr 5 06:23:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getservbyname_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $ */
+/* $NetBSD: getservbyname_r.c,v 1.6.28.1 2011/04/05 06:23:25 riz Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getservbyname_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $");
+__RCSID("$NetBSD: getservbyname_r.c,v 1.6.28.1 2011/04/05 06:23:25 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -70,6 +70,8 @@
key.size = snprintf(buf, sizeof(buf), "\376%s/%s",
name, proto);
key.size++;
+ if (key.size > sizeof(buf))
+ return NULL;
if ((*db->get)(db, &key, &data, 0) != 0)
return NULL;
Index: src/lib/libc/net/getservbyport_r.c
diff -u src/lib/libc/net/getservbyport_r.c:1.6 src/lib/libc/net/getservbyport_r.c:1.6.28.1
--- src/lib/libc/net/getservbyport_r.c:1.6 Wed Mar 21 02:35:39 2007
+++ src/lib/libc/net/getservbyport_r.c Tue Apr 5 06:23:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getservbyport_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $ */
+/* $NetBSD: getservbyport_r.c,v 1.6.28.1 2011/04/05 06:23:25 riz Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getservbyport.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getservbyport_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $");
+__RCSID("$NetBSD: getservbyport_r.c,v 1.6.28.1 2011/04/05 06:23:25 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,6 +71,8 @@
key.size = snprintf(buf, sizeof(buf), "\377%d/%s", port,
proto);
key.size++;
+ if (key.size > sizeof(buf))
+ return NULL;
if ((*db->get)(db, &key, &data, 0) != 0)
return NULL;
CVS commit: [netbsd-5-0] src/lib/libc/net
Module Name:src
Committed By: riz
Date: Tue Apr 5 06:22:41 UTC 2011
Modified Files:
src/lib/libc/net [netbsd-5-0]: getservbyname_r.c getservbyport_r.c
Log Message:
Apply patch (requested by christos in ticket #1593):
lib/libc/net/getservbyname_r.c patch
lib/libc/net/getservbyport_r.c patch
Protect against stack smashes (from Maksymilian Arciemowicz)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.24.1 src/lib/libc/net/getservbyname_r.c \
src/lib/libc/net/getservbyport_r.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/libc/net/getservbyname_r.c
diff -u src/lib/libc/net/getservbyname_r.c:1.6 src/lib/libc/net/getservbyname_r.c:1.6.24.1
--- src/lib/libc/net/getservbyname_r.c:1.6 Wed Mar 21 02:35:39 2007
+++ src/lib/libc/net/getservbyname_r.c Tue Apr 5 06:22:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getservbyname_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $ */
+/* $NetBSD: getservbyname_r.c,v 1.6.24.1 2011/04/05 06:22:40 riz Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getservbyname_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $");
+__RCSID("$NetBSD: getservbyname_r.c,v 1.6.24.1 2011/04/05 06:22:40 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -70,6 +70,8 @@
key.size = snprintf(buf, sizeof(buf), "\376%s/%s",
name, proto);
key.size++;
+ if (key.size > sizeof(buf))
+ return NULL;
if ((*db->get)(db, &key, &data, 0) != 0)
return NULL;
Index: src/lib/libc/net/getservbyport_r.c
diff -u src/lib/libc/net/getservbyport_r.c:1.6 src/lib/libc/net/getservbyport_r.c:1.6.24.1
--- src/lib/libc/net/getservbyport_r.c:1.6 Wed Mar 21 02:35:39 2007
+++ src/lib/libc/net/getservbyport_r.c Tue Apr 5 06:22:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getservbyport_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $ */
+/* $NetBSD: getservbyport_r.c,v 1.6.24.1 2011/04/05 06:22:40 riz Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getservbyport.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getservbyport_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $");
+__RCSID("$NetBSD: getservbyport_r.c,v 1.6.24.1 2011/04/05 06:22:40 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,6 +71,8 @@
key.size = snprintf(buf, sizeof(buf), "\377%d/%s", port,
proto);
key.size++;
+ if (key.size > sizeof(buf))
+ return NULL;
if ((*db->get)(db, &key, &data, 0) != 0)
return NULL;
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Tue Apr 5 06:22:22 UTC 2011 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1587, 1588, 1593 To generate a diff of this commit: cvs rdiff -u -r1.1.2.70 -r1.1.2.71 src/doc/CHANGES-5.2 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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.70 src/doc/CHANGES-5.2:1.1.2.71 --- src/doc/CHANGES-5.2:1.1.2.70 Sun Apr 3 06:10:29 2011 +++ src/doc/CHANGES-5.2 Tue Apr 5 06:22:21 2011 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.70 2011/04/03 06:10:29 jdc Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.71 2011/04/05 06:22:21 riz Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -4951,3 +4951,20 @@ mitigation for CVE-2011-1547 [spz, ticket #1590] +sys/net/bpf.c 1.163 + + Allocate buffers with (M_WAITOK | M_CANFAIL) instead of M_NOWAIT. + [bouyer, ticket #1587] + +sys/dev/pci/if_jme.c1.17 + + Some bus_dma(9)-related and memory allocation fixes for + jme(4). + [bouyer, ticket #1588] + +lib/libc/net/getservbyname_r.c patch +lib/libc/net/getservbyport_r.c patch + + Protect against stack smashes. + [christos, ticket #1593] +
CVS commit: [netbsd-5] src/lib/libc/net
Module Name:src
Committed By: riz
Date: Tue Apr 5 06:21:19 UTC 2011
Modified Files:
src/lib/libc/net [netbsd-5]: getservbyname_r.c getservbyport_r.c
Log Message:
Apply patch (requested by christos in ticket #1593):
lib/libc/net/getservbyname_r.c patch
lib/libc/net/getservbyport_r.c patch
Protect against stack smashes (from Maksymilian Arciemowicz)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.18.1 src/lib/libc/net/getservbyname_r.c \
src/lib/libc/net/getservbyport_r.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/libc/net/getservbyname_r.c
diff -u src/lib/libc/net/getservbyname_r.c:1.6 src/lib/libc/net/getservbyname_r.c:1.6.18.1
--- src/lib/libc/net/getservbyname_r.c:1.6 Wed Mar 21 02:35:39 2007
+++ src/lib/libc/net/getservbyname_r.c Tue Apr 5 06:21:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getservbyname_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $ */
+/* $NetBSD: getservbyname_r.c,v 1.6.18.1 2011/04/05 06:21:18 riz Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getservbyname_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $");
+__RCSID("$NetBSD: getservbyname_r.c,v 1.6.18.1 2011/04/05 06:21:18 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -70,6 +70,8 @@
key.size = snprintf(buf, sizeof(buf), "\376%s/%s",
name, proto);
key.size++;
+ if (key.size > sizeof(buf))
+ return NULL;
if ((*db->get)(db, &key, &data, 0) != 0)
return NULL;
Index: src/lib/libc/net/getservbyport_r.c
diff -u src/lib/libc/net/getservbyport_r.c:1.6 src/lib/libc/net/getservbyport_r.c:1.6.18.1
--- src/lib/libc/net/getservbyport_r.c:1.6 Wed Mar 21 02:35:39 2007
+++ src/lib/libc/net/getservbyport_r.c Tue Apr 5 06:21:19 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: getservbyport_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $ */
+/* $NetBSD: getservbyport_r.c,v 1.6.18.1 2011/04/05 06:21:19 riz Exp $ */
/*
* Copyright (c) 1983, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getservbyport.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: getservbyport_r.c,v 1.6 2007/03/21 02:35:39 christos Exp $");
+__RCSID("$NetBSD: getservbyport_r.c,v 1.6.18.1 2011/04/05 06:21:19 riz Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -71,6 +71,8 @@
key.size = snprintf(buf, sizeof(buf), "\377%d/%s", port,
proto);
key.size++;
+ if (key.size > sizeof(buf))
+ return NULL;
if ((*db->get)(db, &key, &data, 0) != 0)
return NULL;
CVS commit: src
Module Name:src Committed By: jruoho Date: Tue Apr 5 06:15:31 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi src/tests/lib/libc/gen: Makefile src/tests/lib/libc/stdlib: Makefile Added Files: src/tests/lib/libc/gen: t_getgrent.c t_ttyname.c src/tests/lib/libc/stdlib: t_strtod.c Log Message: Add simple test cases for ttyname(3), strtod(3), and getgrent(3). To generate a diff of this commit: cvs rdiff -u -r1.291 -r1.292 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.16 -r1.17 src/tests/lib/libc/gen/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/gen/t_getgrent.c \ src/tests/lib/libc/gen/t_ttyname.c cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libc/stdlib/Makefile cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/stdlib/t_strtod.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.291 src/distrib/sets/lists/tests/mi:1.292 --- src/distrib/sets/lists/tests/mi:1.291 Mon Apr 4 19:08:42 2011 +++ src/distrib/sets/lists/tests/mi Tue Apr 5 06:15:30 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.291 2011/04/04 19:08:42 jruoho Exp $ +# $NetBSD: mi,v 1.292 2011/04/05 06:15:30 jruoho Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -336,6 +336,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/gen/t_basedirname.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_dir.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_fmtcheck.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/t_getgrent.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_glob_star.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_humanize_number.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_ldexp.debug tests-lib-debug debug,atf @@ -345,6 +346,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/gen/t_rbstress.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_syslog_pthread.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_siginfo.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/t_ttyname.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_vis.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/getaddrinfo tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/getaddrinfo/data tests-obsolete obsolete @@ -407,6 +409,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_hsearch.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_mi_vector_hash.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_posix_memalign.debug tests-lib-debug debug,atf +./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_strtod.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_strtox.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/stringtests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/string/t_memcpy.debug tests-lib-debug debug,atf @@ -1714,6 +1717,7 @@ ./usr/tests/lib/libc/gen/t_basedirname tests-lib-tests atf ./usr/tests/lib/libc/gen/t_dir tests-lib-tests atf ./usr/tests/lib/libc/gen/t_fmtcheck tests-lib-tests atf +./usr/tests/lib/libc/gen/t_getgrent tests-lib-tests atf ./usr/tests/lib/libc/gen/t_glob_star tests-lib-tests atf ./usr/tests/lib/libc/gen/t_humanize_number tests-lib-tests atf ./usr/tests/lib/libc/gen/t_ldexp tests-lib-tests atf @@ -1723,6 +1727,7 @@ ./usr/tests/lib/libc/gen/t_rbstress tests-lib-tests atf ./usr/tests/lib/libc/gen/t_syslog_pthread tests-lib-tests atf ./usr/tests/lib/libc/gen/t_siginfo tests-lib-tests atf +./usr/tests/lib/libc/gen/t_ttyname tests-lib-tests atf ./usr/tests/lib/libc/gen/t_vis tests-lib-tests atf ./usr/tests/lib/libc/getaddrinfo tests-obsolete obsolete ./usr/tests/lib/libc/getaddrinfo/Atffile tests-obsolete obsolete @@ -1860,6 +1865,7 @@ ./usr/tests/lib/libc/stdlib/t_hsearch tests-lib-tests atf ./usr/tests/lib/libc/stdlib/t_mi_vector_hash tests-lib-tests atf ./usr/tests/lib/libc/stdlib/t_posix_memalign tests-lib-tests atf +./usr/tests/lib/libc/stdlib/t_strtod tests-lib-tests atf ./usr/tests/lib/libc/stdlib/t_strtox tests-lib-tests atf ./usr/tests/lib/libc/string tests-lib-tests ./usr/tests/lib/libc/string/Atffile tests-lib-tests atf Index: src/tests/lib/libc/gen/Makefile diff -u src/tests/lib/libc/gen/Makefile:1.16 src/tests/lib/libc/gen/Makefile:1.17 --- src/tests/lib/libc/gen/Makefile:1.16 Mon Apr 4 09:52:18 2011 +++ src/tests/lib/libc/gen/Makefile Tue Apr 5 06:15:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2011/04/04 09:52:18 jruoho Exp $ +# $NetBSD: Makefile,v 1.17 2011/04/05 0
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: riz
Date: Tue Apr 5 06:12:46 UTC 2011
Modified Files:
src/sys/dev/pci [netbsd-5]: if_jme.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1588):
sys/dev/pci/if_jme.c: revision 1.17
Some bus_dma(9)-related and memory allocation fixes:
- always bus_dmamap_unload() before recycling a receive descriptor
- make sure to not sleep from interrupt context: call bus_dmamap_load with
M_NOWAIT, and create dma maps BUS_DMA_ALLOCNOW.
- if a receive descriptor has a NULL mbuf try to allocate a new one, don't
try to receive it.
To generate a diff of this commit:
cvs rdiff -u -r1.4.6.3 -r1.4.6.4 src/sys/dev/pci/if_jme.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/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.4.6.3 src/sys/dev/pci/if_jme.c:1.4.6.4
--- src/sys/dev/pci/if_jme.c:1.4.6.3 Sun Jan 16 12:51:59 2011
+++ src/sys/dev/pci/if_jme.c Tue Apr 5 06:12:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_jme.c,v 1.4.6.3 2011/01/16 12:51:59 bouyer Exp $ */
+/* $NetBSD: if_jme.c,v 1.4.6.4 2011/04/05 06:12:46 riz Exp $ */
/*
* Copyright (c) 2008 Manuel Bouyer. All rights reserved.
@@ -63,7 +63,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.4.6.3 2011/01/16 12:51:59 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.4.6.4 2011/04/05 06:12:46 riz Exp $");
#include
@@ -447,13 +447,14 @@
for (i = 0; i < JME_NBUFS; i++) {
sc->jme_txmbuf[i] = sc->jme_rxmbuf[i] = NULL;
if (bus_dmamap_create(sc->jme_dmatag, JME_MAX_TX_LEN,
- JME_NBUFS, JME_MAX_TX_LEN, 0, BUS_DMA_NOWAIT,
+ JME_NBUFS, JME_MAX_TX_LEN, 0,
+ BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW,
&sc->jme_txmbufm[i]) != 0) {
aprint_error_dev(self, "can't allocate DMA TX map\n");
return;
}
if (bus_dmamap_create(sc->jme_dmatag, JME_MAX_RX_LEN,
- 1, JME_MAX_RX_LEN, 0, BUS_DMA_NOWAIT,
+ 1, JME_MAX_RX_LEN, 0, BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW,
&sc->jme_rxmbufm[i]) != 0) {
aprint_error_dev(self, "can't allocate DMA RX map\n");
return;
@@ -705,6 +706,8 @@
}
map = sc->jme_rxmbufm[i];
m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
+ KASSERT(m->m_len == MCLBYTES);
+
error = bus_dmamap_load_mbuf(sc->jme_dmatag, map, m,
BUS_DMA_READ|BUS_DMA_NOWAIT);
if (error) {
@@ -1050,6 +1053,7 @@
static void
jme_intr_rx(jme_softc_t *sc) {
struct mbuf *m, *mhead;
+ bus_dmamap_t mmap;
struct ifnet *ifp = &sc->jme_if;
uint32_t flags, buflen;
int i, ipackets, nsegs, seg, error;
@@ -1063,7 +1067,7 @@
sc->jme_rx_cons, le32toh(sc->jme_rxring[sc->jme_rx_cons].flags));
#endif
ipackets = 0;
- while((le32toh(sc->jme_rxring[ sc->jme_rx_cons].flags) & JME_RD_OWN)
+ while((le32toh(sc->jme_rxring[sc->jme_rx_cons].flags) & JME_RD_OWN)
== 0) {
i = sc->jme_rx_cons;
desc = &sc->jme_rxring[i];
@@ -1071,11 +1075,19 @@
printf("rxintr i %d flags 0x%x buflen 0x%x\n",
i, le32toh(desc->flags), le32toh(desc->buflen));
#endif
+ if (sc->jme_rxmbuf[i] == NULL) {
+ if ((error = jme_add_rxbuf(sc, NULL)) != 0) {
+aprint_error_dev(sc->jme_dev,
+"can't add new mbuf to empty slot: %d\n",
+error);
+break;
+ }
+ JME_DESC_INC(sc->jme_rx_cons, JME_NBUFS);
+ i = sc->jme_rx_cons;
+ continue;
+ }
if ((le32toh(desc->buflen) & JME_RD_VALID) == 0)
break;
- bus_dmamap_sync(sc->jme_dmatag, sc->jme_rxmbufm[i], 0,
- sc->jme_rxmbufm[i]->dm_mapsize, BUS_DMASYNC_POSTREAD);
- bus_dmamap_unload(sc->jme_dmatag, sc->jme_rxmbufm[i]);
buflen = le32toh(desc->buflen);
nsegs = JME_RX_NSEGS(buflen);
@@ -1093,6 +1105,10 @@
for (seg = 0; seg < nsegs; seg++) {
m = sc->jme_rxmbuf[i];
sc->jme_rxmbuf[i] = NULL;
+mmap = sc->jme_rxmbufm[i];
+bus_dmamap_sync(sc->jme_dmatag, mmap, 0,
+mmap->dm_mapsize, BUS_DMASYNC_POSTREAD);
+bus_dmamap_unload(sc->jme_dmatag, mmap);
if ((error = jme_add_rxbuf(sc, m)) != 0)
aprint_error_dev(sc->jme_dev,
"can't reuse mbuf: %d\n", error);
@@ -1104,11 +1120,24 @@
/* receive this packet */
mhead = m = sc->jme_rxmbuf[i];
sc->jme_rxmbuf[i] = NULL;
+ mmap = sc->jme_rxmbufm[i];
+ bus_dmamap_sync(sc->jme_dmatag, mmap, 0,
+ mmap->dm_mapsize, BUS_DMASYNC_POSTREAD);
+ bus_dmamap_unload(sc->jme_dmatag, mmap);
/* add a new buffer to chain */
- if (jme_add_rxbuf(sc, NULL) == ENOBUFS) {
- for (seg = 0; seg < nsegs; seg++) {
+ if (jme_add_rxbuf(sc, NULL) != 0) {
+ if ((error = jme_add_rxbuf(sc, m)) != 0)
+aprint_error_dev(sc->jme_dev,
+"can't reuse mbuf: %d\n", error);
+ JME_DESC_INC(sc->jme_rx_cons, JME_NBUFS);
+ i = sc->jme_rx_cons;
+ for (seg = 1; seg < nsegs; seg++) {
m = sc->jme_rxmbuf[i];
sc->jme_rxmbuf[i] = NULL;
+mmap = sc->jme_rxmbufm[i];
+bus_dmamap_sync(sc->jme_dmatag, mmap, 0,
+mmap->dm_mapsize, BUS_DMASYNC_POSTREAD);
+bus_d
CVS commit: [netbsd-5] src/sys/net
Module Name:src
Committed By: riz
Date: Tue Apr 5 06:10:50 UTC 2011
Modified Files:
src/sys/net [netbsd-5]: bpf.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1587):
sys/net/bpf.c: revision 1.163
Allocate buffers with (M_WAITOK | M_CANFAIL) instead of M_NOWAIT.
M_NOWAIT cause dhcpd on a low-memory server with lots of interfaces to
occasionally fail to start with ENOBUFS; (M_WAITOK | M_CANFAIL) seems to
fix this.
Tested on 3 different dhcp servers.
To generate a diff of this commit:
cvs rdiff -u -r1.141.6.1 -r1.141.6.2 src/sys/net/bpf.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/bpf.c
diff -u src/sys/net/bpf.c:1.141.6.1 src/sys/net/bpf.c:1.141.6.2
--- src/sys/net/bpf.c:1.141.6.1 Sat Apr 4 23:36:28 2009
+++ src/sys/net/bpf.c Tue Apr 5 06:10:50 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.141.6.1 2009/04/04 23:36:28 snj Exp $ */
+/* $NetBSD: bpf.c,v 1.141.6.2 2011/04/05 06:10:50 riz Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.141.6.1 2009/04/04 23:36:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bpf.c,v 1.141.6.2 2011/04/05 06:10:50 riz Exp $");
#if defined(_KERNEL_OPT)
#include "opt_bpf.h"
@@ -1528,10 +1528,10 @@
bpf_allocbufs(struct bpf_d *d)
{
- d->bd_fbuf = malloc(d->bd_bufsize, M_DEVBUF, M_NOWAIT);
+ d->bd_fbuf = malloc(d->bd_bufsize, M_DEVBUF, M_WAITOK | M_CANFAIL);
if (!d->bd_fbuf)
return (ENOBUFS);
- d->bd_sbuf = malloc(d->bd_bufsize, M_DEVBUF, M_NOWAIT);
+ d->bd_sbuf = malloc(d->bd_bufsize, M_DEVBUF, M_WAITOK | M_CANFAIL);
if (!d->bd_sbuf) {
free(d->bd_fbuf, M_DEVBUF);
return (ENOBUFS);
CVS commit: src/etc/rc.d
Module Name:src
Committed By: enami
Date: Tue Apr 5 02:52:28 UTC 2011
Modified Files:
src/etc/rc.d: ccd
Log Message:
Unconfigure on shutdown so that component deivces are closed.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/etc/rc.d/ccd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ccd
diff -u src/etc/rc.d/ccd:1.6 src/etc/rc.d/ccd:1.7
--- src/etc/rc.d/ccd:1.6 Tue Apr 21 16:08:57 2009
+++ src/etc/rc.d/ccd Tue Apr 5 02:52:27 2011
@@ -1,17 +1,18 @@
#!/bin/sh
#
-# $NetBSD: ccd,v 1.6 2009/04/21 16:08:57 joerg Exp $
+# $NetBSD: ccd,v 1.7 2011/04/05 02:52:27 enami Exp $
#
# PROVIDE: ccd
# BEFORE: DISKS
+# KEYWORD: shutdown
$_rc_subr_loaded . /etc/rc.subr
name="ccd"
rcvar=$name
start_cmd="ccd_start"
-stop_cmd=":"
+stop_cmd="ccd_stop"
ccd_start()
{
@@ -21,5 +22,13 @@
fi
}
+ccd_stop()
+{
+ if [ -f /etc/ccd.conf ]; then
+ echo "Unconfiguring CCD devices."
+ ccdconfig -U
+ fi
+}
+
load_rc_config $name
run_rc_command "$1"
CVS commit: src/sys/kern
Module Name:src Committed By: yamt Date: Tue Apr 5 00:27:36 UTC 2011 Modified Files: src/sys/kern: kern_time.c Log Message: fix assertion failure in timer_intr. CLOCK_REALTIME timers can be on timer_queue. To generate a diff of this commit: cvs rdiff -u -r1.166 -r1.167 src/sys/kern/kern_time.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/kern/kern_time.c diff -u src/sys/kern/kern_time.c:1.166 src/sys/kern/kern_time.c:1.167 --- src/sys/kern/kern_time.c:1.166 Fri Dec 17 22:08:18 2010 +++ src/sys/kern/kern_time.c Tue Apr 5 00:27:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_time.c,v 1.166 2010/12/17 22:08:18 yamt Exp $ */ +/* $NetBSD: kern_time.c,v 1.167 2011/04/05 00:27:35 yamt Exp $ */ /*- * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.166 2010/12/17 22:08:18 yamt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.167 2011/04/05 00:27:35 yamt Exp $"); #include #include @@ -1282,7 +1282,7 @@ pts->pts_timers[index] = NULL; if (pt->pt_type == CLOCK_REALTIME) callout_halt(&pt->pt_ch, &timer_lock); - else if (pt->pt_queued) + if (pt->pt_queued) TAILQ_REMOVE(&timer_queue, pt, pt_chain); mutex_spin_exit(&timer_lock); if (pt->pt_type == CLOCK_REALTIME)
CVS commit: src/sys/arch/sgimips/dev
Module Name:src
Committed By: macallan
Date: Mon Apr 4 22:50:36 UTC 2011
Modified Files:
src/sys/arch/sgimips/dev: crmfb.c
Log Message:
remove some old debug code
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sgimips/dev/crmfb.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/sgimips/dev/crmfb.c
diff -u src/sys/arch/sgimips/dev/crmfb.c:1.30 src/sys/arch/sgimips/dev/crmfb.c:1.31
--- src/sys/arch/sgimips/dev/crmfb.c:1.30 Thu Mar 31 00:01:08 2011
+++ src/sys/arch/sgimips/dev/crmfb.c Mon Apr 4 22:50:36 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: crmfb.c,v 1.30 2011/03/31 00:01:08 macallan Exp $ */
+/* $NetBSD: crmfb.c,v 1.31 2011/04/04 22:50:36 macallan Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.30 2011/03/31 00:01:08 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.31 2011/04/04 22:50:36 macallan Exp $");
#include
#include
@@ -174,10 +174,6 @@
static int crmfb_setup_video(struct crmfb_softc *, int);
static void crmfb_setup_palette(struct crmfb_softc *);
-#ifdef CRMFB_DEBUG
-void crmfb_test_mte(struct crmfb_softc *);
-#endif
-
static void crmfb_fill_rect(struct crmfb_softc *, int, int, int, int, uint32_t);
static void crmfb_bitblt(struct crmfb_softc *, int, int, int, int, int, int,
uint32_t);
@@ -385,9 +381,6 @@
sc->sc_hot_x = 0;
sc->sc_hot_y = 0;
-#ifdef CRMFB_DEBUG
- crmfb_test_mte(sc);
-#endif
crmfb_setup_ddc(sc);
return;
}
@@ -1183,120 +1176,6 @@
(rxde << 16) | ryde);
}
-#ifdef CRMFB_DEBUG
-void
-crmfb_test_mte(struct crmfb_softc *sc)
-{
- uint64_t addr, reg;
- uint32_t addrs[256];
- int i, j, boo;
-
- crmfb_wait_idle(sc);
- addr = (uint64_t)(DMAADDR(sc->sc_dma) + sc->sc_fbsize);
- addr = addr >> 12;
- for (i = 0; i < 64; i += 8) {
-#if 1
- reg = (addr << 32) | (addr + 1) | 0x80008000LL;
- bus_space_write_8(sc->sc_iot, sc->sc_reh,
- CRIME_RE_LINEAR_A + i, reg);
- printf(" %08x", (uint32_t)(addr & 0x));
-#endif
- addr += 2;
- }
- printf("\n");
- memset(sc->sc_scratch, 4, 0x1);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_MODE_SRC,
- DE_MODE_LIN_A | DE_MODE_BUFDEPTH_8 | DE_MODE_TYPE_CI |
- DE_MODE_PIXDEPTH_8);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_XFER_STRD_SRC, 1);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_DRAWMODE,
- DE_DRAWMODE_PLANEMASK | DE_DRAWMODE_BYTEMASK | DE_DRAWMODE_ROP |
- DE_DRAWMODE_XFER_EN);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_ROP, 3);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_PRIMITIVE,
- DE_PRIM_RECTANGLE | DE_PRIM_TB);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_XFER_ADDR_SRC, 0);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_X_VERTEX_0,
- 0x0200);
- bus_space_write_4(sc->sc_iot, sc->sc_reh,
- CRIME_DE_X_VERTEX_1 | CRIME_DE_START,
- 0x04000100);
-
- crmfb_wait_idle(sc);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_MODE_SRC,
- DE_MODE_TLB_A | DE_MODE_BUFDEPTH_8 | DE_MODE_TYPE_CI |
- DE_MODE_PIXDEPTH_8);
-
-#if 1
- delay(400);
-
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_MTE_BG, 0x15151515);
- crmfb_wait_idle(sc);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_MTE_MODE,
- MTE_MODE_DST_ECC |
- (MTE_TLB_LIN_A << MTE_DST_TLB_SHIFT) |
- (MTE_TLB_A << MTE_SRC_TLB_SHIFT) |
- (MTE_DEPTH_8 << MTE_DEPTH_SHIFT) |
- 0/*MTE_MODE_COPY*/);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_MTE_DST_STRIDE, 1);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_MTE_SRC_STRIDE, 1);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_MTE_SRC0, 0x);
- //bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_MTE_SRC1, 0x01000100);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_MTE_DST0, 0x);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_MTE_DST1 |
- CRIME_DE_START, 0x0001);
- //status[9] = bus_space_read_4(sc->sc_iot, sc->sc_reh, CRIME_DE_STATUS);
- crmfb_wait_idle(sc);
- /* now look for 0x05050505 in RAM */
-
- boo = 0;
- for (i = 0xA000; i < 0xB000; i += 0x1000)
- if (*((uint32_t *)i) == 0x15151515) {
- /* see if there's more */
- j = 4;
- while ((j < 0x100) && (*((uint32_t *)(i + j)) ==
- 0x15151515))
-j += 4;
- if (j > 0x20) {
-addrs[boo] = i;
-boo++;
- }
- }
- printf("...");
- for (i = 0; i < boo; i++)
- printf(" %08x", addrs[i]);
- printf("\n");
-#endif
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_MODE_SRC,
- DE_MODE_LIN_A | DE_MODE_BUFDEPTH_8 | DE_MODE_TYPE_CI |
- DE_MODE_PIXDEPTH_8);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_XFER_STRD_SRC, 1);
- crmfb_bitblt(sc, 0, 0, 400, 0, 512, 64, 3);
- crmfb_wait_idle(sc);
- bus_space_write_4(sc->sc_iot, sc->sc_reh, CRIME_DE_MODE_SRC,
- DE_MODE_TLB_A | DE_MODE_BUFDEPTH_8 | DE_MODE_TYPE_CI |
-
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 22:48:15 UTC 2011
Modified Files:
src/sys/dev/pci: ehci_pci.c ohci_pci.c uhci_pci.c
Log Message:
Deregister PMF handlers during detachment. Complete the host controller
shutdown.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/ehci_pci.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/pci/uhci_pci.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/ehci_pci.c
diff -u src/sys/dev/pci/ehci_pci.c:1.51 src/sys/dev/pci/ehci_pci.c:1.52
--- src/sys/dev/pci/ehci_pci.c:1.51 Mon Apr 4 20:37:56 2011
+++ src/sys/dev/pci/ehci_pci.c Mon Apr 4 22:48:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_pci.c,v 1.51 2011/04/04 20:37:56 dyoung Exp $ */
+/* $NetBSD: ehci_pci.c,v 1.52 2011/04/04 22:48:15 dyoung Exp $ */
/*
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.51 2011/04/04 20:37:56 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_pci.c,v 1.52 2011/04/04 22:48:15 dyoung Exp $");
#include
#include
@@ -282,11 +282,13 @@
struct ehci_pci_softc *sc = device_private(self);
int rv;
- pmf_device_deregister(self);
rv = ehci_detach(&sc->sc, flags);
if (rv)
return rv;
+ pmf_device_deregister(self);
+ ehci_shutdown(self, flags);
+
/* disable interrupts */
EOWRITE2(&sc->sc, EHCI_USBINTR, 0);
/* XXX grotty hack to flush the write */
Index: src/sys/dev/pci/ohci_pci.c
diff -u src/sys/dev/pci/ohci_pci.c:1.46 src/sys/dev/pci/ohci_pci.c:1.47
--- src/sys/dev/pci/ohci_pci.c:1.46 Tue May 25 08:37:10 2010
+++ src/sys/dev/pci/ohci_pci.c Mon Apr 4 22:48:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_pci.c,v 1.46 2010/05/25 08:37:10 pgoyette Exp $ */
+/* $NetBSD: ohci_pci.c,v 1.47 2011/04/04 22:48:15 dyoung Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.46 2010/05/25 08:37:10 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.47 2011/04/04 22:48:15 dyoung Exp $");
#include "ehci.h"
@@ -186,11 +186,14 @@
struct ohci_pci_softc *sc = device_private(self);
int rv;
- pmf_device_deregister(self);
rv = ohci_detach(&sc->sc, flags);
if (rv)
return rv;
+ pmf_device_deregister(self);
+
+ ohci_shutdown(self, flags);
+
if (sc->sc.sc_size) {
/* Disable interrupts, so we don't get any spurious ones. */
bus_space_write_4(sc->sc.iot, sc->sc.ioh,
Index: src/sys/dev/pci/uhci_pci.c
diff -u src/sys/dev/pci/uhci_pci.c:1.52 src/sys/dev/pci/uhci_pci.c:1.53
--- src/sys/dev/pci/uhci_pci.c:1.52 Tue May 25 08:50:54 2010
+++ src/sys/dev/pci/uhci_pci.c Mon Apr 4 22:48:15 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci_pci.c,v 1.52 2010/05/25 08:50:54 cegger Exp $ */
+/* $NetBSD: uhci_pci.c,v 1.53 2011/04/04 22:48:15 dyoung Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.52 2010/05/25 08:50:54 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci_pci.c,v 1.53 2011/04/04 22:48:15 dyoung Exp $");
#include "ehci.h"
@@ -203,12 +203,12 @@
struct uhci_pci_softc *sc = device_private(self);
int rv;
- pmf_device_deregister(self);
-
rv = uhci_detach(&sc->sc, flags);
if (rv)
return (rv);
+ pmf_device_deregister(self);
+
/* disable interrupts and acknowledge any pending */
bus_space_write_2(sc->sc.iot, sc->sc.ioh, UHCI_INTR, 0);
bus_space_write_2(sc->sc.iot, sc->sc.ioh, UHCI_STS,
CVS commit: src/gnu/dist/gdb6/sim/ppc
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 22:33:32 UTC 2011
Modified Files:
src/gnu/dist/gdb6/sim/ppc: emul_netbsd.c
Log Message:
I've been using this patch (which comes from Matt Thomas, maybe?) for
about a year. It make MKCROSSGDB=yes work for macppc, at least.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c
diff -u src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.6 src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.7
--- src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c:1.6 Thu Jun 3 14:32:31 2010
+++ src/gnu/dist/gdb6/sim/ppc/emul_netbsd.c Mon Apr 4 22:33:32 2011
@@ -738,7 +738,7 @@
if (WITH_TRACE && ppc_trace[trace_os_emul])
printf_filtered ("0x%lx, 0x%lx", (long)t_addr, (long)tz_addr);
- SYS(gettimeofday);
+ SYS(__gettimeofday50);
emul_write_status(processor, status, err);
if (status == 0) {
if (t_addr != 0)
CVS commit: src/sys/arch/sgimips/dev
Module Name:src
Committed By: macallan
Date: Mon Apr 4 22:15:14 UTC 2011
Modified Files:
src/sys/arch/sgimips/dev: files.dev
Log Message:
crmfb needs edid and friends now
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/dev/files.dev
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/sgimips/dev/files.dev
diff -u src/sys/arch/sgimips/dev/files.dev:1.10 src/sys/arch/sgimips/dev/files.dev:1.11
--- src/sys/arch/sgimips/dev/files.dev:1.10 Thu Feb 12 06:33:57 2009
+++ src/sys/arch/sgimips/dev/files.dev Mon Apr 4 22:15:13 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.dev,v 1.10 2009/02/12 06:33:57 rumble Exp $
+# $NetBSD: files.dev,v 1.11 2011/04/04 22:15:13 macallan Exp $
define giobus {}
@@ -31,7 +31,7 @@
attach crime at mainbus
file arch/sgimips/dev/crime.c crime needs-flag
-device crmfb: wsemuldisplaydev, vcons, rasops8, rasops16, rasops32
+device crmfb: wsemuldisplaydev, vcons, rasops8, i2cbus, iic, i2c_bitbang, ddc_read_edid, edid
attach crmfb at mainbus
file arch/sgimips/dev/crmfb.c crmfb needs-flag
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 22:13:58 UTC 2011
Modified Files:
src/sys/dev/pci: rdcide.c
Log Message:
Make rdcide_chip_map()'s pci_attach_args argument const.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/rdcide.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/rdcide.c
diff -u src/sys/dev/pci/rdcide.c:1.1 src/sys/dev/pci/rdcide.c:1.2
--- src/sys/dev/pci/rdcide.c:1.1 Mon Apr 4 14:33:51 2011
+++ src/sys/dev/pci/rdcide.c Mon Apr 4 22:13:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rdcide.c,v 1.1 2011/04/04 14:33:51 bouyer Exp $ */
+/* $NetBSD: rdcide.c,v 1.2 2011/04/04 22:13:58 dyoung Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rdcide.c,v 1.1 2011/04/04 14:33:51 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rdcide.c,v 1.2 2011/04/04 22:13:58 dyoung Exp $");
#include
#include
@@ -36,7 +36,8 @@
#include
#include
-static void rdcide_chip_map(struct pciide_softc*, struct pci_attach_args *);
+static void rdcide_chip_map(struct pciide_softc *,
+const struct pci_attach_args *);
static void rdcide_setup_channel(struct ata_channel *);
static bool rdcide_resume(device_t, const pmf_qual_t *);
@@ -117,7 +118,7 @@
}
static void
-rdcide_chip_map(struct pciide_softc *sc, struct pci_attach_args *pa)
+rdcide_chip_map(struct pciide_softc *sc, const struct pci_attach_args *pa)
{
struct pciide_channel *cp;
int channel;
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: ahoka Date: Mon Apr 4 21:46:15 UTC 2011 Modified Files: src/sys/ufs/ufs: ufs_extern.h Log Message: add "struct ufid;" so we can include it without ufs/inode.h To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/sys/ufs/ufs/ufs_extern.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/ufs/ufs/ufs_extern.h diff -u src/sys/ufs/ufs/ufs_extern.h:1.63 src/sys/ufs/ufs/ufs_extern.h:1.64 --- src/sys/ufs/ufs/ufs_extern.h:1.63 Sun Mar 6 17:08:39 2011 +++ src/sys/ufs/ufs/ufs_extern.h Mon Apr 4 21:46:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_extern.h,v 1.63 2011/03/06 17:08:39 bouyer Exp $ */ +/* $NetBSD: ufs_extern.h,v 1.64 2011/04/04 21:46:15 ahoka Exp $ */ /*- * Copyright (c) 1991, 1993, 1994 @@ -49,6 +49,7 @@ struct mount; struct nameidata; struct lwp; +struct ufid; struct ufs_args; struct ufsmount; struct uio;
CVS commit: src/sys/arch/amd64/conf
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 21:35:31 UTC 2011
Modified Files:
src/sys/arch/amd64/conf: files.amd64
Log Message:
Don't need x86_stub.c here, we'll pick it up from files.x86.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/amd64/conf/files.amd64
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/files.amd64
diff -u src/sys/arch/amd64/conf/files.amd64:1.70 src/sys/arch/amd64/conf/files.amd64:1.71
--- src/sys/arch/amd64/conf/files.amd64:1.70 Sun Apr 3 22:29:26 2011
+++ src/sys/arch/amd64/conf/files.amd64 Mon Apr 4 21:35:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.amd64,v 1.70 2011/04/03 22:29:26 dyoung Exp $
+# $NetBSD: files.amd64,v 1.71 2011/04/04 21:35:31 dyoung Exp $
#
# new style config file for amd64 architecture
#
@@ -111,9 +111,6 @@
# TSC timecounter support
file arch/x86/x86/tsc.c
-# Stubs for x86 routines not included in the system
-file arch/x86/x86/x86_stub.c
-
# attribute used to represent the "keyboard controller"
# XXX should be a real device
define pckbcport { [irq = -1], [port = -1] }
CVS commit: src/sys/arch/x86/conf
Module Name:src Committed By: dyoung Date: Mon Apr 4 21:33:49 UTC 2011 Modified Files: src/sys/arch/x86/conf: files.x86 Log Message: As pointed out by Manuel Bouyer and Taylor R Campbell, I forgot to commit the change to files.x86 that adds x86_stub.c, so do that. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x86/conf/files.x86 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/x86/conf/files.x86 diff -u src/sys/arch/x86/conf/files.x86:1.65 src/sys/arch/x86/conf/files.x86:1.66 --- src/sys/arch/x86/conf/files.x86:1.65 Wed Mar 16 11:35:36 2011 +++ src/sys/arch/x86/conf/files.x86 Mon Apr 4 21:33:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.x86,v 1.65 2011/03/16 11:35:36 jakllsch Exp $ +# $NetBSD: files.x86,v 1.66 2011/04/04 21:33:49 dyoung Exp $ # options for MP configuration through the MP spec defflag opt_mpbios.h MPBIOS MPVERBOSE MPDEBUG MPBIOS_SCANPCI @@ -108,6 +108,9 @@ file arch/x86/isa/isa_machdep.c isa +# Stubs for x86 routines not included in the system +file arch/x86/x86/x86_stub.c + # IPMI device device ipmi: sysmon_envsys, sysmon_wdog attach ipmi at ipmibus
CVS commit: src/external/bsd/liblzf/dist
Module Name:src Committed By: agc Date: Mon Apr 4 20:37:49 UTC 2011 Modified Files: src/external/bsd/liblzf/dist: lzf.h Log Message: remove function parameter names from function prototypes make the lzf_compress() prototype match the function definition - the prototype always added the state table argument, although it should be conditionally compiled in. use the same cpp magic as in the source file to prototype the function in the header file. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/liblzf/dist/lzf.h 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/liblzf/dist/lzf.h diff -u src/external/bsd/liblzf/dist/lzf.h:1.2 src/external/bsd/liblzf/dist/lzf.h:1.3 --- src/external/bsd/liblzf/dist/lzf.h:1.2 Wed Feb 3 03:55:38 2010 +++ src/external/bsd/liblzf/dist/lzf.h Mon Apr 4 20:37:49 2011 @@ -76,9 +76,12 @@ * */ unsigned int -lzf_compress (const void *const in_data, unsigned int in_len, - void *out_data, unsigned int out_len, - LZF_STATE htab); +lzf_compress (const void *const, unsigned int, + void *, unsigned int +#if LZF_STATE_ARG + , LZF_STATE +#endif + ); /* * Decompress data compressed with some version of the lzf_compress @@ -96,8 +99,8 @@ * This function is very fast, about as fast as a copying loop. */ unsigned int -lzf_decompress (const void *const in_data, unsigned int in_len, -void *out_data, unsigned int out_len); +lzf_decompress (const void *const , unsigned int, +void *, unsigned int); #endif
CVS commit: src/sys/arch/mips/conf
Module Name:src Committed By: dyoung Date: Mon Apr 4 20:01:14 UTC 2011 Modified Files: src/sys/arch/mips/conf: files.adm5120 Log Message: Make usb_dma a dependency of ahci(4), since it needs usb_allocmem(9). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/conf/files.adm5120 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/mips/conf/files.adm5120 diff -u src/sys/arch/mips/conf/files.adm5120:1.2 src/sys/arch/mips/conf/files.adm5120:1.3 --- src/sys/arch/mips/conf/files.adm5120:1.2 Tue Mar 20 08:55:43 2007 +++ src/sys/arch/mips/conf/files.adm5120 Mon Apr 4 20:01:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.adm5120,v 1.2 2007/03/20 08:55:43 dyoung Exp $ +# $NetBSD: files.adm5120,v 1.3 2011/04/04 20:01:14 dyoung Exp $ file arch/mips/adm5120/adm5120_intr.c @@ -44,6 +44,6 @@ file arch/mips/adm5120/dev/wdc_extio.c wdc_extio # On-chip USB controller -device ahci: usbus +device ahci: usbus, usb_dma attach ahci at obio file arch/mips/adm5120/dev/ahci.c ahci
CVS commit: src/tests/include
Module Name:src
Committed By: jruoho
Date: Mon Apr 4 19:59:08 UTC 2011
Modified Files:
src/tests/include: t_paths.c
Log Message:
Mark this again as expected failure.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/include/t_paths.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/include/t_paths.c
diff -u src/tests/include/t_paths.c:1.4 src/tests/include/t_paths.c:1.5
--- src/tests/include/t_paths.c:1.4 Wed Mar 30 22:26:26 2011
+++ src/tests/include/t_paths.c Mon Apr 4 19:59:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_paths.c,v 1.4 2011/03/30 22:26:26 jruoho Exp $ */
+/* $NetBSD: t_paths.c,v 1.5 2011/04/04 19:59:08 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_paths.c,v 1.4 2011/03/30 22:26:26 jruoho Exp $");
+__RCSID("$NetBSD: t_paths.c,v 1.5 2011/04/04 19:59:08 jruoho Exp $");
#include
#include
@@ -160,6 +160,9 @@
if ((paths[i].flags & PATH_DEV) != 0) {
+ if (strcmp(paths[i].path, _PATH_BPF) == 0)
+atf_tc_expect_fail("PR lib/44807");
+
ATF_REQUIRE(S_ISBLK(m) != 0 || S_ISCHR(m) != 0);
ATF_REQUIRE((paths[i].flags & PATH_DIR) == 0);
CVS commit: src/sys/arch/mips/adm5120/dev
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:58:56 UTC 2011
Modified Files:
src/sys/arch/mips/adm5120/dev: ahci.c ahcivar.h
Log Message:
Use callout(9) instead of the USB compatibility junk that went away
months ago.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/adm5120/dev/ahci.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/adm5120/dev/ahcivar.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/arch/mips/adm5120/dev/ahci.c
diff -u src/sys/arch/mips/adm5120/dev/ahci.c:1.5 src/sys/arch/mips/adm5120/dev/ahci.c:1.6
--- src/sys/arch/mips/adm5120/dev/ahci.c:1.5 Tue Dec 16 22:35:24 2008
+++ src/sys/arch/mips/adm5120/dev/ahci.c Mon Apr 4 19:58:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ahci.c,v 1.5 2008/12/16 22:35:24 christos Exp $ */
+/* $NetBSD: ahci.c,v 1.6 2011/04/04 19:58:56 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.5 2008/12/16 22:35:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.6 2011/04/04 19:58:56 dyoung Exp $");
#include
#include
@@ -297,7 +297,7 @@
SIMPLEQ_INIT(&sc->sc_free_xfers);
- usb_callout_init(sc->sc_poll_handle);
+ callout_init(&sc->sc_poll_handle, 0);
REG_WRITE(ADMHCD_REG_INTENABLE, 0); /* disable interrupts */
REG_WRITE(ADMHCD_REG_CONTROL, ADMHCD_SW_RESET); /* reset */
@@ -437,7 +437,7 @@
static int p0_state=0;
static int p1_state=0;
- usb_callout(sc->sc_poll_handle, sc->sc_interval, ahci_poll_hub, xfer);
+ callout_reset(&sc->sc_poll_handle, sc->sc_interval, ahci_poll_hub, xfer);
/* USB spec 11.13.3 (p.260) */
p = KERNADDR(&xfer->dmabuf, 0);
@@ -996,7 +996,7 @@
DPRINTF(D_TRACE, ("SLRIstart "));
sc->sc_interval = MS_TO_TICKS(xfer->pipe->endpoint->edesc->bInterval);
- usb_callout(sc->sc_poll_handle, sc->sc_interval, ahci_poll_hub, xfer);
+ callout_reset(&sc->sc_poll_handle, sc->sc_interval, ahci_poll_hub, xfer);
sc->sc_intr_xfer = xfer;
return USBD_IN_PROGRESS;
}
@@ -1014,7 +1014,7 @@
DPRINTF(D_TRACE, ("SLRIclose "));
- usb_uncallout(sc->sc_poll_handle, ahci_poll_hub, sc->sc_intr_xfer);
+ callout_stop(&sc->sc_poll_handle);
sc->sc_intr_xfer = NULL;
}
@@ -1243,8 +1243,8 @@
xfer->hcpriv = sx;
/* initialize callout */
- usb_callout_init(sx->sx_callout_t);
- usb_callout(sx->sx_callout_t,
+ callout_init(&sx->sx_callout_t, 0);
+ callout_reset(&sx->sx_callout_t,
MS_TO_TICKS(pipe->endpoint->edesc->bInterval),
ahci_poll_device, sx);
@@ -1269,7 +1269,7 @@
DPRINTF(D_TRACE, ("pldev"));
- usb_callout(sx->sx_callout_t,
+ callout_reset(&sx->sx_callout_t,
MS_TO_TICKS(pipe->endpoint->edesc->bInterval),
ahci_poll_device, sx);
@@ -1304,7 +1304,7 @@
sx = xfer->hcpriv;
if (sx) {
- usb_uncallout(sx->sx_callout_t, ahci_poll_device, sx);
+ callout_stop(&sx->sx_callout_t);
free(sx, M_USB);
xfer->hcpriv = NULL;
} else {
Index: src/sys/arch/mips/adm5120/dev/ahcivar.h
diff -u src/sys/arch/mips/adm5120/dev/ahcivar.h:1.2 src/sys/arch/mips/adm5120/dev/ahcivar.h:1.3
--- src/sys/arch/mips/adm5120/dev/ahcivar.h:1.2 Mon Apr 28 20:23:27 2008
+++ src/sys/arch/mips/adm5120/dev/ahcivar.h Mon Apr 4 19:58:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcivar.h,v 1.2 2008/04/28 20:23:27 martin Exp $ */
+/* $NetBSD: ahcivar.h,v 1.3 2011/04/04 19:58:56 dyoung Exp $ */
/*-
* Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
@@ -71,7 +71,7 @@
struct ahci_xfer {
usbd_xfer_handle sx_xfer;
- usb_callout_t sx_callout_t;
+ callout_t sx_callout_t;
};
struct ahci_softc {
@@ -91,7 +91,7 @@
#define INTR_ON (1)
#define INTR_OFF (0)
- device_ptr_t sc_child;
+ device_t sc_child;
struct device *sc_parent; /* parent device */
@@ -102,7 +102,7 @@
/* Information for the root hub interrupt pipe */
int sc_interval;
usbd_xfer_handle sc_intr_xfer;
- usb_callout_t sc_poll_handle;
+ callout_t sc_poll_handle;
int sc_flags;
#define AHCDF_RESET (0x01)
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: dyoung Date: Mon Apr 4 19:57:31 UTC 2011 Modified Files: src/sys/arch/i386/conf: XEN3_DOMU Log Message: The PCI pass-through driver is not too useful without PCI drivers, but add it to this kernel configuration so that at it gets built some of the time. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/conf/XEN3_DOMU 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/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.29 src/sys/arch/i386/conf/XEN3_DOMU:1.30 --- src/sys/arch/i386/conf/XEN3_DOMU:1.29 Sun Mar 6 17:08:26 2011 +++ src/sys/arch/i386/conf/XEN3_DOMU Mon Apr 4 19:57:31 2011 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.29 2011/03/06 17:08:26 bouyer Exp $ +# $NetBSD: XEN3_DOMU,v 1.30 2011/04/04 19:57:31 dyoung Exp $ include "arch/xen/conf/std.xen" @@ -256,6 +256,6 @@ options PAX_ASLR=0 # PaX Address Space Layout Randomization # PCI pass-through support: -#xpci* at xenbus ? #Xen3 PCI front end driver -#pci* at xpci ? +xpci* at xenbus ? #Xen3 PCI front end driver +pci* at xpci ? # you then need to add your PCI devices drivers below.
CVS commit: src/sys/arch/evbppc/conf
Module Name:src Committed By: dyoung Date: Mon Apr 4 19:55:16 UTC 2011 Modified Files: src/sys/arch/evbppc/conf: std.obs266 Log Message: Pull in the Atheros HAL options so that OPENBLOCKS266_OPT will build. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/conf/std.obs266 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/evbppc/conf/std.obs266 diff -u src/sys/arch/evbppc/conf/std.obs266:1.1 src/sys/arch/evbppc/conf/std.obs266:1.2 --- src/sys/arch/evbppc/conf/std.obs266:1.1 Thu Mar 18 14:15:38 2010 +++ src/sys/arch/evbppc/conf/std.obs266 Mon Apr 4 19:55:16 2011 @@ -1,4 +1,4 @@ -# $NetBSD: std.obs266,v 1.1 2010/03/18 14:15:38 kiyohara Exp $ +# $NetBSD: std.obs266,v 1.2 2011/04/04 19:55:16 dyoung Exp $ # # Standard/required options for obs266. @@ -8,4 +8,7 @@ makeoptions TEXTADDR=0x25000 options KERNBASE=0x25000 +# Atheros HAL options +include "external/isc/atheros_hal/conf/std.ath_hal" + include "arch/evbppc/conf/files.obs266"
CVS commit: src/lib/libbluetooth
Module Name:src
Committed By: plunky
Date: Mon Apr 4 19:51:33 UTC 2011
Modified Files:
src/lib/libbluetooth: sdp_put.c
Log Message:
correct inverted logic (if sdp_put_data fails, sdp_put_attr should fail)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libbluetooth/sdp_put.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/libbluetooth/sdp_put.c
diff -u src/lib/libbluetooth/sdp_put.c:1.3 src/lib/libbluetooth/sdp_put.c:1.4
--- src/lib/libbluetooth/sdp_put.c:1.3 Sat Nov 13 19:43:56 2010
+++ src/lib/libbluetooth/sdp_put.c Mon Apr 4 19:51:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp_put.c,v 1.3 2010/11/13 19:43:56 plunky Exp $ */
+/* $NetBSD: sdp_put.c,v 1.4 2011/04/04 19:51:33 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: sdp_put.c,v 1.3 2010/11/13 19:43:56 plunky Exp $");
+__RCSID("$NetBSD: sdp_put.c,v 1.4 2011/04/04 19:51:33 plunky Exp $");
#include
#include
@@ -65,7 +65,7 @@
sdp_data_t d = *data;
if (!sdp_put_uint16(&d, attr)
- || sdp_put_data(&d, value))
+ || !sdp_put_data(&d, value))
return false;
*data = d;
CVS commit: src/sys/arch
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:47:50 UTC 2011
Modified Files:
src/sys/arch/mips: Makefile.inc
src/sys/arch/prep: Makefile
src/sys/arch/sandpoint: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/mips/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/prep/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/Makefile
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/mips/Makefile.inc
diff -u src/sys/arch/mips/Makefile.inc:1.6 src/sys/arch/mips/Makefile.inc:1.7
--- src/sys/arch/mips/Makefile.inc:1.6 Tue Mar 20 08:52:04 2007
+++ src/sys/arch/mips/Makefile.inc Mon Apr 4 19:47:50 2011
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.6 2007/03/20 08:52:04 dyoung Exp $
+# $NetBSD: Makefile.inc,v 1.7 2011/04/04 19:47:50 dyoung Exp $
AMIPS= ${SYSDIR}/arch/mips/mips/*.S
-SMIPS= ${SYSDIR}/arch/mips/mips/*.[ch] ${SYSDIR}/arch/mips/include/*.h
+AMIPS+= ${SYSDIR}/arch/mips/rmi/*.S
+SMIPS= ${SYSDIR}/arch/mips/mips/*.[ch]
+SMIPS+= ${SYSDIR}/arch/mips/include/*.h
SMIPS+= ${SYSDIR}/arch/mips/adm5120/*.[ch]
SMIPS+= ${SYSDIR}/arch/mips/adm5120/dev/*.[ch]
SMIPS+= ${SYSDIR}/arch/mips/adm5120/include/*.h
@@ -12,3 +14,8 @@
SMIPS+= ${SYSDIR}/arch/mips/atheros/dev/*.[ch]
SMIPS+= ${SYSDIR}/arch/mips/atheros/include/*.h
SMIPS+= ${SYSDIR}/arch/mips/bonito/*.[ch]
+SMIPS+= ${SYSDIR}/arch/mips/cfe/*.[ch]
+SMIPS+= ${SYSDIR}/arch/mips/rmi/*.[ch]
+SMIPS+= ${SYSDIR}/arch/mips/sibyte/dev/*.[ch]
+SMIPS+= ${SYSDIR}/arch/mips/sibyte/include/*.[ch]
+SMIPS+= ${SYSDIR}/arch/mips/sibyte/pci/*.[ch]
Index: src/sys/arch/prep/Makefile
diff -u src/sys/arch/prep/Makefile:1.3 src/sys/arch/prep/Makefile:1.4
--- src/sys/arch/prep/Makefile:1.3 Sat Oct 25 22:27:38 2008
+++ src/sys/arch/prep/Makefile Mon Apr 4 19:47:49 2011
@@ -1,22 +1,25 @@
-# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/04 19:47:49 dyoung Exp $
-# Makefile for tags file
+.include <../powerpc/Makefile.inc>
-TPREP= ../prep/tags
-SPREP= ../prep/prep/*.[ch] ../prep/include/*.h ../prep/isa/*.[ch] \
- ../prep/pci/*.[ch]
-APREP= ../prep/prep/*.[sS]
+TPREP= ${SYSDIR}/arch/prep/tags
+SPREP= ${SYSDIR}/arch/prep/prep/*.[ch] \
+ ${SYSDIR}/arch/prep/isa/*.[ch] \
+ ${SYSDIR}/arch/prep/pci/*.[ch] \
+ ${SYSDIR}/arch/prep/include/*.h
+APREP= ${SYSDIR}/arch/prep/prep/*.S
-# Directories in which to place tags links
-DPREP= include
+DPREP= include
.include "../../kern/Make.tags.inc"
tags:
- -ctags -wdtf ${TPREP} ${SPREP} ${COMM}
- egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${APREP} | \
+ -rm -f ${TPREP}
+ -echo ${SPREP} ${SPPC} | xargs ctags -wadtf ${TPREP}
+ -${FINDCOMM} | xargs ctags -wadtf ${TPREP}
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${APREP} ${APPC} | \
${TOOL_SED} -e \
- "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TPREP}
sort -o ${TPREP} ${TPREP}
Index: src/sys/arch/sandpoint/Makefile
diff -u src/sys/arch/sandpoint/Makefile:1.3 src/sys/arch/sandpoint/Makefile:1.4
--- src/sys/arch/sandpoint/Makefile:1.3 Fri Jan 28 22:15:36 2011
+++ src/sys/arch/sandpoint/Makefile Mon Apr 4 19:47:50 2011
@@ -1,4 +1,32 @@
-# $NetBSD: Makefile,v 1.3 2011/01/28 22:15:36 phx Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/04 19:47:50 dyoung Exp $
+
+.include <../powerpc/Makefile.inc>
+
+TSANDPOINT= ${SYSDIR}/arch/sandpoint/tags
+SSANDPOINT= ${SYSDIR}/arch/sandpoint/sandpoint/*.[ch] \
+ ${SYSDIR}/arch/sandpoint/isa/*.[ch] \
+ ${SYSDIR}/arch/sandpoint/pci/*.[ch] \
+ ${SYSDIR}/arch/sandpoint/include/*.h
+ASANDPOINT= ${SYSDIR}/arch/sandpoint/sandpoint/*.S
+
+DSANDPOINT= include
+
+.include "../../kern/Make.tags.inc"
+
+tags:
+ -rm -f ${TSANDPOINT}
+ -echo ${SSANDPOINT} ${SPPC} | xargs ctags -wadtf ${TSANDPOINT}
+ -${FINDCOMM} | xargs ctags -wadtf ${TSANDPOINT}
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASANDPOINT} ${APPC} | \
+ ${TOOL_SED} -e \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ >> ${TSANDPOINT}
+ sort -o ${TSANDPOINT} ${TSANDPOINT}
+
+links:
+ -for i in ${DSANDPOINT}; do \
+ cd $$i && rm -f tags; ln -s ../tags tags; done
+
SUBDIR= compile include stand
CVS commit: src/sys/arch/ofppc
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:47:21 UTC 2011
Modified Files:
src/sys/arch/ofppc: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ofppc/Makefile
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/ofppc/Makefile
diff -u src/sys/arch/ofppc/Makefile:1.6 src/sys/arch/ofppc/Makefile:1.7
--- src/sys/arch/ofppc/Makefile:1.6 Mon Jan 6 17:40:43 2003
+++ src/sys/arch/ofppc/Makefile Mon Apr 4 19:47:21 2011
@@ -1,4 +1,32 @@
-# $NetBSD: Makefile,v 1.6 2003/01/06 17:40:43 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2011/04/04 19:47:21 dyoung Exp $
+
+.include <../powerpc/Makefile.inc>
+
+TOFPPC= ${SYSDIR}/arch/ofppc/tags
+SOFPPC= ${SYSDIR}/arch/ofppc/ofppc/*.[ch] \
+ ${SYSDIR}/arch/ofppc/isa/*.[ch] \
+ ${SYSDIR}/arch/ofppc/pci/*.[ch] \
+ ${SYSDIR}/arch/ofppc/include/*.h
+AOFPPC= ${SYSDIR}/arch/ofppc/ofppc/*.S
+
+DOFPPC= include
+
+.include "../../kern/Make.tags.inc"
+
+tags:
+ -rm -f ${TOFPPC}
+ -echo ${SOFPPC} ${SPPC} | xargs ctags -wadtf ${TOFPPC}
+ -${FINDCOMM} | xargs ctags -wadtf ${TOFPPC}
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AOFPPC} ${APPC} | \
+ ${TOOL_SED} -e \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ >> ${TOFPPC}
+ sort -o ${TOFPPC} ${TOFPPC}
+
+links:
+ -for i in ${DOFPPC}; do \
+ cd $$i && rm -f tags; ln -s ../tags tags; done
+
SUBDIR= compile include stand
CVS commit: src/sys/arch/netwinder
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:47:00 UTC 2011
Modified Files:
src/sys/arch/netwinder: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/netwinder/Makefile
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/netwinder/Makefile
diff -u src/sys/arch/netwinder/Makefile:1.3 src/sys/arch/netwinder/Makefile:1.4
--- src/sys/arch/netwinder/Makefile:1.3 Sat Oct 25 22:27:38 2008
+++ src/sys/arch/netwinder/Makefile Mon Apr 4 19:47:00 2011
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/04 19:47:00 dyoung Exp $
# Makefile for netwinder tags file and boot blocks
-TNETWINDER= ../netwinder/tags
-SNETWINDER= ../netwinder/netwinder/*.[ch] ../netwinder/include/*.h \
- ../netwinder/isa/*.[ch] ../netwinder/pci/*.[ch]
-ANETWINDER= ../netwinder/netwinder/*.s
+.include <../arm/Makefile.inc>
+
+TNETWINDER= ${SYSDIR}/arch/netwinder/tags
+SNETWINDER= ${SYSDIR}/arch/netwinder/netwinder/*.[ch] \
+ ${SYSDIR}/arch/netwinder/include/*.h \
+ ${SYSDIR}/arch/netwinder/pci/*.[ch]
+ANETWINDER= ${SYSDIR}/arch/netwinder/netwinder/*.S
# Directories in which to place tags links
-DNETWINDER= isa pci include
+DNETWINDER= pci include
.include "../../kern/Make.tags.inc"
tags:
- -ctags -wdtf ${TNETWINDER} ${SNETWINDER} ${COMM}
- egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ANETWINDER} | \
+ -rm -f ${TNETWINDER}
+ -echo ${SNETWINDER} ${SARM} | xargs ctags -wadtf ${TNETWINDER}
+ -${FINDCOMM} | xargs ctags -wadtf ${TNETWINDER}
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ANETWINDER} ${AARM} | \
${TOOL_SED} -e \
- "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TNETWINDER}
sort -o ${TNETWINDER} ${TNETWINDER}
CVS commit: src/sys/arch
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:46:40 UTC 2011
Modified Files:
src/sys/arch/evbmips: Makefile
src/sys/arch/evbppc: Makefile
src/sys/arch/i386: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/Makefile
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/i386/Makefile
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/evbmips/Makefile
diff -u src/sys/arch/evbmips/Makefile:1.7 src/sys/arch/evbmips/Makefile:1.8
--- src/sys/arch/evbmips/Makefile:1.7 Sat Oct 25 22:27:37 2008
+++ src/sys/arch/evbmips/Makefile Mon Apr 4 19:46:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.8 2011/04/04 19:46:40 dyoung Exp $
# Makefile for evbmips tags file and boot blocks
@@ -7,9 +7,15 @@
# XXX ! fix this
TEVBMIPS= ${SYSDIR}/arch/evbmips/tags
-SEVBMIPS= ${SYSDIR}/arch/evbmips/evbmips/*.[ch] \
- ${SYSDIR}/arch/evbmips/include/*.h \
- ${SYSDIR}/arch/evbmips/isa/*.[ch]
+SEVBMIPS= ${SYSDIR}/arch/evbmips/adm5120/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/alchemy/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/atheros/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/evbmips/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/gdium/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/include/*.h
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/isa/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/malta/*.[ch]
+SEVBMIPS+= ${SYSDIR}/arch/evbmips/rmixl/*.[ch]
AEVBMIPS= ${SYSDIR}/arch/evbmips/evbmips/*.S
# Directories in which to place tags links
@@ -23,7 +29,7 @@
-${FINDCOMM} | xargs ctags -wadtf ${TEVBMIPS}
egrep "^LEAF(.*)|^[AN]LEAF(.*)|^NON_LEAF(.*)" ${AEVBMIPS} ${AMIPS} | \
${TOOL_SED} -e \
- "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TEVBMIPS}
sort -o ${TEVBMIPS} ${TEVBMIPS}
Index: src/sys/arch/evbppc/Makefile
diff -u src/sys/arch/evbppc/Makefile:1.2 src/sys/arch/evbppc/Makefile:1.3
--- src/sys/arch/evbppc/Makefile:1.2 Mon Jan 6 17:40:28 2003
+++ src/sys/arch/evbppc/Makefile Mon Apr 4 19:46:40 2011
@@ -1,32 +1,39 @@
-# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:28 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2011/04/04 19:46:40 dyoung Exp $
-ETAGS?= etags
+.include <../powerpc/Makefile.inc>
# XXX Fix this to deal with multiple "evbppc" ports.
-SEVBPPC= evbppc/*.[ch] include/*.h
-AEVBPPC=
+TEVBPPC= ${SYSDIR}/arch/evbppc/tags
+SEVBPPC= ${SYSDIR}/arch/evbppc/evbppc/*.[ch]
+SEVBPPC+= ${SYSDIR}/arch/evbppc/include/*.h
+SEVBPPC+= ${SYSDIR}/arch/evbppc/pmppc/dev/*.[ch]
+SEVBPPC+= ${SYSDIR}/arch/evbppc/pmppc/pci/*.[ch]
+SEVBPPC+= ${SYSDIR}/arch/evbppc/pmppc/*.[ch]
+AEVBPPC= ${SYSDIR}/arch/evbppc/ev64260/*.S \
+ ${SYSDIR}/arch/evbppc/explora/*.S \
+ ${SYSDIR}/arch/evbppc/mpc85xx/*.S \
+ ${SYSDIR}/arch/evbppc/obs405/*.S \
+ ${SYSDIR}/arch/evbppc/pmppc/*.S \
+ ${SYSDIR}/arch/evbppc/virtex/*.S \
+ ${SYSDIR}/arch/evbppc/walnut/*.S
-SPPC= ../powerpc/ibm4xx/*.[ch] ../powerpc/powerpc/*.[ch] \
- ../powerpc/include/*.h ../powerpc/include/ibm4xx/*.h \
- ../powerpc/fpu/*.[ch]
-APPC= ../powerpc/ibm4xx/*.[sS] ../powerpc/powerpc/*.[sS]
-LPPC= ../../lib/libkern/arch/powerpc/*.[chsS] \
- ../../lib/libkern/*.[ch] \
- ../../lib/libsa/*.[ch]
+DEVBPPC= include
-SYSDIR= ../..
.include "../../kern/Make.tags.inc"
-.ifmake TAGS
-COMM!= find ${SYSDIR} -name "arch" -prune -o -name "*.[ch]" -print
-.endif
-
-TAGS: ${SEVBPPC} ${COMM} ${SPPC} ${COMM} ${ASPARC64}
- @echo Making TAGS...
- @${ETAGS} ${SEVBPPC} ${COMM} ${SPPC} ${COMM} "--regex=/^GLOBAL(\(.*\))/\1/" \
- "--regex=/^_C_LABEL(\(.*\)):/\1/" "--regex=/^\(.*\):/\1/" \
- "--regex=/^ENTRY(\(.*\)):/\1/" "--regex=/^ASENTRY(\(.*\)):/\1/" \
- ${APPC} ${AEVBPPC}
+tags:
+ -rm -f ${TEVBPPC}
+ -echo ${SEVBPPC} ${SPPC} | xargs ctags -wadtf ${TEVBPPC}
+ -${FINDCOMM} | xargs ctags -wadtf ${TEVBPPC}
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBPPC} ${APPC} | \
+ ${TOOL_SED} -e \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ >> ${TEVBPPC}
+ sort -o ${TEVBPPC} ${TEVBPPC}
+
+links:
+ -for i in ${DEVBPPC}; do \
+ cd $$i && rm -f tags; ln -s ../tags tags; done
SUBDIR= compile include
Index: src/sys/arch/i386/Makefile
diff -u src/sys/arch/i386/Makefile:1.39 src/sys/arch/i386/Makefile:1.40
--- src/sys/arch/i386/Makefile:1.39 Fri Mar 18 19:48:12 2011
+++ src/sys/arch/i386/Makefile Mon Apr 4 19:46:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2011/03/18 19:48:12 dyoung Exp $
+# $NetBSD: Makefile,v 1.40 2011/04/04 19:46:40 dyoung Exp $
# Makefile for i386 tags file and boot blocks
@@ -18,6 +18,11 @@
${SYSDIR}/arch/x86/acpi/*.[ch] \
${SYSDIR}/arch/x86/include/*.h \
${SYSDIR}/arch/x86/isa/*.[ch] \
+ ${SYSDIR}/arch/xen/include/*.h \
+ ${SYSDIR}/arch/xen/i38
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:45:24 UTC 2011
Modified Files:
src/sys/arch/evbarm: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/Makefile
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/evbarm/Makefile
diff -u src/sys/arch/evbarm/Makefile:1.6 src/sys/arch/evbarm/Makefile:1.7
--- src/sys/arch/evbarm/Makefile:1.6 Sat Oct 25 22:27:37 2008
+++ src/sys/arch/evbarm/Makefile Mon Apr 4 19:45:24 2011
@@ -1,17 +1,67 @@
-# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.7 2011/04/04 19:45:24 dyoung Exp $
# Makefile for evbarm tags file and boot blocks
+# Find where ARM source files are for inclusion in tags
+.include <../arm/Makefile.inc>
+
TEVBARM= ${SYSDIR}/arch/evbarm/tags
-SEVBARM= ${SYSDIR}/arch/arm/xscale/*.[ch] \
- ${SYSDIR}/arch/evbarm/dev/*.[ch] \
- ${SYSDIR}/arch/evbarm/ifpga/*.[ch] \
- ${SYSDIR}/arch/evbarm/include/*.h \
- ${SYSDIR}/arch/evbarm/integrator/*.[ch] \
- ${SYSDIR}/arch/evbarm/iq31244/*.[ch] \
- ${SYSDIR}/arch/evbarm/iq80310/*.[ch] \
- ${SYSDIR}/arch/evbarm/iq80321/*.[ch]
-AEVBARM= ${SYSDIR}/arch/evbarm/integrator/*.S
+SEVBARM= ${SYSDIR}/arch/evbarm/adi_brh/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/armadillo/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/beagle/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/cp3100/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/dev/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/devkit8000/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/evbarm/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/g42xxeb/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/gemini/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/gumstix/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/hdl_g/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/ifpga/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/imx31/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/include/*.h
+SEVBARM+= ${SYSDIR}/arch/evbarm/integrator/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/iq31244/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/iq80310/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/iq80321/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/ixdp425/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/ixm1200/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/lubbock/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/marvell/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/mpcsa/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/netwalker/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/npwr_fc/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/nslu2/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/osk5912/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/smdk2xx0/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/tisdp24xx/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/tsarm/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/evbarm/viper/*.[ch]
+SEVBARM+= ${SYSDIR}/arch/arm/xscale/*.[ch]
+
+AEVBARM= ${SYSDIR}/arch/evbarm/adi_brh/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/armadillo/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/beagle/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/g42xxeb/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/gemini/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/gumstix/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/hdl_g/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/imx31/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/ixdp425/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/ixm1200/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/lubbock/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/marvell/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/mpcsa/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/netwalker/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/nslu2/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/smdk2xx0/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/tisdp24xx/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/tsarm/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/viper/*.S
+AEVBARM+= ${SYSDIR}/arch/arm/xscale/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/integrator/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/iq80310/*.S
+AEVBARM+= ${SYSDIR}/arch/evbarm/iq80321/*.S
# Directories in which to place tags links
DEVBARM= include
@@ -20,11 +70,11 @@
tags:
-rm -f ${TEVBARM}
- -echo ${SEVBARM} | xargs ctags -wadtf ${TEVBARM}
+ -echo ${SEVBARM} ${SARM} | xargs ctags -wadtf ${TEVBARM}
-${FINDCOMM} | xargs ctags -wadtf ${TEVBARM}
- egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBARM} | \
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBARM} ${AARM} | \
${TOOL_SED} -e \
- "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TEVBARM}
sort -o ${TEVBARM} ${TEVBARM}
CVS commit: src/sys/arch/cobalt
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:45:00 UTC 2011
Modified Files:
src/sys/arch/cobalt: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/cobalt/Makefile
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/cobalt/Makefile
diff -u src/sys/arch/cobalt/Makefile:1.5 src/sys/arch/cobalt/Makefile:1.6
--- src/sys/arch/cobalt/Makefile:1.5 Sat Oct 25 22:27:37 2008
+++ src/sys/arch/cobalt/Makefile Mon Apr 4 19:45:00 2011
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.5 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.6 2011/04/04 19:45:00 dyoung Exp $
# Makefile for cobalt tags file
# Find where mips source files are for inclusion in tags
.include <../mips/Makefile.inc>
-TCOBALT= ../cobalt/tags
-SCOBALT= ../cobalt/cobalt/*.[ch] ../cobalt/include/*.h \
- ../cobalt/dev/*.[ch] ../cobalt/pci/*.[ch]
-ACOBALT= ../cobalt/cobalt/*.S
+TCOBALT= ${SYSDIR}/arch/cobalt/tags
+SCOBALT= ${SYSDIR}/arch/cobalt/cobalt/*.[ch] \
+ ${SYSDIR}/arch/cobalt/include/*.h \
+ ${SYSDIR}/arch/cobalt/dev/*.[ch] \
+ ${SYSDIR}/arch/cobalt/pci/*.[ch]
+ACOBALT= ${SYSDIR}/arch/cobalt/cobalt/*.S
# Directories in which to place tags links
DCOBALT= pci include
@@ -16,7 +18,9 @@
.include "../../kern/Make.tags.inc"
tags:
- -ctags -wdtf ${TCOBALT} ${SCOBALT} ${SMIPS} ${COMM}
+ -rm -f ${TCOBALT}
+ -echo ${SCOBALT} ${SMIPS} | xargs ctags -wadtf ${TCOBALT}
+ -${FINDCOMM} | xargs ctags -wadtf ${TCOBALT}
egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACOBALT} ${AMIPS} | \
${TOOL_SED} -e \
"s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
CVS commit: src/sys/arch/cats
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:44:37 UTC 2011
Modified Files:
src/sys/arch/cats: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/cats/Makefile
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/cats/Makefile
diff -u src/sys/arch/cats/Makefile:1.3 src/sys/arch/cats/Makefile:1.4
--- src/sys/arch/cats/Makefile:1.3 Sat Oct 25 22:27:37 2008
+++ src/sys/arch/cats/Makefile Mon Apr 4 19:44:37 2011
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.4 2011/04/04 19:44:37 dyoung Exp $
# Makefile for cats tags file and boot blocks
-TCATS= ../cats/tags
-SCATS= ../cats/cats/*.[ch] ../cats/include/*.h \
- ../cats/isa/*.[ch]
-ACATS= ../cats/cats/*.S
+# Find where ARM source files are for inclusion in tags
+.include <../arm/Makefile.inc>
+
+TCATS= ${SYSDIR}/arch/cats/tags
+SCATS= ${SYSDIR}/arch/cats/cats/*.[ch] ${SYSDIR}/arch/cats/include/*.h \
+ ${SYSDIR}/arch/cats/pci/*.[ch]
# Directories in which to place tags links
DCATS= isa include
@@ -13,10 +15,12 @@
.include "../../kern/Make.tags.inc"
tags:
- -ctags -wdtf ${TCATS} ${SCATS} ${COMM}
- egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACATS} | \
+ -rm -f ${TCATS}
+ -echo ${SCATS} ${SARM} | xargs ctags -wadtf ${TCATS}
+ -${FINDCOMM} | xargs ctags -wadtf ${TCATS}
+ egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACATS} ${AARM} | \
${TOOL_SED} -e \
- "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TCATS}
sort -o ${TCATS} ${TCATS}
CVS commit: src/sys/arch/atari
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:44:16 UTC 2011
Modified Files:
src/sys/arch/atari: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/atari/Makefile
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/atari/Makefile
diff -u src/sys/arch/atari/Makefile:1.7 src/sys/arch/atari/Makefile:1.8
--- src/sys/arch/atari/Makefile:1.7 Sat Oct 25 22:27:37 2008
+++ src/sys/arch/atari/Makefile Mon Apr 4 19:44:16 2011
@@ -1,14 +1,20 @@
-# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:37 apb Exp $
+# $NetBSD: Makefile,v 1.8 2011/04/04 19:44:16 dyoung Exp $
# Makefile for atari tags file and boot blocks
# Find where m68k source files are for inclusion in tags
.include <../m68k/Makefile.inc>
-TATARI= ../atari/tags
-SATARI= ../atari/atari/*.[ch] ../atari/include/*.h \
- ../atari/dev/*.[ch]
-AATARI= ../atari/atari/*.s
+TATARI= ${SYSDIR}/arch/atari/tags
+SATARI= ${SYSDIR}/arch/atari/atari/*.[ch]
+SATARI+= ${SYSDIR}/arch/atari/include/*.h
+SATARI+= ${SYSDIR}/arch/atari/dev/*.[ch]
+SATARI+= ${SYSDIR}/arch/atari/isa/*.[ch]
+SATARI+= ${SYSDIR}/arch/atari/pci/*.[ch]
+SATARI+= ${SYSDIR}/arch/atari/vme/*.[ch]
+
+AATARI= ${SYSDIR}/arch/atari/atari/*.s
+AATARI+= ${SYSDIR}/arch/atari/dev/*.s
# Directories in which to place tags links
DATARI= atari dev include
@@ -16,7 +22,9 @@
.include "../../kern/Make.tags.inc"
tags:
- -ctags -wdtf ${TATARI} ${SATARI} ${SM68K} ${COMM}
+ -rm -f ${TATARI}
+ -echo ${SATARI} ${SM68K} | xargs ctags -wadtf ${TATARI}
+ -${FINDCOMM} | xargs ctags -wadtf ${TATARI}
egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AATARI} ${AM68K} | \
${TOOL_SED} "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
>> ${TATARI}
CVS commit: src/sys/arch
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:43:34 UTC 2011
Added Files:
src/sys/arch/arm: Makefile.inc
src/sys/arch/powerpc: Makefile.inc
Log Message:
Add a couple of make(1) include files that provide lists of source
files needed for tags computation in evbppc, evbarm, cats, and other
architectures.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/sys/arch/powerpc/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/arm/Makefile.inc
diff -u /dev/null src/sys/arch/arm/Makefile.inc:1.1
--- /dev/null Mon Apr 4 19:43:34 2011
+++ src/sys/arch/arm/Makefile.inc Mon Apr 4 19:43:34 2011
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.inc,v 1.1 2011/04/04 19:43:34 dyoung Exp $
+
+AARM= ${SYSDIR}/arch/arm/arm/*.S
+SARM= ${SYSDIR}/arch/arm/arm/*.[ch] ${SYSDIR}/arch/arm/include/*.h
+SARM+= ${SYSDIR}/arch/arm/arm32/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/at91/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/ep93xx/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/footbridge/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/fpe-arm/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/gemini/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/imx/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/iomd/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/ixp12x0/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/mainbus/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/marvell/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/mpcore/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/ofw/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/omap/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/pic/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/s3c2xx0/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/sa11x0/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/vfp/*.[ch]
+SARM+= ${SYSDIR}/arch/arm/xscale/*.[ch]
Index: src/sys/arch/powerpc/Makefile.inc
diff -u /dev/null src/sys/arch/powerpc/Makefile.inc:1.1
--- /dev/null Mon Apr 4 19:43:34 2011
+++ src/sys/arch/powerpc/Makefile.inc Mon Apr 4 19:43:34 2011
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile.inc,v 1.1 2011/04/04 19:43:34 dyoung Exp $
+
+APPC= ${SYSDIR}/arch/powerpc/booke/*.S
+APPC+= ${SYSDIR}/arch/powerpc/ibm4xx/*.S
+APPC+= ${SYSDIR}/arch/powerpc/oea/*.S
+APPC+= ${SYSDIR}/arch/powerpc/ibm4xx/openbios/*.S
+APPC+= ${SYSDIR}/arch/powerpc/powerpc/*.S
+
+SPPC= ${SYSDIR}/arch/powerpc/include/*.h
+SPPC+= ${SYSDIR}/arch/powerpc/booke/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/fpu/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/ibm4xx/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/isa/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/marvell/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/oea/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/pci/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/pic/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/booke/dev/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/booke/pci/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/ibm4xx/dev/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/ibm4xx/openbios/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/ibm4xx/pci/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/include/booke/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/include/oea/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/include/ibm4xx/*.[ch]
+SPPC+= ${SYSDIR}/arch/powerpc/powerpc/*.[ch]
CVS commit: src/sys/arch/sparc
Module Name:src
Committed By: dyoung
Date: Mon Apr 4 19:41:24 UTC 2011
Modified Files:
src/sys/arch/sparc: Makefile
Log Message:
Fix target 'tags'.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/Makefile
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/sparc/Makefile
diff -u src/sys/arch/sparc/Makefile:1.9 src/sys/arch/sparc/Makefile:1.10
--- src/sys/arch/sparc/Makefile:1.9 Sat Oct 25 22:27:38 2008
+++ src/sys/arch/sparc/Makefile Mon Apr 4 19:41:24 2011
@@ -1,26 +1,32 @@
-# $NetBSD: Makefile,v 1.9 2008/10/25 22:27:38 apb Exp $
+# $NetBSD: Makefile,v 1.10 2011/04/04 19:41:24 dyoung Exp $
# Makefile for sparc tags file and boot blocks
-TSPARC= ../sparc/tags
-SSPARC= ../sparc/dev/*.[ch] ../sparc/fpu/*.[ch] \
- ../sparc/include/*.[ch] ../sparc/sparc/*.[ch]
-ASPARC= ../sparc/sparc/*.s
+TSPARC= ${SYSDIR}/arch/sparc/tags
+SSPARC= ${SYSDIR}/arch/sparc/dev/*.[ch] \
+ ${SYSDIR}/arch/sparc/fpu/*.[ch] \
+ ${SYSDIR}/arch/sparc/sparc/*.[ch] \
+ ${SYSDIR}/arch/sparc/include/*.h
+ASPARC= ${SYSDIR}/arch/sparc/sparc/*.s
# Directories in which to place tags links
-DSPARC= conf dev fpu include sparc
+DSPARC= sparc dev fpu include
+
+.include "../../kern/Make.tags.inc"
tags:
- -ctags -wdtf ${TSPARC} ${SSPARC} ${COMM}
+ -rm -f ${TSPARC}
+ -echo ${SSPARC} | xargs ctags -wadtf ${TSPARC}
+ -${FINDCOMM} | xargs ctags -wadtf ${TSPARC}
egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASPARC} | \
${TOOL_SED} -e \
- "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
- >> tags
+ "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
+ >> ${TSPARC}
sort -o ${TSPARC} ${TSPARC}
links:
-for i in ${DSPARC}; do \
- cd $$i && rm -f tags; ln -s ../tags tags; done
+ (cd $$i && rm -f tags; ln -s ../tags tags); done
SUBDIR= compile include stand
CVS commit: src
Module Name:src
Committed By: hannken
Date: Mon Apr 4 19:16:58 UTC 2011
Modified Files:
src/sys/fs/msdosfs: denode.h msdosfs_denode.c msdosfs_vfsops.c
src/tests/fs/vfs: t_vfsops.c
Log Message:
Msdosfs on-disk meta data is not sufficient to create or validate file handles.
Maintain a tree of file handles, create nodes from msdosfs_vptofh() and keep
them until either the file gets unlinked or the file system gets unmounted.
Fixes the msdosfs part of PR #43745 (fhopen of an unlinked file causes problems
on multiple file systems)
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/fs/msdosfs/denode.h
cvs rdiff -u -r1.42 -r1.43 src/sys/fs/msdosfs/msdosfs_denode.c
cvs rdiff -u -r1.89 -r1.90 src/sys/fs/msdosfs/msdosfs_vfsops.c
cvs rdiff -u -r1.10 -r1.11 src/tests/fs/vfs/t_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/denode.h
diff -u src/sys/fs/msdosfs/denode.h:1.18 src/sys/fs/msdosfs/denode.h:1.19
--- src/sys/fs/msdosfs/denode.h:1.18 Thu Apr 8 16:04:35 2010
+++ src/sys/fs/msdosfs/denode.h Mon Apr 4 19:16:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: denode.h,v 1.18 2010/04/08 16:04:35 pooka Exp $ */
+/* $NetBSD: denode.h,v 1.19 2011/04/04 19:16:58 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -249,9 +249,7 @@
u_int32_t defid_dirclust; /* cluster this dir entry came from */
u_int32_t defid_dirofs; /* offset of entry within the cluster */
-#if 0
u_int32_t defid_gen; /* generation number */
-#endif
};
/*
@@ -310,5 +308,9 @@
void msdosfs_gop_markupdate(struct vnode *, int);
void msdosfs_detimes(struct denode *, const struct timespec *,
const struct timespec *, const struct timespec *, int);
+int msdosfs_fh_enter(struct msdosfsmount *, uint32_t, uint32_t, uint32_t *);
+int msdosfs_fh_remove(struct msdosfsmount *, uint32_t, uint32_t);
+int msdosfs_fh_lookup(struct msdosfsmount *, uint32_t, uint32_t, uint32_t *);
+void msdosfs_fh_destroy(struct msdosfsmount *);
#endif /* _KERNEL */
#endif /* _MSDOSFS_DENODE_H_ */
Index: src/sys/fs/msdosfs/msdosfs_denode.c
diff -u src/sys/fs/msdosfs/msdosfs_denode.c:1.42 src/sys/fs/msdosfs/msdosfs_denode.c:1.43
--- src/sys/fs/msdosfs/msdosfs_denode.c:1.42 Tue Mar 22 20:33:51 2011
+++ src/sys/fs/msdosfs/msdosfs_denode.c Mon Apr 4 19:16:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_denode.c,v 1.42 2011/03/22 20:33:51 hannken Exp $ */
+/* $NetBSD: msdosfs_denode.c,v 1.43 2011/04/04 19:16:58 hannken Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.42 2011/03/22 20:33:51 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_denode.c,v 1.43 2011/04/04 19:16:58 hannken Exp $");
#include
#include
@@ -84,6 +84,53 @@
extern int prtactive;
+struct fh_key {
+ struct msdosfsmount *fhk_mount;
+ uint32_t fhk_dircluster;
+ uint32_t fhk_diroffset;
+};
+struct fh_node {
+ struct rb_node fh_rbnode;
+ struct fh_key fh_key;
+#define fh_mount fh_key.fhk_mount
+#define fh_dircluster fh_key.fhk_dircluster
+#define fh_diroffset fh_key.fhk_diroffset
+ uint32_t fh_gen;
+};
+
+static int
+fh_compare_node_fh(void *ctx, const void *b, const void *key)
+{
+ const struct fh_node * const pnp = b;
+ const struct fh_key * const fhp = key;
+
+ /* msdosfs_fh_destroy() below depends on first sorting on fh_mount. */
+ if (pnp->fh_mount != fhp->fhk_mount)
+ return (intptr_t)pnp->fh_mount - (intptr_t)fhp->fhk_mount;
+ if (pnp->fh_dircluster != fhp->fhk_dircluster)
+ return pnp->fh_dircluster - fhp->fhk_dircluster;
+ return pnp->fh_diroffset - fhp->fhk_diroffset;
+}
+
+static int
+fh_compare_nodes(void *ctx, const void *parent, const void *node)
+{
+ const struct fh_node * const np = node;
+
+ return fh_compare_node_fh(ctx, parent, &np->fh_key);
+}
+
+static uint32_t fh_generation;
+static kmutex_t fh_lock;
+static struct pool fh_pool;
+static rb_tree_t fh_rbtree;
+static const rb_tree_ops_t fh_rbtree_ops = {
+ .rbto_compare_nodes = fh_compare_nodes,
+ .rbto_compare_key = fh_compare_node_fh,
+ .rbto_node_offset = offsetof(struct fh_node, fh_rbnode),
+ .rbto_context = NULL
+};
+
static const struct genfs_ops msdosfs_genfsops = {
.gop_size = genfs_size,
.gop_alloc = msdosfs_gop_alloc,
@@ -106,8 +153,12 @@
malloc_type_attach(M_MSDOSFSTMP);
pool_init(&msdosfs_denode_pool, sizeof(struct denode), 0, 0, 0,
"msdosnopl", &pool_allocator_nointr, IPL_NONE);
+ pool_init(&fh_pool, sizeof(struct fh_node), 0, 0, 0,
+ "msdosfhpl", &pool_allocator_nointr, IPL_NONE);
dehashtbl = hashinit(desiredvnodes / 2, HASH_LIST, true, &dehash);
+ rb_tree_init(&fh_rbtree, &fh_rbtree_ops);
mutex_init(&msdosfs_ihash_lock, MUTEX_DEFAULT, IPL_NONE);
+ mutex_init(&fh_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&msdosfs_hashlock, MUTEX_DEFAULT, IPL_NONE);
}
@@ -147,7 +198,9 @@
{
hashdone(dehasht
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Mon Apr 4 19:08:43 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/syscall: Makefile
Added Files:
src/tests/syscall: t_setuid.c
Log Message:
Use the same pattern for couple of simple setuid(2) tests.
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.17 -r1.18 src/tests/syscall/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/syscall/t_setuid.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.290 src/distrib/sets/lists/tests/mi:1.291
--- src/distrib/sets/lists/tests/mi:1.290 Mon Apr 4 16:32:41 2011
+++ src/distrib/sets/lists/tests/mi Mon Apr 4 19:08:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.290 2011/04/04 16:32:41 jruoho Exp $
+# $NetBSD: mi,v 1.291 2011/04/04 19:08:42 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -571,6 +571,7 @@
./usr/libdata/debug/usr/tests/syscall/t_getsid.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_mmap.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_mprotect.debug tests-syscall-debug debug,atf
+./usr/libdata/debug/usr/tests/syscall/t_setuid.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_timer.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_umask.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/usr.bin tests-sbin-tests
@@ -2113,6 +2114,7 @@
./usr/tests/syscall/t_getsid tests-syscall-tests atf
./usr/tests/syscall/t_mmap tests-syscall-tests atf
./usr/tests/syscall/t_mprotect tests-syscall-tests atf
+./usr/tests/syscall/t_setuid tests-syscall-tests atf
./usr/tests/syscall/t_timer tests-syscall-tests atf
./usr/tests/syscall/t_umask tests-syscall-tests atf
./usr/tests/toolchain tests-syscall-tests atf
Index: src/tests/syscall/Makefile
diff -u src/tests/syscall/Makefile:1.17 src/tests/syscall/Makefile:1.18
--- src/tests/syscall/Makefile:1.17 Mon Apr 4 16:32:41 2011
+++ src/tests/syscall/Makefile Mon Apr 4 19:08:43 2011
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2011/04/04 16:32:41 jruoho Exp $
+# $NetBSD: Makefile,v 1.18 2011/04/04 19:08:43 jruoho Exp $
.include
TESTSDIR= ${TESTSBASE}/syscall
TESTS_C+= t_access t_cmsg t_dup t_fsync t_getpid t_getsid
-TESTS_C+= t_mmap t_mprotect t_timer t_umask
+TESTS_C+= t_mmap t_mprotect t_setuid t_timer t_umask
LDADD.t_getpid+=-lpthread
LDADD.t_timer+= -lpthread
Added files:
Index: src/tests/syscall/t_setuid.c
diff -u /dev/null src/tests/syscall/t_setuid.c:1.1
--- /dev/null Mon Apr 4 19:08:43 2011
+++ src/tests/syscall/t_setuid.c Mon Apr 4 19:08:43 2011
@@ -0,0 +1,122 @@
+/* $NetBSD: t_setuid.c,v 1.1 2011/04/04 19:08:43 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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.
+ */
+#include
+__RCSID("$NetBSD: t_setuid.c,v 1.1 2011/04/04 19:08:43 jruoho Exp $");
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+ATF_TC(setuid_perm);
+ATF_TC_HEAD(setuid_perm, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test setuid(0) as normal user");
+ atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(setuid_perm, tc)
+{
+ errno = 0;
+
+ ATF_REQUIRE(setuid(0) == -1);
+ ATF_REQUIRE(errno == EPERM);
+}
+
+ATF_TC(setuid_re
CVS commit: src/usr.sbin/flashctl
Module Name:src
Committed By: ahoka
Date: Mon Apr 4 18:30:07 UTC 2011
Modified Files:
src/usr.sbin/flashctl: flashctl.c
Log Message:
fix one more flash_addr_t fallout
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/flashctl/flashctl.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.sbin/flashctl/flashctl.c
diff -u src/usr.sbin/flashctl/flashctl.c:1.2 src/usr.sbin/flashctl/flashctl.c:1.3
--- src/usr.sbin/flashctl/flashctl.c:1.2 Sun Mar 20 06:10:27 2011
+++ src/usr.sbin/flashctl/flashctl.c Mon Apr 4 18:30:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: flashctl.c,v 1.2 2011/03/20 06:10:27 ahoka Exp $ */
+/* $NetBSD: flashctl.c,v 1.3 2011/04/04 18:30:07 ahoka Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -137,10 +137,10 @@
printf("\n");
/* TODO: humanize */
- printf("Capacity %jd Mbytes, %jd pages, %zu bytes/page\n",
+ printf("Capacity %jd Mbytes, %jd pages, %ju bytes/page\n",
(intmax_t )ip.ip_flash_size / 1024 / 1024,
(intmax_t )ip.ip_flash_size / ip.ip_page_size,
- ip.ip_page_size);
+ (intmax_t )ip.ip_page_size);
if (ip.ip_flash_type == FLASH_TYPE_NAND) {
printf("Block size %jd Kbytes, %jd pages/block\n",
@@ -150,7 +150,7 @@
} else if (!strcmp("badblocks", command)) {
struct flash_info_params ip;
struct flash_badblock_params bbp;
- flash_addr_t addr;
+ flash_off_t addr;
bool hasbad = false;
error = ioctl(fd, FLASH_GET_INFO, &ip);
@@ -185,7 +185,7 @@
printf("No bad blocks found.\n");
}
} else if (!strcmp("markbad", command)) {
- flash_addr_t address;
+ flash_off_t address;
/* TODO: maybe we should let the user specify
* multiple blocks?
CVS commit: src/lib/libbluetooth
Module Name:src
Committed By: plunky
Date: Mon Apr 4 18:29:48 UTC 2011
Modified Files:
src/lib/libbluetooth: sdp_get.c
Log Message:
remove compile time guard from previous commit, it is not needed
(C99 guarantees [u]intmax types are at least 64-bits)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libbluetooth/sdp_get.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/libbluetooth/sdp_get.c
diff -u src/lib/libbluetooth/sdp_get.c:1.2 src/lib/libbluetooth/sdp_get.c:1.3
--- src/lib/libbluetooth/sdp_get.c:1.2 Mon Apr 4 16:19:25 2011
+++ src/lib/libbluetooth/sdp_get.c Mon Apr 4 18:29:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp_get.c,v 1.2 2011/04/04 16:19:25 plunky Exp $ */
+/* $NetBSD: sdp_get.c,v 1.3 2011/04/04 18:29:47 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,15 +30,11 @@
*/
#include
-__RCSID("$NetBSD: sdp_get.c,v 1.2 2011/04/04 16:19:25 plunky Exp $");
+__RCSID("$NetBSD: sdp_get.c,v 1.3 2011/04/04 18:29:47 plunky Exp $");
#include
#include
-#if INTMAX_MAX < INT64_MAX
-#warning INTMAX type is not large enough to hold INT64 values
-#endif
-
/**
* sdp_get_(data, value)
*
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: ahoka
Date: Mon Apr 4 18:24:56 UTC 2011
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
remove FLASH_GET_INFO compat as it is no longer using size_t
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/netbsd32/netbsd32_ioctl.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/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.55 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.56
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.55 Sat Mar 19 04:07:35 2011
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Mon Apr 4 18:24:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.55 2011/03/19 04:07:35 cliff Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.56 2011/04/04 18:24:56 ahoka Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.55 2011/03/19 04:07:35 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.56 2011/04/04 18:24:56 ahoka Exp $");
#include
#include
@@ -51,7 +51,6 @@
#include
#include
#include
-#include
#ifdef __sparc__
#include
@@ -443,26 +442,6 @@
*s32p = (netbsd32_u_long)*p;
}
-static inline void
-netbsd32_to_flash_info_params(struct netbsd32_flash_info_params *s32p,
- struct flash_info_params *p, u_long cmd)
-{
- p->ip_flash_size = s32p->ip_flash_size;
- p->ip_page_size = (size_t)s32p->ip_page_size;
- p->ip_erase_size = (size_t)s32p->ip_erase_size;
- p->ip_flash_type = s32p->ip_flash_type;
-}
-
-static inline void
-netbsd32_from_flash_info_params(struct flash_info_params *p,
- struct netbsd32_flash_info_params *s32p, u_long cmd)
-{
- s32p->ip_flash_size = p->ip_flash_size;
- s32p->ip_page_size = (netbsd32_size_t)p->ip_page_size;
- s32p->ip_erase_size = (netbsd32_size_t)p->ip_erase_size;
- s32p->ip_flash_type = p->ip_flash_type;
-}
-
/*
* main ioctl syscall.
*
@@ -764,9 +743,6 @@
case ENVSYS_REMOVEPROPS32:
IOCTL_STRUCT_CONV_TO(ENVSYS_REMOVEPROPS, plistref);
- case FLASH_GET_INFO32:
- IOCTL_STRUCT_CONV_TO(FLASH_GET_INFO, flash_info_params);
-
default:
#ifdef NETBSD32_MD_IOCTL
error = netbsd32_md_ioctl(fp, com, data32, l);
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.34 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.35
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.34 Mon Apr 4 17:46:22 2011
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Mon Apr 4 18:24:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.34 2011/04/04 17:46:22 ahoka Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.35 2011/04/04 18:24:56 ahoka Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,6 @@
#include
#include
#include
-#include
#include
@@ -393,12 +392,3 @@
#define ENVSYS_GETDICTIONARY32 _IOWR('E', 0, struct netbsd32_plistref)
#define ENVSYS_SETDICTIONARY32 _IOWR('E', 1, struct netbsd32_plistref)
#define ENVSYS_REMOVEPROPS32 _IOWR('E', 2, struct netbsd32_plistref)
-
-/* from */
-struct netbsd32_flash_info_params {
- flash_off_t ip_flash_size;
- netbsd32_size_t ip_page_size;
- netbsd32_size_t ip_erase_size;
- uint8_t ip_flash_type;
-};
-#define FLASH_GET_INFO32 _IOWR('&', 2, struct netbsd32_flash_info_params)
CVS commit: src/sys/sys
Module Name:src
Committed By: ahoka
Date: Mon Apr 4 18:23:39 UTC 2011
Modified Files:
src/sys/sys: flashio.h
Log Message:
dont use size_t, but a fixed 64 bit unsigned type flash_size_t in ioctls
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/sys/flashio.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/sys/flashio.h
diff -u src/sys/sys/flashio.h:1.2 src/sys/sys/flashio.h:1.3
--- src/sys/sys/flashio.h:1.2 Mon Apr 4 16:26:09 2011
+++ src/sys/sys/flashio.h Mon Apr 4 18:23:39 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: flashio.h,v 1.2 2011/04/04 16:26:09 ahoka Exp $ */
+/* $NetBSD: flashio.h,v 1.3 2011/04/04 18:23:39 ahoka Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -79,8 +79,8 @@
struct flash_info_params {
flash_off_t ip_flash_size;
- size_t ip_page_size;
- size_t ip_erase_size;
+ flash_size_t ip_page_size;
+ flash_size_t ip_erase_size;
uint8_t ip_flash_type;
};
CVS commit: src/tests/include
Module Name:src
Committed By: jruoho
Date: Mon Apr 4 18:02:01 UTC 2011
Modified Files:
src/tests/include: t_limits.c
Log Message:
Add a test case for the POSIX (minimum) limits. Written by Stathis Kamperis.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/include/t_limits.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/include/t_limits.c
diff -u src/tests/include/t_limits.c:1.1 src/tests/include/t_limits.c:1.2
--- src/tests/include/t_limits.c:1.1 Sat Jul 17 19:26:27 2010
+++ src/tests/include/t_limits.c Mon Apr 4 18:02:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_limits.c,v 1.1 2010/07/17 19:26:27 jmmv Exp $ */
+/* $NetBSD: t_limits.c,v 1.2 2011/04/04 18:02:01 jruoho Exp $ */
/*
* Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -26,21 +26,250 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * Copyright (c) 2009, Stathis Kamperis
+ * 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. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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
+ * COPYRIGHT HOLDERS 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.
+ */
#include
__COPYRIGHT("@(#) Copyright (c) 2008, 2010\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_limits.c,v 1.1 2010/07/17 19:26:27 jmmv Exp $");
+__RCSID("$NetBSD: t_limits.c,v 1.2 2011/04/04 18:02:01 jruoho Exp $");
#include
#include
+struct psxentry {
+ const char *psx_desc;
+ int psx_constant;
+ int psx_minval;
+} psxtable[] = {
+
+ /*
+ * POSIX symbolic constants.
+ */
+#ifdef _POSIX_AIO_LISTIO_MAX
+ { "_POSIX_AIO_LISTIO_MAX", _POSIX_AIO_LISTIO_MAX, 2},
+#endif
+#ifdef _POSIX_AIO_MAX
+ { "_POSIX_AIO_MAX", _POSIX_AIO_MAX, 1},
+#endif
+#ifdef _POSIX_ARG_MAX
+ { "_POSIX_ARG_MAX", _POSIX_ARG_MAX, 4096 },
+#endif
+#ifdef _POSIX_CHILD_MAX
+ { "_POSIX_CHILD_MAX" , _POSIX_CHILD_MAX, 25 },
+#endif
+#ifdef _POSIX_DELAYTIMER_MAX
+ { "_POSIX_DELAYTIMER_MAX", _POSIX_DELAYTIMER_MAX, 32 },
+#endif
+#ifdef _POSIX_HOST_NAME_MAX
+ { "_POSIX_HOST_NAME_MAX", _POSIX_HOST_NAME_MAX, 255 },
+#endif
+#ifdef _POSIX_LINK_MAX
+ { "_POSIX_LINK_MAX", _POSIX_LINK_MAX, 8},
+#endif
+#ifdef _POSIX_LOGIN_NAME_MAX
+ { "_POSIX_LOGIN_NAME_MAX", _POSIX_LOGIN_NAME_MAX, 9},
+#endif
+#ifdef _POSIX_MAX_CANON
+ { "_POSIX_MAX_CANON", _POSIX_MAX_CANON, 255 },
+#endif
+#ifdef _POSIX_MAX_INPUT
+ { "_POSIX_MAX_INPUT", _POSIX_MAX_INPUT, 255 },
+#endif
+#ifdef _POSIX_MQ_OPEN_MAX
+ { "_POSIX_MQ_OPEN_MAX", _POSIX_MQ_OPEN_MAX, 8},
+#endif
+#ifdef _POSIX_MQ_PRIO_MAX
+ { "_POSIX_MQ_PRIO_MAX", _POSIX_MQ_PRIO_MAX, 32 },
+#endif
+#ifdef _POSIX_NAME_MAX
+ { "_POSIX_NAME_MAX", _POSIX_NAME_MAX, 9},
+#endif
+#ifdef _POSIX_NGROUPS_MAX
+ { "_POSIX_NGROUPS_MAX", _POSIX_NGROUPS_MAX, 8},
+#endif
+#ifdef _POSIX_OPEN_MAX
+ { "_POSIX_OPEN_MAX", _POSIX_OPEN_MAX, 20 },
+#endif
+#ifdef _POSIX_PATH_MAX
+ { "_POSIX_PATH_MAX", _POSIX_PATH_MAX, 256 },
+#endif
+#ifdef _POSIX_PIPE_BUF
+ { "_POSIX_PIPE_BUF", _POSIX_PIPE_BUF, 512 },
+#endif
+#ifdef _POSIX_RE_DUP_MAX
+ { "_POSIX_RE_DUP_MAX", _POSIX_RE_DUP_MAX, 255 },
+#endif
+#ifdef _POSIX_RTSIG_MAX
+ { "_POSIX_RTSIG_MAX", _POSIX_RTSIG_MAX, 8},
+#endif
+#ifdef _POSIX_SEM_NSEMS_MAX
+ { "_POSIX_SEM_NSEMS_MAX", _POSIX_SEM_NSEMS_MAX, 256 },
+#endif
+#ifdef _POSIX_SEM_VALUE_MAX
+ { "_POSIX_SEM_VALUE_MAX", _POSIX_SEM_VALUE_MAX, 32767},
+#endif
+#ifdef _POSIX_SIGQUEUE_MAX
+ { "_POSIX_SIGQUEUE_MAX", _POSIX_SIGQUEUE_MAX, 32 },
+#endif
+#ifdef _POSIX_SSIZE_MAX
+ { "_POSIX_SSIZE_MAX", _POSIX_SSIZE_MAX, 32767},
+#endif
+#ifdef _POSIX_STREAM_MAX
+ { "_POSIX_STREAM_MAX", _POSIX_STREAM_MAX, 8},
+#endif
+#ifdef _POSIX_SS_REPL_MAX
+ { "_POSIX_SS_REPL_MAX", _POSIX_SS_REPL_MAX, 4},
+#en
CVS commit: src/sys/dev/pci
Module Name:src Committed By: bouyer Date: Mon Apr 4 18:01:22 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen: Add RDC PCI-ISA bridge To generate a diff of this commit: cvs rdiff -u -r1.1066 -r1.1067 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1065 -r1.1066 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. Modified files: Index: src/sys/dev/pci/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.1066 src/sys/dev/pci/pcidevs.h:1.1067 --- src/sys/dev/pci/pcidevs.h:1.1066 Mon Apr 4 15:13:08 2011 +++ src/sys/dev/pci/pcidevs.h Mon Apr 4 18:01:20 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.1066 2011/04/04 15:13:08 dyoung Exp $ */ +/* $NetBSD: pcidevs.h,v 1.1067 2011/04/04 18:01:20 bouyer Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1069 2011/04/04 14:33:51 bouyer Exp + * NetBSD: pcidevs,v 1.1070 2011/04/04 17:59:59 bouyer Exp */ /* @@ -3921,8 +3921,9 @@ #define PCI_PRODUCT_RATOC_REXPCI31 0x0853 /* REX PCI-31/33 SCSI */ /* RDC Semiconductor products */ -#define PCI_PRODUCT_RDC_R6040 0x6040 /* RDC R6040 10/100 Ethernet */ #define PCI_PRODUCT_RDC_IDE 0x1011 /* RDC IDE controller */ +#define PCI_PRODUCT_RDC_PCIB 0x6036 /* RDC PCI-ISA bridge */ +#define PCI_PRODUCT_RDC_R6040 0x6040 /* RDC R6040 10/100 Ethernet */ /* Realtek products */ #define PCI_PRODUCT_REALTEK_RT8029 0x8029 /* 8029 Ethernet */ Index: src/sys/dev/pci/pcidevs_data.h diff -u src/sys/dev/pci/pcidevs_data.h:1.1065 src/sys/dev/pci/pcidevs_data.h:1.1066 --- src/sys/dev/pci/pcidevs_data.h:1.1065 Mon Apr 4 15:13:08 2011 +++ src/sys/dev/pci/pcidevs_data.h Mon Apr 4 18:01:21 2011 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs_data.h,v 1.1065 2011/04/04 15:13:08 dyoung Exp $ */ +/* $NetBSD: pcidevs_data.h,v 1.1066 2011/04/04 18:01:21 bouyer Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1069 2011/04/04 14:33:51 bouyer Exp + * NetBSD: pcidevs,v 1.1070 2011/04/04 17:59:59 bouyer Exp */ /* @@ -6333,10 +6333,12 @@ 22214, 11343, 0, PCI_VENDOR_RATOC, PCI_PRODUCT_RATOC_REXPCI31, 1, 5, 6349, 0, - PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R6040, - 5061, 22235, 5503, 5401, 0, PCI_VENDOR_RDC, PCI_PRODUCT_RDC_IDE, - 5061, 6305, 22241, 0, + 5061, 6305, 22235, 0, + PCI_VENDOR_RDC, PCI_PRODUCT_RDC_PCIB, + 5061, 6516, 10383, 0, + PCI_VENDOR_RDC, PCI_PRODUCT_RDC_R6040, + 5061, 22246, 5503, 5401, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8029, 22252, 5401, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8139D, @@ -8383,7 +8385,7 @@ "I4\0" /* 1 refs @ 5047 */ "Areca\0" /* 1 refs @ 5050 */ "S2io\0" /* 1 refs @ 5056 */ - "RDC\0" /* 3 refs @ 5061 */ + "RDC\0" /* 4 refs @ 5061 */ "Ralink\0" /* 1 refs @ 5065 */ "Raza\0" /* 1 refs @ 5072 */ "(NetLogic)\0" /* 1 refs @ 5077 */ @@ -8572,7 +8574,7 @@ "(5-8)\0" /* 1 refs @ 6498 */ "M1445\0" /* 1 refs @ 6504 */ "M1449\0" /* 1 refs @ 6510 */ - "PCI-ISA\0" /* 45 refs @ 6516 */ + "PCI-ISA\0" /* 46 refs @ 6516 */ "M1451\0" /* 1 refs @ 6524 */ "Host-PCI\0" /* 42 refs @ 6530 */ "M1461\0" /* 1 refs @ 6539 */ @@ -9184,7 +9186,7 @@ "T1\0" /* 1 refs @ 10366 */ "XLS\0" /* 1 refs @ 10369 */ "PCIe-PCIe\0" /* 1 refs @ 10373 */ - "bridge\0" /* 1 refs @ 10383 */ + "bridge\0" /* 2 refs @ 10383 */ "single-channel\0" /* 2 refs @ 10390 */ "RS-485\0" /* 8 refs @ 10405 */ "UART\0" /* 19 refs @ 10412 */ @@ -10744,8 +10746,8 @@ "RT3090\0" /* 1 refs @ 22214 */ "REX\0" /* 1 refs @ 1 */ "PCI-31/33\0" /* 1 refs @ 5 */ - "R6040\0" /* 1 refs @ 22235 */ - "controller\0" /* 1 refs @ 22241 */ + "controller\0" /* 1 refs @ 22235 */ + "R6040\0" /* 1 refs @ 22246 */ "8029\0" /* 1 refs @ 22252 */ "8139D\0" /* 1 refs @ 22257 */ "8100\0" /* 1 refs @ 22263 */
CVS commit: src/sys/arch/sandpoint/sandpoint
Module Name:src
Committed By: phx
Date: Mon Apr 4 18:01:08 UTC 2011
Modified Files:
src/sys/arch/sandpoint/sandpoint: iic_eumb.c
Log Message:
Add more known I2C devices:
dlink: strtc
qnap: s390rtc
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sandpoint/sandpoint/iic_eumb.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/sandpoint/sandpoint/iic_eumb.c
diff -u src/sys/arch/sandpoint/sandpoint/iic_eumb.c:1.11 src/sys/arch/sandpoint/sandpoint/iic_eumb.c:1.12
--- src/sys/arch/sandpoint/sandpoint/iic_eumb.c:1.11 Thu Mar 31 02:32:35 2011
+++ src/sys/arch/sandpoint/sandpoint/iic_eumb.c Mon Apr 4 18:01:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iic_eumb.c,v 1.11 2011/03/31 02:32:35 nisimura Exp $ */
+/* $NetBSD: iic_eumb.c,v 1.12 2011/04/04 18:01:08 phx Exp $ */
/*-
* Copyright (c) 2010,2011 Frank Wille.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: iic_eumb.c,v 1.11 2011/03/31 02:32:35 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iic_eumb.c,v 1.12 2011/04/04 18:01:08 phx Exp $");
#include
#include
@@ -59,11 +59,13 @@
};
static struct i2cdev rtcmodel[] = {
+ { "dlink","strtc", 0x68 },
{ "kurobox", "rs5c372rtc", 0x32 },
+ { "qnap", "s390rtc",0x30 },
{ "synology", "rs5c372rtc", 0x32 },
};
-void add_i2c_child_devices(device_t, const char *);
+static void add_i2c_child_devices(device_t, const char *);
static int
iic_eumb_match(device_t parent, cfdata_t cf, void *aux)
@@ -100,7 +102,7 @@
motoi2c_attach_common(self, &sc->sc_motoi2c, NULL);
}
-void
+static void
add_i2c_child_devices(device_t self, const char *family)
{
struct i2cdev *rtc;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: bouyer Date: Mon Apr 4 17:59:59 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add RDC PCI-ISA bridge To generate a diff of this commit: cvs rdiff -u -r1.1069 -r1.1070 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.1069 src/sys/dev/pci/pcidevs:1.1070 --- src/sys/dev/pci/pcidevs:1.1069 Mon Apr 4 14:33:51 2011 +++ src/sys/dev/pci/pcidevs Mon Apr 4 17:59:59 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1069 2011/04/04 14:33:51 bouyer Exp $ +$NetBSD: pcidevs,v 1.1070 2011/04/04 17:59:59 bouyer Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3914,8 +3914,9 @@ product RATOC REXPCI31 0x0853 REX PCI-31/33 SCSI /* RDC Semiconductor products */ -product RDC R6040 0x6040 RDC R6040 10/100 Ethernet product RDC IDE 0x1011 RDC IDE controller +product RDC PCIB 0x6036 RDC PCI-ISA bridge +product RDC R6040 0x6040 RDC R6040 10/100 Ethernet /* Realtek products */ product REALTEK RT8029 0x8029 8029 Ethernet
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: phx
Date: Mon Apr 4 17:58:40 UTC 2011
Modified Files:
src/sys/dev/i2c: files.i2c
Added Files:
src/sys/dev/i2c: s390.c s390reg.h
Log Message:
s390rtc(4), an RTC driver for the Seiko Instruments S-35390A chip.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/i2c/files.i2c
cvs rdiff -u -r0 -r1.1 src/sys/dev/i2c/s390.c src/sys/dev/i2c/s390reg.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/i2c/files.i2c
diff -u src/sys/dev/i2c/files.i2c:1.33 src/sys/dev/i2c/files.i2c:1.34
--- src/sys/dev/i2c/files.i2c:1.33 Mon Feb 14 08:50:39 2011
+++ src/sys/dev/i2c/files.i2c Mon Apr 4 17:58:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.i2c,v 1.33 2011/02/14 08:50:39 hannken Exp $
+# $NetBSD: files.i2c,v 1.34 2011/04/04 17:58:40 phx Exp $
defflag opt_i2cbus.hI2C_SCAN
define i2cbus { }
@@ -58,6 +58,11 @@
attach pcfrtc at iic
file dev/i2c/pcf8583.c pcfrtc
+# Seiko Instruments S-xx390A Real Time Clock
+device s390rtc
+attach s390rtc at iic
+file dev/i2c/s390.cs390rtc
+
# Atmel/Microchip 24Cxx Serial EEPROM
define at24cxx_eeprom
device seeprom
Added files:
Index: src/sys/dev/i2c/s390.c
diff -u /dev/null src/sys/dev/i2c/s390.c:1.1
--- /dev/null Mon Apr 4 17:58:40 2011
+++ src/sys/dev/i2c/s390.c Mon Apr 4 17:58:40 2011
@@ -0,0 +1,249 @@
+/* $NetBSD: s390.c,v 1.1 2011/04/04 17:58:40 phx Exp $ */
+
+/*-
+ * Copyright (c) 2011 Frank Wille.
+ * All rights reserved.
+ *
+ * Written by Frank Wille for The NetBSD Project.
+ *
+ * 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. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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.
+ */
+
+#include
+__KERNEL_RCSID(0, "$NetBSD: s390.c,v 1.1 2011/04/04 17:58:40 phx Exp $");
+
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+
+struct s390rtc_softc {
+ device_t sc_dev;
+ i2c_tag_t sc_tag;
+ i2c_addr_t sc_addr;
+ struct todr_chip_handle sc_todr;
+};
+
+static int s390rtc_match(device_t, cfdata_t, void *);
+static void s390rtc_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(s390rtc, sizeof(struct s390rtc_softc),
+s390rtc_match, s390rtc_attach, NULL, NULL);
+
+static int s390rtc_gettime(struct todr_chip_handle *, struct timeval *);
+static int s390rtc_settime(struct todr_chip_handle *, struct timeval *);
+static int s390rtc_clock_read(struct s390rtc_softc *, struct clock_ymdhms *);
+static int s390rtc_clock_write(struct s390rtc_softc *, struct clock_ymdhms *);
+static int s390rtc_read(struct s390rtc_softc *, int, uint8_t *, size_t);
+static int s390rtc_write(struct s390rtc_softc *, int, uint8_t *, size_t);
+static uint8_t bitreverse(uint8_t);
+
+static int
+s390rtc_match(device_t parent, cfdata_t cf, void *arg)
+{
+ struct i2c_attach_args *ia = arg;
+
+ if (ia->ia_addr == S390_ADDR)
+ return 1;
+ return 0;
+}
+
+static void
+s390rtc_attach(device_t parent, device_t self, void *arg)
+{
+ struct s390rtc_softc *sc = device_private(self);
+ struct i2c_attach_args *ia = arg;
+ uint8_t reg[1];
+
+ aprint_naive(": Real-time Clock\n");
+ aprint_normal(": Seiko Instruments 35390A Real-time Clock\n");
+
+ sc->sc_tag = ia->ia_tag;
+ sc->sc_addr = ia->ia_addr;
+ sc->sc_dev = self;
+
+ /* Reset the chip and turn on 24h mode, after power-off or battery. */
+ if (!s390rtc_read(sc, S390_STATUS1, reg, sizeof(reg)))
+ return;
+ if (reg[0] & (S390_ST1_POC | S390_ST1_BLD)) {
+ reg[0] |= S390_ST1_24H | S390_ST1_RESET;
+ if (!s390rtc_write(sc, S390_STATUS1, reg, sizeof(reg)))
+ return;
+ }
+
+ /* Disable the test mode, when enabled. */
+ if (!s390rtc_read(sc, S390_STATUS2, reg, sizeof(reg)))
+ return;
+ if ((reg[0] & S390_ST2_TEST)) {
+ reg[0] &= ~S390_ST2_
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: ahoka
Date: Mon Apr 4 17:46:22 UTC 2011
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.h
Log Message:
flash_addr_t -> flash_off_t
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/netbsd32/netbsd32_ioctl.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/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.33 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.34
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.33 Sat Mar 19 13:47:43 2011
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Mon Apr 4 17:46:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.33 2011/03/19 13:47:43 cliff Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.34 2011/04/04 17:46:22 ahoka Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -396,7 +396,7 @@
/* from */
struct netbsd32_flash_info_params {
- flash_addr_t ip_flash_size;
+ flash_off_t ip_flash_size;
netbsd32_size_t ip_page_size;
netbsd32_size_t ip_erase_size;
uint8_t ip_flash_type;
CVS commit: src/doc
Module Name:src Committed By: bouyer Date: Mon Apr 4 17:27:32 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note rdcpcib(4) To generate a diff of this commit: cvs rdiff -u -r1.1534 -r1.1535 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.1534 src/doc/CHANGES:1.1535 --- src/doc/CHANGES:1.1534 Mon Apr 4 14:47:49 2011 +++ src/doc/CHANGES Mon Apr 4 17:27:32 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1534 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1535 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -980,3 +980,6 @@ ssh-askpass: Updated to 1.2.0. [mbalmer 20110403] rdcide(4): add a driver for the IDE controller found in RDC's vortex86 and PMX-1000 system-on-chip. [bouyer 20110404] + rdcpcib(4): add a driver for the PCI/ISA bridge and watchdog timer + found in RDC's vortex86 and PMX-1000 system-on-chip. + [bouyer 20110404]
CVS commit: src
Module Name:src Committed By: bouyer Date: Mon Apr 4 17:26:24 UTC 2011 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile src/share/man/man4/man4.i386: Makefile Added Files: src/share/man/man4/man4.i386: rdcide.4 rdcpcib.4 Log Message: Add a man page for rdcpcib(4). While there move rdcide.4 to i386/ To generate a diff of this commit: cvs rdiff -u -r1.1305 -r1.1306 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.556 -r1.557 src/share/man/man4/Makefile cvs rdiff -u -r1.74 -r1.75 src/share/man/man4/man4.i386/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man4/man4.i386/rdcide.4 \ src/share/man/man4/man4.i386/rdcpcib.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.1305 src/distrib/sets/lists/man/mi:1.1306 --- src/distrib/sets/lists/man/mi:1.1305 Sun Mar 27 02:52:10 2011 +++ src/distrib/sets/lists/man/mi Mon Apr 4 17:26:23 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1305 2011/03/27 02:52:10 fair Exp $ +# $NetBSD: mi,v 1.1306 2011/04/04 17:26:23 bouyer Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1119,6 +1119,8 @@ ./usr/share/man/cat4/i386/pcvt.0 man-obsolete obsolete ./usr/share/man/cat4/i386/pms.0 man-obsolete obsolete ./usr/share/man/cat4/i386/pnpbios.0 man-sys-catman .cat +./usr/share/man/cat4/i386/rdcide.0 man-sys-catman .cat +./usr/share/man/cat4/i386/rdcpcib.0 man-sys-catman .cat ./usr/share/man/cat4/i386/sony.0 man-obsolete obsolete ./usr/share/man/cat4/i386/speaker.0 man-obsolete obsolete ./usr/share/man/cat4/i386/spic.0 man-sys-catman .cat @@ -3876,6 +3878,8 @@ ./usr/share/man/html4/i386/npx.html man-sys-htmlman html ./usr/share/man/html4/i386/pcibios.html man-sys-htmlman html ./usr/share/man/html4/i386/pnpbios.html man-sys-htmlman html +./usr/share/man/html4/i386/rdcide.html man-sys-htmlman html +./usr/share/man/html4/i386/rdcpcib.html man-sys-htmlman html ./usr/share/man/html4/i386/spic.html man-sys-htmlman html ./usr/share/man/html4/i386/vald.html man-obsolete obsolete ./usr/share/man/html4/i386/vesafb.html man-obsolete obsolete @@ -6448,6 +6452,8 @@ ./usr/share/man/man4/i386/pcvt.4 man-obsolete obsolete ./usr/share/man/man4/i386/pms.4 man-obsolete obsolete ./usr/share/man/man4/i386/pnpbios.4 man-sys-man .man +./usr/share/man/man4/i386/rdcide.4 man-sys-man .man +./usr/share/man/man4/i386/rdcpcib.4 man-sys-man .man ./usr/share/man/man4/i386/sony.4 man-obsolete obsolete ./usr/share/man/man4/i386/speaker.4 man-obsolete obsolete ./usr/share/man/man4/i386/spic.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.556 src/share/man/man4/Makefile:1.557 --- src/share/man/man4/Makefile:1.556 Sun Mar 27 00:08:07 2011 +++ src/share/man/man4/Makefile Mon Apr 4 17:26:24 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.556 2011/03/27 00:08:07 fair Exp $ +# $NetBSD: Makefile,v 1.557 2011/04/04 17:26:24 bouyer Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -47,8 +47,8 @@ piixpm.4 pim.4 plip.4 pms.4 pmu.4 pnaphy.4 ppbus.4 ppp.4 pppoe.4 \ pseye.4 ptm.4 pty.4 puc.4 pud.4 puffs.4 px.4 pxg.4 \ qe.4 qec.4 qsphy.4 \ - raid.4 ral.4 ray.4 rcons.4 rdcphy.4 re.4 rgephy.4 rlphy.4 rnd.4 \ - route.4 rs5c372rtc.4 rtk.4 rtw.4 rum.4 \ + raid.4 ral.4 ray.4 rcons.4 rdcphy.4 re.4 rgephy.4 rlphy.4 \ + rnd.4 route.4 rs5c372rtc.4 rtk.4 rtw.4 rum.4 \ satalink.4 sbus.4 scc.4 schide.4 scsi.4 sd.4 se.4 seeprom.4 sem.4 \ ses.4 sf.4 sfb.4 sgsmix.4 shb.4 shmif.4 \ shpcic.4 siisata.4 siop.4 sip.4 siside.4 sk.4 sl.4 slide.4 \ Index: src/share/man/man4/man4.i386/Makefile diff -u src/share/man/man4/man4.i386/Makefile:1.74 src/share/man/man4/man4.i386/Makefile:1.75 --- src/share/man/man4/man4.i386/Makefile:1.74 Thu Feb 24 14:20:29 2011 +++ src/share/man/man4/man4.i386/Makefile Mon Apr 4 17:26:24 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2011/02/24 14:20:29 jruoho Exp $ +# $NetBSD: Makefile,v 1.75 2011/04/04 17:26:24 bouyer Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/5/93 MAN= apm.4 autoconf.4 \ @@ -7,7 +7,7 @@ fdc.4 \ gcscide.4 gcscpcib.4 geodewdog.4 geodecntr.4 glxsb.4 gscpcib.4 \ intro.4 io.4 lms.4 lpt.4 mem.4 mms.4 npx.4 ndis.4 \ - pcibios.4 pnpbios.4 spic.4 viac7temp.4 + pcibios.4 pnpbios.4 rdcide.4 rdcpcib.4 spic.4 viac7temp.4 MLINKS= mem.4 kmem.4 MLINKS+=lpt.4 lpa.4 MLINKS+=pcibios.4 PCIBIOS.4 Added files: Index: src/share/man/man4/man4.i386/rdcide.4 diff -u /dev/null src/share/man/man4/man4.i386/rdcide.4:1.1 --- /dev/null Mon Apr 4 17:26:24 2011 +++ src/share/man/man4/man4.i386/rdcide.4 Mon Apr 4 17:26:24 2011 @@ -0,0 +1,54 @@ +.\" $NetBSD: rdcide.4,v 1.1 2011/04/04 17:26:24 bouyer Exp $ +.\" +.\" Copyright (c) 2011 Manuel Bouyer. +.\" +.\" Redistribution and use in sour
CVS commit: src/sys/arch
Module Name:src
Committed By: bouyer
Date: Mon Apr 4 17:09:40 UTC 2011
Modified Files:
src/sys/arch/i386/conf: ALL GENERIC
src/sys/arch/x86/pci: files.pci
Added Files:
src/sys/arch/x86/pci: rdcpcib.c
Log Message:
Add a driver for RDC's vortex86/PMX-1000 SoC PCI/ISA bridge, with support
for the integrated watchdog timer.
To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1028 -r1.1029 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x86/pci/files.pci
cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/pci/rdcpcib.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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.302 src/sys/arch/i386/conf/ALL:1.303
--- src/sys/arch/i386/conf/ALL:1.302 Mon Apr 4 14:33:51 2011
+++ src/sys/arch/i386/conf/ALL Mon Apr 4 17:09:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.302 2011/04/04 14:33:51 bouyer Exp $
+# $NetBSD: ALL,v 1.303 2011/04/04 17:09:39 bouyer 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.302 $"
+#ident "ALL-$Revision: 1.303 $"
maxusers 64 # estimated number of users
@@ -487,6 +487,7 @@
gscpcib* at pci? dev ? function ? # NS Geode PCI-ISA w/ GPIO support
viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support
iic* at viapcib?
+rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/
pchb* at pci? dev ? function ? # PCI-Host bridges
pceb* at pci? dev ? function ? # PCI-EISA bridges
pcib* at pci? dev ? function ? # PCI-ISA bridges
@@ -509,6 +510,7 @@
isa0 at piixpcib?
isa0 at gscpcib?
isa0 at viapcib?
+isa0 at rdcpcib?
isa0 at mainbus?
isa0 at pceb?
isa0 at pcib?
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1028 src/sys/arch/i386/conf/GENERIC:1.1029
--- src/sys/arch/i386/conf/GENERIC:1.1028 Mon Apr 4 14:33:51 2011
+++ src/sys/arch/i386/conf/GENERIC Mon Apr 4 17:09:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1028 2011/04/04 14:33:51 bouyer Exp $
+# $NetBSD: GENERIC,v 1.1029 2011/04/04 17:09:39 bouyer Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1028 $"
+#ident "GENERIC-$Revision: 1.1029 $"
maxusers 64 # estimated number of users
@@ -467,6 +467,8 @@
#gscpcib* at pci? dev ? function ? # NS Geode PCI-ISA w/ GPIO support
viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support
iic* at viapcib?
+rdcpcib* at pci? dev ? function ? # RDC Vortex86/PMX-1000 PCI-ISA w/
+ # watchdog
pchb* at pci? dev ? function ? # PCI-Host bridges
pceb* at pci? dev ? function ? # PCI-EISA bridges
pcib* at pci? dev ? function ? # PCI-ISA bridges
@@ -489,6 +491,7 @@
#isa0 at piixpcib?
#isa0 at gscpcib?
isa0 at viapcib?
+isa0 at rdcpcib?
isa0 at mainbus?
isa0 at pceb?
isa0 at pcib?
Index: src/sys/arch/x86/pci/files.pci
diff -u src/sys/arch/x86/pci/files.pci:1.10 src/sys/arch/x86/pci/files.pci:1.11
--- src/sys/arch/x86/pci/files.pci:1.10 Fri Jul 23 00:43:21 2010
+++ src/sys/arch/x86/pci/files.pci Mon Apr 4 17:09:39 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.10 2010/07/23 00:43:21 jakllsch Exp $
+# $NetBSD: files.pci,v 1.11 2011/04/04 17:09:39 bouyer Exp $
device aapic
attach aapic at pci
@@ -16,7 +16,7 @@
device pcib: isabus
attach pcib at pci
file arch/x86/pci/pcib.c pcib | ichlpcib | gscpcib | piixpcib |
- viapcib | amdpcib | gcscpcib
+ viapcib | amdpcib | gcscpcib | rdcpcib
device amdpcib {} : isabus
attach amdpcib at pci
@@ -31,6 +31,10 @@
file arch/x86/pci/amdtemp.c amdtemp
# PCI-LPC bridges
+device rdcpcib: isabus, sysmon_wdog
+attach rdcpcib at pci
+file arch/x86/pci/rdcpcib.c rdcpcib
+
define fwhichbus {}
define hpetichbus {}
device ichlpcib: acpipmtimer, isabus, sysmon_wdog, fwhichbus, hpetichbus, gpiobus
Added files:
Index: src/sys/arch/x86/pci/rdcpcib.c
diff -u /dev/null src/sys/arch/x86/pci/rdcpcib.c:1.1
--- /dev/null Mon Apr 4 17:09:40 2011
+++ src/sys/arch/x86/pci/rdcpcib.c Mon Apr 4 17:09:39 2011
@@ -0,0 +1,301 @@
+/* $NetBSD: rdcpcib.c,v 1.1 2011/04/04 17:09:39 bouyer Exp $ */
+
+/*
+ * Copyright (c) 2011 Manuel Bouyer.
+ *
+ * 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. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided wit
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: phx
Date: Mon Apr 4 16:41:34 UTC 2011
Modified Files:
src/sys/arch/sandpoint/stand/altboot: rge.c
Log Message:
Make sure a frame is at least 60 bytes, as Realtek does not automatically
expand small frames.
Patch suggested by nisimura@.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sandpoint/stand/altboot/rge.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/sandpoint/stand/altboot/rge.c
diff -u src/sys/arch/sandpoint/stand/altboot/rge.c:1.3 src/sys/arch/sandpoint/stand/altboot/rge.c:1.4
--- src/sys/arch/sandpoint/stand/altboot/rge.c:1.3 Sun Mar 27 19:09:43 2011
+++ src/sys/arch/sandpoint/stand/altboot/rge.c Mon Apr 4 16:41:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rge.c,v 1.3 2011/03/27 19:09:43 phx Exp $ */
+/* $NetBSD: rge.c,v 1.4 2011/04/04 16:41:34 phx Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -219,6 +219,10 @@
volatile struct desc *txd;
unsigned loop;
+ if (len < 60) {
+ memset(buf + len, 0, 60 - len);
+ len = 60; /* RTL does not stretch <60 Tx frame */
+ }
wbinv(buf, len);
txd = &l->txd[l->tx];
txd->xd2 = htole32(VTOPHYS(buf));
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Mon Apr 4 16:32:41 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/syscall: Makefile
Added Files:
src/tests/syscall: t_umask.c
Log Message:
Couple of simple tests for umask(2).
To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.290 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.16 -r1.17 src/tests/syscall/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/syscall/t_umask.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.289 src/distrib/sets/lists/tests/mi:1.290
--- src/distrib/sets/lists/tests/mi:1.289 Mon Apr 4 09:58:28 2011
+++ src/distrib/sets/lists/tests/mi Mon Apr 4 16:32:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.289 2011/04/04 09:58:28 he Exp $
+# $NetBSD: mi,v 1.290 2011/04/04 16:32:41 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -572,6 +572,7 @@
./usr/libdata/debug/usr/tests/syscall/t_mmap.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_mprotect.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_timer.debug tests-syscall-debug debug,atf
+./usr/libdata/debug/usr/tests/syscall/t_umask.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/usr.bin tests-sbin-tests
./usr/libdata/debug/usr/tests/usr.sbin tests-sbin-tests
./usr/libdata/debug/usr/tests/util tests-util-debug
@@ -2113,6 +2114,7 @@
./usr/tests/syscall/t_mmap tests-syscall-tests atf
./usr/tests/syscall/t_mprotect tests-syscall-tests atf
./usr/tests/syscall/t_timer tests-syscall-tests atf
+./usr/tests/syscall/t_umask tests-syscall-tests atf
./usr/tests/toolchain tests-syscall-tests atf
./usr/tests/toolchain/Atffile tests-syscall-tests atf
./usr/tests/toolchain/cc tests-syscall-tests atf
Index: src/tests/syscall/Makefile
diff -u src/tests/syscall/Makefile:1.16 src/tests/syscall/Makefile:1.17
--- src/tests/syscall/Makefile:1.16 Mon Apr 4 08:19:08 2011
+++ src/tests/syscall/Makefile Mon Apr 4 16:32:41 2011
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2011/04/04 08:19:08 jruoho Exp $
+# $NetBSD: Makefile,v 1.17 2011/04/04 16:32:41 jruoho Exp $
.include
TESTSDIR= ${TESTSBASE}/syscall
TESTS_C+= t_access t_cmsg t_dup t_fsync t_getpid t_getsid
-TESTS_C+= t_mmap t_mprotect t_timer
+TESTS_C+= t_mmap t_mprotect t_timer t_umask
LDADD.t_getpid+=-lpthread
LDADD.t_timer+= -lpthread
Added files:
Index: src/tests/syscall/t_umask.c
diff -u /dev/null src/tests/syscall/t_umask.c:1.1
--- /dev/null Mon Apr 4 16:32:41 2011
+++ src/tests/syscall/t_umask.c Mon Apr 4 16:32:41 2011
@@ -0,0 +1,205 @@
+/* $NetBSD: t_umask.c,v 1.1 2011/04/04 16:32:41 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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.
+ */
+#include
+__RCSID("$NetBSD: t_umask.c,v 1.1 2011/04/04 16:32:41 jruoho Exp $");
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+static const char path[] = "/tmp/umask";
+static const mode_t mask[] = {
+ S_IRWXU,
+ S_IRUSR,
+ S_IWUSR,
+ S_IXUSR,
+ S_IRWXG,
+ S_IRGRP,
+ S_IWGRP,
+ S_IXGRP,
+ S_IRWXO,
+ S_IROTH,
+ S_IWOTH,
+ S_IXOTH
+};
+
+ATF_TC_WITH_CLEANUP(umask_fork);
+ATF_TC_HEAD(umask_fork, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Check that umask(2) is inherited");
+}
+
+ATF_TC_BODY(umask_fork, tc)
+{
+ mode_t mode;
+ pid_t pid;
+ siz
CVS commit: src/sys/sys
Module Name:src
Committed By: ahoka
Date: Mon Apr 4 16:26:09 UTC 2011
Modified Files:
src/sys/sys: flashio.h
Log Message:
this file was missing from the flash_off_t commit
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/sys/flashio.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/sys/flashio.h
diff -u src/sys/sys/flashio.h:1.1 src/sys/sys/flashio.h:1.2
--- src/sys/sys/flashio.h:1.1 Sat Feb 26 18:07:32 2011
+++ src/sys/sys/flashio.h Mon Apr 4 16:26:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: flashio.h,v 1.1 2011/02/26 18:07:32 ahoka Exp $ */
+/* $NetBSD: flashio.h,v 1.2 2011/04/04 16:26:09 ahoka Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -59,7 +59,8 @@
/* public userspace API */
/* common integer type to address flash */
-typedef int64_t flash_addr_t;
+typedef int64_t flash_off_t;
+typedef uint64_t flash_size_t;
/**
* struct erase_params - for ioctl erase call
@@ -67,25 +68,25 @@
* @len: length of the erase
*/
struct flash_erase_params {
- flash_addr_t ep_addr;
- flash_addr_t ep_len;
+ flash_off_t ep_addr;
+ flash_off_t ep_len;
};
struct flash_badblock_params {
- flash_addr_t bbp_addr;
+ flash_off_t bbp_addr;
bool bbp_isbad;
};
struct flash_info_params {
- flash_addr_t ip_flash_size;
+ flash_off_t ip_flash_size;
size_t ip_page_size;
size_t ip_erase_size;
uint8_t ip_flash_type;
};
struct flash_dump_params {
- flash_addr_t dp_block;
- flash_addr_t dp_len;
+ flash_off_t dp_block;
+ flash_off_t dp_len;
uint8_t *dp_buf;
};
CVS commit: src/lib/libbluetooth
Module Name:src
Committed By: plunky
Date: Mon Apr 4 16:19:25 UTC 2011
Modified Files:
src/lib/libbluetooth: sdp_get.c
Log Message:
handle overflowed values correctly,
also put a compile time guard to warn if INTMAX won't fit in INT64
(all our ports currently have INTMAX = INT64)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libbluetooth/sdp_get.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/libbluetooth/sdp_get.c
diff -u src/lib/libbluetooth/sdp_get.c:1.1 src/lib/libbluetooth/sdp_get.c:1.2
--- src/lib/libbluetooth/sdp_get.c:1.1 Tue May 12 10:05:06 2009
+++ src/lib/libbluetooth/sdp_get.c Mon Apr 4 16:19:25 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sdp_get.c,v 1.1 2009/05/12 10:05:06 plunky Exp $ */
+/* $NetBSD: sdp_get.c,v 1.2 2011/04/04 16:19:25 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,11 +30,15 @@
*/
#include
-__RCSID("$NetBSD: sdp_get.c,v 1.1 2009/05/12 10:05:06 plunky Exp $");
+__RCSID("$NetBSD: sdp_get.c,v 1.2 2011/04/04 16:19:25 plunky Exp $");
#include
#include
+#if INTMAX_MAX < INT64_MAX
+#warning INTMAX type is not large enough to hold INT64 values
+#endif
+
/**
* sdp_get_(data, value)
*
@@ -188,9 +192,6 @@
return false;
v = be64dec(p);
- if (v > UINTMAX_MAX)
- return false;
-
p += 8;
break;
@@ -200,7 +201,7 @@
x = be64dec(p);
v = be64dec(p + 8);
- if (x != 0 || v > UINTMAX_MAX)
+ if (x != 0)
return false;
p += 16;
@@ -254,9 +255,6 @@
return false;
v = (int64_t)be64dec(p);
- if (v > INTMAX_MAX || v < INTMAX_MIN)
- return false;
-
p += 8;
break;
@@ -267,10 +265,10 @@
x = (int64_t)be64dec(p);
v = (int64_t)be64dec(p + 8);
if (x == 0) {
- if (v > INTMAX_MAX)
+ if (v < 0)
return false;
} else if (x == -1) {
- if (v < INTMAX_MIN)
+ if (v >= 0)
return false;
} else {
return false;
CVS commit: src/tests/fs/puffs
Module Name:src
Committed By: plunky
Date: Mon Apr 4 15:42:42 UTC 2011
Modified Files:
src/tests/fs/puffs: t_basic.c
Log Message:
reinstate #ifdef PUFFSDUMP around otherwise unused function
which requires symbols from -lpuffs, not linked
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/fs/puffs/t_basic.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/puffs/t_basic.c
diff -u src/tests/fs/puffs/t_basic.c:1.10 src/tests/fs/puffs/t_basic.c:1.11
--- src/tests/fs/puffs/t_basic.c:1.10 Thu Feb 10 20:10:54 2011
+++ src/tests/fs/puffs/t_basic.c Mon Apr 4 15:42:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_basic.c,v 1.10 2011/02/10 20:10:54 pooka Exp $ */
+/* $NetBSD: t_basic.c,v 1.11 2011/04/04 15:42:42 plunky Exp $ */
#include
#include
@@ -39,6 +39,7 @@
atf_tc_fail_errno("statvfs");
}
+#ifdef PUFFSDUMP
static void __unused
dumpopcount(struct puffstestargs *args)
{
@@ -56,6 +57,7 @@
puffsdump_vnop_revmap[i], args->pta_vn_toserv_ops[i]);
}
}
+#endif
ATF_TC(mount);
ATF_TC_HEAD(mount, tc)
CVS commit: src/doc
Module Name:src Committed By: bouyer Date: Mon Apr 4 14:47:50 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Note rdcide(4). Also note vte(4), better late than never :) To generate a diff of this commit: cvs rdiff -u -r1.1533 -r1.1534 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.1533 src/doc/CHANGES:1.1534 --- src/doc/CHANGES:1.1533 Sun Apr 3 13:30:22 2011 +++ src/doc/CHANGES Mon Apr 4 14:47:49 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1533 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1534 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -897,6 +897,8 @@ connection. This makes things like rebooting a kernel server from under an application possible. [pooka 20110124] emips: Initial commit of the eMIPS port [pooka 20110126] + vte(4): add a driver for the R6040 fast ethernet controller found in + RDC's vortex86 and PMX-1000 system-on-chip. [bouyer 20110126] kernel: add kern.evcnt sysctl [matt 20110129] vmstat(1): add support for getting evcnts and boottime for sysctl. Allow unprived vmstat to function is everything wanted is @@ -976,3 +978,5 @@ alpha: add TLS (thread locale storage) support. [skrll 20110331] atf(7): Import 0.13. [jmmv 20110331] ssh-askpass: Updated to 1.2.0. [mbalmer 20110403] + rdcide(4): add a driver for the IDE controller found in RDC's + vortex86 and PMX-1000 system-on-chip. [bouyer 20110404]
CVS commit: src/tests/lib/libpthread
Module Name:src
Committed By: martin
Date: Mon Apr 4 14:47:22 UTC 2011
Modified Files:
src/tests/lib/libpthread: t_mutex.c
Log Message:
Do only set a (lower than default) timeout value if we are on powerpc and
expect to run into a real deadrun ofter.
The (too short) timeout otherwise makes slower archs fail.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libpthread/t_mutex.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/libpthread/t_mutex.c
diff -u src/tests/lib/libpthread/t_mutex.c:1.4 src/tests/lib/libpthread/t_mutex.c:1.5
--- src/tests/lib/libpthread/t_mutex.c:1.4 Mon Feb 21 21:43:41 2011
+++ src/tests/lib/libpthread/t_mutex.c Mon Apr 4 14:47:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mutex.c,v 1.4 2011/02/21 21:43:41 riz Exp $ */
+/* $NetBSD: t_mutex.c,v 1.5 2011/04/04 14:47:22 martin Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_mutex.c,v 1.4 2011/02/21 21:43:41 riz Exp $");
+__RCSID("$NetBSD: t_mutex.c,v 1.5 2011/04/04 14:47:22 martin Exp $");
#include
#include
@@ -118,7 +118,8 @@
ATF_TC_HEAD(mutex2, tc)
{
atf_tc_set_md_var(tc, "descr", "Checks mutexes");
- atf_tc_set_md_var(tc, "timeout", "40");
+ if (strcmp(atf_config_get("atf_arch"), "powerpc") == 0)
+ atf_tc_set_md_var(tc, "timeout", "40");
}
ATF_TC_BODY(mutex2, tc)
{
@@ -189,7 +190,8 @@
{
atf_tc_set_md_var(tc, "descr", "Checks mutexes using a static "
"initializer");
- atf_tc_set_md_var(tc, "timeout", "40");
+ if (strcmp(atf_config_get("atf_arch"), "powerpc") == 0)
+ atf_tc_set_md_var(tc, "timeout", "40");
}
ATF_TC_BODY(mutex3, tc)
{
CVS commit: src/sys
Module Name:src Committed By: bouyer Date: Mon Apr 4 14:33:51 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL GENERIC src/sys/dev/pci: files.pci pcidevs Added Files: src/sys/dev/pci: rdcide.c rdcide_reg.h Log Message: Add rdcide(4), a driver for the IDE controller found in RDC's vortex86/PMX-1000 system-on-chip. To generate a diff of this commit: cvs rdiff -u -r1.301 -r1.302 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1027 -r1.1028 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.339 -r1.340 src/sys/dev/pci/files.pci cvs rdiff -u -r1.1068 -r1.1069 src/sys/dev/pci/pcidevs cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/rdcide.c src/sys/dev/pci/rdcide_reg.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/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.301 src/sys/arch/i386/conf/ALL:1.302 --- src/sys/arch/i386/conf/ALL:1.301 Sun Mar 6 17:08:25 2011 +++ src/sys/arch/i386/conf/ALL Mon Apr 4 14:33:51 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.301 2011/03/06 17:08:25 bouyer Exp $ +# $NetBSD: ALL,v 1.302 2011/04/04 14:33:51 bouyer 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.301 $" +#ident "ALL-$Revision: 1.302 $" maxusers 64 # estimated number of users @@ -900,6 +900,7 @@ pdcide* at pci? dev ? function ? # Promise IDE controllers pdcsata* at pci? dev ? function ? # Promise SATA150 controllers rccide* at pci? dev ? function ? # ServerWorks IDE controllers +rdcide* at pci? dev ? function ? # RDC PMX-1000 IDE controllers satalink* at pci? dev ? function ? # SiI SATALink controllers schide* at pci? dev ? function ? # Intel SCH IDE controllers siisata* at pci? dev ? function ? # SiI SteelVine controllers Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1027 src/sys/arch/i386/conf/GENERIC:1.1028 --- src/sys/arch/i386/conf/GENERIC:1.1027 Fri Apr 1 12:11:16 2011 +++ src/sys/arch/i386/conf/GENERIC Mon Apr 4 14:33:51 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1027 2011/04/01 12:11:16 jruoho Exp $ +# $NetBSD: GENERIC,v 1.1028 2011/04/04 14:33:51 bouyer Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1027 $" +#ident "GENERIC-$Revision: 1.1028 $" maxusers 64 # estimated number of users @@ -847,6 +847,7 @@ pdcide* at pci? dev ? function ? # Promise IDE controllers pdcsata* at pci? dev ? function ? # Promise SATA150 controllers rccide* at pci? dev ? function ? # ServerWorks IDE controllers +rdcide* at pci? dev ? function ? # RDC PMX-1000 IDE controllers satalink* at pci? dev ? function ? # SiI SATALink controllers schide* at pci? dev ? function ? # Intel SCH IDE controllers siisata* at pci? dev ? function ? # SiI SteelVine controllers Index: src/sys/dev/pci/files.pci diff -u src/sys/dev/pci/files.pci:1.339 src/sys/dev/pci/files.pci:1.340 --- src/sys/dev/pci/files.pci:1.339 Wed Feb 23 00:35:29 2011 +++ src/sys/dev/pci/files.pci Mon Apr 4 14:33:51 2011 @@ -1,4 +1,4 @@ -# $NetBSD: files.pci,v 1.339 2011/02/23 00:35:29 jmcneill Exp $ +# $NetBSD: files.pci,v 1.340 2011/04/04 14:33:51 bouyer Exp $ # # Config file and device description for machine-independent PCI code. # Included by ports that need it. Requires that the SCSI files be @@ -306,6 +306,11 @@ attach rccide at pci file dev/pci/rccide.c rccide +# RDC IDE controllers +device rdcide: ata, ata_dma, ata_udma, pciide_common, wdc_common +attach rdcide at pci +file dev/pci/rdcide.c rdcide + # ServerWorks SATA controllers device svwsata: ata, ata_dma, ata_udma, pciide_common, wdc_common, sata attach svwsata at pci Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1068 src/sys/dev/pci/pcidevs:1.1069 --- src/sys/dev/pci/pcidevs:1.1068 Wed Mar 16 23:19:32 2011 +++ src/sys/dev/pci/pcidevs Mon Apr 4 14:33:51 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1068 2011/03/16 23:19:32 matt Exp $ +$NetBSD: pcidevs,v 1.1069 2011/04/04 14:33:51 bouyer Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -3915,6 +3915,7 @@ /* RDC Semiconductor products */ product RDC R6040 0x6040 RDC R6040 10/100 Ethernet +product RDC IDE 0x1011 RDC IDE controller /* Realtek products */ product REALTEK RT8029 0x8029 8029 Ethernet Added files: Index: src/sys/dev/pci/rdcide.c diff -u /dev/null src/sys/dev/pci/rdcide.c:1.1 --- /dev/null Mon Apr 4 14:33:52 2011 +++ src/sys/dev/pci/rdcide.c Mon Apr 4 14:33:51 2011 @@ -0,0 +1,267 @@ +/* $NetBSD: rdcide.c,v 1.1 2011/04/04 14:33:51 bouyer Exp $ */ + +/* + * Copyright (c) 2011 Manuel Bouyer. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that
CVS commit: src/sys/dev
Module Name:src
Committed By: ahoka
Date: Mon Apr 4 14:25:10 UTC 2011
Modified Files:
src/sys/dev/flash: flash.c flash.h
src/sys/dev/nand: nand.c nand.h nand_bbt.c nand_bbt.h nand_io.c
Log Message:
Fix badblock checking
Replace flash_addr_t with flash_off_t and use it to address flash everywhere
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/flash/flash.c src/sys/dev/flash/flash.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/nand/nand.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/nand/nand.h
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/nand/nand_bbt.c \
src/sys/dev/nand/nand_bbt.h src/sys/dev/nand/nand_io.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/flash/flash.c
diff -u src/sys/dev/flash/flash.c:1.2 src/sys/dev/flash/flash.c:1.3
--- src/sys/dev/flash/flash.c:1.2 Wed Mar 30 14:34:26 2011
+++ src/sys/dev/flash/flash.c Mon Apr 4 14:25:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.c,v 1.2 2011/03/30 14:34:26 uebayasi Exp $ */
+/* $NetBSD: flash.c,v 1.3 2011/04/04 14:25:09 ahoka Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.2 2011/03/30 14:34:26 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.3 2011/04/04 14:25:09 ahoka Exp $");
#include
#include
@@ -88,7 +88,7 @@
int flash_nsectors(struct buf *bp);
int flash_sector(struct buf *bp);
-static inline off_t flash_get_part_offset(struct flash_softc *fl,
+static inline flash_off_t flash_get_part_offset(struct flash_softc *fl,
size_t poffset);
int flash_match(device_t parent, cfdata_t match, void *aux);
@@ -405,7 +405,8 @@
struct flash_softc *sc;
int unit, err;
size_t retlen;
- flash_addr_t offset;
+ flash_off_t offset;
+ bool bad;
unit = minor(dev);
if ((sc = device_lookup_private(&flash_cd, unit)) == NULL)
@@ -441,15 +442,11 @@
*/
bbp = data;
- err = flash_block_isbad(sc->sc_dev, bbp->bbp_addr);
- if (err == EIO) {
- bbp->bbp_isbad = true;
- err = 0;
- } else if (err) {
+ err = flash_block_isbad(sc->sc_dev, bbp->bbp_addr, &bad);
+ if (err) {
return err;
- } else {
- bbp->bbp_isbad = false;
}
+ bbp->bbp_isbad = bad;
break;
case FLASH_BLOCK_MARKBAD:
@@ -548,7 +545,7 @@
return sc->sc_dev;
}
-static inline off_t
+static inline flash_off_t
flash_get_part_offset(struct flash_softc *fl, size_t poffset)
{
return fl->flash_if->partition.part_offset + poffset;
@@ -577,7 +574,7 @@
int
flash_read(device_t self,
-off_t offset, size_t len, size_t *retlen, uint8_t *buf)
+flash_off_t offset, size_t len, size_t *retlen, uint8_t *buf)
{
struct flash_softc *sc = device_private(self);
@@ -593,7 +590,7 @@
int
flash_write(device_t self,
-off_t offset, size_t len, size_t *retlen, const uint8_t *buf)
+flash_off_t offset, size_t len, size_t *retlen, const uint8_t *buf)
{
struct flash_softc *sc = device_private(self);
@@ -611,7 +608,7 @@
}
int
-flash_block_markbad(device_t self, uint64_t offset)
+flash_block_markbad(device_t self, flash_off_t offset)
{
struct flash_softc *sc = device_private(self);
@@ -629,7 +626,7 @@
}
int
-flash_block_isbad(device_t self, uint64_t offset)
+flash_block_isbad(device_t self, flash_off_t offset, bool *bad)
{
struct flash_softc *sc = device_private(self);
@@ -640,7 +637,7 @@
sc->flash_if->partition.part_offset)
return EINVAL;
- return sc->flash_if->block_isbad(device_parent(self), offset);
+ return sc->flash_if->block_isbad(device_parent(self), offset, bad);
}
int
Index: src/sys/dev/flash/flash.h
diff -u src/sys/dev/flash/flash.h:1.2 src/sys/dev/flash/flash.h:1.3
--- src/sys/dev/flash/flash.h:1.2 Wed Mar 30 14:34:26 2011
+++ src/sys/dev/flash/flash.h Mon Apr 4 14:25:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: flash.h,v 1.2 2011/03/30 14:34:26 uebayasi Exp $ */
+/* $NetBSD: flash.h,v 1.3 2011/04/04 14:25:09 ahoka Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -73,8 +73,8 @@
* @state: the erase operation's result
*/
struct flash_erase_instruction {
- flash_addr_t ei_addr;
- flash_addr_t ei_len;
+ flash_off_t ei_addr;
+ flash_off_t ei_len;
void (*ei_callback)(struct flash_erase_instruction *);
u_long ei_priv;
u_char ei_state;
@@ -86,8 +86,8 @@
};
struct flash_partition {
- flash_addr_t part_offset;
- flash_addr_t part_size;
+ flash_off_t part_offset;
+ flash_off_t part_size;
int part_flags;
};
@@ -107,10 +107,10 @@
*/
struct flash_interface {
int (*erase)(device_t, struct flash_erase_instruction *);
- int (*read)(device_t, off_t, size_t, size_t *, uint8_t *);
- int (*write)(device_t, off_t, size_t, size_t *, const uint8_t *);
- int (*block_markbad)(device_t, uint64_t);
- int (*block_isbad)(device_t, uint64_t);
+ int (*read)(device_t, flash_off_t, size_t, size_t *, uint8_t *);
+ int (*write)(device_t, flash_off_t, s
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: blymn Date: Mon Apr 4 11:32:26 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Properly define the sets for define_key To generate a diff of this commit: cvs rdiff -u -r1.1607 -r1.1608 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1607 src/distrib/sets/lists/comp/mi:1.1608 --- src/distrib/sets/lists/comp/mi:1.1607 Mon Apr 4 10:36:28 2011 +++ src/distrib/sets/lists/comp/mi Mon Apr 4 11:32:25 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1607 2011/04/04 10:36:28 blymn Exp $ +# $NetBSD: mi,v 1.1608 2011/04/04 11:32:25 blymn Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -5700,6 +5700,7 @@ ./usr/share/man/cat3/dcngettext.0 comp-c-catman .cat ./usr/share/man/cat3/def_prog_mode.0 comp-c-catman .cat ./usr/share/man/cat3/def_shell_mode.0 comp-c-catman .cat +./usr/share/man/cat3/define_key.0 comp-c-catman .cat ./usr/share/man/cat3/dehumanize_number.0 comp-c-catman .cat ./usr/share/man/cat3/del_curterm.0 comp-c-catman .cat ./usr/share/man/cat3/delay_output.0 comp-c-catman .cat @@ -11783,6 +11784,7 @@ ./usr/share/man/html3/dcngettext.html comp-c-htmlman html ./usr/share/man/html3/def_prog_mode.html comp-c-htmlman html ./usr/share/man/html3/def_shell_mode.html comp-c-htmlman html +./usr/share/man/html3/define_key.html comp-c-htmlman html ./usr/share/man/html3/dehumanize_number.html comp-c-htmlman html ./usr/share/man/html3/del_curterm.html comp-c-htmlman html ./usr/share/man/html3/delay_output.html comp-c-htmlman html
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: blymn Date: Mon Apr 4 10:36:29 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi Log Message: Add define key for the man pages for curses To generate a diff of this commit: cvs rdiff -u -r1.1606 -r1.1607 src/distrib/sets/lists/comp/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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1606 src/distrib/sets/lists/comp/mi:1.1607 --- src/distrib/sets/lists/comp/mi:1.1606 Thu Mar 31 08:25:30 2011 +++ src/distrib/sets/lists/comp/mi Mon Apr 4 10:36:28 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1606 2011/03/31 08:25:30 pooka Exp $ +# $NetBSD: mi,v 1.1607 2011/04/04 10:36:28 blymn Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -17772,6 +17772,7 @@ ./usr/share/man/man3/dcngettext.3 comp-c-man .man ./usr/share/man/man3/def_prog_mode.3 comp-c-man .man ./usr/share/man/man3/def_shell_mode.3 comp-c-man .man +./usr/share/man/man3/define_key.3 comp-c-man .man ./usr/share/man/man3/dehumanize_number.3 comp-c-man .man ./usr/share/man/man3/del_curterm.3 comp-c-man .man ./usr/share/man/man3/delay_output.3 comp-c-man .man
CVS commit: src/lib/libcurses
Module Name:src Committed By: blymn Date: Mon Apr 4 10:32:05 UTC 2011 Modified Files: src/lib/libcurses: Makefile Log Message: Add man page link for define_key To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/lib/libcurses/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/Makefile diff -u src/lib/libcurses/Makefile:1.64 src/lib/libcurses/Makefile:1.65 --- src/lib/libcurses/Makefile:1.64 Wed Feb 3 15:34:40 2010 +++ src/lib/libcurses/Makefile Mon Apr 4 10:32:04 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2010/02/03 15:34:40 roy Exp $ +# $NetBSD: Makefile,v 1.65 2011/04/04 10:32:04 blymn Exp $ # @(#)Makefile 8.2 (Berkeley) 1/2/94 .include @@ -67,6 +67,7 @@ curses_clear.3 clrtobot.3 curses_clear.3 clrtoeol.3 \ curses_color.3 color_content.3 curses_attributes.3 color_set.3 \ curses_window.3 copywin.3 curses_tty.3 curs_set.3 \ + curses_input.3 define_key.3 \ curses_tty.3 delay_output.3 curses_tty.3 def_prog_mode.3 \ curses_tty.3 def_shell_mode.3 curses_delch.3 delch.3 \ curses_deleteln.3 deleteln.3 curses_screen.3 delscreen.3 \
CVS commit: src/tests
Module Name:src
Committed By: jruoho
Date: Mon Apr 4 10:30:29 UTC 2011
Modified Files:
src/tests/lib/libc/gen: t_nice.c
src/tests/syscall: t_getpid.c t_getsid.c t_mmap.c t_mprotect.c
Log Message:
Use _exit(2).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/gen/t_nice.c
cvs rdiff -u -r1.1 -r1.2 src/tests/syscall/t_getpid.c \
src/tests/syscall/t_getsid.c src/tests/syscall/t_mmap.c
cvs rdiff -u -r1.2 -r1.3 src/tests/syscall/t_mprotect.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_nice.c
diff -u src/tests/lib/libc/gen/t_nice.c:1.1 src/tests/lib/libc/gen/t_nice.c:1.2
--- src/tests/lib/libc/gen/t_nice.c:1.1 Mon Apr 4 09:52:18 2011
+++ src/tests/lib/libc/gen/t_nice.c Mon Apr 4 10:30:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_nice.c,v 1.1 2011/04/04 09:52:18 jruoho Exp $ */
+/* $NetBSD: t_nice.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_nice.c,v 1.1 2011/04/04 09:52:18 jruoho Exp $");
+__RCSID("$NetBSD: t_nice.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $");
#include
#include
@@ -104,9 +104,9 @@
ATF_REQUIRE(errno == 0);
if (nic != pri)
-exit(EXIT_FAILURE);
+_exit(EXIT_FAILURE);
- exit(EXIT_SUCCESS);
+ _exit(EXIT_SUCCESS);
}
(void)wait(&sta);
Index: src/tests/syscall/t_getpid.c
diff -u src/tests/syscall/t_getpid.c:1.1 src/tests/syscall/t_getpid.c:1.2
--- src/tests/syscall/t_getpid.c:1.1 Mon Apr 4 06:48:05 2011
+++ src/tests/syscall/t_getpid.c Mon Apr 4 10:30:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_getpid.c,v 1.1 2011/04/04 06:48:05 jruoho Exp $ */
+/* $NetBSD: t_getpid.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_getpid.c,v 1.1 2011/04/04 06:48:05 jruoho Exp $");
+__RCSID("$NetBSD: t_getpid.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $");
#include
@@ -74,15 +74,15 @@
ppid = getppid();
if (tpid != ppid)
-exit(EXIT_FAILURE);
+_exit(EXIT_FAILURE);
if (cpid == ppid)
-exit(EXIT_FAILURE);
+_exit(EXIT_FAILURE);
if (tpid == fpid)
-exit(EXIT_FAILURE);
+_exit(EXIT_FAILURE);
- exit(EXIT_SUCCESS);
+ _exit(EXIT_SUCCESS);
}
wpid = wait(&sta);
Index: src/tests/syscall/t_getsid.c
diff -u src/tests/syscall/t_getsid.c:1.1 src/tests/syscall/t_getsid.c:1.2
--- src/tests/syscall/t_getsid.c:1.1 Mon Apr 4 08:19:08 2011
+++ src/tests/syscall/t_getsid.c Mon Apr 4 10:30:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_getsid.c,v 1.1 2011/04/04 08:19:08 jruoho Exp $ */
+/* $NetBSD: t_getsid.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_getsid.c,v 1.1 2011/04/04 08:19:08 jruoho Exp $");
+__RCSID("$NetBSD: t_getsid.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $");
#include
@@ -94,12 +94,12 @@
ppid = getppid();
if (sid != csid)
- exit(EXIT_FAILURE);
+ _exit(EXIT_FAILURE);
if (getsid(ppid) != csid)
- exit(EXIT_FAILURE);
+ _exit(EXIT_FAILURE);
- exit(EXIT_SUCCESS);
+ _exit(EXIT_SUCCESS);
}
(void)wait(&sta);
Index: src/tests/syscall/t_mmap.c
diff -u src/tests/syscall/t_mmap.c:1.1 src/tests/syscall/t_mmap.c:1.2
--- src/tests/syscall/t_mmap.c:1.1 Thu Mar 31 13:07:20 2011
+++ src/tests/syscall/t_mmap.c Mon Apr 4 10:30:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mmap.c,v 1.1 2011/03/31 13:07:20 jruoho Exp $ */
+/* $NetBSD: t_mmap.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_mmap.c,v 1.1 2011/03/31 13:07:20 jruoho Exp $");
+__RCSID("$NetBSD: t_mmap.c,v 1.2 2011/04/04 10:30:29 jruoho Exp $");
#include
#include
@@ -66,7 +66,7 @@
static void
map_sighandler(int signo)
{
- exit(signo);
+ _exit(signo);
}
ATF_TC(mmap_err);
Index: src/tests/syscall/t_mprotect.c
diff -u src/tests/syscall/t_mprotect.c:1.2 src/tests/syscall/t_mprotect.c:1.3
--- src/tests/syscall/t_mprotect.c:1.2 Sun Apr 3 16:22:15 2011
+++ src/tests/syscall/t_mprotect.c Mon Apr 4 10:30:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_mprotect.c,v 1.2 2011/04/03 16:22:15 jruoho Exp $ */
+/* $NetBSD: t_mprotect.c,v 1.3 2011/04/04 10:30:29 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_mprotect.c,v 1.2 2011/04/03 16:22:15 jruoho Exp $");
+__RCSID("$NetBSD: t_mprotect.c,v 1.3 2011/04/04 10:30:29 jruoho Exp $");
#include
#include
@@ -56,7 +56,7 @@
static void
sighandler(int signo)
{
- exit(signo);
+ _exit(signo)
CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Mon Apr 4 10:25:09 UTC 2011 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: Add gem at sbus (works since quite some time). To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 src/sys/arch/sparc64/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/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.135 src/sys/arch/sparc64/conf/GENERIC:1.136 --- src/sys/arch/sparc64/conf/GENERIC:1.135 Sun Mar 20 23:31:36 2011 +++ src/sys/arch/sparc64/conf/GENERIC Mon Apr 4 10:25:08 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.135 2011/03/20 23:31:36 mrg Exp $ +# $NetBSD: GENERIC,v 1.136 2011/04/04 10:25:08 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.135 $" +#ident "GENERIC-$Revision: 1.136 $" maxusers 64 @@ -502,6 +502,7 @@ fpa* at pci? dev ? function ? # DEC DEFPA FDDI UT fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet +gem* at sbus? slot ? offset ? # XXX lacks bus_dmamap_sync() #le* at pci? dev ? function ? # PCnet-PCI Ethernet # XXX uses vtophys()
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: he Date: Mon Apr 4 09:58:28 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi shl.mi Log Message: Move the recently added tests for libexec/ld.elf_so to shl.mi, so that the sun2 port builds again. To generate a diff of this commit: cvs rdiff -u -r1.288 -r1.289 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/tests/shl.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.288 src/distrib/sets/lists/tests/mi:1.289 --- src/distrib/sets/lists/tests/mi:1.288 Mon Apr 4 09:52:17 2011 +++ src/distrib/sets/lists/tests/mi Mon Apr 4 09:58:28 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.288 2011/04/04 09:52:17 jruoho Exp $ +# $NetBSD: mi,v 1.289 2011/04/04 09:58:28 he Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -510,8 +510,6 @@ ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen1.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_df_1_noopen2.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/h_locking.debug tests-libexec-debug debug,atf -./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_helper_dso1.so.1.debug tests-libexec-debug debug,atf -./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_helper_dso2.so.1.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlerror-cleared.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlerror-false.debug tests-libexec-debug debug,atf ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlinfo.debug tests-libexec-debug debug,atf @@ -2010,10 +2008,6 @@ ./usr/tests/libexec/ld.elf_so/h_df_1_noopen1 tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/h_df_1_noopen2 tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/h_locking tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/libh_helper_dso1.so tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/libh_helper_dso1.so.1 tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/libh_helper_dso2.so tests-libexec-tests atf -./usr/tests/libexec/ld.elf_so/libh_helper_dso2.so.1 tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/t_df_1_noopen tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/t_dlerror-cleared tests-libexec-tests atf ./usr/tests/libexec/ld.elf_so/t_dlerror-false tests-libexec-tests atf Index: src/distrib/sets/lists/tests/shl.mi diff -u src/distrib/sets/lists/tests/shl.mi:1.3 src/distrib/sets/lists/tests/shl.mi:1.4 --- src/distrib/sets/lists/tests/shl.mi:1.3 Wed Mar 30 11:43:16 2011 +++ src/distrib/sets/lists/tests/shl.mi Mon Apr 4 09:58:28 2011 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.3 2011/03/30 11:43:16 he Exp $ +# $NetBSD: shl.mi,v 1.4 2011/04/04 09:58:28 he Exp $ # ./usr/libdata/debug/usr/tests/lib/csu/libh_initfini3_dso.so.1.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/tls/libh_tls_dlopen.so.1.debug tests-lib-debug debug,atf @@ -17,3 +17,9 @@ ./usr/tests/lib/libc/tls/t_tls_dynamic tests-lib-tests atf ./usr/tests/util/id/libfake.so.0 tests-obsolete obsolete ./usr/tests/util/id/libfake.so.0.0 tests-obsolete obsolete +./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_helper_dso1.so.1.debug tests-libexec-debug debug,atf +./usr/libdata/debug/usr/tests/libexec/ld.elf_so/libh_helper_dso2.so.1.debug tests-libexec-debug debug,atf +./usr/tests/libexec/ld.elf_so/libh_helper_dso1.so tests-libexec-tests atf +./usr/tests/libexec/ld.elf_so/libh_helper_dso1.so.1 tests-libexec-tests atf +./usr/tests/libexec/ld.elf_so/libh_helper_dso2.so tests-libexec-tests atf +./usr/tests/libexec/ld.elf_so/libh_helper_dso2.so.1 tests-libexec-tests atf
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Mon Apr 4 09:52:18 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/lib/libc/gen: Makefile
Added Files:
src/tests/lib/libc/gen: t_nice.c
Log Message:
Few simple tests for nice(3).
To generate a diff of this commit:
cvs rdiff -u -r1.287 -r1.288 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.15 -r1.16 src/tests/lib/libc/gen/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/lib/libc/gen/t_nice.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.287 src/distrib/sets/lists/tests/mi:1.288
--- src/distrib/sets/lists/tests/mi:1.287 Mon Apr 4 08:19:08 2011
+++ src/distrib/sets/lists/tests/mi Mon Apr 4 09:52:17 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.287 2011/04/04 08:19:08 jruoho Exp $
+# $NetBSD: mi,v 1.288 2011/04/04 09:52:17 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -339,6 +339,7 @@
./usr/libdata/debug/usr/tests/lib/libc/gen/t_glob_star.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_humanize_number.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_ldexp.debug tests-lib-debug debug,atf
+./usr/libdata/debug/usr/tests/lib/libc/gen/t_nice.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_raise.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_randomid.debug tests-lib-debug debug,atf
./usr/libdata/debug/usr/tests/lib/libc/gen/t_rbstress.debug tests-lib-debug debug,atf
@@ -1716,6 +1717,7 @@
./usr/tests/lib/libc/gen/t_glob_star tests-lib-tests atf
./usr/tests/lib/libc/gen/t_humanize_number tests-lib-tests atf
./usr/tests/lib/libc/gen/t_ldexp tests-lib-tests atf
+./usr/tests/lib/libc/gen/t_nice tests-lib-tests atf
./usr/tests/lib/libc/gen/t_raise tests-lib-tests atf
./usr/tests/lib/libc/gen/t_randomid tests-lib-tests atf
./usr/tests/lib/libc/gen/t_rbstress tests-lib-tests atf
Index: src/tests/lib/libc/gen/Makefile
diff -u src/tests/lib/libc/gen/Makefile:1.15 src/tests/lib/libc/gen/Makefile:1.16
--- src/tests/lib/libc/gen/Makefile:1.15 Thu Mar 24 16:58:01 2011
+++ src/tests/lib/libc/gen/Makefile Mon Apr 4 09:52:18 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/03/24 16:58:01 jruoho Exp $
+# $NetBSD: Makefile,v 1.16 2011/04/04 09:52:18 jruoho Exp $
.include
@@ -10,6 +10,7 @@
TESTS_C+= t_glob_star
TESTS_C+= t_humanize_number
TESTS_C+= t_ldexp
+TESTS_C+= t_nice
TESTS_C+= t_raise
TESTS_C+= t_randomid
TESTS_C+= t_rbstress
Added files:
Index: src/tests/lib/libc/gen/t_nice.c
diff -u /dev/null src/tests/lib/libc/gen/t_nice.c:1.1
--- /dev/null Mon Apr 4 09:52:18 2011
+++ src/tests/lib/libc/gen/t_nice.c Mon Apr 4 09:52:18 2011
@@ -0,0 +1,144 @@
+/* $NetBSD: t_nice.c,v 1.1 2011/04/04 09:52:18 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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.
+ */
+#include
+__RCSID("$NetBSD: t_nice.c,v 1.1 2011/04/04 09:52:18 jruoho Exp $");
+
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+
+ATF_TC(nice_err);
+ATF_TC_HEAD(nice_err, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test nice(3) for invalid parameters");
+ atf_tc_set_md_var(tc, "require.user", "unprivileged");
+}
+
+ATF_TC_BODY(nice_err, tc)
+{
+ int i;
+
+ /*
+ * The call should fail with EPERM if the
+ * supplied para
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Mon Apr 4 08:19:08 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/syscall: Makefile
Added Files:
src/tests/syscall: t_getsid.c
Log Message:
Add some basic tests also for getsid(2).
To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.15 -r1.16 src/tests/syscall/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/syscall/t_getsid.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.286 src/distrib/sets/lists/tests/mi:1.287
--- src/distrib/sets/lists/tests/mi:1.286 Mon Apr 4 06:48:04 2011
+++ src/distrib/sets/lists/tests/mi Mon Apr 4 08:19:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.286 2011/04/04 06:48:04 jruoho Exp $
+# $NetBSD: mi,v 1.287 2011/04/04 08:19:08 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -569,6 +569,7 @@
./usr/libdata/debug/usr/tests/syscall/t_dup.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_fsync.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_getpid.debug tests-syscall-debug debug,atf
+./usr/libdata/debug/usr/tests/syscall/t_getsid.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_mmap.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_mprotect.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_timer.debug tests-syscall-debug debug,atf
@@ -2112,6 +2113,7 @@
./usr/tests/syscall/t_dup tests-syscall-tests atf
./usr/tests/syscall/t_fsync tests-syscall-tests atf
./usr/tests/syscall/t_getpid tests-syscall-tests atf
+./usr/tests/syscall/t_getsid tests-syscall-tests atf
./usr/tests/syscall/t_mmap tests-syscall-tests atf
./usr/tests/syscall/t_mprotect tests-syscall-tests atf
./usr/tests/syscall/t_timer tests-syscall-tests atf
Index: src/tests/syscall/Makefile
diff -u src/tests/syscall/Makefile:1.15 src/tests/syscall/Makefile:1.16
--- src/tests/syscall/Makefile:1.15 Mon Apr 4 08:05:37 2011
+++ src/tests/syscall/Makefile Mon Apr 4 08:19:08 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2011/04/04 08:05:37 jruoho Exp $
+# $NetBSD: Makefile,v 1.16 2011/04/04 08:19:08 jruoho Exp $
.include
TESTSDIR= ${TESTSBASE}/syscall
-TESTS_C+= t_access t_cmsg t_dup t_fsync t_getpid
+TESTS_C+= t_access t_cmsg t_dup t_fsync t_getpid t_getsid
TESTS_C+= t_mmap t_mprotect t_timer
LDADD.t_getpid+=-lpthread
Added files:
Index: src/tests/syscall/t_getsid.c
diff -u /dev/null src/tests/syscall/t_getsid.c:1.1
--- /dev/null Mon Apr 4 08:19:08 2011
+++ src/tests/syscall/t_getsid.c Mon Apr 4 08:19:08 2011
@@ -0,0 +1,119 @@
+/* $NetBSD: t_getsid.c,v 1.1 2011/04/04 08:19:08 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * 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. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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.
+ */
+#include
+__RCSID("$NetBSD: t_getsid.c,v 1.1 2011/04/04 08:19:08 jruoho Exp $");
+
+#include
+
+#include
+#include
+#include
+
+#include
+
+ATF_TC(getsid_current);
+ATF_TC_HEAD(getsid_current, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "Test getsid(0)");
+}
+
+ATF_TC_BODY(getsid_current, tc)
+{
+ pid_t sid;
+
+ sid = getsid(0);
+ ATF_REQUIRE(sid != -1);
+
+ if (sid != getsid(getpid()))
+ atf_tc_fail("getsid(0) did not match the calling process");
+}
+
+ATF_TC(getsid_err);
+ATF_TC_HEAD(getsi
CVS commit: src/tests/syscall
Module Name:src Committed By: jruoho Date: Mon Apr 4 08:05:37 UTC 2011 Modified Files: src/tests/syscall: Makefile Log Message: Link the 't_timer' -test with pthread(3). Should fix the test failures. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/tests/syscall/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/syscall/Makefile diff -u src/tests/syscall/Makefile:1.14 src/tests/syscall/Makefile:1.15 --- src/tests/syscall/Makefile:1.14 Mon Apr 4 06:48:05 2011 +++ src/tests/syscall/Makefile Mon Apr 4 08:05:37 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2011/04/04 06:48:05 jruoho Exp $ +# $NetBSD: Makefile,v 1.15 2011/04/04 08:05:37 jruoho Exp $ .include @@ -8,6 +8,7 @@ TESTS_C+= t_mmap t_mprotect t_timer LDADD.t_getpid+=-lpthread +LDADD.t_timer+= -lpthread LDADD.t_cmsg+= -lrumpnet_local -lrumpnet_net -lrumpnet LDADD.t_cmsg+= -lrumpvfs -lrump -lrumpuser -lpthread
CVS commit: src/lib/libc/sys
Module Name:src Committed By: jruoho Date: Mon Apr 4 08:00:53 UTC 2011 Modified Files: src/lib/libc/sys: getsid.2 setsid.2 Log Message: Use .Fn for functions. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/sys/getsid.2 cvs rdiff -u -r1.14 -r1.15 src/lib/libc/sys/setsid.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/getsid.2 diff -u src/lib/libc/sys/getsid.2:1.10 src/lib/libc/sys/getsid.2:1.11 --- src/lib/libc/sys/getsid.2:1.10 Sat Oct 7 21:03:51 2006 +++ src/lib/libc/sys/getsid.2 Mon Apr 4 08:00:53 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: getsid.2,v 1.10 2006/10/07 21:03:51 elad Exp $ +.\" $NetBSD: getsid.2,v 1.11 2011/04/04 08:00:53 jruoho Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)getpgrp.2 8.1 (Berkeley) 6/4/93 .\" -.Dd October 7, 2006 +.Dd April 4, 2011 .Dt GETSID 2 .Os .Sh NAME @@ -43,7 +43,7 @@ .Fn getsid "pid_t pid" .Sh DESCRIPTION The -.Nm +.Fn getsid function returns the session ID of the process specified by .Ar pid . If @@ -53,7 +53,7 @@ process that is the session leader. .Sh ERRORS If an error occurs, -.Nm +.Fn getsid returns \-1 and the global variable .Va errno is set to indicate the error, as follows: Index: src/lib/libc/sys/setsid.2 diff -u src/lib/libc/sys/setsid.2:1.14 src/lib/libc/sys/setsid.2:1.15 --- src/lib/libc/sys/setsid.2:1.14 Sat Oct 7 21:03:51 2006 +++ src/lib/libc/sys/setsid.2 Mon Apr 4 08:00:53 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: setsid.2,v 1.14 2006/10/07 21:03:51 elad Exp $ +.\" $NetBSD: setsid.2,v 1.15 2011/04/04 08:00:53 jruoho Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)setsid.2 8.1 (Berkeley) 6/4/93 .\" -.Dd October 7, 2006 +.Dd April 4, 2011 .Dt SETSID 2 .Os .Sh NAME @@ -43,7 +43,7 @@ .Fn setsid "void" .Sh DESCRIPTION The -.Nm setsid +.Fn setsid function creates a new session. The calling process is the session leader of the new session, is the process group leader of a new process group and has no controlling @@ -52,12 +52,12 @@ process group. .Pp Upon successful completion, the -.Nm setsid +.Fn setsid function returns the value of the process group ID of the new process group, which is the same as the process ID of the calling process. .Sh ERRORS If an error occurs, -.Nm setsid +.Fn setsid returns \-1 and the global variable .Va errno is set to indicate the error, as follows: @@ -74,6 +74,6 @@ .Xr tcsetpgrp 3 .Sh STANDARDS The -.Nm setsid +.Fn setsid function conforms to .St -p1003.1-90 .
CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Apr 4 07:17:09 UTC 2011 Modified Files: src/share/man/man4: filemon.4 Log Message: Sort sections. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/filemon.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/filemon.4 diff -u src/share/man/man4/filemon.4:1.3 src/share/man/man4/filemon.4:1.4 --- src/share/man/man4/filemon.4:1.3 Fri Apr 1 10:32:37 2011 +++ src/share/man/man4/filemon.4 Mon Apr 4 07:17:08 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: filemon.4,v 1.3 2011/04/01 10:32:37 jruoho Exp $ +.\" $NetBSD: filemon.4,v 1.4 2011/04/04 07:17:08 wiz Exp $ .\" .\" Copyright (c) 2011, Juniper Networks, Inc. .\" @@ -103,6 +103,10 @@ indicates the version of .Nm . .El +.Sh FILES +.Bd -literal +/dev/filemon +.Ed .Sh EXAMPLES The following example demonstrates the basic usage of .Nm : @@ -147,10 +151,6 @@ It is possible to achieve almost equivalent results with .Xr dtrace 1 though on many systems this requires elevated privileges. -.Sh FILES -.Bd -literal -/dev/filemon -.Ed .Sh HISTORY .Nm was contributed by Juniper Networks.
CVS commit: src/tests/syscall
Module Name:src
Committed By: jruoho
Date: Mon Apr 4 07:16:29 UTC 2011
Modified Files:
src/tests/syscall: t_access.c
Log Message:
Require an unprivileged run with atf_tc_set_md_var(). Pointed out by njoly@.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/syscall/t_access.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/syscall/t_access.c
diff -u src/tests/syscall/t_access.c:1.2 src/tests/syscall/t_access.c:1.3
--- src/tests/syscall/t_access.c:1.2 Mon Apr 4 01:49:45 2011
+++ src/tests/syscall/t_access.c Mon Apr 4 07:16:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_access.c,v 1.2 2011/04/04 01:49:45 jruoho Exp $ */
+/* $NetBSD: t_access.c,v 1.3 2011/04/04 07:16:29 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_access.c,v 1.2 2011/04/04 01:49:45 jruoho Exp $");
+__RCSID("$NetBSD: t_access.c,v 1.3 2011/04/04 07:16:29 jruoho Exp $");
#include
#include
@@ -47,6 +47,7 @@
ATF_TC_HEAD(access_access, tc)
{
atf_tc_set_md_var(tc, "descr", "Test access(2) for EACCES");
+ atf_tc_set_md_var(tc, "require.user", "unprivileged");
}
ATF_TC_BODY(access_access, tc)
@@ -55,9 +56,6 @@
size_t i;
int fd;
- if (getuid() == 0)
- return;
-
fd = open(path, O_RDONLY | O_CREAT);
if (fd < 0)
