CVS commit: src/share/man/man4
Module Name:src Committed By: wiz Date: Mon Apr 7 11:18:13 UTC 2014 Modified Files: src/share/man/man4: mcp23s17gpio.4 Log Message: Fix Dd. New sentence, new line. Sort SEE ALSO. Fix macro usage. More markup. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/mcp23s17gpio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/mcp23s17gpio.4 diff -u src/share/man/man4/mcp23s17gpio.4:1.1 src/share/man/man4/mcp23s17gpio.4:1.2 --- src/share/man/man4/mcp23s17gpio.4:1.1 Sun Apr 6 17:59:39 2014 +++ src/share/man/man4/mcp23s17gpio.4 Mon Apr 7 11:18:13 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: mcp23s17gpio.4,v 1.1 2014/04/06 17:59:39 kardel Exp $ +.\ $NetBSD: mcp23s17gpio.4,v 1.2 2014/04/07 11:18:13 wiz Exp $ .\ .\Copyright (c) 2014 Frank Kardel .\All rights reserved. @@ -24,7 +24,7 @@ .\ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 6th, 2014 +.Dd April 6, 2014 .Dt MCP23S17GPIO 4 .Os .Sh NAME @@ -39,15 +39,18 @@ .Sh DESCRIPTION The .Nm -driver supports up to 8 instances of the MCP23S17 16-bit GPIO chips. Access to -the pins is provided by the +driver supports up to 8 instances of the MCP23S17 16-bit GPIO chips. +Access to the pins is provided by the .Xr gpio 4 -interface. The -.Nm flags argument selects the hardware address of the chip instance. +interface. +The +.Nm +.Ar flags +argument selects the hardware address of the chip instance. .Sh SEE ALSO -.Xr spi 4 , +.Xr gpio 4 , .Xr intro 4 , -.Xr gpio 4 +.Xr spi 4 .Sh HISTORY The .Nm @@ -58,4 +61,4 @@ driver first appeared in The .Nm driver was written by -.An Frank Kardel Aq Mt kar...@netbsd.org . +.An Frank Kardel Aq Mt kar...@netbsd.org .
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Mon Apr 7 11:26:16 UTC 2014 Modified Files: src/doc: CHANGES Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.1911 -r1.1912 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1911 src/doc/CHANGES:1.1912 --- src/doc/CHANGES:1.1911 Sun Apr 6 17:59:39 2014 +++ src/doc/CHANGES Mon Apr 7 11:26:16 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1911 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1912 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -383,4 +383,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: in chroots (Ilya Zykov) [christos 20140404] i386: Switched to GCC 4.8. [christos 20140404] mcp23s17gpio: Add Microchip MCP23S17 16-bit GPIO chip driver. - e.g. Rasberry Pi interface boards [kardel 20140406] \ No newline at end of file + e.g. Raspberry Pi interface boards [kardel 20140406]
CVS commit: src/sys/external/bsd
Module Name:src Committed By: riastradh Date: Mon Apr 7 11:55:29 UTC 2014 Added Files: src/sys/external/bsd/common/include/linux: errno.h Removed Files: src/sys/external/bsd/drm2/include/linux: errno.h Log Message: Move linux/errno.h from drm2 to common. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/common/include/linux/errno.h cvs rdiff -u -r1.2 -r0 src/sys/external/bsd/drm2/include/linux/errno.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/external/bsd/common/include/linux/errno.h diff -u /dev/null src/sys/external/bsd/common/include/linux/errno.h:1.1 --- /dev/null Mon Apr 7 11:55:29 2014 +++ src/sys/external/bsd/common/include/linux/errno.h Mon Apr 7 11:55:29 2014 @@ -0,0 +1,39 @@ +/* $NetBSD: errno.h,v 1.1 2014/04/07 11:55:29 riastradh Exp $ */ + +/*- + * Copyright (c) 2013 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by Taylor R. Campbell. + * + * 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. + */ + +#ifndef _LINUX_ERRNO_H_ +#define _LINUX_ERRNO_H_ + +#include sys/errno.h + +#define ERESTARTSYS ERESTART + +#endif /* _LINUX_ERRNO_H_ */
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Mon Apr 7 14:40:18 UTC 2014 Modified Files: src/sys/arch/evbarm/rpi: rpi_start.S Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/rpi/rpi_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/rpi/rpi_start.S diff -u src/sys/arch/evbarm/rpi/rpi_start.S:1.9 src/sys/arch/evbarm/rpi/rpi_start.S:1.10 --- src/sys/arch/evbarm/rpi/rpi_start.S:1.9 Tue Apr 1 06:55:29 2014 +++ src/sys/arch/evbarm/rpi/rpi_start.S Mon Apr 7 14:40:17 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rpi_start.S,v 1.9 2014/04/01 06:55:29 skrll Exp $ */ +/* $NetBSD: rpi_start.S,v 1.10 2014/04/07 14:40:17 skrll Exp $ */ /* * Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved. @@ -87,7 +87,7 @@ #include arm/armreg.h #include assym.h -RCSID($NetBSD: rpi_start.S,v 1.9 2014/04/01 06:55:29 skrll Exp $) +RCSID($NetBSD: rpi_start.S,v 1.10 2014/04/07 14:40:17 skrll Exp $) /* * Workaround Erratum 411920 @@ -201,7 +201,7 @@ _C_LABEL(rpi_start): mcr p15, 0, r0, c7, c14, 0 /* Clean and Invalidate Entire Data Cache */ -ldr r2, Lctl_ID_dis /* Disable I+D caches */ + ldr r2, Lctl_ID_dis /* Disable I+D caches */ mrc p15, 0, r1, c1, c0, 0 /* */ and r1, r1, r2 /* */ mcr p15, 0, r1, c1, c0, 0 /* */
CVS commit: src/tests/lib/libc/ssp
Module Name:src
Committed By: christos
Date: Mon Apr 7 15:09:20 UTC 2014
Modified Files:
src/tests/lib/libc/ssp: h_stpncpy.c
Log Message:
fix lossage with gcc-4.5
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libc/ssp/h_stpncpy.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/ssp/h_stpncpy.c
diff -u src/tests/lib/libc/ssp/h_stpncpy.c:1.1 src/tests/lib/libc/ssp/h_stpncpy.c:1.2
--- src/tests/lib/libc/ssp/h_stpncpy.c:1.1 Sun Apr 6 15:28:59 2014
+++ src/tests/lib/libc/ssp/h_stpncpy.c Mon Apr 7 11:09:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: h_stpncpy.c,v 1.1 2014/04/06 19:28:59 christos Exp $ */
+/* $NetBSD: h_stpncpy.c,v 1.2 2014/04/07 15:09:20 christos Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2008\
The NetBSD Foundation, inc. All rights reserved.);
-__RCSID($NetBSD: h_stpncpy.c,v 1.1 2014/04/06 19:28:59 christos Exp $);
+__RCSID($NetBSD: h_stpncpy.c,v 1.2 2014/04/07 15:09:20 christos Exp $);
#include stdio.h
#include string.h
@@ -41,10 +41,15 @@ main(int argc, char *argv[])
{
char b[10];
int len = atoi(argv[1]);
+#if __GNUC_PREREQ__(4, 8)
char *q = stpncpy(b, 1020202020202, len);
if (q - b != len)
abort();
+#else
+ // gcc-4.5 lacks __builtin___stpncpy_chk, lose.
+ (void)strncpy(b, 1020202020202, len);
+#endif
(void)printf(%*.*s\n, len, len, b);
return 0;
CVS commit: src/sys/kern
Module Name:src
Committed By: seanb
Date: Mon Apr 7 15:35:23 UTC 2014
Modified Files:
src/sys/kern: uipc_syscalls.c
Log Message:
Fix a case where an erroneous EAGAIN was returned out of recvmmsg.
This occured when some, but not all of the mmsg array members
were filled with data from a non-blocking socket.
PR kern/48725
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/kern/uipc_syscalls.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/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.165 src/sys/kern/uipc_syscalls.c:1.166
--- src/sys/kern/uipc_syscalls.c:1.165 Wed Oct 9 20:15:39 2013
+++ src/sys/kern/uipc_syscalls.c Mon Apr 7 15:35:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_syscalls.c,v 1.165 2013/10/09 20:15:39 christos Exp $ */
+/* $NetBSD: uipc_syscalls.c,v 1.166 2014/04/07 15:35:23 seanb Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.165 2013/10/09 20:15:39 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_syscalls.c,v 1.166 2014/04/07 15:35:23 seanb Exp $);
#include opt_pipe.h
@@ -1058,8 +1058,11 @@ sys_recvmmsg(struct lwp *l, const struct
error = do_sys_recvmsg_so(l, s, so, msg, from,
msg-msg_control != NULL ? control : NULL, retval);
- if (error)
+ if (error) {
+ if (error == EAGAIN dg 0)
+error = 0;
break;
+ }
if (msg-msg_control != NULL)
error = copyout_msg_control(l, msg, control);
CVS commit: src/sys/kern
Module Name:src
Committed By: rjs
Date: Mon Apr 7 17:02:15 UTC 2014
Modified Files:
src/sys/kern: exec_elf32.c
Log Message:
whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/kern/exec_elf32.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/exec_elf32.c
diff -u src/sys/kern/exec_elf32.c:1.139 src/sys/kern/exec_elf32.c:1.140
--- src/sys/kern/exec_elf32.c:1.139 Fri Mar 7 01:34:29 2014
+++ src/sys/kern/exec_elf32.c Mon Apr 7 17:02:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf32.c,v 1.139 2014/03/07 01:34:29 christos Exp $ */
+/* $NetBSD: exec_elf32.c,v 1.140 2014/04/07 17:02:15 rjs Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: exec_elf32.c,v 1.139 2014/03/07 01:34:29 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: exec_elf32.c,v 1.140 2014/04/07 17:02:15 rjs Exp $);
#define ELFSIZE 32
@@ -64,7 +64,7 @@ static struct execsw exec_elf32_execsw[]
.es_copyargs = elf32_copyargs,
.es_setregs = NULL,
.es_coredump = coredump_elf32,
- .es_setup_stack =exec_setup_stack,
+ .es_setup_stack = exec_setup_stack,
},
#if EXEC_ELF_NOTELESS
{
CVS commit: src/external/mit/xorg/server/drivers/xf86-video-intel
Module Name:src
Committed By: rjs
Date: Mon Apr 7 17:06:47 UTC 2014
Modified Files:
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
Log Message:
The SNA code builds with gcc 4.8 on i386 so enable it again.
ok riastradh@
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/external/mit/xorg/server/drivers/xf86-video-intel/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/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.13 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.14
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.13 Thu Apr 3 18:17:52 2014
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Mon Apr 7 17:06:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/04/03 18:17:52 riastradh Exp $
+# $NetBSD: Makefile,v 1.14 2014/04/07 17:06:47 rjs Exp $
.include bsd.own.mk
@@ -24,9 +24,6 @@ SRCS+= i810_dga.c
SRCS+= i810_dri.c
SRCS+= i810_hwmc.c
-# SNA is amd64-only for now -- triggers ICEs on i386.
-.if ${MACHINE_ARCH} != i386
-
# sna
.PATH: ${X11SRCDIR.${DRIVER}}/src/sna
SRCS+= blt.c
@@ -96,8 +93,6 @@ SRCS+= fbstipple.c
SRCS+= fbtile.c
SRCS+= fbutil.c
-.endif
-
# uxa
.PATH: ${X11SRCDIR.${DRIVER}}/src/uxa
SRCS+= intel_batchbuffer.c
@@ -140,12 +135,8 @@ CPPFLAGS+= -DHAVE_ATOMIC_PRIMITIVES
CPPFLAGS+= -DENABLE_XVMC
CPPFLAGS+= -DUSE_UXA
-.if ${MACHINE_ARCH} == i386
-CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=UXA
-.else
CPPFLAGS+= -DUSE_SNA
CPPFLAGS+= -DDEFAULT_ACCEL_METHOD=SNA
-.endif
CPPFLAGS+= -DHAVE_DRI1
CPPFLAGS+= -DHAVE_DRI2_H
CVS commit: src/crypto/external/bsd/openssl
Module Name:src
Committed By: apb
Date: Mon Apr 7 17:40:49 UTC 2014
Modified Files:
src/crypto/external/bsd/openssl: pkgconfig.mk
Log Message:
Run the mkpc script using ${HOST_SH}
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/pkgconfig.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/pkgconfig.mk
diff -u src/crypto/external/bsd/openssl/pkgconfig.mk:1.4 src/crypto/external/bsd/openssl/pkgconfig.mk:1.5
--- src/crypto/external/bsd/openssl/pkgconfig.mk:1.4 Fri Feb 1 21:02:48 2013
+++ src/crypto/external/bsd/openssl/pkgconfig.mk Mon Apr 7 17:40:49 2014
@@ -1,4 +1,6 @@
-# $NetBSD: pkgconfig.mk,v 1.4 2013/02/01 21:02:48 christos Exp $
+# $NetBSD: pkgconfig.mk,v 1.5 2014/04/07 17:40:49 apb Exp $
+
+.include bsd.own.mk
FILESDIR=/usr/lib/pkgconfig
.for pkg in ${PKGCONFIG}
@@ -6,5 +8,5 @@ FILES+=${pkg}.pc
FILESBUILD_${pkg}.pc=yes
${pkg}.pc: ${.CURDIR}/../../mkpc
- ${.ALLSRC} ${OPENSSLSRC}/crypto ${.TARGET} ${.TARGET}
+ ${HOST_SH} ${.ALLSRC} ${OPENSSLSRC}/crypto ${.TARGET} ${.TARGET}
.endfor
CVS commit: [tls-earlyentropy] src/tests/kernel
Module Name:src
Committed By: tls
Date: Mon Apr 7 19:32:16 UTC 2014
Modified Files:
src/tests/kernel [tls-earlyentropy]: Makefile gen_t_subr_prf
Log Message:
Fix t_subr_prf.c -- such as is possible. I am not so sure about the idea of
tearing apart a source file with a script in order to test pieces of it...
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.33.4.1 src/tests/kernel/Makefile
cvs rdiff -u -r1.3 -r1.3.6.1 src/tests/kernel/gen_t_subr_prf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.33 src/tests/kernel/Makefile:1.33.4.1
--- src/tests/kernel/Makefile:1.33 Tue Apr 16 22:05:44 2013
+++ src/tests/kernel/Makefile Mon Apr 7 19:32:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2013/04/16 22:05:44 mlelstv Exp $
+# $NetBSD: Makefile,v 1.33.4.1 2014/04/07 19:32:15 tls Exp $
NOMAN= # defined
@@ -47,6 +47,7 @@ CPPFLAGS.subr_extent.c= -D_EXTENT_TESTIN
t_subr_prf.c: gen_t_subr_prf ${NETBSDSRCDIR}/sys/kern/subr_prf.c
${HOST_SH} ${.ALLSRC} ${.TARGET}
+CPPFLAGS.t_subr_prf.c= -Wno-pointer-sign # XXX platform vs kernel SHA2
CLEANFILES+= t_subr_prf.c
Index: src/tests/kernel/gen_t_subr_prf
diff -u src/tests/kernel/gen_t_subr_prf:1.3 src/tests/kernel/gen_t_subr_prf:1.3.6.1
--- src/tests/kernel/gen_t_subr_prf:1.3 Wed Oct 31 13:48:12 2012
+++ src/tests/kernel/gen_t_subr_prf Mon Apr 7 19:32:15 2014
@@ -2,10 +2,12 @@
cat _EOF $2
#include sys/types.h
+#include sys/time.h
#include stdio.h
#include stdarg.h
#include stdint.h
#include string.h
+#include sha2.h
#include atf-c.h
@@ -18,6 +20,7 @@ cat _EOF $2
#define KPRINTF_BUFSIZE 1024
#undef putchar
#define putchar xputchar
+
static int putchar(char c, int foo, void *b)
{
return fputc(c, stderr);
@@ -29,6 +32,11 @@ static const char hexdigits[] = 0123456
typedef int device_t;
+static SHA512_CTX kprnd_sha;
+
+#define timespec timeval
+#define nanotime(ts) gettimeofday(ts, NULL)
+
#define device_xname(a)
int kprintf(const char *, int, void *, char *, va_list) __printflike(1, 0);
void device_printf(device_t, const char *, ...) __printflike(2, 3);
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Mon Apr 7 20:38:52 UTC 2014 Modified Files: src/sys/arch/arm/include: cpufunc.h Log Message: Declare armv7 routines if CPU_ARMV7 is defined. Rearrange in less random manner. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/sys/arch/arm/include/cpufunc.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/cpufunc.h diff -u src/sys/arch/arm/include/cpufunc.h:1.70 src/sys/arch/arm/include/cpufunc.h:1.71 --- src/sys/arch/arm/include/cpufunc.h:1.70 Sat Mar 29 23:44:37 2014 +++ src/sys/arch/arm/include/cpufunc.h Mon Apr 7 20:38:52 2014 @@ -470,7 +470,7 @@ void armv6_idcache_wbinv_all (void); void armv6_idcache_wbinv_range (vaddr_t, vsize_t); #endif -#if defined(CPU_CORTEX) +#if defined(CPU_ARMV7) #if defined(ARM_MMU_EXTENDED) void armv7_setttb(u_int, tlb_asid_t); void armv7_context_switch(u_int, tlb_asid_t); @@ -480,12 +480,15 @@ void armv7_context_switch(u_int); #endif void armv7_icache_sync_range(vaddr_t, vsize_t); +void armv7_icache_sync_all(void); + +void armv7_dcache_inv_range(vaddr_t, vsize_t); void armv7_dcache_wb_range(vaddr_t, vsize_t); void armv7_dcache_wbinv_range(vaddr_t, vsize_t); -void armv7_dcache_inv_range(vaddr_t, vsize_t); -void armv7_idcache_wbinv_range(vaddr_t, vsize_t); +void armv7_dcache_wbinv_all(void); -void armv7_icache_sync_all(void); +void armv7_idcache_wbinv_range(vaddr_t, vsize_t); +void armv7_idcache_wbinv_all(void); void armv7_tlb_flushID(void); void armv7_tlb_flushI(void); @@ -498,12 +501,7 @@ void armv7_tlb_flushD_SE(vaddr_t); void armv7_cpu_sleep(int); void armv7_drain_writebuf(void); void armv7_setup(char *string); -#endif - -#if defined(CPU_CORTEX) || defined(CPU_PJ4B) -void armv7_dcache_wbinv_all(void); -void armv7_idcache_wbinv_all(void); -#endif +#endif /* CPU_ARMV7 */ #if defined(CPU_PJ4B) #if defined(ARM_MMU_EXTENDED)
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: christos
Date: Mon Apr 7 21:09:55 UTC 2014
Modified Files:
src/sys/arch/i386/stand/lib: Makefile
Log Message:
XXX: gcc-4.8 bug. Passes wrong arguments to biosdisk_read(). Turn optimization
off.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/stand/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.37 src/sys/arch/i386/stand/lib/Makefile:1.38
--- src/sys/arch/i386/stand/lib/Makefile:1.37 Fri Feb 14 15:34:27 2014
+++ src/sys/arch/i386/stand/lib/Makefile Mon Apr 7 17:09:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2014/02/14 20:34:27 joerg Exp $
+# $NetBSD: Makefile,v 1.38 2014/04/07 21:09:55 christos Exp $
S?= ${.CURDIR}/../../../..
@@ -57,3 +57,6 @@ lib${LIB}.o:: ${OBJS}
.if ${HAVE_GCC:U} == 45
COPTS.biosdisk.c+= -fno-strict-aliasing
.endif
+.if ${HAVE_GCC:U} == 48
+COPTS.biosdisk_ll.c+= -O0
+.endif
CVS commit: src/doc
Module Name:src Committed By: christos Date: Mon Apr 7 21:20:17 UTC 2014 Modified Files: src/doc: HACKS Log Message: Add x86 bootblock hack. To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/doc/HACKS Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/HACKS diff -u src/doc/HACKS:1.147 src/doc/HACKS:1.148 --- src/doc/HACKS:1.147 Sat Apr 5 13:06:44 2014 +++ src/doc/HACKS Mon Apr 7 17:20:17 2014 @@ -1,4 +1,4 @@ -# $NetBSD: HACKS,v 1.147 2014/04/05 17:06:44 tron Exp $ +# $NetBSD: HACKS,v 1.148 2014/04/07 21:20:17 christos Exp $ # # This file is intended to document workarounds for currently unsolved # (mostly) compiler bugs. @@ -815,6 +815,18 @@ port i386 the i387 FPU without rounding the intermediate results kcah +port x86 + hack turn off optimization for biosdisk_ll.c because otherwise + we are pass the wrong arguments to biosdisk_read(). + $ cd /usr/src/sys/arch/i386/floppies/bootflopp-com + $ qemu-system-i386 -nographic -fda boot-com1.fs -boot a + who christos + file src/sys/arch/i386/stand/lib/Makefile : 1.38 + descr + Turning on DISK_DEBUG shows the problem. We should find + out which option is causing this. + hcah + port powerpc hack avoid using __builtin_return_address(0) because it fails in
CVS commit: src/sys/dev/pci/hdaudio
Module Name:src Committed By: njoly Date: Mon Apr 7 21:35:41 UTC 2014 Modified Files: src/sys/dev/pci/hdaudio: hdaudio_ids.c Log Message: Use 0x prefix when printing hexadecimal numbers. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/hdaudio/hdaudio_ids.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/pci/hdaudio/hdaudio_ids.c diff -u src/sys/dev/pci/hdaudio/hdaudio_ids.c:1.7 src/sys/dev/pci/hdaudio/hdaudio_ids.c:1.8 --- src/sys/dev/pci/hdaudio/hdaudio_ids.c:1.7 Tue Dec 17 17:13:46 2013 +++ src/sys/dev/pci/hdaudio/hdaudio_ids.c Mon Apr 7 21:35:41 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: hdaudio_ids.c,v 1.7 2013/12/17 17:13:46 jakllsch Exp $ */ +/* $NetBSD: hdaudio_ids.c,v 1.8 2014/04/07 21:35:41 njoly Exp $ */ /* * Copyright (c) 2010 Jared D. McNeill jmcne...@invisible.ca @@ -29,7 +29,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: hdaudio_ids.c,v 1.7 2013/12/17 17:13:46 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: hdaudio_ids.c,v 1.8 2014/04/07 21:35:41 njoly Exp $); #include sys/types.h #include sys/param.h @@ -267,7 +267,7 @@ hdaudio_id2name(uint16_t vendor, uint16_ if (name) snprintf(buf, len - 1, %s, name); else if (product == HDA_PRODUCT_ANY) - snprintf(buf, len - 1, vendor %04x, vendor); + snprintf(buf, len - 1, vendor 0x%04x, vendor); else - snprintf(buf, len - 1, product %04x, product); + snprintf(buf, len - 1, product 0x%04x, product); }
CVS commit: src/sys/dev/pci
Module Name:src Committed By: njoly Date: Mon Apr 7 21:37:42 UTC 2014 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add Intel Ivy Bridge PCI Express Root Port To generate a diff of this commit: cvs rdiff -u -r1.1184 -r1.1185 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1184 src/sys/dev/pci/pcidevs:1.1185 --- src/sys/dev/pci/pcidevs:1.1184 Sat Mar 15 10:30:41 2014 +++ src/sys/dev/pci/pcidevs Mon Apr 7 21:37:42 2014 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1184 2014/03/15 10:30:41 kiyohara Exp $ +$NetBSD: pcidevs,v 1.1185 2014/04/07 21:37:42 njoly Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2544,6 +2544,7 @@ product INTEL SANDYBRIDGE_M_IGD_2 0x0126 product INTEL SANDYBRIDGE_S_HB 0x0108 Sandy Bridge Host Bridge product INTEL SANDYBRIDGE_S_IGD 0x010A Sandy Bridge Integrated Graphics Device product INTEL IVYBRIDGE_HB 0x0150 Ivy Bridge Host Bridge +product INTEL IVYBRIDGE_PCIE 0x0151 Ivy Bridge PCI Express Root Port product INTEL IVYBRIDGE_IGD 0x0152 Ivy Bridge Integrated Graphics Device product INTEL IVYBRIDGE_IGD_1 0x0162 Ivy Bridge Integrated Graphics Device product INTEL IVYBRIDGE_M_HB 0x0154 Ivy Bridge Host Bridge
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: njoly
Date: Mon Apr 7 21:38:29 UTC 2014
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
Regen for Intel Ivy Bridge PCI Express Root Port.
To generate a diff of this commit:
cvs rdiff -u -r1.1177 -r1.1178 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1176 -r1.1177 src/sys/dev/pci/pcidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1177 src/sys/dev/pci/pcidevs.h:1.1178
--- src/sys/dev/pci/pcidevs.h:1.1177 Sat Mar 15 10:32:36 2014
+++ src/sys/dev/pci/pcidevs.h Mon Apr 7 21:38:28 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1177 2014/03/15 10:32:36 kiyohara Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1178 2014/04/07 21:38:28 njoly Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1184 2014/03/15 10:30:41 kiyohara Exp
+ * NetBSD: pcidevs,v 1.1185 2014/04/07 21:37:42 njoly Exp
*/
/*
@@ -2551,6 +2551,7 @@
#define PCI_PRODUCT_INTEL_SANDYBRIDGE_S_HB 0x0108 /* Sandy Bridge Host Bridge */
#define PCI_PRODUCT_INTEL_SANDYBRIDGE_S_IGD 0x010A /* Sandy Bridge Integrated Graphics Device */
#define PCI_PRODUCT_INTEL_IVYBRIDGE_HB 0x0150 /* Ivy Bridge Host Bridge */
+#define PCI_PRODUCT_INTEL_IVYBRIDGE_PCIE 0x0151 /* Ivy Bridge PCI Express Root Port */
#define PCI_PRODUCT_INTEL_IVYBRIDGE_IGD 0x0152 /* Ivy Bridge Integrated Graphics Device */
#define PCI_PRODUCT_INTEL_IVYBRIDGE_IGD_1 0x0162 /* Ivy Bridge Integrated Graphics Device */
#define PCI_PRODUCT_INTEL_IVYBRIDGE_M_HB 0x0154 /* Ivy Bridge Host Bridge */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1176 src/sys/dev/pci/pcidevs_data.h:1.1177
--- src/sys/dev/pci/pcidevs_data.h:1.1176 Sat Mar 15 10:32:36 2014
+++ src/sys/dev/pci/pcidevs_data.h Mon Apr 7 21:38:28 2014
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1176 2014/03/15 10:32:36 kiyohara Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1177 2014/04/07 21:38:28 njoly Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1184 2014/03/15 10:30:41 kiyohara Exp
+ * NetBSD: pcidevs,v 1.1185 2014/04/07 21:37:42 njoly Exp
*/
/*
@@ -3857,6 +3857,8 @@ static const uint16_t pci_products[] = {
17075, 6347, 692, 1716, 2427, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_IVYBRIDGE_HB,
17081, 6347, 6743, 6347, 0,
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_IVYBRIDGE_PCIE,
+ 17081, 6347, 615, 4329, 7835, 7901, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_IVYBRIDGE_IGD,
17081, 6347, 692, 1716, 2427, 0,
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_IVYBRIDGE_IGD_1,
@@ -9574,7 +9576,7 @@ static const char pci_words[] = { .
TMC\0 /* 1 refs @ 601 */
Miro\0 /* 1 refs @ 605 */
(2nd\0 /* 14 refs @ 610 */
- PCI\0 /* 322 refs @ 615 */
+ PCI\0 /* 323 refs @ 615 */
Vendor\0 /* 16 refs @ 619 */
ID)\0 /* 19 refs @ 626 */
NEC\0 /* 2 refs @ 630 */
@@ -10070,7 +10072,7 @@ static const char pci_words[] = { .
Transmeta\0 /* 1 refs @ 4302 */
Rockwell\0 /* 1 refs @ 4312 */
Davicom\0 /* 1 refs @ 4321 */
- Express\0 /* 103 refs @ 4329 */
+ Express\0 /* 104 refs @ 4329 */
TriTech\0 /* 1 refs @ 4337 */
Kofax\0 /* 1 refs @ 4345 */
Image\0 /* 1 refs @ 4351 */
@@ -10336,7 +10338,7 @@ static const char pci_words[] = { .
ACCM\0 /* 1 refs @ 6330 */
2188\0 /* 1 refs @ 6335 */
VL-PCI\0 /* 3 refs @ 6340 */
- Bridge\0 /* 608 refs @ 6347 */
+ Bridge\0 /* 609 refs @ 6347 */
2051\0 /* 2 refs @ 6354 */
Single\0 /* 7 refs @ 6359 */
Solution\0 /* 2 refs @ 6366 */
@@ -10529,7 +10531,7 @@ static const char pci_words[] = { .
Link\0 /* 19 refs @ 7810 */
Family11h\0 /* 5 refs @ 7815 */
Family14h\0 /* 1 refs @ 7825 */
- Root\0 /* 18 refs @ 7835 */
+ Root\0 /* 19 refs @ 7835 */
Complex\0 /* 2 refs @ 7840 */
Family15h\0 /* 6 refs @ 7848 */
North\0 /* 11 refs @ 7858 */
@@ -10537,7 +10539,7 @@ static const char pci_words[] = { .
C-state\0 /* 1 refs @ 7878 */
Family12h\0 /* 2 refs @ 7886 */
GPP0\0 /* 1 refs @ 7896 */
- Port\0 /* 131 refs @ 7901 */
+ Port\0 /* 132 refs @ 7901 */
Misc.\0 /* 1 refs @ 7906 */
PCnet-PCI\0 /* 1 refs @ 7912 */
PCnet-Home\0 /* 1 refs @ 7922 */
@@ -11853,7 +11855,7 @@ static const char pci_words[] = { .
1030\0 /* 2 refs @ 17065 */
6230\0 /* 2 refs @ 17070 */
Sandy\0 /* 10 refs @ 17075 */
- Ivy\0 /* 9 refs @ 17081 */
+ Ivy\0 /* 10 refs @ 17081 */
80312\0 /* 1 refs @ 17085 */
80321\0 /* 1 refs @ 17091 */
6700PXH\0 /* 2 refs @ 17097 */
CVS commit: src/sys/dev/ic
Module Name:src Committed By: christos Date: Tue Apr 8 00:09:15 UTC 2014 Modified Files: src/sys/dev/ic: com.c Log Message: Clear dtr on transition from !0 to 0, and set it on the opposite. This leaves dtr alone in the normal case. To generate a diff of this commit: cvs rdiff -u -r1.324 -r1.325 src/sys/dev/ic/com.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/com.c diff -u src/sys/dev/ic/com.c:1.324 src/sys/dev/ic/com.c:1.325 --- src/sys/dev/ic/com.c:1.324 Sun Apr 6 19:29:58 2014 +++ src/sys/dev/ic/com.c Mon Apr 7 20:09:15 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.324 2014/04/06 23:29:58 christos Exp $ */ +/* $NetBSD: com.c,v 1.325 2014/04/08 00:09:15 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com.c,v 1.324 2014/04/06 23:29:58 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: com.c,v 1.325 2014/04/08 00:09:15 christos Exp $); #include opt_com.h #include opt_ddb.h @@ -1424,12 +1424,10 @@ comparam(struct tty *tp, struct termios } sc-sc_msr_mask = sc-sc_msr_cts | sc-sc_msr_dcd; - if (ospeed == 0) + if (t-c_ospeed == 0 tp-t_ospeed != 0) CLR(sc-sc_mcr, sc-sc_mcr_dtr); -#if 0 - else + else if (t-c_ospeed != 0 tp-t_ospeed == 0) SET(sc-sc_mcr, sc-sc_mcr_dtr); -#endif sc-sc_dlbl = ospeed; sc-sc_dlbh = ospeed 8;
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Apr 8 02:19:54 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new OpenSSL To generate a diff of this commit: cvs rdiff -u -r1.1105 -r1.1106 src/doc/3RDPARTY cvs rdiff -u -r1.1912 -r1.1913 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1105 src/doc/3RDPARTY:1.1106 --- src/doc/3RDPARTY:1.1105 Sat Apr 5 07:18:03 2014 +++ src/doc/3RDPARTY Mon Apr 7 22:19:54 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1105 2014/04/05 11:18:03 apb Exp $ +# $NetBSD: 3RDPARTY,v 1.1106 2014/04/08 02:19:54 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -968,8 +968,8 @@ markus is very cooperative about it): - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes. Package: OpenSSL -Version: 1.0.1f -Current Vers: 1.0.1f with AES-NI patch +Version: 1.0.1g +Current Vers: 1.0.1g with AES-NI patch Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1912 src/doc/CHANGES:1.1913 --- src/doc/CHANGES:1.1912 Mon Apr 7 07:26:16 2014 +++ src/doc/CHANGES Mon Apr 7 22:19:54 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1912 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1913 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -384,3 +384,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: i386: Switched to GCC 4.8. [christos 20140404] mcp23s17gpio: Add Microchip MCP23S17 16-bit GPIO chip driver. e.g. Raspberry Pi interface boards [kardel 20140406] + OpenSSL: Imported 1.0.1g [christos 20140407]
