CVS commit: src/lib/libc/time
Module Name:src Committed By: njoly Date: Thu Dec 9 09:22:31 UTC 2010 Modified Files: src/lib/libc/time: ctime.3 Log Message: Convert a few macros to Vt (variable type). To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/lib/libc/time/ctime.3 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/time/ctime.3 diff -u src/lib/libc/time/ctime.3:1.34 src/lib/libc/time/ctime.3:1.35 --- src/lib/libc/time/ctime.3:1.34 Wed Oct 27 19:18:00 2010 +++ src/lib/libc/time/ctime.3 Thu Dec 9 09:22:31 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ctime.3,v 1.34 2010/10/27 19:18:00 wiz Exp $ +.\ $NetBSD: ctime.3,v 1.35 2010/12/09 09:22:31 njoly Exp $ .Dd October 27, 2010 .Dt CTIME 3 .Os @@ -18,7 +18,7 @@ .Lb libc .Sh SYNOPSIS .In time.h -.Dv extern char *tzname[2]; +.Vt extern char *tzname[2]; .Ft char * .Fn ctime const time_t *clock .Ft char * @@ -42,7 +42,7 @@ .Sh DESCRIPTION .Fn ctime converts a -.Tp time_t , +.Vt time_t , pointed to by .Fa clock , representing the time in seconds since @@ -235,7 +235,7 @@ The .Fn mktime function returns the specified time since the Epoch as a -.Va time_t +.Vt time_t type value. If the time cannot be represented, then .Fn mktime
CVS commit: src/sys/arch/hp700/hp700
Module Name:src Committed By: skrll Date: Thu Dec 9 10:19:23 UTC 2010 Modified Files: src/sys/arch/hp700/hp700: machdep.c Log Message: Initialise lwp0.l_cpu early so that spl* work. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/arch/hp700/hp700/machdep.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/hp700/hp700/machdep.c diff -u src/sys/arch/hp700/hp700/machdep.c:1.90 src/sys/arch/hp700/hp700/machdep.c:1.91 --- src/sys/arch/hp700/hp700/machdep.c:1.90 Mon Dec 6 18:42:09 2010 +++ src/sys/arch/hp700/hp700/machdep.c Thu Dec 9 10:19:23 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.90 2010/12/06 18:42:09 skrll Exp $ */ +/* $NetBSD: machdep.c,v 1.91 2010/12/09 10:19:23 skrll Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.90 2010/12/06 18:42:09 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.91 2010/12/09 10:19:23 skrll Exp $); #include opt_cputype.h #include opt_ddb.h @@ -429,12 +429,13 @@ #ifdef KGDB boothowto |= RB_KDB; /* go to kgdb early if compiled in. */ #endif - /* Setup curlwp/curcpu early for LOCKDEBUG */ + /* Setup curlwp/curcpu early for LOCKDEBUG and spl* */ #ifdef MULTIPROCESSOR mtctl(cpus[0], CR_CURCPU); #else mtctl(lwp0, CR_CURLWP); #endif + lwp0.l_cpu = cpus[0]; /* Copy bootinfo */ if (bi != NULL)
CVS commit: src/bin/dd
Module Name:src
Committed By: enami
Date: Thu Dec 9 10:24:56 UTC 2010
Modified Files:
src/bin/dd: args.c
Log Message:
Wrap long line.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/bin/dd/args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/dd/args.c
diff -u src/bin/dd/args.c:1.28 src/bin/dd/args.c:1.29
--- src/bin/dd/args.c:1.28 Sun Dec 5 23:35:59 2010
+++ src/bin/dd/args.c Thu Dec 9 10:24:56 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: args.c,v 1.28 2010/12/05 23:35:59 jym Exp $ */
+/* $NetBSD: args.c,v 1.29 2010/12/09 10:24:56 enami Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = @(#)args.c 8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: args.c,v 1.28 2010/12/05 23:35:59 jym Exp $);
+__RCSID($NetBSD: args.c,v 1.29 2010/12/09 10:24:56 enami Exp $);
#endif
#endif /* not lint */
@@ -382,7 +382,8 @@
/* NOTREACHED */
}
if (ddflags cp-noset) {
- errx(EXIT_FAILURE, %s: illegal conversion combination, tmp.name);
+ errx(EXIT_FAILURE,
+ %s: illegal conversion combination, tmp.name);
/* NOTREACHED */
}
ddflags |= cp-set;
CVS commit: src/lib/libcurses
Module Name:src Committed By: njoly Date: Thu Dec 9 11:21:50 UTC 2010 Modified Files: src/lib/libcurses: curses_fileio.3 Log Message: Add missing space in fread xref. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libcurses/curses_fileio.3 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/curses_fileio.3 diff -u src/lib/libcurses/curses_fileio.3:1.3 src/lib/libcurses/curses_fileio.3:1.4 --- src/lib/libcurses/curses_fileio.3:1.3 Wed Apr 30 13:10:51 2008 +++ src/lib/libcurses/curses_fileio.3 Thu Dec 9 11:21:49 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: curses_fileio.3,v 1.3 2008/04/30 13:10:51 martin Exp $ +.\ $NetBSD: curses_fileio.3,v 1.4 2010/12/09 11:21:49 njoly Exp $ .\ Copyright (c) 2008 The NetBSD Foundation, Inc. .\ All rights reserved. .\ @@ -75,7 +75,7 @@ if an error is detected. .Sh SEE ALSO .Xr curses_window 3 , -.Xr fread 3, +.Xr fread 3 , .Xr fwrite 3 .Sh NOTES Subwindows can not be created by the
CVS commit: src/lib/libcurses
Module Name:src Committed By: njoly Date: Thu Dec 9 13:26:27 UTC 2010 Modified Files: src/lib/libcurses: curses.3 Log Message: s/curses_fileo/curses_fileio/ in xrefs. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/lib/libcurses/curses.3 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/curses.3 diff -u src/lib/libcurses/curses.3:1.60 src/lib/libcurses/curses.3:1.61 --- src/lib/libcurses/curses.3:1.60 Sun Jul 12 23:12:40 2009 +++ src/lib/libcurses/curses.3 Thu Dec 9 13:26:27 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: curses.3,v 1.60 2009/07/12 23:12:40 wiz Exp $ +.\ $NetBSD: curses.3,v 1.61 2010/12/09 13:26:27 njoly Exp $ .\ .\ Copyright (c) 1985, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -130,7 +130,7 @@ .It getparyx Ta Xr curses_cursor 3 .It getstr Ta Xr curses_input 3 .It gettmode Ta Xr curses_tty 3 -.It getwin Ta Xr curses_fileo 3 +.It getwin Ta Xr curses_fileio 3 .It getyx Ta Xr curses_cursor 3 .It has_colors Ta Xr curses_color 3 .It has_ic Ta Xr curses_tty 3 @@ -209,7 +209,7 @@ .It pnoutrefresh Ta Xr curses_pad 3 .It prefresh Ta Xr curses_pad 3 .It printw Ta Xr curses_print 3 -.It putwin Ta Xr curses_fileo 3 +.It putwin Ta Xr curses_fileio 3 .It qiflush Ta Xr curses_tty 3 .It raw Ta Xr curses_tty 3 .It redrawwin Ta Xr curses_touch 3
CVS commit: src/share/man/man3
Module Name:src Committed By: njoly Date: Thu Dec 9 13:51:46 UTC 2010 Modified Files: src/share/man/man3: intro.3 Log Message: Remove reference to Curses development kit (CDK) which do not exists anymore. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/share/man/man3/intro.3 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/man3/intro.3 diff -u src/share/man/man3/intro.3:1.22 src/share/man/man3/intro.3:1.23 --- src/share/man/man3/intro.3:1.22 Tue Mar 10 23:42:45 2009 +++ src/share/man/man3/intro.3 Thu Dec 9 13:51:45 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: intro.3,v 1.22 2009/03/10 23:42:45 joerg Exp $ +.\ $NetBSD: intro.3,v 1.23 2010/12/09 13:51:45 njoly Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -101,9 +101,6 @@ see .Xr signal 3 .El -.It Em libcdk Pq Fl l Ns Ar cdk -Curses development kit (CDK) library. See -.Xr cdk 3 . .It Em libcom_err Pq Fl l Ns Ar com_err The common error description library. See .Xr com_err 3 .
CVS commit: src/tests/sbin/resize_ffs
Module Name:src
Committed By: riz
Date: Thu Dec 9 16:59:35 UTC 2010
Modified Files:
src/tests/sbin/resize_ffs: common.sh
Log Message:
Remove accidentally-committed debug-assist code.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/sbin/resize_ffs/common.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/resize_ffs/common.sh
diff -u src/tests/sbin/resize_ffs/common.sh:1.1 src/tests/sbin/resize_ffs/common.sh:1.2
--- src/tests/sbin/resize_ffs/common.sh:1.1 Thu Dec 9 05:19:02 2010
+++ src/tests/sbin/resize_ffs/common.sh Thu Dec 9 16:59:35 2010
@@ -17,19 +17,6 @@
fi
}
-# make sure to remove test_redo before committing
-test_redo ()
-{
-local fpi=$((${2} * 4))
-local i
-if [ $fpi -gt 16384 ]; then
-i=-i 16384
-fi
- sudo umount ${MNTPT}
- newfs -O1 $i -b $1 -f $2 -s $3 -F ${IMG}
- sudo rump_ffs ${IMG} ${MNTPT}
-}
-
# test_case() taken from the tests/ipf/h_common.sh
# Used to declare the atf goop for a test.
test_case()
@@ -92,17 +79,6 @@
done
}
-mount_test_fs_image ()
-{
- rump_ffs ${IMG} ${MNTPT}
-}
-
-unmount_test_fs_image ()
-{
- umount -f ${MNTPT}
-}
-
-
# verify that the data in a particular directory is still OK
# generated md5 file doesn't need explicit cleanup thanks to ATF
check_data ()
CVS commit: src/tests/sbin/resize_ffs
Module Name:src
Committed By: riz
Date: Thu Dec 9 17:28:06 UTC 2010
Modified Files:
src/tests/sbin/resize_ffs: t_grow.sh t_shrink.sh
Log Message:
Wrap the bigger tests in RESIZE_FFS_BIG_TESTS, as the automated test
run seems to choke over a certain size. (This will speed up the runs
as well)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/sbin/resize_ffs/t_grow.sh \
src/tests/sbin/resize_ffs/t_shrink.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/resize_ffs/t_grow.sh
diff -u src/tests/sbin/resize_ffs/t_grow.sh:1.1 src/tests/sbin/resize_ffs/t_grow.sh:1.2
--- src/tests/sbin/resize_ffs/t_grow.sh:1.1 Thu Dec 9 05:19:02 2010
+++ src/tests/sbin/resize_ffs/t_grow.sh Thu Dec 9 17:28:05 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_grow.sh,v 1.1 2010/12/09 05:19:02 riz Exp $
+# $NetBSD: t_grow.sh,v 1.2 2010/12/09 17:28:05 riz Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -76,6 +76,9 @@
# created fs. 'level' is the fs-level (-O 0,1,2) passed to newfs.
# If 'swap' is included, byteswap the fs
test_case grow_16M_v1_4096 grow_ffs 4096 512 32768 131072 1 28
+test_case_xfail grow_16M_v1_4096_swapped PR bin/44203 grow_ffs 4096 512 32768 131072 1 28 swap
+test_case_xfail grow_16M_v2_4096 PR bin/44205 grow_ffs 4096 512 32768 131072 2 28
+test_case_xfail grow_16M_v2_4096_swapped PR bin/44203, PR bin/44205 grow_ffs 4096 512 32768 131072 2 28 swap
test_case grow_16M_v1_8192 grow_ffs 8192 1024 32768 131072 1 28
test_case grow_16M_v1_16384 grow_ffs 16384 2048 32768 131072 1 29
test_case grow_16M_v1_32768 grow_ffs 32768 4096 32768 131072 1 28
@@ -103,7 +106,7 @@
test_case grow_64M_v1_65536 grow_ffs 65536 8192 131072 262144 1 101
test_case_xfail grow_64M_v1_65536_swapped PR bin/44203 grow_ffs 65536 8192 131072 262144 1 101 swap
test_case_xfail grow_64M_v2_65536 PR bin/44205 grow_ffs 65536 8192 131072 262144 2 101
-test_case_xfail grow_64M_v2_65536_swapped PR bin/44203; PR bin/44205 grow_ffs 65536 8192 131072 262144 2 101 swap
+test_case_xfail grow_64M_v2_65536_swapped PR bin/44203, PR bin/44205 grow_ffs 65536 8192 131072 262144 2 101 swap
atf_test_case grow_ffsv1_partial_cg
grow_ffsv1_partial_cg_head()
@@ -127,6 +130,9 @@
{
setupvars
atf_add_test_case grow_16M_v1_4096
+ atf_add_test_case grow_16M_v1_4096_swapped
+ atf_add_test_case grow_16M_v2_4096
+ atf_add_test_case grow_16M_v2_4096_swapped
atf_add_test_case grow_16M_v1_8192
atf_add_test_case grow_16M_v1_16384
atf_add_test_case grow_16M_v1_32768
@@ -141,6 +147,7 @@
atf_add_test_case grow_32M_v1_16384
atf_add_test_case grow_32M_v1_32768
atf_add_test_case grow_32M_v1_65536
+if [ X${RESIZE_FFS_BIG_TESTS} != X ]; then
atf_add_test_case grow_48M_v1_4096
atf_add_test_case grow_48M_v1_8192
atf_add_test_case grow_48M_v1_16384
@@ -154,5 +161,6 @@
atf_add_test_case grow_64M_v1_65536_swapped
atf_add_test_case grow_64M_v2_65536
atf_add_test_case grow_64M_v2_65536_swapped
+fi
atf_add_test_case grow_ffsv1_partial_cg
}
Index: src/tests/sbin/resize_ffs/t_shrink.sh
diff -u src/tests/sbin/resize_ffs/t_shrink.sh:1.1 src/tests/sbin/resize_ffs/t_shrink.sh:1.2
--- src/tests/sbin/resize_ffs/t_shrink.sh:1.1 Thu Dec 9 05:19:02 2010
+++ src/tests/sbin/resize_ffs/t_shrink.sh Thu Dec 9 17:28:05 2010
@@ -1,4 +1,4 @@
-# $NetBSD: t_shrink.sh,v 1.1 2010/12/09 05:19:02 riz Exp $
+# $NetBSD: t_shrink.sh,v 1.2 2010/12/09 17:28:05 riz Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -82,6 +82,9 @@
# created fs. 'level' is the fs-level (-O 0,1,2) passed to newfs.
# If 'swap' is included, byteswap the fs
test_case shrink_24M_16M_v1_4096 shrink_ffs 4096 512 49152 32768 1 41
+test_case_xfail shrink_24M_16M_v1_4096_swapped PR bin/44203 shrink_ffs 4096 512 49152 32768 1 41 swap
+test_case_xfail shrink_24M_16M_v2_4096 PR bin/44205 shrink_ffs 4096 512 49152 32768 2 41 swap
+test_case_xfail shrink_24M_16M_v2_4096_swapped PR bin/44203, PR bin/44205 shrink_ffs 4096 512 49152 32768 2 41 swap
test_case shrink_24M_16M_v1_8192 shrink_ffs 8192 1024 49152 32768 1 42
test_case shrink_24M_16M_v1_16384 shrink_ffs 16384 2048 49152 32768 1 43
test_case shrink_24M_16M_v1_32768 shrink_ffs 32768 4096 49152 32768 1 42
@@ -104,7 +107,7 @@
test_case shrink_64M_48M_v1_65536 shrink_ffs 65536 8192 131072 98304 1 101
test_case_xfail shrink_64M_48M_v1_65536_swapped PR bin/44203 shrink_ffs 65536 8192 131072 98304 1 101 swap
test_case_xfail shrink_64M_48M_v2_65536 PR bin/44205 shrink_ffs 65536 8192 131072 98304 2 101
-test_case_xfail shrink_64M_48M_v2_65536_swapped PR bin/44203; PR bin/44205 shrink_ffs 65536 8192 131072 98304 2 101 swap
+test_case_xfail shrink_64M_48M_v2_65536_swapped PR bin/44203, PR bin/44205 shrink_ffs 65536 8192 131072 98304 2 101 swap
atf_test_case shrink_ffsv1_partial_cg
shrink_ffsv1_partial_cg_head()
@@ -127,6 +130,9 @@
{
setupvars
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: joerg
Date: Thu Dec 9 21:27:32 UTC 2010
Modified Files:
src/lib/libc/gen: errlist.c
Log Message:
Wrap sys_errlist constants in a macro to make it easier to extract
the strings reliably with sed/awk.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/lib/libc/gen/errlist.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/gen/errlist.c
diff -u src/lib/libc/gen/errlist.c:1.17 src/lib/libc/gen/errlist.c:1.18
--- src/lib/libc/gen/errlist.c:1.17 Tue Oct 31 00:38:07 2006
+++ src/lib/libc/gen/errlist.c Thu Dec 9 21:27:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: errlist.c,v 1.17 2006/10/31 00:38:07 cbiere Exp $ */
+/* $NetBSD: errlist.c,v 1.18 2010/12/09 21:27:31 joerg Exp $ */
/*
* Copyright (c) 1982, 1985, 1993
@@ -34,147 +34,158 @@
#if 0
static char sccsid[] = @(#)errlst.c 8.2 (Berkeley) 11/16/93;
#else
-__RCSID($NetBSD: errlist.c,v 1.17 2006/10/31 00:38:07 cbiere Exp $);
+__RCSID($NetBSD: errlist.c,v 1.18 2010/12/09 21:27:31 joerg Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
#include errno.h
+#define EL(x) x
+
static const char *const errlist[] = {
- Undefined error: 0, /* 0 - ENOERROR */
- Operation not permitted, /* 1 - EPERM */
- No such file or directory, /* 2 - ENOENT */
- No such process, /* 3 - ESRCH */
- Interrupted system call, /* 4 - EINTR */
- Input/output error, /* 5 - EIO */
- Device not configured, /* 6 - ENXIO */
- Argument list too long, /* 7 - E2BIG */
- Exec format error, /* 8 - ENOEXEC */
- Bad file descriptor, /* 9 - EBADF */
- No child processes, /* 10 - ECHILD */
- Resource deadlock avoided, /* 11 - EDEADLK */
- Cannot allocate memory, /* 12 - ENOMEM */
- Permission denied, /* 13 - EACCES */
- Bad address,/* 14 - EFAULT */
- Block device required, /* 15 - ENOTBLK */
- Device busy,/* 16 - EBUSY */
- File exists,/* 17 - EEXIST */
- Cross-device link, /* 18 - EXDEV */
- Operation not supported by device, /* 19 - ENODEV */
- Not a directory, /* 20 - ENOTDIR */
- Is a directory, /* 21 - EISDIR */
- Invalid argument, /* 22 - EINVAL */
- Too many open files in system, /* 23 - ENFILE */
- Too many open files, /* 24 - EMFILE */
- Inappropriate ioctl for device, /* 25 - ENOTTY */
- Text file busy, /* 26 - ETXTBSY */
- File too large, /* 27 - EFBIG */
- No space left on device, /* 28 - ENOSPC */
- Illegal seek,/* 29 - ESPIPE */
- Read-only file system, /* 30 - EROFS */
- Too many links, /* 31 - EMLINK */
- Broken pipe,/* 32 - EPIPE */
+ EL((Undefined error: 0)), /* 0 - ENOERROR */
+ EL((Operation not permitted)), /* 1 - EPERM */
+ EL((No such file or directory)), /* 2 - ENOENT */
+ EL((No such process)), /* 3 - ESRCH */
+ EL((Interrupted system call)), /* 4 - EINTR */
+ EL((Input/output error)), /* 5 - EIO */
+ EL((Device not configured)), /* 6 - ENXIO */
+ EL((Argument list too long)), /* 7 - E2BIG */
+ EL((Exec format error)), /* 8 - ENOEXEC */
+ EL((Bad file descriptor)), /* 9 - EBADF */
+ EL((No child processes)), /* 10 - ECHILD */
+ EL((Resource deadlock avoided)), /* 11 - EDEADLK */
+ EL((Cannot allocate memory)), /* 12 - ENOMEM */
+ EL((Permission denied)), /* 13 - EACCES */
+ EL((Bad address)), /* 14 - EFAULT */
+ EL((Block device required)), /* 15 - ENOTBLK */
+ EL((Device busy)), /* 16 - EBUSY */
+ EL((File exists)), /* 17 - EEXIST */
+ EL((Cross-device link)), /* 18 - EXDEV */
+ /* 19 - ENODEV */
+ EL((Operation not supported by device)),
+ EL((Not a directory)), /* 20 - ENOTDIR */
+ EL((Is a directory)), /* 21 - EISDIR */
+ EL((Invalid argument)), /* 22 - EINVAL */
+ EL((Too many open files in system)), /* 23 - ENFILE */
+ EL((Too many open files)), /* 24 - EMFILE */
+ EL((Inappropriate ioctl for device)), /* 25 - ENOTTY */
+ EL((Text file busy)), /* 26 - ETXTBSY */
+ EL((File too large)), /* 27 - EFBIG */
+ EL((No space left on device)), /* 28 - ENOSPC */
+ EL((Illegal seek)), /* 29 - ESPIPE */
+ EL((Read-only file system)), /* 30 - EROFS */
+ EL((Too many links)), /* 31 - EMLINK */
+ EL((Broken pipe)), /* 32 - EPIPE */
/* math software */
- Numerical argument out of domain, /* 33 - EDOM */
- Result too large or too small, /* 34 - ERANGE */
+ /* 33 - EDOM */
+ EL((Numerical argument out of domain)),
+ EL((Result too large or too small)), /* 34 - ERANGE */
/* non-blocking and interrupt i/o */
- Resource temporarily unavailable, /* 35 - EAGAIN */
+ /* 35 - EAGAIN */
+ EL((Resource temporarily unavailable)),
/* 35 - EWOULDBLOCK */
- Operation now in progress, /* 36 - EINPROGRESS */
- Operation already in progress, /* 37 - EALREADY */
+ EL((Operation now in progress)), /* 36 - EINPROGRESS */
+ EL((Operation already in progress)), /* 37 - EALREADY */
/* ipc/network software -- argument errors */
- Socket operation on non-socket, /* 38 - ENOTSOCK */
-
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Thu Dec 9 22:30:17 UTC 2010
Modified Files:
src/usr.bin/make: main.c meta.c nonints.h
Log Message:
meta_oodate(): we should track 'latestdir' on a per process basis.
Also, only consider target out of date if a not-found file is outside
'CWD'. Ignore anything in /tmp/ or tmpdir.
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/usr.bin/make/main.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/meta.c
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/make/nonints.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.190 src/usr.bin/make/main.c:1.191
--- src/usr.bin/make/main.c:1.190 Mon Sep 13 15:36:57 2010
+++ src/usr.bin/make/main.c Thu Dec 9 22:30:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.190 2010/09/13 15:36:57 sjg Exp $ */
+/* $NetBSD: main.c,v 1.191 2010/12/09 22:30:16 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: main.c,v 1.190 2010/09/13 15:36:57 sjg Exp $;
+static char rcsid[] = $NetBSD: main.c,v 1.191 2010/12/09 22:30:16 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
@@ -81,7 +81,7 @@
#if 0
static char sccsid[] = @(#)main.c 8.3 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: main.c,v 1.190 2010/09/13 15:36:57 sjg Exp $);
+__RCSID($NetBSD: main.c,v 1.191 2010/12/09 22:30:16 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -1966,20 +1966,10 @@
}
}
-/*
- * Create and open a temp file using pattern.
- * If fnamep is provided set it to a copy of the filename created.
- * Otherwise unlink the file once open.
- */
-int
-mkTempFile(const char *pattern, char **fnamep)
+char *
+getTmpdir(void)
{
static char *tmpdir = NULL;
-char tfile[MAXPATHLEN];
-int fd;
-
-if (!pattern)
- pattern = TMPPAT;
if (!tmpdir) {
struct stat st;
@@ -1994,6 +1984,25 @@
tmpdir = bmake_strdup(_PATH_TMP);
}
}
+return tmpdir;
+}
+
+/*
+ * Create and open a temp file using pattern.
+ * If fnamep is provided set it to a copy of the filename created.
+ * Otherwise unlink the file once open.
+ */
+int
+mkTempFile(const char *pattern, char **fnamep)
+{
+static char *tmpdir = NULL;
+char tfile[MAXPATHLEN];
+int fd;
+
+if (!pattern)
+ pattern = TMPPAT;
+if (!tmpdir)
+ tmpdir = getTmpdir();
if (pattern[0] == '/') {
snprintf(tfile, sizeof(tfile), %s, pattern);
} else {
Index: src/usr.bin/make/meta.c
diff -u src/usr.bin/make/meta.c:1.4 src/usr.bin/make/meta.c:1.5
--- src/usr.bin/make/meta.c:1.4 Sat Nov 27 05:02:35 2010
+++ src/usr.bin/make/meta.c Thu Dec 9 22:30:17 2010
@@ -695,15 +695,24 @@
/*
* When running with 'meta' functionality, a target can be out-of-date
* if any of the references in it's meta data file is more recent.
+ * We have to track the latestdir on a per-process basis.
*/
+#define LDIR_VNAME_FMT .meta.%d.ldir
+
Boolean
meta_oodate(GNode *gn, Boolean oodate)
{
+static char *tmpdir = NULL;
+char ldir_vname[64];
+char cwd[MAXPATHLEN];
char latestdir[MAXPATHLEN];
char fname[MAXPATHLEN];
char fname1[MAXPATHLEN];
+char fname2[MAXPATHLEN];
char *p;
char *cp;
+size_t cwdlen;
+size_t tmplen = 0;
FILE *fp;
Boolean ignoreOODATE = FALSE;
@@ -718,7 +727,7 @@
*/
Make_DoAllVar(gn);
-if (getcwd(latestdir, sizeof(latestdir)) == NULL)
+if (getcwd(cwd, sizeof(cwd)) == NULL)
err(1, Could not get current working directory);
meta_name(gn, fname, sizeof(fname), NULL, NULL);
@@ -727,6 +736,8 @@
static char *buf = NULL;
static size_t bufsz;
int lineno = 0;
+ int lastpid = 0;
+ int pid;
int f = 0;
int x;
LstNode ln;
@@ -736,10 +747,17 @@
bufsz = 8 * BUFSIZ;
buf = bmake_malloc(bufsz);
}
-
+
+ if (!tmpdir) {
+ tmpdir = getTmpdir();
+ tmplen = strlen(tmpdir);
+ }
+
/* we want to track all the .meta we read */
Var_Append(.MAKE.META.FILES, fname, VAR_GLOBAL);
+ cwdlen = strlen(cwd);
+
ln = Lst_First(gn-commands);
while (!oodate (x = fgetLine(buf, bufsz, 0, fp)) 0) {
lineno++;
@@ -764,28 +782,102 @@
p = buf;
strsep(p, );
if (f) {
+ /*
+ * We are in the 'filemon' output section.
+ * Each record from filemon follows the general form:
+ *
+ * key pid data
+ *
+ * Where:
+ * key is a single letter, denoting the syscall.
+ * pid is the process that made the syscall.
+ * data is the arguments (of interest).
+ */
+ switch(buf[0]) {
+ case '#': /* comment */
+ case 'V': /* version */
+ break;
+ default:
+ /*
+ * We need to track pathnames per-process.
+ *
+ * Each process run by make, starts off in the 'CWD'
+ * recorded in the .meta file, if it chdirs ('C')
+ * elsewhere we need to track that - but only for
+ *
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jym Date: Thu Dec 9 22:34:37 UTC 2010 Modified Files: src/sys/dev/pci: if_bnx.c if_bnxreg.h Added Files: src/sys/dev/pci: if_bnxvar.h Log Message: Similar to bge(4), split if_bnxreg.h in two parts: - if_bnxreg.h: general register values, flags... for bnx(4), that can be included in other drivers - if_bnxvar.h: PCI or device specific code (device state data, debug macros etc.), which should remain private to bnx(4) No comments, no objections on current-us...@. See discussion: http://mail-index.netbsd.org/current-users/2010/12/01/msg014926.html To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/if_bnx.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/pci/if_bnxreg.h cvs rdiff -u -r0 -r1.1 src/sys/dev/pci/if_bnxvar.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/if_bnx.c diff -u src/sys/dev/pci/if_bnx.c:1.35 src/sys/dev/pci/if_bnx.c:1.36 --- src/sys/dev/pci/if_bnx.c:1.35 Sat Nov 27 17:48:58 2010 +++ src/sys/dev/pci/if_bnx.c Thu Dec 9 22:34:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bnx.c,v 1.35 2010/11/27 17:48:58 jym Exp $ */ +/* $NetBSD: if_bnx.c,v 1.36 2010/12/09 22:34:37 jym Exp $ */ /* $OpenBSD: if_bnx.c,v 1.85 2009/11/09 14:32:41 dlg Exp $ */ /*- @@ -35,7 +35,7 @@ #if 0 __FBSDID($FreeBSD: src/sys/dev/bce/if_bce.c,v 1.3 2006/04/13 14:12:26 ru Exp $); #endif -__KERNEL_RCSID(0, $NetBSD: if_bnx.c,v 1.35 2010/11/27 17:48:58 jym Exp $); +__KERNEL_RCSID(0, $NetBSD: if_bnx.c,v 1.36 2010/12/09 22:34:37 jym Exp $); /* * The following controllers are supported by this driver: @@ -60,6 +60,8 @@ #include sys/mutex.h #include dev/pci/if_bnxreg.h +#include dev/pci/if_bnxvar.h + #include dev/microcode/bnx/bnxfw.h // Index: src/sys/dev/pci/if_bnxreg.h diff -u src/sys/dev/pci/if_bnxreg.h:1.10 src/sys/dev/pci/if_bnxreg.h:1.11 --- src/sys/dev/pci/if_bnxreg.h:1.10 Tue Jan 19 22:07:00 2010 +++ src/sys/dev/pci/if_bnxreg.h Thu Dec 9 22:34:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bnxreg.h,v 1.10 2010/01/19 22:07:00 pooka Exp $ */ +/* $NetBSD: if_bnxreg.h,v 1.11 2010/12/09 22:34:37 jym Exp $ */ /* $OpenBSD: if_bnxreg.h,v 1.33 2009/09/05 16:02:28 claudio Exp $ */ /*- @@ -32,54 +32,29 @@ * $FreeBSD: src/sys/dev/bce/if_bcereg.h,v 1.4 2006/05/04 00:34:07 mjacob Exp $ */ -#undef BNX_DEBUG - -#ifndef _BNX_H_DEFINED -#define _BNX_H_DEFINED - -#ifdef _KERNEL_OPT -#include opt_inet.h -#endif - -#include sys/param.h -#include sys/systm.h -#include sys/sockio.h -#include sys/mbuf.h -#include sys/malloc.h -#include sys/kernel.h -#include sys/device.h -#include sys/socket.h -#include sys/sysctl.h -//#include sys/workqueue.h - -#include net/if.h -#include net/if_dl.h -#include net/if_media.h -#include net/if_ether.h - -#ifdef INET -#include netinet/in.h -#include netinet/in_systm.h -#include netinet/in_var.h -#include netinet/ip.h -#include netinet/if_inarp.h -#endif - -#include net/if_vlanvar.h - -#include net/bpf.h - -#include dev/pci/pcireg.h -#include dev/pci/pcivar.h -#include dev/pci/pcidevs.h - -#include dev/mii/mii.h -#include dev/mii/miivar.h -#include dev/mii/miidevs.h -#include dev/mii/brgphyreg.h - #define ETHER_ALIGN 2 +/* General controller flags -- bnx_flags element in bnx_softc */ +#define BNX_PCIX_FLAG 0x01 +#define BNX_PCI_32BIT_FLAG 0x02 +#define BNX_ONE_TDMA_FLAG 0x04/* Deprecated */ +#define BNX_NO_WOL_FLAG 0x08 +#define BNX_USING_DAC_FLAG 0x10 +#define BNX_USING_MSI_FLAG 0x20 +#define BNX_MFW_ENABLE_FLAG 0x40 +#define BNX_ACTIVE_FLAG 0x80 +#define BNX_ALLOC_PKTS_FLAG 0x100 + +/* PHY specific flags -- bnx_phy_flags element in bnx_softc */ +#define BNX_PHY_SERDES_FLAG 0x001 +#define BNX_PHY_CRC_FIX_FLAG0x002 +#define BNX_PHY_PARALLEL_DETECT_FLAG0x004 +#define BNX_PHY_2_5G_CAPABLE_FLAG 0x008 +#define BNX_PHY_INT_MODE_MASK_FLAG 0x300 +#define BNX_PHY_INT_MODE_AUTO_POLLING_FLAG 0x100 +#define BNX_PHY_INT_MODE_LINK_READY_FLAG0x200 +#define BNX_PHY_IEEE_CLAUSE_45_FLAG 0x400 + // /* Debugging macros and definitions.*/ // @@ -675,28 +650,10 @@ #define HOST_VIEW_SHMEM_BASE 0x167c00 -/* - * PCI registers defined in the PCI 2.2 spec. - */ -#define BNX_PCI_BAR0 0x10 -#define BNX_PCI_PCIX_CMD 0x40 - // /* Convenience definitions. */
CVS commit: src/lib/libm
Module Name:src
Committed By: abs
Date: Thu Dec 9 22:52:59 UTC 2010
Modified Files:
src/lib/libm: Makefile
src/lib/libm/noieee_src: n_floor.c
Added Files:
src/lib/libm/noieee_src: n_lround.c n_lroundf.c
Log Message:
Add noieee versions for lround(), lroundf(), lrint(), lrintf(),
llrint() and llrintf(). Code copied from round(), roundf() and
rint() and modified for return values. Its possible this may not
do the right things in edge cases, but if so its likely to have
the same issues as the existing round(), roundf() and rint().
All this used by vax (only), and should allow xnest to complete
build.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/lib/libm/Makefile
cvs rdiff -u -r1.6 -r1.7 src/lib/libm/noieee_src/n_floor.c
cvs rdiff -u -r0 -r1.1 src/lib/libm/noieee_src/n_lround.c \
src/lib/libm/noieee_src/n_lroundf.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/libm/Makefile
diff -u src/lib/libm/Makefile:1.98 src/lib/libm/Makefile:1.99
--- src/lib/libm/Makefile:1.98 Wed Sep 15 16:11:29 2010
+++ src/lib/libm/Makefile Thu Dec 9 22:52:59 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2010/09/15 16:11:29 christos Exp $
+# $NetBSD: Makefile,v 1.99 2010/12/09 22:52:59 abs Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -163,7 +163,7 @@
n_lgamma.c n_j0.c n_j1.c n_jn.c n_log.c n_log10.c n_log1p.c \
n_log__L.c n_pow.c n_sinh.c n_tanh.c \
n_sincos.c n_tan.c \
- n_round.c n_roundf.c
+ n_round.c n_roundf.c n_lround.c n_lroundf.c
# n_sqrt.c n_argred.c n_infnan.c n_atan2.c n_cabs.c n_cbrt.c n_support.c
Index: src/lib/libm/noieee_src/n_floor.c
diff -u src/lib/libm/noieee_src/n_floor.c:1.6 src/lib/libm/noieee_src/n_floor.c:1.7
--- src/lib/libm/noieee_src/n_floor.c:1.6 Thu May 13 20:35:40 2004
+++ src/lib/libm/noieee_src/n_floor.c Thu Dec 9 22:52:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: n_floor.c,v 1.6 2004/05/13 20:35:40 mhitch Exp $ */
+/* $NetBSD: n_floor.c,v 1.7 2010/12/09 22:52:59 abs Exp $ */
/*
* Copyright (c) 1985, 1993
* The Regents of the University of California. All rights reserved.
@@ -144,3 +144,75 @@
return (t - s);
}
#endif /* not national */
+
+long
+lrint(double x)
+{
+ double s;
+ volatile double t;
+ const double one = 1.0;
+
+#if !defined(__vax__)!defined(tahoe)
+ if (x != x)/* NaN */
+ return (x);
+#endif /* !defined(__vax__)!defined(tahoe) */
+ if (copysign(x,one) = L) /* already an integer */
+ return (x);
+ s = copysign(L,x);
+ t = x + s;/* x+s rounded to integer */
+ return (t - s);
+}
+
+long long
+llrint(double x)
+{
+ double s;
+ volatile double t;
+ const double one = 1.0;
+
+#if !defined(__vax__)!defined(tahoe)
+ if (x != x)/* NaN */
+ return (x);
+#endif /* !defined(__vax__)!defined(tahoe) */
+ if (copysign(x,one) = L) /* already an integer */
+ return (x);
+ s = copysign(L,x);
+ t = x + s;/* x+s rounded to integer */
+ return (t - s);
+}
+
+long
+lrintf(float x)
+{
+ float s;
+ volatile float t;
+ const float one = 1.0;
+
+#if !defined(__vax__)!defined(tahoe)
+ if (x != x)/* NaN */
+ return (x);
+#endif /* !defined(__vax__)!defined(tahoe) */
+ if (copysign(x,one) = L) /* already an integer */
+ return (x);
+ s = copysign(L,x);
+ t = x + s;/* x+s rounded to integer */
+ return (t - s);
+}
+
+long long
+llrintf(float x)
+{
+ float s;
+ volatile float t;
+ const float one = 1.0;
+
+#if !defined(__vax__)!defined(tahoe)
+ if (x != x)/* NaN */
+ return (x);
+#endif /* !defined(__vax__)!defined(tahoe) */
+ if (copysign(x,one) = L) /* already an integer */
+ return (x);
+ s = copysign(L,x);
+ t = x + s;/* x+s rounded to integer */
+ return (t - s);
+}
Added files:
Index: src/lib/libm/noieee_src/n_lround.c
diff -u /dev/null src/lib/libm/noieee_src/n_lround.c:1.1
--- /dev/null Thu Dec 9 22:52:59 2010
+++ src/lib/libm/noieee_src/n_lround.c Thu Dec 9 22:52:59 2010
@@ -0,0 +1,53 @@
+/*-
+ * Copyright (c) 2003, Steven G. Kargl
+ * 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 unmodified, 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 AUTHOR ``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 AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: jym
Date: Thu Dec 9 23:25:49 UTC 2010
Modified Files:
src/sys/dev/mii: brgphy.c brgphyreg.h
Log Message:
Add support for BCM5709S (SerDes PHY) in brgphy(4).
From FreeBSD, via OpenBSD, with some minor adaptations.
No comments, no objections on tech-k...@.
The driver was tested on a Dell M710. Access was kindly provided by
Uwe Toenjes, whom I thank for this.
See also http://mail-index.netbsd.org/tech-kern/2010/12/01/msg009478.html
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/mii/brgphyreg.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/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.56 src/sys/dev/mii/brgphy.c:1.57
--- src/sys/dev/mii/brgphy.c:1.56 Sat Nov 27 17:42:04 2010
+++ src/sys/dev/mii/brgphy.c Thu Dec 9 23:25:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.56 2010/11/27 17:42:04 jym Exp $ */
+/* $NetBSD: brgphy.c,v 1.57 2010/12/09 23:25:49 jym Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -55,14 +55,14 @@
*/
/*
- * driver for the Broadcom BCM5400 Gig-E PHY.
+ * driver for the Broadcom BCM5400 and BCM5700 Gig-E PHYs.
*
* Programming information for this PHY was gleaned from FreeBSD
* (they were apparently able to get a datasheet from Broadcom).
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.56 2010/11/27 17:42:04 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: brgphy.c,v 1.57 2010/12/09 23:25:49 jym Exp $);
#include sys/param.h
#include sys/systm.h
@@ -81,9 +81,7 @@
#include dev/mii/brgphyreg.h
#include dev/pci/if_bgereg.h
-#if 0
#include dev/pci/if_bnxreg.h
-#endif
static int brgphymatch(device_t, cfdata_t, void *);
static void brgphyattach(device_t, device_t, void *);
@@ -182,6 +180,9 @@
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709C,
MII_STR_BROADCOM2_BCM5709C },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709S,
+ MII_STR_BROADCOM2_BCM5709S },
+
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709CAX,
MII_STR_BROADCOM2_BCM5709CAX },
@@ -249,26 +250,56 @@
if (sc-mii_capabilities BMSR_EXTSTAT)
sc-mii_extcapabilities = PHY_READ(sc, MII_EXTSR);
- aprint_normal_dev(self, );
- if ((sc-mii_capabilities BMSR_MEDIAMASK) == 0
- (sc-mii_extcapabilities EXTSR_MEDIAMASK) == 0)
- aprint_error(no media present);
- else
- mii_phy_add_media(sc);
- aprint_normal(\n);
if (device_is_a(parent, bge)) {
bsc-sc_isbge = true;
dict = device_properties(parent);
if (!prop_dictionary_get_uint32(dict, phyflags,
- bsc-sc_bge_flags))
- aprint_error(failed to get phyflags);
+ bsc-sc_bge_flags))
+ aprint_error_dev(self, failed to get phyflags);
} else if (device_is_a(parent, bnx)) {
bsc-sc_isbnx = true;
dict = device_properties(parent);
- prop_dictionary_get_uint32(dict, phyflags,
- bsc-sc_bnx_flags);
+ if (!prop_dictionary_get_uint32(dict, phyflags,
+ bsc-sc_bnx_flags))
+ aprint_error_dev(self, failed to get phyflags);
}
+
+ aprint_normal_dev(self, );
+ if ((sc-mii_capabilities BMSR_MEDIAMASK) == 0
+ (sc-mii_extcapabilities EXTSR_MEDIAMASK) == 0)
+ aprint_error(no media present);
+ else {
+ if (sc-mii_flags MIIF_HAVEFIBER) {
+ sc-mii_flags |= MIIF_NOISOLATE | MIIF_NOLOOP;
+
+ /*
+ * Set the proper bits for capabilities so that the
+ * correct media get selected by mii_phy_add_media()
+ */
+ sc-mii_capabilities |= BMSR_ANEG;
+ sc-mii_capabilities = ~BMSR_100T4;
+ sc-mii_extcapabilities |= EXTSR_1000XFDX;
+
+ if (bsc-sc_isbnx) {
+/*
+ * 2.5Gb support is a software enabled feature
+ * on the BCM5708S and BCM5709S controllers.
+ */
+#define ADD(m, c) ifmedia_add(mii-mii_media, (m), (c), NULL)
+if (bsc-sc_bnx_flags
+ BNX_PHY_2_5G_CAPABLE_FLAG) {
+ ADD(IFM_MAKEWORD(IFM_ETHER, IFM_2500_SX,
+ IFM_FDX, sc-mii_inst), 0);
+ aprint_normal(2500baseSX-FDX, );
+#undef ADD
+}
+ }
+ }
+ mii_phy_add_media(sc);
+ }
+ aprint_normal(\n);
+
}
static int
@@ -399,14 +430,13 @@
{
struct mii_data *mii = sc-mii_pdata;
struct ifmedia_entry *ife = mii-mii_media.ifm_cur;
- int bmcr, auxsts, gtsr;
+ int bmcr, bmsr, auxsts, gtsr;
mii-mii_media_status = IFM_AVALID;
mii-mii_media_active = IFM_ETHER;
- auxsts = PHY_READ(sc, BRGPHY_MII_AUXSTS);
-
- if (auxsts BRGPHY_AUXSTS_LINK)
+ bmsr = PHY_READ(sc, MII_BMSR) | PHY_READ(sc, MII_BMSR);
+ if (bmsr BMSR_LINK)
mii-mii_media_status |= IFM_ACTIVE;
bmcr = PHY_READ(sc, MII_BMCR);
@@ -424,53 +454,95 @@
* The media status bits are only valid of autonegotiation
* has completed (or it's disabled).
*/
- if ((auxsts BRGPHY_AUXSTS_ACOMP) == 0) {
+ if ((bmsr BMSR_ACOMP) == 0) {
/* Erg, still trying, I guess... */
mii-mii_media_active |= IFM_NONE;
return;
}
- switch (auxsts
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: christos
Date: Thu Dec 9 23:33:30 UTC 2010
Modified Files:
src/sys/dev/ic: vga.c vgavar.h
Log Message:
PR/41415: IdOp: Implement save and restore palette for vga.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/ic/vgavar.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/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.105 src/sys/dev/ic/vga.c:1.106
--- src/sys/dev/ic/vga.c:1.105 Tue Oct 19 18:27:54 2010
+++ src/sys/dev/ic/vga.c Thu Dec 9 18:33:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.105 2010/10/19 22:27:54 jmcneill Exp $ */
+/* $NetBSD: vga.c,v 1.106 2010/12/09 23:33:30 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.105 2010/10/19 22:27:54 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.106 2010/12/09 23:33:30 christos Exp $);
/* for WSCONS_SUPPORT_PCVTFONTS */
#include opt_wsdisplay_compat.h
@@ -101,7 +101,6 @@
/* videostate */
struct egavga_font *fontset1, *fontset2;
/* font data */
- /* palette */
int mindispoffset, maxdispoffset;
int vga_rollover;
@@ -526,7 +525,7 @@
vga_init(struct vga_config *vc, bus_space_tag_t iot, bus_space_tag_t memt)
{
struct vga_handle *vh = vc-hdl;
- u_int8_t mor;
+ uint8_t mor;
int i;
vh-vh_iot = iot;
@@ -536,7 +535,7 @@
panic(vga_init: couldn't map vga io);
/* read misc output register */
- mor = bus_space_read_1(vh-vh_iot, vh-vh_ioh_vga, VGA_MISC_DATAR);
+ mor = vga_raw_read(vh, VGA_MISC_DATAR);
vh-vh_mono = !(mor 1);
if (bus_space_map(vh-vh_iot, (vh-vh_mono ? 0x3b0 : 0x3d0), 0x10, 0,
@@ -589,6 +588,7 @@
if (!vh-vh_mono (u_int)WSDISPLAY_BORDER_COLOR sizeof(fgansitopc))
_vga_attr_write(vh, VGA_ATC_OVERSCAN,
fgansitopc[WSDISPLAY_BORDER_COLOR]);
+ vga_save_palette(vc);
}
void
@@ -781,6 +781,11 @@
const struct vga_funcs *vf = vc-vc_funcs;
switch (cmd) {
+ case WSDISPLAYIO_SMODE:
+ if (*(u_int *)data == WSDISPLAYIO_MODE_EMUL)
+ vga_restore_palette(vc);
+ return 0;
+
case WSDISPLAYIO_GTYPE:
*(int *)data = vc-vc_type;
return 0;
@@ -1037,7 +1042,7 @@
}
vga_setfont(vc, scr);
- /* XXX swich colours! */
+ vga_restore_palette(vc);
scr-pcs.visibleoffset = scr-pcs.dispoffset = scr-mindispoffset;
if (!oldscr || (scr-pcs.dispoffset != oldscr-pcs.dispoffset)) {
@@ -1173,7 +1178,7 @@
#ifdef WSCONS_SUPPORT_PCVTFONTS
#define NOTYET 0x
-static const u_int16_t pcvt_unichars[0xa0] = {
+static const uint16_t pcvt_unichars[0xa0] = {
/* 0 */ _e006U, /* N/L control */
NOTYET, NOTYET, NOTYET, NOTYET, NOTYET, NOTYET, NOTYET,
NOTYET,
@@ -1444,7 +1449,7 @@
{
struct vga_handle *vh = vc-hdl;
u_int idx;
- u_int8_t value;
+ uint8_t value;
if (vh-vh_mono)
return ENODEV;
@@ -1486,3 +1491,40 @@
vga_6845_write(sc-sc_vc-hdl, curend, 0x00);
#endif
}
+
+void
+vga_save_palette(struct vga_config *vc)
+{
+ struct vga_handle *vh = vc-hdl;
+ size_t i;
+ uint8_t *palette = vc-palette;
+
+ if (vh-vh_mono)
+ return;
+
+ vga_raw_write(vh, VGA_DAC_PELMASK, 0xff);
+ vga_raw_write(vh, VGA_DAC_ADDRR, 0x00);
+ for (i = 0; i sizeof(vc-palette); i++)
+ *palette++ = vga_raw_read(vh, VGA_DAC_PALETTE);
+
+ vga_raw_read(vh, 0x0a); /* reset flip/flop */
+}
+
+void
+vga_restore_palette(struct vga_config *vc)
+{
+ struct vga_handle *vh = vc-hdl;
+ size_t i;
+ uint8_t *palette = vc-palette;
+
+ if (vh-vh_mono)
+ return;
+
+ vga_raw_write(vh, VGA_DAC_PELMASK, 0xff);
+ vga_raw_write(vh, VGA_DAC_ADDRW, 0x00);
+ for (i = 0; i sizeof(vc-palette); i++)
+ vga_raw_write(vh, VGA_DAC_PALETTE, *palette++);
+
+ vga_raw_read(vh, 0x0a); /* reset flip/flop */
+ vga_enable(vh);
+}
Index: src/sys/dev/ic/vgavar.h
diff -u src/sys/dev/ic/vgavar.h:1.28 src/sys/dev/ic/vgavar.h:1.29
--- src/sys/dev/ic/vgavar.h:1.28 Fri Mar 14 18:12:08 2008
+++ src/sys/dev/ic/vgavar.h Thu Dec 9 18:33:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vgavar.h,v 1.28 2008/03/14 22:12:08 cube Exp $ */
+/* $NetBSD: vgavar.h,v 1.29 2010/12/09 23:33:30 christos Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -68,6 +68,7 @@
int vc_type;
const struct vga_funcs *vc_funcs;
+ u_int8_t palette[256 * 3];
#ifndef VGA_RASTERCONSOLE
int currentfontset1, currentfontset2;
int vc_nfontslots;
@@ -91,73 +92,81 @@
static __inline u_int8_t _vga_gdc_read(struct vga_handle *, int);
static __inline void _vga_gdc_write(struct vga_handle *, int, u_int8_t);
+#define vga_raw_read(vh, reg) \
+bus_space_read_1(vh-vh_iot, vh-vh_ioh_vga, reg)
+#define vga_raw_write(vh, reg, value) \
+bus_space_write_1(vh-vh_iot, vh-vh_ioh_vga, reg, value)
+
+#define vga_enable(vh) \
+vga_raw_write(vh, 0, 0x20)
+
+#define vga_reset_state(vh) \
+(void) bus_space_read_1(vh-vh_iot,
CVS commit: src/share/man/man4
Module Name:src Committed By: jym Date: Thu Dec 9 23:34:10 UTC 2010 Modified Files: src/share/man/man4: bnx.4 Log Message: Document BCM5709S support. While here, complete media types list. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/bnx.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/bnx.4 diff -u src/share/man/man4/bnx.4:1.2 src/share/man/man4/bnx.4:1.3 --- src/share/man/man4/bnx.4:1.2 Sun Dec 17 23:53:28 2006 +++ src/share/man/man4/bnx.4 Thu Dec 9 23:34:10 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: bnx.4,v 1.2 2006/12/17 23:53:28 wiz Exp $ +.\ $NetBSD: bnx.4,v 1.3 2010/12/09 23:34:10 jym Exp $ .\ $OpenBSD: bnx.4,v 1.13 2006/12/15 16:12:52 reyk Exp $ .\ .\ Copyright (c) 2006 Broadcom Corporation @@ -29,7 +29,7 @@ .\ .\ $FreeBSD: /repoman/r/ncvs/src/share/man/man4/bce.4,v 1.2 2006/04/10 20:12:17 brueffer Exp $ .\ -.Dd December 17, 2006 +.Dd December 10, 2010 .Dt BNX 4 .Os .Sh NAME @@ -42,7 +42,7 @@ The .Nm driver supports Broadcom's NetXtreme II product family, such as the -BCM5706 PCI-X and BCM5708 PCI Express Ethernet controllers, which +BCM5706 PCI-X and BCM5708-BCM5709 PCI Express Ethernet controllers, which includes the following: .Pp .Bl -bullet -compact @@ -51,6 +51,8 @@ .It Dell PowerEdge 2950 integrated BCM5708 NIC (10/100/1000baseT) .It +Dell PowerEdge M710 integrated BCM5709S NIC (1000baseSX) +.It HP NC370F PCI-X Multifunction Gigabit server adapter (1000baseSX) .It HP NC370T PCI-X Multifunction Gigabit server adapter (10/100/1000baseT) @@ -118,6 +120,18 @@ Only .Cm full-duplex mode is supported. +.It Cm 1000baseSX +Set 1000Mbps (Gigabit Ethernet) operation. +Both +.Cm full-duplex +and +.Cm half-duplex +modes are supported. +.It Cm 2500baseSX +Set 2500Mbps operation. +Only +.Cm full-duplex +mode is supported. .El .Pp The
CVS commit: src/share/man/man4
Module Name:src Committed By: jym Date: Thu Dec 9 23:35:25 UTC 2010 Modified Files: src/share/man/man4: brgphy.4 Log Message: BCM5700 family PHYs are also supported. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/brgphy.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/brgphy.4 diff -u src/share/man/man4/brgphy.4:1.2 src/share/man/man4/brgphy.4:1.3 --- src/share/man/man4/brgphy.4:1.2 Wed Apr 30 13:10:53 2008 +++ src/share/man/man4/brgphy.4 Thu Dec 9 23:35:24 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: brgphy.4,v 1.2 2008/04/30 13:10:53 martin Exp $ +.\ $NetBSD: brgphy.4,v 1.3 2010/12/09 23:35:24 jym Exp $ .\ .\ Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -28,7 +28,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 1, 2001 +.Dd December 10, 2010 .Dt BRGPHY 4 .Os .Sh NAME @@ -39,7 +39,8 @@ .Sh DESCRIPTION The .Nm -driver supports the Broadcom BCM5400-family Gigabit Ethernet PHYs. +driver supports the Broadcom BCM5400-family and BCM5700-family +Gigabit Ethernet PHYs. These PHYs are found on a variety of Gigabit Ethernet interfaces. .Sh SEE ALSO .Xr ifmedia 4 ,
CVS commit: src/doc
Module Name:src Committed By: jym Date: Thu Dec 9 23:40:12 UTC 2010 Modified Files: src/doc: CHANGES Log Message: BCM5709S support. To generate a diff of this commit: cvs rdiff -u -r1.1471 -r1.1472 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.1471 src/doc/CHANGES:1.1472 --- src/doc/CHANGES:1.1471 Mon Dec 6 18:43:47 2010 +++ src/doc/CHANGES Thu Dec 9 23:40:12 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1471 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1472 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -808,3 +808,4 @@ for the list of changes [christos 20101205] prenice(1): Add new command to change process priorities based upon the command name, like pkill(1) and pgrep(1). [mrg 20101205] + bnx(4): Add support for Broadcom BCM5709S (SerDes) chip. [jym 20101210]
CVS commit: src/sys/arch
Module Name:src
Committed By: macallan
Date: Fri Dec 10 00:17:08 UTC 2010
Modified Files:
src/sys/arch/mac68k/dev: akbd.c ams.c
src/sys/arch/macppc/dev: ams.c
Log Message:
return the right values for ioctl(WSKBDIO_GTYPE) and ioctl(WSMOUSEIO_GTYPE)
fixes PR 23991
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mac68k/dev/akbd.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mac68k/dev/ams.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/macppc/dev/ams.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/mac68k/dev/akbd.c
diff -u src/sys/arch/mac68k/dev/akbd.c:1.21 src/sys/arch/mac68k/dev/akbd.c:1.22
--- src/sys/arch/mac68k/dev/akbd.c:1.21 Sat Mar 10 16:35:14 2007
+++ src/sys/arch/mac68k/dev/akbd.c Fri Dec 10 00:17:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: akbd.c,v 1.21 2007/03/10 16:35:14 hauke Exp $ */
+/* $NetBSD: akbd.c,v 1.22 2010/12/10 00:17:08 macallan Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: akbd.c,v 1.21 2007/03/10 16:35:14 hauke Exp $);
+__KERNEL_RCSID(0, $NetBSD: akbd.c,v 1.22 2010/12/10 00:17:08 macallan Exp $);
#include opt_adb.h
@@ -464,7 +464,7 @@
switch (cmd) {
case WSKBDIO_GTYPE:
- *(int *)data = 0; /* XXX */
+ *(int *)data = WSKBD_TYPE_ADB;
return 0;
case WSKBDIO_SETLEDS:
return 0;
Index: src/sys/arch/mac68k/dev/ams.c
diff -u src/sys/arch/mac68k/dev/ams.c:1.19 src/sys/arch/mac68k/dev/ams.c:1.20
--- src/sys/arch/mac68k/dev/ams.c:1.19 Mon Mar 5 21:05:35 2007
+++ src/sys/arch/mac68k/dev/ams.c Fri Dec 10 00:17:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ams.c,v 1.19 2007/03/05 21:05:35 he Exp $ */
+/* $NetBSD: ams.c,v 1.20 2010/12/10 00:17:08 macallan Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ams.c,v 1.19 2007/03/05 21:05:35 he Exp $);
+__KERNEL_RCSID(0, $NetBSD: ams.c,v 1.20 2010/12/10 00:17:08 macallan Exp $);
#include sys/param.h
#include sys/device.h
@@ -522,7 +522,13 @@
int
ams_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l)
{
- return (EPASSTHROUGH);
+
+ switch (cmd) {
+ case WSMOUSEIO_GTYPE:
+ *(u_int *)data = WSMOUSE_TYPE_ADB;
+ break;
+ }
+ return EPASSTHROUGH;
}
void
Index: src/sys/arch/macppc/dev/ams.c
diff -u src/sys/arch/macppc/dev/ams.c:1.25 src/sys/arch/macppc/dev/ams.c:1.26
--- src/sys/arch/macppc/dev/ams.c:1.25 Mon Mar 5 10:47:06 2007
+++ src/sys/arch/macppc/dev/ams.c Fri Dec 10 00:17:08 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ams.c,v 1.25 2007/03/05 10:47:06 tsutsui Exp $ */
+/* $NetBSD: ams.c,v 1.26 2010/12/10 00:17:08 macallan Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ams.c,v 1.25 2007/03/05 10:47:06 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: ams.c,v 1.26 2010/12/10 00:17:08 macallan Exp $);
#include sys/param.h
#include sys/device.h
@@ -629,6 +629,12 @@
int
ams_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l)
{
+
+ switch (cmd) {
+ case WSMOUSEIO_GTYPE:
+ *(u_int *)data = WSMOUSE_TYPE_ADB;
+ break;
+ }
return EPASSTHROUGH;
}
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Fri Dec 10 00:31:27 UTC 2010 Modified Files: src/sys/arch/macppc/conf: GENERIC Log Message: fix some typos, new ADB is no longer experimental while there add some (S)ATA drivers from i386 which might be found on PCI cards To generate a diff of this commit: cvs rdiff -u -r1.283 -r1.284 src/sys/arch/macppc/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/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.283 src/sys/arch/macppc/conf/GENERIC:1.284 --- src/sys/arch/macppc/conf/GENERIC:1.283 Tue Nov 23 11:14:01 2010 +++ src/sys/arch/macppc/conf/GENERIC Fri Dec 10 00:31:26 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.283 2010/11/23 11:14:01 hannken Exp $ +# $NetBSD: GENERIC,v 1.284 2010/12/10 00:31:26 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.283 $ +#ident GENERIC-$Revision: 1.284 $ maxusers 32 @@ -303,16 +303,19 @@ pciide* at pci? dev ? function ? flags 0x # GENERIC pciide driver acardide* at pci? dev ? function ? # Acard IDE controllers aceride* at pci? dev ? function ? # Acer Lab IDE controllers +ahcisata* at pci? dev ? function ? # AHCI SATA controllers artsata* at pci? dev ? function ? # Intel i31244 SATA controller cmdide* at pci? dev ? function ? # CMD tech IDE controllers cypide* at pci? dev ? function ? # Cypress IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers +iteide* at pci? dev ? function ? # IT Express IDE controllers optiide* at pci? dev ? function ? # Opti IDE controllers pdcide* at pci? dev ? function ? # Promise IDE controllers pdcsata* at pci? dev ? function ? # Promise SATA150 controllers satalink* at pci? dev ? function ? # SiI SATALink controllers siside* at pci? dev ? function ? # SiS IDE controllers slide* at pci? dev ? function ? # Symphony Labs IDE controllers +stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers wdc* at pci? dev ? function ? # Kauai ATA cbb* at pci? dev ? function ? # PCI-CardBus bridge @@ -368,7 +371,7 @@ #ams* at adb?# ADB mouse #abtn* at adb? -# the new, improved, experimental ADB subsystem +# the new, improved ADB subsystem cuda* at obio? # CUDA, for Old World PowerMacs pmu* at obio? # PMU, *Books and newer PowerMacs @@ -381,7 +384,7 @@ wsmouse* at wsmousedev? battery* at pmu? # legacy battery, for ohare-based PowerBooks -smartbat* at pmu? # Smart battery, sound in newer *Books +smartbat* at pmu? # Smart battery, found in newer *Books iic0 at cuda0 # CUDA's IIC bus sgsmix0 at iic0 addr 0x8a # additional mixer found in beige G3
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: macallan Date: Fri Dec 10 00:36:03 UTC 2010 Modified Files: src/sys/arch/macppc/conf: GENERIC Log Message: add rum* at uhub? since it was confirmed working a while ago To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/sys/arch/macppc/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/macppc/conf/GENERIC diff -u src/sys/arch/macppc/conf/GENERIC:1.284 src/sys/arch/macppc/conf/GENERIC:1.285 --- src/sys/arch/macppc/conf/GENERIC:1.284 Fri Dec 10 00:31:26 2010 +++ src/sys/arch/macppc/conf/GENERIC Fri Dec 10 00:36:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.284 2010/12/10 00:31:26 macallan Exp $ +# $NetBSD: GENERIC,v 1.285 2010/12/10 00:36:03 macallan Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.284 $ +#ident GENERIC-$Revision: 1.285 $ maxusers 32 @@ -514,6 +514,7 @@ # USB 802.11 adapters atu* at uhub? port ? # Atmel at76c50x 802.11b ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g +rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g #zyd* at uhub? port ? # Zydas ZD1211 # PCI IEEE1394 controllers
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: sjg Date: Fri Dec 10 00:36:33 UTC 2010 Modified Files: src/usr.bin/make/unit-tests: Makefile Log Message: Need to export LC_ALL=C too To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/make/unit-tests/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.28 src/usr.bin/make/unit-tests/Makefile:1.29 --- src/usr.bin/make/unit-tests/Makefile:1.28 Thu Apr 22 21:41:11 2010 +++ src/usr.bin/make/unit-tests/Makefile Fri Dec 10 00:36:33 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2010/04/22 21:41:11 sjg Exp $ +# $NetBSD: Makefile,v 1.29 2010/12/10 00:36:33 sjg Exp $ # # Unit tests for make(1) # The main targets are: @@ -59,8 +59,9 @@ TOOL_SED?= sed # ensure consistent results from sort(1) +LC_ALL = C LANG= C -.export LANG +.export LANG LC_ALL # The driver. # We always pretend .MAKE was called 'make'
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: sjg Date: Fri Dec 10 00:37:24 UTC 2010 Modified Files: src/usr.bin/make/unit-tests: Makefile Log Message: fix style To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.bin/make/unit-tests/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/unit-tests/Makefile diff -u src/usr.bin/make/unit-tests/Makefile:1.29 src/usr.bin/make/unit-tests/Makefile:1.30 --- src/usr.bin/make/unit-tests/Makefile:1.29 Fri Dec 10 00:36:33 2010 +++ src/usr.bin/make/unit-tests/Makefile Fri Dec 10 00:37:23 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2010/12/10 00:36:33 sjg Exp $ +# $NetBSD: Makefile,v 1.30 2010/12/10 00:37:23 sjg Exp $ # # Unit tests for make(1) # The main targets are: @@ -59,7 +59,7 @@ TOOL_SED?= sed # ensure consistent results from sort(1) -LC_ALL = C +LC_ALL= C LANG= C .export LANG LC_ALL
CVS commit: src/sys/dev/ic
Module Name:src Committed By: matt Date: Fri Dec 10 00:38:49 UTC 2010 Modified Files: src/sys/dev/ic: cpc700.c Log Message: When attaching a PCI bus, the pci chipset is not optional. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/ic/cpc700.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/ic/cpc700.c diff -u src/sys/dev/ic/cpc700.c:1.16 src/sys/dev/ic/cpc700.c:1.17 --- src/sys/dev/ic/cpc700.c:1.16 Tue May 12 14:25:17 2009 +++ src/sys/dev/ic/cpc700.c Fri Dec 10 00:38:49 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpc700.c,v 1.16 2009/05/12 14:25:17 cegger Exp $ */ +/* $NetBSD: cpc700.c,v 1.17 2010/12/10 00:38:49 matt Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -50,7 +50,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cpc700.c,v 1.16 2009/05/12 14:25:17 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: cpc700.c,v 1.17 2010/12/10 00:38:49 matt Exp $); #include pci.h #include opt_pci.h @@ -173,7 +173,7 @@ aa.pba.pba_iot = pciio; aa.pba.pba_memt = mem; aa.pba.pba_dmat = dma; - aa.pba.pba_pc = 0; + aa.pba.pba_pc = pc; aa.pba.pba_flags = PCI_FLAGS_MEM_ENABLED | PCI_FLAGS_IO_ENABLED; aa.pba.pba_bus = 0;
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: bsh Date: Fri Dec 10 02:06:23 UTC 2010 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_armv6.S Log Message: fix a LINTSTUB To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/cpufunc_asm_armv6.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm/cpufunc_asm_armv6.S diff -u src/sys/arch/arm/arm/cpufunc_asm_armv6.S:1.3 src/sys/arch/arm/arm/cpufunc_asm_armv6.S:1.4 --- src/sys/arch/arm/arm/cpufunc_asm_armv6.S:1.3 Sat Jun 19 19:44:57 2010 +++ src/sys/arch/arm/arm/cpufunc_asm_armv6.S Fri Dec 10 02:06:22 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc_asm_armv6.S,v 1.3 2010/06/19 19:44:57 matt Exp $ */ +/* $NetBSD: cpufunc_asm_armv6.S,v 1.4 2010/12/10 02:06:22 bsh Exp $ */ /* * Copyright (c) 2002, 2005 ARM Limited @@ -83,7 +83,7 @@ mcr p15, 0, r0, c7, c10, 4 /* drain the write buffer */ RET -/* LINTSTUB: void armv6_icache_sync_range(vaddr_t, vsize_t); */ +/* LINTSTUB: void armv6_dcache_wb_range(vaddr_t, vsize_t); */ ENTRY(armv6_dcache_wb_range) add r1, r1, r0 sub r1, r1, #1
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri Dec 10 07:23:46 UTC 2010 Modified Files: src/doc: 3RDPARTY Log Message: binutils-2.21 out. To generate a diff of this commit: cvs rdiff -u -r1.792 -r1.793 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.792 src/doc/3RDPARTY:1.793 --- src/doc/3RDPARTY:1.792 Sun Dec 5 05:15:59 2010 +++ src/doc/3RDPARTY Fri Dec 10 07:23:46 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.792 2010/12/05 05:15:59 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.793 2010/12/10 07:23:46 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -132,7 +132,7 @@ Package: binutils Version: 2.16.1 -Current Vers: 2.20.1 +Current Vers: 2.21 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/binutils/ Home Page: http://www.gnu.org/software/binutils/
