CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: hannken
Date: Sun Jul 26 08:13:24 UTC 2015
Modified Files:
src/sys/ufs/lfs: lfs_vnops.c
Log Message:
lfs_flush_pchain: replace vget() with vcache_get().
To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/sys/ufs/lfs/lfs_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/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.276 src/sys/ufs/lfs/lfs_vnops.c:1.277
--- src/sys/ufs/lfs/lfs_vnops.c:1.276 Sat Jul 25 10:40:35 2015
+++ src/sys/ufs/lfs/lfs_vnops.c Sun Jul 26 08:13:23 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.276 2015/07/25 10:40:35 martin Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.277 2015/07/26 08:13:23 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lfs_vnops.c,v 1.276 2015/07/25 10:40:35 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: lfs_vnops.c,v 1.277 2015/07/26 08:13:23 hannken Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -1682,31 +1682,34 @@ lfs_flush_pchain(struct lfs *fs)
mutex_enter(lfs_lock);
top:
for (ip = TAILQ_FIRST(fs-lfs_pchainhd); ip != NULL; ip = nip) {
+ struct mount *mp = ITOV(ip)-v_mount;
+ ino_t ino = ip-i_number;
+
nip = TAILQ_NEXT(ip, i_lfs_pchain);
- vp = ITOV(ip);
if (!(ip-i_flags IN_PAGING))
goto top;
- mutex_enter(vp-v_interlock);
- if (vdead_check(vp, VDEAD_NOWAIT) != 0 ||
- (vp-v_uflag VU_DIROP) != 0) {
- mutex_exit(vp-v_interlock);
- continue;
- }
- if (vp-v_type != VREG) {
- mutex_exit(vp-v_interlock);
- continue;
- }
- if (vget(vp, LK_NOWAIT, false /* !wait */))
- continue;
mutex_exit(lfs_lock);
-
- if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT | LK_RETRY) != 0) {
+ if (vcache_get(mp, ino, sizeof(ino), vp) != 0) {
+ mutex_enter(lfs_lock);
+ continue;
+ };
+ if (vn_lock(vp, LK_EXCLUSIVE | LK_NOWAIT) != 0) {
vrele(vp);
mutex_enter(lfs_lock);
continue;
}
+ ip = VTOI(vp);
+ mutex_enter(lfs_lock);
+ if ((vp-v_uflag VU_DIROP) != 0 || vp-v_type != VREG ||
+ !(ip-i_flags IN_PAGING)) {
+ mutex_exit(lfs_lock);
+ vput(vp);
+ mutex_enter(lfs_lock);
+ goto top;
+ }
+ mutex_exit(lfs_lock);
error = lfs_writefile(fs, sp, vp);
if (!VPISEMPTY(vp) !WRITEINPROG(vp)
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: hannken Date: Sun Jul 26 08:33:53 UTC 2015 Modified Files: src/sys/ufs/lfs: ulfs_quota1.c Log Message: Remove bogus mutex_enter(mntvnode_lock). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/lfs/ulfs_quota1.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/ufs/lfs/ulfs_quota1.c diff -u src/sys/ufs/lfs/ulfs_quota1.c:1.8 src/sys/ufs/lfs/ulfs_quota1.c:1.9 --- src/sys/ufs/lfs/ulfs_quota1.c:1.8 Sat May 24 16:34:04 2014 +++ src/sys/ufs/lfs/ulfs_quota1.c Sun Jul 26 08:33:53 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ulfs_quota1.c,v 1.8 2014/05/24 16:34:04 christos Exp $ */ +/* $NetBSD: ulfs_quota1.c,v 1.9 2015/07/26 08:33:53 hannken Exp $ */ /* from NetBSD: ufs_quota1.c,v 1.18 2012/02/02 03:00:48 matt Exp */ /* @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ulfs_quota1.c,v 1.8 2014/05/24 16:34:04 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ulfs_quota1.c,v 1.9 2015/07/26 08:33:53 hannken Exp $); #include sys/param.h #include sys/kernel.h @@ -780,7 +780,6 @@ lfs_q1sync(struct mount *mp) mutex_exit(dq-dq_interlock); } vput(vp); - mutex_enter(mntvnode_lock); } vfs_vnode_iterator_destroy(marker); return (0);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun Jul 26 10:09:53 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: JETSONTK1 Log Message: disable DEBUG and LOCKDEBUG To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/JETSONTK1 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/conf/JETSONTK1 diff -u src/sys/arch/evbarm/conf/JETSONTK1:1.28 src/sys/arch/evbarm/conf/JETSONTK1:1.29 --- src/sys/arch/evbarm/conf/JETSONTK1:1.28 Sun May 31 14:43:59 2015 +++ src/sys/arch/evbarm/conf/JETSONTK1 Sun Jul 26 10:09:53 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: JETSONTK1,v 1.28 2015/05/31 14:43:59 jmcneill Exp $ +# $NetBSD: JETSONTK1,v 1.29 2015/07/26 10:09:53 jmcneill Exp $ # # NVIDIA Jetson TK1 - Tegra K1 development kit # https://developer.nvidia.com/jetson-tk1 @@ -16,8 +16,8 @@ options MULTIPROCESSOR #options MEMSIZE=2048 options DIAGNOSTIC # internal consistency checks -options DEBUG -options LOCKDEBUG +#options DEBUG +#options LOCKDEBUG #options PMAP_DEBUG # Enable pmap_debug_level code #options IPKDB # remote kernel debugging #options VERBOSE_INIT_ARM # verbose bootstraping messages
CVS commit: src/sys/dev
Module Name:src
Committed By: skrll
Date: Sun Jul 26 07:23:10 UTC 2015
Modified Files:
src/sys/dev: ldvar.h
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/ldvar.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/ldvar.h
diff -u src/sys/dev/ldvar.h:1.23 src/sys/dev/ldvar.h:1.24
--- src/sys/dev/ldvar.h:1.23 Sat May 2 08:00:08 2015
+++ src/sys/dev/ldvar.h Sun Jul 26 07:23:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ldvar.h,v 1.23 2015/05/02 08:00:08 mlelstv Exp $ */
+/* $NetBSD: ldvar.h,v 1.24 2015/07/26 07:23:10 skrll Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,29 +38,29 @@
#include dev/dkvar.h /* for dk_softc */
struct ld_softc {
- struct dk_softc sc_dksc;
- kmutex_t sc_mutex;
+ struct dk_softc sc_dksc;
+ kmutex_t sc_mutex;
krndsource_t sc_rnd_source;
- int sc_queuecnt; /* current h/w queue depth */
- int sc_ncylinders; /* # cylinders */
- int sc_nheads; /* # heads */
- int sc_nsectors; /* # sectors per track */
+ int sc_queuecnt; /* current h/w queue depth */
+ int sc_ncylinders; /* # cylinders */
+ int sc_nheads; /* # heads */
+ int sc_nsectors; /* # sectors per track */
uint64_t sc_disksize512;
/*
* The following are filled by hardware specific attachment code.
*/
device_t sc_dv;
- int sc_flags; /* control flags */
- uint64_t sc_secperunit; /* # sectors in total */
- int sc_secsize; /* sector size in bytes */
- int sc_maxxfer; /* max xfer size in bytes */
- int sc_maxqueuecnt; /* maximum h/w queue depth */
-
- int (*sc_dump)(struct ld_softc *, void *, int, int);
- int (*sc_flush)(struct ld_softc *, int);
- int (*sc_start)(struct ld_softc *, struct buf *);
+ int sc_flags; /* control flags */
+ uint64_t sc_secperunit; /* # sectors in total */
+ int sc_secsize; /* sector size in bytes */
+ int sc_maxxfer; /* max xfer size in bytes */
+ int sc_maxqueuecnt; /* maximum h/w queue depth */
+
+ int (*sc_dump)(struct ld_softc *, void *, int, int);
+ int (*sc_flush)(struct ld_softc *, int);
+ int (*sc_start)(struct ld_softc *, struct buf *);
};
/* sc_flags */
CVS commit: src/sys/arch/amd64
Module Name:src
Committed By: mrg
Date: Sun Jul 26 10:49:05 UTC 2015
Modified Files:
src/sys/arch/amd64/amd64: kgdb_machdep.c
src/sys/arch/amd64/include: db_machdep.h
Log Message:
properly copy regs for kgdb, and define the number of registers properly.
from openbsd via Vicente Chaves and PR port-amd64/50091.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/amd64/kgdb_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/include/db_machdep.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/kgdb_machdep.c
diff -u src/sys/arch/amd64/amd64/kgdb_machdep.c:1.8 src/sys/arch/amd64/amd64/kgdb_machdep.c:1.9
--- src/sys/arch/amd64/amd64/kgdb_machdep.c:1.8 Sun Apr 3 22:29:25 2011
+++ src/sys/arch/amd64/amd64/kgdb_machdep.c Sun Jul 26 10:49:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.8 2011/04/03 22:29:25 dyoung Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.9 2015/07/26 10:49:05 mrg Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kgdb_machdep.c,v 1.8 2011/04/03 22:29:25 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: kgdb_machdep.c,v 1.9 2015/07/26 10:49:05 mrg Exp $);
#include opt_ddb.h
@@ -159,7 +159,26 @@ void
kgdb_getregs(db_regs_t *regs, kgdb_reg_t *gdb_regs)
{
- memcpy(gdb_regs, regs, sizeof *regs);
+ gdb_regs[ 0] = regs-tf_rax;
+ gdb_regs[ 1] = regs-tf_rbx;
+ gdb_regs[ 2] = regs-tf_rcx;
+ gdb_regs[ 3] = regs-tf_rdx;
+ gdb_regs[ 4] = regs-tf_rsi;
+ gdb_regs[ 5] = regs-tf_rdi;
+ gdb_regs[ 6] = regs-tf_rbp;
+ gdb_regs[ 7] = regs-tf_rsp;
+ gdb_regs[ 8] = regs-tf_r8;
+ gdb_regs[ 9] = regs-tf_r9;
+ gdb_regs[10] = regs-tf_r10;
+ gdb_regs[11] = regs-tf_r11;
+ gdb_regs[12] = regs-tf_r12;
+ gdb_regs[13] = regs-tf_r13;
+ gdb_regs[14] = regs-tf_r14;
+ gdb_regs[15] = regs-tf_r15;
+ gdb_regs[16] = regs-tf_rip;
+ gdb_regs[17] = regs-tf_rflags;
+ gdb_regs[18] = regs-tf_cs;
+ gdb_regs[19] = regs-tf_ss;
}
/*
@@ -169,7 +188,26 @@ void
kgdb_setregs(db_regs_t *regs, kgdb_reg_t *gdb_regs)
{
- memcpy(regs, gdb_regs, sizeof *regs);
+ regs-tf_rax = gdb_regs[ 0];
+ regs-tf_rbx = gdb_regs[ 1];
+ regs-tf_rcx = gdb_regs[ 2];
+ regs-tf_rdx = gdb_regs[ 3];
+ regs-tf_rsi = gdb_regs[ 4];
+ regs-tf_rdi = gdb_regs[ 5];
+ regs-tf_rbp = gdb_regs[ 6];
+ regs-tf_rsp = gdb_regs[ 7];
+ regs-tf_r8 = gdb_regs[ 8];
+ regs-tf_r9 = gdb_regs[ 9];
+ regs-tf_r10 = gdb_regs[10];
+ regs-tf_r11 = gdb_regs[11];
+ regs-tf_r12 = gdb_regs[12];
+ regs-tf_r13 = gdb_regs[13];
+ regs-tf_r14 = gdb_regs[14];
+ regs-tf_r15 = gdb_regs[15];
+ regs-tf_rip = gdb_regs[16];
+ regs-tf_rflags = gdb_regs[17];
+ regs-tf_cs = gdb_regs[18];
+ regs-tf_ss = gdb_regs[19];
}
/*
Index: src/sys/arch/amd64/include/db_machdep.h
diff -u src/sys/arch/amd64/include/db_machdep.h:1.14 src/sys/arch/amd64/include/db_machdep.h:1.15
--- src/sys/arch/amd64/include/db_machdep.h:1.14 Thu Oct 17 23:05:08 2013
+++ src/sys/arch/amd64/include/db_machdep.h Sun Jul 26 10:49:05 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.14 2013/10/17 23:05:08 christos Exp $ */
+/* $NetBSD: db_machdep.h,v 1.15 2015/07/26 10:49:05 mrg Exp $ */
/*
* Mach Operating System
@@ -120,7 +120,7 @@ bool db_phys_eq(task_t, vaddr_t, task_t
* Constants for KGDB.
*/
typedef long kgdb_reg_t;
-#define KGDB_NUMREGS 16
+#define KGDB_NUMREGS 20
#define KGDB_BUFLEN 512
#if 0
CVS commit: src/tools/compat
Module Name:src Committed By: kamil Date: Sun Jul 26 14:01:53 UTC 2015 Modified Files: src/tools/compat: Makefile compat_defs.h configure configure.ac nbtool_config.h.in Log Message: Add reallocarr(3) to tools/compat This should unbreak libutil(3) creation on systems withot reallocarr(3). To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/tools/compat/Makefile cvs rdiff -u -r1.101 -r1.102 src/tools/compat/compat_defs.h cvs rdiff -u -r1.82 -r1.83 src/tools/compat/configure cvs rdiff -u -r1.83 -r1.84 src/tools/compat/configure.ac cvs rdiff -u -r1.36 -r1.37 src/tools/compat/nbtool_config.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/Makefile diff -u src/tools/compat/Makefile:1.73 src/tools/compat/Makefile:1.74 --- src/tools/compat/Makefile:1.73 Sun Jan 18 18:09:10 2015 +++ src/tools/compat/Makefile Sun Jul 26 14:01:53 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2015/01/18 18:09:10 christos Exp $ +# $NetBSD: Makefile,v 1.74 2015/07/26 14:01:53 kamil Exp $ HOSTLIB= nbcompat @@ -13,7 +13,7 @@ SRCS= atoll.c basename.c cdbr.c cdbw.c mi_vector_hash.c mkdtemp.c \ mkstemp.c pread.c putc_unlocked.c pwcache.c pwrite.c \ pw_scan.c \ - raise_default_signal.c rmd160.c rmd160hl.c \ + raise_default_signal.c reallocarr.c rmd160.c rmd160hl.c \ setenv.c setgroupent.c \ setpassent.c setprogname.c sha1.c sha1hl.c sha2.c \ sha256hl.c sha384hl.c sha512hl.c snprintb.c snprintf.c \ Index: src/tools/compat/compat_defs.h diff -u src/tools/compat/compat_defs.h:1.101 src/tools/compat/compat_defs.h:1.102 --- src/tools/compat/compat_defs.h:1.101 Fri Jan 16 18:44:06 2015 +++ src/tools/compat/compat_defs.h Sun Jul 26 14:01:53 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: compat_defs.h,v 1.101 2015/01/16 18:44:06 christos Exp $ */ +/* $NetBSD: compat_defs.h,v 1.102 2015/07/26 14:01:53 kamil Exp $ */ #ifndef __NETBSD_COMPAT_DEFS_H__ #define __NETBSD_COMPAT_DEFS_H__ @@ -469,6 +469,10 @@ ssize_t pwrite(int, const void *, size_t int raise_default_signal(int); #endif +#if !HAVE_REALLOCARR +int reallocarr(void *, size_t, size_t); +#endif + #if !HAVE_SETENV int setenv(const char *, const char *, int); #endif Index: src/tools/compat/configure diff -u src/tools/compat/configure:1.82 src/tools/compat/configure:1.83 --- src/tools/compat/configure:1.82 Fri Jan 16 18:44:31 2015 +++ src/tools/compat/configure Sun Jul 26 14:01:53 2015 @@ -5044,7 +5044,7 @@ for ac_func in atoll asprintf asnprintf getopt getopt_long group_from_gid gid_from_group \ heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \ mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \ - pwrite raise_default_signal random setenv \ + pwrite raise_default_signal random reallocarr setenv \ setgroupent setprogname setpassent \ snprintb_m snprintf strlcat strlcpy strmode \ strndup strnlen strsep strsuftoll strtoi strtoll strtou \ Index: src/tools/compat/configure.ac diff -u src/tools/compat/configure.ac:1.83 src/tools/compat/configure.ac:1.84 --- src/tools/compat/configure.ac:1.83 Fri Jan 16 18:44:06 2015 +++ src/tools/compat/configure.ac Sun Jul 26 14:01:53 2015 @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.83 2015/01/16 18:44:06 christos Exp $ +# $NetBSD: configure.ac,v 1.84 2015/07/26 14:01:53 kamil Exp $ # # Autoconf definition file for libnbcompat. # @@ -157,7 +157,7 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf getopt getopt_long group_from_gid gid_from_group \ heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \ mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \ - pwrite raise_default_signal random setenv \ + pwrite raise_default_signal random reallocarr setenv \ setgroupent setprogname setpassent \ snprintb_m snprintf strlcat strlcpy strmode \ strndup strnlen strsep strsuftoll strtoi strtoll strtou \ Index: src/tools/compat/nbtool_config.h.in diff -u src/tools/compat/nbtool_config.h.in:1.36 src/tools/compat/nbtool_config.h.in:1.37 --- src/tools/compat/nbtool_config.h.in:1.36 Fri Jan 16 18:44:31 2015 +++ src/tools/compat/nbtool_config.h.in Sun Jul 26 14:01:53 2015 @@ -1,6 +1,6 @@ /* nbtool_config.h.in. Generated automatically from configure.ac by autoheader. */ -/* $NetBSD: nbtool_config.h.in,v 1.36 2015/01/16 18:44:31 christos Exp $*/ +/* $NetBSD: nbtool_config.h.in,v 1.37 2015/07/26 14:01:53 kamil Exp $*/ #ifndef __NETBSD_NBTOOL_CONFIG_H__ #define __NETBSD_NBTOOL_CONFIG_H__ @@ -419,6 +419,9 @@ /* Define if you have the `random' function. */ #undef HAVE_RANDOM +/* Define if you have the `reallocarr' function. */ +#undef HAVE_REALLOCARR + /* Define if you have the resolv.h header file. */ #undef HAVE_RESOLV_H
CVS commit: src/external/mit/xorg/server/xorg-server/GL
Module Name:src Committed By: mrg Date: Sun Jul 26 09:04:15 UTC 2015 Removed Files: src/external/mit/xorg/server/xorg-server/GL: Makefile src/external/mit/xorg/server/xorg-server/GL/GLcore: Makefile Makefile.GLcore src/external/mit/xorg/server/xorg-server/GL/glx: Makefile Makefile.glx Log Message: remove unused files. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/server/xorg-server/GL/Makefile cvs rdiff -u -r1.1 -r0 \ src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile cvs rdiff -u -r1.3 -r0 \ src/external/mit/xorg/server/xorg-server/GL/GLcore/Makefile.GLcore cvs rdiff -u -r1.2 -r0 \ src/external/mit/xorg/server/xorg-server/GL/glx/Makefile cvs rdiff -u -r1.6 -r0 \ src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Sun Jul 26 15:12:03 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_hdmi.c
Log Message:
fix a few typos in the audio infoframe we build
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_hdmi.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/nvidia/tegra_hdmi.c
diff -u src/sys/arch/arm/nvidia/tegra_hdmi.c:1.7 src/sys/arch/arm/nvidia/tegra_hdmi.c:1.8
--- src/sys/arch/arm/nvidia/tegra_hdmi.c:1.7 Sat Jul 25 15:55:31 2015
+++ src/sys/arch/arm/nvidia/tegra_hdmi.c Sun Jul 26 15:12:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_hdmi.c,v 1.7 2015/07/25 15:55:31 jmcneill Exp $ */
+/* $NetBSD: tegra_hdmi.c,v 1.8 2015/07/26 15:12:03 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_hdmi.c,v 1.7 2015/07/25 15:55:31 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_hdmi.c,v 1.8 2015/07/26 15:12:03 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -501,13 +501,14 @@ static void
tegra_hdmi_setup_audio_infoframe(struct tegra_hdmi_softc *sc)
{
uint8_t data[10] = {
- 0x84, 0x01, 0x10,
+ 0x84, 0x01, 0x0a,
0x00, /* PB0 (checksum) */
0x01, /* CT=0, CC=2ch */
- 0xc0, /* SS=0, SF=48kHz */
+ 0x00, /* SS=0, SF=0 */
+ 0x00,
0x00, /* CA=FR/FL */
0x00, /* LSV=0dB, DM_INH=permitted */
- 0x00, 0x00
+ 0x00
};
data[3] = tegra_hdmi_infoframe_csum(data, sizeof(data));
CVS commit: src/sys/arch/macppc/stand/ofwboot
Module Name:src Committed By: tsutsui Date: Sun Jul 26 14:24:29 UTC 2015 Modified Files: src/sys/arch/macppc/stand/ofwboot: Locore.c Log Message: Don't set garbages into BAT registers, which was broken in rev 1.25. Should fix PR port-macppc/50018 (though there is no response for 3 weeks), and should be pulled up to netbsd-7. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/macppc/stand/ofwboot/Locore.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/macppc/stand/ofwboot/Locore.c diff -u src/sys/arch/macppc/stand/ofwboot/Locore.c:1.25 src/sys/arch/macppc/stand/ofwboot/Locore.c:1.26 --- src/sys/arch/macppc/stand/ofwboot/Locore.c:1.25 Wed Feb 26 21:42:40 2014 +++ src/sys/arch/macppc/stand/ofwboot/Locore.c Sun Jul 26 14:24:29 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: Locore.c,v 1.25 2014/02/26 21:42:40 macallan Exp $ */ +/* $NetBSD: Locore.c,v 1.26 2015/07/26 14:24:29 tsutsui Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -75,6 +75,7 @@ __asm( cmpi0,1,%r0,0x02 \n /* 601 CPU = 0x0001 */ blt 1f \n /* skip over non-601 BAT setup */ /*non PPC 601 BATs*/ + li %r0,0 \n mtibatu 0,%r0 \n mtibatu 1,%r0 \n mtibatu 2,%r0 \n @@ -93,7 +94,8 @@ __asm( b 2f \n /* PPC 601 BATs*/ -1: mtibatu 0,%r0 \n +1: li %r0,0 \n + mtibatu 0,%r0 \n mtibatu 1,%r0 \n mtibatu 2,%r0 \n mtibatu 3,%r0 \n
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: kamil Date: Sun Jul 26 17:09:29 UTC 2015 Modified Files: src/lib/libc/stdlib: malloc.3 Log Message: Add history of allocators Idea accepted by christos No objctions from riastradh To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/lib/libc/stdlib/malloc.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/stdlib/malloc.3 diff -u src/lib/libc/stdlib/malloc.3:1.42 src/lib/libc/stdlib/malloc.3:1.43 --- src/lib/libc/stdlib/malloc.3:1.42 Sun Jul 26 17:00:37 2015 +++ src/lib/libc/stdlib/malloc.3 Sun Jul 26 17:09:29 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: malloc.3,v 1.42 2015/07/26 17:00:37 kamil Exp $ +.\ $NetBSD: malloc.3,v 1.43 2015/07/26 17:09:29 kamil Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -34,7 +34,7 @@ .\ @(#)malloc.3 8.1 (Berkeley) 6/4/93 .\ $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.73 2007/06/15 22:32:33 jasone Exp $ .\ -.Dd February 5, 2015 +.Dd July 26, 2015 .Dt MALLOC 3 .Os .Sh NAME @@ -265,3 +265,47 @@ and .Fn free functions conform to .St -isoC . +.Sh HISTORY +A +.Fn free +internal kernel function and a predecessor to +.Fn malloc , +.Fn alloc , +first appeared in +.At v1 . +The C Library functions +.Fn alloc +and +.Fn free +appeared in +.At v6 . +The functions +.Fn malloc , +.Fn calloc , +and +.Fn realloc +first appeared in +.At v7 . +.Pp +A new implementation by Chris Kingsley was introduced in +.Bx 4.2 , +followed by a complete rewrite by Poul-Henning Kamp ( +.Dq phk's malloc +or +.Dq new malloc ) +which appeared in +.Fx 2.2 +and was included in +.Nx 1.5 +and +.Ox 2.0 . +These implementations were all +.Xr sbrk 2 +based. +.Pp +The +.Fn jemalloc 3 +allocator became the default system allocator first in +.Fx 7.0 +and then in +.Nx 5.0 .
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: abs
Date: Sun Jul 26 15:30:36 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_pm.c
Log Message:
Avoid NULL dev_priv-vlv_pctx- deref in a WARN check on Lenovo B50-30,
add an additional check for the NULL dev_priv-vlv_pctx.
System now boots (though does not recognise any of the USB(3) ports)
pullup#7
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.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/external/bsd/drm2/dist/drm/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.6 Wed Feb 25 13:06:13 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Sun Jul 26 15:30:36 2015
@@ -3625,6 +3625,8 @@ static void valleyview_check_pctx(struct
{
unsigned long pctx_addr = I915_READ(VLV_PCBR) ~4095;
+ if (WARN_ON(!dev_priv-vlv_pctx))
+ return;
WARN_ON(pctx_addr != dev_priv-mm.stolen_base +
dev_priv-vlv_pctx-stolen-start);
}
CVS commit: src/lib/libutil
Module Name:src Committed By: kamil Date: Sun Jul 26 17:37:38 UTC 2015 Modified Files: src/lib/libutil: efun.3 Log Message: Bump date for recent changes To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/lib/libutil/efun.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/libutil/efun.3 diff -u src/lib/libutil/efun.3:1.13 src/lib/libutil/efun.3:1.14 --- src/lib/libutil/efun.3:1.13 Sun Jul 26 17:36:38 2015 +++ src/lib/libutil/efun.3 Sun Jul 26 17:37:38 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: efun.3,v 1.13 2015/07/26 17:36:38 kamil Exp $ +.\ $NetBSD: efun.3,v 1.14 2015/07/26 17:37:38 kamil Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd May 3, 2010 +.Dd July 26, 2015 .Dt EFUN 3 .Os .Sh NAME
CVS commit: src/lib/libutil
Module Name:src Committed By: kamil Date: Sun Jul 26 17:36:38 UTC 2015 Modified Files: src/lib/libutil: efun.3 Log Message: Sync parameter name with efun.c This change is non-functional. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/lib/libutil/efun.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/libutil/efun.3 diff -u src/lib/libutil/efun.3:1.12 src/lib/libutil/efun.3:1.13 --- src/lib/libutil/efun.3:1.12 Sun Jul 26 02:20:30 2015 +++ src/lib/libutil/efun.3 Sun Jul 26 17:36:38 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: efun.3,v 1.12 2015/07/26 02:20:30 kamil Exp $ +.\ $NetBSD: efun.3,v 1.13 2015/07/26 17:36:38 kamil Exp $ .\ .\ Copyright (c) 2006 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -57,7 +57,7 @@ .Ft FILE * .Fn efopen const char *p const char *m .Ft void * -.Fn ecalloc size_t n size_t c +.Fn ecalloc size_t n size_t s .Ft void * .Fn emalloc size_t n .Ft void *
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Sun Jul 26 17:54:46 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_hdaudio.c Log Message: set HDAUDIO_FLAG_NO_STREAM_RESET quirk To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_hdaudio.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/nvidia/tegra_hdaudio.c diff -u src/sys/arch/arm/nvidia/tegra_hdaudio.c:1.3 src/sys/arch/arm/nvidia/tegra_hdaudio.c:1.4 --- src/sys/arch/arm/nvidia/tegra_hdaudio.c:1.3 Sun May 10 11:04:59 2015 +++ src/sys/arch/arm/nvidia/tegra_hdaudio.c Sun Jul 26 17:54:46 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: tegra_hdaudio.c,v 1.3 2015/05/10 11:04:59 jmcneill Exp $ */ +/* $NetBSD: tegra_hdaudio.c,v 1.4 2015/07/26 17:54:46 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca @@ -29,7 +29,7 @@ #include locators.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tegra_hdaudio.c,v 1.3 2015/05/10 11:04:59 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: tegra_hdaudio.c,v 1.4 2015/07/26 17:54:46 jmcneill Exp $); #include sys/param.h #include sys/bus.h @@ -97,6 +97,7 @@ tegra_hdaudio_attach(device_t parent, de loc-loc_size - TEGRA_HDAUDIO_OFFSET, sc-sc.sc_memh); sc-sc.sc_memvalid = true; sc-sc.sc_dmat = tio-tio_dmat; + sc-sc.sc_flags = HDAUDIO_FLAG_NO_STREAM_RESET; aprint_naive(\n); aprint_normal(: HDA\n);
CVS commit: src/sys/dev/hdaudio
Module Name:src
Committed By: jmcneill
Date: Sun Jul 26 17:54:33 UTC 2015
Modified Files:
src/sys/dev/hdaudio: hdaudio.c hdaudiovar.h
Log Message:
Skip stream reset if HDAUDIO_FLAG_NO_STREAM_RESET flag is set.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/hdaudio/hdaudio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/hdaudio/hdaudiovar.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/hdaudio/hdaudio.c
diff -u src/sys/dev/hdaudio/hdaudio.c:1.2 src/sys/dev/hdaudio/hdaudio.c:1.3
--- src/sys/dev/hdaudio/hdaudio.c:1.2 Wed May 20 18:28:32 2015
+++ src/sys/dev/hdaudio/hdaudio.c Sun Jul 26 17:54:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudio.c,v 1.2 2015/05/20 18:28:32 riastradh Exp $ */
+/* $NetBSD: hdaudio.c,v 1.3 2015/07/26 17:54:33 jmcneill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdaudio.c,v 1.2 2015/05/20 18:28:32 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdaudio.c,v 1.3 2015/07/26 17:54:33 jmcneill Exp $);
#include sys/types.h
#include sys/param.h
@@ -1215,7 +1215,8 @@ hdaudio_stream_start(struct hdaudio_stre
KASSERT(st-st_bdl.dma_valid == true);
hdaudio_stream_stop(st);
- hdaudio_stream_reset(st);
+ if ((sc-sc_flags HDAUDIO_FLAG_NO_STREAM_RESET) == 0)
+ hdaudio_stream_reset(st);
/*
* Configure buffer descriptor list
Index: src/sys/dev/hdaudio/hdaudiovar.h
diff -u src/sys/dev/hdaudio/hdaudiovar.h:1.3 src/sys/dev/hdaudio/hdaudiovar.h:1.4
--- src/sys/dev/hdaudio/hdaudiovar.h:1.3 Sat May 30 13:47:03 2015
+++ src/sys/dev/hdaudio/hdaudiovar.h Sun Jul 26 17:54:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hdaudiovar.h,v 1.3 2015/05/30 13:47:03 jmcneill Exp $ */
+/* $NetBSD: hdaudiovar.h,v 1.4 2015/07/26 17:54:33 jmcneill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -157,6 +157,9 @@ struct hdaudio_softc {
struct hdaudio_stream sc_stream[HDAUDIO_MAX_STREAMS];
uint32_t sc_stream_mask;
kmutex_t sc_stream_mtx;
+
+ uint32_t sc_flags;
+#define HDAUDIO_FLAG_NO_STREAM_RESET 0x0001
};
int hdaudio_attach(device_t, struct hdaudio_softc *);
CVS commit: src
Module Name:src Committed By: kamil Date: Sun Jul 26 15:15:31 UTC 2015 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi src/lib/libutil: shlib_version Log Message: Bump shalib minor for new function: ereallocarr(3) Noted by mrg To generate a diff of this commit: cvs rdiff -u -r1.743 -r1.744 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.51 -r1.52 src/lib/libutil/shlib_version 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/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.743 src/distrib/sets/lists/base/shl.mi:1.744 --- src/distrib/sets/lists/base/shl.mi:1.743 Wed Jul 8 17:29:56 2015 +++ src/distrib/sets/lists/base/shl.mi Sun Jul 26 15:15:31 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.743 2015/07/08 17:29:56 christos Exp $ +# $NetBSD: shl.mi,v 1.744 2015/07/26 15:15:31 kamil Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -84,7 +84,7 @@ ./lib/libtermlib.so.0.6base-sys-shlib dynamicroot ./lib/libutil.sobase-sys-shlib dynamicroot ./lib/libutil.so.7base-sys-shlib dynamicroot -./lib/libutil.so.7.21base-sys-shlib dynamicroot +./lib/libutil.so.7.22base-sys-shlib dynamicroot ./lib/libz.so base-sys-shlib dynamicroot ./lib/libz.so.1 base-sys-shlib dynamicroot ./lib/libz.so.1.0base-sys-shlib dynamicroot @@ -800,7 +800,7 @@ ./usr/lib/libusbhid.so.1.0 base-sys-shlib compatfile ./usr/lib/libutil.sobase-sys-shlib compatfile ./usr/lib/libutil.so.7base-sys-shlib compatfile -./usr/lib/libutil.so.7.21 base-sys-shlib compatfile +./usr/lib/libutil.so.7.22 base-sys-shlib compatfile ./usr/lib/libuutil.sobase-zfs-shlib compatfile,zfs ./usr/lib/libuutil.so.0base-zfs-shlib compatfile,zfs ./usr/lib/libuutil.so.0.0 base-zfs-shlib compatfile,zfs Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.104 src/distrib/sets/lists/debug/shl.mi:1.105 --- src/distrib/sets/lists/debug/shl.mi:1.104 Wed Jul 8 17:29:56 2015 +++ src/distrib/sets/lists/debug/shl.mi Sun Jul 26 15:15:31 2015 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.104 2015/07/08 17:29:56 christos Exp $ +# $NetBSD: shl.mi,v 1.105 2015/07/26 15:15:31 kamil Exp $ ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libc.so.12.197.debug comp-sys-debug debug,dynamicroot @@ -21,7 +21,7 @@ ./usr/libdata/debug/lib/libradius.so.4.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/librumpclient.so.0.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libterminfo.so.1.0.debug comp-sys-debug debug,dynamicroot -./usr/libdata/debug/lib/libutil.so.7.21.debug comp-sys-debug debug,dynamicroot +./usr/libdata/debug/lib/libutil.so.7.22.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libz.so.1.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/npf/ext_log.so.0.0.debug comp-sys-debug debug,compatfile,npf ./usr/libdata/debug/lib/npf/ext_normalize.so.0.0.debug comp-sys-debug debug,compatfile,npf @@ -268,7 +268,7 @@ ./usr/libdata/debug/usr/lib/libukfs.so.1.0.debug comp-sys-debug debug,compatfile,rump ./usr/libdata/debug/usr/lib/libumem.so.0.0.debug comp-zfs-debug debug,compatfile,zfs ./usr/libdata/debug/usr/lib/libusbhid.so.1.0.debug comp-sys-debug debug,compatfile -./usr/libdata/debug/usr/lib/libutil.so.7.21.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libutil.so.7.22.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libuutil.so.0.0.debug comp-zfs-debug debug,compatfile,zfs ./usr/libdata/debug/usr/lib/libwind.so.0.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libwrap.so.1.0.debug comp-net-debug debug,compatfile Index: src/lib/libutil/shlib_version diff -u src/lib/libutil/shlib_version:1.51 src/lib/libutil/shlib_version:1.52 --- src/lib/libutil/shlib_version:1.51 Sat Apr 7 16:44:39 2012 +++ src/lib/libutil/shlib_version Sun Jul 26 15:15:31 2015 @@ -1,5 +1,5 @@ -# $NetBSD: shlib_version,v 1.51 2012/04/07 16:44:39 christos Exp $ +# $NetBSD: shlib_version,v 1.52 2015/07/26 15:15:31 kamil Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # major=7 -minor=21 +minor=22
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: kamil Date: Sun Jul 26 17:00:37 UTC 2015 Modified Files: src/lib/libc/stdlib: malloc.3 Log Message: mandoc lint To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/lib/libc/stdlib/malloc.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/stdlib/malloc.3 diff -u src/lib/libc/stdlib/malloc.3:1.41 src/lib/libc/stdlib/malloc.3:1.42 --- src/lib/libc/stdlib/malloc.3:1.41 Fri Feb 6 08:37:39 2015 +++ src/lib/libc/stdlib/malloc.3 Sun Jul 26 17:00:37 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: malloc.3,v 1.41 2015/02/06 08:37:39 wiz Exp $ +.\ $NetBSD: malloc.3,v 1.42 2015/07/26 17:00:37 kamil Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -212,7 +212,6 @@ if ((p = calloc(num, size)) == NULL) When using .Fn realloc , one must be careful to avoid the following idiom: -.Pp .Bd -literal -offset indent nsize += 50;
CVS commit: src/sys/dev/hdaudio
Module Name:src
Committed By: jmcneill
Date: Sun Jul 26 19:06:26 UTC 2015
Modified Files:
src/sys/dev/hdaudio: hdafg.c
Log Message:
- Support multi-channel ( 2) output to HDMI sinks.
- Fix a bug in hdafg_set_params that could program converters using the
wrong audio_params_t if auconv is in use
- Force Tegra124 HDMI codec to a fixed rate 44.1kHz
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/hdaudio/hdafg.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/hdaudio/hdafg.c
diff -u src/sys/dev/hdaudio/hdafg.c:1.2 src/sys/dev/hdaudio/hdafg.c:1.3
--- src/sys/dev/hdaudio/hdafg.c:1.2 Sat Mar 28 14:50:20 2015
+++ src/sys/dev/hdaudio/hdafg.c Sun Jul 26 19:06:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hdafg.c,v 1.2 2015/03/28 14:50:20 jmcneill Exp $ */
+/* $NetBSD: hdafg.c,v 1.3 2015/07/26 19:06:26 jmcneill Exp $ */
/*
* Copyright (c) 2009 Precedence Technologies Ltd supp...@precedence.co.uk
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.2 2015/03/28 14:50:20 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: hdafg.c,v 1.3 2015/07/26 19:06:26 jmcneill Exp $);
#include sys/types.h
#include sys/param.h
@@ -327,6 +327,8 @@ struct hdafg_softc {
} sc_p;
struct hdaudio_audiodev sc_audiodev;
+
+ uint16_t sc_fixed_rate;
};
static int hdafg_match(device_t, cfdata_t, void *);
@@ -3041,7 +3043,7 @@ hdafg_commit(struct hdafg_softc *sc)
static void
hdafg_stream_connect_hdmi(struct hdafg_softc *sc, struct hdaudio_assoc *as,
-struct hdaudio_widget *w, int maxchan)
+struct hdaudio_widget *w, const audio_params_t *params)
{
struct hdmi_audio_infoframe hdmi;
/* TODO struct displayport_audio_infoframe dp; */
@@ -3069,7 +3071,12 @@ hdafg_stream_connect_hdmi(struct hdafg_s
hdmi.header.packet_type = HDMI_AI_PACKET_TYPE;
hdmi.header.version = HDMI_AI_VERSION;
hdmi.header.length = HDMI_AI_LENGTH;
- hdmi.ct_cc = maxchan - 1;
+ hdmi.ct_cc = params-channels - 1;
+ if (params-channels 2) {
+ hdmi.ca = 0x1f;
+ } else {
+ hdmi.ca = 0x00;
+ }
hdafg_dd_hdmi_ai_cksum(hdmi);
}
/* update data island with new audio infoframe */
@@ -3092,19 +3099,22 @@ hdafg_stream_connect(struct hdafg_softc
{
struct hdaudio_assoc *as = sc-sc_assocs;
struct hdaudio_widget *w;
+ const audio_params_t *params;
uint16_t fmt, dfmt;
int tag, chn, maxchan, c;
int i, j, k;
KASSERT(mode == AUMODE_PLAY || mode == AUMODE_RECORD);
- if (mode == AUMODE_PLAY)
+ if (mode == AUMODE_PLAY) {
fmt = hdaudio_stream_param(sc-sc_audiodev.ad_playback,
sc-sc_pparam);
- else
+ params = sc-sc_pparam;
+ } else {
fmt = hdaudio_stream_param(sc-sc_audiodev.ad_capture,
sc-sc_rparam);
-
+ params = sc-sc_rparam;
+ }
for (i = 0; i sc-sc_nassocs; i++) {
if (as[i].as_enable == false)
@@ -3177,6 +3187,8 @@ hdafg_stream_connect(struct hdafg_softc
dfmt |= COP_DIGITAL_CONVCTRL1_NAUDIO;
else
dfmt = ~COP_DIGITAL_CONVCTRL1_NAUDIO;
+if (sc-sc_vendor == HDAUDIO_VENDOR_NVIDIA)
+ dfmt |= COP_DIGITAL_CONVCTRL1_COPY;
hdaudio_command(sc-sc_codec, w-w_nid,
CORB_SET_DIGITAL_CONVERTER_CONTROL_1, dfmt);
}
@@ -3203,7 +3215,7 @@ hdafg_stream_connect(struct hdafg_softc
continue;
if (w-w_pin.cap (COP_PINCAP_HDMI|COP_PINCAP_DP))
hdafg_stream_connect_hdmi(sc, as[i],
-w, maxchan);
+w, params);
}
}
}
@@ -3237,6 +3249,9 @@ hdafg_rate_supported(struct hdafg_softc
{
uint32_t caps = sc-sc_p.pcm_size_rate;
+ if (sc-sc_fixed_rate)
+ return frequency == sc-sc_fixed_rate;
+
#define ISFREQOK(shift) ((caps (1 (shift))) ? true : false)
switch (frequency) {
case 8000:
@@ -3251,6 +3266,7 @@ hdafg_rate_supported(struct hdafg_softc
return ISFREQOK(4);
case 44100:
return ISFREQOK(5);
+ return true;
case 48000:
return true; /* Must be supported by all codecs */
case 88200:
@@ -3433,7 +3449,8 @@ hdafg_configure_encodings(struct hdafg_s
f.channels = 2;
f.channel_mask = AUFMT_STEREO;
f.frequency_type = 0;
- f.frequency[0] = f.frequency[1] = 48000;
+ f.frequency[0] = f.frequency[1] = sc-sc_fixed_rate ?
+ sc-sc_fixed_rate : 48000;
f.mode = AUMODE_PLAY|AUMODE_RECORD;
hdafg_append_formats(sc-sc_audiodev, f);
}
@@ -3625,6 +3642,16 @@ hdafg_attach(device_t parent, device_t s
hda_print1(sc, : %s %s%s\n, vendor, product,
sc-sc_config ? (custom configuration) : );
+ switch (sc-sc_vendor) {
+ case HDAUDIO_VENDOR_NVIDIA:
+ switch (sc-sc_product) {
+ case HDAUDIO_PRODUCT_NVIDIA_TEGRA124_HDMI:
+ sc-sc_fixed_rate = 44100;
+ break;
+ }
+ break;
+ }
+
rv = prop_dictionary_get_uint64(args, function-group, fgptr);
if (rv == false || fgptr == 0) {
hda_error(sc, missing function-group property\n);
@@ -3715,7 +3742,7 @@ hdafg_attach(device_t parent, device_t s
hda_debug(sc, connecting streams\n);
CVS commit: src/doc
Module Name:src Committed By: kamil Date: Sun Jul 26 19:31:19 UTC 2015 Modified Files: src/doc: 3RDPARTY Log Message: Update the ACPICA entry Version: 20150410 Current Vers: 20150717 To generate a diff of this commit: cvs rdiff -u -r1.1237 -r1.1238 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.1237 src/doc/3RDPARTY:1.1238 --- src/doc/3RDPARTY:1.1237 Fri Jul 17 15:24:27 2015 +++ src/doc/3RDPARTY Sun Jul 26 19:31:19 2015 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1237 2015/07/17 15:24:27 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.1238 2015/07/26 19:31:19 kamil Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -40,8 +40,8 @@ # Package: acpica -Version: 20140926 -Current Vers: 20150410 +Version: 20150410 +Current Vers: 20150717 Maintainer: Intel Archive Site: http://www.acpica.org/downloads/ Home Page: http://www.acpica.org/
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: christos Date: Sun Jul 26 17:03:06 UTC 2015 Modified Files: src/lib/libc/stdlib: quick_exit.3 Log Message: From Timo Buhrmester: Fix wrong parameter description To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/stdlib/quick_exit.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/stdlib/quick_exit.3 diff -u src/lib/libc/stdlib/quick_exit.3:1.2 src/lib/libc/stdlib/quick_exit.3:1.3 --- src/lib/libc/stdlib/quick_exit.3:1.2 Fri Apr 26 15:36:47 2013 +++ src/lib/libc/stdlib/quick_exit.3 Sun Jul 26 13:03:06 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: quick_exit.3,v 1.2 2013/04/26 19:36:47 wiz Exp $ +.\ $NetBSD: quick_exit.3,v 1.3 2015/07/26 17:03:06 christos Exp $ .\ Copyright (c) 2011 David Chisnall .\ All rights reserved. .\ @@ -25,7 +25,7 @@ .\ .\ $FreeBSD: src/lib/libc/stdlib/quick_exit.3,v 1.4 2012/11/17 01:49:41 svnexp Exp $ .\ -.Dd April 26, 2013 +.Dd July 26, 2015 .Dt QUICK_EXIT 3 .Os .Sh NAME @@ -36,7 +36,7 @@ .Sh SYNOPSIS .In stdlib.h .Ft _Noreturn void -.Fn quick_exit void +.Fn quick_exit int status .Sh DESCRIPTION The .Fn quick_exit @@ -45,6 +45,15 @@ with .Xr at_quick_exit 3 but not any C++ destructors or cleanup code registered with .Xr atexit 3 . +.Pp +The +.Fa status +values +.Dv EXIT_SUCCESS +and +.Dv EXIT_FAILURE +can be used to indicate successful and unsuccessful +termination, respectively. .Sh RETURN VALUES The .Fn quick_exit
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: martin
Date: Sun Jul 26 17:21:55 UTC 2015
Modified Files:
src/lib/libc/stdlib: jemalloc.c
Log Message:
Defer using pthread keys until we are threaded.
From Christos, fixes PR port-arm/50087 by allowing malloc calls prior
to libpthread initialization.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/stdlib/jemalloc.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/stdlib/jemalloc.c
diff -u src/lib/libc/stdlib/jemalloc.c:1.37 src/lib/libc/stdlib/jemalloc.c:1.38
--- src/lib/libc/stdlib/jemalloc.c:1.37 Tue Jan 20 18:31:25 2015
+++ src/lib/libc/stdlib/jemalloc.c Sun Jul 26 17:21:55 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: jemalloc.c,v 1.37 2015/01/20 18:31:25 christos Exp $ */
+/* $NetBSD: jemalloc.c,v 1.38 2015/07/26 17:21:55 martin Exp $ */
/*-
* Copyright (C) 2006,2007 Jason Evans jas...@freebsd.org.
@@ -118,7 +118,7 @@
#include sys/cdefs.h
/* __FBSDID($FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $); */
-__RCSID($NetBSD: jemalloc.c,v 1.37 2015/01/20 18:31:25 christos Exp $);
+__RCSID($NetBSD: jemalloc.c,v 1.38 2015/07/26 17:21:55 martin Exp $);
#ifdef __FreeBSD__
#include libc_private.h
@@ -783,20 +783,58 @@ static unsigned next_arena;
static malloc_mutex_t arenas_mtx; /* Protects arenas initialization. */
#endif
-#ifndef NO_TLS
/*
* Map of pthread_self() -- arenas[???], used for selecting an arena to use
* for allocations.
*/
-static __thread arena_t *arenas_map;
-#define get_arenas_map() (arenas_map)
-#define set_arenas_map(x) (arenas_map = x)
+#ifndef NO_TLS
+static __thread arena_t **arenas_map;
#else
-#ifdef _REENTRANT
-static thread_key_t arenas_map_key;
+static arena_t **arenas_map;
#endif
-#define get_arenas_map() thr_getspecific(arenas_map_key)
-#define set_arenas_map(x) thr_setspecific(arenas_map_key, x)
+
+#if !defined(NO_TLS) || !defined(_REENTRANT)
+# define get_arenas_map() (arenas_map)
+# define set_arenas_map(x) (arenas_map = x)
+#else
+
+static thread_key_t arenas_map_key = -1;
+
+static inline arena_t **
+get_arenas_map(void)
+{
+ if (!__isthreaded)
+ return arenas_map;
+
+ if (arenas_map_key == -1) {
+ (void)thr_keycreate(arenas_map_key, NULL);
+ if (arenas_map != NULL) {
+ thr_setspecific(arenas_map_key, arenas_map);
+ arenas_map = NULL;
+ }
+ }
+
+ return thr_getspecific(arenas_map_key);
+}
+
+static __inline void
+set_arenas_map(arena_t **a)
+{
+ if (!__isthreaded) {
+ arenas_map = a;
+ return;
+ }
+
+ if (arenas_map_key == -1) {
+ (void)thr_keycreate(arenas_map_key, NULL);
+ if (arenas_map != NULL) {
+ _DIAGASSERT(arenas_map == a);
+ arenas_map = NULL;
+ }
+ }
+
+ thr_setspecific(arenas_map_key, a);
+}
#endif
#ifdef MALLOC_STATS
@@ -3654,11 +3692,6 @@ malloc_init_hard(void)
opt_narenas_lshift += 2;
}
-#ifdef NO_TLS
- /* Initialize arena key. */
- (void)thr_keycreate(arenas_map_key, NULL);
-#endif
-
/* Determine how many arenas to use. */
narenas = ncpus;
if (opt_narenas_lshift 0) {
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: msaitoh
Date: Mon Jul 27 04:50:50 UTC 2015
Modified Files:
src/sys/dev/acpi: acpi_resource.c
Log Message:
Add ACPI_RESOURCE_TYPE_END_TAG and ACPI_RESOURCE_TYPE_ADDRESS64.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/acpi_resource.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/acpi/acpi_resource.c
diff -u src/sys/dev/acpi/acpi_resource.c:1.36 src/sys/dev/acpi/acpi_resource.c:1.37
--- src/sys/dev/acpi/acpi_resource.c:1.36 Mon Apr 13 18:32:50 2015
+++ src/sys/dev/acpi/acpi_resource.c Mon Jul 27 04:50:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_resource.c,v 1.36 2015/04/13 18:32:50 christos Exp $ */
+/* $NetBSD: acpi_resource.c,v 1.37 2015/07/27 04:50:50 msaitoh Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_resource.c,v 1.36 2015/04/13 18:32:50 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_resource.c,v 1.37 2015/07/27 04:50:50 msaitoh Exp $);
#include sys/param.h
#include sys/device.h
@@ -99,6 +99,9 @@ acpi_resource_parse_callback(ACPI_RESOUR
ops = arg-ops;
switch (res-Type) {
+ case ACPI_RESOURCE_TYPE_END_TAG:
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, EndTag\n));
+ break;
case ACPI_RESOURCE_TYPE_FIXED_IO:
ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
FixedIo 0x%x/%u\n,
@@ -290,6 +293,10 @@ acpi_resource_parse_callback(ACPI_RESOUR
Address16 unimplemented\n));
break;
+ case ACPI_RESOURCE_TYPE_ADDRESS64:
+ ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
+ Address64 unimplemented\n));
+ break;
case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES,
Extended address64 unimplemented\n));
CVS commit: src/games/atc
Module Name:src Committed By: wiz Date: Sun Jul 26 22:22:24 UTC 2015 Modified Files: src/games/atc: atc.6 Log Message: Use An in AUTHORS section. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/games/atc/atc.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/atc/atc.6 diff -u src/games/atc/atc.6:1.23 src/games/atc/atc.6:1.24 --- src/games/atc/atc.6:1.23 Thu Jul 23 01:19:20 2015 +++ src/games/atc/atc.6 Sun Jul 26 22:22:24 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: atc.6,v 1.23 2015/07/23 01:19:20 pgoyette Exp $ +.\ $NetBSD: atc.6,v 1.24 2015/07/26 22:22:24 wiz Exp $ .\ .\ Copyright (c) 1990, 1993 .\ The Regents of the University of California. All rights reserved. @@ -493,7 +493,10 @@ which holds the list of playable games, The scores are kept in .Pa /var/games/atc_score . .Sh AUTHORS -Ed James, UC Berkeley: edja...@ucbvax.berkeley.edu, ucbvax!edjames +.An Ed James , +UC Berkeley: +.Aq Mt edja...@ucbvax.berkeley.edu , +ucbvax!edjames .Pp This game is based on someone's description of the overall flavor of a game written for some unknown PC many years ago, maybe.
CVS commit: xsrc/external/mit/libxcb/dist/src
Module Name:xsrc
Committed By: wiz
Date: Sun Jul 26 22:13:33 UTC 2015
Modified Files:
xsrc/external/mit/libxcb/dist/src: xcb_in.c
Log Message:
Reduce diffs to upstream.
Probably merge issue, mostly whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libxcb/dist/src/xcb_in.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libxcb/dist/src/xcb_in.c
diff -u xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.3 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.4
--- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.3 Mon Mar 17 03:08:52 2014
+++ xsrc/external/mit/libxcb/dist/src/xcb_in.c Sun Jul 26 22:13:33 2015
@@ -36,9 +36,6 @@
#include stdio.h
#include errno.h
-#include xcb.h
-#include xcbext.h
-#include xcbint.h
#if USE_POLL
#include poll.h
#endif
@@ -51,6 +48,10 @@
#include xcb_windefs.h
#endif /* _WIN32 */
+#include xcb.h
+#include xcbext.h
+#include xcbint.h
+
#define XCB_ERROR 0
#define XCB_REPLY 1
#define XCB_XGE_EVENT 35
@@ -200,9 +201,9 @@ static int read_packet(xcb_connection_t
c-in.request_completed = c-in.request_read - 1;
}
-while(c-in.pending_replies
+while(c-in.pending_replies
c-in.pending_replies-workaround != WORKAROUND_EXTERNAL_SOCKET_OWNER
- XCB_SEQUENCE_COMPARE (c-in.pending_replies-last_request, =, c-in.request_completed))
+ XCB_SEQUENCE_COMPARE (c-in.pending_replies-last_request, =, c-in.request_completed))
{
pending_reply *oldpend = c-in.pending_replies;
c-in.pending_replies = oldpend-next;
@@ -386,11 +387,11 @@ static int read_block(const int fd, void
FD_ZERO(fds);
FD_SET(fd, fds);
- /* Initializing errno here makes sure that for Win32 this loop will execute only once */
- errno = 0;
- do {
- ret = select(fd + 1, fds, 0, 0, 0);
- } while (ret == -1 errno == EINTR);
+/* Initializing errno here makes sure that for Win32 this loop will execute only once */
+errno = 0;
+do {
+ret = select(fd + 1, fds, 0, 0, 0);
+} while (ret == -1 errno == EINTR);
#endif /* USE_POLL */
}
if(ret = 0)
@@ -746,7 +747,7 @@ xcb_register_for_special_xge(xcb_connect
pthread_mutex_unlock(c-iolock);
return NULL;
}
-
+
se-extension = ext_reply-major_opcode;
se-eid = eid;
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: wiz Date: Sun Jul 26 22:32:03 UTC 2015 Modified Files: src/lib/libc/stdlib: malloc.3 Log Message: Spacing; Fn - Xr for jemalloc. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/lib/libc/stdlib/malloc.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/stdlib/malloc.3 diff -u src/lib/libc/stdlib/malloc.3:1.43 src/lib/libc/stdlib/malloc.3:1.44 --- src/lib/libc/stdlib/malloc.3:1.43 Sun Jul 26 17:09:29 2015 +++ src/lib/libc/stdlib/malloc.3 Sun Jul 26 22:32:03 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: malloc.3,v 1.43 2015/07/26 17:09:29 kamil Exp $ +.\ $NetBSD: malloc.3,v 1.44 2015/07/26 22:32:03 wiz Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -289,14 +289,14 @@ first appeared in .Pp A new implementation by Chris Kingsley was introduced in .Bx 4.2 , -followed by a complete rewrite by Poul-Henning Kamp ( -.Dq phk's malloc +followed by a complete rewrite by Poul-Henning Kamp +.Dq ( phk's malloc or .Dq new malloc ) which appeared in .Fx 2.2 and was included in -.Nx 1.5 +.Nx 1.5 and .Ox 2.0 . These implementations were all @@ -304,7 +304,7 @@ These implementations were all based. .Pp The -.Fn jemalloc 3 +.Xr jemalloc 3 allocator became the default system allocator first in .Fx 7.0 and then in
