CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: martin
Date: Mon Feb 11 09:26:07 UTC 2013
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
Enable SSE2 support for amd64
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/lib/pixman/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.19 src/external/mit/xorg/lib/pixman/Makefile:1.20
--- src/external/mit/xorg/lib/pixman/Makefile:1.19 Thu Feb 7 13:33:50 2013
+++ src/external/mit/xorg/lib/pixman/Makefile Mon Feb 11 09:26:07 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/02/07 13:33:50 macallan Exp $
+# $NetBSD: Makefile,v 1.20 2013/02/11 09:26:07 martin Exp $
NOLINT= 1 # defined
@@ -43,16 +43,14 @@ SRCS= \
# XXX
.if ${MACHINE_ARCH} == i386
-# SSE2 requires a gcc = 4.2
+# SSE2 does not work, for unknown reasons
SRCS+= pixman-mmx.c
COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden
MKDEPFLAGS+= -mmmx -fvisibility=hidden
.elif ${MACHINE_ARCH} == x86_64
-SRCS+= pixman-mmx.c
-# XXX sse2 is broken with pixman 0.21.2; GCC generates unaligned accesses
-#SRCS+= pixman-sse2.c
-COPTS.pixman-mmx.c= -mmmx -fvisibility=hidden
-#COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
+SRCS+= pixman-sse2.c
+COPTS.pixman-sse2.c= -msse2 -fvisibility=hidden
+CPPFLAGS+= -DUSE_SSE2
.endif
.if ${MACHINE_ARCH} == powerpc
CVS commit: src/lib/libm
Module Name:src
Committed By: matt
Date: Mon Feb 11 12:43:04 UTC 2013
Modified Files:
src/lib/libm: Makefile
Added Files:
src/lib/libm/arch/arm: lrint.S lrintf.S
Log Message:
Add VFP versions of lrint/lrintf/lrintl for earmhf*
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/lib/libm/Makefile
cvs rdiff -u -r0 -r1.1 src/lib/libm/arch/arm/lrint.S \
src/lib/libm/arch/arm/lrintf.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.130 src/lib/libm/Makefile:1.131
--- src/lib/libm/Makefile:1.130 Mon Feb 11 01:47:04 2013
+++ src/lib/libm/Makefile Mon Feb 11 12:43:04 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2013/02/11 01:47:04 christos Exp $
+# $NetBSD: Makefile,v 1.131 2013/02/11 12:43:04 matt Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -52,7 +52,7 @@ USE_SHLIBDIR= yes
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
.elif (${MACHINE_ARCH} == earmhf || ${MACHINE_ARCH} == earmhfeb)
.PATH: ${.CURDIR}/arch/arm
-ARCH_SRCS = e_sqrt.S e_sqrtf.S s_fabsf.S
+ARCH_SRCS = e_sqrt.S e_sqrtf.S s_fabsf.S lrint.S lrintf.S
.elif (${MACHINE_ARCH} == sparc)
.PATH: ${.CURDIR}/arch/sparc
COMMON_SRCS+= fenv.c
Added files:
Index: src/lib/libm/arch/arm/lrint.S
diff -u /dev/null src/lib/libm/arch/arm/lrint.S:1.1
--- /dev/null Mon Feb 11 12:43:04 2013
+++ src/lib/libm/arch/arm/lrint.S Mon Feb 11 12:43:03 2013
@@ -0,0 +1,42 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include arm/asm.h
+
+RCSID($NetBSD: lrint.S,v 1.1 2013/02/11 12:43:03 matt Exp $)
+
+STRONG_ALIAS(_lrintl, _lrint)
+WEAK_ALIAS(lrintl, _lrintl)
+WEAK_ALIAS(lrint, _lrint)
+
+ENTRY(_lrint)
+ vcvt.s32.f64 s0, d0
+ vmov r0, s0
+ RET
+END(_lrint)
Index: src/lib/libm/arch/arm/lrintf.S
diff -u /dev/null src/lib/libm/arch/arm/lrintf.S:1.1
--- /dev/null Mon Feb 11 12:43:04 2013
+++ src/lib/libm/arch/arm/lrintf.S Mon Feb 11 12:43:03 2013
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Mon Feb 11 16:02:32 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser_pth.c
Log Message:
As reported by several people, the signature of pthread_setname_np() varies
from one Linux distro to another (didn't suspect it to be *that* _np).
Comment out the call on Linux pending autoconf support.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/librumpuser/rumpuser_pth.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/librumpuser/rumpuser_pth.c
diff -u src/lib/librumpuser/rumpuser_pth.c:1.11 src/lib/librumpuser/rumpuser_pth.c:1.12
--- src/lib/librumpuser/rumpuser_pth.c:1.11 Mon Jan 14 21:00:16 2013
+++ src/lib/librumpuser/rumpuser_pth.c Mon Feb 11 16:02:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_pth.c,v 1.11 2013/01/14 21:00:16 pooka Exp $ */
+/* $NetBSD: rumpuser_pth.c,v 1.12 2013/02/11 16:02:31 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser_pth.c,v 1.11 2013/01/14 21:00:16 pooka Exp $);
+__RCSID($NetBSD: rumpuser_pth.c,v 1.12 2013/02/11 16:02:31 pooka Exp $);
#endif /* !lint */
#include assert.h
@@ -242,9 +242,15 @@ rumpuser_thread_create(void *(*f)(void *
if (rv == 0 thrname)
pthread_setname_np(ptid, thrname, NULL);
#elif defined(__linux__)
+ /*
+ * The pthread_setname_np() call varies from one Linux distro to
+ * another. Comment out the call pending autoconf support.
+ */
+#if 0
if (rv == 0 thrname)
pthread_setname_np(ptid, thrname);
#endif
+#endif
if (joinable) {
assert(ptcookie);
CVS commit: src/usr.bin
Module Name:src Committed By: christos Date: Mon Feb 11 17:14:23 UTC 2013 Modified Files: src/usr.bin: Makefile Log Message: Don't build and install soelim anymore, because it got overwritten anyway by the groff one and messed up the mtree unprived sets. If we want to switch back to ours, we should probably add the extra flags GNU added first. To generate a diff of this commit: cvs rdiff -u -r1.211 -r1.212 src/usr.bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/Makefile diff -u src/usr.bin/Makefile:1.211 src/usr.bin/Makefile:1.212 --- src/usr.bin/Makefile:1.211 Thu Nov 1 19:30:19 2012 +++ src/usr.bin/Makefile Mon Feb 11 12:14:23 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.211 2012/11/01 23:30:19 christos Exp $ +# $NetBSD: Makefile,v 1.212 2013/02/11 17:14:23 christos Exp $ # from: @(#)Makefile 8.3 (Berkeley) 1/7/94 .include bsd.own.mk @@ -24,7 +24,7 @@ SUBDIR= apply asa at audio audiocfg \ renice rev revoke rfcomm_sppd rlogin rpcgen rpcinfo rs rsh \ rup ruptime rusers rwall rwho \ script sdiff sdpquery sed seq shar shlock shmif_dumpbus \ - showmount shuffle sockstat soelim sort spell split stat su systat \ + showmount shuffle sockstat sort spell split stat su systat \ tabs tail talk tcopy tee telnet tftp tic time tip touch tpfmt tput \ tr true tset tsort tty ul uname unexpand unifdef \ uniq units unvis unzip usbhidaction usbhidctl users utoppya \
CVS commit: src/usr.bin
Module Name:src
Committed By: christos
Date: Mon Feb 11 17:24:21 UTC 2013
Modified Files:
src/usr.bin: Makefile
Log Message:
put back soelim, if MKGROFF is no so that we don't break the sets.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/usr.bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/Makefile
diff -u src/usr.bin/Makefile:1.212 src/usr.bin/Makefile:1.213
--- src/usr.bin/Makefile:1.212 Mon Feb 11 12:14:23 2013
+++ src/usr.bin/Makefile Mon Feb 11 12:24:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.212 2013/02/11 17:14:23 christos Exp $
+# $NetBSD: Makefile,v 1.213 2013/02/11 17:24:21 christos Exp $
# from: @(#)Makefile 8.3 (Berkeley) 1/7/94
.include bsd.own.mk
@@ -35,6 +35,10 @@ SUBDIR= apply asa at audio audiocfg \
SUBDIR+= ../external/zlib/pigz/bin/pigz
+.if (${MKGROFF} == no)
+SUBDIR+= soelim
+.endif
+
.if (${MKMAKEMANDB} == no)
SUBDIR+= apropos whatis
.endif
CVS commit: src/lib/libm/arch/arm
Module Name:src Committed By: matt Date: Mon Feb 11 17:41:13 UTC 2013 Added Files: src/lib/libm/arch/arm: s_fma.S s_fmaf.S Log Message: Add fma/fmaf/fmal for arm hard float which uses the VFP vmla instruction. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/lib/libm/arch/arm/s_fma.S \ src/lib/libm/arch/arm/s_fmaf.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/lib/libm/arch/arm/s_fma.S diff -u /dev/null src/lib/libm/arch/arm/s_fma.S:1.1 --- /dev/null Mon Feb 11 17:41:13 2013 +++ src/lib/libm/arch/arm/s_fma.S Mon Feb 11 17:41:13 2013 @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2013 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include arm/asm.h + +RCSID($NetBSD: s_fma.S,v 1.1 2013/02/11 17:41:13 matt Exp $) + +STRONG_ALIAS(_fmal, _fma) +WEAK_ALIAS(fmal, _fmal) +WEAK_ALIAS(fma, _fma) + +ENTRY(_fma) + vmla.f64 d2, d0, d1 + vmov.f64 d0, d2 + RET +END(_fma) Index: src/lib/libm/arch/arm/s_fmaf.S diff -u /dev/null src/lib/libm/arch/arm/s_fmaf.S:1.1 --- /dev/null Mon Feb 11 17:41:13 2013 +++ src/lib/libm/arch/arm/s_fmaf.S Mon Feb 11 17:41:13 2013 @@ -0,0 +1,40 @@ +/*- + * Copyright (c) 2013 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Matt Thomas of 3am Software Foundry. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#include arm/asm.h + +RCSID($NetBSD: s_fmaf.S,v 1.1 2013/02/11 17:41:13 matt Exp $) + +WEAK_ALIAS(fmaf, _fmaf) + +ENTRY(_fmaf) + vmla.f32 s2, s0, s1 + vmov.f32 s0, s2 + RET +END(_fmaf)
CVS commit: src/lib/libm
Module Name:src
Committed By: matt
Date: Mon Feb 11 17:55:01 UTC 2013
Modified Files:
src/lib/libm: Makefile
Log Message:
any arch that has fenv.[ch] can have fma as well (since fma uses fenv).
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/lib/libm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.131 src/lib/libm/Makefile:1.132
--- src/lib/libm/Makefile:1.131 Mon Feb 11 12:43:04 2013
+++ src/lib/libm/Makefile Mon Feb 11 17:55:01 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.131 2013/02/11 12:43:04 matt Exp $
+# $NetBSD: Makefile,v 1.132 2013/02/11 17:55:01 matt Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -52,13 +52,15 @@ USE_SHLIBDIR= yes
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
.elif (${MACHINE_ARCH} == earmhf || ${MACHINE_ARCH} == earmhfeb)
.PATH: ${.CURDIR}/arch/arm
-ARCH_SRCS = e_sqrt.S e_sqrtf.S s_fabsf.S lrint.S lrintf.S
+ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
.elif (${MACHINE_ARCH} == sparc)
.PATH: ${.CURDIR}/arch/sparc
COMMON_SRCS+= fenv.c
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif (${MACHINE_ARCH} == sparc64)
.PATH: ${.CURDIR}/arch/sparc64
COMMON_SRCS+= fenv.c
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
.elif ((${MACHINE_ARCH} == i386) || (${MACHINE_ARCH} == x86_64))
.if (${MACHINE_ARCH} == x86_64)
@@ -67,8 +69,9 @@ COMMON_SRCS+= fenv.c
.PATH: ${.CURDIR}/arch/i387
COMMON_SRCS+= fenv.c s_nextafterl.c s_nexttoward.c s_nexttowardf.c \
- s_nearbyint.c s_rintl.c s_fma.c s_fmaf.c s_fmal.c \
+ s_nearbyint.c s_rintl.c \
s_scalbln.c s_frexpl.c # s_nan.c
+COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
e_logf.S e_log10.S e_log10f.S e_log2.S e_log2f.S e_remainder.S \
@@ -167,7 +170,8 @@ COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c
w_sinh.c w_sinhf.c w_sqrt.c w_sqrtf.c \
lrint.c lrintf.c llrint.c llrintf.c lround.c lroundf.c llround.c \
llroundf.c s_frexp.c s_ldexp.c s_modf.c \
- s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c s_fminf.c s_fminl.c s_fdim.c
+ s_fmax.c s_fmaxf.c s_fmaxl.c \
+ s_fmin.c s_fminf.c s_fminl.c s_fdim.c
.PATH: ${.CURDIR}/compat
COMMON_SRCS+= compat_cabs.c compat_cabsf.c
CVS commit: src/distrib/utils/embedded
Module Name:src Committed By: jmcneill Date: Mon Feb 11 18:11:20 UTC 2013 Modified Files: src/distrib/utils/embedded: mkimage Log Message: set -e To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/distrib/utils/embedded/mkimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/utils/embedded/mkimage diff -u src/distrib/utils/embedded/mkimage:1.32 src/distrib/utils/embedded/mkimage:1.33 --- src/distrib/utils/embedded/mkimage:1.32 Sun Feb 10 21:51:05 2013 +++ src/distrib/utils/embedded/mkimage Mon Feb 11 18:11:20 2013 @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: mkimage,v 1.32 2013/02/10 21:51:05 jmcneill Exp $ +# $NetBSD: mkimage,v 1.33 2013/02/11 18:11:20 jmcneill Exp $ # # Copyright (c) 2013 The NetBSD Foundation, Inc. # All rights reserved. @@ -32,6 +32,8 @@ # POSSIBILITY OF SUCH DAMAGE. # +set -e + DIR=$(cd $(dirname $0) pwd) PROG=$(basename $0)
CVS commit: [netbsd-6-0] src/sys/dev
Module Name:src
Committed By: riz
Date: Mon Feb 11 20:39:05 UTC 2013
Modified Files:
src/sys/dev [netbsd-6-0]: fss.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #810):
sys/dev/fss.c: revision 1.85
Lookup the block device mounted on from the specfs_hash table.
This doesn't belong here but makes it possible to pullup.
Fixes PR kern/47020 (fss(4) panic)
To generate a diff of this commit:
cvs rdiff -u -r1.81.4.1.4.1 -r1.81.4.1.4.2 src/sys/dev/fss.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/fss.c
diff -u src/sys/dev/fss.c:1.81.4.1.4.1 src/sys/dev/fss.c:1.81.4.1.4.2
--- src/sys/dev/fss.c:1.81.4.1.4.1 Sun Feb 10 23:57:38 2013
+++ src/sys/dev/fss.c Mon Feb 11 20:39:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.81.4.1.4.1 2013/02/10 23:57:38 riz Exp $ */
+/* $NetBSD: fss.c,v 1.81.4.1.4.2 2013/02/11 20:39:04 riz Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.81.4.1.4.1 2013/02/10 23:57:38 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.81.4.1.4.2 2013/02/11 20:39:04 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -620,7 +620,7 @@ static int
fss_create_files(struct fss_softc *sc, struct fss_set *fss,
off_t *bsize, struct lwp *l)
{
- int error, bits, fsbsize;
+ int i, error, bits, fsbsize;
uint64_t numsec;
unsigned int secsize;
struct timespec ts;
@@ -691,25 +691,31 @@ fss_create_files(struct fss_softc *sc, s
vrele(vp);
/*
- * Get the block device it is mounted on.
+ * Get the block device it is mounted on and its size.
*/
- error = namei_simple_kernel(sc-sc_mount-mnt_stat.f_mntfromname,
-NSM_FOLLOW_NOEMULROOT, vp);
- if (error != 0)
- return error;
-
- if (vp-v_type != VBLK) {
- vrele(vp);
+ mutex_enter(device_lock);
+ for (i = 0; i SPECHSZ; i++) {
+ for (vp = specfs_hash[i]; vp; vp = vp-v_specnext) {
+ if (vp-v_type == VBLK
+ vp == vp-v_specnode-sn_dev-sd_bdevvp
+ vp-v_specmountpoint == sc-sc_mount)
+break;
+ }
+ if (vp != NULL)
+ break;
+ }
+ if (vp == NULL) {
+ mutex_exit(device_lock);
return EINVAL;
}
-
+ mutex_enter(vp-v_interlock);
+ mutex_exit(device_lock);
+ error = vget(vp, 0);
+ if (error)
+ return error;
sc-sc_bdev = vp-v_rdev;
- /*
- * Get the block device size.
- */
-
error = getdisksize(vp, numsec, secsize);
vrele(vp);
if (error)
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Mon Feb 11 20:39:18 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.2 Log Message: ticket 810. To generate a diff of this commit: cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-6.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.2 diff -u src/doc/CHANGES-6.0.2:1.1.2.17 src/doc/CHANGES-6.0.2:1.1.2.18 --- src/doc/CHANGES-6.0.2:1.1.2.17 Sun Feb 10 23:57:51 2013 +++ src/doc/CHANGES-6.0.2 Mon Feb 11 20:39:18 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.2,v 1.1.2.17 2013/02/10 23:57:51 riz Exp $ +# $NetBSD: CHANGES-6.0.2,v 1.1.2.18 2013/02/11 20:39:18 riz Exp $ A complete list of changes from the NetBSD 6.0.1 release to the NetBSD 6.0.2 release: @@ -113,3 +113,8 @@ sys/dev/fss.c 1.84 Don't crash when running multiple dump -X. PR#47514. [hannken, ticket #808] +sys/dev/fss.c 1.85 + + Fix panic in fss(4). PR#47020. + [hannken, ticket #810] +
CVS commit: [netbsd-6] src/sys/dev
Module Name:src
Committed By: riz
Date: Mon Feb 11 20:39:28 UTC 2013
Modified Files:
src/sys/dev [netbsd-6]: fss.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #810):
sys/dev/fss.c: revision 1.85
Lookup the block device mounted on from the specfs_hash table.
This doesn't belong here but makes it possible to pullup.
Fixes PR kern/47020 (fss(4) panic)
To generate a diff of this commit:
cvs rdiff -u -r1.81.4.2 -r1.81.4.3 src/sys/dev/fss.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/fss.c
diff -u src/sys/dev/fss.c:1.81.4.2 src/sys/dev/fss.c:1.81.4.3
--- src/sys/dev/fss.c:1.81.4.2 Sun Feb 10 23:57:25 2013
+++ src/sys/dev/fss.c Mon Feb 11 20:39:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fss.c,v 1.81.4.2 2013/02/10 23:57:25 riz Exp $ */
+/* $NetBSD: fss.c,v 1.81.4.3 2013/02/11 20:39:28 riz Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.81.4.2 2013/02/10 23:57:25 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: fss.c,v 1.81.4.3 2013/02/11 20:39:28 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -620,7 +620,7 @@ static int
fss_create_files(struct fss_softc *sc, struct fss_set *fss,
off_t *bsize, struct lwp *l)
{
- int error, bits, fsbsize;
+ int i, error, bits, fsbsize;
uint64_t numsec;
unsigned int secsize;
struct timespec ts;
@@ -691,25 +691,31 @@ fss_create_files(struct fss_softc *sc, s
vrele(vp);
/*
- * Get the block device it is mounted on.
+ * Get the block device it is mounted on and its size.
*/
- error = namei_simple_kernel(sc-sc_mount-mnt_stat.f_mntfromname,
-NSM_FOLLOW_NOEMULROOT, vp);
- if (error != 0)
- return error;
-
- if (vp-v_type != VBLK) {
- vrele(vp);
+ mutex_enter(device_lock);
+ for (i = 0; i SPECHSZ; i++) {
+ for (vp = specfs_hash[i]; vp; vp = vp-v_specnext) {
+ if (vp-v_type == VBLK
+ vp == vp-v_specnode-sn_dev-sd_bdevvp
+ vp-v_specmountpoint == sc-sc_mount)
+break;
+ }
+ if (vp != NULL)
+ break;
+ }
+ if (vp == NULL) {
+ mutex_exit(device_lock);
return EINVAL;
}
-
+ mutex_enter(vp-v_interlock);
+ mutex_exit(device_lock);
+ error = vget(vp, 0);
+ if (error)
+ return error;
sc-sc_bdev = vp-v_rdev;
- /*
- * Get the block device size.
- */
-
error = getdisksize(vp, numsec, secsize);
vrele(vp);
if (error)
CVS commit: [netbsd-6] src/sys/kern
Module Name:src
Committed By: riz
Date: Mon Feb 11 20:42:32 UTC 2013
Modified Files:
src/sys/kern [netbsd-6]: subr_pserialize.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #811):
sys/kern/subr_pserialize.c: revision 1.7
- pserialize_switchpoint: check for passing twice, not more than needed.
- pserialize_perform: avoid a possible race with softint handler.
Reported by hannken@.
To generate a diff of this commit:
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/kern/subr_pserialize.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/subr_pserialize.c
diff -u src/sys/kern/subr_pserialize.c:1.5.2.1 src/sys/kern/subr_pserialize.c:1.5.2.2
--- src/sys/kern/subr_pserialize.c:1.5.2.1 Fri Feb 8 19:32:07 2013
+++ src/sys/kern/subr_pserialize.c Mon Feb 11 20:42:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pserialize.c,v 1.5.2.1 2013/02/08 19:32:07 riz Exp $ */
+/* $NetBSD: subr_pserialize.c,v 1.5.2.2 2013/02/11 20:42:32 riz Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_pserialize.c,v 1.5.2.1 2013/02/08 19:32:07 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_pserialize.c,v 1.5.2.2 2013/02/11 20:42:32 riz Exp $);
#include sys/param.h
@@ -48,13 +48,13 @@ __KERNEL_RCSID(0, $NetBSD: subr_pserial
#include sys/kmem.h
#include sys/mutex.h
#include sys/pserialize.h
+#include sys/proc.h
#include sys/queue.h
#include sys/xcall.h
struct pserialize {
TAILQ_ENTRY(pserialize) psz_chain;
lwp_t * psz_owner;
- kcondvar_t psz_notifier;
kcpuset_t * psz_target;
kcpuset_t * psz_pass;
};
@@ -102,7 +102,6 @@ pserialize_create(void)
pserialize_t psz;
psz = kmem_zalloc(sizeof(struct pserialize), KM_SLEEP);
- cv_init(psz-psz_notifier, psrlz);
kcpuset_create(psz-psz_target, true);
kcpuset_create(psz-psz_pass, true);
psz-psz_owner = NULL;
@@ -121,7 +120,6 @@ pserialize_destroy(pserialize_t psz)
KASSERT(psz-psz_owner == NULL);
- cv_destroy(psz-psz_notifier);
kcpuset_destroy(psz-psz_target);
kcpuset_destroy(psz-psz_pass);
kmem_free(psz, sizeof(struct pserialize));
@@ -163,27 +161,21 @@ pserialize_perform(pserialize_t psz)
mutex_spin_enter(psz_lock);
TAILQ_INSERT_TAIL(psz_queue0, psz, psz_chain);
psz_work_todo++;
- mutex_spin_exit(psz_lock);
- /*
- * Force some context switch activity on every CPU, as the system
- * may not be busy. Note: should pass the point twice.
- */
- xc = xc_broadcast(XC_HIGHPRI, (xcfunc_t)nullop, NULL, NULL);
- xc_wait(xc);
+ do {
+ mutex_spin_exit(psz_lock);
- /* No need to xc_wait() as we implement our own condvar. */
- xc_broadcast(XC_HIGHPRI, (xcfunc_t)nullop, NULL, NULL);
+ /*
+ * Force some context switch activity on every CPU, as
+ * the system may not be busy. Pause to not flood.
+ */
+ xc = xc_broadcast(XC_HIGHPRI, (xcfunc_t)nullop, NULL, NULL);
+ xc_wait(xc);
+ kpause(psrlz, false, 1, NULL);
+
+ mutex_spin_enter(psz_lock);
+ } while (!kcpuset_iszero(psz-psz_target));
- /*
- * Wait for all CPUs to cycle through mi_switch() twice.
- * The last one through will remove our update from the
- * queue and awaken us.
- */
- mutex_spin_enter(psz_lock);
- while (!kcpuset_iszero(psz-psz_target)) {
- cv_wait(psz-psz_notifier, psz_lock);
- }
psz_ev_excl.ev_count++;
mutex_spin_exit(psz_lock);
@@ -236,8 +228,8 @@ pserialize_switchpoint(void)
*/
for (psz = TAILQ_FIRST(psz_queue1); psz != NULL; psz = next) {
next = TAILQ_NEXT(psz, psz_chain);
+ kcpuset_set(psz-psz_pass, cid);
if (!kcpuset_match(psz-psz_pass, psz-psz_target)) {
- kcpuset_set(psz-psz_pass, cid);
continue;
}
kcpuset_zero(psz-psz_pass);
@@ -250,8 +242,8 @@ pserialize_switchpoint(void)
*/
for (psz = TAILQ_FIRST(psz_queue0); psz != NULL; psz = next) {
next = TAILQ_NEXT(psz, psz_chain);
+ kcpuset_set(psz-psz_pass, cid);
if (!kcpuset_match(psz-psz_pass, psz-psz_target)) {
- kcpuset_set(psz-psz_pass, cid);
continue;
}
kcpuset_zero(psz-psz_pass);
@@ -265,7 +257,6 @@ pserialize_switchpoint(void)
while ((psz = TAILQ_FIRST(psz_queue2)) != NULL) {
TAILQ_REMOVE(psz_queue2, psz, psz_chain);
kcpuset_zero(psz-psz_target);
- cv_signal(psz-psz_notifier);
psz_work_todo--;
}
mutex_spin_exit(psz_lock);
CVS commit: [netbsd-6-0] src/sys/kern
Module Name:src
Committed By: riz
Date: Mon Feb 11 20:42:51 UTC 2013
Modified Files:
src/sys/kern [netbsd-6-0]: subr_pserialize.c
Log Message:
Pull up following revision(s) (requested by rmind in ticket #811):
sys/kern/subr_pserialize.c: revision 1.7
- pserialize_switchpoint: check for passing twice, not more than needed.
- pserialize_perform: avoid a possible race with softint handler.
Reported by hannken@.
To generate a diff of this commit:
cvs rdiff -u -r1.5.8.1 -r1.5.8.2 src/sys/kern/subr_pserialize.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/subr_pserialize.c
diff -u src/sys/kern/subr_pserialize.c:1.5.8.1 src/sys/kern/subr_pserialize.c:1.5.8.2
--- src/sys/kern/subr_pserialize.c:1.5.8.1 Fri Feb 8 19:31:19 2013
+++ src/sys/kern/subr_pserialize.c Mon Feb 11 20:42:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pserialize.c,v 1.5.8.1 2013/02/08 19:31:19 riz Exp $ */
+/* $NetBSD: subr_pserialize.c,v 1.5.8.2 2013/02/11 20:42:50 riz Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_pserialize.c,v 1.5.8.1 2013/02/08 19:31:19 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_pserialize.c,v 1.5.8.2 2013/02/11 20:42:50 riz Exp $);
#include sys/param.h
@@ -48,13 +48,13 @@ __KERNEL_RCSID(0, $NetBSD: subr_pserial
#include sys/kmem.h
#include sys/mutex.h
#include sys/pserialize.h
+#include sys/proc.h
#include sys/queue.h
#include sys/xcall.h
struct pserialize {
TAILQ_ENTRY(pserialize) psz_chain;
lwp_t * psz_owner;
- kcondvar_t psz_notifier;
kcpuset_t * psz_target;
kcpuset_t * psz_pass;
};
@@ -102,7 +102,6 @@ pserialize_create(void)
pserialize_t psz;
psz = kmem_zalloc(sizeof(struct pserialize), KM_SLEEP);
- cv_init(psz-psz_notifier, psrlz);
kcpuset_create(psz-psz_target, true);
kcpuset_create(psz-psz_pass, true);
psz-psz_owner = NULL;
@@ -121,7 +120,6 @@ pserialize_destroy(pserialize_t psz)
KASSERT(psz-psz_owner == NULL);
- cv_destroy(psz-psz_notifier);
kcpuset_destroy(psz-psz_target);
kcpuset_destroy(psz-psz_pass);
kmem_free(psz, sizeof(struct pserialize));
@@ -163,27 +161,21 @@ pserialize_perform(pserialize_t psz)
mutex_spin_enter(psz_lock);
TAILQ_INSERT_TAIL(psz_queue0, psz, psz_chain);
psz_work_todo++;
- mutex_spin_exit(psz_lock);
- /*
- * Force some context switch activity on every CPU, as the system
- * may not be busy. Note: should pass the point twice.
- */
- xc = xc_broadcast(XC_HIGHPRI, (xcfunc_t)nullop, NULL, NULL);
- xc_wait(xc);
+ do {
+ mutex_spin_exit(psz_lock);
- /* No need to xc_wait() as we implement our own condvar. */
- xc_broadcast(XC_HIGHPRI, (xcfunc_t)nullop, NULL, NULL);
+ /*
+ * Force some context switch activity on every CPU, as
+ * the system may not be busy. Pause to not flood.
+ */
+ xc = xc_broadcast(XC_HIGHPRI, (xcfunc_t)nullop, NULL, NULL);
+ xc_wait(xc);
+ kpause(psrlz, false, 1, NULL);
+
+ mutex_spin_enter(psz_lock);
+ } while (!kcpuset_iszero(psz-psz_target));
- /*
- * Wait for all CPUs to cycle through mi_switch() twice.
- * The last one through will remove our update from the
- * queue and awaken us.
- */
- mutex_spin_enter(psz_lock);
- while (!kcpuset_iszero(psz-psz_target)) {
- cv_wait(psz-psz_notifier, psz_lock);
- }
psz_ev_excl.ev_count++;
mutex_spin_exit(psz_lock);
@@ -236,8 +228,8 @@ pserialize_switchpoint(void)
*/
for (psz = TAILQ_FIRST(psz_queue1); psz != NULL; psz = next) {
next = TAILQ_NEXT(psz, psz_chain);
+ kcpuset_set(psz-psz_pass, cid);
if (!kcpuset_match(psz-psz_pass, psz-psz_target)) {
- kcpuset_set(psz-psz_pass, cid);
continue;
}
kcpuset_zero(psz-psz_pass);
@@ -250,8 +242,8 @@ pserialize_switchpoint(void)
*/
for (psz = TAILQ_FIRST(psz_queue0); psz != NULL; psz = next) {
next = TAILQ_NEXT(psz, psz_chain);
+ kcpuset_set(psz-psz_pass, cid);
if (!kcpuset_match(psz-psz_pass, psz-psz_target)) {
- kcpuset_set(psz-psz_pass, cid);
continue;
}
kcpuset_zero(psz-psz_pass);
@@ -265,7 +257,6 @@ pserialize_switchpoint(void)
while ((psz = TAILQ_FIRST(psz_queue2)) != NULL) {
TAILQ_REMOVE(psz_queue2, psz, psz_chain);
kcpuset_zero(psz-psz_target);
- cv_signal(psz-psz_notifier);
psz_work_todo--;
}
mutex_spin_exit(psz_lock);
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Mon Feb 11 20:43:01 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.2 Log Message: Ticket 811. To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-6.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.2 diff -u src/doc/CHANGES-6.0.2:1.1.2.18 src/doc/CHANGES-6.0.2:1.1.2.19 --- src/doc/CHANGES-6.0.2:1.1.2.18 Mon Feb 11 20:39:18 2013 +++ src/doc/CHANGES-6.0.2 Mon Feb 11 20:43:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.2,v 1.1.2.18 2013/02/11 20:39:18 riz Exp $ +# $NetBSD: CHANGES-6.0.2,v 1.1.2.19 2013/02/11 20:43:01 riz Exp $ A complete list of changes from the NetBSD 6.0.1 release to the NetBSD 6.0.2 release: @@ -118,3 +118,8 @@ sys/dev/fss.c 1.85 Fix panic in fss(4). PR#47020. [hannken, ticket #810] +sys/kern/subr_pserialize.c 1.7 + + Avoid possible race with softint handler. + [rmind, ticket #811] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Feb 11 20:44:40 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Tickets 810, 811. To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-6.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.89 src/doc/CHANGES-6.1:1.1.2.90 --- src/doc/CHANGES-6.1:1.1.2.89 Mon Feb 11 04:22:15 2013 +++ src/doc/CHANGES-6.1 Mon Feb 11 20:44:39 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.89 2013/02/11 04:22:15 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.90 2013/02/11 20:44:39 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8247,3 +8247,13 @@ sys/dev/spi/spi.c1.7 Stop condvar/mutex leaks. [skrll, ticket #809] +sys/dev/fss.c 1.85 + + Fix panic in fss(4). PR#47020. + [hannken, ticket #810] + +sys/kern/subr_pserialize.c 1.7 + + Avoid possible race with softint handler. + [rmind, ticket #811] +
CVS commit: [netbsd-6] src/external/mit/xorg/server/drivers/xf86-video-radeon
Module Name:src Committed By: riz Date: Mon Feb 11 21:04:46 UTC 2013 Modified Files: src/external/mit/xorg/server/drivers/xf86-video-radeon [netbsd-6]: Makefile Log Message: Pull up following revision(s) (requested by veego in ticket #812): external/mit/xorg/server/drivers/xf86-video-radeon/Makefile patch xsrc/external/mit/xf86-video-ati/dist/ChangeLog patch xsrc/external/mit/xf86-video-ati/dist/INSTALL patch xsrc/external/mit/xf86-video-ati/dist/Makefile.in patch xsrc/external/mit/xf86-video-ati/dist/aclocal.m4patch xsrc/external/mit/xf86-video-ati/dist/config.h.in patch xsrc/external/mit/xf86-video-ati/dist/configure patch xsrc/external/mit/xf86-video-ati/dist/configure.ac patch xsrc/external/mit/xf86-video-ati/dist/ltmain.sh patch xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in patch xsrc/external/mit/xf86-video-ati/dist/man/radeon.manpatch xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am patch xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in patch xsrc/external/mit/xf86-video-ati/dist/src/ati.c patch xsrc/external/mit/xf86-video-ati/dist/src/ati.h patch xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h patch xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h patch xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c patch xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c patch xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg.h patch xsrc/external/mit/xf86-video-ati/dist/src/cayman_shader.c patch xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h patch xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c patch xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_accel.c patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg.h patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_shader.cpatch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_textured_videofuncs.c patch xsrc/external/mit/xf86-video-ati/dist/src/generic_bus.h patch xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c patch xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.cpatch xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.hpatch xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c patch xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h patch xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.cpatch xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.cpatch xsrc/external/mit/xf86-video-ati/dist/src/radeon_accelfuncs.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_bios.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.cpatch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c patch xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.cpatch
CVS commit: [netbsd-6] xsrc/external/mit/xf86-video-ati
Module Name:xsrc Committed By: riz Date: Mon Feb 11 21:05:25 UTC 2013 Modified Files: xsrc/external/mit/xf86-video-ati/dist [netbsd-6]: ChangeLog INSTALL Makefile.in aclocal.m4 config.h.in configure configure.ac ltmain.sh xsrc/external/mit/xf86-video-ati/dist/man [netbsd-6]: Makefile.in radeon.man xsrc/external/mit/xf86-video-ati/dist/src [netbsd-6]: Makefile.am Makefile.in ati.c ati.h ati_pciids_gen.h atipciids.h atombios_crtc.c atombios_output.c cayman_reg.h cayman_shader.c drmmode_display.c drmmode_display.h evergreen_accel.c evergreen_exa.c evergreen_reg.h evergreen_shader.c evergreen_state.h evergreen_textured_videofuncs.c generic_bus.h legacy_crtc.c r600_exa.c r600_reg.h r600_shader.c r600_state.h r600_textured_videofuncs.c r6xx_accel.c radeon.h radeon_accel.c radeon_accelfuncs.c radeon_atombios.c radeon_atombios.h radeon_bios.c radeon_chipinfo_gen.h radeon_chipset_gen.h radeon_commonfuncs.c radeon_crtc.c radeon_cursor.c radeon_dri.c radeon_dri2.c radeon_driver.c radeon_drm.h radeon_exa.c radeon_exa_funcs.c radeon_exa_render.c radeon_exa_shared.c radeon_exa_shared.h radeon_kms.c radeon_legacy_memory.c radeon_modes.c radeon_output.c radeon_pci_chipset_gen.h radeon_pci_device_match_gen.h radeon_probe.c radeon_probe.h radeon_textured_video.c radeon_textured_videofuncs.c radeon_video.c radeon_video.h radeon_vip.c theatre.c theatre200.c theatre_detect.c xsrc/external/mit/xf86-video-ati/dist/src/pcidb [netbsd-6]: ati_pciids.csv xsrc/external/mit/xf86-video-ati/include [netbsd-6]: config.h Added Files: xsrc/external/mit/xf86-video-ati/dist/src [netbsd-6]: compat-api.h radeon_xvmc.c Log Message: Pull up following revision(s) (requested by veego in ticket #812): external/mit/xorg/server/drivers/xf86-video-radeon/Makefile patch xsrc/external/mit/xf86-video-ati/dist/ChangeLog patch xsrc/external/mit/xf86-video-ati/dist/INSTALL patch xsrc/external/mit/xf86-video-ati/dist/Makefile.in patch xsrc/external/mit/xf86-video-ati/dist/aclocal.m4patch xsrc/external/mit/xf86-video-ati/dist/config.h.in patch xsrc/external/mit/xf86-video-ati/dist/configure patch xsrc/external/mit/xf86-video-ati/dist/configure.ac patch xsrc/external/mit/xf86-video-ati/dist/ltmain.sh patch xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in patch xsrc/external/mit/xf86-video-ati/dist/man/radeon.manpatch xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am patch xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in patch xsrc/external/mit/xf86-video-ati/dist/src/ati.c patch xsrc/external/mit/xf86-video-ati/dist/src/ati.h patch xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h patch xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h patch xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c patch xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c patch xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg.h patch xsrc/external/mit/xf86-video-ati/dist/src/cayman_shader.c patch xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h patch xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c patch xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_accel.c patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg.h patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_shader.cpatch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h patch xsrc/external/mit/xf86-video-ati/dist/src/evergreen_textured_videofuncs.c patch xsrc/external/mit/xf86-video-ati/dist/src/generic_bus.h patch xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c patch xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.cpatch xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.hpatch xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c patch xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h patch xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.cpatch xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c patch
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Feb 11 21:07:54 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: Ticket 812. To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-6.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.90 src/doc/CHANGES-6.1:1.1.2.91 --- src/doc/CHANGES-6.1:1.1.2.90 Mon Feb 11 20:44:39 2013 +++ src/doc/CHANGES-6.1 Mon Feb 11 21:07:54 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.90 2013/02/11 20:44:39 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.91 2013/02/11 21:07:54 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8257,3 +8257,84 @@ sys/kern/subr_pserialize.c 1.7 Avoid possible race with softint handler. [rmind, ticket #811] +external/mit/xorg/server/drivers/xf86-video-radeon/Makefile patch +xsrc/external/mit/xf86-video-ati/dist/ChangeLogpatch +xsrc/external/mit/xf86-video-ati/dist/INSTALLpatch +xsrc/external/mit/xf86-video-ati/dist/Makefile.in patch +xsrc/external/mit/xf86-video-ati/dist/aclocal.m4 patch +xsrc/external/mit/xf86-video-ati/dist/config.h.in patch +xsrc/external/mit/xf86-video-ati/dist/configurepatch +xsrc/external/mit/xf86-video-ati/dist/configure.ac patch +xsrc/external/mit/xf86-video-ati/dist/ltmain.shpatch +xsrc/external/mit/xf86-video-ati/dist/man/Makefile.in patch +xsrc/external/mit/xf86-video-ati/dist/man/radeon.man patch +xsrc/external/mit/xf86-video-ati/dist/src/Makefile.am patch +xsrc/external/mit/xf86-video-ati/dist/src/Makefile.in patch +xsrc/external/mit/xf86-video-ati/dist/src/ati.cpatch +xsrc/external/mit/xf86-video-ati/dist/src/ati.hpatch +xsrc/external/mit/xf86-video-ati/dist/src/ati_pciids_gen.h patch +xsrc/external/mit/xf86-video-ati/dist/src/atipciids.h patch +xsrc/external/mit/xf86-video-ati/dist/src/atombios_crtc.c patch +xsrc/external/mit/xf86-video-ati/dist/src/atombios_output.c patch +xsrc/external/mit/xf86-video-ati/dist/src/cayman_reg.h patch +xsrc/external/mit/xf86-video-ati/dist/src/cayman_shader.c patch +xsrc/external/mit/xf86-video-ati/dist/src/compat-api.h patch +xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.c patch +xsrc/external/mit/xf86-video-ati/dist/src/drmmode_display.h patch +xsrc/external/mit/xf86-video-ati/dist/src/evergreen_accel.c patch +xsrc/external/mit/xf86-video-ati/dist/src/evergreen_exa.c patch +xsrc/external/mit/xf86-video-ati/dist/src/evergreen_reg.h patch +xsrc/external/mit/xf86-video-ati/dist/src/evergreen_shader.c patch +xsrc/external/mit/xf86-video-ati/dist/src/evergreen_state.h patch +xsrc/external/mit/xf86-video-ati/dist/src/evergreen_textured_videofuncs.c patch +xsrc/external/mit/xf86-video-ati/dist/src/generic_bus.h patch +xsrc/external/mit/xf86-video-ati/dist/src/legacy_crtc.c patch +xsrc/external/mit/xf86-video-ati/dist/src/r600_exa.c patch +xsrc/external/mit/xf86-video-ati/dist/src/r600_reg.h patch +xsrc/external/mit/xf86-video-ati/dist/src/r600_shader.c patch +xsrc/external/mit/xf86-video-ati/dist/src/r600_state.h patch +xsrc/external/mit/xf86-video-ati/dist/src/r600_textured_videofuncs.c patch +xsrc/external/mit/xf86-video-ati/dist/src/r6xx_accel.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon.h patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_accel.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_accelfuncs.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_atombios.h patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_bios.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipinfo_gen.h patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_chipset_gen.h patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_commonfuncs.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_crtc.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_cursor.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_dri2.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_driver.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_drm.h patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_funcs.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_render.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_exa_shared.h patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_kms.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_legacy_memory.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c patch +xsrc/external/mit/xf86-video-ati/dist/src/radeon_output.c patch
CVS commit: [netbsd-6] src/sbin/wsconsctl
Module Name:src
Committed By: riz
Date: Mon Feb 11 21:36:30 UTC 2013
Modified Files:
src/sbin/wsconsctl [netbsd-6]: mouse.c util.c wsconsctl.h
Log Message:
Pull up following revision(s) (requested by khorben in ticket #814):
sbin/wsconsctl/wsconsctl.h: revision 1.12
sbin/wsconsctl/mouse.c: revision 1.9
sbin/wsconsctl/mouse.c: revision 1.10
sbin/wsconsctl/util.c: revision 1.31
Added a field type for signed integers. This is required when handling
touchscreen calibration values, which is about to be implemented in
wsconsctl (see PR kern/45872).
Reviewed by uwe@ (thank you!)
Added a field type for signed integers. This is required when handling
touchscreen calibration values, which is about to be implemented in
wsconsctl (see PR kern/45872).
Reviewed by uwe@ (thank you!)
Added read-only support for touchscreen calibration (see PR kern/45872).
Tested with the uts(4) driver, as well as with mice without calibration
support.
Reviewed by uwe@ (thank you!)
Added complete support for touchscreen calibration (see PR kern/45872).
Tested with the uts(4) driver, as well as with mice without calibration
support.
Reviewed by uwe@ (thank you!)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.22.1 src/sbin/wsconsctl/mouse.c
cvs rdiff -u -r1.30 -r1.30.2.1 src/sbin/wsconsctl/util.c
cvs rdiff -u -r1.11 -r1.11.4.1 src/sbin/wsconsctl/wsconsctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/wsconsctl/mouse.c
diff -u src/sbin/wsconsctl/mouse.c:1.8 src/sbin/wsconsctl/mouse.c:1.8.22.1
--- src/sbin/wsconsctl/mouse.c:1.8 Mon Apr 28 20:23:09 2008
+++ src/sbin/wsconsctl/mouse.c Mon Feb 11 21:36:30 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: mouse.c,v 1.8 2008/04/28 20:23:09 martin Exp $ */
+/* $NetBSD: mouse.c,v 1.8.22.1 2013/02/11 21:36:30 riz Exp $ */
/*-
- * Copyright (c) 1998, 2006 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2006, 2012 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -45,8 +45,13 @@
static int mstype;
static int resolution;
static int samplerate;
+static struct wsmouse_calibcoords calibration;
+static char *calibration_samples;
static struct wsmouse_repeat repeat;
+static void mouse_get_calibration(int);
+static void mouse_put_calibration(int);
+
static void mouse_get_repeat(int);
static void mouse_put_repeat(int);
@@ -54,6 +59,16 @@ struct field mouse_field_tab[] = {
{ resolution, resolution, FMT_UINT, FLG_WRONLY },
{ samplerate, samplerate, FMT_UINT, FLG_WRONLY },
{ type, mstype, FMT_MSTYPE, FLG_RDONLY },
+{ calibration.minx, calibration.minx,
+ FMT_INT, FLG_MODIFY },
+{ calibration.miny, calibration.miny,
+ FMT_INT, FLG_MODIFY },
+{ calibration.maxx, calibration.maxx,
+ FMT_INT, FLG_MODIFY },
+{ calibration.maxy, calibration.maxy,
+ FMT_INT, FLG_MODIFY },
+{ calibration.samples, calibration_samples,
+ FMT_STRING, FLG_MODIFY },
{ repeat.buttons, repeat.wr_buttons,
FMT_BITFIELD, FLG_MODIFY },
{ repeat.delay.first, repeat.wr_delay_first,
@@ -75,6 +90,13 @@ mouse_get_values(int fd)
if (ioctl(fd, WSMOUSEIO_GTYPE, mstype) 0)
err(EXIT_FAILURE, WSMOUSEIO_GTYPE);
+ if (field_by_value(calibration.minx)-flags FLG_GET ||
+ field_by_value(calibration.miny)-flags FLG_GET ||
+ field_by_value(calibration.maxx)-flags FLG_GET ||
+ field_by_value(calibration.maxy)-flags FLG_GET ||
+ field_by_value(calibration_samples)-flags FLG_GET)
+ mouse_get_calibration(fd);
+
if (field_by_value(repeat.wr_buttons)-flags FLG_GET ||
field_by_value(repeat.wr_delay_first)-flags FLG_GET ||
field_by_value(repeat.wr_delay_decrement)-flags FLG_GET ||
@@ -83,11 +105,63 @@ mouse_get_values(int fd)
}
static void
+mouse_get_calibration(int fd)
+{
+ struct wsmouse_calibcoords tmp;
+ char *samples;
+ char buf[48];
+ int i;
+
+ if (ioctl(fd, WSMOUSEIO_GCALIBCOORDS, tmp) 0) {
+ field_disable_by_value(calibration.minx);
+ field_disable_by_value(calibration.miny);
+ field_disable_by_value(calibration.maxx);
+ field_disable_by_value(calibration.maxy);
+ field_disable_by_value(calibration_samples);
+ return;
+ }
+
+ if (field_by_value(calibration.minx)-flags FLG_GET)
+ calibration.minx = tmp.minx;
+ if (field_by_value(calibration.miny)-flags FLG_GET)
+ calibration.miny = tmp.miny;
+ if (field_by_value(calibration.maxx)-flags FLG_GET)
+ calibration.maxx = tmp.maxx;
+ if (field_by_value(calibration.maxy)-flags FLG_GET)
+ calibration.maxy = tmp.maxy;
+ if (field_by_value(calibration_samples)-flags FLG_GET) {
+ free(calibration_samples);
+ if (tmp.samplelen = 0) {
+ calibration_samples = strdup();
+ if (calibration_samples == NULL)
+err(EXIT_FAILURE, could not list calibration
+ samples);
+ } else {
+ samples =
CVS commit: [netbsd-6] src/sys/arch
Module Name:src Committed By: riz Date: Mon Feb 11 21:39:39 UTC 2013 Modified Files: src/sys/arch/amd64/conf [netbsd-6]: XEN3_DOM0 src/sys/arch/i386/conf [netbsd-6]: XEN3_DOM0 Log Message: Pull up following revision(s) (requested by khorben in ticket #815): sys/arch/amd64/conf/XEN3_DOM0: revision 1.92 sys/arch/i386/conf/XEN3_DOM0: revision 1.72 Added wpi(4) to the XEN3_DOM0 kernel for both amd64 and i386 Tested on a Lenovo ThinkPad T60 2007 (amd64) To generate a diff of this commit: cvs rdiff -u -r1.77.2.8 -r1.77.2.9 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.60.2.6 -r1.60.2.7 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.8 src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.9 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.8 Sat Dec 1 09:56:11 2012 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Mon Feb 11 21:39:39 2013 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.77.2.8 2012/12/01 09:56:11 msaitoh Exp $ +# $NetBSD: XEN3_DOM0,v 1.77.2.9 2013/02/11 21:39:39 riz Exp $ include arch/amd64/conf/std.xen @@ -373,6 +373,7 @@ vge* at pci? dev ? function ? # VIATech vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b) wm* at pci? dev ? function ? # Intel 8254x gigabit +wpi* at pci? dev ? function ? # Intel PRO/Wireless 3945ABG xge* at pci? dev ? function ? # Neterion (S2io) Xframe-I 10GbE # MII/PHY support Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.6 src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.7 --- src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.6 Wed Oct 17 21:33:16 2012 +++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Feb 11 21:39:39 2013 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.60.2.6 2012/10/17 21:33:16 riz Exp $ +# $NetBSD: XEN3_DOM0,v 1.60.2.7 2013/02/11 21:39:39 riz Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -350,6 +350,7 @@ vge* at pci? dev ? function ? # VIATech vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b) wm* at pci? dev ? function ? # Intel 8254x gigabit +wpi* at pci? dev ? function ? # Intel PRO/Wireless 3945ABG xge* at pci? dev ? function ? # Neterion (S2io) Xframe-I 10GbE # MII/PHY support
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: riz
Date: Mon Feb 11 21:44:22 UTC 2013
Modified Files:
src/sys/dev/usb [netbsd-6]: u3g.c
Log Message:
Pull up following revision(s) (requested by khorben in ticket #816):
sys/dev/usb/u3g.c: revision 1.26
Added the device id for the Huawei EM770W 3G modem to u3g(4)
Confirmed to work on a WeTab
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.2.1 src/sys/dev/usb/u3g.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/usb/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.24 src/sys/dev/usb/u3g.c:1.24.2.1
--- src/sys/dev/usb/u3g.c:1.24 Fri Dec 23 00:51:44 2011
+++ src/sys/dev/usb/u3g.c Mon Feb 11 21:44:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.24 2011/12/23 00:51:44 jakllsch Exp $ */
+/* $NetBSD: u3g.c,v 1.24.2.1 2013/02/11 21:44:22 riz Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: u3g.c,v 1.24 2011/12/23 00:51:44 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: u3g.c,v 1.24.2.1 2013/02/11 21:44:22 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -185,6 +185,7 @@ static const struct usb_devno u3g_devs[]
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E1750 },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E1820 },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_E220 },
+ { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_EM770W },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_K3765 },
{ USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE },
/* OEM: Merlin */
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Mon Feb 11 21:50:31 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.1 Log Message: tickets 814-817. To generate a diff of this commit: cvs rdiff -u -r1.1.2.91 -r1.1.2.92 src/doc/CHANGES-6.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1 diff -u src/doc/CHANGES-6.1:1.1.2.91 src/doc/CHANGES-6.1:1.1.2.92 --- src/doc/CHANGES-6.1:1.1.2.91 Mon Feb 11 21:07:54 2013 +++ src/doc/CHANGES-6.1 Mon Feb 11 21:50:30 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1,v 1.1.2.91 2013/02/11 21:07:54 riz Exp $ +# $NetBSD: CHANGES-6.1,v 1.1.2.92 2013/02/11 21:50:30 riz Exp $ A complete list of changes from the 6.0 release until the 6.1 release: @@ -8338,3 +8338,65 @@ xsrc/external/mit/xf86-video-ati/include Update Xorg ATI driver to version 6.14.6. [veego, ticket #812] +sbin/wsconsctl/mouse.c1.9-1.10 +sbin/wsconsctl/util.c1.31 +sbin/wsconsctl/wsconsctl.h 1.12 + + Add support for touchscreen calibration to wsconsctl(8). PR#45872. + [khorben, ticket #814] + +sys/arch/amd64/conf/XEN3_DOM0 1.92 +sys/arch/i386/conf/XEN3_DOM0 1.72 + + Add wpi(4) to XEN3_DOM0 kernel (i386 and amd64). + [khorben, ticket #815] + +sys/dev/usb/u3g.c1.26 + + Add support for Huawei EM770W to u3g(4). + [khorben, ticket #816] + +lib/libnpf/npf.31.8 +lib/libnpf/npf.c1.16-1.17 +lib/libnpf/npf.h1.13-1.14 +sys/modules/npf/Makefile 1.12 +sys/net/npf/files.npf1.10 +sys/net/npf/npf.c1.15 +sys/net/npf/npf.h1.26-1.27 +sys/net/npf/npf_alg.c1.7 +sys/net/npf/npf_alg_icmp.c 1.15 +sys/net/npf/npf_conf.c1.1-1.2 +sys/net/npf/npf_ctl.c1.21-1.22 +sys/net/npf/npf_handler.c 1.26 +sys/net/npf/npf_impl.h1.26-1.27 +sys/net/npf/npf_inet.c1.21 +sys/net/npf/npf_instr.c1.16 +sys/net/npf/npf_nat.c1.19 +sys/net/npf/npf_ncode.h1.11 +sys/net/npf/npf_processor.c 1.15 +sys/net/npf/npf_rproc.c1.6 +sys/net/npf/npf_ruleset.c 1.17-1.18 +sys/net/npf/npf_sendpkt.c 1.14 +sys/net/npf/npf_session.c 1.21 +sys/net/npf/npf_state.c1.14 +sys/net/npf/npf_tableset.c 1.17 +sys/rump/net/lib/libnpf/Makefile 1.4 +usr.sbin/npf/npfctl/Makefile 1.10 +usr.sbin/npf/npfctl/npf.conf.5 1.27 +usr.sbin/npf/npfctl/npf_build.c 1.18-1.20 +usr.sbin/npf/npfctl/npf_disassemble.c 1.14-1.16 +usr.sbin/npf/npfctl/npf_parse.y 1.18 +usr.sbin/npf/npfctl/npf_scan.l 1.10 +usr.sbin/npf/npfctl/npfctl.8 1.12 +usr.sbin/npf/npfctl/npfctl.c 1.28-1.30 +usr.sbin/npf/npfctl/npfctl.h 1.25-1.26 +usr.sbin/npf/npftest/Makefile 1.4 +usr.sbin/npf/npftest/README 1.4 +usr.sbin/npf/npftest/libnpftest/npf_rule_test.c 1.4-1.5 +usr.sbin/npf/npftest/npftest.conf 1.2 +usr.sbin/pf/ftp-proxy/Makefile 1.8 + + NPF: implement dynamic NPF ruless, add initial BPF support as + an alternative to n-code, and minor fixes. + [rmind, ticket #817] +
CVS commit: src/usr.bin/passwd
Module Name:src
Committed By: christos
Date: Mon Feb 11 23:11:49 UTC 2013
Modified Files:
src/usr.bin/passwd: Makefile
Log Message:
don't build kpasswd; heimdal does it for us.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/passwd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/passwd/Makefile
diff -u src/usr.bin/passwd/Makefile:1.42 src/usr.bin/passwd/Makefile:1.43
--- src/usr.bin/passwd/Makefile:1.42 Sun Apr 24 17:42:06 2011
+++ src/usr.bin/passwd/Makefile Mon Feb 11 18:11:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2011/04/24 21:42:06 elric Exp $
+# $NetBSD: Makefile,v 1.43 2013/02/11 23:11:48 christos Exp $
# from: @(#)Makefile8.3 (Berkeley) 4/2/94
.include bsd.own.mk
@@ -25,6 +25,7 @@ LDADD+= -lcrypt -lutil
BINOWN= root
BINMODE=4555
+.ifdef OVERRIDE_HEIMDAL_KPASSWD
.if (${USE_KERBEROS} != no)
CPPFLAGS+= -DKERBEROS5
SRCS+= krb5_passwd.c
@@ -34,6 +35,7 @@ LDADD+= -lkrb5 -lcrypto -lasn1 -lcom_err
LINKS+= ${BINDIR}/passwd ${BINDIR}/kpasswd
MAN+= kpasswd.1
.endif
+.endif
.if (${USE_PAM} != no)
CPPFLAGS+=-DUSE_PAM
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Tue Feb 12 00:32:15 UTC 2013 Modified Files: src/sys/arch/arm/include: vfpreg.h Log Message: Fix some FPEXC bit definitions To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/include/vfpreg.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/include/vfpreg.h diff -u src/sys/arch/arm/include/vfpreg.h:1.6 src/sys/arch/arm/include/vfpreg.h:1.7 --- src/sys/arch/arm/include/vfpreg.h:1.6 Sat Sep 22 19:45:53 2012 +++ src/sys/arch/arm/include/vfpreg.h Tue Feb 12 00:32:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vfpreg.h,v 1.6 2012/09/22 19:45:53 matt Exp $ */ +/* $NetBSD: vfpreg.h,v 1.7 2013/02/12 00:32:15 matt Exp $ */ /* * Copyright (c) 2008 ARM Ltd @@ -69,9 +69,9 @@ #define VFP_FPEXC_FP2V 0x1000 /* FPINST2 instruction valid */ #define VFP_FPEXC_VECITR 0x0700 /* Vector iteration count */ #define VFP_FPEXC_INV 0x0080 /* Input exception flag */ -#define VFP_FPEXC_UFC 0x0080 /* Potential underflow flag */ -#define VFP_FPEXC_OFC 0x0080 /* Potential overflow flag */ -#define VFP_FPEXC_IOC 0x0080 /* Potential inv. op. flag */ +#define VFP_FPEXC_UFC 0x0008 /* Potential underflow flag */ +#define VFP_FPEXC_OFC 0x0004 /* Potential overflow flag */ +#define VFP_FPEXC_IOC 0x0001 /* Potential inv. op. flag */ #define VFP_FPSCR_N 0x8000 /* set if compare = result */ #define VFP_FPSCR_Z 0x4000 /* set if compare = result */
CVS commit: src/sys/sys
Module Name:src
Committed By: matt
Date: Tue Feb 12 02:24:42 UTC 2013
Modified Files:
src/sys/sys: siginfo.h
Log Message:
Add two more si_trap fields (si_trap[23]) so more information can be passed
on a fault.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/sys/siginfo.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/siginfo.h
diff -u src/sys/sys/siginfo.h:1.22 src/sys/sys/siginfo.h:1.23
--- src/sys/sys/siginfo.h:1.22 Sun Apr 10 14:37:20 2011
+++ src/sys/sys/siginfo.h Tue Feb 12 02:24:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: siginfo.h,v 1.22 2011/04/10 14:37:20 christos Exp $ */
+/* $NetBSD: siginfo.h,v 1.23 2013/02/12 02:24:42 matt Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -68,6 +68,8 @@ struct _ksiginfo {
struct {
void *_addr;
int _trap;
+ int _trap2;
+ int _trap3;
} _fault;
struct {
@@ -146,6 +148,8 @@ typedef union siginfo {
#define si_addr _info._reason._fault._addr
#define si_trap _info._reason._fault._trap
+#define si_trap2 _info._reason._fault._trap2
+#define si_trap3 _info._reason._fault._trap3
#define si_band _info._reason._poll._band
#define si_fd _info._reason._poll._fd
@@ -165,6 +169,8 @@ typedef union siginfo {
#define ksi_addr ksi_info._reason._fault._addr
#define ksi_trap ksi_info._reason._fault._trap
+#define ksi_trap2 ksi_info._reason._fault._trap2
+#define ksi_trap3 ksi_info._reason._fault._trap3
#define ksi_band ksi_info._reason._poll._band
#define ksi_fd ksi_info._reason._poll._fd
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: matt
Date: Tue Feb 12 02:38:53 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_board.c
Log Message:
fix inverted ifdefs
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/broadcom/bcm53xx_board.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/broadcom/bcm53xx_board.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_board.c:1.11 src/sys/arch/arm/broadcom/bcm53xx_board.c:1.12
--- src/sys/arch/arm/broadcom/bcm53xx_board.c:1.11 Fri Feb 8 23:24:02 2013
+++ src/sys/arch/arm/broadcom/bcm53xx_board.c Tue Feb 12 02:38:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_board.c,v 1.11 2013/02/08 23:24:02 matt Exp $ */
+/* $NetBSD: bcm53xx_board.c,v 1.12 2013/02/12 02:38:53 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: bcm53xx_board.c,v 1.11 2013/02/08 23:24:02 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: bcm53xx_board.c,v 1.12 2013/02/12 02:38:53 matt Exp $);
#include sys/param.h
#include sys/bus.h
@@ -527,7 +527,7 @@ bcm53xx_dma_bootstrap(psize_t memsize)
bcm53xx_dma_ranges[0].dr_len = memsize;
bcm53xx_coherent_dma_ranges[0].dr_len = memsize;
bcm53xx_dma_tag._nranges = 1;
-#ifdef _ARM32_NEED_BUS_DMA_BOUNCE
+#ifndef _ARM32_NEED_BUS_DMA_BOUNCE
bcm53xx_coherent_dma_tag._nranges = 1;
#endif
} else {
@@ -537,7 +537,7 @@ bcm53xx_dma_bootstrap(psize_t memsize)
* below 256MB which for PCI and GMAC are coherent.
*/
bcm53xx_dma_ranges[1].dr_len = memsize - 0x1000;
-#ifdef _ARM32_NEED_BUS_DMA_BOUNCE
+#ifndef _ARM32_NEED_BUS_DMA_BOUNCE
bcm53xx_coherent_dma_ranges[1].dr_len = memsize - 0x1000;
#endif
}
CVS commit: src/lib/libm/arch/i387
Module Name:src Committed By: matt Date: Tue Feb 12 02:52:13 UTC 2013 Modified Files: src/lib/libm/arch/i387: s_scalbnf.S Log Message: Fix the strong alias correctly this time. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libm/arch/i387/s_scalbnf.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/arch/i387/s_scalbnf.S diff -u src/lib/libm/arch/i387/s_scalbnf.S:1.10 src/lib/libm/arch/i387/s_scalbnf.S:1.11 --- src/lib/libm/arch/i387/s_scalbnf.S:1.10 Mon Feb 11 04:57:22 2013 +++ src/lib/libm/arch/i387/s_scalbnf.S Tue Feb 12 02:52:13 2013 @@ -5,7 +5,7 @@ #include machine/asm.h -RCSID($NetBSD: s_scalbnf.S,v 1.10 2013/02/11 04:57:22 matt Exp $) +RCSID($NetBSD: s_scalbnf.S,v 1.11 2013/02/12 02:52:13 matt Exp $) #ifdef WEAK_ALIAS WEAK_ALIAS(scalbnf,_scalbnf) @@ -24,7 +24,7 @@ ENTRY(_scalbnf) fstp %st(0) ret #elif defined(STRONG_ALIAS) -STRONG_ALIAS(_scalbnf,_scalbnfl) +STRONG_ALIAS(_scalbnf,_scalblnf) #endif ENTRY(_scalblnf)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Tue Feb 12 03:11:43 UTC 2013
Modified Files:
src/sys/dev/pci: if_wm.c if_wmvar.h
Log Message:
Use 82580(and I350) specific PHY read/write functions.
Fixes PR#47542.
To generate a diff of this commit:
cvs rdiff -u -r1.242 -r1.243 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_wmvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.242 src/sys/dev/pci/if_wm.c:1.243
--- src/sys/dev/pci/if_wm.c:1.242 Thu Feb 7 15:38:42 2013
+++ src/sys/dev/pci/if_wm.c Tue Feb 12 03:11:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.242 2013/02/07 15:38:42 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.243 2013/02/12 03:11:43 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.242 2013/02/07 15:38:42 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.243 2013/02/12 03:11:43 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -543,6 +543,8 @@ static int wm_gmii_bm_readreg(device_t,
static void wm_gmii_bm_writereg(device_t, int, int, int);
static int wm_gmii_hv_readreg(device_t, int, int);
static void wm_gmii_hv_writereg(device_t, int, int, int);
+static int wm_gmii_82580_readreg(device_t, int, int);
+static void wm_gmii_82580_writereg(device_t, int, int, int);
static int wm_sgmii_readreg(device_t, int, int);
static void wm_sgmii_writereg(device_t, int, int, int);
@@ -6315,6 +6317,10 @@ wm_gmii_mediainit(struct wm_softc *sc, p
} else if (sc-sc_type = WM_T_80003) {
sc-sc_mii.mii_readreg = wm_gmii_i80003_readreg;
sc-sc_mii.mii_writereg = wm_gmii_i80003_writereg;
+ } else if (sc-sc_type = WM_T_82580) {
+ sc-sc_phytype = WMPHY_82580;
+ sc-sc_mii.mii_readreg = wm_gmii_82580_readreg;
+ sc-sc_mii.mii_writereg = wm_gmii_82580_writereg;
} else if (sc-sc_type = WM_T_82544) {
sc-sc_mii.mii_readreg = wm_gmii_i82544_readreg;
sc-sc_mii.mii_writereg = wm_gmii_i82544_writereg;
@@ -7018,6 +7024,58 @@ wm_sgmii_writereg(device_t self, int phy
}
/*
+ * wm_gmii_82580_readreg: [mii interface function]
+ *
+ * Read a PHY register on the 82580 and I350.
+ * This could be handled by the PHY layer if we didn't have to lock the
+ * ressource ...
+ */
+static int
+wm_gmii_82580_readreg(device_t self, int phy, int reg)
+{
+ struct wm_softc *sc = device_private(self);
+ int sem;
+ int rv;
+
+ sem = swfwphysem[sc-sc_funcid];
+ if (wm_get_swfw_semaphore(sc, sem)) {
+ aprint_error_dev(sc-sc_dev, %s: failed to get semaphore\n,
+ __func__);
+ return 0;
+ }
+
+ rv = wm_gmii_i82544_readreg(self, phy, reg);
+
+ wm_put_swfw_semaphore(sc, sem);
+ return rv;
+}
+
+/*
+ * wm_gmii_82580_writereg: [mii interface function]
+ *
+ * Write a PHY register on the 82580 and I350.
+ * This could be handled by the PHY layer if we didn't have to lock the
+ * ressource ...
+ */
+static void
+wm_gmii_82580_writereg(device_t self, int phy, int reg, int val)
+{
+ struct wm_softc *sc = device_private(self);
+ int sem;
+
+ sem = swfwphysem[sc-sc_funcid];
+ if (wm_get_swfw_semaphore(sc, sem)) {
+ aprint_error_dev(sc-sc_dev, %s: failed to get semaphore\n,
+ __func__);
+ return;
+ }
+
+ wm_gmii_i82544_writereg(self, phy, reg, val);
+
+ wm_put_swfw_semaphore(sc, sem);
+}
+
+/*
* wm_gmii_statchg: [mii interface function]
*
* Callback from MII layer when media changes.
Index: src/sys/dev/pci/if_wmvar.h
diff -u src/sys/dev/pci/if_wmvar.h:1.13 src/sys/dev/pci/if_wmvar.h:1.14
--- src/sys/dev/pci/if_wmvar.h:1.13 Fri May 25 23:37:38 2012
+++ src/sys/dev/pci/if_wmvar.h Tue Feb 12 03:11:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wmvar.h,v 1.13 2012/05/25 23:37:38 msaitoh Exp $ */
+/* $NetBSD: if_wmvar.h,v 1.14 2013/02/12 03:11:43 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -140,7 +140,8 @@ typedef enum {
WMPHY_BM,
WMPHY_82577,
WMPHY_82578,
- WMPHY_82579
+ WMPHY_82579,
+ WMPHY_82580
} wm_phy_type;
