CVS commit: src/lib/libm/man
Module Name:src Committed By: he Date: Thu Sep 10 08:28:54 UTC 2015 Modified Files: src/lib/libm/man: frexp.3 Log Message: Document frexpl() now that we have it as well. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libm/man/frexp.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/man/frexp.3 diff -u src/lib/libm/man/frexp.3:1.2 src/lib/libm/man/frexp.3:1.3 --- src/lib/libm/man/frexp.3:1.2 Thu Apr 29 08:35:03 2010 +++ src/lib/libm/man/frexp.3 Thu Sep 10 08:28:54 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: frexp.3,v 1.2 2010/04/29 08:35:03 joerg Exp $ +.\" $NetBSD: frexp.3,v 1.3 2015/09/10 08:28:54 he Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -47,6 +47,8 @@ .Fn frexp "double value" "int *exp" .Ft float .Fn frexpf "float value" "int *exp" +.Ft long double +.Fn frexpl "long double value" "int *exp" .Sh DESCRIPTION The .Fn frexp
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Thu Sep 10 09:30:02 UTC 2015
Modified Files:
src/sys/conf: assym.mk
Log Message:
Simplify the dependency line further.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/conf/assym.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/assym.mk
diff -u src/sys/conf/assym.mk:1.3 src/sys/conf/assym.mk:1.4
--- src/sys/conf/assym.mk:1.3 Wed Sep 9 03:27:15 2015
+++ src/sys/conf/assym.mk Thu Sep 10 09:30:01 2015
@@ -1,4 +1,4 @@
-# $NetBSD: assym.mk,v 1.3 2015/09/09 03:27:15 uebayasi Exp $
+# $NetBSD: assym.mk,v 1.4 2015/09/10 09:30:01 uebayasi Exp $
assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf
${_MKTARGET_CREATE}
@@ -7,11 +7,7 @@ assym.h: ${GENASSYM_CONF} ${GENASSYM_EXT
${GENASSYM_CPPFLAGS} > assym.h.tmp && \
mv -f assym.h.tmp assym.h
-.if !defined(___USE_SUFFIX_RULES___)
-${_MD_SFILES:C/\.[Ss]/.o/} ${_SFILES:C/\.[Ss]/.o/}: assym.h
-.else
-${SRCS:M*.[sS]}: assym.h
-.endif
+${SRCS:M*.[sS]:C|\.[Ss]|.o|}: assym.h
assym.d: assym.h
${_MKTARGET_CREATE}
CVS commit: src/lib/libc/net
Module Name:src
Committed By: christos
Date: Thu Sep 10 11:33:27 UTC 2015
Modified Files:
src/lib/libc/net: getaddrinfo.c
Log Message:
mke allocaddrinfo static.
To generate a diff of this commit:
cvs rdiff -u -r1.107 -r1.108 src/lib/libc/net/getaddrinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.107 src/lib/libc/net/getaddrinfo.c:1.108
--- src/lib/libc/net/getaddrinfo.c:1.107 Wed Sep 9 06:06:05 2015
+++ src/lib/libc/net/getaddrinfo.c Thu Sep 10 07:33:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.107 2015/09/09 10:06:05 ozaki-r Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.108 2015/09/10 11:33:27 christos Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.107 2015/09/09 10:06:05 ozaki-r Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.108 2015/09/10 11:33:27 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef RUMP_ACTION
@@ -935,7 +935,7 @@ get_canonname(const struct addrinfo *pai
return 0;
}
-struct addrinfo *
+static struct addrinfo *
allocaddrinfo(socklen_t addrlen)
{
struct addrinfo *ai;
CVS commit: src/lib/libm/man
Module Name:src Committed By: wiz Date: Thu Sep 10 12:30:08 UTC 2015 Modified Files: src/lib/libm/man: frexp.3 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/libm/man/frexp.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libm/man/frexp.3 diff -u src/lib/libm/man/frexp.3:1.3 src/lib/libm/man/frexp.3:1.4 --- src/lib/libm/man/frexp.3:1.3 Thu Sep 10 08:28:54 2015 +++ src/lib/libm/man/frexp.3 Thu Sep 10 12:30:08 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: frexp.3,v 1.3 2015/09/10 08:28:54 he Exp $ +.\" $NetBSD: frexp.3,v 1.4 2015/09/10 12:30:08 wiz Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -33,7 +33,7 @@ .\" .\" @(#)frexp.3 8.1 (Berkeley) 6/4/93 .\" -.Dd March 21, 2006 +.Dd September 10, 2015 .Dt FREXP 3 .Os .Sh NAME
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Thu Sep 10 13:11:39 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc assym.mk
Log Message:
Fix dependency of *.d -> assym.h in `-S' mode.
To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.4 -r1.5 src/sys/conf/assym.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.244 src/sys/conf/Makefile.kern.inc:1.245
--- src/sys/conf/Makefile.kern.inc:1.244 Mon Sep 7 15:55:06 2015
+++ src/sys/conf/Makefile.kern.inc Thu Sep 10 13:11:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.244 2015/09/07 15:55:06 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.245 2015/09/10 13:11:39 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -358,7 +358,7 @@ DEPS= ${SRCS:R:S/$/.d/g}
.if !defined(___USE_SUFFIX_RULES___)
.for _s in ${SSRCS}
.if !target(${_s:T:R}.d)
-${_s:T:R}.d: ${_s} assym.h
+${_s:T:R}.d: ${_s}
${_MKTARGET_CREATE}
${MKDEP} -f ${.TARGET}.tmp -- ${MKDEP_AFLAGS} \
${CPPFLAGS} ${CPPFLAGS.${_s:T}} ${_s}
Index: src/sys/conf/assym.mk
diff -u src/sys/conf/assym.mk:1.4 src/sys/conf/assym.mk:1.5
--- src/sys/conf/assym.mk:1.4 Thu Sep 10 09:30:01 2015
+++ src/sys/conf/assym.mk Thu Sep 10 13:11:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: assym.mk,v 1.4 2015/09/10 09:30:01 uebayasi Exp $
+# $NetBSD: assym.mk,v 1.5 2015/09/10 13:11:39 uebayasi Exp $
assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf
${_MKTARGET_CREATE}
@@ -7,7 +7,13 @@ assym.h: ${GENASSYM_CONF} ${GENASSYM_EXT
${GENASSYM_CPPFLAGS} > assym.h.tmp && \
mv -f assym.h.tmp assym.h
+.if !defined(___USE_SUFFIX_RULES___)
+${SRCS:T:M*.[sS]:C|\.[Ss]|.o|}: assym.h
+${SRCS:T:M*.[sS]:C|\.[Ss]|.d|}: assym.h
+.else
${SRCS:M*.[sS]:C|\.[Ss]|.o|}: assym.h
+${SRCS:M*.[sS]:C|\.[Ss]|.d|}: assym.h
+.endif
assym.d: assym.h
${_MKTARGET_CREATE}
CVS commit: src/lib/libc
Module Name:src
Committed By: christos
Date: Thu Sep 10 14:05:06 UTC 2015
Modified Files:
src/lib/libc/include: namespace.h
src/lib/libc/net: getaddrinfo.c
Log Message:
namespace protect allocaddrinfo
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/lib/libc/include/namespace.h
cvs rdiff -u -r1.108 -r1.109 src/lib/libc/net/getaddrinfo.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/include/namespace.h
diff -u src/lib/libc/include/namespace.h:1.178 src/lib/libc/include/namespace.h:1.179
--- src/lib/libc/include/namespace.h:1.178 Fri May 1 10:17:56 2015
+++ src/lib/libc/include/namespace.h Thu Sep 10 10:05:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.178 2015/05/01 14:17:56 christos Exp $ */
+/* $NetBSD: namespace.h,v 1.179 2015/09/10 14:05:06 christos Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -170,6 +170,7 @@
#define a64l _a64l
#define adjtime _adjtime
#define alarm _alarm
+#define allocaddrinfo _allocaddrinfo
#define alphasort _alphasort
#define arc4random _arc4random
#define arc4random_addrandom _arc4random_addrandom
Index: src/lib/libc/net/getaddrinfo.c
diff -u src/lib/libc/net/getaddrinfo.c:1.108 src/lib/libc/net/getaddrinfo.c:1.109
--- src/lib/libc/net/getaddrinfo.c:1.108 Thu Sep 10 07:33:27 2015
+++ src/lib/libc/net/getaddrinfo.c Thu Sep 10 10:05:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: getaddrinfo.c,v 1.108 2015/09/10 11:33:27 christos Exp $ */
+/* $NetBSD: getaddrinfo.c,v 1.109 2015/09/10 14:05:06 christos Exp $ */
/* $KAME: getaddrinfo.c,v 1.29 2000/08/31 17:26:57 itojun Exp $ */
/*
@@ -55,7 +55,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getaddrinfo.c,v 1.108 2015/09/10 11:33:27 christos Exp $");
+__RCSID("$NetBSD: getaddrinfo.c,v 1.109 2015/09/10 14:05:06 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#ifndef RUMP_ACTION
@@ -95,6 +95,7 @@ __RCSID("$NetBSD: getaddrinfo.c,v 1.108
#ifndef RUMP_ACTION
#ifdef __weak_alias
__weak_alias(getaddrinfo,_getaddrinfo)
+__weak_alias(allocaddrinfo,_allocaddrinfo)
__weak_alias(freeaddrinfo,_freeaddrinfo)
__weak_alias(gai_strerror,_gai_strerror)
#endif
@@ -935,7 +936,7 @@ get_canonname(const struct addrinfo *pai
return 0;
}
-static struct addrinfo *
+struct addrinfo *
allocaddrinfo(socklen_t addrlen)
{
struct addrinfo *ai;
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Thu Sep 10 16:14:22 UTC 2015
Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh
Log Message:
Ignore multiline IOC macros by default.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/rump/include/rump/makerumpdefs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/makerumpdefs.sh
diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.25 src/sys/rump/include/rump/makerumpdefs.sh:1.26
--- src/sys/rump/include/rump/makerumpdefs.sh:1.25 Wed Dec 18 20:10:58 2013
+++ src/sys/rump/include/rump/makerumpdefs.sh Thu Sep 10 16:14:22 2015
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
rm -f rumpdefs.h
exec 3>&1 > rumpdefs.h
-printf '/* $NetBSD: makerumpdefs.sh,v 1.25 2013/12/18 20:10:58 pooka Exp $ */\n\n'
+printf '/* $NetBSD: makerumpdefs.sh,v 1.26 2015/09/10 16:14:22 pooka Exp $ */\n\n'
printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n'
printf '#ifndef _RUMP_RUMPDEFS_H_\n'
printf '#define _RUMP_RUMPDEFS_H_\n\n'
@@ -97,7 +97,7 @@ fromvers ../../../sys/fstypes.h
sed -n '/#define[ ]*MNT_[A-Z].*[^\]$/s/MNT_/RUMP_MNT_/gp' <../../../sys/fstypes.h | sed 's,/\*.*$,,'
fromvers ../../../sys/ioccom.h
-sed -n '/#define[ ]*IOC[A-Z_]/s/IOC/RUMP_&/gp' <../../../sys/ioccom.h | sed 's,/\*.*$,,'
+sed -n '/#define[ ]*IOC[A-Z_].*[^\\]$/s/IOC/RUMP_&/gp' <../../../sys/ioccom.h | sed 's,/\*.*$,,'
sed -n '/#define[ ]*_IO.*\\$/{:t;N;/\\$/bt;s/_IOC/_RUMP_IOC/g;s/IOC[A-Z]/RUMP_&/gp}' <../../../sys/ioccom.h \
| sed 's,/\*.*$,,'
sed -n '/#define[ ]*_IO.*[^\]$/{s/_IO/_RUMP_IO/g;s/IOC_/RUMP_IOC_/gp}' <../../../sys/ioccom.h \
@@ -129,7 +129,7 @@ echo Generating rumperr.h
rm -f rumperr.h
exec > rumperr.h
-printf '/* $NetBSD: makerumpdefs.sh,v 1.25 2013/12/18 20:10:58 pooka Exp $ */\n\n'
+printf '/* $NetBSD: makerumpdefs.sh,v 1.26 2015/09/10 16:14:22 pooka Exp $ */\n\n'
printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n'
fromvers ../../../sys/errno.h
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Thu Sep 10 16:16:35 UTC 2015
Modified Files:
src/sys/rump/include/rump: rumpdefs.h rumperr.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/rump/include/rump/rumpdefs.h
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/include/rump/rumperr.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/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.30 src/sys/rump/include/rump/rumpdefs.h:1.31
--- src/sys/rump/include/rump/rumpdefs.h:1.30 Wed Dec 18 20:12:08 2013
+++ src/sys/rump/include/rump/rumpdefs.h Thu Sep 10 16:16:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.30 2013/12/18 20:12:08 pooka Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.31 2015/09/10 16:16:35 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -33,7 +33,7 @@
#define RUMP_O_SEARCH 0x0080 /* skip search permission checks */
#define RUMP_O_NOSIGPIPE 0x0100 /* don't deliver sigpipe */
-/* NetBSD: vnode.h,v 1.243 2013/12/01 17:29:40 christos Exp */
+/* NetBSD: vnode.h,v 1.256 2015/07/12 08:11:28 hannken Exp */
enum rump_vtype { RUMP_VNON, RUMP_VREG, RUMP_VDIR, RUMP_VBLK, RUMP_VCHR, RUMP_VLNK, RUMP_VSOCK, RUMP_VFIFO, RUMP_VBAD };
#define RUMP_LK_SHARED 0x0001
#define RUMP_LK_EXCLUSIVE 0x0002
@@ -170,12 +170,14 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_AB_SILENT 0x0004
#define RUMP_AB_DEBUG 0x0008
-/* NetBSD: socket.h,v 1.108 2013/01/31 14:30:47 joerg Exp */
+/* NetBSD: socket.h,v 1.117 2015/04/03 20:01:08 rtr Exp */
#define RUMP_SOCK_STREAM 1
#define RUMP_SOCK_DGRAM 2
#define RUMP_SOCK_RAW 3
#define RUMP_SOCK_RDM 4
#define RUMP_SOCK_SEQPACKET 5
+#define RUMP_SOCK_CONN_DGRAM 6
+#define RUMP_SOCK_DCCP RUMP_SOCK_CONN_DGRAM
#define RUMP_SOCK_CLOEXEC 0x1000
#define RUMP_SOCK_NONBLOCK 0x2000
#define RUMP_SOCK_NOSIGPIPE 0x4000
@@ -295,7 +297,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_MSG_IOVUSRSPACE 0x400
#define RUMP_MSG_LENUSRSPACE 0x800
-/* NetBSD: in.h,v 1.89 2013/06/27 19:38:16 christos Exp */
+/* NetBSD: in.h,v 1.97 2015/05/02 14:41:32 roy Exp */
#define RUMP_IP_OPTIONS 1
#define RUMP_IP_HDRINCL 2
#define RUMP_IP_TOS 3
@@ -313,7 +315,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_IP_PORTRANGE 19
#define RUMP_IP_RECVIF 20
#define RUMP_IP_ERRORMTU 21
-#define RUMP_IP_IPSEC_POLICY 22
+#define RUMP_IP_IPSEC_POLICY 22
#define RUMP_IP_RECVTTL 23
#define RUMP_IP_MINTTL 24
#define RUMP_IP_PKTINFO 25
@@ -337,6 +339,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_IPPROTO_UDP 17
#define RUMP_IPPROTO_IDP 22
#define RUMP_IPPROTO_TP 29
+#define RUMP_IPPROTO_DCCP 33
#define RUMP_IPPROTO_IPV6 41
#define RUMP_IPPROTO_ROUTING 43
#define RUMP_IPPROTO_FRAGMENT 44
@@ -362,7 +365,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_IPPROTO_DONE 257
#define RUMP_IPPROTO_MAXID (RUMP_IPPROTO_AH + 1)
-/* NetBSD: tcp.h,v 1.30 2012/01/07 20:20:22 christos Exp */
+/* NetBSD: tcp.h,v 1.31 2015/02/14 12:57:53 he Exp */
#define RUMP_TCP_MSS 536
#define RUMP_TCP_MINMSS 216
#define RUMP_TCP_MAXWIN 65535
@@ -376,10 +379,11 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_TCP_KEEPCNT 6
#define RUMP_TCP_KEEPINIT 7
#define RUMP_TCP_NOOPT 8
+#define RUMP_TCP_INFO 9
#define RUMP_TCP_MD5SIG 0x10
#define RUMP_TCP_CONGCTL 0x20
-/* NetBSD: mount.h,v 1.210 2013/11/23 13:35:36 christos Exp */
+/* NetBSD: mount.h,v 1.217 2015/05/06 15:57:08 hannken Exp */
#define RUMP_MOUNT_FFS "ffs"
#define RUMP_MOUNT_UFS RUMP_MOUNT_FFS
#define RUMP_MOUNT_NFS "nfs"
@@ -414,7 +418,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_MOUNT_RUMPFS "rumpfs"
#define RUMP_MOUNT_V7FS "v7fs"
-/* NetBSD: fstypes.h,v 1.32 2012/11/26 16:22:21 drochner Exp */
+/* NetBSD: fstypes.h,v 1.33 2015/05/06 15:57:08 hannken Exp */
#define RUMP_MNT_RDONLY 0x0001
#define RUMP_MNT_SYNCHRONOUS 0x0002
#define RUMP_MNT_NOEXEC 0x0004
@@ -451,7 +455,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_MNT_NOWAIT 2
#define RUMP_MNT_LAZY 3
-/* NetBSD: ioccom.h,v 1.11 2011/10/19 10:53:12 yamt Exp */
+/* NetBSD: ioccom.h,v 1.12 2014/12/10 00:16:05 christos Exp */
#define RUMP_IOCPARM_MASK 0x1fff
#define RUMP_IOCPARM_SHIFT 16
#define RUMP_IOCGROUP_SHIFT 8
@@ -516,7 +520,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_KTRFACv1 (1 << RUMP_KTRFAC_VER_SHIFT)
#define RUMP_KTRFACv2 (2 << RUMP_KTRFAC_VER_SHIFT)
-/* NetBSD: module.h,v 1.34 2013/10/23 18:57:40 mbalmer Exp */
+/* NetBSD: module.h,v 1.38 2015/06/22 16:35:13 matt Exp */
struct rump_modctl_load {
const char *ml_filename;
@@ -532,7 +536,7 @@ enum rump_modctl {
RUMP_MODCTL_EXISTS /* enum: 0: load, 1: autoload */
};
-
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Sep 10 16:21:32 UTC 2015 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: Fix #define ERRNO EANOTHERRNO. Was: #define RUMP_ERRNO EANOTHERRNO Now: #define RUMP_ERRNO RUMP_EANOTHERRNO pointed out by Sebastian Wicki on irc To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/include/rump/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.26 src/sys/rump/include/rump/makerumpdefs.sh:1.27 --- src/sys/rump/include/rump/makerumpdefs.sh:1.26 Thu Sep 10 16:14:22 2015 +++ src/sys/rump/include/rump/makerumpdefs.sh Thu Sep 10 16:21:32 2015 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec 3>&1 > rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.26 2015/09/10 16:14:22 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.27 2015/09/10 16:21:32 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -60,7 +60,8 @@ sed -n '/#define.*LK_[A-Z]/s/LK_/RUMP_LK | sed 's,/\*.*$,,' fromvers ../../../sys/errno.h -sed -n '/#define[ ]*E/s/E[A-Z]*/RUMP_&/p' < ../../../sys/errno.h +sed -n '/#define[ ]*E/s/\([ ]\)\(E[A-Z2][A-Z]*\)/\1RUMP_\2/gp' \ +< ../../../sys/errno.h fromvers ../../../sys/reboot.h sed -n '/#define.*RB_[A-Z]/s/RB_/RUMP_RB_/gp' <../../../sys/reboot.h \ @@ -129,7 +130,7 @@ echo Generating rumperr.h rm -f rumperr.h exec > rumperr.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.26 2015/09/10 16:14:22 pooka Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.27 2015/09/10 16:21:32 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n' fromvers ../../../sys/errno.h
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Thu Sep 10 16:21:48 UTC 2015
Modified Files:
src/sys/rump/include/rump: rumpdefs.h rumperr.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/rump/include/rump/rumpdefs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/include/rump/rumperr.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/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.31 src/sys/rump/include/rump/rumpdefs.h:1.32
--- src/sys/rump/include/rump/rumpdefs.h:1.31 Thu Sep 10 16:16:35 2015
+++ src/sys/rump/include/rump/rumpdefs.h Thu Sep 10 16:21:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.31 2015/09/10 16:16:35 pooka Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.32 2015/09/10 16:21:48 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -76,7 +76,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_EDOM 33 /* Numerical argument out of domain */
#define RUMP_ERANGE 34 /* Result too large or too small */
#define RUMP_EAGAIN 35 /* Resource temporarily unavailable */
-#define RUMP_EWOULDBLOCK EAGAIN /* Operation would block */
+#define RUMP_EWOULDBLOCK RUMP_EAGAIN /* Operation would block */
#define RUMP_EINPROGRESS 36 /* Operation now in progress */
#define RUMP_EALREADY 37 /* Operation already in progress */
#define RUMP_ENOTSOCK 38 /* Socket operation on non-socket */
Index: src/sys/rump/include/rump/rumperr.h
diff -u src/sys/rump/include/rump/rumperr.h:1.2 src/sys/rump/include/rump/rumperr.h:1.3
--- src/sys/rump/include/rump/rumperr.h:1.2 Thu Sep 10 16:16:35 2015
+++ src/sys/rump/include/rump/rumperr.h Thu Sep 10 16:21:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rumperr.h,v 1.2 2015/09/10 16:16:35 pooka Exp $ */
+/* $NetBSD: rumperr.h,v 1.3 2015/09/10 16:21:48 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Thu Sep 10 17:15:11 UTC 2015
Modified Files:
src/usr.bin/make: main.c
Log Message:
Output Entering/Leaving messages for objdir when != srcdir and -w flag
This helps ensure Emacs can find source of error.
Reviewed by: christos
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/usr.bin/make/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.232 src/usr.bin/make/main.c:1.233
--- src/usr.bin/make/main.c:1.232 Thu Mar 26 22:20:42 2015
+++ src/usr.bin/make/main.c Thu Sep 10 17:15:11 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.232 2015/03/26 22:20:42 sjg Exp $ */
+/* $NetBSD: main.c,v 1.233 2015/09/10 17:15:11 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.232 2015/03/26 22:20:42 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.233 2015/09/10 17:15:11 sjg Exp $";
#else
#include
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.232 2015/03/26 22:20:42 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.233 2015/09/10 17:15:11 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -168,6 +168,7 @@ Boolean keepgoing; /* -k flag */
Boolean queryFlag; /* -q flag */
Boolean touchFlag; /* -t flag */
Boolean enterFlag; /* -w flag */
+Boolean enterFlagObj; /* -w and objdir != srcdir */
Boolean ignoreErrors; /* -i flag */
Boolean beSilent; /* -s flag */
Boolean oldVars; /* variable substitution style */
@@ -710,6 +711,8 @@ Main_SetObjdir(const char *path)
setenv("PWD", objdir, 1);
Dir_InitDot();
rc = TRUE;
+ if (enterFlag && strcmp(objdir, curdir) != 0)
+enterFlagObj = TRUE;
}
}
@@ -1231,6 +1234,9 @@ main(int argc, char **argv)
doing_depend = FALSE;
}
+ if (enterFlagObj)
+ printf("%s: Entering directory `%s'\n", progname, objdir);
+
MakeMode(NULL);
Var_Append("MFLAGS", Var_Value(MAKEFLAGS, VAR_GLOBAL, &p1), VAR_GLOBAL);
@@ -1372,6 +1378,8 @@ main(int argc, char **argv)
Trace_Log(MAKEEND, 0);
+ if (enterFlagObj)
+ printf("%s: Leaving directory `%s'\n", progname, objdir);
if (enterFlag)
printf("%s: Leaving directory `%s'\n", progname, curdir);
CVS commit: src/external/cddl/osnet/sys/kern
Module Name:src Committed By: riz Date: Thu Sep 10 19:56:13 UTC 2015 Modified Files: src/external/cddl/osnet/sys/kern: ddi.c Log Message: include for curlwp. From ozaki-r. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/cddl/osnet/sys/kern/ddi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/kern/ddi.c diff -u src/external/cddl/osnet/sys/kern/ddi.c:1.4 src/external/cddl/osnet/sys/kern/ddi.c:1.5 --- src/external/cddl/osnet/sys/kern/ddi.c:1.4 Tue Dec 14 01:18:34 2010 +++ src/external/cddl/osnet/sys/kern/ddi.c Thu Sep 10 19:56:13 2015 @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include
CVS commit: src/sys/modules/dtrace/lockstat
Module Name:src
Committed By: riz
Date: Thu Sep 10 19:57:48 UTC 2015
Modified Files:
src/sys/modules/dtrace/lockstat: Makefile
Log Message:
Evil hack to ensure dtrace lockstat module builds on arm.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dtrace/lockstat/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/modules/dtrace/lockstat/Makefile
diff -u src/sys/modules/dtrace/lockstat/Makefile:1.1 src/sys/modules/dtrace/lockstat/Makefile:1.2
--- src/sys/modules/dtrace/lockstat/Makefile:1.1 Sun Mar 8 04:15:22 2015
+++ src/sys/modules/dtrace/lockstat/Makefile Thu Sep 10 19:57:48 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/03/08 04:15:22 christos Exp $
+# $NetBSD: Makefile,v 1.2 2015/09/10 19:57:48 riz Exp $
.include "../../Makefile.inc"
@@ -10,5 +10,8 @@ SRCS= lockstat.c
CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/sys
CPPFLAGS+= -I${NETBSDSRCDIR}/external/cddl/osnet/dist/uts/common
CPPFLAGS+= -DKDTRACE_HOOKS
+.if (!empty(MACHINE_ARCH:Mearm*) || !empty(MACHINE_ARCH:Marm*))
+CPPFLAGS+= -D__HAVE_CPU_COUNTER
+.endif
.include
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Fri Sep 11 01:23:37 UTC 2015
Modified Files:
src/sys/kern: kern_exec.c
Log Message:
On non absolute exec pathnames, prepend the working directory if
possible so that we can provide in most situations the absolute
pathname in the AUX vector so that $ORIGIN works. The following
are implementation issues:
1. deep path execs still don't work (can't provide path to the AUX vector)
2. the returned path is not normalized (cosmetic)
To generate a diff of this commit:
cvs rdiff -u -r1.413 -r1.414 src/sys/kern/kern_exec.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/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.413 src/sys/kern/kern_exec.c:1.414
--- src/sys/kern/kern_exec.c:1.413 Fri Jul 31 03:37:17 2015
+++ src/sys/kern/kern_exec.c Thu Sep 10 21:23:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.413 2015/07/31 07:37:17 maxv Exp $ */
+/* $NetBSD: kern_exec.c,v 1.414 2015/09/11 01:23:37 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.413 2015/07/31 07:37:17 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.414 2015/09/11 01:23:37 christos Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -79,6 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_exec.c,
#include
#include
#include
+#include
#include
#include
#include
@@ -592,6 +593,51 @@ exec_autoload(void)
#endif
}
+static struct pathbuf *
+makepathbuf(struct lwp *l, const char *upath)
+{
+ char *path, *bp;
+ size_t len;
+ int error;
+ struct cwdinfo *cwdi;
+
+ path = PNBUF_GET();
+ error = copyinstr(upath, path, MAXPATHLEN, &len);
+ if (error) {
+ PNBUF_PUT(path);
+ DPRINTF(("%s: copyin path @%p %d\n", __func__, upath, error));
+ return NULL;
+ }
+
+ if (path[0] == '/')
+ goto out;
+
+ len++;
+ if (len + 1 >= MAXPATHLEN)
+ goto out;
+ bp = path + MAXPATHLEN - len;
+ memmove(bp, path, len);
+ *(--bp) = '/';
+
+ cwdi = l->l_proc->p_cwdi;
+ rw_enter(&cwdi->cwdi_lock, RW_READER);
+ error = getcwd_common(cwdi->cwdi_cdir, NULL, &bp, path, MAXPATHLEN / 2,
+ GETCWD_CHECK_ACCESS, l);
+ rw_exit(&cwdi->cwdi_lock);
+
+ if (error) {
+ DPRINTF(("%s: getcwd_common path %s %d\n", __func__, path,
+ error));
+ goto out;
+ }
+ len = path + MAXPATHLEN - bp;
+
+ memmove(path, bp, len);
+ path[len] = '\0';
+out:
+ return pathbuf_assimilate(path);
+}
+
static int
execve_loadvm(struct lwp *l, const char *path, char * const *args,
char * const *envs, execve_fetch_element_t fetch_element,
@@ -651,12 +697,9 @@ execve_loadvm(struct lwp *l, const char
* functions call check_exec() recursively - for example,
* see exec_script_makecmds().
*/
- error = pathbuf_copyin(path, &data->ed_pathbuf);
- if (error) {
- DPRINTF(("%s: pathbuf_copyin path @%p %d\n", __func__,
- path, error));
+ data->ed_pathbuf = makepathbuf(l, path);
+ if (data->ed_pathbuf == NULL)
goto clrflg;
- }
data->ed_pathstring = pathbuf_stringcopy_get(data->ed_pathbuf);
data->ed_resolvedpathbuf = PNBUF_GET();
@@ -880,7 +923,6 @@ pathexec(struct exec_package *epp, struc
(void)memcpy(p->p_comm, commandname, commandlen);
p->p_comm[commandlen] = '\0';
- path = PNBUF_GET();
/*
* If the path starts with /, we don't need to do any work.
@@ -888,30 +930,11 @@ pathexec(struct exec_package *epp, struc
* In the future perhaps we could canonicalize it?
*/
if (pathstring[0] == '/') {
- (void)strlcpy(path, pathstring,
- MAXPATHLEN);
- epp->ep_path = path;
- }
-#ifdef notyet
- /*
- * Although this works most of the time [since the entry was just
- * entered in the cache] we don't use it because it will fail for
- * entries that are not placed in the cache because their name is
- * longer than NCHNAMLEN and it is not the cleanest interface,
- * because there could be races. When the namei cache is re-written,
- * this can be changed to use the appropriate function.
- */
- else if (!(error = vnode_to_path(path, MAXPATHLEN, p->p_textvp, l, p)))
+ path = PNBUF_GET();
+ (void)strlcpy(path, pathstring, MAXPATHLEN);
epp->ep_path = path;
-#endif
- else {
-#ifdef notyet
- printf("Cannot get path for pid %d [%s] (error %d)\n",
- (int)p->p_pid, p->p_comm, error);
-#endif
+ } else
epp->ep_path = NULL;
- PNBUF_PUT(path);
- }
}
/* XXX elsewhere */
CVS commit: src/sys/conf
Module Name:src
Committed By: uebayasi
Date: Fri Sep 11 01:40:52 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Indent.
To generate a diff of this commit:
cvs rdiff -u -r1.245 -r1.246 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.245 src/sys/conf/Makefile.kern.inc:1.246
--- src/sys/conf/Makefile.kern.inc:1.245 Thu Sep 10 13:11:39 2015
+++ src/sys/conf/Makefile.kern.inc Fri Sep 11 01:40:52 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.245 2015/09/10 13:11:39 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.246 2015/09/11 01:40:52 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -250,7 +250,7 @@ TARGETSFX= .gdb
LINKFLAGS+= ${LINKFLAGS_NORMAL}
.endif
-SYSTEM_LD_HEAD+=${SYSTEM_LD_HEAD_EXTRA}
+SYSTEM_LD_HEAD+= ${SYSTEM_LD_HEAD_EXTRA}
SYSTEM_LD_TAIL_STAGE1= ${SYSTEM_LD_TAIL}
SYSTEM_LD_TAIL_STAGE2= ${SYSTEM_LD_TAIL}
.if defined(COPY_SYMTAB)
CVS commit: othersrc/external/bsd/arfe
Module Name:othersrc
Committed By: dyoung
Date: Fri Sep 11 01:50:43 UTC 2015
Modified Files:
othersrc/external/bsd/arfe: Makefile
othersrc/external/bsd/arfe/dt: Makefile README dt.c dt.h hex.c hex.h
ipv4.c ipv4.h testit
othersrc/external/bsd/arfe/dt/rr: if-re0-if-wm0 if-wm0-if-re0
ifconfig.0-ifconfig.1 ifconfig.0-logger-ifconfig.0
ifconfig.1-ifconfig.0 logger-ifconfig.0-ifconfig.0 wm0-a-wm0-b
wm0-b-wm0-a
othersrc/external/bsd/arfe/it: Makefile README
Added Files:
othersrc/external/bsd/arfe/dt: macaddr.c macaddr.h
othersrc/external/bsd/arfe/tt: .cvsignore Makefile README testit.sh
Log Message:
Add a new tool, tt, that transforms its input based on the transform
exemplified by a match/transform-template pair.
Add a data detector for MAC addresses. Update expected test outputs.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/arfe/Makefile
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/arfe/dt/Makefile
cvs rdiff -u -r1.5 -r1.6 othersrc/external/bsd/arfe/dt/README
cvs rdiff -u -r1.9 -r1.10 othersrc/external/bsd/arfe/dt/dt.c
cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/arfe/dt/dt.h \
othersrc/external/bsd/arfe/dt/hex.c othersrc/external/bsd/arfe/dt/hex.h \
othersrc/external/bsd/arfe/dt/ipv4.c othersrc/external/bsd/arfe/dt/ipv4.h
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/dt/macaddr.c \
othersrc/external/bsd/arfe/dt/macaddr.h
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/arfe/dt/testit
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/arfe/dt/rr/if-re0-if-wm0 \
othersrc/external/bsd/arfe/dt/rr/if-wm0-if-re0
cvs rdiff -u -r1.4 -r1.5 \
othersrc/external/bsd/arfe/dt/rr/ifconfig.0-ifconfig.1 \
othersrc/external/bsd/arfe/dt/rr/ifconfig.0-logger-ifconfig.0 \
othersrc/external/bsd/arfe/dt/rr/ifconfig.1-ifconfig.0 \
othersrc/external/bsd/arfe/dt/rr/logger-ifconfig.0-ifconfig.0 \
othersrc/external/bsd/arfe/dt/rr/wm0-a-wm0-b \
othersrc/external/bsd/arfe/dt/rr/wm0-b-wm0-a
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/arfe/it/Makefile
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/arfe/it/README
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/tt/.cvsignore \
othersrc/external/bsd/arfe/tt/Makefile \
othersrc/external/bsd/arfe/tt/README \
othersrc/external/bsd/arfe/tt/testit.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/arfe/Makefile
diff -u othersrc/external/bsd/arfe/Makefile:1.1 othersrc/external/bsd/arfe/Makefile:1.2
--- othersrc/external/bsd/arfe/Makefile:1.1 Mon Aug 10 21:10:59 2015
+++ othersrc/external/bsd/arfe/Makefile Fri Sep 11 01:50:42 2015
@@ -1,5 +1,5 @@
.include
-SUBDIR=dt it
+SUBDIR=dt it tt
.include
Index: othersrc/external/bsd/arfe/dt/Makefile
diff -u othersrc/external/bsd/arfe/dt/Makefile:1.3 othersrc/external/bsd/arfe/dt/Makefile:1.4
--- othersrc/external/bsd/arfe/dt/Makefile:1.3 Wed Sep 2 22:43:17 2015
+++ othersrc/external/bsd/arfe/dt/Makefile Fri Sep 11 01:50:42 2015
@@ -1,9 +1,9 @@
-# $ARFE: Makefile 231 2015-09-02 22:31:30Z dyoung $
+# $ARFE: Makefile 239 2015-09-10 22:49:40Z dyoung $
NOMAN=
.include
PROG=dt
-SRCS+=dt.c hex.c ipv4.c
+SRCS+=dt.c hex.c ipv4.c macaddr.c
#CPPFLAGS+=-DHB_DEBUG
CPPFLAGS+=-DHB_ASSERT
DBG+=-g -O3
Index: othersrc/external/bsd/arfe/dt/README
diff -u othersrc/external/bsd/arfe/dt/README:1.5 othersrc/external/bsd/arfe/dt/README:1.6
--- othersrc/external/bsd/arfe/dt/README:1.5 Wed Sep 2 22:45:47 2015
+++ othersrc/external/bsd/arfe/dt/README Fri Sep 11 01:50:42 2015
@@ -1,5 +1,5 @@
-$ARFE: README 235 2015-09-02 22:44:54Z dyoung $
-$NetBSD: README,v 1.5 2015/09/02 22:45:47 dyoung Exp $
+$ARFE: README 236 2015-09-02 22:47:33Z dyoung $
+$NetBSD: README,v 1.6 2015/09/11 01:50:42 dyoung Exp $
DT---(d)ifferentiate (t)ext---finds a longest common subsequence (LCS)
of two texts where the numbers and IPv4 addresses are "wild": a span
Index: othersrc/external/bsd/arfe/dt/dt.c
diff -u othersrc/external/bsd/arfe/dt/dt.c:1.9 othersrc/external/bsd/arfe/dt/dt.c:1.10
--- othersrc/external/bsd/arfe/dt/dt.c:1.9 Wed Sep 2 22:45:47 2015
+++ othersrc/external/bsd/arfe/dt/dt.c Fri Sep 11 01:50:42 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: dt.c,v 1.9 2015/09/02 22:45:47 dyoung Exp $ */
-/* $ARFE: dt.c 235 2015-09-02 22:44:54Z dyoung $ */
+/* $NetBSD: dt.c,v 1.10 2015/09/11 01:50:42 dyoung Exp $ */
+/* $ARFE: dt.c 239 2015-09-10 22:49:40Z dyoung $ */
/*-
* Copyright (c) 2014,2015 David Young
@@ -51,6 +51,7 @@
#include "dt.h"
#include "hex.h"
#include "ipv4.h"
+#include "macaddr.h"
#if defined(HB_ASSERT)
#define dbg_assert assert
@@ -63,19 +64,6 @@ typedef struct origin {
int j;
} origin_t;
-typedef struct chainelt {
- TAILQ_ENTRY(chainelt) ce_link;
- int ce_column; /* 0: no column alignment,
- * -x: starts at column x (1 = first column)
- *
CVS commit: othersrc/external/bsd/arfe/tt/tests
Module Name:othersrc Committed By: dyoung Date: Fri Sep 11 01:52:20 UTC 2015 Added Files: othersrc/external/bsd/arfe/tt/tests/1: expected-output input match transform othersrc/external/bsd/arfe/tt/tests/2: expected-output input match transform othersrc/external/bsd/arfe/tt/tests/3: expected-output input match transform Log Message: Straggler from last: add tt tests. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/tt/tests/1/expected-output \ othersrc/external/bsd/arfe/tt/tests/1/input \ othersrc/external/bsd/arfe/tt/tests/1/match \ othersrc/external/bsd/arfe/tt/tests/1/transform cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/tt/tests/2/expected-output \ othersrc/external/bsd/arfe/tt/tests/2/input \ othersrc/external/bsd/arfe/tt/tests/2/match \ othersrc/external/bsd/arfe/tt/tests/2/transform cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/arfe/tt/tests/3/expected-output \ othersrc/external/bsd/arfe/tt/tests/3/input \ othersrc/external/bsd/arfe/tt/tests/3/match \ othersrc/external/bsd/arfe/tt/tests/3/transform Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: othersrc/external/bsd/arfe/tt/tests/1/expected-output diff -u /dev/null othersrc/external/bsd/arfe/tt/tests/1/expected-output:1.1 --- /dev/null Fri Sep 11 01:52:20 2015 +++ othersrc/external/bsd/arfe/tt/tests/1/expected-output Fri Sep 11 01:52:20 2015 @@ -0,0 +1,3 @@ +wm0 + 455275962 input bytes in 746652 packets (74393 multicast) + 121514350 output bytes in 541402 packets (254 multicast) Index: othersrc/external/bsd/arfe/tt/tests/1/input diff -u /dev/null othersrc/external/bsd/arfe/tt/tests/1/input:1.1 --- /dev/null Fri Sep 11 01:52:20 2015 +++ othersrc/external/bsd/arfe/tt/tests/1/input Fri Sep 11 01:52:20 2015 @@ -0,0 +1,10 @@ +wm0: flags=8843 mtu 1500 + capabilities=2bf80 + enabled=2bf80 + address: 00:0a:0b:cd:01:ef + media: Ethernet autoselect (1000baseT full-duplex) + status: active + input: 746652 packets, 455275962 bytes, 74393 multicasts + output: 541402 packets, 121514350 bytes, 254 multicasts + inet 10.0.1.17 netmask 0xff00 broadcast 10.0.1.255 + inet6 fe80::20a:bff:fecd:1ef%wm0 prefixlen 64 scopeid 0x1 Index: othersrc/external/bsd/arfe/tt/tests/1/match diff -u /dev/null othersrc/external/bsd/arfe/tt/tests/1/match:1.1 --- /dev/null Fri Sep 11 01:52:20 2015 +++ othersrc/external/bsd/arfe/tt/tests/1/match Fri Sep 11 01:52:20 2015 @@ -0,0 +1,9 @@ +wm0: flags=8843 mtu 1500 + capabilities=2bf80 + enabled=2bf80 + address: 00:0a:0b:cd:01:ef + media: Ethernet autoselect (1000baseT full-duplex) + status: active + input: 745177 packets, 455120099 bytes, 74377 multicasts + output: 540500 packets, 121290742 bytes, 253 multicasts + inet 10.0.1.17 netmask 0xff00 broadcast 10.0.1.255 Index: othersrc/external/bsd/arfe/tt/tests/1/transform diff -u /dev/null othersrc/external/bsd/arfe/tt/tests/1/transform:1.1 --- /dev/null Fri Sep 11 01:52:20 2015 +++ othersrc/external/bsd/arfe/tt/tests/1/transform Fri Sep 11 01:52:20 2015 @@ -0,0 +1,3 @@ +wm0 + 455120099 input bytes in 745177 packets (74377 multicast) + 121290742 output bytes in 540500 packets (253 multicast) Index: othersrc/external/bsd/arfe/tt/tests/2/expected-output diff -u /dev/null othersrc/external/bsd/arfe/tt/tests/2/expected-output:1.1 --- /dev/null Fri Sep 11 01:52:20 2015 +++ othersrc/external/bsd/arfe/tt/tests/2/expected-output Fri Sep 11 01:52:20 2015 @@ -0,0 +1,4 @@ +wm0 mtu 1500 + link 00:0a:0b:cd:01:ef + inet 10.0.1.17 netmask 0xff00 broadcast 10.0.1.255 + inet6 fe80::20a:bff:fecd:1ef%wm0 / 64 scopeid 0x1 Index: othersrc/external/bsd/arfe/tt/tests/2/input diff -u /dev/null othersrc/external/bsd/arfe/tt/tests/2/input:1.1 --- /dev/null Fri Sep 11 01:52:20 2015 +++ othersrc/external/bsd/arfe/tt/tests/2/input Fri Sep 11 01:52:20 2015 @@ -0,0 +1,10 @@ +wm0: flags=8843 mtu 1500 + capabilities=2bf80 + enabled=2bf80 + address: 00:0a:0b:cd:01:ef + media: Ethernet autoselect (1000baseT full-duplex) + status: active + input: 746652 packets, 455275962 bytes, 74393 multicasts + output: 541402 packets, 121514350 bytes, 254 multicasts + inet 10.0.1.17 netmask 0xff00 broadcast 10.0.1.255 + inet6 fe80::20a:bff:fecd:1ef%wm0 prefixlen 64 scopeid 0x1 Index: othersrc/external/bsd/arfe/tt/tests/2/match diff -u /dev/null othersrc/external/bsd/arfe/tt/tests/2/match:1.1 --- /dev/null Fri Sep 11 01:52:20 2015 +++ othersrc/external/bsd/arfe/tt/tests/2/match Fri Sep 11 01:52:20 2015 @@ -0,0 +1,10 @@ +wm0: flags=8843 mtu 1492 + capabilities=2bf80 + enabled=2bf80 + address: aa:ab:ac:ad:ae:af + media: Ethernet autoselect (1000baseT full-duplex) + status: active + input: 745177 packets, 455120099 bytes, 74377 multicasts + output: 540500 packets, 121290742 bytes, 253 multicasts + inet 0.0.0.0 netmask 0x broadcast 255.255.255.255 + inet6 fe80::10f:20f:30f1:40f%wm0 prefix
CVS commit: othersrc/external/bsd/arfe/tt
Module Name:othersrc Committed By: dyoung Date: Fri Sep 11 01:53:49 UTC 2015 Modified Files: othersrc/external/bsd/arfe/tt: .cvsignore Log Message: In .cvsignore, s/it/tt/ and add a directory that I do not intend to commit. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/arfe/tt/.cvsignore Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/arfe/tt/.cvsignore diff -u othersrc/external/bsd/arfe/tt/.cvsignore:1.1 othersrc/external/bsd/arfe/tt/.cvsignore:1.2 --- othersrc/external/bsd/arfe/tt/.cvsignore:1.1 Fri Sep 11 01:50:43 2015 +++ othersrc/external/bsd/arfe/tt/.cvsignore Fri Sep 11 01:53:49 2015 @@ -1,3 +1,5 @@ *.d .depend -it +.gdbinit +anonymize +tt
CVS commit: othersrc/external/bsd/arfe
Module Name:othersrc Committed By: dyoung Date: Fri Sep 11 02:12:57 UTC 2015 Modified Files: othersrc/external/bsd/arfe/dt: README dt.c dt.h hex.c hex.h ipv4.c ipv4.h othersrc/external/bsd/arfe/it: README othersrc/external/bsd/arfe/tt: README testit.sh Log Message: CVS/ is not a test directory, don't try to run a test there. Update $ARFE$. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 othersrc/external/bsd/arfe/dt/README cvs rdiff -u -r1.10 -r1.11 othersrc/external/bsd/arfe/dt/dt.c cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/arfe/dt/dt.h \ othersrc/external/bsd/arfe/dt/hex.c othersrc/external/bsd/arfe/dt/hex.h \ othersrc/external/bsd/arfe/dt/ipv4.c othersrc/external/bsd/arfe/dt/ipv4.h cvs rdiff -u -r1.4 -r1.5 othersrc/external/bsd/arfe/it/README cvs rdiff -u -r1.1 -r1.2 othersrc/external/bsd/arfe/tt/README \ othersrc/external/bsd/arfe/tt/testit.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/arfe/dt/README diff -u othersrc/external/bsd/arfe/dt/README:1.6 othersrc/external/bsd/arfe/dt/README:1.7 --- othersrc/external/bsd/arfe/dt/README:1.6 Fri Sep 11 01:50:42 2015 +++ othersrc/external/bsd/arfe/dt/README Fri Sep 11 02:12:57 2015 @@ -1,5 +1,5 @@ -$ARFE: README 236 2015-09-02 22:47:33Z dyoung $ -$NetBSD: README,v 1.6 2015/09/11 01:50:42 dyoung Exp $ +$ARFE: README 243 2015-09-11 01:57:04Z dyoung $ +$NetBSD: README,v 1.7 2015/09/11 02:12:57 dyoung Exp $ DT---(d)ifferentiate (t)ext---finds a longest common subsequence (LCS) of two texts where the numbers and IPv4 addresses are "wild": a span Index: othersrc/external/bsd/arfe/dt/dt.c diff -u othersrc/external/bsd/arfe/dt/dt.c:1.10 othersrc/external/bsd/arfe/dt/dt.c:1.11 --- othersrc/external/bsd/arfe/dt/dt.c:1.10 Fri Sep 11 01:50:42 2015 +++ othersrc/external/bsd/arfe/dt/dt.c Fri Sep 11 02:12:57 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: dt.c,v 1.10 2015/09/11 01:50:42 dyoung Exp $ */ -/* $ARFE: dt.c 239 2015-09-10 22:49:40Z dyoung $ */ +/* $NetBSD: dt.c,v 1.11 2015/09/11 02:12:57 dyoung Exp $ */ +/* $ARFE: dt.c 243 2015-09-11 01:57:04Z dyoung $ */ /*- * Copyright (c) 2014,2015 David Young Index: othersrc/external/bsd/arfe/dt/dt.h diff -u othersrc/external/bsd/arfe/dt/dt.h:1.2 othersrc/external/bsd/arfe/dt/dt.h:1.3 --- othersrc/external/bsd/arfe/dt/dt.h:1.2 Fri Sep 11 01:50:42 2015 +++ othersrc/external/bsd/arfe/dt/dt.h Fri Sep 11 02:12:57 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: dt.h,v 1.2 2015/09/11 01:50:42 dyoung Exp $ */ -/* $ARFE: dt.h 237 2015-09-02 22:48:04Z dyoung $ */ +/* $NetBSD: dt.h,v 1.3 2015/09/11 02:12:57 dyoung Exp $ */ +/* $ARFE: dt.h 243 2015-09-11 01:57:04Z dyoung $ */ /*- * Copyright (c) 2014,2015 David Young Index: othersrc/external/bsd/arfe/dt/hex.c diff -u othersrc/external/bsd/arfe/dt/hex.c:1.2 othersrc/external/bsd/arfe/dt/hex.c:1.3 --- othersrc/external/bsd/arfe/dt/hex.c:1.2 Fri Sep 11 01:50:42 2015 +++ othersrc/external/bsd/arfe/dt/hex.c Fri Sep 11 02:12:57 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: hex.c,v 1.2 2015/09/11 01:50:42 dyoung Exp $ */ -/* $ARFE: hex.c 236 2015-09-02 22:47:33Z dyoung $ */ +/* $NetBSD: hex.c,v 1.3 2015/09/11 02:12:57 dyoung Exp $ */ +/* $ARFE: hex.c 243 2015-09-11 01:57:04Z dyoung $ */ /*- * Copyright (c) 2014,2015 David Young Index: othersrc/external/bsd/arfe/dt/hex.h diff -u othersrc/external/bsd/arfe/dt/hex.h:1.2 othersrc/external/bsd/arfe/dt/hex.h:1.3 --- othersrc/external/bsd/arfe/dt/hex.h:1.2 Fri Sep 11 01:50:42 2015 +++ othersrc/external/bsd/arfe/dt/hex.h Fri Sep 11 02:12:57 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: hex.h,v 1.2 2015/09/11 01:50:42 dyoung Exp $ */ -/* $ARFE: hex.h 236 2015-09-02 22:47:33Z dyoung $ */ +/* $NetBSD: hex.h,v 1.3 2015/09/11 02:12:57 dyoung Exp $ */ +/* $ARFE: hex.h 243 2015-09-11 01:57:04Z dyoung $ */ /*- * Copyright (c) 2014,2015 David Young Index: othersrc/external/bsd/arfe/dt/ipv4.c diff -u othersrc/external/bsd/arfe/dt/ipv4.c:1.2 othersrc/external/bsd/arfe/dt/ipv4.c:1.3 --- othersrc/external/bsd/arfe/dt/ipv4.c:1.2 Fri Sep 11 01:50:42 2015 +++ othersrc/external/bsd/arfe/dt/ipv4.c Fri Sep 11 02:12:57 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: ipv4.c,v 1.2 2015/09/11 01:50:42 dyoung Exp $ */ -/* $ARFE: ipv4.c 238 2015-09-10 20:16:07Z dyoung $ */ +/* $NetBSD: ipv4.c,v 1.3 2015/09/11 02:12:57 dyoung Exp $ */ +/* $ARFE: ipv4.c 243 2015-09-11 01:57:04Z dyoung $ */ /*- * Copyright (c) 2014,2015 David Young Index: othersrc/external/bsd/arfe/dt/ipv4.h diff -u othersrc/external/bsd/arfe/dt/ipv4.h:1.2 othersrc/external/bsd/arfe/dt/ipv4.h:1.3 --- othersrc/external/bsd/arfe/dt/ipv4.h:1.2 Fri Sep 11 01:50:42 2015 +++ othersrc/external/bsd/arfe/dt/ipv4.h Fri Sep 11 02:12:57 2015 @@ -1,5 +1,5 @@ -/* $NetBSD: ipv4.h,v 1.2 2015/09/11 01:50:42 dyoung Exp $ */ -/* $ARFE: ipv4.h 236 2015-09-02 22:47:33Z dyoung $ */ +/* $NetBSD: ipv4.h,v 1.3 2015/09/11 02:12:57 dyoung Exp $ */ +/* $ARFE: ipv4.h 243 201
CVS commit: src/usr.bin/config
Module Name:src Committed By: uebayasi Date: Fri Sep 11 02:26:22 UTC 2015 Modified Files: src/usr.bin/config: TODO Log Message: Libraries should be built in sub-make. libkern is polluting .PATH too much. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/usr.bin/config/TODO 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/config/TODO diff -u src/usr.bin/config/TODO:1.29 src/usr.bin/config/TODO:1.30 --- src/usr.bin/config/TODO:1.29 Tue Sep 8 05:48:07 2015 +++ src/usr.bin/config/TODO Fri Sep 11 02:26:22 2015 @@ -437,6 +437,9 @@ o Support library. Provide a consistent way to build library either as .o or .a. + Build libraries in sub-make. Don't include library makefiles. Don't + pollute search path (.PATH). libkern does too much. + o Accept `.a' suffix. Make "file" command accept `.a' suffix. Handle it the same way as `.o'.
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Fri Sep 11 06:51:44 UTC 2015
Modified Files:
src/sys/arch/mips/atheros/dev: ehci_arbus.c
src/sys/arch/powerpc/booke/dev: pq3ehci.c
src/sys/dev/usb: ehci.c ehcireg.h
Log Message:
Fix up USBMODE registers in sc_vendor_init functions and not in the ehci
driver.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/atheros/dev/ehci_arbus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/dev/pq3ehci.c
cvs rdiff -u -r1.244 -r1.245 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/usb/ehcireg.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/mips/atheros/dev/ehci_arbus.c
diff -u src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.2 src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.3
--- src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.2 Fri Jul 20 02:14:02 2012
+++ src/sys/arch/mips/atheros/dev/ehci_arbus.c Fri Sep 11 06:51:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_arbus.c,v 1.2 2012/07/20 02:14:02 matt Exp $ */
+/* $NetBSD: ehci_arbus.c,v 1.3 2015/09/11 06:51:43 skrll Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.2 2012/07/20 02:14:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.3 2015/09/11 06:51:43 skrll Exp $");
#include "locators.h"
@@ -50,12 +50,24 @@ __KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c
#include
#include
+/*
+ * This is relative to the start of the unreserved registers in USB contoller
+ * block and not the full USB block which would be 0x1a8.
+ */
+#define ARBUS_USBMODE 0xa8 /* USB mode */
+#define USBMODE_CM __BITS(0,1) /* Controller Mode */
+#define USBMODE_CM_IDLE __SHIFTIN(0,USBMODE_CM) /* Idle (both) */
+#define USBMODE_CM_DEVICE __SHIFTIN(2,USBMODE_CM) /* Device Controller */
+#define USBMODE_CM_HOST __SHIFTIN(3,USBMODE_CM) /* Host Controller */
+
static int ehci_arbus_match(device_t, cfdata_t, void *);
static void ehci_arbus_attach(device_t, device_t, void *);
CFATTACH_DECL_NEW(ehci_arbus, sizeof (ehci_softc_t),
ehci_arbus_match, ehci_arbus_attach, NULL, NULL);
+static void ehci_arbus_init(struct ehci_soft *);
+
int
ehci_arbus_match(device_t parent, cfdata_t cf, void *aux)
{
@@ -85,6 +97,7 @@ ehci_arbus_attach(device_t parent, devic
sc->sc_bus.dmatag = aa->aa_dmat;
sc->sc_bus.usbrev = USBREV_1_0;
sc->sc_flags |= EHCIF_ETTF;
+ sc->sc_vendor_init = ehci_arbus_init;
error = bus_space_map(aa->aa_bst, aa->aa_addr, aa->aa_size, 0,
&sc->ioh);
@@ -136,3 +149,16 @@ ehci_arbus_attach(device_t parent, devic
sc->sc_child = config_found(self, &sc->sc_bus, usbctlprint);
}
+static void
+ehci_arbus_init(struct ehci_softc *sc)
+{
+ /* Set host mode */
+ uint32_t old = bus_space_read_4(sc->iot, sc->ioh, ARBUS_USBMODE);
+ uint32_t reg = old;
+
+ reg &= ~USBMODE_CM;
+ reg |= USBMODE_CM_HOST;
+ if (reg != old)
+ bus_space_write_4(sc->iot, sc->ioh, ARBUS_USBMODE, reg);
+
+}
Index: src/sys/arch/powerpc/booke/dev/pq3ehci.c
diff -u src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.5 src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.6
--- src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.5 Fri Jul 20 02:14:01 2012
+++ src/sys/arch/powerpc/booke/dev/pq3ehci.c Fri Sep 11 06:51:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $ */
+/* $NetBSD: pq3ehci.c,v 1.6 2015/09/11 06:51:43 skrll Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.5 2012/07/20 02:14:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.6 2015/09/11 06:51:43 skrll Exp $");
#include "opt_usb.h"
@@ -54,6 +54,16 @@ __KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v
#include
#include
+/*
+ * This is relative to the start of the unreserved registers in USB contoller
+ * block and not the full USB block which would be 0x1a8.
+ */
+#define PQ3_USBMODE 0xa8 /* USB mode */
+#define USBMODE_CM __BITS(0,1) /* Controller Mode */
+#define USBMODE_CM_IDLE __SHIFTIN(0,USBMODE_CM) /* Idle (both) */
+#define USBMODE_CM_DEVICE __SHIFTIN(2,USBMODE_CM) /* Device Controller */
+#define USBMODE_CM_HOST __SHIFTIN(3,USBMODE_CM) /* Host Controller */
+
#ifdef EHCI_DEBUG
#define DPRINTF(x) if (ehcidebug) printf x
extern int ehcidebug;
@@ -69,6 +79,8 @@ struct pq3ehci_softc {
void *sc_ih; /* interrupt vectoring */
};
+static void pq3ehci_init(struct ehci_softc *);
+
CFATTACH_DECL_NEW(pq3ehci, sizeof(struct pq3ehci_softc),
pq3ehci_match, pq3ehci_attach, NULL, NULL);
@@ -99,6 +111,7 @@ pq3ehci_attach(device_t parent, device_t
sc->sc.sc_bus.usbrev = USBREV_2_0;
sc->sc.sc_ncomp = 0;
sc->sc.sc_flags |= EHCIF_ETTF;
+ sc->sc.sc_vendor_init = pq3ehci_init;
aprint_naive(": USB controller\n");
aprint_normal(": USB controller\n")
CVS commit: src/sys/arch/mips/atheros/dev
Module Name:src Committed By: skrll Date: Fri Sep 11 06:55:45 UTC 2015 Modified Files: src/sys/arch/mips/atheros/dev: ehci_arbus.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/atheros/dev/ehci_arbus.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/mips/atheros/dev/ehci_arbus.c diff -u src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.3 src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.4 --- src/sys/arch/mips/atheros/dev/ehci_arbus.c:1.3 Fri Sep 11 06:51:43 2015 +++ src/sys/arch/mips/atheros/dev/ehci_arbus.c Fri Sep 11 06:55:45 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci_arbus.c,v 1.3 2015/09/11 06:51:43 skrll Exp $ */ +/* $NetBSD: ehci_arbus.c,v 1.4 2015/09/11 06:55:45 skrll Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.3 2015/09/11 06:51:43 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c,v 1.4 2015/09/11 06:55:45 skrll Exp $"); #include "locators.h" @@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ehci_arbus.c #include #include -#include +#include #include #include #include
CVS commit: src/sys/arch/powerpc/booke/dev
Module Name:src Committed By: skrll Date: Fri Sep 11 06:55:56 UTC 2015 Modified Files: src/sys/arch/powerpc/booke/dev: pq3ehci.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/booke/dev/pq3ehci.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/powerpc/booke/dev/pq3ehci.c diff -u src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.6 src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.7 --- src/sys/arch/powerpc/booke/dev/pq3ehci.c:1.6 Fri Sep 11 06:51:43 2015 +++ src/sys/arch/powerpc/booke/dev/pq3ehci.c Fri Sep 11 06:55:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: pq3ehci.c,v 1.6 2015/09/11 06:51:43 skrll Exp $ */ +/* $NetBSD: pq3ehci.c,v 1.7 2015/09/11 06:55:56 skrll Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,7 +29,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.6 2015/09/11 06:51:43 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pq3ehci.c,v 1.7 2015/09/11 06:55:56 skrll Exp $"); #include "opt_usb.h" @@ -130,7 +130,7 @@ pq3ehci_attach(device_t parent, device_t * We need to tell the USB interface to snoop all off RAM starting * at 0. Since it can do it by powers of 2, get the highest RAM * address and roughly round it to the next power of 2 and find - * the number of leading zero bits. + * the number of leading zero bits. */ cpu_write_4(cnl->cnl_addr + USB_SNOOP1, SNOOP_2GB - __builtin_clz(curcpu()->ci_softc->cpu_highmem * 2 - 1));
