CVS commit: src/usr.bin/progress
Module Name:src
Committed By: gson
Date: Sat Jan 17 10:57:51 UTC 2015
Modified Files:
src/usr.bin/progress: progress.c
Log Message:
Retry read() on EINTR. Fixes premature exit of
/dev/null
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/progress/progress.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/progress/progress.c
diff -u src/usr.bin/progress/progress.c:1.20 src/usr.bin/progress/progress.c:1.21
--- src/usr.bin/progress/progress.c:1.20 Wed Jun 27 22:07:36 2012
+++ src/usr.bin/progress/progress.c Sat Jan 17 10:57:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: progress.c,v 1.20 2012/06/27 22:07:36 riastradh Exp $ */
+/* $NetBSD: progress.c,v 1.21 2015/01/17 10:57:51 gson Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.20 2012/06/27 22:07:36 riastradh Exp $");
+__RCSID("$NetBSD: progress.c,v 1.21 2015/01/17 10:57:51 gson Exp $");
#endif/* not lint */
#include
@@ -228,7 +228,12 @@ main(int argc, char *argv[])
signal(SIGPIPE, broken_pipe);
progressmeter(-1);
- while ((nr = read(fd, fb_buf, buffersize)) > 0)
+ while (1) {
+ do {
+ nr = read(fd, fb_buf, buffersize);
+ } while (nr < 0 && errno == EINTR);
+ if (nr <= 0)
+ break;
for (off = 0; nr; nr -= nw, off += nw, bytes += nw)
if ((nw = write(outpipe[1], fb_buf + off,
(size_t) nr)) < 0) {
@@ -236,6 +241,7 @@ main(int argc, char *argv[])
err(1, "writing %u bytes to output pipe",
(unsigned) nr);
}
+ }
close(outpipe[1]);
gzipstat = 0;
CVS commit: [netbsd-7] src/distrib/sets/lists/debug
Module Name:src Committed By: martin Date: Sat Jan 17 11:16:39 UTC 2015 Modified Files: src/distrib/sets/lists/debug [netbsd-7]: ad.aarch64 shl.mi Log Message: Fix minor glitch in pullup of ticket #419, pointed out by htodd@ To generate a diff of this commit: cvs rdiff -u -r1.2.2.3 -r1.2.2.4 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.71.2.7 -r1.71.2.8 src/distrib/sets/lists/debug/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/debug/ad.aarch64 diff -u src/distrib/sets/lists/debug/ad.aarch64:1.2.2.3 src/distrib/sets/lists/debug/ad.aarch64:1.2.2.4 --- src/distrib/sets/lists/debug/ad.aarch64:1.2.2.3 Fri Jan 16 08:24:51 2015 +++ src/distrib/sets/lists/debug/ad.aarch64 Sat Jan 17 11:16:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.2.2.3 2015/01/16 08:24:51 martin Exp $ +# $NetBSD: ad.aarch64,v 1.2.2.4 2015/01/17 11:16:39 martin Exp $ -./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetmask.debug -./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetround.debug ./usr/lib/eabi/libcrypto_g.a comp-c-debuglib compat,crypto,debuglib @@ -221,7 +221,7 @@ #./usr/libdata/debug/usr/lib/eabihf/libc.so.12.193.debug comp-sys-debug debug,compat #./usr/libdata/debug/usr/lib/eabihf/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug #./usr/libdata/debug/usr/lib/eabihf/libcrypt.so.1.0.debug comp-sys-debug debug,compat -#./usr/libdata/debug/usr/lib/eabihf/libcrypto.so.8.3.debug comp-crypto-debug crypto,debug,compat +#./usr/libdata/debug/usr/lib/eabihf/libcrypto.so.8.4.debug comp-crypto-debug crypto,debug,compat #./usr/libdata/debug/usr/lib/eabihf/libcrypto_rc5.so.7.0.debug comp-crypto-debug crypto,crypto_rc5,debug,compat #./usr/libdata/debug/usr/lib/eabihf/libctf.so.2.0.debug comp-sys-debug dtrace,debug,compat #./usr/libdata/debug/usr/lib/eabihf/libcurses.so.7.0.debug comp-sys-debug debug,compat Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.71.2.7 src/distrib/sets/lists/debug/shl.mi:1.71.2.8 --- src/distrib/sets/lists/debug/shl.mi:1.71.2.7 Fri Jan 16 08:24:51 2015 +++ src/distrib/sets/lists/debug/shl.mi Sat Jan 17 11:16:39 2015 @@ -1,7 +1,7 @@ -# $NetBSD: shl.mi,v 1.71.2.7 2015/01/16 08:24:51 martin Exp $ +# $NetBSD: shl.mi,v 1.71.2.8 2015/01/17 11:16:39 martin Exp $ ./usr/libdata/debug/lib/libc.so.12.193.debug comp-sys-debug debug ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug -./usr/libdata/debug/lib/libcrypto.so.8.3.debug comp-sys-debug debug +./usr/libdata/debug/lib/libcrypto.so.8.4.debug comp-sys-debug debug ./usr/libdata/debug/lib/libdevmapper.so.1.0.debug comp-sys-debug debug ./usr/libdata/debug/lib/libdm.so.0.0.debug comp-sys-debug debug,obsolete ./usr/libdata/debug/lib/libedit.so.3.1.debug comp-sys-debug debug
CVS commit: src/external/bsd/ipf/bin/ipftest
Module Name:src Committed By: martin Date: Sat Jan 17 11:25:30 UTC 2015 Modified Files: src/external/bsd/ipf/bin/ipftest: Makefile Log Message: Do not compile md5.c (while usning system md5.h headers) - instead just use the libc version. Patch from Yasushi Oshima in PR bin/49580. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/bin/ipftest/Makefile 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/ipf/bin/ipftest/Makefile diff -u src/external/bsd/ipf/bin/ipftest/Makefile:1.2 src/external/bsd/ipf/bin/ipftest/Makefile:1.3 --- src/external/bsd/ipf/bin/ipftest/Makefile:1.2 Sat Mar 24 00:32:50 2012 +++ src/external/bsd/ipf/bin/ipftest/Makefile Sat Jan 17 11:25:30 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2012/03/24 00:32:50 matt Exp $ +# $NetBSD: Makefile,v 1.3 2015/01/17 11:25:30 martin Exp $ .include @@ -7,7 +7,7 @@ SRCS= ipftest.c fil.c ip_frag.c ip_stat ip_proxy.c ip_auth.c ip_htable.c ip_lookup.c \ ip_dstlist.c ip_pool.c ip_sync.c \ ip_fil.c ip_log.c ippool_y.c ippool_l.c ipf_y.c \ - ipf_l.c ipnat_y.c ipnat_l.c md5.c radix_ipf.c bpf_filter.c + ipf_l.c ipnat_y.c ipnat_l.c radix_ipf.c bpf_filter.c MAN= ipftest.1 CPPFLAGS+= -DIPFILTER_LOG -DIPFILTER_LOOKUP \
CVS commit: [netbsd-7] src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Sat Jan 17 11:44:34 UTC 2015 Modified Files: src/distrib/sets/lists/xdebug [netbsd-7]: mi Log Message: Pull up following revision(s) (requested by bouyer in ticket #421): distrib/sets/lists/xdebug/mi: revision 1.11 fix sets. To generate a diff of this commit: cvs rdiff -u -r1.8.4.1 -r1.8.4.2 src/distrib/sets/lists/xdebug/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/xdebug/mi diff -u src/distrib/sets/lists/xdebug/mi:1.8.4.1 src/distrib/sets/lists/xdebug/mi:1.8.4.2 --- src/distrib/sets/lists/xdebug/mi:1.8.4.1 Mon Jan 5 21:23:50 2015 +++ src/distrib/sets/lists/xdebug/mi Sat Jan 17 11:44:34 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.8.4.1 2015/01/05 21:23:50 martin Exp $ +# $NetBSD: mi,v 1.8.4.2 2015/01/17 11:44:34 martin Exp $ ./etc/mtree/set.xdebug comp-sys-root ./usr/X11R6/lib/libFS_g.a-unknown- debuglib,x11 ./usr/X11R6/lib/libGLU_g.a-unknown- debuglib,x11 @@ -53,7 +53,7 @@ ./usr/X11R7/lib/libGLw_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/libICE_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/libOSMesa_g.a-unknown- obsolete -./usr/X11R7/lib/libglapi.a-unknown- debuglib,xorg +./usr/X11R7/lib/libglapi_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/libSM_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/libX11-xcb_g.a-unknown- debuglib,xorg ./usr/X11R7/lib/libX11_g.a-unknown- debuglib,xorg
CVS commit: [netbsd-7] src/lib/libperfuse
Module Name:src
Committed By: martin
Date: Sat Jan 17 11:47:27 UTC 2015
Modified Files:
src/lib/libperfuse [netbsd-7]: ops.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #422):
lib/libperfuse/ops.c: revision 1.82
Fix atime update
FUSE filesystems assume that SETATTR with atime is the result of utiimes()
being called. As a result, atime and mtime will be updated. This happens
with MooseFS and glusterFS. atime is supposed to be updated by the
filesystem itself when it gets read operations.
We fix the problem in SETATTR operations by
1) do not create a mtime update when we have an atime update (and vice
versa), just fill the fields to avoid the filesystem restting the
missing field to Epoch, but do not pretend we want to update it.
2) If the change is limited to atime, iscard it, as updates should be
done by READ operations
3) Kernel part of PUFFS has been fixed to make sure reads on empty file
are sent to the filesystem:
http://mail-index.netbsd.org/source-changes/2015/01/13/msg062364.html
Thanks to Tom Ivar Helbekkmo for reporting this issue.
To generate a diff of this commit:
cvs rdiff -u -r1.66.2.13 -r1.66.2.14 src/lib/libperfuse/ops.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/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.66.2.13 src/lib/libperfuse/ops.c:1.66.2.14
--- src/lib/libperfuse/ops.c:1.66.2.13 Fri Nov 14 15:06:36 2014
+++ src/lib/libperfuse/ops.c Sat Jan 17 11:47:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.66.2.13 2014/11/14 15:06:36 martin Exp $ */
+/* $NetBSD: ops.c,v 1.66.2.14 2015/01/17 11:47:27 martin Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -1785,30 +1785,27 @@ perfuse_node_setattr_ttl(struct puffs_us
}
/*
- * Setting mtime without atime or vice versa leads to
- * dates being reset to Epoch on glusterfs. If one
- * is missing, use the old value.
+ * When not sending a time field, still fill with
+ * current value, as the filesystem may just reset
+ * the field to Epoch even if fsi->valid bit is
+ * not set (GlusterFS does that).
*/
- if ((vap->va_mtime.tv_sec != (time_t)PUFFS_VNOVAL) ||
- (vap->va_atime.tv_sec != (time_t)PUFFS_VNOVAL)) {
-
- if (vap->va_atime.tv_sec != (time_t)PUFFS_VNOVAL) {
- fsi->atime = vap->va_atime.tv_sec;
- fsi->atimensec = (uint32_t)vap->va_atime.tv_nsec;
- } else {
- fsi->atime = old_va->va_atime.tv_sec;
- fsi->atimensec = (uint32_t)old_va->va_atime.tv_nsec;
- }
-
- if (vap->va_mtime.tv_sec != (time_t)PUFFS_VNOVAL) {
- fsi->mtime = vap->va_mtime.tv_sec;
- fsi->mtimensec = (uint32_t)vap->va_mtime.tv_nsec;
- } else {
- fsi->mtime = old_va->va_mtime.tv_sec;
- fsi->mtimensec = (uint32_t)old_va->va_mtime.tv_nsec;
- }
+ if (vap->va_atime.tv_sec != (time_t)PUFFS_VNOVAL) {
+ fsi->atime = vap->va_atime.tv_sec;
+ fsi->atimensec = (uint32_t)vap->va_atime.tv_nsec;
+ fsi->valid |= FUSE_FATTR_ATIME;
+ } else {
+ fsi->atime = old_va->va_atime.tv_sec;
+ fsi->atimensec = (uint32_t)old_va->va_atime.tv_nsec;
+ }
- fsi->valid |= (FUSE_FATTR_MTIME|FUSE_FATTR_ATIME);
+ if (vap->va_mtime.tv_sec != (time_t)PUFFS_VNOVAL) {
+ fsi->mtime = vap->va_mtime.tv_sec;
+ fsi->mtimensec = (uint32_t)vap->va_mtime.tv_nsec;
+ fsi->valid |= FUSE_FATTR_MTIME;
+ } else {
+ fsi->mtime = old_va->va_mtime.tv_sec;
+ fsi->mtimensec = (uint32_t)old_va->va_mtime.tv_nsec;
}
if (vap->va_mode != (mode_t)PUFFS_VNOVAL) {
@@ -1851,6 +1848,14 @@ perfuse_node_setattr_ttl(struct puffs_us
fsi->mtimensec = 0;
fsi->valid &= ~(FUSE_FATTR_ATIME|FUSE_FATTR_MTIME);
}
+
+ /*
+ * If only atime is changed, discard the operation: it
+ * happens after read, and in that case the filesystem
+ * already updaed atime. NB: utimes() also change mtime.
+ */
+ if (fsi->valid == FUSE_FATTR_ATIME)
+ fsi->valid &= ~FUSE_FATTR_ATIME;
/*
* If nothing remain, discard the operation.
CVS commit: [netbsd-7] src/sys/fs/puffs
Module Name:src
Committed By: martin
Date: Sat Jan 17 11:49:09 UTC 2015
Modified Files:
src/sys/fs/puffs [netbsd-7]: puffs_vnops.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #423):
sys/fs/puffs/puffs_vnops.c: revision 1.199
Make sure reads on empty files reach PUFFS filesystems
Sending a read through the page cache will get the operation
short-circuited. This is a problem with some filesystems that
expect to receive the read operation in order to update atime.
We fix that by bypassing the page cache when reading a file
wich a size known to be zero.
To generate a diff of this commit:
cvs rdiff -u -r1.182.2.11 -r1.182.2.12 src/sys/fs/puffs/puffs_vnops.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/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.182.2.11 src/sys/fs/puffs/puffs_vnops.c:1.182.2.12
--- src/sys/fs/puffs/puffs_vnops.c:1.182.2.11 Sun Nov 9 10:09:32 2014
+++ src/sys/fs/puffs/puffs_vnops.c Sat Jan 17 11:49:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.182.2.11 2014/11/09 10:09:32 msaitoh Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.182.2.12 2015/01/17 11:49:09 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.182.2.11 2014/11/09 10:09:32 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.182.2.12 2015/01/17 11:49:09 martin Exp $");
#include
#include
@@ -2279,9 +2279,17 @@ puffs_vnop_read(void *v)
if (uio->uio_offset < 0)
return EFBIG;
+ /*
+ * On the case of reading empty files and (vp->v_size != 0) below:
+ * some filesystems (hint: FUSE and distributed filesystems) still
+ * expect to get the READ in order to update atime. Reading through
+ * the case filters empty files, therefore we prefer to bypass the
+ * cache here.
+ */
if (vp->v_type == VREG &&
PUFFS_USE_PAGECACHE(pmp) &&
- !(pn->pn_stat & PNODE_RDIRECT)) {
+ !(pn->pn_stat & PNODE_RDIRECT) &&
+ (vp->v_size != 0)) {
const int advice = IO_ADV_DECODE(ap->a_ioflag);
while (uio->uio_resid > 0) {
CVS commit: [netbsd-7] src/tests/fs/vfs
Module Name:src
Committed By: martin
Date: Sat Jan 17 11:51:33 UTC 2015
Modified Files:
src/tests/fs/vfs [netbsd-7]: t_vnops.c
Log Message:
Pull up following revision(s) (requested by gson in ticket #424):
tests/fs/vfs/t_vnops.c: revision 1.41
Mark udf_lookup_complex as an expected failure, referencing PR kern/49033.
Since it does not fail reliably, force it to fail to avoid spurious failure
reports due to unexpected success.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.2.1 src/tests/fs/vfs/t_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/vfs/t_vnops.c
diff -u src/tests/fs/vfs/t_vnops.c:1.40 src/tests/fs/vfs/t_vnops.c:1.40.2.1
--- src/tests/fs/vfs/t_vnops.c:1.40 Fri Jul 25 12:16:22 2014
+++ src/tests/fs/vfs/t_vnops.c Sat Jan 17 11:51:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: t_vnops.c,v 1.40 2014/07/25 12:16:22 martin Exp $ */
+/* $NetBSD: t_vnops.c,v 1.40.2.1 2015/01/17 11:51:33 martin Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -87,6 +87,9 @@ lookup_complex(const atf_tc_t *tc, const
USES_DIRS;
+ if (FSTYPE_UDF(tc))
+ atf_tc_expect_fail("PR kern/49033");
+
sprintf(pb, "%s/dir", mountpath);
if (rump_sys_mkdir(pb, 0777) == -1)
atf_tc_fail_errno("mkdir");
@@ -129,6 +132,9 @@ lookup_complex(const atf_tc_t *tc, const
atf_tc_fail("stat results differ, see ouput for more details");
}
+ if (FSTYPE_UDF(tc))
+ atf_tc_fail("random failure of PR kern/49033 "
+ "did not happen this time");
}
static void
CVS commit: [netbsd-7] src/sys/arch/i386/stand/boot
Module Name:src
Committed By: martin
Date: Sat Jan 17 12:01:37 UTC 2015
Modified Files:
src/sys/arch/i386/stand/boot [netbsd-7]: boot2.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #426):
sys/arch/i386/stand/boot/boot2.c: revision 1.64
Restore previous behavior: "boot -s" == "boot netbsd -s"
Instead of ignoring the flags and doing the default boot. Merge some
extraneous code.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/arch/i386/stand/boot/boot2.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/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.63 src/sys/arch/i386/stand/boot/boot2.c:1.63.2.1
--- src/sys/arch/i386/stand/boot/boot2.c:1.63 Sat Jun 28 09:16:18 2014
+++ src/sys/arch/i386/stand/boot/boot2.c Sat Jan 17 12:01:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.63 2014/06/28 09:16:18 rtr Exp $ */
+/* $NetBSD: boot2.c,v 1.63.2.1 2015/01/17 12:01:37 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -111,7 +111,7 @@ static int default_unit, default_partiti
static const char *default_filename;
char *sprint_bootsel(const char *);
-void bootit(const char *, int, int);
+static void bootit(const char *, int);
void print_banner(void);
void boot2(int, uint64_t);
@@ -244,16 +244,12 @@ clearit(void)
clear_pc_screen();
}
-void
-bootit(const char *filename, int howto, int tell)
+static void
+bootit(const char *filename, int howto)
{
-
- if (tell) {
- printf("booting %s", sprint_bootsel(filename));
- if (howto)
- printf(" (howto 0x%x)", howto);
- printf("\n");
- }
+ if (howto & AB_VERBOSE)
+ printf("booting %s (howto 0x%x)\n", sprint_bootsel(filename),
+ howto);
if (exec_netbsd(filename, 0, howto, boot_biosdev < 0x80, clearit) < 0)
printf("boot: %s: %s\n", sprint_bootsel(filename),
@@ -389,9 +385,9 @@ boot2(int biosdev, uint64_t biossector)
* try pairs of names[] entries, foo and foo.gz
*/
/* don't print "booting..." again */
- bootit(names[currname][0], 0, 0);
+ bootit(names[currname][0], 0);
/* since it failed, try compressed bootfile. */
- bootit(names[currname][1], 0, 1);
+ bootit(names[currname][1], AB_VERBOSE);
}
bootmenu(); /* does not return */
@@ -451,23 +447,23 @@ void
command_boot(char *arg)
{
char *filename;
- int howto, tell;
+ int howto;
if (!parseboot(arg, &filename, &howto))
return;
- tell = ((howto & AB_VERBOSE) != 0);
if (filename != NULL) {
- bootit(filename, howto, tell);
+ bootit(filename, howto);
} else {
int i;
#ifndef SMALL
- bootdefault();
+ if (howto == 0)
+ bootdefault();
#endif
for (i = 0; i < NUMNAMES; i++) {
- bootit(names[i][0], howto, tell);
- bootit(names[i][1], howto, tell);
+ bootit(names[i][0], howto);
+ bootit(names[i][1], howto);
}
}
}
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Sat Jan 17 12:10:56 UTC 2015 Modified Files: src/distrib/sets/lists/comp [netbsd-7]: mi src/share/man/man9 [netbsd-7]: Makefile malloc.9 src/sys/compat/common [netbsd-7]: compat_util.c if_43.c kern_time_50.c uipc_syscalls_43.c src/sys/compat/freebsd [netbsd-7]: freebsd_exec_elf32.c freebsd_file.c freebsd_ipc.c freebsd_misc.c src/sys/compat/linux/arch/alpha [netbsd-7]: linux_machdep.c linux_pipe.c src/sys/compat/linux/arch/arm [netbsd-7]: linux_machdep.c linux_ptrace.c src/sys/compat/linux/arch/i386 [netbsd-7]: linux_machdep.c linux_ptrace.c src/sys/compat/linux/arch/mips [netbsd-7]: linux_machdep.c linux_ptrace.c src/sys/compat/linux/arch/powerpc [netbsd-7]: linux_machdep.c linux_ptrace.c src/sys/compat/linux/common [netbsd-7]: linux_exec.c linux_exec_aout.c linux_fadvise64.c linux_fadvise64_64.c linux_file.c linux_llseek.c linux_misc_notalpha.c linux_pipe.c linux_sched.c linux_signal.c linux_socket.c linux_socketcall.c linux_uselib.c src/sys/compat/linux32/common [netbsd-7]: linux32_misc.c src/sys/compat/svr4 [netbsd-7]: svr4_exec_elf32.c svr4_exec_elf64.c svr4_fcntl.c svr4_filio.c svr4_ioctl.c svr4_ipc.c svr4_schedctl.c svr4_signal.c svr4_sockio.c svr4_termios.c svr4_ttold.c src/sys/fs/cd9660 [netbsd-7]: cd9660_node.c cd9660_util.c src/sys/fs/puffs [netbsd-7]: puffs_compat.c puffs_msgif.c puffs_node.c puffs_subr.c puffs_vfsops.c src/sys/fs/udf [netbsd-7]: udf_strat_bootstrap.c src/sys/kern [netbsd-7]: kern_exec.c src/sys/miscfs/fdesc [netbsd-7]: fdesc_vfsops.c src/sys/miscfs/genfs [netbsd-7]: layer_subr.c layer_vfsops.c src/sys/miscfs/nullfs [netbsd-7]: null_vfsops.c src/sys/miscfs/overlay [netbsd-7]: overlay_vfsops.c overlay_vnops.c src/sys/miscfs/procfs [netbsd-7]: procfs_subr.c procfs_vfsops.c src/sys/miscfs/umapfs [netbsd-7]: umap_subr.c umap_vfsops.c umap_vnops.c src/sys/netinet [netbsd-7]: if_atm.c in_pcb.c raw_ip.c tcp_output.c tcp_sack.c tcp_subr.c tcp_timer.c tcp_usrreq.c tcp_vtw.c src/sys/netinet6 [netbsd-7]: dest6.c in6_ifattach.c in6_pcb.c ip6_forward.c udp6_output.c src/sys/sys [netbsd-7]: malloc.h mallocvar.h src/sys/ufs/chfs [netbsd-7]: chfs_vfsops.c chfs_vnode.c src/sys/ufs/ext2fs [netbsd-7]: ext2fs_readwrite.c ext2fs_vfsops.c ext2fs_vnops.c Log Message: Pull up following revision(s) (requested by maxv in ticket #427): sys/compat/svr4/svr4_schedctl.c: revision 1.8 sys/netinet/tcp_timer.c: revision 1.88 sys/miscfs/genfs/layer_vfsops.c: revision 1.45 sys/compat/svr4/svr4_ioctl.c: revision 1.37 sys/ufs/chfs/chfs_vfsops.c: revision 1.14 sys/miscfs/fdesc/fdesc_vfsops.c: revision 1.91 sys/compat/linux/arch/i386/linux_ptrace.c: revision 1.30 sys/compat/common/kern_time_50.c: revision 1.28 sys/netinet6/ip6_forward.c: revision 1.74 sys/miscfs/umapfs/umap_vnops.c: revision 1.57 sys/compat/svr4/svr4_fcntl.c: revision 1.74 distrib/sets/lists/comp/mi: revision 1.1931 sys/netinet6/udp6_output.c: revision 1.46 sys/fs/puffs/puffs_compat.c: revision 1.3 sys/fs/udf/udf_rename.c: revision 1.11 sys/compat/svr4/svr4_filio.c: revision 1.24 sys/fs/udf/udf_rename.c: revision 1.12 sys/netinet/tcp_usrreq.c: revision 1.202 sys/miscfs/umapfs/umap_subr.c: revision 1.29 sys/compat/linux/common/linux_fadvise64.c: revision 1.3 sys/netinet/if_atm.c: revision 1.34 sys/miscfs/procfs/procfs_subr.c: revision 1.106 sys/miscfs/genfs/layer_subr.c: revision 1.37 sys/netinet/tcp_sack.c: revision 1.30 sys/compat/freebsd/freebsd_misc.c: revision 1.33 sys/compat/freebsd/freebsd_file.c: revision 1.33 sys/ufs/chfs/chfs_vnode.c: revision 1.12 sys/compat/svr4/svr4_ttold.c: revision 1.34 sys/compat/linux/common/linux_file.c: revision 1.114 sys/compat/linux/arch/mips/linux_machdep.c: revision 1.43 sys/compat/linux/common/linux_signal.c: revision 1.76 sys/compat/common/compat_util.c: revision 1.46 sys/compat/linux/arch/arm/linux_ptrace.c: revision 1.18 sys/compat/svr4/svr4_sockio.c: revision 1.36 sys/compat/linux/arch/arm/linux_machdep.c: revision 1.32 sys/compat/svr4/svr4_signal.c: revision 1.66 sys/kern/kern_exec.c: revision 1.410 sys/fs/puffs/puffs_vfsops.c: revision 1.115 sys/compat/svr4/svr4_exec_elf64.c: revision 1.15 sys/compat/linux/arch/i386/linux_machdep.c: revision 1.159 sys/compat/linux/arch/alpha/linux_machdep.c: revision 1.50
CVS commit: [netbsd-7] src/distrib/evbppc/ramdisk
Module Name:src
Committed By: martin
Date: Sat Jan 17 12:16:34 UTC 2015
Modified Files:
src/distrib/evbppc/ramdisk [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by joerg in ticket #428):
distrib/evbppc/ramdisk/Makefile: revision 1.19
Include /dev/bpf for dhcpcd.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.2.1 src/distrib/evbppc/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/evbppc/ramdisk/Makefile
diff -u src/distrib/evbppc/ramdisk/Makefile:1.17 src/distrib/evbppc/ramdisk/Makefile:1.17.2.1
--- src/distrib/evbppc/ramdisk/Makefile:1.17 Fri Aug 8 16:56:30 2014
+++ src/distrib/evbppc/ramdisk/Makefile Sat Jan 17 12:16:34 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/08/08 16:56:30 joerg Exp $
+# $NetBSD: Makefile,v 1.17.2.1 2015/01/17 12:16:34 martin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -22,7 +22,7 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${NETBSDSRCDIR}/etc/netconfig ${DISTRIBDIR}/common/protocols \
${DISTRIBDIR}/common/services
MAKEDEVTARGETS= std md0 wd0 wd1 wd2 wd3 cd0 cd1 sd0 sd1 sd2 sd3 st0 ipty
-MAKEDEVTARGETS+= ld0 ld1
+MAKEDEVTARGETS+= ld0 ld1 bpf
MAKEDEVTARGETS+= drvctl dk0 dk1 dk2 dk3
MAKEDEVTARGETS+= flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7
CVS commit: [netbsd-7] src/sys/arch/amiga/amiga
Module Name:src
Committed By: martin
Date: Sat Jan 17 12:20:15 UTC 2015
Modified Files:
src/sys/arch/amiga/amiga [netbsd-7]: gayle.c
Log Message:
Pull up following revision(s) (requested by phx in ticket #429):
sys/arch/amiga/amiga/gayle.c: revision 1.8
Fixed crash of A4000 IDE due to uninitialised bus_space_tag and bus_space
handle for the interrupt status register.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/arch/amiga/amiga/gayle.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/amiga/amiga/gayle.c
diff -u src/sys/arch/amiga/amiga/gayle.c:1.7 src/sys/arch/amiga/amiga/gayle.c:1.7.4.1
--- src/sys/arch/amiga/amiga/gayle.c:1.7 Fri Jan 3 00:33:06 2014
+++ src/sys/arch/amiga/amiga/gayle.c Sat Jan 17 12:20:14 2015
@@ -1,9 +1,9 @@
-/* $NetBSD: gayle.c,v 1.7 2014/01/03 00:33:06 rkujawa Exp $ */
+/* $NetBSD: gayle.c,v 1.7.4.1 2015/01/17 12:20:14 martin Exp $ */
/* public domain */
#include
-__KERNEL_RCSID(0, "$NetBSD: gayle.c,v 1.7 2014/01/03 00:33:06 rkujawa Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gayle.c,v 1.7.4.1 2015/01/17 12:20:14 martin Exp $");
/*
* Gayle management - provide functions for use in the drivers that utilise
@@ -75,9 +75,11 @@ gayle_init(void) {
if (is_a4000()) {
gayle_t->gayle_isr_bst.base = (bus_addr_t) __UNVOLATILE(ztwomap(
GAYLE_IDE_BASE_A4000+GAYLE_IDE_INTREQ_A4000));
-
- gayle_t->gayle_io_bst.absm = &amiga_bus_stride_1;
+ gayle_t->gayle_isr_bst.absm = &amiga_bus_stride_1;
gayle_t->gayle_isr_t = &(gayle_t->gayle_isr_bst);
+
+ bus_space_map(gayle_t->gayle_isr_t, 0, 0x1, 0,
+ &(gayle_t->gayle_isr_h));
} else {
bus_space_subregion(gayle_t->gayle_io_t, gayle_t->gayle_io_h,
GAYLE_INTREQ, 0x1, &(gayle_t->gayle_isr_h));
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Jan 17 12:22:10 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #421 - 424, 426 - 429 To generate a diff of this commit: cvs rdiff -u -r1.1.2.167 -r1.1.2.168 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.167 src/doc/CHANGES-7.0:1.1.2.168 --- src/doc/CHANGES-7.0:1.1.2.167 Fri Jan 16 22:28:33 2015 +++ src/doc/CHANGES-7.0 Sat Jan 17 12:22:09 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.167 2015/01/16 22:28:33 snj Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.168 2015/01/17 12:22:09 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -13915,3 +13915,135 @@ sys/dev/usb/usbdevs_data.h (regen) PR#49105 from MOCHIDA Shuji. [dholland, ticket #420] +distrib/sets/lists/xdebug/mi 1.11 + + Fix sets. + [bouyer, ticket #421] + +lib/libperfuse/ops.c1.82 + + Fix atime updates. + [manu, ticket #422] + +sys/fs/puffs/puffs_vnops.c 1.199 + + Make sure reads on empty files reach PUFFS filesystems. + [manu, ticket #423] + +tests/fs/vfs/t_vnops.c1.41 + + Mark udf_lookup_complex as an expected failure, referencing + PR kern/49033. Since it does not fail reliably, force it to fail + to avoid spurious failure reports due to unexpected success. + [gson, ticket #424] + +sys/arch/i386/stand/boot/boot2.c 1.64 + + Restore previous behavior: "boot -s" == "boot netbsd -s" + [christos, ticket #426] + +distrib/sets/lists/comp/mi 1.1931 +share/man/man9/Makefile1.380 +share/man/man9/malloc.91.50-1.51 +sys/compat/common/compat_util.c 1.46 +sys/compat/common/if_43.c 1.9 +sys/compat/common/kern_time_50.c 1.28 +sys/compat/common/uipc_syscalls_43.c 1.46 +sys/compat/freebsd/freebsd_exec_elf32.c 1.20 +sys/compat/freebsd/freebsd_file.c 1.33 +sys/compat/freebsd/freebsd_ipc.c 1.17 +sys/compat/freebsd/freebsd_misc.c 1.33 +sys/compat/linux/arch/alpha/linux_machdep.c 1.50 +sys/compat/linux/arch/alpha/linux_pipe.c 1.17 +sys/compat/linux/arch/arm/linux_machdep.c 1.32 +sys/compat/linux/arch/arm/linux_ptrace.c 1.18 +sys/compat/linux/arch/i386/linux_machdep.c 1.159 +sys/compat/linux/arch/i386/linux_ptrace.c 1.30 +sys/compat/linux/arch/mips/linux_machdep.c 1.43 +sys/compat/linux/arch/mips/linux_ptrace.c 1.10 +sys/compat/linux/arch/powerpc/linux_machdep.c 1.48 +sys/compat/linux/arch/powerpc/linux_ptrace.c 1.28 +sys/compat/linux/common/linux_exec.c 1.117 +sys/compat/linux/common/linux_exec_aout.c 1.67 +sys/compat/linux/common/linux_fadvise64.c 1.3 +sys/compat/linux/common/linux_fadvise64_64.c 1.3 +sys/compat/linux/common/linux_file.c 1.114 +sys/compat/linux/common/linux_llseek.c 1.34 +sys/compat/linux/common/linux_misc_notalpha.c 1.109 +sys/compat/linux/common/linux_pipe.c 1.67 +sys/compat/linux/common/linux_sched.c 1.67 +sys/compat/linux/common/linux_signal.c 1.76 +sys/compat/linux/common/linux_socket.c 1.120 +sys/compat/linux/common/linux_socketcall.c 1.45 +sys/compat/linux/common/linux_uselib.c 1.33 +sys/compat/linux32/common/linux32_misc.c 1.24 +sys/compat/svr4/svr4_exec_elf32.c 1.15 +sys/compat/svr4/svr4_exec_elf64.c 1.15 +sys/compat/svr4/svr4_fcntl.c 1.74 +sys/compat/svr4/svr4_filio.c 1.24 +sys/compat/svr4/svr4_ioctl.c 1.37 +sys/compat/svr4/svr4_ipc.c 1.27 +sys/compat/svr4/svr4_schedctl.c 1.8 +sys/compat/svr4/svr4_signal.c 1.66 +sys/compat/svr4/svr4_sockio.c 1.36 +sys/compat/svr4/svr4_termios.c 1.28 +sys/compat/svr4/svr4_ttold.c 1.34 +sys/fs/cd9660/cd9660_node.c 1.34 +sys/fs/cd9660/cd9660_util.c 1.12 +sys/fs/puffs/puffs_compat.c 1.3 +sys/fs/puffs/puffs_msgif.c 1.97 +sys/fs/puffs/puffs_node.c 1.36 +sys/fs/puffs/puffs_subr.c 1.67 +sys/fs/puffs/puffs_vfsops.c 1.115 +sys/fs/udf/udf_rename.c1.11 +sys/fs/udf/udf_rename.c1.12 +sys/fs/udf/udf_strat_bootstrap.c 1.4 +sys/kern/kern_exec.c1.410 +sys/miscfs/fdesc/fdesc_vfsops.c 1.91 +sys/miscfs/genfs/layer_subr.c 1.37 +sys/miscfs/genfs/layer_vfsops.c 1.45 +sys/miscfs/nullfs/null_vfsops.c 1.90 +sys/miscfs/overlay/overlay_vfsops.c 1.63 +sys/miscfs/overlay/overlay_vnops.c 1.21 +sys/miscfs/procfs/procfs_subr.c 1.106 +sys/miscfs/procfs/procfs_vfsops.c 1.94 +sys/miscfs/umapfs/umap_subr.c 1.29 +sys/miscfs/umapfs/umap_vfsops.c 1.95 +sys/miscfs/umapfs/umap_vnops.c 1.57 +sys/netinet/if_atm.c1.34 +sys/netinet/in_pcb.c1.153 +sys/netinet/raw_ip.c1.146 +sys/netinet/tcp_output.c 1.179 +sys/netinet/tcp_sack.c1.30 +sys/netinet/tcp_subr.c1.257 +sys/netinet/tcp_timer.c1.88 +sys/netinet/tcp_usrreq.c 1.202 +sys/netinet/tcp_vtw.c1.12 +sys/netinet6/dest6.c1.18 +sys/netinet6/in6_ifattach.c 1.94 +sys/netinet6/in6_pcb.c1.132 +sys/netinet6/ip6_forward.c 1.74 +sys/netinet6/udp6_output.c 1.46 +sys/sys/malloc.h1.116 +sys/sys/mallocvar.h1.13 +sys/ufs/chf
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sat Jan 17 12:23:31 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: gdb-7.8.2 out. To generate a diff of this commit: cvs rdiff -u -r1.1192 -r1.1193 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.1192 src/doc/3RDPARTY:1.1193 --- src/doc/3RDPARTY:1.1192 Thu Jan 15 08:50:36 2015 +++ src/doc/3RDPARTY Sat Jan 17 12:23:31 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1192 2015/01/15 08:50:36 skrll Exp $ +# $NetBSD: 3RDPARTY,v 1.1193 2015/01/17 12:23:31 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -426,7 +426,7 @@ Before importing a new version of extern Package: gdb Version: 7.7.1 -Current Vers: 7.8.1 +Current Vers: 7.8.2 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/gdb/ Home Page: http://www.gnu.org/software/gdb/
CVS commit: [netbsd-7] src
Module Name:src
Committed By: martin
Date: Sat Jan 17 13:44:47 UTC 2015
Modified Files:
src/share/man/man4 [netbsd-7]: rtsx.4
src/sys/dev/ic [netbsd-7]: rtsx.c rtsxreg.h rtsxvar.h
src/sys/dev/pci [netbsd-7]: rtsx_pci.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #432):
sys/dev/ic/rtsxreg.h: revision 1.2
sys/dev/ic/rtsxvar.h: revision 1.2
sys/dev/pci/rtsx_pci.c: revision 1.3
sys/dev/ic/rtsx.c: revision 1.2
share/man/man4/rtsx.4: revision 1.3-1.4
Added RTS5227/RTL8402/RTL8411/RTL8411B support.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.6.1 src/share/man/man4/rtsx.4
cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/dev/ic/rtsx.c src/sys/dev/ic/rtsxreg.h \
src/sys/dev/ic/rtsxvar.h
cvs rdiff -u -r1.2 -r1.2.8.1 src/sys/dev/pci/rtsx_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/share/man/man4/rtsx.4
diff -u src/share/man/man4/rtsx.4:1.2 src/share/man/man4/rtsx.4:1.2.6.1
--- src/share/man/man4/rtsx.4:1.2 Wed Mar 19 17:48:34 2014
+++ src/share/man/man4/rtsx.4 Sat Jan 17 13:44:47 2015
@@ -1,10 +1,10 @@
-.\" $NetBSD: rtsx.4,v 1.2 2014/03/19 17:48:34 wiz Exp $
-.\" $OpenBSD: rtsx.4,v 1.4 2013/11/06 13:51:02 stsp Exp $
+.\" $NetBSD: rtsx.4,v 1.2.6.1 2015/01/17 13:44:47 martin Exp $
+.\" $OpenBSD: rtsx.4,v 1.6 2014/05/18 10:52:17 stsp Exp $
.\"
.\" Theo de Raadt, 2006. Public Domain.
.\" Stefan Sperling, 2012. Public Domain.
.\"
-.Dd March 19, 2014
+.Dd October 29, 2014
.Dt RTSX 4
.Os
.Sh NAME
@@ -16,7 +16,8 @@
.Sh DESCRIPTION
The
.Nm
-driver provides support for the Realtek RTS5209 and RTS5229 SD card readers.
+driver provides support for the Realtek RTS5209, RTS5227, RTS5229,
+RTL8402, RTL8411 and RTL8411B SD card readers.
.Pp
The
.Xr sdmmc 4
Index: src/sys/dev/ic/rtsx.c
diff -u src/sys/dev/ic/rtsx.c:1.1 src/sys/dev/ic/rtsx.c:1.1.8.1
--- src/sys/dev/ic/rtsx.c:1.1 Wed Mar 19 15:26:41 2014
+++ src/sys/dev/ic/rtsx.c Sat Jan 17 13:44:47 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: rtsx.c,v 1.1 2014/03/19 15:26:41 nonaka Exp $ */
-/* $OpenBSD: rtsx.c,v 1.7 2013/12/08 18:31:03 stsp Exp $ */
+/* $NetBSD: rtsx.c,v 1.1.8.1 2015/01/17 13:44:47 martin Exp $ */
+/* $OpenBSD: rtsx.c,v 1.10 2014/08/19 17:55:03 phessler Exp $ */
/*
* Copyright (c) 2006 Uwe Stuehler
@@ -19,11 +19,11 @@
*/
/*
- * Realtek RTS5209/RTS5229 Card Reader driver.
+ * Realtek RTS5209/RTS5227/RTS5229/RTL8402/RTL8411/RTL8411B Card Reader driver.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rtsx.c,v 1.1 2014/03/19 15:26:41 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsx.c,v 1.1.8.1 2015/01/17 13:44:47 martin Exp $");
#include
#include
@@ -97,6 +97,13 @@ __KERNEL_RCSID(0, "$NetBSD: rtsx.c,v 1.1
return err;\
} while (/*CONSTCOND*/0)
+#define RTSX_BITOP(sc, reg, mask, bits)\
+ do { \
+ int err = rtsx_write((sc), (reg), (mask), (bits));\
+ if (err) \
+ return err;\
+ } while (/*CONSTCOND*/0)
+
static int rtsx_host_reset(sdmmc_chipset_handle_t);
static uint32_t rtsx_host_ocr(sdmmc_chipset_handle_t);
static int rtsx_host_maxblklen(sdmmc_chipset_handle_t);
@@ -214,7 +221,8 @@ rtsx_attach(struct rtsx_softc *sc, bus_s
}
if (bus_dmamap_create(sc->sc_dmat, RTSX_HOSTCMD_BUFSIZE, 1,
- RTSX_DMA_MAX_SEGSIZE, 0, BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW, &sc->sc_dmap_cmd) != 0)
+ RTSX_DMA_MAX_SEGSIZE, 0, BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW,
+ &sc->sc_dmap_cmd) != 0)
goto error;
/*
@@ -319,23 +327,30 @@ static int
rtsx_init(struct rtsx_softc *sc, int attaching)
{
uint32_t status;
- uint8_t ver;
+ uint8_t reg;
int error;
- /* Read IC version from dummy register. */
- if (sc->sc_flags & RTSX_F_5229) {
- RTSX_READ(sc, RTSX_DUMMY_REG, &ver);
- switch (ver & 0x0f) {
- case RTSX_IC_VERSION_A:
- case RTSX_IC_VERSION_B:
- case RTSX_IC_VERSION_D:
- break;
- case RTSX_IC_VERSION_C:
- sc->sc_flags |= RTSX_F_5229_TYPE_C;
- break;
- default:
- aprint_error_dev(sc->sc_dev, "unknown ic %02x\n", ver);
- return 1;
+ if (attaching) {
+ if (RTSX_IS_RTS5229(sc)) {
+ /* Read IC version from dummy register. */
+ RTSX_READ(sc, RTSX_DUMMY_REG, ®);
+ switch (reg & 0x0f) {
+ case RTSX_IC_VERSION_A:
+ case RTSX_IC_VERSION_B:
+ case RTSX_IC_VERSION_D:
+break;
+ case RTSX_IC_VERSION_C:
+sc->sc_flags |= RTSX_F_5229_TYPE_C;
+break;
+ default:
+aprint_error_dev(sc->sc_dev,
+"unknown RTS5229 version 0x%02x\n", reg);
+return 1;
+ }
+ } else if (RTSX_IS_RTL8411B(sc)) {
+ RTSX_READ(sc, RTSX_RTL8411B_PACKAGE, ®);
+ if (reg & RTSX_RTL8411B_QFN48)
+sc->sc_flags |= RTSX_F_8411B_QFN48;
}
}
@@ -359,10 +374,12 @@ rtsx_init(struct rtsx_softc *sc, int att
delay(200);
/* XXX magic numbers from linux driver */
- if (sc->sc_flags & RTSX_F_5209)
+ if (RTSX_IS_RTS5209(sc))
error = rtsx_write_phy(sc, 0x00, 0xB966);
- else
+ else if (RTSX_IS_RT
CVS commit: [netbsd-7] src/sys/dev/mii
Module Name:src Committed By: martin Date: Sat Jan 17 13:46:39 UTC 2015 Modified Files: src/sys/dev/mii [netbsd-7]: miidevs Log Message: Pull up following revision(s) (requested by nonaka in ticket #433): sys/dev/mii/miidevs: revision 1.121 sys/dev/mii/miidevs: revision 1.122 BCM5714 and BCM5780 are used for both copper and fiber. Add Realtek RTL8251. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.120.2.1 src/sys/dev/mii/miidevs 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/miidevs diff -u src/sys/dev/mii/miidevs:1.120 src/sys/dev/mii/miidevs:1.120.2.1 --- src/sys/dev/mii/miidevs:1.120 Wed Jul 2 22:33:18 2014 +++ src/sys/dev/mii/miidevs Sat Jan 17 13:46:39 2015 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.120 2014/07/02 22:33:18 msaitoh Exp $ +$NetBSD: miidevs,v 1.120.2.1 2015/01/17 13:46:39 martin Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -167,8 +167,8 @@ model BROADCOM BCM5750 0x0018 BCM5750 1 model BROADCOM BCM5704 0x0019 BCM5704 1000BASE-T media interface model BROADCOM BCM5705 0x001a BCM5705 1000BASE-T media interface model BROADCOM BCM54K2 0x002e BCM54K2 1000BASE-T media interface -model BROADCOM BCM5714 0x0034 BCM5714 1000BASE-T media interface -model BROADCOM BCM5780 0x0035 BCM5780 1000BASE-T media interface +model BROADCOM BCM5714 0x0034 BCM5714 1000BASE-T/X media interface +model BROADCOM BCM5780 0x0035 BCM5780 1000BASE-T/X media interface model BROADCOM BCM5708C 0x0036 BCM5708C 1000BASE-T media interface model BROADCOM2 BCM5325 0x0003 BCM5325 10/100 5-port PHY switch model BROADCOM2 BCM5906 0x0004 BCM5906 10/100baseTX media interface @@ -306,6 +306,7 @@ model RDC R6040 0x0003 R6040 10/100 me /* RealTek PHYs */ model yyREALTEK RTL8201L 0x0020 RTL8201L 10/100 media interface model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface +model REALTEK RTL8251 0x RTL8251 1000BASE-T media interface model REALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface /* Seeq PHYs */
CVS commit: [netbsd-7] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Sat Jan 17 13:50:57 UTC 2015
Modified Files:
src/sys/dev/mii [netbsd-7]: rgephy.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #434):
sys/dev/mii/rgephy.c: revision 1.36, 1.37
Add support for Realtek RTL8251.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.4.1 src/sys/dev/mii/rgephy.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/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.35 src/sys/dev/mii/rgephy.c:1.35.4.1
--- src/sys/dev/mii/rgephy.c:1.35 Tue Dec 17 16:00:23 2013
+++ src/sys/dev/mii/rgephy.c Sat Jan 17 13:50:57 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rgephy.c,v 1.35 2013/12/17 16:00:23 martin Exp $ */
+/* $NetBSD: rgephy.c,v 1.35.4.1 2015/01/17 13:50:57 martin Exp $ */
/*
* Copyright (c) 2003
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.35 2013/12/17 16:00:23 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.35.4.1 2015/01/17 13:50:57 martin Exp $");
/*
@@ -87,6 +87,9 @@ static const struct mii_phydesc rgephys[
{ MII_OUI_REALTEK, MII_MODEL_REALTEK_RTL8169S,
MII_STR_REALTEK_RTL8169S },
+ { MII_OUI_REALTEK, MII_MODEL_REALTEK_RTL8251,
+ MII_STR_REALTEK_RTL8251 },
+
{ 0,0,
NULL }
};
@@ -453,7 +456,8 @@ rgephy_loop(struct mii_softc *sc)
uint32_t bmsr;
int i;
- if (sc->mii_mpd_rev < 2) {
+ if (sc->mii_mpd_model != MII_MODEL_REALTEK_RTL8251 &&
+ sc->mii_mpd_rev < 2) {
PHY_WRITE(sc, MII_BMCR, BMCR_PDOWN);
DELAY(1000);
}
@@ -487,7 +491,8 @@ rgephy_load_dspcode(struct mii_softc *sc
{
int val;
- if (sc->mii_mpd_rev >= 2)
+ if (sc->mii_mpd_model == MII_MODEL_REALTEK_RTL8251 ||
+ sc->mii_mpd_rev >= 2)
return;
#if 1
@@ -587,7 +592,8 @@ rgephy_reset(struct mii_softc *sc)
mii_phy_reset(sc);
DELAY(1000);
- if (sc->mii_mpd_rev < 2) {
+ if (sc->mii_mpd_model != MII_MODEL_REALTEK_RTL8251 &&
+ sc->mii_mpd_rev < 2) {
rgephy_load_dspcode(sc);
} else if (sc->mii_mpd_rev == 3) {
/* RTL8211C(L) */
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Jan 17 13:53:24 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets 432 - 434 To generate a diff of this commit: cvs rdiff -u -r1.1.2.168 -r1.1.2.169 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.168 src/doc/CHANGES-7.0:1.1.2.169 --- src/doc/CHANGES-7.0:1.1.2.168 Sat Jan 17 12:22:09 2015 +++ src/doc/CHANGES-7.0 Sat Jan 17 13:53:24 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.168 2015/01/17 12:22:09 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.169 2015/01/17 13:53:24 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -14046,4 +14046,23 @@ sys/arch/amiga/amiga/gayle.c 1.8 and bus_space handle for the interrupt status register. [phx, ticket #429] +share/man/man4/rtsx.41.3-1.4 +sys/dev/ic/rtsx.c1.2 +sys/dev/ic/rtsxreg.h1.2 +sys/dev/ic/rtsxvar.h1.2 +sys/dev/pci/rtsx_pci.c1.3 + + Added RTS5227/RTL8402/RTL8411/RTL8411B support. + [nonaka, ticket #432] + +sys/dev/mii/miidevs1.121-1.122 + + BCM5714 and BCM5780 are used for both copper and fiber. + Add Realtek RTL8251. + [nonaka, ticket #433] + +sys/dev/mii/rgephy.c1.36-1.37 + + Add support for Realtek RTL8251. + [nonaka, ticket #434]
CVS commit: [netbsd-7] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Sat Jan 17 14:13:40 UTC 2015
Modified Files:
src/sys/dev/mii [netbsd-7]: miidevs.h miidevs_data.h
Log Message:
Regen (Ticket #433)
To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.123.2.1 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.111 -r1.111.2.1 src/sys/dev/mii/miidevs_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/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.123 src/sys/dev/mii/miidevs.h:1.123.2.1
--- src/sys/dev/mii/miidevs.h:1.123 Wed Jul 2 22:33:39 2014
+++ src/sys/dev/mii/miidevs.h Sat Jan 17 14:13:40 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.123 2014/07/02 22:33:39 msaitoh Exp $ */
+/* $NetBSD: miidevs.h,v 1.123.2.1 2015/01/17 14:13:40 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.120 2014/07/02 22:33:18 msaitoh Exp
+ * NetBSD: miidevs,v 1.120.2.1 2015/01/17 13:46:39 martin Exp
*/
/*-
@@ -214,9 +214,9 @@
#define MII_MODEL_BROADCOM_BCM54K2 0x002e
#define MII_STR_BROADCOM_BCM54K2 "BCM54K2 1000BASE-T media interface"
#define MII_MODEL_BROADCOM_BCM5714 0x0034
-#define MII_STR_BROADCOM_BCM5714 "BCM5714 1000BASE-T media interface"
+#define MII_STR_BROADCOM_BCM5714 "BCM5714 1000BASE-T/X media interface"
#define MII_MODEL_BROADCOM_BCM5780 0x0035
-#define MII_STR_BROADCOM_BCM5780 "BCM5780 1000BASE-T media interface"
+#define MII_STR_BROADCOM_BCM5780 "BCM5780 1000BASE-T/X media interface"
#define MII_MODEL_BROADCOM_BCM5708C 0x0036
#define MII_STR_BROADCOM_BCM5708C "BCM5708C 1000BASE-T media interface"
#define MII_MODEL_BROADCOM2_BCM5325 0x0003
@@ -460,6 +460,8 @@
#define MII_STR_yyREALTEK_RTL8201L "RTL8201L 10/100 media interface"
#define MII_MODEL_xxREALTEK_RTL8169S 0x0011
#define MII_STR_xxREALTEK_RTL8169S "RTL8169S/8110S/8211 1000BASE-T media interface"
+#define MII_MODEL_REALTEK_RTL8251 0x
+#define MII_STR_REALTEK_RTL8251 "RTL8251 1000BASE-T media interface"
#define MII_MODEL_REALTEK_RTL8169S 0x0011
#define MII_STR_REALTEK_RTL8169S "RTL8169S/8110S/8211 1000BASE-T media interface"
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.111 src/sys/dev/mii/miidevs_data.h:1.111.2.1
--- src/sys/dev/mii/miidevs_data.h:1.111 Wed Jul 2 22:33:39 2014
+++ src/sys/dev/mii/miidevs_data.h Sat Jan 17 14:13:40 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.111 2014/07/02 22:33:39 msaitoh Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.111.2.1 2015/01/17 14:13:40 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.120 2014/07/02 22:33:18 msaitoh Exp
+ * NetBSD: miidevs,v 1.120.2.1 2015/01/17 13:46:39 martin Exp
*/
/*-
@@ -184,6 +184,7 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_RDC, MII_MODEL_RDC_R6040, MII_STR_RDC_R6040 },
{ MII_OUI_yyREALTEK, MII_MODEL_yyREALTEK_RTL8201L, MII_STR_yyREALTEK_RTL8201L },
{ MII_OUI_xxREALTEK, MII_MODEL_xxREALTEK_RTL8169S, MII_STR_xxREALTEK_RTL8169S },
+ { MII_OUI_REALTEK, MII_MODEL_REALTEK_RTL8251, MII_STR_REALTEK_RTL8251 },
{ MII_OUI_REALTEK, MII_MODEL_REALTEK_RTL8169S, MII_STR_REALTEK_RTL8169S },
{ MII_OUI_SEEQ, MII_MODEL_SEEQ_80220, MII_STR_SEEQ_80220 },
{ MII_OUI_SEEQ, MII_MODEL_SEEQ_84220, MII_STR_SEEQ_84220 },
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Jan 17 14:14:58 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ammend #433 To generate a diff of this commit: cvs rdiff -u -r1.1.2.169 -r1.1.2.170 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.169 src/doc/CHANGES-7.0:1.1.2.170 --- src/doc/CHANGES-7.0:1.1.2.169 Sat Jan 17 13:53:24 2015 +++ src/doc/CHANGES-7.0 Sat Jan 17 14:14:58 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.169 2015/01/17 13:53:24 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.170 2015/01/17 14:14:58 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -14056,6 +14056,8 @@ sys/dev/pci/rtsx_pci.c1.3 [nonaka, ticket #432] sys/dev/mii/miidevs1.121-1.122 +sys/dev/mii/miidevs.h(regen) +sys/dev/mii/miidevs_data.h (regen) BCM5714 and BCM5780 are used for both copper and fiber. Add Realtek RTL8251.
CVS commit: src/sys
Module Name:src
Committed By: jmcneill
Date: Sat Jan 17 15:04:47 UTC 2015
Modified Files:
src/sys/conf: files
Added Files:
src/sys/dev/ic: dwc_tmr.c dwc_tmr_reg.h dwc_tmr_var.h
Log Message:
Add driver for DesignWare 32-bit timer as found in Rockchip RK3066/PX2,
from FUKAUMI Naoki
To generate a diff of this commit:
cvs rdiff -u -r1.1125 -r1.1126 src/sys/conf/files
cvs rdiff -u -r0 -r1.1 src/sys/dev/ic/dwc_tmr.c src/sys/dev/ic/dwc_tmr_reg.h \
src/sys/dev/ic/dwc_tmr_var.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/conf/files
diff -u src/sys/conf/files:1.1125 src/sys/conf/files:1.1126
--- src/sys/conf/files:1.1125 Fri Jan 16 10:36:14 2015
+++ src/sys/conf/files Sat Jan 17 15:04:47 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1125 2015/01/16 10:36:14 ozaki-r Exp $
+# $NetBSD: files,v 1.1126 2015/01/17 15:04:47 jmcneill Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20141030
@@ -1098,6 +1098,10 @@ file dev/ic/acpipmtimer.c acpipmtimer
device hpet
file dev/ic/hpet.c hpet needs-flag
+# DesignWare timer
+device dwctmr
+file dev/ic/dwc_tmr.c dwctmr
+
# SMSC LAN9118 Family Ethernet Controller
#
device smsh: arp, ether, ifnet, mii
Added files:
Index: src/sys/dev/ic/dwc_tmr.c
diff -u /dev/null src/sys/dev/ic/dwc_tmr.c:1.1
--- /dev/null Sat Jan 17 15:04:47 2015
+++ src/sys/dev/ic/dwc_tmr.c Sat Jan 17 15:04:47 2015
@@ -0,0 +1,75 @@
+/* $NetBSD: dwc_tmr.c,v 1.1 2015/01/17 15:04:47 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015 Jared D. McNeill
+ * 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 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 (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: dwc_tmr.c,v 1.1 2015/01/17 15:04:47 jmcneill Exp $");
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#define TIMER_READ(sc, reg) \
+bus_space_read_4((sc)->sc_bst, (sc)->sc_bsh, (reg))
+#define TIMER_WRITE(sc, reg, val) \
+bus_space_write_4((sc)->sc_bst, (sc)->sc_bsh, (reg), (val))
+
+static u_int dwc_tmr_get_timecount(struct timecounter *);
+
+void
+dwc_tmr_attach_subr(struct dwc_tmr_softc *sc, u_int64_t freq)
+{
+
+ TIMER_WRITE(sc, DWC_TMR_CONTROL_REG, 0);
+ TIMER_WRITE(sc, DWC_TMR_LOAD_COUNT_REG, ~0);
+ TIMER_WRITE(sc, DWC_TMR_CONTROL_REG, DWC_TMR_CONTROL_ENABLE);
+
+ sc->sc_tc.tc_get_timecount = dwc_tmr_get_timecount;
+ sc->sc_tc.tc_poll_pps = NULL;
+ sc->sc_tc.tc_counter_mask = ~0;
+ sc->sc_tc.tc_frequency = freq;
+ sc->sc_tc.tc_name = device_xname(sc->sc_dev);
+ sc->sc_tc.tc_priv = sc;
+ sc->sc_tc.tc_quality = 900;
+
+ tc_init(&sc->sc_tc);
+}
+
+static u_int
+dwc_tmr_get_timecount(struct timecounter *tc)
+{
+ struct dwc_tmr_softc *sc = tc->tc_priv;
+
+ return ~TIMER_READ(sc, DWC_TMR_CURRENT_VALUE_REG);
+}
Index: src/sys/dev/ic/dwc_tmr_reg.h
diff -u /dev/null src/sys/dev/ic/dwc_tmr_reg.h:1.1
--- /dev/null Sat Jan 17 15:04:47 2015
+++ src/sys/dev/ic/dwc_tmr_reg.h Sat Jan 17 15:04:47 2015
@@ -0,0 +1,41 @@
+/* $NetBSD: dwc_tmr_reg.h,v 1.1 2015/01/17 15:04:47 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015 Jared D. McNeill
+ * 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 AUTHOR ``AS IS'' AND ANY EXP
CVS commit: src/sys/arch
Module Name:src
Committed By: jmcneill
Date: Sat Jan 17 15:05:25 UTC 2015
Modified Files:
src/sys/arch/arm/rockchip: files.rockchip obio.c rockchip_board.c
rockchip_cpufreq.c rockchip_crureg.h rockchip_emac.c rockchip_reg.h
rockchip_timer.c rockchip_var.h
src/sys/arch/evbarm/conf: ROCKCHIP
src/sys/arch/evbarm/rockchip: rockchip_machdep.c
Log Message:
Add Rockchip PX2 support, from FUKAUMI Naoki
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/rockchip/files.rockchip
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/rockchip/obio.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/rockchip/rockchip_board.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rockchip_cpufreq.c \
src/sys/arch/arm/rockchip/rockchip_timer.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/rockchip/rockchip_crureg.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/rockchip/rockchip_emac.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/rockchip/rockchip_reg.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/rockchip/rockchip_var.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/conf/ROCKCHIP
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/rockchip/rockchip_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/arm/rockchip/files.rockchip
diff -u src/sys/arch/arm/rockchip/files.rockchip:1.9 src/sys/arch/arm/rockchip/files.rockchip:1.10
--- src/sys/arch/arm/rockchip/files.rockchip:1.9 Sun Jan 4 03:53:02 2015
+++ src/sys/arch/arm/rockchip/files.rockchip Sat Jan 17 15:05:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.rockchip,v 1.9 2015/01/04 03:53:02 jmcneill Exp $
+# $NetBSD: files.rockchip,v 1.10 2015/01/17 15:05:24 jmcneill Exp $
#
# Configuration info for Rockchip ARM Peripherals
#
@@ -32,7 +32,11 @@ device rkiic: i2cbus, i2cexec
attach rkiic at obio
file arch/arm/rockchip/rockchip_i2c.c rkiic
-# Timer
+# RK3066 Timer (Synopsys DesignWare)
+attach dwctmr at obio with rkdwctmr
+file arch/arm/rockchip/rockchip_dwctmr.c rkdwctmr
+
+# RK3188 Timer
device rktimer
attach rktimer at obio
file arch/arm/rockchip/rockchip_timer.c rktimer
Index: src/sys/arch/arm/rockchip/obio.c
diff -u src/sys/arch/arm/rockchip/obio.c:1.16 src/sys/arch/arm/rockchip/obio.c:1.17
--- src/sys/arch/arm/rockchip/obio.c:1.16 Tue Jan 13 10:37:38 2015
+++ src/sys/arch/arm/rockchip/obio.c Sat Jan 17 15:05:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: obio.c,v 1.16 2015/01/13 10:37:38 jmcneill Exp $ */
+/* $NetBSD: obio.c,v 1.17 2015/01/17 15:05:24 jmcneill Exp $ */
/*
* Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "opt_rockchip.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.16 2015/01/13 10:37:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.17 2015/01/17 15:05:24 jmcneill Exp $");
#include
#include
@@ -63,10 +63,10 @@ CFATTACH_DECL_NEW(obio, 0,
int obio_print(void *, const char *);
int obio_search(device_t, cfdata_t, const int *, void *);
-void obio_init_grf(void);
-void obio_iomux(int, int);
-void obio_init_gpio(void);
-void obio_swporta(int, int, int);
+static void obio_init_rk3066(void);
+static void obio_init_rk3188(void);
+static void obio_grf_set(uint32_t, uint32_t);
+static int obio_gpio_set_out(u_int, u_int, u_int);
#ifdef ROCKCHIP_CLOCK_DEBUG
static void obio_dump_clocks(void);
@@ -96,8 +96,17 @@ obio_attach(device_t parent, device_t se
obio_dump_clocks();
#endif
- obio_init_grf();
- obio_init_gpio();
+ switch (rockchip_chip_id()) {
+ case ROCKCHIP_CHIP_ID_RK3066:
+ obio_init_rk3066();
+ break;
+ case ROCKCHIP_CHIP_ID_RK3188:
+ case ROCKCHIP_CHIP_ID_RK3188PLUS:
+ obio_init_rk3188();
+ break;
+ default:
+ break;
+ }
/*
* Attach all on-board devices as described in the kernel
@@ -178,125 +187,251 @@ obio_search(device_t parent, cfdata_t cf
return 0;
}
+#define GRF_GPIO0A_IOMUX_OFFSET 0x00a8
+#define GRF_GPIO0B_IOMUX_OFFSET 0x00ac
+#define GRF_GPIO0C_IOMUX_OFFSET 0x00b0
+#define GRF_GPIO0D_IOMUX_OFFSET 0x00b4
+
+#define GRF_GPIO1A_IOMUX_OFFSET 0x00b8
+#define GRF_GPIO1B_IOMUX_OFFSET 0x00bc
+#define GRF_GPIO1C_IOMUX_OFFSET 0x00c0
+#define GRF_GPIO1D_IOMUX_OFFSET 0x00c4
+
+#define GRF_GPIO2A_IOMUX_OFFSET 0x00c8
+#define GRF_GPIO2B_IOMUX_OFFSET 0x00cc
+#define GRF_GPIO2C_IOMUX_OFFSET 0x00d0
+#define GRF_GPIO2D_IOMUX_OFFSET 0x00d4
+
+#define GRF_GPIO3A_IOMUX_OFFSET 0x00d8
+#define GRF_GPIO3B_IOMUX_OFFSET 0x00dc
+#define GRF_GPIO3C_IOMUX_OFFSET 0x00e0
+#define GRF_GPIO3D_IOMUX_OFFSET 0x00e4
+
+#define GRF_GPIO4A_IOMUX_OFFSET 0x00e8
+#define GRF_GPIO4B_IOMUX_OFFSET 0x00ec
+#define GRF_GPIO4C_IOMUX_OFFSET 0x00f0
+#define GRF_GPIO4D_IOMUX_OFFSET 0x00f4
+
+#define GRF_GPIO6B_IOMUX_OFFSET 0x010c
+
+#define GRF_SOC_CON0_OFFSET 0x0150
+#define GRF_SOC_CON1_OFFSET 0x0154
+#define GRF_SOC_CON2_OFFSET 0x0158
+
+static void
+obio_init_rk3066(void)
+{
+ /* dwctwo[01] */
+ obio_grf_set(GRF_GPIO0A_IOMUX_OFFSET, 0x1400
CVS import: src/external/bsd/am-utils/dist
Module Name:src Committed By: christos Date: Sat Jan 17 16:34:20 UTC 2015 Update of /cvsroot/src/external/bsd/am-utils/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22307 Log Message: Import am-utils 6.2-20140117 Status: Vendor Tag: ezk Release Tags: am-utils-6-2-20140117 C src/external/bsd/am-utils/dist/ChangeLog U src/external/bsd/am-utils/dist/AUTHORS U src/external/bsd/am-utils/dist/BUGS U src/external/bsd/am-utils/dist/COPYING U src/external/bsd/am-utils/dist/INSTALL U src/external/bsd/am-utils/dist/FAQ N src/external/bsd/am-utils/dist/README.release-announce U src/external/bsd/am-utils/dist/INSTALL.am-utils U src/external/bsd/am-utils/dist/LSM.am-utils U src/external/bsd/am-utils/dist/MIRRORS.html U src/external/bsd/am-utils/dist/MIRRORS.txt U src/external/bsd/am-utils/dist/Makefile.am U src/external/bsd/am-utils/dist/NEWS U src/external/bsd/am-utils/dist/README U src/external/bsd/am-utils/dist/README.attrcache U src/external/bsd/am-utils/dist/README.autofs U src/external/bsd/am-utils/dist/README.ldap U src/external/bsd/am-utils/dist/README.osx N src/external/bsd/am-utils/dist/README.release U src/external/bsd/am-utils/dist/README.sun2amd U src/external/bsd/am-utils/dist/README.y2k U src/external/bsd/am-utils/dist/depcomp U src/external/bsd/am-utils/dist/aux_conf.h.in U src/external/bsd/am-utils/dist/bootstrap U src/external/bsd/am-utils/dist/buildall U src/external/bsd/am-utils/dist/commit U src/external/bsd/am-utils/dist/config.guess.long U src/external/bsd/am-utils/dist/config.guess U src/external/bsd/am-utils/dist/cvs-server.txt U src/external/bsd/am-utils/dist/config.sub N src/external/bsd/am-utils/dist/configure.ac U src/external/bsd/am-utils/dist/install-sh U src/external/bsd/am-utils/dist/ldap-id.ms U src/external/bsd/am-utils/dist/ldap-id.txt U src/external/bsd/am-utils/dist/ldap.schema U src/external/bsd/am-utils/dist/ltmain.sh U src/external/bsd/am-utils/dist/missing U src/external/bsd/am-utils/dist/tasks U src/external/bsd/am-utils/dist/mkinstalldirs U src/external/bsd/am-utils/dist/vers.m4 N src/external/bsd/am-utils/dist/ylwrap.amd U src/external/bsd/am-utils/dist/ylwrap U src/external/bsd/am-utils/dist/amd/amfs_direct.c U src/external/bsd/am-utils/dist/amd/.cvsignore U src/external/bsd/am-utils/dist/amd/Makefile.am U src/external/bsd/am-utils/dist/amd/am_ops.c C src/external/bsd/am-utils/dist/amd/amd.8 U src/external/bsd/am-utils/dist/amd/amd.c U src/external/bsd/am-utils/dist/amd/amd.h U src/external/bsd/am-utils/dist/amd/amfs_auto.c U src/external/bsd/am-utils/dist/amd/amfs_generic.c U src/external/bsd/am-utils/dist/amd/amfs_error.c U src/external/bsd/am-utils/dist/amd/amfs_program.c U src/external/bsd/am-utils/dist/amd/amfs_host.c U src/external/bsd/am-utils/dist/amd/amfs_link.c U src/external/bsd/am-utils/dist/amd/amfs_linkx.c U src/external/bsd/am-utils/dist/amd/amfs_nfsl.c U src/external/bsd/am-utils/dist/amd/amfs_nfsx.c U src/external/bsd/am-utils/dist/amd/amfs_toplvl.c U src/external/bsd/am-utils/dist/amd/autil.c U src/external/bsd/am-utils/dist/amd/amfs_root.c U src/external/bsd/am-utils/dist/amd/info_hesiod.c U src/external/bsd/am-utils/dist/amd/amfs_union.c U src/external/bsd/am-utils/dist/amd/amq_subr.c U src/external/bsd/am-utils/dist/amd/amq_svc.c U src/external/bsd/am-utils/dist/amd/clock.c U src/external/bsd/am-utils/dist/amd/conf.c U src/external/bsd/am-utils/dist/amd/conf_parse.y C src/external/bsd/am-utils/dist/amd/conf_tok.l U src/external/bsd/am-utils/dist/amd/get_args.c U src/external/bsd/am-utils/dist/amd/info_exec.c U src/external/bsd/am-utils/dist/amd/info_file.c U src/external/bsd/am-utils/dist/amd/info_nisplus.c U src/external/bsd/am-utils/dist/amd/info_ldap.c U src/external/bsd/am-utils/dist/amd/info_ndbm.c U src/external/bsd/am-utils/dist/amd/info_nis.c U src/external/bsd/am-utils/dist/amd/info_passwd.c U src/external/bsd/am-utils/dist/amd/info_sun.c U src/external/bsd/am-utils/dist/amd/info_union.c U src/external/bsd/am-utils/dist/amd/map.c U src/external/bsd/am-utils/dist/amd/mapc.c U src/external/bsd/am-utils/dist/amd/mntfs.c U src/external/bsd/am-utils/dist/amd/nfs_prot_svc.c U src/external/bsd/am-utils/dist/amd/nfs_start.c U src/external/bsd/am-utils/dist/amd/nfs_subr.c U src/external/bsd/am-utils/dist/amd/ops_TEMPLATE.c U src/external/bsd/am-utils/dist/amd/ops_cachefs.c C src/external/bsd/am-utils/dist/amd/ops_cdfs.c U src/external/bsd/am-utils/dist/amd/ops_efs.c N src/external/bsd/am-utils/dist/amd/ops_ext.c U src/external/bsd/am-utils/dist/amd/ops_lofs.c N src/external/bsd/am-utils/dist/amd/ops_lustre.c U src/external/bsd/am-utils/dist/amd/ops_mfs.c U src/external/bsd/am-utils/dist/amd/ops_nfs.c U src/external/bsd/am-utils/dist/amd/ops_nfs3.c N src/external/bsd/am-utils/dist/amd/ops_nfs4.c U src/external/bsd/am-utils/dist/amd/ops_nullfs.c U src/external/bsd/am-utils/dist/amd/ops_pcfs.c U src/external/bsd/am-utils/dist/amd/ops_tfs.c U src/external/bsd/am-utils/dist/amd/ops_tmpfs.c U src/external/bsd/am-u
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: jmcneill
Date: Sat Jan 17 17:21:55 UTC 2015
Added Files:
src/sys/arch/arm/rockchip: rockchip_dwctmr.c
Log Message:
Add dwctmr glue, from FUKAUMI Naoki
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/rockchip/rockchip_dwctmr.c
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/rockchip/rockchip_dwctmr.c
diff -u /dev/null src/sys/arch/arm/rockchip/rockchip_dwctmr.c:1.1
--- /dev/null Sat Jan 17 17:21:55 2015
+++ src/sys/arch/arm/rockchip/rockchip_dwctmr.c Sat Jan 17 17:21:55 2015
@@ -0,0 +1,75 @@
+/* $NetBSD: rockchip_dwctmr.c,v 1.1 2015/01/17 17:21:55 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015 Jared D. McNeill
+ * 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 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 (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: rockchip_dwctmr.c,v 1.1 2015/01/17 17:21:55 jmcneill Exp $");
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+
+static int rk_dwctmr_match(device_t, cfdata_t, void *);
+static void rk_dwctmr_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(rkdwctmr, sizeof(struct dwc_tmr_softc),
+ rk_dwctmr_match, rk_dwctmr_attach, NULL, NULL);
+
+static int
+rk_dwctmr_match(device_t parent, cfdata_t cf, void *aux)
+{
+
+ if (rockchip_chip_id() != ROCKCHIP_CHIP_ID_RK3066)
+ return 0;
+
+ return 1;
+}
+
+static void
+rk_dwctmr_attach(device_t parent, device_t self, void *aux)
+{
+ struct dwc_tmr_softc *sc = device_private(self);
+ struct obio_attach_args * const obio = aux;
+
+ sc->sc_dev = self;
+ sc->sc_bst = obio->obio_bst;
+ bus_space_subregion(obio->obio_bst, obio->obio_bsh, obio->obio_offset,
+ obio->obio_size, &sc->sc_bsh);
+
+ aprint_naive("\n");
+ aprint_normal("\n");
+
+ dwc_tmr_attach_subr(sc, ROCKCHIP_REF_FREQ);
+}
CVS commit: src/sys/arch/evbarm/rockchip
Module Name:src
Committed By: jmcneill
Date: Sat Jan 17 17:30:26 UTC 2015
Modified Files:
src/sys/arch/evbarm/rockchip: rockchip_machdep.c
Log Message:
fix VERBOSE_INIT_ARM; cant call rockchip_chip_name() this early
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/rockchip/rockchip_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/evbarm/rockchip/rockchip_machdep.c
diff -u src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.20 src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.21
--- src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.20 Sat Jan 17 15:05:24 2015
+++ src/sys/arch/evbarm/rockchip/rockchip_machdep.c Sat Jan 17 17:30:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_machdep.c,v 1.20 2015/01/17 15:05:24 jmcneill Exp $ */
+/* $NetBSD: rockchip_machdep.c,v 1.21 2015/01/17 17:30:26 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.20 2015/01/17 15:05:24 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rockchip_machdep.c,v 1.21 2015/01/17 17:30:26 jmcneill Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -520,7 +520,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Talk to the user */
- printf("\nNetBSD/evbarm (%s) booting ...\n", rockchip_chip_name());
+ printf("\nNetBSD/evbarm (rockchip) booting ...\n");
#endif
#ifdef BOOT_ARGS
CVS commit: src/doc
Module Name:src Committed By: christos Date: Sat Jan 17 17:48:41 UTC 2015 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new am-utils To generate a diff of this commit: cvs rdiff -u -r1.1193 -r1.1194 src/doc/3RDPARTY cvs rdiff -u -r1.2035 -r1.2036 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/3RDPARTY diff -u src/doc/3RDPARTY:1.1193 src/doc/3RDPARTY:1.1194 --- src/doc/3RDPARTY:1.1193 Sat Jan 17 07:23:31 2015 +++ src/doc/3RDPARTY Sat Jan 17 12:48:41 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1193 2015/01/17 12:23:31 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1194 2015/01/17 17:48:41 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -55,7 +55,7 @@ Please read src/sys/dev/acpi/acpica/READ Package: am-utils [amd] Version: 6.2 -Current Vers: 6.2rc1 +Current Vers: 6.2 Maintainer: Erez Zadok Archive Site: ftp://ftp.am-utils.org/pub/am-utils/ Home Page: http://www.am-utils.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2035 src/doc/CHANGES:1.2036 --- src/doc/CHANGES:1.2035 Tue Jan 13 04:14:59 2015 +++ src/doc/CHANGES Sat Jan 17 12:48:41 2015 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2035 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2036 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -122,3 +122,5 @@ Changes from NetBSD 7.0 to NetBSD 8.0: graphics devices [macallan 20150106] gcc: Import GCC 4.8.4. [mrg 20150109] openssl: Import openssl 1.0.1k [spz 20150113] + am-utils: Upgrade to 6.2; adds nfsv4, lustre (which we can't use) + nfs3 rpc support for amfs [christos 20150117]
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jmcneill
Date: Sat Jan 17 19:10:18 UTC 2015
Modified Files:
src/sys/dev/ic: dwc_mmc.c dwc_mmc_reg.h
Log Message:
improve intr reg debugging
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/dwc_mmc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/dwc_mmc_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/dev/ic/dwc_mmc.c
diff -u src/sys/dev/ic/dwc_mmc.c:1.4 src/sys/dev/ic/dwc_mmc.c:1.5
--- src/sys/dev/ic/dwc_mmc.c:1.4 Tue Dec 30 12:36:06 2014
+++ src/sys/dev/ic/dwc_mmc.c Sat Jan 17 19:10:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc.c,v 1.4 2014/12/30 12:36:06 jmcneill Exp $ */
+/* $NetBSD: dwc_mmc.c,v 1.5 2015/01/17 19:10:18 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill
@@ -29,7 +29,7 @@
#include "opt_dwc_mmc.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.4 2014/12/30 12:36:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.5 2015/01/17 19:10:18 jmcneill Exp $");
#include
#include
@@ -67,6 +67,11 @@ static int dwc_mmc_pio_wait(struct dwc_m
static int dwc_mmc_pio_transfer(struct dwc_mmc_softc *,
struct sdmmc_command *);
+#ifdef DWC_MMC_DEBUG
+static void dwc_mmc_print_rint(struct dwc_mmc_softc *, const char *,
+ uint32_t);
+#endif
+
void dwc_mmc_dump_regs(void);
static struct sdmmc_chip_functions dwc_mmc_chip_functions = {
@@ -142,7 +147,7 @@ dwc_mmc_intr(void *priv)
MMC_WRITE(sc, DWC_MMC_MINTSTS_REG, mint);
#ifdef DWC_MMC_DEBUG
- device_printf(sc->sc_dev, "mint %#x rint %#x\n", mint, rint);
+ dwc_mmc_print_rint(sc, "irq", rint);
#endif
if (rint & DWC_MMC_INT_CARDDET) {
@@ -489,8 +494,7 @@ dwc_mmc_exec_command(sdmmc_chipset_handl
DWC_MMC_INT_ERROR|DWC_MMC_INT_CD, hz * 10);
if (cmd->c_error == 0 && (sc->sc_intr_rint & DWC_MMC_INT_ERROR)) {
#ifdef DWC_MMC_DEBUG
- device_printf(sc->sc_dev, "%s: rint %#x\n", __func__,
- sc->sc_intr_rint);
+ dwc_mmc_print_rint(sc, "exec1", sc->sc_intr_rint);
#endif
if (sc->sc_intr_rint & DWC_MMC_INT_RTO) {
cmd->c_error = ETIMEDOUT;
@@ -509,8 +513,7 @@ dwc_mmc_exec_command(sdmmc_chipset_handl
if (cmd->c_error == 0 &&
(sc->sc_intr_rint & DWC_MMC_INT_ERROR)) {
#ifdef DWC_MMC_DEBUG
- device_printf(sc->sc_dev, "%s: rint2 %#x\n", __func__,
- sc->sc_intr_rint);
+ dwc_mmc_print_rint(sc, "exec2", sc->sc_intr_rint);
#endif
cmd->c_error = ETIMEDOUT;
}
@@ -558,6 +561,16 @@ dwc_mmc_card_intr_ack(sdmmc_chipset_hand
{
}
+#ifdef DWC_MMC_DEBUG
+static void
+dwc_mmc_print_rint(struct dwc_mmc_softc *sc, const char *tag, uint32_t rint)
+{
+ char buf[128];
+ snprintb(buf, sizeof(buf), DWC_MMC_INT_BITS, rint);
+ device_printf(sc->sc_dev, "[%s] rint %s\n", tag, buf);
+}
+#endif
+
void
dwc_mmc_dump_regs(void)
{
Index: src/sys/dev/ic/dwc_mmc_reg.h
diff -u src/sys/dev/ic/dwc_mmc_reg.h:1.2 src/sys/dev/ic/dwc_mmc_reg.h:1.3
--- src/sys/dev/ic/dwc_mmc_reg.h:1.2 Sat Dec 27 19:18:04 2014
+++ src/sys/dev/ic/dwc_mmc_reg.h Sat Jan 17 19:10:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc_reg.h,v 1.2 2014/12/27 19:18:04 jmcneill Exp $ */
+/* $NetBSD: dwc_mmc_reg.h,v 1.3 2015/01/17 19:10:18 jmcneill Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill
@@ -113,6 +113,27 @@
DWC_MMC_INT_RTO | DWC_MMC_INT_DRTO | DWC_MMC_INT_HTO | \
DWC_MMC_INT_HLE | DWC_MMC_INT_SBE | DWC_MMC_INT_EBE)
+#define DWC_MMC_INT_BITS \
+ "\20" \
+ "\x18" "SDIO_INT" \
+ "\x10" "NEW_INT" \
+ "\x0f" "EBE" \
+ "\x0e" "ACD" \
+ "\x0d" "SBE" \
+ "\x0c" "HLE" \
+ "\x0b" "FRUN" \
+ "\x0a" "HTO" \
+ "\x09" "DRTO" \
+ "\x08" "RTO" \
+ "\x07" "DCRC" \
+ "\x06" "RCRC" \
+ "\x05" "RXDR" \
+ "\x04" "TXDR" \
+ "\x03" "DTO" \
+ "\x02" "CD" \
+ "\x01" "RE" \
+ "\x00" "CARDDET"
+
#define DWC_MMC_CMD_START_CMD __BIT(31)
#define DWC_MMC_CMD_USE_HOLD_REG __BIT(29)
#define DWC_MMC_CMD_VOLT_SWITCH __BIT(28)
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Sat Jan 17 19:12:57 UTC 2015 Modified Files: src/distrib/sets/lists/base: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.aarch64 ad.arm ad.mips ad.powerpc ad.riscv md.amd64 md.sparc64 shl.mi Log Message: bump libamu. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/base/ad.aarch64 cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.62 -r1.63 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/base/ad.powerpc cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/base/ad.riscv cvs rdiff -u -r1.258 -r1.259 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.246 -r1.247 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.731 -r1.732 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/debug/ad.aarch64 cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/debug/ad.powerpc cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/debug/ad.riscv cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/debug/md.amd64 cvs rdiff -u -r1.75 -r1.76 src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/debug/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/base/ad.aarch64 diff -u src/distrib/sets/lists/base/ad.aarch64:1.17 src/distrib/sets/lists/base/ad.aarch64:1.18 --- src/distrib/sets/lists/base/ad.aarch64:1.17 Fri Jan 16 13:46:42 2015 +++ src/distrib/sets/lists/base/ad.aarch64 Sat Jan 17 14:12:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.17 2015/01/16 18:46:42 christos Exp $ +# $NetBSD: ad.aarch64,v 1.18 2015/01/17 19:12:57 christos Exp $ ./lib/eabi base-compat-shlib compat ./lib/eabi/npf base-npf-shlib compat ./lib/eabi/npf/ext_log.so base-npf-shlib compat,pic @@ -83,8 +83,8 @@ ./usr/lib/eabi/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic ./usr/lib/eabi/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic ./usr/lib/eabi/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic -./usr/lib/eabi/libamu.so.4 base-compat-shlib compat,pic -./usr/lib/eabi/libamu.so.4.0 base-compat-shlib compat,pic +./usr/lib/eabi/libamu.so.5 base-compat-shlib compat,pic +./usr/lib/eabi/libamu.so.5.0 base-compat-shlib compat,pic ./usr/lib/eabi/libarchive.so.3 base-compat-shlib compat,pic ./usr/lib/eabi/libarchive.so.3.1 base-compat-shlib compat,pic ./usr/lib/eabi/libarm.so.0 base-compat-shlib compat,pic @@ -399,8 +399,8 @@ ./usr/lib/eabihf/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic ./usr/lib/eabihf/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic ./usr/lib/eabihf/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic -./usr/lib/eabihf/libamu.so.4 base-compat-shlib compat,pic -./usr/lib/eabihf/libamu.so.4.0 base-compat-shlib compat,pic +./usr/lib/eabihf/libamu.so.5 base-compat-shlib compat,pic +./usr/lib/eabihf/libamu.so.5.0 base-compat-shlib compat,pic ./usr/lib/eabihf/libarchive.so.3 base-compat-shlib compat,pic ./usr/lib/eabihf/libarchive.so.3.1 base-compat-shlib compat,pic ./usr/lib/eabihf/libarm.so.0 base-compat-shlib compat,pic @@ -715,8 +715,8 @@ ./usr/lib/oabi/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic ./usr/lib/oabi/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic ./usr/lib/oabi/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/libamu.so.4 base-compat-shlib compat,pic -./usr/lib/oabi/libamu.so.4.0 base-compat-shlib compat,pic +./usr/lib/oabi/libamu.so.5 base-compat-shlib compat,pic +./usr/lib/oabi/libamu.so.5.0 base-compat-shlib compat,pic ./usr/lib/oabi/libarchive.so.3 base-compat-shlib compat,pic ./usr/lib/oabi/libarchive.so.3.1 base-compat-shlib compat,pic ./usr/lib/oabi/libarm.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.arm diff -u src/distrib/sets/lists/base/ad.arm:1.68 src/distrib/sets/lists/base/ad.arm:1.69 --- src/distrib/sets/lists/base/ad.arm:1.68 Fri Jan 16 13:46:42 2015 +++ src/distrib/sets/lists/base/ad.arm Sat Jan 17 14:12:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.68 2015/01/16 18:46:42 christos Exp $ +# $NetBSD: ad.arm,v 1.69 2015/01/17 19:12:57 christos Exp $ ./lib/oabi base-compat-shlib compat ./lib/oabi/npf base-npf-shlib compat ./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic @@ -67,8 +67,8 @@ ./usr/lib/oabi/i18n/libmapper_std.so.5.0 base-i18n-shlib compat,pic ./usr/lib/oabi/i18n/libmapper_zone.so.5 base-i18n-shlib compat,pic ./usr/lib/oabi/i18n/libmapper_zone.so.5.0 base-i18n-shlib compat,pic -./usr/lib/oabi/libamu.so.4 base-compat-shlib compat,pic -./usr/lib/oabi/liba
CVS commit: src/sys/dev/ic
Module Name:src Committed By: jmcneill Date: Sat Jan 17 19:32:50 UTC 2015 Modified Files: src/sys/dev/ic: dwc_mmc_reg.h Log Message: fix previous To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/dwc_mmc_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/dev/ic/dwc_mmc_reg.h diff -u src/sys/dev/ic/dwc_mmc_reg.h:1.3 src/sys/dev/ic/dwc_mmc_reg.h:1.4 --- src/sys/dev/ic/dwc_mmc_reg.h:1.3 Sat Jan 17 19:10:18 2015 +++ src/sys/dev/ic/dwc_mmc_reg.h Sat Jan 17 19:32:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_mmc_reg.h,v 1.3 2015/01/17 19:10:18 jmcneill Exp $ */ +/* $NetBSD: dwc_mmc_reg.h,v 1.4 2015/01/17 19:32:50 jmcneill Exp $ */ /*- * Copyright (c) 2014 Jared D. McNeill @@ -115,24 +115,24 @@ #define DWC_MMC_INT_BITS \ "\20" \ - "\x18" "SDIO_INT" \ - "\x10" "NEW_INT" \ - "\x0f" "EBE" \ - "\x0e" "ACD" \ - "\x0d" "SBE" \ - "\x0c" "HLE" \ - "\x0b" "FRUN" \ - "\x0a" "HTO" \ - "\x09" "DRTO" \ - "\x08" "RTO" \ - "\x07" "DCRC" \ - "\x06" "RCRC" \ - "\x05" "RXDR" \ - "\x04" "TXDR" \ - "\x03" "DTO" \ - "\x02" "CD" \ - "\x01" "RE" \ - "\x00" "CARDDET" + "\x19" "SDIO_INT" \ + "\x11" "NEW_INT" \ + "\x10" "EBE" \ + "\x0f" "ACD" \ + "\x0e" "SBE" \ + "\x0d" "HLE" \ + "\x0c" "FRUN" \ + "\x0b" "HTO" \ + "\x0a" "DRTO" \ + "\x09" "RTO" \ + "\x08" "DCRC" \ + "\x07" "RCRC" \ + "\x06" "RXDR" \ + "\x05" "TXDR" \ + "\x04" "DTO" \ + "\x03" "CD" \ + "\x02" "RE" \ + "\x01" "CARDDET" #define DWC_MMC_CMD_START_CMD __BIT(31) #define DWC_MMC_CMD_USE_HOLD_REG __BIT(29)
CVS commit: src/lib/librumpclient
Module Name:src
Committed By: justin
Date: Sat Jan 17 19:34:50 UTC 2015
Modified Files:
src/lib/librumpclient: rumpclient.c
Log Message:
Modern Android SDK does not need special cases
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/lib/librumpclient/rumpclient.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/librumpclient/rumpclient.c
diff -u src/lib/librumpclient/rumpclient.c:1.64 src/lib/librumpclient/rumpclient.c:1.65
--- src/lib/librumpclient/rumpclient.c:1.64 Sat Dec 13 17:18:55 2014
+++ src/lib/librumpclient/rumpclient.c Sat Jan 17 19:34:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpclient.c,v 1.64 2014/12/13 17:18:55 justin Exp $ */
+/* $NetBSD: rumpclient.c,v 1.65 2015/01/17 19:34:50 justin Exp $ */
/*
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -46,11 +46,11 @@
defined(__DragonFly__) || defined(__OpenBSD__)
#define USE_KQUEUE
#endif
-#if defined(__linux__) && !defined(__ANDROID__)
+#if defined(__linux__)
#define USE_SIGNALFD
#endif
-__RCSID("$NetBSD: rumpclient.c,v 1.64 2014/12/13 17:18:55 justin Exp $");
+__RCSID("$NetBSD: rumpclient.c,v 1.65 2015/01/17 19:34:50 justin Exp $");
#include
#include
@@ -86,17 +86,9 @@ int (*host_socket)(int, int, int);
int (*host_close)(int);
int (*host_connect)(int, const struct sockaddr *, socklen_t);
int (*host_fcntl)(int, int, ...);
-#ifdef __ANDROID__
-int (*host_poll)(struct pollfd *, nfds_t, long);
-#else
int (*host_poll)(struct pollfd *, nfds_t, int);
-#endif
ssize_t (*host_read)(int, void *, size_t);
-#ifdef __ANDROID__
-int (*host_sendmsg)(int, const struct msghdr *, unsigned int);
-#else
ssize_t (*host_sendmsg)(int, const struct msghdr *, int);
-#endif
int (*host_setsockopt)(int, int, int, const void *, socklen_t);
int (*host_dup)(int);
CVS commit: src/external/bsd/am-utils/dist/amd
Module Name:src
Committed By: christos
Date: Sat Jan 17 19:36:40 UTC 2015
Modified Files:
src/external/bsd/am-utils/dist/amd: amq_subr.c
Log Message:
don't use time_t in xdr_long
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/am-utils/dist/amd/amq_subr.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/am-utils/dist/amd/amq_subr.c
diff -u src/external/bsd/am-utils/dist/amd/amq_subr.c:1.1.1.3 src/external/bsd/am-utils/dist/amd/amq_subr.c:1.2
--- src/external/bsd/am-utils/dist/amd/amq_subr.c:1.1.1.3 Sat Jan 17 11:34:15 2015
+++ src/external/bsd/am-utils/dist/amd/amq_subr.c Sat Jan 17 14:36:39 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amq_subr.c,v 1.1.1.3 2015/01/17 16:34:15 christos Exp $ */
+/* $NetBSD: amq_subr.c,v 1.2 2015/01/17 19:36:39 christos Exp $ */
/*
* Copyright (c) 1997-2014 Erez Zadok
@@ -530,6 +530,7 @@ xdr_amq_map_info_qelem(XDR *xdrs, qelem
u_int len = 0;
int x;
char *n;
+ long modify;
/*
* Compute length of list
@@ -554,7 +555,8 @@ xdr_amq_map_info_qelem(XDR *xdrs, qelem
return (FALSE);
}
-if (!xdr_long(xdrs, &m->modify)) {
+modify = m->modify;
+if (!xdr_long(xdrs, &modify)) {
return (FALSE);
}
CVS commit: src/sys/arch/arm/arm
Module Name:src
Committed By: skrll
Date: Sat Jan 17 19:46:41 UTC 2015
Modified Files:
src/sys/arch/arm/arm: disassem.c
Log Message:
Remove duplicate entry
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/arm/disassem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/disassem.c
diff -u src/sys/arch/arm/arm/disassem.c:1.28 src/sys/arch/arm/arm/disassem.c:1.29
--- src/sys/arch/arm/arm/disassem.c:1.28 Fri Jan 2 15:52:33 2015
+++ src/sys/arch/arm/arm/disassem.c Sat Jan 17 19:46:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: disassem.c,v 1.28 2015/01/02 15:52:33 skrll Exp $ */
+/* $NetBSD: disassem.c,v 1.29 2015/01/17 19:46:41 skrll Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -49,7 +49,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.28 2015/01/02 15:52:33 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.29 2015/01/17 19:46:41 skrll Exp $");
#include
@@ -239,7 +239,6 @@ static const struct arm32_insn arm32_i[]
{ 0x0f100010, 0x0e100010, "mrc", "#z" },
{ 0xff10, 0xfe00, "cdp2", "#y" },
{ 0x0f10, 0x0e00, "cdp", "#y" },
-{ 0x0f100010, 0x0e10, "mcr", "#z" },
{ 0x0ff0, 0x0c40, "mcrr", "#&" },
{ 0x0ff0, 0x0c50, "mrrc", "#&" },
{ 0xfe100090, 0xfc10, "ldc2", "L#v" },
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sat Jan 17 19:47:34 UTC 2015 Modified Files: src/sys/arch/arm/arm: disassem.c Log Message: Document 'e' To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/arm/disassem.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm/disassem.c diff -u src/sys/arch/arm/arm/disassem.c:1.29 src/sys/arch/arm/arm/disassem.c:1.30 --- src/sys/arch/arm/arm/disassem.c:1.29 Sat Jan 17 19:46:41 2015 +++ src/sys/arch/arm/arm/disassem.c Sat Jan 17 19:47:34 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: disassem.c,v 1.29 2015/01/17 19:46:41 skrll Exp $ */ +/* $NetBSD: disassem.c,v 1.30 2015/01/17 19:47:34 skrll Exp $ */ /* * Copyright (c) 1996 Mark Brinicombe. @@ -49,7 +49,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.29 2015/01/17 19:46:41 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disassem.c,v 1.30 2015/01/17 19:47:34 skrll Exp $"); #include @@ -77,6 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: disassem.c,v * b - branch address * c - comment field bits(0-23) * d - destination register (bits 12-15) + * e - address operand of ldrh/strh instruction * f - 1st fp operand (register) (bits 12-14) * g - 2nd fp operand (register) (bits 16-18) * h - 3rd fp operand (register/immediate) (bits 0-4)
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: martin Date: Sat Jan 17 21:48:05 UTC 2015 Modified Files: src/sys/dev/pci [netbsd-7]: pcidevs Log Message: Pull up revision 1.1204 for ticket #432 To generate a diff of this commit: cvs rdiff -u -r1.1199.2.1 -r1.1199.2.2 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.1199.2.1 src/sys/dev/pci/pcidevs:1.1199.2.2 --- src/sys/dev/pci/pcidevs:1.1199.2.1 Fri Nov 7 21:34:56 2014 +++ src/sys/dev/pci/pcidevs Sat Jan 17 21:48:05 2015 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1199.2.1 2014/11/07 21:34:56 snj Exp $ +$NetBSD: pcidevs,v 1.1199.2.2 2015/01/17 21:48:05 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -4918,6 +4918,7 @@ product REALTEK RTS5209 0x5209 RTS5209 product REALTEK RTS5227 0x5227 RTS5227 PCI-E Card Reader product REALTEK RTS5229 0x5229 RTS5229 PCI-E Card Reader product REALTEK RTS5249 0x5249 RTS5249 PCI-E Card Reader +product REALTEK RTL8402 0x5286 RTL8402 PCI-E Card Reader product REALTEK RTL8411B 0x5287 RTL8411B PCI-E Card Reader product REALTEK RTL8411 0x5289 RTL8411 PCI-E Card Reader product REALTEK RT8029 0x8029 8029 Ethernet
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Sat Jan 17 21:49:38 UTC 2015
Modified Files:
src/sys/dev/pci [netbsd-7]: pcidevs.h pcidevs_data.h
Log Message:
regen (ticket #432)
To generate a diff of this commit:
cvs rdiff -u -r1.1192.2.1 -r1.1192.2.2 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1191.2.1 -r1.1191.2.2 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.1192.2.1 src/sys/dev/pci/pcidevs.h:1.1192.2.2
--- src/sys/dev/pci/pcidevs.h:1.1192.2.1 Fri Nov 7 21:36:29 2014
+++ src/sys/dev/pci/pcidevs.h Sat Jan 17 21:49:36 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1192.2.1 2014/11/07 21:36:29 snj Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1192.2.2 2015/01/17 21:49:36 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1199.2.1 2014/11/07 21:34:56 snj Exp
+ * NetBSD: pcidevs,v 1.1199.2.2 2015/01/17 21:48:05 martin Exp
*/
/*
@@ -4925,6 +4925,7 @@
#define PCI_PRODUCT_REALTEK_RTS5227 0x5227 /* RTS5227 PCI-E Card Reader */
#define PCI_PRODUCT_REALTEK_RTS5229 0x5229 /* RTS5229 PCI-E Card Reader */
#define PCI_PRODUCT_REALTEK_RTS5249 0x5249 /* RTS5249 PCI-E Card Reader */
+#define PCI_PRODUCT_REALTEK_RTL8402 0x5286 /* RTL8402 PCI-E Card Reader */
#define PCI_PRODUCT_REALTEK_RTL8411B 0x5287 /* RTL8411B PCI-E Card Reader */
#define PCI_PRODUCT_REALTEK_RTL8411 0x5289 /* RTL8411 PCI-E Card Reader */
#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.1191.2.1 src/sys/dev/pci/pcidevs_data.h:1.1191.2.2
--- src/sys/dev/pci/pcidevs_data.h:1.1191.2.1 Fri Nov 7 21:36:29 2014
+++ src/sys/dev/pci/pcidevs_data.h Sat Jan 17 21:49:36 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1191.2.1 2014/11/07 21:36:29 snj Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1191.2.2 2015/01/17 21:49:36 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1199.2.1 2014/11/07 21:34:56 snj Exp
+ * NetBSD: pcidevs,v 1.1199.2.2 2015/01/17 21:48:05 martin Exp
*/
/*
@@ -8257,1358 +8257,1360 @@ static const uint16_t pci_products[] = {
25918, 15718, 10790, 14331, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTS5249,
25926, 15718, 10790, 14331, 0,
- PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8411B,
+ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8402,
25934, 15718, 10790, 14331, 0,
+ PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8411B,
+ 25942, 15718, 10790, 14331, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8411,
- 25943, 15718, 10790, 14331, 0,
+ 25951, 15718, 10790, 14331, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8029,
- 25951, 5501, 0,
+ 25959, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8139D,
- 25956, 5603, 5501, 0,
+ 25964, 5603, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8100,
- 25962, 5603, 5501, 0,
+ 25970, 5603, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8129,
- 25967, 5603, 5501, 0,
+ 25975, 5603, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8101E,
- 25972, 5603, 5501, 0,
+ 25980, 5603, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8138,
- 25990, 5603, 5501, 0,
+ 25998, 5603, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8139,
7364, 5603, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8169SC,
- 25995, 5516, 5501, 0,
+ 26003, 5516, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168,
- 26009, 5516, 5501, 0,
+ 26017, 5516, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8169,
- 26019, 5516, 5501, 0,
+ 26027, 5516, 5501, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8188CE,
- 26029, 4739, 4534, 26039, 15718, 16214, 0,
+ 26037, 4739, 4534, 26047, 15718, 16214, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8180,
- 26047, 7460, 0,
+ 26055, 7460, 0,
PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8185,
- 26052, 26057, 0,
+ 26060, 26065, 0,
PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7780,
- 26069, 615, 6239, 0,
+ 26077, 615, 6239, 0,
PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7785,
- 26076, 615, 6239, 0,
+ 26084, 615, 6239, 0,
PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7757_PBI,
- 26083, 17156, 26090, 26100, 0,
+ 26091, 17156, 26098, 26108, 0,
PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7757_PPB,
- 26083, 15280, 6347, 26106, 0,
+ 26091, 15280, 6347, 26114, 0,
PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7757_PS,
- 26083, 17156, 26112, 26119, 0,
+ 26091, 17156, 26120, 26127, 0,
PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_PD720201,
- 2612
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Sat Jan 17 21:52:19 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ammend #432 for additional files pulled up. To generate a diff of this commit: cvs rdiff -u -r1.1.2.170 -r1.1.2.171 src/doc/CHANGES-7.0 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-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.170 src/doc/CHANGES-7.0:1.1.2.171 --- src/doc/CHANGES-7.0:1.1.2.170 Sat Jan 17 14:14:58 2015 +++ src/doc/CHANGES-7.0 Sat Jan 17 21:52:19 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.170 2015/01/17 14:14:58 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.171 2015/01/17 21:52:19 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -14050,6 +14050,9 @@ share/man/man4/rtsx.41.3-1.4 sys/dev/ic/rtsx.c1.2 sys/dev/ic/rtsxreg.h1.2 sys/dev/ic/rtsxvar.h1.2 +sys/dev/pci/pcidevs1.1204 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) sys/dev/pci/rtsx_pci.c1.3 Added RTS5227/RTL8402/RTL8411/RTL8411B support.
CVS commit: src/lib/librumpuser
Module Name:src Committed By: justin Date: Sat Jan 17 23:49:40 UTC 2015 Modified Files: src/lib/librumpuser: rumpuser_port.h Log Message: Remove no longer required definitions To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/lib/librumpuser/rumpuser_port.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librumpuser/rumpuser_port.h diff -u src/lib/librumpuser/rumpuser_port.h:1.42 src/lib/librumpuser/rumpuser_port.h:1.43 --- src/lib/librumpuser/rumpuser_port.h:1.42 Mon Nov 10 22:43:46 2014 +++ src/lib/librumpuser/rumpuser_port.h Sat Jan 17 23:49:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpuser_port.h,v 1.42 2014/11/10 22:43:46 pooka Exp $ */ +/* $NetBSD: rumpuser_port.h,v 1.43 2015/01/17 23:49:40 justin Exp $ */ #ifndef _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ #define _LIB_LIBRUMPUSER_RUMPUSER_PORT_H_ @@ -112,10 +112,6 @@ typedef uint16_t in_port_t; #include #define atomic_inc_uint(x) __sync_fetch_and_add(x, 1) #define atomic_dec_uint(x) __sync_fetch_and_sub(x, 1) -#include -int clock_nanosleep (clockid_t, int, const struct timespec *, struct timespec *); -#include -void arc4random_buf(void*, size_t); #endif /* sunny magic */
