CVS commit: src/sys/rump/dev
Module Name:src
Committed By: pooka
Date: Tue Nov 18 08:43:03 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libpci_eap: Makefile PCI_EAP.ioconf eap_at_pci.c
joy_eap.h shlib_version
Log Message:
Add eap PCI audio driver.
tested by playing audio with rump kernel booted on qemu with -soundhw es1370
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_eap/Makefile \
src/sys/rump/dev/lib/libpci_eap/PCI_EAP.ioconf \
src/sys/rump/dev/lib/libpci_eap/eap_at_pci.c \
src/sys/rump/dev/lib/libpci_eap/joy_eap.h \
src/sys/rump/dev/lib/libpci_eap/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/sys/rump/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.15 src/sys/rump/dev/Makefile.rumpdevcomp:1.16
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.15 Thu Nov 6 00:45:58 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Tue Nov 18 08:43:03 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.15 2014/11/06 00:45:58 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.16 2014/11/18 08:43:03 pooka Exp $
#
RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \
@@ -9,6 +9,7 @@ RUMPUSBDEVS= ubt ucom ugenhc ulpt umass
RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm
RUMPPCIDEVS+= pci_virtio virtio_if_vioif virtio_ld virtio_viornd
+RUMPPCIDEVS+= pci_eap
# Not really a PCI device, but
RUMPPCIDEVS+= miiphy
Added files:
Index: src/sys/rump/dev/lib/libpci_eap/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci_eap/Makefile:1.1
--- /dev/null Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/lib/libpci_eap/Makefile Tue Nov 18 08:43:03 2014
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2014/11/18 08:43:03 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.PATH: ${RUMPTOP}/../dev/pci
+
+LIB= rumpdev_pci_eap
+IOCONF= PCI_EAP.ioconf
+SRCS= eap_at_pci.c
+SRCS+= eap.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/../dev
+CPPFLAGS+= -I${.CURDIR}/../libaudio
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libpci_eap/PCI_EAP.ioconf
diff -u /dev/null src/sys/rump/dev/lib/libpci_eap/PCI_EAP.ioconf:1.1
--- /dev/null Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/lib/libpci_eap/PCI_EAP.ioconf Tue Nov 18 08:43:03 2014
@@ -0,0 +1,11 @@
+# $NetBSD: PCI_EAP.ioconf,v 1.1 2014/11/18 08:43:03 pooka Exp $
+#
+
+ioconf pci_eap
+
+include conf/files
+include dev/pci/files.pci
+
+pseudo-root pci*
+
+eap* at pci?
Index: src/sys/rump/dev/lib/libpci_eap/eap_at_pci.c
diff -u /dev/null src/sys/rump/dev/lib/libpci_eap/eap_at_pci.c:1.1
--- /dev/null Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/lib/libpci_eap/eap_at_pci.c Tue Nov 18 08:43:03 2014
@@ -0,0 +1,45 @@
+/* $NetBSD: eap_at_pci.c,v 1.1 2014/11/18 08:43:03 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. 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 OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: eap_at_pci.c,v 1.1 2014/11/18 08:43:03 pooka Exp $);
+
+#include sys/param.h
+#include sys/conf.h
+#include sys/device.h
+#include sys/bus.h
+
+#include rump_private.h
+
+#include ioconf.c
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+
+ config_init_component(cfdriver_ioconf_pci_eap,
+ cfattach_ioconf_pci_eap, cfdata_ioconf_pci_eap);
+}
Index: src/sys/rump/dev/lib/libpci_eap/joy_eap.h
diff -u /dev/null src/sys/rump/dev/lib/libpci_eap/joy_eap.h:1.1
--- /dev/null Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/lib/libpci_eap/joy_eap.h Tue
CVS commit: src/tests/lib/libc/gen
Module Name:src
Committed By: martin
Date: Tue Nov 18 08:58:08 UTC 2014
Modified Files:
src/tests/lib/libc/gen: t_fpsetmask.c
Log Message:
Skip the tests on ARM if the NEON fpu does not support exceptions (Cortex).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tests/lib/libc/gen/t_fpsetmask.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/gen/t_fpsetmask.c
diff -u src/tests/lib/libc/gen/t_fpsetmask.c:1.14 src/tests/lib/libc/gen/t_fpsetmask.c:1.15
--- src/tests/lib/libc/gen/t_fpsetmask.c:1.14 Tue Nov 4 00:20:19 2014
+++ src/tests/lib/libc/gen/t_fpsetmask.c Tue Nov 18 08:58:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_fpsetmask.c,v 1.14 2014/11/04 00:20:19 justin Exp $ */
+/* $NetBSD: t_fpsetmask.c,v 1.15 2014/11/18 08:58:08 martin Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -58,8 +58,20 @@ ATF_TC_BODY(no_test, tc)
#include ieeefp.h
-const char *skip_mesg;
-const char *skip_arch;
+#if __arm__ !__SOFTFP__
+ /*
+ * Some NEON fpus do not implement IEEE exception handling,
+ * skip these tests if running on them and compiled for
+ * hard float.
+ */
+#define FPU_PREREQ() \
+ if (0 == fpsetmask(fpsetmask(FP_X_INV))) \
+ atf_tc_skip(FPU does not implement exception handling);
+#endif
+
+#ifndef FPU_PREREQ
+#define FPU_PREREQ() /* nothing */
+#endif
void sigfpe(int, siginfo_t *, void *);
@@ -296,6 +308,9 @@ sigfpe(int s, siginfo_t *si, void *c)
\
ATF_TC_BODY(m##_##t, tc) \
{\
+ \
+ FPU_PREREQ(); \
+ \
if (strcmp(MACHINE, macppc) == 0) \
atf_tc_expect_fail(PR port-macppc/46319); \
\
@@ -323,6 +338,8 @@ ATF_TC_BODY(fpsetmask_basic, tc)
size_t i;
fp_except_t msk, lst[] = { FP_X_INV, FP_X_DZ, FP_X_OFL, FP_X_UFL };
+ FPU_PREREQ();
+
msk = fpgetmask();
for (i = 0; i __arraycount(lst); i++) {
fpsetmask(msk | lst[i]);
CVS commit: src/sys/rump/dev
Module Name:src
Committed By: pooka
Date: Tue Nov 18 09:04:20 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libaudio_ac97: Makefile shlib_version
Log Message:
add ac97 component
for use with eap and others
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libaudio_ac97/Makefile \
src/sys/rump/dev/lib/libaudio_ac97/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/sys/rump/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.16 src/sys/rump/dev/Makefile.rumpdevcomp:1.17
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.16 Tue Nov 18 08:43:03 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Tue Nov 18 09:04:20 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.16 2014/11/18 08:43:03 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.17 2014/11/18 09:04:20 pooka Exp $
#
-RUMPDEVCOMP= audio bpf cgd disk dm drvctl fss md netsmb pad pud \
- putter raidframe rnd scsipi sysmon vnd wscons \
+RUMPDEVCOMP= audio audio_ac97 bpf cgd disk dm drvctl fss md netsmb \
+ pad pud putter raidframe rnd scsipi sysmon vnd wscons \
opencrypto
RUMPUSBDEVS= ubt ucom ugenhc ulpt umass usb
Added files:
Index: src/sys/rump/dev/lib/libaudio_ac97/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libaudio_ac97/Makefile:1.1
--- /dev/null Tue Nov 18 09:04:20 2014
+++ src/sys/rump/dev/lib/libaudio_ac97/Makefile Tue Nov 18 09:04:20 2014
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2014/11/18 09:04:20 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../dev/ic
+
+LIB= rumpdev_audio_ac97
+
+SRCS= ac97.c
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libaudio_ac97/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libaudio_ac97/shlib_version:1.1
--- /dev/null Tue Nov 18 09:04:20 2014
+++ src/sys/rump/dev/lib/libaudio_ac97/shlib_version Tue Nov 18 09:04:20 2014
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2014/11/18 09:04:20 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pooka Date: Tue Nov 18 09:12:30 UTC 2014 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi Log Message: appeased the mighty setlist gods by telling them what they should know To generate a diff of this commit: cvs rdiff -u -r1.723 -r1.724 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1921 -r1.1922 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.269 -r1.270 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.91 -r1.92 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.83 -r1.84 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/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.723 src/distrib/sets/lists/base/shl.mi:1.724 --- src/distrib/sets/lists/base/shl.mi:1.723 Thu Nov 13 07:03:23 2014 +++ src/distrib/sets/lists/base/shl.mi Tue Nov 18 09:12:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.723 2014/11/13 07:03:23 mlelstv Exp $ +# $NetBSD: shl.mi,v 1.724 2014/11/18 09:12:30 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -485,6 +485,9 @@ ./usr/lib/librumpdev_audio.so base-rump-shlib rump ./usr/lib/librumpdev_audio.so.0 base-rump-shlib rump ./usr/lib/librumpdev_audio.so.0.0 base-rump-shlib rump +./usr/lib/librumpdev_audio_ac97.so base-rump-shlib rump +./usr/lib/librumpdev_audio_ac97.so.0 base-rump-shlib rump +./usr/lib/librumpdev_audio_ac97.so.0.0 base-rump-shlib rump ./usr/lib/librumpdev_bpf.so base-rump-shlib rump ./usr/lib/librumpdev_bpf.so.0 base-rump-shlib rump ./usr/lib/librumpdev_bpf.so.0.0 base-rump-shlib rump Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1921 src/distrib/sets/lists/comp/mi:1.1922 --- src/distrib/sets/lists/comp/mi:1.1921 Mon Nov 17 16:55:05 2014 +++ src/distrib/sets/lists/comp/mi Tue Nov 18 09:12:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1921 2014/11/17 16:55:05 christos Exp $ +# $NetBSD: mi,v 1.1922 2014/11/18 09:12:30 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3748,6 +3748,8 @@ ./usr/lib/librumpdev.acomp-c-lib rump ./usr/lib/librumpdev_audio.a comp-c-lib rump ./usr/lib/librumpdev_audio_p.a comp-c-proflib profile,rump +./usr/lib/librumpdev_audio_ac97.a comp-c-lib rump +./usr/lib/librumpdev_audio_ac97_p.a comp-c-proflib profile,rump ./usr/lib/librumpdev_bpf.a comp-c-lib rump ./usr/lib/librumpdev_bpf_p.a comp-c-proflib profile,rump ./usr/lib/librumpdev_cgd.a comp-c-lib rump Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.269 src/distrib/sets/lists/comp/shl.mi:1.270 --- src/distrib/sets/lists/comp/shl.mi:1.269 Fri Oct 24 02:39:34 2014 +++ src/distrib/sets/lists/comp/shl.mi Tue Nov 18 09:12:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.269 2014/10/24 02:39:34 christos Exp $ +# $NetBSD: shl.mi,v 1.270 2014/11/18 09:12:30 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -150,6 +150,7 @@ ./usr/lib/librumpclient_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpcrypto_pic.a comp-obsolete obsolete ./usr/lib/librumpdev_audio_pic.a comp-c-piclib rump,picinstall +./usr/lib/librumpdev_audio_ac97_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpdev_bpf_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpdev_cgd_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpdev_disk_pic.a comp-c-piclib rump,picinstall Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.91 src/distrib/sets/lists/debug/mi:1.92 --- src/distrib/sets/lists/debug/mi:1.91 Fri Oct 24 02:39:34 2014 +++ src/distrib/sets/lists/debug/mi Tue Nov 18 09:12:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.91 2014/10/24 02:39:34 christos Exp $ +# $NetBSD: mi,v 1.92 2014/11/18 09:12:30 pooka Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -138,6 +138,7 @@ ./usr/lib/librumpclient_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpcrypto_g.a comp-obsolete obsolete ./usr/lib/librumpdev_audio_g.a comp-c-debuglib debuglib,rump +./usr/lib/librumpdev_audio_ac97_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_bpf_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_cgd_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpdev_disk_g.a comp-c-debuglib debuglib,rump Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.83 src/distrib/sets/lists/debug/shl.mi:1.84 --- src/distrib/sets/lists/debug/shl.mi:1.83 Sat Nov 15 20:28:50 2014 +++ src/distrib/sets/lists/debug/shl.mi Tue Nov 18 09:12:30 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.83
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: nonaka
Date: Tue Nov 18 09:28:37 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_fb.c
src/sys/external/bsd/drm2/radeon: radeondrmkmsfb.c radeondrmkmsfb.h
Log Message:
Use correct linebytes.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.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/external/bsd/drm2/dist/drm/radeon/radeon_fb.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c:1.4 Sat Jul 26 06:37:53 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fb.c Tue Nov 18 09:28:36 2014
@@ -255,6 +255,7 @@ static int radeonfb_create(struct drm_fb
rfa.rfa_fb_helper = helper;
rfa.rfa_fb_sizes = *sizes;
rfa.rfa_fb_ptr = rbo-kptr;
+ rfa.rfa_fb_linebytes = mode_cmd.pitches[0];
helper-fbdev = config_found_ia(rdev-ddev-dev, radeonfbbus, rfa,
NULL);
Index: src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.4 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.5
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c:1.4 Wed Nov 12 16:07:17 2014
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.c Tue Nov 18 09:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.c,v 1.4 2014/11/12 16:07:17 chs Exp $ */
+/* $NetBSD: radeondrmkmsfb.c,v 1.5 2014/11/18 09:28:36 nonaka Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: radeondrmkmsfb.c,v 1.4 2014/11/12 16:07:17 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: radeondrmkmsfb.c,v 1.5 2014/11/18 09:28:36 nonaka Exp $);
#ifdef _KERNEL_OPT
#include vga.h
@@ -171,8 +171,7 @@ radeonfb_setconfig_task(struct radeon_ta
prop_dictionary_set_uint32(dict, width, sizes-fb_width);
prop_dictionary_set_uint32(dict, height, sizes-fb_height);
prop_dictionary_set_uint8(dict, depth, sizes-surface_bpp);
- prop_dictionary_set_uint16(dict, linebytes,
- roundup2((sizes-fb_width * howmany(sizes-surface_bpp, 8)), 64));
+ prop_dictionary_set_uint16(dict, linebytes, rfa-rfa_fb_linebytes);
prop_dictionary_set_uint32(dict, address, 0); /* XXX 32-bit */
CTASSERT(sizeof(uintptr_t) = sizeof(uint64_t));
prop_dictionary_set_uint64(dict, virtual_address,
Index: src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h
diff -u src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h:1.1 src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h:1.2
--- src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h:1.1 Fri Jul 25 12:35:03 2014
+++ src/sys/external/bsd/drm2/radeon/radeondrmkmsfb.h Tue Nov 18 09:28:36 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: radeondrmkmsfb.h,v 1.1 2014/07/25 12:35:03 riastradh Exp $ */
+/* $NetBSD: radeondrmkmsfb.h,v 1.2 2014/11/18 09:28:36 nonaka Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,6 +39,7 @@ struct radeonfb_attach_args {
struct drm_fb_helper *rfa_fb_helper;
struct drm_fb_helper_surface_size rfa_fb_sizes;
void *rfa_fb_ptr;
+ uint32_trfa_fb_linebytes;
};
#endif /* _RADEON_RADEONDRMKMS_H_ */
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Nov 18 10:18:45 UTC 2014 Modified Files: src/sys/dev/usb: xhci.c xhcireg.h Log Message: kern/49391: Fixes to XHCI driver command ring and status TRB CRCR needs 64byte aligned address Use usb_allocmem instead of usb_allocmem_flags(..., 0) Correct status stage TRB in xhci_device_ctrl_start - direction logic was wrong. Correct a typo in a comment To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/usb/xhci.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/xhcireg.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/usb/xhci.c diff -u src/sys/dev/usb/xhci.c:1.27 src/sys/dev/usb/xhci.c:1.28 --- src/sys/dev/usb/xhci.c:1.27 Fri Oct 3 11:05:36 2014 +++ src/sys/dev/usb/xhci.c Tue Nov 18 10:18:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xhci.c,v 1.27 2014/10/03 11:05:36 skrll Exp $ */ +/* $NetBSD: xhci.c,v 1.28 2014/11/18 10:18:45 skrll Exp $ */ /* * Copyright (c) 2013 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.27 2014/10/03 11:05:36 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.28 2014/11/18 10:18:45 skrll Exp $); #include opt_usb.h @@ -1384,7 +1384,7 @@ xhci_allocm(struct usbd_bus *bus, usb_dm XHCIHIST_FUNC(); XHCIHIST_CALLED(); - err = usb_allocmem_flags(sc-sc_bus, size, 0, dma, 0); + err = usb_allocmem(sc-sc_bus, size, 0, dma); #if 0 if (err == USBD_NOMEM) err = usb_reserve_allocm(sc-sc_dma_reserve, dma, size); @@ -2491,7 +2491,7 @@ xhci_root_ctrl_done(usbd_xfer_handle xfe xfer-hcpriv = NULL; } -/* root hub intrerrupt */ +/* root hub interrupt */ static usbd_status xhci_root_intr_transfer(usbd_xfer_handle xfer) @@ -2657,9 +2657,9 @@ xhci_device_ctrl_start(usbd_xfer_handle no_data: parameter = 0; - status = XHCI_TRB_2_IRQ_SET(0) | XHCI_TRB_2_TDSZ_SET(1); + status = XHCI_TRB_2_IRQ_SET(0); /* the status stage has inverted direction */ - control = (isread ? 0 : XHCI_TRB_3_DIR_IN) | + control = ((isread (len 0)) ? 0 : XHCI_TRB_3_DIR_IN) | XHCI_TRB_3_TYPE_SET(XHCI_TRB_TYPE_STATUS_STAGE) | XHCI_TRB_3_CHAIN_BIT | XHCI_TRB_3_ENT_BIT; xhci_trb_put(xx-xx_trb[i++], parameter, status, control); Index: src/sys/dev/usb/xhcireg.h diff -u src/sys/dev/usb/xhcireg.h:1.1 src/sys/dev/usb/xhcireg.h:1.2 --- src/sys/dev/usb/xhcireg.h:1.1 Sat Sep 14 00:40:31 2013 +++ src/sys/dev/usb/xhcireg.h Tue Nov 18 10:18:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xhcireg.h,v 1.1 2013/09/14 00:40:31 jakllsch Exp $ */ +/* $NetBSD: xhcireg.h,v 1.2 2014/11/18 10:18:45 skrll Exp $ */ /* $FreeBSD$ */ /*- @@ -212,7 +212,7 @@ #define XHCI_STREAM_CONTEXT_ALIGN 16 #define XHCI_STREAM_ARRAY_ALIGN 16 #define XHCI_TRANSFER_RING_SEGMENTS_ALIGN 16 -#define XHCI_COMMAND_RING_SEGMENTS_ALIGN 16 +#define XHCI_COMMAND_RING_SEGMENTS_ALIGN 64 #define XHCI_EVENT_RING_SEGMENTS_ALIGN 64 #define XHCI_EVENT_RING_SEGMENT_TABLE_ALIGN 64 #define XHCI_SCRATCHPAD_BUFFER_ARRAY_ALIGN 64
CVS commit: src/external/bsd/smbfs/dist/mount_smbfs
Module Name:src Committed By: nakayama Date: Tue Nov 18 10:38:52 UTC 2014 Modified Files: src/external/bsd/smbfs/dist/mount_smbfs: mount_smbfs.8 Log Message: Mention about -E and -c options in the BUGS section. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.8 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/smbfs/dist/mount_smbfs/mount_smbfs.8 diff -u src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.8:1.3 src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.8:1.4 --- src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.8:1.3 Sat Nov 15 18:57:25 2014 +++ src/external/bsd/smbfs/dist/mount_smbfs/mount_smbfs.8 Tue Nov 18 10:38:52 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount_smbfs.8,v 1.3 2014/11/15 18:57:25 nakayama Exp $ +.\ $NetBSD: mount_smbfs.8,v 1.4 2014/11/18 10:38:52 nakayama Exp $ .\ Id: mount_smbfs.8,v 1.8 2000/06/09 13:52:56 bp Exp .\ .\ Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -25,7 +25,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 9, 2003 +.Dd November 17, 2014 .Dt MOUNT_SMBFS 8 .Os .Sh NAME @@ -208,3 +208,15 @@ port done by and .An Jaromir Dolecek .Aq jdole...@netbsd.org . +.Sh BUGS +The +.Fl E +option works only if you mount with +.Xr rump_smbfs 8 +instead of +.Nm . +.Pp +The +.Fl c +option is not implemented yet. +It is silently ignored for now.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Tue Nov 18 13:05:33 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: emul.c
Log Message:
Attempt to make sure that DELAY()/delay() is available in all MD names.
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/sys/rump/librump/rumpkern/emul.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/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.166 src/sys/rump/librump/rumpkern/emul.c:1.167
--- src/sys/rump/librump/rumpkern/emul.c:1.166 Wed May 28 20:57:22 2014
+++ src/sys/rump/librump/rumpkern/emul.c Tue Nov 18 13:05:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.166 2014/05/28 20:57:22 justin Exp $ */
+/* $NetBSD: emul.c,v 1.167 2014/11/18 13:05:33 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.166 2014/05/28 20:57:22 justin Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.167 2014/11/18 13:05:33 pooka Exp $);
#include sys/param.h
#include sys/null.h
@@ -231,14 +231,22 @@ module_init_md(void)
*/
}
-/* us and them, after all we're only ordinary seconds */
+/*
+ * Try to emulate all the MD definitions of DELAY() / delay().
+ * Would be nice to fix the #defines in MD headers, but this quicker.
+ */
static void
rump_delay(unsigned int us)
{
uint64_t sec, nsec;
+#ifdef __mac68k__
+ sec = us / 1000;
+ nsec = (us % 1000) * 100;
+#else
sec = us / 100;
nsec = (us % 100) * 1000;
+#endif
if (__predict_false(sec != 0))
printf(WARNING: over 1s delay\n);
@@ -246,6 +254,8 @@ rump_delay(unsigned int us)
rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, sec, nsec);
}
void (*delay_func)(unsigned int) = rump_delay;
+__strong_alias(delay,rump_delay);
+__strong_alias(_delay,rump_delay);
/*
* Provide weak aliases for tty routines used by printf.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Tue Nov 18 16:57:52 UTC 2014
Modified Files:
src/sys/rump/librump/rumpkern: emul.c
Log Message:
delay() can't use rumpuser_clock_sleep(), because that may unschedule().
Instead, busyloop with calls to rumpuser_clock_gettime(). Fixing delay()
properly should addressed in hypercall rev.18 by introducing a nowrap
variant/flag for rumpuser_clock_sleep().
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/sys/rump/librump/rumpkern/emul.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/rump/librump/rumpkern/emul.c
diff -u src/sys/rump/librump/rumpkern/emul.c:1.167 src/sys/rump/librump/rumpkern/emul.c:1.168
--- src/sys/rump/librump/rumpkern/emul.c:1.167 Tue Nov 18 13:05:33 2014
+++ src/sys/rump/librump/rumpkern/emul.c Tue Nov 18 16:57:52 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: emul.c,v 1.167 2014/11/18 13:05:33 pooka Exp $ */
+/* $NetBSD: emul.c,v 1.168 2014/11/18 16:57:52 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.167 2014/11/18 13:05:33 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: emul.c,v 1.168 2014/11/18 16:57:52 pooka Exp $);
#include sys/param.h
#include sys/null.h
@@ -234,11 +234,27 @@ module_init_md(void)
/*
* Try to emulate all the MD definitions of DELAY() / delay().
* Would be nice to fix the #defines in MD headers, but this quicker.
+ *
+ * XXX: we'd need a rumpuser_clock_sleep_nowrap() here. Since we
+ * don't have it in the current hypercall revision, busyloop.
+ * Note that rather than calibrate a loop delay and work with that,
+ * get call gettime (which does not block) in a loop to make sure
+ * we didn't get virtual ghosttime. That might be slightly inaccurate
+ * for very small delays ...
+ *
+ * The other option would be to run a thread in the hypervisor which
+ * sleeps for us and we can wait for it using rumpuser_cv_wait_nowrap()
+ * Probably too fussy. Better just wait for hypercall rev 18 ;)
*/
static void
rump_delay(unsigned int us)
{
- uint64_t sec, nsec;
+ struct timespec target, tmp;
+ uint64_t sec, sec_ini, sec_now;
+ long nsec, nsec_ini, nsec_now;
+ int loops;
+
+ rumpuser_clock_gettime(RUMPUSER_CLOCK_ABSMONO, sec_ini, nsec_ini);
#ifdef __mac68k__
sec = us / 1000;
@@ -248,10 +264,27 @@ rump_delay(unsigned int us)
nsec = (us % 100) * 1000;
#endif
+ target.tv_sec = sec_ini;
+ tmp.tv_sec = sec;
+ target.tv_nsec = nsec_ini;
+ tmp.tv_nsec = nsec;
+ timespecadd(target, tmp, target);
+
if (__predict_false(sec != 0))
printf(WARNING: over 1s delay\n);
- rumpuser_clock_sleep(RUMPUSER_CLOCK_RELWALL, sec, nsec);
+ for (loops = 0; loops 1000*1000*100; loops++) {
+ struct timespec cur;
+
+ rumpuser_clock_gettime(RUMPUSER_CLOCK_ABSMONO,
+ sec_now, nsec_now);
+ cur.tv_sec = sec_now;
+ cur.tv_nsec = nsec_now;
+ if (timespeccmp(cur, target, =)) {
+ return;
+ }
+ }
+ printf(WARNING: DELAY ESCAPED\n);
}
void (*delay_func)(unsigned int) = rump_delay;
__strong_alias(delay,rump_delay);
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: joerg Date: Tue Nov 18 17:03:41 UTC 2014 Modified Files: src/sys/dev/scsipi: scsipi_base.c Log Message: Use size for the size argument of memcmp, not the result of a compare. To generate a diff of this commit: cvs rdiff -u -r1.163 -r1.164 src/sys/dev/scsipi/scsipi_base.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/scsipi/scsipi_base.c diff -u src/sys/dev/scsipi/scsipi_base.c:1.163 src/sys/dev/scsipi/scsipi_base.c:1.164 --- src/sys/dev/scsipi/scsipi_base.c:1.163 Mon Nov 17 18:43:48 2014 +++ src/sys/dev/scsipi/scsipi_base.c Tue Nov 18 17:03:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: scsipi_base.c,v 1.163 2014/11/17 18:43:48 christos Exp $ */ +/* $NetBSD: scsipi_base.c,v 1.164 2014/11/18 17:03:41 joerg Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.163 2014/11/17 18:43:48 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: scsipi_base.c,v 1.164 2014/11/18 17:03:41 joerg Exp $); #include opt_scsi.h @@ -1059,7 +1059,7 @@ scsipi_inquiry3_ok(const struct scsipi_i const struct scsipi_inquiry3_pattern *q = scsipi_inquiry3_quirk[i]; #define MATCH(field) \ -(q-field[0] ? memcmp(ib-field, q-field, sizeof(ib-field) == 0) : 1) +(q-field[0] ? memcmp(ib-field, q-field, sizeof(ib-field)) == 0 : 1) if (MATCH(vendor) MATCH(product) MATCH(revision)) return 0; }
CVS commit: [netbsd-7] src/sys/dev/raidframe
Module Name:src
Committed By: snj
Date: Tue Nov 18 18:03:10 UTC 2014
Modified Files:
src/sys/dev/raidframe [netbsd-7]: raidframevar.h rf_netbsdkintf.c
rf_reconstruct.c
Log Message:
Pull up following revision(s) (requested by oster in ticket #243):
sys/dev/raidframe/raidframevar.h: revision 1.17
sys/dev/raidframe/rf_netbsdkintf.c: revision 1.316
sys/dev/raidframe/rf_reconstruct.c: revision 1.121
Fix a long-standing bug related to rebooting while a
reconstruct-to-spare is underway but not yet complete.
The issue was that a component was being marked as a used_spare when
the rebuild started, not when the rebuild was actually finished.
Marking it as a used_spare meant that the component label on the spare
was being updated such that after a reboot the component would be
considered up-to-date, regardless of whether the rebuild actually
completed!
This fix includes:
1) Add an additional state rf_ds_rebuilding_spare which is used
to denote that a spare is currently being rebuilt from the live
components.
2) Update the comments on the disk states, which were out-of-sync
with reality.
3) When rebuilding to a spare component, that spare now enters the
state rf_ds_rebuilding_spare instead of the state rf_ds_used_spare.
4) When the rebuild is actually complete then the spare component
enters the rf_ds_used_spare state. rf_ds_used_spare is now used
exclusively for the case where the rebuilding to the spare has
completed successfully.
XXX: Someday we need to teach raidctl(8) about this new state, and
take out the backwards compatibility code in rf_netbsdkintf.c (see
RAIDFRAME_GET_INFO in raidioctl()). For today, this fix needs to be
generic enough that it can get backported without major grief.
XXX: Needs pullup to netbsd-5*, netbsd-6*, and netbsd-7
Fixes PR#49244.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.4.1 src/sys/dev/raidframe/raidframevar.h
cvs rdiff -u -r1.312.2.2 -r1.312.2.3 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.120 -r1.120.2.1 src/sys/dev/raidframe/rf_reconstruct.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/raidframe/raidframevar.h
diff -u src/sys/dev/raidframe/raidframevar.h:1.16 src/sys/dev/raidframe/raidframevar.h:1.16.4.1
--- src/sys/dev/raidframe/raidframevar.h:1.16 Fri Feb 28 10:16:51 2014
+++ src/sys/dev/raidframe/raidframevar.h Tue Nov 18 18:03:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: raidframevar.h,v 1.16 2014/02/28 10:16:51 skrll Exp $ */
+/* $NetBSD: raidframevar.h,v 1.16.4.1 2014/11/18 18:03:10 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -383,17 +383,17 @@ struct RF_SparetWait_s {
* IF YOU ADD A STATE, CHECK TO SEE IF YOU NEED TO MODIFY RF_DEAD_DISK().
*/
enum RF_DiskStatus_e {
-rf_ds_optimal, /* no problems */
-rf_ds_failed, /* reconstruction ongoing */
-rf_ds_reconstructing, /* reconstruction complete to spare, dead disk
- * not yet replaced */
-rf_ds_dist_spared, /* reconstruction complete to distributed
+ rf_ds_optimal, /* no problems */
+ rf_ds_failed, /* disk has failed */
+ rf_ds_reconstructing, /* reconstruction ongoing */
+ rf_ds_dist_spared, /* reconstruction complete to distributed
* spare space, dead disk not yet replaced */
-rf_ds_spared, /* reconstruction complete to distributed
- * spare space, dead disk not yet replaced */
-rf_ds_spare,/* an available spare disk */
-rf_ds_used_spare/* a spare which has been used, and hence is
+ rf_ds_spared, /* reconstruction complete, dead disk not
+ yet replaced */
+ rf_ds_spare,/* an available spare disk */
+ rf_ds_used_spare, /* a spare which has been used, and hence is
* not available */
+ rf_ds_rebuilding_spare /* a spare which is being rebuilt to */
};
typedef enum RF_DiskStatus_e RF_DiskStatus_t;
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.312.2.2 src/sys/dev/raidframe/rf_netbsdkintf.c:1.312.2.3
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.312.2.2 Tue Nov 11 10:42:22 2014
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Tue Nov 18 18:03:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.312.2.2 2014/11/11 10:42:22 martin Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.312.2.3 2014/11/18 18:03:10 snj Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.312.2.2 2014/11/11 10:42:22 martin Exp $);
CVS commit: [netbsd-7] src/sys
Module Name:src
Committed By: snj
Date: Tue Nov 18 18:19:10 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_hdmi.c awin_hdmiaudio.c
awin_var.h
src/sys/arch/evbarm/awin [netbsd-7]: awin_machdep.c
src/sys/dev/i2c [netbsd-7]: ddc.c ddcvar.h
src/sys/dev/videomode [netbsd-7]: edid.c edidreg.h edidvar.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #244):
sys/arch/arm/allwinner/awin_hdmi.c: revision 1.13-1.15
sys/arch/arm/allwinner/awin_hdmiaudio.c: revision 1.4
sys/arch/arm/allwinner/awin_var.h: revision 1.25
sys/arch/evbarm/awin/awin_machdep.c: revision 1.29
sys/dev/i2c/ddc.c: revision 1.4
sys/dev/i2c/ddcvar.h: revision 1.2
sys/dev/videomode/edid.c: revision 1.13
sys/dev/videomode/edidreg.h: revision 1.4
sys/dev/videomode/edidvar.h: revision 1.3
Parse the extension block count field, and make it available in struct edid_info
--
add ddc_read_edid_block, which is the same as ddc_read_edid but takes an
additional block number argument
--
Add support for DVI displays. Detect HDMI vs DVI mode by looking for a
CEA-861-D extension block in the EDID, and then searching this block for
an HDMI vendor-specific data block (HDMI VSDB).
--
Allow for overriding DVI/HDMI detection with a kernel boot arg. Set
hdmi.forcemode=dvi or hdmi.forcemode=hdmi to disable auto-detection.
--
report hotplug status for AUDIO_GETDEV fields, only allow playback if a capable
display is connected
--
clear repeater sel bits before setting -- would cause an issue if we ever
switched away from a pixel doubling mode
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.4 -r1.4.2.5 src/sys/arch/arm/allwinner/awin_hdmi.c
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/arm/allwinner/awin_hdmiaudio.c
cvs rdiff -u -r1.10.2.4 -r1.10.2.5 src/sys/arch/arm/allwinner/awin_var.h
cvs rdiff -u -r1.8.2.7 -r1.8.2.8 src/sys/arch/evbarm/awin/awin_machdep.c
cvs rdiff -u -r1.3 -r1.3.62.1 src/sys/dev/i2c/ddc.c
cvs rdiff -u -r1.1 -r1.1.138.1 src/sys/dev/i2c/ddcvar.h
cvs rdiff -u -r1.12 -r1.12.12.1 src/sys/dev/videomode/edid.c
cvs rdiff -u -r1.3 -r1.3.30.1 src/sys/dev/videomode/edidreg.h
cvs rdiff -u -r1.2 -r1.2.138.1 src/sys/dev/videomode/edidvar.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/arm/allwinner/awin_hdmi.c
diff -u src/sys/arch/arm/allwinner/awin_hdmi.c:1.4.2.4 src/sys/arch/arm/allwinner/awin_hdmi.c:1.4.2.5
--- src/sys/arch/arm/allwinner/awin_hdmi.c:1.4.2.4 Fri Nov 14 13:37:39 2014
+++ src/sys/arch/arm/allwinner/awin_hdmi.c Tue Nov 18 18:19:09 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_hdmi.c,v 1.4.2.4 2014/11/14 13:37:39 martin Exp $ */
+/* $NetBSD: awin_hdmi.c,v 1.4.2.5 2014/11/18 18:19:09 snj Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca
@@ -32,7 +32,7 @@
#define AWIN_HDMI_PLL 3 /* PLL7 or PLL3 */
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_hdmi.c,v 1.4.2.4 2014/11/14 13:37:39 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_hdmi.c,v 1.4.2.5 2014/11/18 18:19:09 snj Exp $);
#include sys/param.h
#include sys/bus.h
@@ -64,6 +64,14 @@ struct awin_hdmi_softc {
kmutex_t sc_ic_lock;
bool sc_connected;
+ char sc_display_vendor[16];
+ char sc_display_product[16];
+
+ u_int sc_display_mode;
+ u_int sc_current_display_mode;
+#define DISPLAY_MODE_AUTO 0
+#define DISPLAY_MODE_HDMI 1
+#define DISPLAY_MODE_DVI 2
uint32_t sc_ver;
unsigned int sc_i2c_blklen;
@@ -85,17 +93,19 @@ static int awin_hdmi_i2c_acquire_bus(voi
static void awin_hdmi_i2c_release_bus(void *, int);
static int awin_hdmi_i2c_exec(void *, i2c_op_t, i2c_addr_t, const void *,
size_t, void *, size_t, int);
-static int awin_hdmi_i2c_xfer(void *, i2c_addr_t, uint8_t,
+static int awin_hdmi_i2c_xfer(void *, i2c_addr_t, uint8_t, uint8_t,
size_t, int, int);
static int awin_hdmi_i2c_reset(struct awin_hdmi_softc *, int);
static void awin_hdmi_enable(struct awin_hdmi_softc *);
static void awin_hdmi_read_edid(struct awin_hdmi_softc *);
+static u_int awin_hdmi_get_display_mode(struct awin_hdmi_softc *,
+ const struct edid_info *);
static void awin_hdmi_video_enable(struct awin_hdmi_softc *, bool);
static void awin_hdmi_set_videomode(struct awin_hdmi_softc *,
- const struct videomode *);
+ const struct videomode *, u_int);
static void awin_hdmi_set_audiomode(struct awin_hdmi_softc *,
- const struct videomode *);
+ const struct videomode *, u_int);
static void awin_hdmi_hpd(struct awin_hdmi_softc *);
static void awin_hdmi_thread(void *);
#if 0
@@ -127,6 +137,7 @@ awin_hdmi_attach(device_t parent, device
struct awin_hdmi_softc *sc = device_private(self);
struct awinio_attach_args * const aio = aux;
const struct awin_locators * const loc = aio-aio_loc;
+ prop_dictionary_t cfg = device_properties(self);
uint32_t ver,
CVS commit: [netbsd-7] src
Module Name:src Committed By: snj Date: Tue Nov 18 18:32:30 UTC 2014 Modified Files: src/distrib/sets/lists/base [netbsd-7]: mi src/doc [netbsd-7]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-7]: Makefile NEWS Theory africa asia australasia backzone checktab.awk europe leapseconds leapseconds.awk northamerica southamerica zone.tab zone1970.tab Log Message: Apply patch (requested by apb in ticket #245): Update tzdata from 2014g to 2014j. Some of the changes are: * A new Zone Pacific/Bougainville, for the part of Papua New Guinea that plans to switch from UTC+10 to UTC+11 on 2014-12-28 at 02:00. * Changes for Fiji, Belarus, and Turks Caicos that take effect at various times in 2014. * Changes to historical data. To generate a diff of this commit: cvs rdiff -u -r1.1087 -r1.1087.2.1 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1145.2.1 -r1.1145.2.2 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.1.4.1 -r1.1.1.1.4.2 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/NEWS \ src/external/public-domain/tz/dist/africa \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/australasia \ src/external/public-domain/tz/dist/europe \ src/external/public-domain/tz/dist/leapseconds \ src/external/public-domain/tz/dist/leapseconds.awk \ src/external/public-domain/tz/dist/northamerica \ src/external/public-domain/tz/dist/southamerica \ src/external/public-domain/tz/dist/zone.tab \ src/external/public-domain/tz/dist/zone1970.tab cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \ src/external/public-domain/tz/dist/Theory \ src/external/public-domain/tz/dist/backzone \ src/external/public-domain/tz/dist/checktab.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1087 src/distrib/sets/lists/base/mi:1.1087.2.1 --- src/distrib/sets/lists/base/mi:1.1087 Sun Aug 10 17:32:54 2014 +++ src/distrib/sets/lists/base/mi Tue Nov 18 18:32:29 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1087 2014/08/10 17:32:54 joerg Exp $ +# $NetBSD: mi,v 1.1087.2.1 2014/11/18 18:32:29 snj Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -5562,6 +5562,7 @@ ./usr/share/zoneinfo/Pacific base-sys-share ./usr/share/zoneinfo/Pacific/Apia base-sys-share share ./usr/share/zoneinfo/Pacific/Auckland base-sys-share share +./usr/share/zoneinfo/Pacific/Bougainville base-sys-share share ./usr/share/zoneinfo/Pacific/Chatham base-sys-share share ./usr/share/zoneinfo/Pacific/Chuuk base-sys-share share ./usr/share/zoneinfo/Pacific/Easter base-sys-share share Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1145.2.1 src/doc/3RDPARTY:1.1145.2.2 --- src/doc/3RDPARTY:1.1145.2.1 Sun Sep 21 18:50:41 2014 +++ src/doc/3RDPARTY Tue Nov 18 18:32:29 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1145.2.1 2014/09/21 18:50:41 snj Exp $ +# $NetBSD: 3RDPARTY,v 1.1145.2.2 2014/11/18 18:32:29 snj Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1300,8 +1300,8 @@ Notes: Added changes from a5 - a12 manually. Package: tz -Version: tzcode2014e / tzdata2014g -Current Vers: tzcode2014g / tzdata2014g +Version: tzcode2014e / tzdata2014j +Current Vers: tzcode2014j / tzdata2014j Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/external/public-domain/tz/dist/Makefile diff -u src/external/public-domain/tz/dist/Makefile:1.1.1.1.4.1 src/external/public-domain/tz/dist/Makefile:1.1.1.1.4.2 --- src/external/public-domain/tz/dist/Makefile:1.1.1.1.4.1 Sun Sep 21 18:50:41 2014 +++ src/external/public-domain/tz/dist/Makefile Tue Nov 18 18:32:29 2014 @@ -5,7 +5,7 @@ PACKAGE= tzcode # Version numbers of the code and data distributions. -VERSION= 2014g +VERSION= 2014j # Email address for bug reports. BUGEMAIL= t...@iana.org @@ -129,6 +129,7 @@ LDLIBS= # -DNO_RUN_TIME_WARNINGS_ABOUT_YEAR_2000_PROBLEMS_THANK_YOU=1 # if you do not want run time warnings about formats that may cause # year 2000 grief +# -Dssize_t=long on ancient hosts that lack ssize_t # -DTHREAD_SAFE=1 to make localtime.c thread-safe, as POSIX requires; # not needed by the main-program tz code, which is single-threaded. # Append other compiler flags as needed, e.g., -pthread on GNU/Linux. @@ -467,7 +468,8 @@ tzselect: tzselect.ksh $? $@ chmod +x $@ -check: check_character_set check_white_space check_tables check_web +check: check_character_set check_white_space check_sorted \ + check_tables check_web check_character_set: $(ENCHILADA) LC_ALL=en_US.utf8 export LC_ALL \ @@ -486,6 +488,18 @@
CVS commit: [netbsd-7] src/sys
Module Name:src
Committed By: snj
Date: Tue Nov 18 18:40:06 UTC 2014
Modified Files:
src/sys/kern [netbsd-7]: vfs_mount.c
src/sys/ufs/ffs [netbsd-7]: ffs_vfsops.c
src/sys/ufs/ufs [netbsd-7]: ufs_extattr.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #246):
sys/kern/vfs_mount.c: revision 1.31
sys/ufs/ffs/ffs_vfsops.c: revision 1.302
sys/ufs/ufs/ufs_extattr.c: revision 1.44
Fix use-after-free on failed unmount with extended attribute enabled
When unmount failed, for instance because the mount is still busy,
UFS1 extended attributes structures were left freed while the kernel
assumes extended attributes were still enabled. This led to using
UFS1 extended attributes structures after free. With LOCKDEBUG, with
quickly triggers a panic.
The problem is fixed by:
1) clear MNT_EXTATTR flag after extended attributes structures are freed
2) attempt to restart extended attributes after failed unmount
2) set MNT_EXTATTR correctly after extended attributes restart
As a side effect, extended attribute structures are now only initialized
when extended attributes are started for the filesystem.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.30.2.1 src/sys/kern/vfs_mount.c
cvs rdiff -u -r1.299 -r1.299.2.1 src/sys/ufs/ffs/ffs_vfsops.c
cvs rdiff -u -r1.43 -r1.43.4.1 src/sys/ufs/ufs/ufs_extattr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_mount.c
diff -u src/sys/kern/vfs_mount.c:1.30 src/sys/kern/vfs_mount.c:1.30.2.1
--- src/sys/kern/vfs_mount.c:1.30 Fri May 30 08:46:00 2014
+++ src/sys/kern/vfs_mount.c Tue Nov 18 18:40:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_mount.c,v 1.30 2014/05/30 08:46:00 hannken Exp $ */
+/* $NetBSD: vfs_mount.c,v 1.30.2.1 2014/11/18 18:40:06 snj Exp $ */
/*-
* Copyright (c) 1997-2011 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.30 2014/05/30 08:46:00 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.30.2.1 2014/11/18 18:40:06 snj Exp $);
#define _VFS_VNODE_PRIVATE
@@ -616,6 +616,22 @@ mount_checkdirs(vnode_t *olddp)
vput(newdp);
}
+/*
+ * Start extended attributes
+ */
+static int
+start_extattr(struct mount *mp)
+{
+ int error;
+
+ error = VFS_EXTATTRCTL(mp, EXTATTR_CMD_START, NULL, 0, NULL);
+ if (error)
+ printf(%s: failed to start extattr: error = %d\n,
+ mp-mnt_stat.f_mntonname, error);
+
+ return error;
+}
+
int
mount_domount(struct lwp *l, vnode_t **vpp, struct vfsops *vfsops,
const char *path, int flags, void *data, size_t *data_len)
@@ -721,13 +737,9 @@ mount_domount(struct lwp *l, vnode_t **v
error = VFS_START(mp, 0);
if (error) {
vrele(vp);
- } else if (flags MNT_EXTATTR) {
- error = VFS_EXTATTRCTL(vp-v_mountedhere,
- EXTATTR_CMD_START, NULL, 0, NULL);
- if (error)
- printf(%s: failed to start extattr: error = %d\n,
- vp-v_mountedhere-mnt_stat.f_mntonname, error);
- }
+ } else if (flags MNT_EXTATTR) {
+ (void)start_extattr(mp);
+ }
/* Drop reference held for VFS_START(). */
vfs_destroy(mp);
*vpp = NULL;
@@ -762,7 +774,7 @@ int
dounmount(struct mount *mp, int flags, struct lwp *l)
{
vnode_t *coveredvp;
- int error, async, used_syncer;
+ int error, async, used_syncer, used_extattr;
#if NVERIEXEC 0
error = veriexec_unmountchk(mp);
@@ -796,6 +808,7 @@ dounmount(struct mount *mp, int flags, s
}
used_syncer = (mp-mnt_syncer != NULL);
+ used_extattr = mp-mnt_flag MNT_EXTATTR;
/*
* XXX Syncer must be frozen when we get here. This should really
@@ -835,6 +848,12 @@ dounmount(struct mount *mp, int flags, s
mutex_exit(mp-mnt_updating);
if (used_syncer)
mutex_exit(syncer_mutex);
+ if (used_extattr) {
+ if (start_extattr(mp) != 0)
+mp-mnt_flag = ~MNT_EXTATTR;
+ else
+mp-mnt_flag |= MNT_EXTATTR;
+ }
return (error);
}
mutex_exit(mp-mnt_updating);
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.299 src/sys/ufs/ffs/ffs_vfsops.c:1.299.2.1
--- src/sys/ufs/ffs/ffs_vfsops.c:1.299 Sat May 24 16:34:04 2014
+++ src/sys/ufs/ffs/ffs_vfsops.c Tue Nov 18 18:40:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.299 2014/05/24 16:34:04 christos Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.299.2.1 2014/11/18 18:40:06 snj Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.299 2014/05/24 16:34:04 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.299.2.1 2014/11/18 18:40:06 snj Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -1272,14 +1272,6 @@ ffs_mountfs(struct vnode *devvp, struct
}
#endif
}
-#ifdef UFS_EXTATTR
- /*
- * Initialize file-backed extended attributes on UFS1 file
- * systems.
- */
- if
CVS commit: [netbsd-7] src/sys/ufs/ufs
Module Name:src
Committed By: snj
Date: Tue Nov 18 18:42:42 UTC 2014
Modified Files:
src/sys/ufs/ufs [netbsd-7]: ufs_extattr.c
Log Message:
Pull up following revision(s) (requested by manu in ticket #247):
sys/ufs/ufs/ufs_extattr.c: revision 1.45
Fix UFS1 extended attribute backend autocreation deadlock
UFS1 extended attribute backend autocration goes through a vn_open()
to create the backend file, and this forces us to release the lock
on the target node, in case the target is within the parents of the
backend file. That created a window within which another thread could
acquire a lock on the target vnode and deadlock awaiting for the
mount extended attribute lock.
We fix the problem by also releasing the mount extended attribute lock
when calling vn_open(), but that lets another thread race us for backend
creation. We just detect this using O_EXCL for vn_open() and by checking
for EEXIST return code. If we are raced, we fail backend creation but
this is not a problem since another thread succeeded on it: we just have
to use the result.
To generate a diff of this commit:
cvs rdiff -u -r1.43.4.1 -r1.43.4.2 src/sys/ufs/ufs/ufs_extattr.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/ufs/ufs_extattr.c
diff -u src/sys/ufs/ufs/ufs_extattr.c:1.43.4.1 src/sys/ufs/ufs/ufs_extattr.c:1.43.4.2
--- src/sys/ufs/ufs/ufs_extattr.c:1.43.4.1 Tue Nov 18 18:40:06 2014
+++ src/sys/ufs/ufs/ufs_extattr.c Tue Nov 18 18:42:42 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_extattr.c,v 1.43.4.1 2014/11/18 18:40:06 snj Exp $ */
+/* $NetBSD: ufs_extattr.c,v 1.43.4.2 2014/11/18 18:42:42 snj Exp $ */
/*-
* Copyright (c) 1999-2002 Robert N. M. Watson
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_extattr.c,v 1.43.4.1 2014/11/18 18:40:06 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_extattr.c,v 1.43.4.2 2014/11/18 18:42:42 snj Exp $);
#ifdef _KERNEL_OPT
#include opt_ffs.h
@@ -210,9 +210,9 @@ ufs_extattr_valid_attrname(int attrnames
/*
* Autocreate an attribute storage
*/
-static struct ufs_extattr_list_entry *
+static int
ufs_extattr_autocreate_attr(struct vnode *vp, int attrnamespace,
-const char *attrname, struct lwp *l)
+const char *attrname, struct lwp *l, struct ufs_extattr_list_entry **uelep)
{
struct mount *mp = vp-v_mount;
struct ufsmount *ump = VFSTOUFS(mp);
@@ -246,11 +246,21 @@ ufs_extattr_autocreate_attr(struct vnode
break;
default:
PNBUF_PUT(path);
- return NULL;
+ *uelep = NULL;
+ return EINVAL;
break;
}
/*
+ * Release extended attribute mount lock, otherwise
+ * we can deadlock with another thread that would lock
+ * vp after we unlock it below, and call
+ * ufs_extattr_uepm_lock(ump), for instance
+ * in ufs_getextattr().
+ */
+ ufs_extattr_uepm_unlock(ump);
+
+ /*
* XXX unlock/lock should only be done when setting extattr
* on backing store or one of its parent directory
* including root, but we always do it for now.
@@ -261,7 +271,12 @@ ufs_extattr_autocreate_attr(struct vnode
pb = pathbuf_create(path);
NDINIT(nd, CREATE, LOCKPARENT, pb);
- error = vn_open(nd, O_CREAT|O_RDWR, 0600);
+ /*
+ * Since we do not hold ufs_extattr_uepm_lock anymore,
+ * another thread may race with us for backend creation,
+ * but only one can succeed here thanks to O_EXCL
+ */
+ error = vn_open(nd, O_CREAT|O_EXCL|O_RDWR, 0600);
/*
* Reacquire the lock on the vnode
@@ -269,10 +284,13 @@ ufs_extattr_autocreate_attr(struct vnode
KASSERT(VOP_ISLOCKED(vp) == 0);
vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ ufs_extattr_uepm_lock(ump);
+
if (error != 0) {
pathbuf_destroy(pb);
PNBUF_PUT(path);
- return NULL;
+ *uelep = NULL;
+ return error;
}
KASSERT(nd.ni_vp != NULL);
@@ -300,7 +318,8 @@ ufs_extattr_autocreate_attr(struct vnode
printf(%s: write uef header failed for %s, error = %d\n,
__func__, attrname, error);
vn_close(backing_vp, FREAD|FWRITE, l-l_cred);
- return NULL;
+ *uelep = NULL;
+ return error;
}
/*
@@ -313,7 +332,8 @@ ufs_extattr_autocreate_attr(struct vnode
printf(%s: enable %s failed, error %d\n,
__func__, attrname, error);
vn_close(backing_vp, FREAD|FWRITE, l-l_cred);
- return NULL;
+ *uelep = NULL;
+ return error;
}
uele = ufs_extattr_find_attr(ump, attrnamespace, attrname);
@@ -321,13 +341,15 @@ ufs_extattr_autocreate_attr(struct vnode
printf(%s: atttribute %s created but not found!\n,
__func__, attrname);
vn_close(backing_vp, FREAD|FWRITE, l-l_cred);
- return NULL;
+ *uelep = NULL;
+ return ESRCH; /* really internal error */
}
printf(%s: EA backing store autocreated for %s\n,
mp-mnt_stat.f_mntonname, attrname);
- return uele;
+ *uelep = uele;
+ return 0;
}
/*
@@ -1405,10 +1427,17 @@ ufs_extattr_set(struct vnode *vp, int at
attribute = ufs_extattr_find_attr(ump, attrnamespace,
CVS commit: [netbsd-7] src/sys/netbt
Module Name:src
Committed By: snj
Date: Tue Nov 18 18:45:30 UTC 2014
Modified Files:
src/sys/netbt [netbsd-7]: rfcomm_upper.c
Log Message:
Pull up following revision(s) (requested by plunky in ticket #248):
sys/netbt/rfcomm_upper.c: revision 1.22
since rfcomm_attach_pcb may be called from (soft) interrupt context
(for incoming connections), use kmem_intr_()
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/netbt/rfcomm_upper.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/netbt/rfcomm_upper.c
diff -u src/sys/netbt/rfcomm_upper.c:1.21 src/sys/netbt/rfcomm_upper.c:1.21.2.1
--- src/sys/netbt/rfcomm_upper.c:1.21 Fri Aug 8 03:05:45 2014
+++ src/sys/netbt/rfcomm_upper.c Tue Nov 18 18:45:30 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rfcomm_upper.c,v 1.21 2014/08/08 03:05:45 rtr Exp $ */
+/* $NetBSD: rfcomm_upper.c,v 1.21.2.1 2014/11/18 18:45:30 snj Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rfcomm_upper.c,v 1.21 2014/08/08 03:05:45 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: rfcomm_upper.c,v 1.21.2.1 2014/11/18 18:45:30 snj Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -70,7 +70,9 @@ rfcomm_attach_pcb(struct rfcomm_dlc **ha
KASSERT(proto != NULL);
KASSERT(upper != NULL);
- dlc = kmem_zalloc(sizeof(struct rfcomm_dlc), KM_SLEEP);
+ dlc = kmem_intr_zalloc(sizeof(struct rfcomm_dlc), KM_NOSLEEP);
+ if (dlc == NULL)
+ return ENOMEM;
dlc-rd_state = RFCOMM_DLC_CLOSED;
dlc-rd_mtu = rfcomm_mtu_default;
@@ -296,7 +298,7 @@ rfcomm_detach_pcb(struct rfcomm_dlc **ha
dlc-rd_flags |= RFCOMM_DLC_DETACH;
else {
callout_destroy(dlc-rd_timeout);
- kmem_free(dlc, sizeof(*dlc));
+ kmem_intr_free(dlc, sizeof(*dlc));
}
}
CVS commit: [netbsd-7] src/sys/arch/arm/allwinner
Module Name:src Committed By: snj Date: Tue Nov 18 18:50:33 UTC 2014 Modified Files: src/sys/arch/arm/allwinner [netbsd-7]: awin_cnt.c Log Message: Pull up following revision(s) (requested by skrll in ticket #250): sys/arch/arm/allwinner/awin_cnt.c: revision 1.2 s/IPL_SCHED/IPL_HIGH/ This allows binuptime to be called from any interrupt handler. To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/arm/allwinner/awin_cnt.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/allwinner/awin_cnt.c diff -u src/sys/arch/arm/allwinner/awin_cnt.c:1.1.2.2 src/sys/arch/arm/allwinner/awin_cnt.c:1.1.2.3 --- src/sys/arch/arm/allwinner/awin_cnt.c:1.1.2.2 Sun Nov 9 14:42:33 2014 +++ src/sys/arch/arm/allwinner/awin_cnt.c Tue Nov 18 18:50:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: awin_cnt.c,v 1.1.2.2 2014/11/09 14:42:33 martin Exp $ */ +/* $NetBSD: awin_cnt.c,v 1.1.2.3 2014/11/18 18:50:33 snj Exp $ */ /*- * Copyright (c) 2014 Jared D. McNeill jmcne...@invisible.ca @@ -29,7 +29,7 @@ #include opt_multiprocessor.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: awin_cnt.c,v 1.1.2.2 2014/11/09 14:42:33 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: awin_cnt.c,v 1.1.2.3 2014/11/18 18:50:33 snj Exp $); #include sys/param.h #include sys/bus.h @@ -84,7 +84,7 @@ awin_cnt_attach(device_t parent, device_ sc-sc_dev = self; sc-sc_bst = aio-aio_core_bst; - mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_SCHED); + mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_HIGH); bus_space_subregion(sc-sc_bst, aio-aio_core_bsh, loc-loc_offset, loc-loc_size, sc-sc_bsh);
CVS commit: [netbsd-7] src/sys
Module Name:src Committed By: snj Date: Tue Nov 18 19:05:32 UTC 2014 Modified Files: src/sys/arch/acorn26/conf [netbsd-7]: GENERIC src/sys/arch/acorn32/conf [netbsd-7]: GENERIC src/sys/arch/alpha/conf [netbsd-7]: GENERIC src/sys/arch/amd64/conf [netbsd-7]: ALL GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/amiga/conf [netbsd-7]: GENERIC GENERIC.in src/sys/arch/amigappc/conf [netbsd-7]: GENERIC src/sys/arch/arc/conf [netbsd-7]: GENERIC src/sys/arch/bebox/conf [netbsd-7]: GENERIC src/sys/arch/cats/conf [netbsd-7]: GENERIC src/sys/arch/cesfic/conf [netbsd-7]: GENERIC src/sys/arch/cobalt/conf [netbsd-7]: GENERIC src/sys/arch/dreamcast/conf [netbsd-7]: GENERIC src/sys/arch/emips/conf [netbsd-7]: GENERIC src/sys/arch/epoc32/conf [netbsd-7]: GENERIC src/sys/arch/ews4800mips/conf [netbsd-7]: GENERIC src/sys/arch/hp300/conf [netbsd-7]: GENERIC src/sys/arch/hpcmips/conf [netbsd-7]: GENERIC src/sys/arch/hpcsh/conf [netbsd-7]: GENERIC src/sys/arch/hppa/conf [netbsd-7]: GENERIC src/sys/arch/i386/conf [netbsd-7]: ALL GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/ibmnws/conf [netbsd-7]: GENERIC src/sys/arch/iyonix/conf [netbsd-7]: GENERIC src/sys/arch/landisk/conf [netbsd-7]: GENERIC src/sys/arch/luna68k/conf [netbsd-7]: GENERIC src/sys/arch/mac68k/conf [netbsd-7]: GENERIC src/sys/arch/macppc/conf [netbsd-7]: GENERIC MAMBO POWERMAC_G5 src/sys/arch/mipsco/conf [netbsd-7]: GENERIC src/sys/arch/mmeye/conf [netbsd-7]: GENERIC src/sys/arch/mvme68k/conf [netbsd-7]: GENERIC src/sys/arch/mvmeppc/conf [netbsd-7]: GENERIC src/sys/arch/netwinder/conf [netbsd-7]: GENERIC src/sys/arch/news68k/conf [netbsd-7]: GENERIC src/sys/arch/newsmips/conf [netbsd-7]: GENERIC src/sys/arch/next68k/conf [netbsd-7]: GENERIC src/sys/arch/ofppc/conf [netbsd-7]: GENERIC src/sys/arch/pmax/conf [netbsd-7]: GENERIC GENERIC64 src/sys/arch/prep/conf [netbsd-7]: GENERIC src/sys/arch/rs6000/conf [netbsd-7]: GENERIC src/sys/arch/sandpoint/conf [netbsd-7]: GENERIC src/sys/arch/sbmips/conf [netbsd-7]: GENERIC src/sys/arch/sgimips/conf [netbsd-7]: GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x src/sys/arch/shark/conf [netbsd-7]: GENERIC src/sys/arch/sparc/conf [netbsd-7]: GENERIC TADPOLE3GX src/sys/arch/sparc64/conf [netbsd-7]: GENERIC NONPLUS64 src/sys/arch/sun2/conf [netbsd-7]: GENERIC src/sys/arch/sun3/conf [netbsd-7]: GENERIC src/sys/arch/vax/conf [netbsd-7]: GENERIC VAX780 src/sys/arch/x68k/conf [netbsd-7]: GENERIC src/sys/arch/zaurus/conf [netbsd-7]: GENERIC src/sys/ufs [netbsd-7]: files.ufs Log Message: Pull up following revision(s) (requested by manu in ticket #251): sys/arch/acorn26/conf/GENERIC: revision 1.81 sys/arch/acorn32/conf/GENERIC: revision 1.116 sys/arch/alpha/conf/GENERIC: revision 1.362 sys/arch/amd64/conf/ALL: revision 1.23 sys/arch/amd64/conf/GENERIC: revision 1.404 sys/arch/amd64/conf/XEN3_DOM0: revision 1.112 sys/arch/amd64/conf/XEN3_DOMU: revision 1.60 sys/arch/amiga/conf/GENERIC.in: revision 1.129 sys/arch/amiga/conf/GENERIC: revision 1.311 sys/arch/amigappc/conf/GENERIC: revision 1.24 sys/arch/arc/conf/GENERIC: revision 1.184 sys/arch/bebox/conf/GENERIC: revision 1.145 sys/arch/cats/conf/GENERIC: revision 1.155 sys/arch/cesfic/conf/GENERIC: revision 1.65 sys/arch/cobalt/conf/GENERIC: revision 1.147 sys/arch/dreamcast/conf/GENERIC: revision 1.121 sys/arch/emips/conf/GENERIC: revision 1.15 sys/arch/epoc32/conf/GENERIC: revision 1.8 sys/arch/ews4800mips/conf/GENERIC: revision 1.51 sys/arch/hp300/conf/GENERIC: revision 1.190 sys/arch/hpcmips/conf/GENERIC: revision 1.229 sys/arch/hpcsh/conf/GENERIC: revision 1.106 sys/arch/hppa/conf/GENERIC: revision 1.6 sys/arch/i386/conf/ALL: revision 1.389 sys/arch/i386/conf/GENERIC: revision 1.1118 sys/arch/i386/conf/XEN3_DOM0: revision 1.93 sys/arch/i386/conf/XEN3_DOMU: revision 1.65 sys/arch/ibmnws/conf/GENERIC: revision 1.46 sys/arch/iyonix/conf/GENERIC: revision 1.88 sys/arch/landisk/conf/GENERIC: revision 1.45 sys/arch/luna68k/conf/GENERIC: revision 1.119 sys/arch/mac68k/conf/GENERIC: revision 1.220 sys/arch/macppc/conf/GENERIC: revision 1.320 sys/arch/macppc/conf/MAMBO: revision 1.24 sys/arch/macppc/conf/POWERMAC_G5: revision 1.25 sys/arch/mipsco/conf/GENERIC: revision 1.88 sys/arch/mmeye/conf/GENERIC: revision 1.120 sys/arch/mvme68k/conf/GENERIC: revision 1.94
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Tue Nov 18 19:11:36 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: tickets 243-248, 250 251 To generate a diff of this commit: cvs rdiff -u -r1.1.2.105 -r1.1.2.106 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.105 src/doc/CHANGES-7.0:1.1.2.106 --- src/doc/CHANGES-7.0:1.1.2.105 Sun Nov 16 11:18:54 2014 +++ src/doc/CHANGES-7.0 Tue Nov 18 19:11:36 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.105 2014/11/16 11:18:54 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.106 2014/11/18 19:11:36 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -2682,3 +2682,155 @@ distrib/utils/libhack/multibyte.c 1.6-1 Handle the special wc NULL case. [christos, ticket #242] +sys/dev/raidframe/raidframevar.h 1.17 +sys/dev/raidframe/rf_netbsdkintf.c 1.316 +sys/dev/raidframe/rf_reconstruct.c 1.121 + + Fix a long-standing bug related to rebooting while a + reconstrucj-to-spare is underway but not yet complete. + Fixes PR kern/49244. + [oster, ticket #243] + +sys/arch/arm/allwinner/awin_hdmi.c 1.13-1.15 +sys/arch/arm/allwinner/awin_hdmiaudio.c 1.4 +sys/arch/arm/allwinner/awin_var.h 1.25 +sys/arch/evbarm/awin/awin_machdep.c 1.29 +sys/dev/i2c/ddc.c1.4 +sys/dev/i2c/ddcvar.h1.2 +sys/dev/videomode/edid.c 1.13 +sys/dev/videomode/edidreg.h 1.4 +sys/dev/videomode/edidvar.h 1.3 + + Add support for auto-detecting HDMI vs DVI displays. + Allow for overriding DVI/HDMI detection with a kernel boot + arg. Set hdmi.forcemode=dvi or hdmi.forcemode=hdmi to + disable auto-detection. + [jmcneill, ticket #244] + +doc/3RDPARTY patch +distrib/sets/lists/base/mi patch +external/public-domain/tz/dist/Makefile patch +external/public-domain/tz/dist/NEWS patch +external/public-domain/tz/dist/Theory patch +external/public-domain/tz/dist/africa patch +external/public-domain/tz/dist/asia patch +external/public-domain/tz/dist/australasia patch +external/public-domain/tz/dist/backzone patch +external/public-domain/tz/dist/checktab.awk patch +external/public-domain/tz/dist/europe patch +external/public-domain/tz/dist/leapseconds patch +external/public-domain/tz/dist/leapseconds.awk patch +external/public-domain/tz/dist/northamerica patch +external/public-domain/tz/dist/southamerica patch +external/public-domain/tz/dist/zone.tab patch +external/public-domain/tz/dist/zone1970.tab patch + + Update tzdata from 2014g to 2014j. Some of the changes are: + * A new Zone Pacific/Bougainville, for the part of Papua New + Guinea that plans to switch from UTC+10 to UTC+11 on + 2014-12-28 at 02:00. + * Changes for Fiji, Belarus, and Turks Caicos that take + effect at various times in 2014. + * Changes to historical data. + [apb, ticket #245] + +sys/kern/vfs_mount.c1.31 +sys/ufs/ffs/ffs_vfsops.c 1.302 +sys/ufs/ufs/ufs_extattr.c 1.44 + + Fix use-after-free on failed unmount with extended attributes + enabled. + [manu, ticket #246] + +sys/ufs/ufs/ufs_extattr.c 1.45 + + Fix UFS1 extended attribute backend autocreation deadlock. + [manu, ticket #247] + +sys/netbt/rfcomm_upper.c 1.22 + + Since rfcomm_attach_pcb may be called from (soft) interrupt + context (for incoming connections), use kmem_intr_() to avoid + a diagnostic panic. + [plunky, ticket #248] + +sys/arch/arm/allwinner/awin_cnt.c 1.2 + + Locking fix for awin_cnt: s/IPL_SCHED/IPL_HIGH/ + This allows binuptime to be called from any interrupt handler. + [skrll, ticket #250] + +sys/arch/acorn26/conf/GENERIC 1.81 +sys/arch/acorn32/conf/GENERIC 1.116 +sys/arch/alpha/conf/GENERIC 1.362 +sys/arch/amd64/conf/ALL1.23 +sys/arch/amd64/conf/GENERIC 1.404 +sys/arch/amd64/conf/XEN3_DOM0 1.112 +sys/arch/amd64/conf/XEN3_DOMU 1.60 +sys/arch/amiga/conf/GENERIC 1.311 +sys/arch/amiga/conf/GENERIC.in 1.129 +sys/arch/amigappc/conf/GENERIC 1.24 +sys/arch/arc/conf/GENERIC 1.184 +sys/arch/bebox/conf/GENERIC 1.145 +sys/arch/cats/conf/GENERIC 1.155 +sys/arch/cesfic/conf/GENERIC 1.65 +sys/arch/cobalt/conf/GENERIC 1.147 +sys/arch/dreamcast/conf/GENERIC 1.121 +sys/arch/emips/conf/GENERIC 1.15 +sys/arch/epoc32/conf/GENERIC 1.8 +sys/arch/ews4800mips/conf/GENERIC 1.51 +sys/arch/hp300/conf/GENERIC 1.190 +sys/arch/hpcmips/conf/GENERIC 1.229 +sys/arch/hpcsh/conf/GENERIC 1.106 +sys/arch/hppa/conf/GENERIC 1.6 +sys/arch/i386/conf/ALL1.389 +sys/arch/i386/conf/GENERIC 1.1118 +sys/arch/i386/conf/XEN3_DOM0 1.93 +sys/arch/i386/conf/XEN3_DOMU 1.65 +sys/arch/ibmnws/conf/GENERIC 1.46 +sys/arch/iyonix/conf/GENERIC 1.88 +sys/arch/landisk/conf/GENERIC 1.45 +sys/arch/luna68k/conf/GENERIC 1.119 +sys/arch/mac68k/conf/GENERIC 1.220 +sys/arch/macppc/conf/GENERIC 1.320 +sys/arch/macppc/conf/MAMBO 1.24
CVS commit: src/sys/modules
Module Name:src
Committed By: pooka
Date: Wed Nov 19 00:17:10 UTC 2014
Modified Files:
src/sys/modules/hdafg: Makefile
src/sys/modules/hdaudio: Makefile
Added Files:
src/sys/modules/hdafg: Makefile.inc
src/sys/modules/hdaudio: Makefile.inc
Log Message:
allow sharing Makefiles with rump kernel components
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/hdafg/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/hdafg/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/sys/modules/hdaudio/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/hdaudio/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/hdafg/Makefile
diff -u src/sys/modules/hdafg/Makefile:1.4 src/sys/modules/hdafg/Makefile:1.5
--- src/sys/modules/hdafg/Makefile:1.4 Sun Aug 28 15:48:19 2011
+++ src/sys/modules/hdafg/Makefile Wed Nov 19 00:17:10 2014
@@ -1,11 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2011/08/28 15:48:19 jmcneill Exp $
+# $NetBSD: Makefile,v 1.5 2014/11/19 00:17:10 pooka Exp $
.include ../Makefile.inc
-
-.PATH: ${S}/dev/pci/hdaudio
+.include ${.CURDIR}/Makefile.inc
KMOD= hdafg
-IOCONF= hdafg.ioconf
-SRCS= hdafg.c hdafg_dd.c
.include bsd.kmodule.mk
Index: src/sys/modules/hdaudio/Makefile
diff -u src/sys/modules/hdaudio/Makefile:1.3 src/sys/modules/hdaudio/Makefile:1.4
--- src/sys/modules/hdaudio/Makefile:1.3 Fri Sep 19 18:05:24 2014
+++ src/sys/modules/hdaudio/Makefile Wed Nov 19 00:17:10 2014
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2014/09/19 18:05:24 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/11/19 00:17:10 pooka Exp $
.include ../Makefile.inc
-
-.PATH: ${S}/dev/pci/hdaudio
+.include ${.CURDIR}/Makefile.inc
KMOD= hdaudio
-IOCONF= hdaudio.ioconf
-SRCS= hdaudio.c
-SRCS+= hdaudio_pci.c
.include bsd.kmodule.mk
Added files:
Index: src/sys/modules/hdafg/Makefile.inc
diff -u /dev/null src/sys/modules/hdafg/Makefile.inc:1.1
--- /dev/null Wed Nov 19 00:17:10 2014
+++ src/sys/modules/hdafg/Makefile.inc Wed Nov 19 00:17:10 2014
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/11/19 00:17:10 pooka Exp $
+
+# This file is used by modules and rump kernels
+
+IOCONFDIR:= ${.PARSEDIR}
+.PATH: ${NETBSDSRCDIR}/sys/dev/pci/hdaudio ${IOCONFDIR}
+
+IOCONF= hdafg.ioconf
+SRCS= hdafg.c hdafg_dd.c
Index: src/sys/modules/hdaudio/Makefile.inc
diff -u /dev/null src/sys/modules/hdaudio/Makefile.inc:1.1
--- /dev/null Wed Nov 19 00:17:10 2014
+++ src/sys/modules/hdaudio/Makefile.inc Wed Nov 19 00:17:10 2014
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile.inc,v 1.1 2014/11/19 00:17:10 pooka Exp $
+
+# This file is used by modules and rump kernels
+
+IOCONFDIR:= ${.PARSEDIR}
+
+.PATH: ${NETBSDSRCDIR}/sys/dev/pci/hdaudio ${IOCONFDIR}
+
+IOCONF= hdaudio.ioconf
+SRCS= hdaudio.c
+SRCS+= hdaudio_pci.c
CVS commit: src/sys/rump/dev
Module Name:src
Committed By: pooka
Date: Wed Nov 19 00:18:58 UTC 2014
Modified Files:
src/sys/rump/dev: Makefile.rumpdevcomp
Added Files:
src/sys/rump/dev/lib/libhdaudio_hdafg: Makefile shlib_version
src/sys/rump/dev/lib/libpci_hdaudio: Makefile shlib_version
Log Message:
Add hdaudio driver as a rump kernel component
tested by booting a rump kernel on a T61, coupled with a client which
writes some Roy Buchanan to /dev/audio
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/rump/dev/Makefile.rumpdevcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libhdaudio_hdafg/Makefile \
src/sys/rump/dev/lib/libhdaudio_hdafg/shlib_version
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libpci_hdaudio/Makefile \
src/sys/rump/dev/lib/libpci_hdaudio/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/sys/rump/dev/Makefile.rumpdevcomp
diff -u src/sys/rump/dev/Makefile.rumpdevcomp:1.17 src/sys/rump/dev/Makefile.rumpdevcomp:1.18
--- src/sys/rump/dev/Makefile.rumpdevcomp:1.17 Tue Nov 18 09:04:20 2014
+++ src/sys/rump/dev/Makefile.rumpdevcomp Wed Nov 19 00:18:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpdevcomp,v 1.17 2014/11/18 09:04:20 pooka Exp $
+# $NetBSD: Makefile.rumpdevcomp,v 1.18 2014/11/19 00:18:58 pooka Exp $
#
RUMPDEVCOMP= audio audio_ac97 bpf cgd disk dm drvctl fss md netsmb \
@@ -9,7 +9,7 @@ RUMPUSBDEVS= ubt ucom ugenhc ulpt umass
RUMPPCIDEVS= pci pci_if_iwn pci_if_pcn pci_if_wm
RUMPPCIDEVS+= pci_virtio virtio_if_vioif virtio_ld virtio_viornd
-RUMPPCIDEVS+= pci_eap
+RUMPPCIDEVS+= pci_eap pci_hdaudio hdaudio_hdafg
# Not really a PCI device, but
RUMPPCIDEVS+= miiphy
Added files:
Index: src/sys/rump/dev/lib/libhdaudio_hdafg/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libhdaudio_hdafg/Makefile:1.1
--- /dev/null Wed Nov 19 00:18:58 2014
+++ src/sys/rump/dev/lib/libhdaudio_hdafg/Makefile Wed Nov 19 00:18:58 2014
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2014/11/19 00:18:58 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.include bsd.own.mk
+.include ${NETBSDSRCDIR}/sys/modules/hdafg/Makefile.inc
+
+LIB= rumpdev_hdaudio_hdafg
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libhdaudio_hdafg/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libhdaudio_hdafg/shlib_version:1.1
--- /dev/null Wed Nov 19 00:18:58 2014
+++ src/sys/rump/dev/lib/libhdaudio_hdafg/shlib_version Wed Nov 19 00:18:58 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/sys/rump/dev/lib/libpci_hdaudio/Makefile
diff -u /dev/null src/sys/rump/dev/lib/libpci_hdaudio/Makefile:1.1
--- /dev/null Wed Nov 19 00:18:58 2014
+++ src/sys/rump/dev/lib/libpci_hdaudio/Makefile Wed Nov 19 00:18:58 2014
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2014/11/19 00:18:58 pooka Exp $
+#
+
+RUMPTOP=${TOPRUMP}
+
+.include bsd.own.mk
+.include ${NETBSDSRCDIR}/sys/modules/hdaudio/Makefile.inc
+
+LIB= rumpdev_pci_hdaudio
+
+.include ${RUMPTOP}/Makefile.rump
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/dev/lib/libpci_hdaudio/shlib_version
diff -u /dev/null src/sys/rump/dev/lib/libpci_hdaudio/shlib_version:1.1
--- /dev/null Wed Nov 19 00:18:58 2014
+++ src/sys/rump/dev/lib/libpci_hdaudio/shlib_version Wed Nov 19 00:18:58 2014
@@ -0,0 +1,2 @@
+major=0
+minor=0
CVS commit: src
Module Name:src Committed By: pooka Date: Wed Nov 19 01:08:42 UTC 2014 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi src/distrib/sets/lists/debug: mi shl.mi src/sys/rump/dev: Makefile.rumpdevcomp Log Message: On second thought, let's not build the rump kernel component for ac97 by default. The component is not used on a NetBSD target anyway. To generate a diff of this commit: cvs rdiff -u -r1.724 -r1.725 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1922 -r1.1923 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.270 -r1.271 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.18 -r1.19 src/sys/rump/dev/Makefile.rumpdevcomp 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.724 src/distrib/sets/lists/base/shl.mi:1.725 --- src/distrib/sets/lists/base/shl.mi:1.724 Tue Nov 18 09:12:30 2014 +++ src/distrib/sets/lists/base/shl.mi Wed Nov 19 01:08:42 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.724 2014/11/18 09:12:30 pooka Exp $ +# $NetBSD: shl.mi,v 1.725 2014/11/19 01:08:42 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -485,9 +485,9 @@ ./usr/lib/librumpdev_audio.so base-rump-shlib rump ./usr/lib/librumpdev_audio.so.0 base-rump-shlib rump ./usr/lib/librumpdev_audio.so.0.0 base-rump-shlib rump -./usr/lib/librumpdev_audio_ac97.so base-rump-shlib rump -./usr/lib/librumpdev_audio_ac97.so.0 base-rump-shlib rump -./usr/lib/librumpdev_audio_ac97.so.0.0 base-rump-shlib rump +./usr/lib/librumpdev_audio_ac97.so base-obsolete obsolete +./usr/lib/librumpdev_audio_ac97.so.0 base-obsolete obsolete +./usr/lib/librumpdev_audio_ac97.so.0.0 base-obsolete obsolete ./usr/lib/librumpdev_bpf.so base-rump-shlib rump ./usr/lib/librumpdev_bpf.so.0 base-rump-shlib rump ./usr/lib/librumpdev_bpf.so.0.0 base-rump-shlib rump Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1922 src/distrib/sets/lists/comp/mi:1.1923 --- src/distrib/sets/lists/comp/mi:1.1922 Tue Nov 18 09:12:30 2014 +++ src/distrib/sets/lists/comp/mi Wed Nov 19 01:08:42 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1922 2014/11/18 09:12:30 pooka Exp $ +# $NetBSD: mi,v 1.1923 2014/11/19 01:08:42 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3748,8 +3748,8 @@ ./usr/lib/librumpdev.acomp-c-lib rump ./usr/lib/librumpdev_audio.a comp-c-lib rump ./usr/lib/librumpdev_audio_p.a comp-c-proflib profile,rump -./usr/lib/librumpdev_audio_ac97.a comp-c-lib rump -./usr/lib/librumpdev_audio_ac97_p.a comp-c-proflib profile,rump +./usr/lib/librumpdev_audio_ac97.a comp-obsolete obsolete +./usr/lib/librumpdev_audio_ac97_p.a comp-obsolete obsolete ./usr/lib/librumpdev_bpf.a comp-c-lib rump ./usr/lib/librumpdev_bpf_p.a comp-c-proflib profile,rump ./usr/lib/librumpdev_cgd.a comp-c-lib rump Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.270 src/distrib/sets/lists/comp/shl.mi:1.271 --- src/distrib/sets/lists/comp/shl.mi:1.270 Tue Nov 18 09:12:30 2014 +++ src/distrib/sets/lists/comp/shl.mi Wed Nov 19 01:08:42 2014 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.270 2014/11/18 09:12:30 pooka Exp $ +# $NetBSD: shl.mi,v 1.271 2014/11/19 01:08:42 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -150,7 +150,7 @@ ./usr/lib/librumpclient_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpcrypto_pic.a comp-obsolete obsolete ./usr/lib/librumpdev_audio_pic.a comp-c-piclib rump,picinstall -./usr/lib/librumpdev_audio_ac97_pic.a comp-c-piclib rump,picinstall +./usr/lib/librumpdev_audio_ac97_pic.a comp-obsolete obsolete ./usr/lib/librumpdev_bpf_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpdev_cgd_pic.a comp-c-piclib rump,picinstall ./usr/lib/librumpdev_disk_pic.a comp-c-piclib rump,picinstall Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.92 src/distrib/sets/lists/debug/mi:1.93 --- src/distrib/sets/lists/debug/mi:1.92 Tue Nov 18 09:12:30 2014 +++ src/distrib/sets/lists/debug/mi Wed Nov 19 01:08:42 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.92 2014/11/18 09:12:30 pooka Exp $ +# $NetBSD: mi,v 1.93 2014/11/19 01:08:42 pooka Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -138,7 +138,7 @@ ./usr/lib/librumpclient_g.a comp-c-debuglib debuglib,rump ./usr/lib/librumpcrypto_g.a comp-obsolete obsolete ./usr/lib/librumpdev_audio_g.a comp-c-debuglib debuglib,rump -./usr/lib/librumpdev_audio_ac97_g.a
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: snj Date: Wed Nov 19 06:33:54 UTC 2014 Modified Files: src/doc [netbsd-5-1]: LAST_MINUTE README.files src/gnu/usr.bin/groff/tmac [netbsd-5-1]: mdoc.local src/sys/sys [netbsd-5-1]: param.h Added Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Say hello to 5.1.5_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.1.6 cvs rdiff -u -r1.2.30.2.2.5 -r1.2.30.2.2.6 src/doc/LAST_MINUTE cvs rdiff -u -r1.4.10.3.2.7 -r1.4.10.3.2.8 src/doc/README.files cvs rdiff -u -r1.43.4.15.2.8 -r1.43.4.15.2.9 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.15.2.10 -r1.330.4.15.2.11 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.30.2.2.5 src/doc/LAST_MINUTE:1.2.30.2.2.6 --- src/doc/LAST_MINUTE:1.2.30.2.2.5 Sat Nov 15 08:11:27 2014 +++ src/doc/LAST_MINUTE Wed Nov 19 06:33:54 2014 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.30.2.2.5 2014/11/15 08:11:27 snj Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.30.2.2.6 2014/11/19 06:33:54 snj Exp $ -This file contains important information on the NetBSD 5.1.5 release that +This file contains important information on the NetBSD 5.1.6 release that did not make it into the main documentation. [all] Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.3.2.7 src/doc/README.files:1.4.10.3.2.8 --- src/doc/README.files:1.4.10.3.2.7 Mon Jan 27 21:29:13 2014 +++ src/doc/README.files Wed Nov 19 06:33:54 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.3.2.7 2014/01/27 21:29:13 bouyer Exp $ +# $NetBSD: README.files,v 1.4.10.3.2.8 2014/11/19 06:33:54 snj Exp $ What's in this directory: @@ -18,6 +18,8 @@ CHANGES-5.1.4 Changes between the 5.1.3 CHANGES-5.1.5 Changes between the 5.1.4 and 5.1.5 releases. +CHANGES-5.1.6 Changes between the 5.1.5 and 5.1.6 releases. + CHANGES.prev Changes in previous NetBSD releases. LAST_MINUTE Last minute changes and notes about the release. @@ -32,7 +34,7 @@ source/sets/ Source distribution sets; s In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 5.1.5 has a binary distribution. The contents of each +NetBSD 5.1.6 has a binary distribution. The contents of each architecture's directory are described in an INSTALL file found in that directory. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.8 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.9 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.15.2.8 Mon Jan 27 21:18:44 2014 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Wed Nov 19 06:33:54 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.43.4.15.2.8 2014/01/27 21:18:44 bouyer Exp $ +.\ $NetBSD: mdoc.local,v 1.43.4.15.2.9 2014/11/19 06:33:54 snj Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~5.1.5 +.ds doc-operating-system NetBSD\~5.1.5_PATCH .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.1.5 +.ds doc-default-operating-system NetBSD\~5.1.5_PATCH .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.15.2.10 src/sys/sys/param.h:1.330.4.15.2.11 --- src/sys/sys/param.h:1.330.4.15.2.10 Sat Nov 15 08:11:27 2014 +++ src/sys/sys/param.h Wed Nov 19 06:33:54 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.15.2.10 2014/11/15 08:11:27 snj Exp $ */ +/* $NetBSD: param.h,v 1.330.4.15.2.11 2014/11/19 06:33:54 snj Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 501000500 /* NetBSD 5.1.5 */ +#define __NetBSD_Version__ 501000500 /* NetBSD 5.1.5_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.1.6 diff -u /dev/null src/doc/CHANGES-5.1.6:1.1.2.1 --- /dev/null Wed Nov 19 06:33:54 2014 +++ src/doc/CHANGES-5.1.6 Wed Nov 19 06:33:54 2014 @@ -0,0 +1,13 @@ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.1 2014/11/19 06:33:54 snj Exp $ + +A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 +release: + +doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.1.5_PATCH. + [snj] +
CVS commit: [netbsd-5-2] src
Module Name:src Committed By: snj Date: Wed Nov 19 06:47:26 UTC 2014 Modified Files: src/doc [netbsd-5-2]: LAST_MINUTE README.files src/gnu/usr.bin/groff/tmac [netbsd-5-2]: mdoc.local src/sys/sys [netbsd-5-2]: param.h Added Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: Oh hi, 5.2.3_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-5.2.4 cvs rdiff -u -r1.2.30.3.2.3 -r1.2.30.3.2.4 src/doc/LAST_MINUTE cvs rdiff -u -r1.4.10.4.2.5 -r1.4.10.4.2.6 src/doc/README.files cvs rdiff -u -r1.43.4.18.2.5 -r1.43.4.18.2.6 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.330.4.18.2.6 -r1.330.4.18.2.7 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.30.3.2.3 src/doc/LAST_MINUTE:1.2.30.3.2.4 --- src/doc/LAST_MINUTE:1.2.30.3.2.3 Sat Nov 15 08:13:01 2014 +++ src/doc/LAST_MINUTE Wed Nov 19 06:47:26 2014 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.30.3.2.3 2014/11/15 08:13:01 snj Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.30.3.2.4 2014/11/19 06:47:26 snj Exp $ -This file contains important information on the NetBSD 5.2.3 release that +This file contains important information on the NetBSD 5.2.4 release that did not make it into the main documentation. [all] Index: src/doc/README.files diff -u src/doc/README.files:1.4.10.4.2.5 src/doc/README.files:1.4.10.4.2.6 --- src/doc/README.files:1.4.10.4.2.5 Mon Jan 27 21:30:24 2014 +++ src/doc/README.files Wed Nov 19 06:47:26 2014 @@ -1,4 +1,4 @@ -# $NetBSD: README.files,v 1.4.10.4.2.5 2014/01/27 21:30:24 bouyer Exp $ +# $NetBSD: README.files,v 1.4.10.4.2.6 2014/11/19 06:47:26 snj Exp $ What's in this directory: @@ -16,6 +16,8 @@ CHANGES-5.2.2 Changes between the 5.2.1 CHANGES-5.2.3 Changes between the 5.2.2 and 5.2.3 releases. +CHANGES-5.2.4 Changes between the 5.2.3 and 5.2.4 releases. + CHANGES.prev Changes in previous NetBSD releases. LAST_MINUTE Last minute changes and notes about the release. @@ -30,7 +32,7 @@ source/sets/ Source distribution sets; s In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 5.2.3 has a binary distribution. The contents of each +NetBSD 5.2.4 has a binary distribution. The contents of each architecture's directory are described in an INSTALL file found in that directory. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.5 src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.6 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.43.4.18.2.5 Mon Jan 27 21:21:24 2014 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Wed Nov 19 06:47:26 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.43.4.18.2.5 2014/01/27 21:21:24 bouyer Exp $ +.\ $NetBSD: mdoc.local,v 1.43.4.18.2.6 2014/11/19 06:47:26 snj Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~5.2.3 +.ds doc-operating-system NetBSD\~5.2.3_PATCH .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~5.2.3 +.ds doc-default-operating-system NetBSD\~5.2.3_PATCH .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.330.4.18.2.6 src/sys/sys/param.h:1.330.4.18.2.7 --- src/sys/sys/param.h:1.330.4.18.2.6 Sat Nov 15 08:13:01 2014 +++ src/sys/sys/param.h Wed Nov 19 06:47:26 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.330.4.18.2.6 2014/11/15 08:13:01 snj Exp $ */ +/* $NetBSD: param.h,v 1.330.4.18.2.7 2014/11/19 06:47:26 snj Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 502000300 /* NetBSD 5.2.3 */ +#define __NetBSD_Version__ 502000300 /* NetBSD 5.2.3_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__) Added files: Index: src/doc/CHANGES-5.2.4 diff -u /dev/null src/doc/CHANGES-5.2.4:1.1.2.1 --- /dev/null Wed Nov 19 06:47:26 2014 +++ src/doc/CHANGES-5.2.4 Wed Nov 19 06:47:26 2014 @@ -0,0 +1,13 @@ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.1 2014/11/19 06:47:26 snj Exp $ + +A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 +release: + +doc/LAST_MINUTE patched by hand +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 5.2.3_PATCH. + [snj] +
