CVS commit: othersrc/external/bsd/delta

[Alistair G. Crooks]

Module Name:othersrc
Committed By:   agc
Date:   Thu Apr 28 05:21:31 UTC 2016

Added Files:
othersrc/external/bsd/delta: Makefile README
othersrc/external/bsd/delta/bin: 1 2 3 4 Makefile
othersrc/external/bsd/delta/dist: Makefile delta.1 delta.c delta.h
libdelta.3 libdelta.c main.c
othersrc/external/bsd/delta/lib: Makefile shlib_version

Log Message:
Add the delta library and utility program, providing
space-efficient binary diff/patch functionality.

delta is a library (and an associated utility) which allow
us to perform binary diff and patching in an efficient way. It
is similar in function to xdelta and vcdiff (RFC 3284), but more
(space-)efficient.

-rw-r--r--  1 agc  users  10107 Apr 14 10:41 1
-rw-r--r--  1 agc  users206 Apr 19 16:50 1.bsd
-rw-r--r--  1 agc  users109 Apr 27 22:11 1.diff
-rw-r--r--  1 agc  users222 Apr 19 16:48 1.xd
-rw-r--r--  1 agc  users158 Apr 19 17:48 1.xd3
-rw-r--r--  1 agc  users  10113 Apr 14 10:41 2
-rw-r--r--  1 agc  users  10113 Apr 27 22:11 2.new

The delta(1) utility takes 3 arguments - oldfile, newfile and
patchfile - and creates the patchfile from the binary difference of
the old and new files. There's an optional -d or -p to diff and
to patch, respectively. The default is to patch.

% delta -d 2 1 2.diff
% delta -p 2 1.new 2.diff
% diff 1 1.new
%

The patchfile uses bzip2, and is more efficient than both xdelta (v1
and v3) by Josh MacDonald, and bsdiff from Colin Percival, dated 2005.
It also uses zigzag encoding for the numbers stored internally, in
order to be space-efficient.

I also tried using xz/lzma compression, but the results were not good
- around 160 bytes for a delta file where bzip2 ended up with 109
bytes.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/delta/Makefile \
othersrc/external/bsd/delta/README
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/delta/bin/1 \
othersrc/external/bsd/delta/bin/2 othersrc/external/bsd/delta/bin/3 \
othersrc/external/bsd/delta/bin/4 \
othersrc/external/bsd/delta/bin/Makefile
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/delta/dist/Makefile \
othersrc/external/bsd/delta/dist/delta.1 \
othersrc/external/bsd/delta/dist/delta.c \
othersrc/external/bsd/delta/dist/delta.h \
othersrc/external/bsd/delta/dist/libdelta.3 \
othersrc/external/bsd/delta/dist/libdelta.c \
othersrc/external/bsd/delta/dist/main.c
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/delta/lib/Makefile \
othersrc/external/bsd/delta/lib/shlib_version

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/delta/Makefile
diff -u /dev/null othersrc/external/bsd/delta/Makefile:1.1
--- /dev/null	Thu Apr 28 05:21:31 2016
+++ othersrc/external/bsd/delta/Makefile	Thu Apr 28 05:21:31 2016
@@ -0,0 +1,9 @@
+#	$NetBSD: Makefile,v 1.1 2016/04/28 05:21:31 agc Exp $
+
+SUBDIR=		lib .WAIT
+SUBDIR+=	bin
+
+.include 
+
+t:
+	cd bin && ${MAKE} t
Index: othersrc/external/bsd/delta/README
diff -u /dev/null othersrc/external/bsd/delta/README:1.1
--- /dev/null	Thu Apr 28 05:21:31 2016
+++ othersrc/external/bsd/delta/README	Thu Apr 28 05:21:31 2016
@@ -0,0 +1,31 @@
+delta is a library (and an associated utility) which allow
+us to perform binary diff and patching in an efficient way. It
+is similar in function to xdelta and vcdiff (RFC 3284), but more
+(space-)efficient.
+
+	-rw-r--r--  1 agc  users  10107 Apr 14 10:41 1
+	-rw-r--r--  1 agc  users206 Apr 19 16:50 1.bsd
+	-rw-r--r--  1 agc  users109 Apr 27 22:11 1.diff
+	-rw-r--r--  1 agc  users222 Apr 19 16:48 1.xd
+	-rw-r--r--  1 agc  users158 Apr 19 17:48 1.xd3
+	-rw-r--r--  1 agc  users  10113 Apr 14 10:41 2
+	-rw-r--r--  1 agc  users  10113 Apr 27 22:11 2.new
+
+The delta(1) utility takes 3 arguments - oldfile, newfile and
+patchfile - and creates the patchfile from the binary difference of
+the old and new files. There's an optional -d or -p to diff and
+to patch, respectively. The default is to patch.
+
+	% delta -d 2 1 2.diff
+	% delta -p 2 1.new 2.diff
+	% diff 1 1.new
+	%
+
+The patchfile uses bzip2, and is more efficient than both xdelta (v1
+and v3) by Josh MacDonald, and bsdiff from Colin Percival, dated 2005. 
+It also uses zigzag encoding for the numbers stored internally, in
+order to be space-efficient.
+
+I also tried using xz/lzma compression, but the results were not good
+- around 160 bytes for a delta file where bzip2 ended up with 111
+bytes.

Index: othersrc/external/bsd/delta/bin/1
diff -u /dev/null othersrc/external/bsd/delta/bin/1:1.1
--- /dev/null	Thu Apr 28 05:21:31 2016
+++ othersrc/external/bsd/delta/bin/1	Thu Apr 28 05:21:31 2016
@@ -0,0 +1,404 @@
+/*-
+ * Copyright 2003-2005 Colin Percival
+ * All rights reserved
+ *
+ * Redistribution and use in source and 

CVS commit: othersrc/external/bsd/delta

[Alistair G. Crooks]

Module Name:othersrc
Committed By:   agc
Date:   Thu Apr 28 05:21:31 UTC 2016

Added Files:
othersrc/external/bsd/delta: Makefile README
othersrc/external/bsd/delta/bin: 1 2 3 4 Makefile
othersrc/external/bsd/delta/dist: Makefile delta.1 delta.c delta.h
libdelta.3 libdelta.c main.c
othersrc/external/bsd/delta/lib: Makefile shlib_version

Log Message:
Add the delta library and utility program, providing
space-efficient binary diff/patch functionality.

delta is a library (and an associated utility) which allow
us to perform binary diff and patching in an efficient way. It
is similar in function to xdelta and vcdiff (RFC 3284), but more
(space-)efficient.

-rw-r--r--  1 agc  users  10107 Apr 14 10:41 1
-rw-r--r--  1 agc  users206 Apr 19 16:50 1.bsd
-rw-r--r--  1 agc  users109 Apr 27 22:11 1.diff
-rw-r--r--  1 agc  users222 Apr 19 16:48 1.xd
-rw-r--r--  1 agc  users158 Apr 19 17:48 1.xd3
-rw-r--r--  1 agc  users  10113 Apr 14 10:41 2
-rw-r--r--  1 agc  users  10113 Apr 27 22:11 2.new

The delta(1) utility takes 3 arguments - oldfile, newfile and
patchfile - and creates the patchfile from the binary difference of
the old and new files. There's an optional -d or -p to diff and
to patch, respectively. The default is to patch.

% delta -d 2 1 2.diff
% delta -p 2 1.new 2.diff
% diff 1 1.new
%

The patchfile uses bzip2, and is more efficient than both xdelta (v1
and v3) by Josh MacDonald, and bsdiff from Colin Percival, dated 2005.
It also uses zigzag encoding for the numbers stored internally, in
order to be space-efficient.

I also tried using xz/lzma compression, but the results were not good
- around 160 bytes for a delta file where bzip2 ended up with 109
bytes.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/delta/Makefile \
othersrc/external/bsd/delta/README
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/delta/bin/1 \
othersrc/external/bsd/delta/bin/2 othersrc/external/bsd/delta/bin/3 \
othersrc/external/bsd/delta/bin/4 \
othersrc/external/bsd/delta/bin/Makefile
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/delta/dist/Makefile \
othersrc/external/bsd/delta/dist/delta.1 \
othersrc/external/bsd/delta/dist/delta.c \
othersrc/external/bsd/delta/dist/delta.h \
othersrc/external/bsd/delta/dist/libdelta.3 \
othersrc/external/bsd/delta/dist/libdelta.c \
othersrc/external/bsd/delta/dist/main.c
cvs rdiff -u -r0 -r1.1 othersrc/external/bsd/delta/lib/Makefile \
othersrc/external/bsd/delta/lib/shlib_version

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

re: CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[matthew green]

good move using machdep.booted_file.  one minor nit:

+   /* This call shouldn't fail, but use a default just in case.*/
+   if (sysctlbyname(BOOTFILE, bootfile, , NULL, 0) != 0)

this comment isn't really true.  it can fail for various reasons
including that the machdep code doesn't know or support this
option..


.mrg.

CVS commit: src/tests/net/if

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 28 01:57:45 UTC 2016

Modified Files:
src/tests/net/if: t_ifconf.sh

Log Message:
Don't depend on the order of interfaces

Instead add tests of querying varying number of interfaces
and tests of checking if removing interfaces is reflected.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if/t_ifconf.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/net/if/t_ifconf.sh
diff -u src/tests/net/if/t_ifconf.sh:1.1 src/tests/net/if/t_ifconf.sh:1.2
--- src/tests/net/if/t_ifconf.sh:1.1	Mon Dec  8 04:23:03 2014
+++ src/tests/net/if/t_ifconf.sh	Thu Apr 28 01:57:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ifconf.sh,v 1.1 2014/12/08 04:23:03 ozaki-r Exp $
+# $NetBSD: t_ifconf.sh,v 1.2 2016/04/28 01:57:45 ozaki-r Exp $
 #
 # Copyright (c) 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -66,8 +66,22 @@ basic_body()
 	atf_check -s exit:0 rump.ifconfig shmif0 192.168.0.1/24
 	atf_check -s exit:0 -o match:'^5$' "$ifconf" total
 
-	# Get only first two entries (lo0's)
-	atf_check -s exit:0 -o not-match:'shmif' "$ifconf" list 2
+	# Vary the number of requesting interfaces
+	atf_check -s exit:0 -o match:1 -x "$ifconf list 1 | wc -l"
+	atf_check -s exit:0 -o match:2 -x "$ifconf list 2 | wc -l"
+	atf_check -s exit:0 -o match:3 -x "$ifconf list 3 | wc -l"
+	atf_check -s exit:0 -o match:4 -x "$ifconf list 4 | wc -l"
+	atf_check -s exit:0 -o match:5 -x "$ifconf list 5 | wc -l"
+	atf_check -s exit:0 -o match:5 -x "$ifconf list 6 | wc -l"
+
+	# Check if removing an interface is reflected
+	atf_check -s exit:0 rump.ifconfig shmif0 destroy
+	atf_check -s exit:0 -o match:'^3$' "$ifconf" total
+	atf_check -s exit:0 -o not-match:'shmif0' "$ifconf" list
+	atf_check -s exit:0 -o match:1 -x "$ifconf list 1 | wc -l"
+	atf_check -s exit:0 -o match:2 -x "$ifconf list 2 | wc -l"
+	atf_check -s exit:0 -o match:3 -x "$ifconf list 3 | wc -l"
+	atf_check -s exit:0 -o match:3 -x "$ifconf list 4 | wc -l"
 
 	unset LD_PRELOAD
 	unset RUMP_SERVER

CVS commit: src/tests/net/if

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 28 01:57:45 UTC 2016

Modified Files:
src/tests/net/if: t_ifconf.sh

Log Message:
Don't depend on the order of interfaces

Instead add tests of querying varying number of interfaces
and tests of checking if removing interfaces is reflected.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/if/t_ifconf.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Thu Apr 28 01:37:17 UTC 2016

Modified Files:
src/sys/dev/usb: if_upl.c
src/sys/net: if.c if.h if_bridge.c if_ieee1394subr.c if_loop.c
if_vlan.c
src/sys/netipsec: ipsec_osdep.h

Log Message:
introduce new ifnet MP-scalable sending interface "if_transmit".


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.331 -r1.332 src/sys/net/if.c
cvs rdiff -u -r1.202 -r1.203 src/sys/net/if.h
cvs rdiff -u -r1.120 -r1.121 src/sys/net/if_bridge.c
cvs rdiff -u -r1.54 -r1.55 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.85 -r1.86 src/sys/net/if_loop.c
cvs rdiff -u -r1.86 -r1.87 src/sys/net/if_vlan.c
cvs rdiff -u -r1.24 -r1.25 src/sys/netipsec/ipsec_osdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

[Kengo NAKAHARA]

Module Name:src
Committed By:   knakahara
Date:   Thu Apr 28 01:37:17 UTC 2016

Modified Files:
src/sys/dev/usb: if_upl.c
src/sys/net: if.c if.h if_bridge.c if_ieee1394subr.c if_loop.c
if_vlan.c
src/sys/netipsec: ipsec_osdep.h

Log Message:
introduce new ifnet MP-scalable sending interface "if_transmit".


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.331 -r1.332 src/sys/net/if.c
cvs rdiff -u -r1.202 -r1.203 src/sys/net/if.h
cvs rdiff -u -r1.120 -r1.121 src/sys/net/if_bridge.c
cvs rdiff -u -r1.54 -r1.55 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.85 -r1.86 src/sys/net/if_loop.c
cvs rdiff -u -r1.86 -r1.87 src/sys/net/if_vlan.c
cvs rdiff -u -r1.24 -r1.25 src/sys/netipsec/ipsec_osdep.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.52 src/sys/dev/usb/if_upl.c:1.53
--- src/sys/dev/usb/if_upl.c:1.52	Thu Apr 28 00:16:56 2016
+++ src/sys/dev/usb/if_upl.c	Thu Apr 28 01:37:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_upl.c,v 1.52 2016/04/28 00:16:56 ozaki-r Exp $	*/
+/*	$NetBSD: if_upl.c,v 1.53 2016/04/28 01:37:17 knakahara Exp $	*/
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.52 2016/04/28 00:16:56 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.53 2016/04/28 01:37:17 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -987,7 +987,7 @@ Static int
 upl_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 const struct rtentry *rt0)
 {
-	int s, len, error;
+	int error;
 
 	DPRINTFN(10,("%s: %s: enter\n",
 		 device_xname(((struct upl_softc *)ifp->if_softc)->sc_dev),
@@ -999,24 +999,13 @@ upl_output(struct ifnet *ifp, struct mbu
 	 */
 	IFQ_CLASSIFY(>if_snd, m, dst->sa_family);
 
-	len = m->m_pkthdr.len;
-	s = splnet();
 	/*
 	 * Queue message on interface, and start output if interface
 	 * not yet active.
 	 */
-	IFQ_ENQUEUE(>if_snd, m, error);
-	if (error) {
-		/* mbuf is already freed */
-		splx(s);
-		return error;
-	}
-	ifp->if_obytes += len;
-	if ((ifp->if_flags & IFF_OACTIVE) == 0)
-		(*ifp->if_start)(ifp);
-	splx(s);
+	error = (*ifp->if_transmit)(ifp, m);
 
-	return 0;
+	return error;
 }
 
 Static void

Index: src/sys/net/if.c
diff -u src/sys/net/if.c:1.331 src/sys/net/if.c:1.332
--- src/sys/net/if.c:1.331	Thu Apr 28 00:16:56 2016
+++ src/sys/net/if.c	Thu Apr 28 01:37:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if.c,v 1.331 2016/04/28 00:16:56 ozaki-r Exp $	*/
+/*	$NetBSD: if.c,v 1.332 2016/04/28 01:37:17 knakahara Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.331 2016/04/28 00:16:56 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.332 2016/04/28 01:37:17 knakahara Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -329,6 +329,13 @@ if_nullstart(struct ifnet *ifp)
 }
 
 int
+if_nulltransmit(struct ifnet *ifp, struct mbuf *m)
+{
+
+	return ENXIO;
+}
+
+int
 if_nullioctl(struct ifnet *ifp, u_long cmd, void *data)
 {
 
@@ -665,6 +672,9 @@ if_register(ifnet_t *ifp)
 		if_slowtimo(ifp);
 	}
 
+	if (ifp->if_transmit == NULL || ifp->if_transmit == if_nulltransmit)
+		ifp->if_transmit = if_transmit;
+
 	TAILQ_INSERT_TAIL(_list, ifp, if_list);
 }
 
@@ -959,6 +969,7 @@ if_deactivate(struct ifnet *ifp)
 	ifp->if_output	 = if_nulloutput;
 	ifp->_if_input	 = if_nullinput;
 	ifp->if_start	 = if_nullstart;
+	ifp->if_transmit = if_nulltransmit;
 	ifp->if_ioctl	 = if_nullioctl;
 	ifp->if_init	 = if_nullinit;
 	ifp->if_stop	 = if_nullstop;
@@ -2667,31 +2678,45 @@ ifreq_setaddr(u_long cmd, struct ifreq *
 }
 
 /*
- * Queue message on interface, and start output if interface
- * not yet active.
+ * wrapper function for the drivers which doesn't have if_transmit().
  */
 int
-ifq_enqueue(struct ifnet *ifp, struct mbuf *m)
+if_transmit(struct ifnet *ifp, struct mbuf *m)
 {
-	int len = m->m_pkthdr.len;
-	int mflags = m->m_flags;
-	int s = splnet();
-	int error;
+	int s, error;
+
+	s = splnet();
 
 	IFQ_ENQUEUE(>if_snd, m, error);
-	if (error != 0)
+	if (error != 0) {
+		/* mbuf is already freed */
 		goto out;
-	ifp->if_obytes += len;
-	if (mflags & M_MCAST)
+	}
+
+	ifp->if_obytes += m->m_pkthdr.len;;
+	if (m->m_flags & M_MCAST)
 		ifp->if_omcasts++;
+
 	if ((ifp->if_flags & IFF_OACTIVE) == 0)
 		(*ifp->if_start)(ifp);
 out:
 	splx(s);
+
 	return error;
 }
 
 /*
+ * Queue message on interface, and start output if interface
+ * not yet active.
+ */
+int
+ifq_enqueue(struct ifnet *ifp, struct mbuf *m)
+{
+
+	return (*ifp->if_transmit)(ifp, m);
+}
+
+/*
  * Queue message on interface, possibly using a second fast queue
  */
 int

Index: src/sys/net/if.h
diff -u src/sys/net/if.h:1.202 

CVS commit: src/tests/net/if

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 28 01:20:31 UTC 2016

Modified Files:
src/tests/net/if: t_ifconfig.sh

Log Message:
Don't depend on the order of interfaces

The kernel guarantees nothing about it.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/net/if/t_ifconfig.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/net/if

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 28 01:20:31 UTC 2016

Modified Files:
src/tests/net/if: t_ifconfig.sh

Log Message:
Don't depend on the order of interfaces

The kernel guarantees nothing about it.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/net/if/t_ifconfig.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/net/if/t_ifconfig.sh
diff -u src/tests/net/if/t_ifconfig.sh:1.8 src/tests/net/if/t_ifconfig.sh:1.9
--- src/tests/net/if/t_ifconfig.sh:1.8	Mon Apr  4 07:37:08 2016
+++ src/tests/net/if/t_ifconfig.sh	Thu Apr 28 01:20:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: t_ifconfig.sh,v 1.8 2016/04/04 07:37:08 ozaki-r Exp $
+# $NetBSD: t_ifconfig.sh,v 1.9 2016/04/28 01:20:31 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -160,11 +160,15 @@ options_body()
 
 	# ifconfig -l [-bdsu]
 	#   -l shows only inteface names
-	atf_check -s exit:0 -o match:'lo0 shmif0' rump.ifconfig -l
+	atf_check -s exit:0 -o match:'lo0' rump.ifconfig -l
+	atf_check -s exit:0 -o match:'shmif0' rump.ifconfig -l
 	atf_check -s exit:0 -o match:'shmif0' rump.ifconfig -l -b
+	atf_check -s exit:0 -o not-match:'lo0' rump.ifconfig -l -b
 	atf_check -s exit:0 -o ignore rump.ifconfig -l -d
-	atf_check -s exit:0 -o match:'lo0 shmif0' rump.ifconfig -l -s
-	atf_check -s exit:0 -o match:'lo0 shmif0' rump.ifconfig -l -u
+	atf_check -s exit:0 -o match:'lo0' rump.ifconfig -l -s
+	atf_check -s exit:0 -o match:'shmif0' rump.ifconfig -l -s
+	atf_check -s exit:0 -o match:'lo0' rump.ifconfig -l -u
+	atf_check -s exit:0 -o match:'shmif0' rump.ifconfig -l -u
 
 	# ifconfig -s interface
 	#   -s interface exists with 0 / 1 if connected / disconnected

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 28 00:37:40 UTC 2016

Modified Files:
src/sys/kern: kern_sig.c

Log Message:
Simplify


To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 src/sys/kern/kern_sig.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_sig.c
diff -u src/sys/kern/kern_sig.c:1.326 src/sys/kern/kern_sig.c:1.327
--- src/sys/kern/kern_sig.c:1.326	Wed Apr 27 17:15:40 2016
+++ src/sys/kern/kern_sig.c	Wed Apr 27 20:37:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_sig.c,v 1.326 2016/04/27 21:15:40 christos Exp $	*/
+/*	$NetBSD: kern_sig.c,v 1.327 2016/04/28 00:37:39 christos Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.326 2016/04/27 21:15:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.327 2016/04/28 00:37:39 christos Exp $");
 
 #include "opt_ptrace.h"
 #include "opt_dtrace.h"
@@ -1751,8 +1751,7 @@ issignal(struct lwp *l)
 /* Take the signal. */
 (void)sigget(sp, NULL, signo, NULL);
 p->p_xsig = signo;
-if (p->p_sflag & PS_CONTINUED)
-	p->p_sflag &= ~PS_CONTINUED;
+p->p_sflag &= ~PS_CONTINUED;
 signo = 0;
 sigswitch(true, PS_NOCLDSTOP, p->p_xsig);
 			} else if (prop & SA_IGNORE) {

CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 28 00:37:40 UTC 2016

Modified Files:
src/sys/kern: kern_sig.c

Log Message:
Simplify


To generate a diff of this commit:
cvs rdiff -u -r1.326 -r1.327 src/sys/kern/kern_sig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/dkwedge

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 28 00:35:24 UTC 2016

Modified Files:
src/sys/dev/dkwedge: dkwedge_gpt.c

Log Message:
Fix tyop


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/dkwedge/dkwedge_gpt.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/dkwedge/dkwedge_gpt.c
diff -u src/sys/dev/dkwedge/dkwedge_gpt.c:1.16 src/sys/dev/dkwedge/dkwedge_gpt.c:1.17
--- src/sys/dev/dkwedge/dkwedge_gpt.c:1.16	Wed Apr 27 20:33:54 2016
+++ src/sys/dev/dkwedge/dkwedge_gpt.c	Wed Apr 27 20:35:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkwedge_gpt.c,v 1.16 2016/04/28 00:33:54 christos Exp $	*/
+/*	$NetBSD: dkwedge_gpt.c,v 1.17 2016/04/28 00:35:24 christos Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.16 2016/04/28 00:33:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.17 2016/04/28 00:35:24 christos Exp $");
 
 #include 
 #include 
@@ -267,8 +267,8 @@ dkwedge_discover_gpt(struct disk *pdk, s
 		 */
 		if ((error = dkwedge_add()) == EEXIST &&
 		strcmp(dkw.dkw_wname, ent_guid_str) != 0) {
-			char orig[sizeof(dkw.dkw_name)];
-			strcpy(orig, dkw.dkw_name);
+			char orig[sizeof(dkw.dkw_wname)];
+			strcpy(orig, dkw.dkw_wname);
 			strcpy(dkw.dkw_wname, ent_guid_str);
 			error = dkwedge_add();
 			if (!error)

CVS commit: src/sys/dev/dkwedge

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 28 00:35:24 UTC 2016

Modified Files:
src/sys/dev/dkwedge: dkwedge_gpt.c

Log Message:
Fix tyop


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/dkwedge/dkwedge_gpt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/dkwedge

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 28 00:33:54 UTC 2016

Modified Files:
src/sys/dev/dkwedge: dkwedge_gpt.c

Log Message:
Fix error message.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dkwedge/dkwedge_gpt.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/dkwedge

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 28 00:33:54 UTC 2016

Modified Files:
src/sys/dev/dkwedge: dkwedge_gpt.c

Log Message:
Fix error message.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/dkwedge/dkwedge_gpt.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/dkwedge/dkwedge_gpt.c
diff -u src/sys/dev/dkwedge/dkwedge_gpt.c:1.15 src/sys/dev/dkwedge/dkwedge_gpt.c:1.16
--- src/sys/dev/dkwedge/dkwedge_gpt.c:1.15	Sun Aug 23 14:40:15 2015
+++ src/sys/dev/dkwedge/dkwedge_gpt.c	Wed Apr 27 20:33:54 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkwedge_gpt.c,v 1.15 2015/08/23 18:40:15 jakllsch Exp $	*/
+/*	$NetBSD: dkwedge_gpt.c,v 1.16 2016/04/28 00:33:54 christos Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.15 2015/08/23 18:40:15 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.16 2016/04/28 00:33:54 christos Exp $");
 
 #include 
 #include 
@@ -267,13 +267,14 @@ dkwedge_discover_gpt(struct disk *pdk, s
 		 */
 		if ((error = dkwedge_add()) == EEXIST &&
 		strcmp(dkw.dkw_wname, ent_guid_str) != 0) {
+			char orig[sizeof(dkw.dkw_name)];
+			strcpy(orig, dkw.dkw_name);
 			strcpy(dkw.dkw_wname, ent_guid_str);
 			error = dkwedge_add();
 			if (!error)
 aprint_error("%s: wedge named '%s' already "
 "existed, using '%s'\n", pdk->dk_name,
-dkw.dkw_wname, /* XXX Unicode */
-ent_guid_str);
+orig, ent_guid_str);
 		}
 		if (error == EEXIST)
 			aprint_error("%s: wedge named '%s' already exists, "

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 28 00:16:57 UTC 2016

Modified Files:
src/sys/dev/ic: hd64570.c
src/sys/dev/pci: if_lmc.c if_lmc.h
src/sys/dev/usb: if_upl.c uhso.c
src/sys/dist/pf/net: if_pflog.c if_pfsync.c
src/sys/net: if.c if.h if_atm.h if_atmsubr.c if_bridge.c if_bridgevar.h
if_ethersubr.c if_faith.c if_fddisubr.c if_gif.c if_gif.h if_gre.c
if_hippisubr.c if_ieee1394subr.c if_loop.c if_mpls.c if_ppp.c
if_pppvar.h if_sl.c if_spppsubr.c if_srt.c if_stf.c if_strip.c
if_tokensubr.c if_tun.c route.c route.h
src/sys/netinet: if_atm.c if_atm.h ip_carp.c ip_carp.h ip_output.c
ip_var.h
src/sys/netisdn: i4b_ipr.c

Log Message:
Constify rtentry of if_output

We no longer need to change rtentry below if_output.

The change makes it clear where rtentries are changed (or not)
and helps forthcoming locking (os psrefing) rtentries.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/if_lmc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_lmc.h
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dist/pf/net/if_pflog.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dist/pf/net/if_pfsync.c
cvs rdiff -u -r1.330 -r1.331 src/sys/net/if.c
cvs rdiff -u -r1.201 -r1.202 src/sys/net/if.h
cvs rdiff -u -r1.20 -r1.21 src/sys/net/if_atm.h src/sys/net/if_srt.c
cvs rdiff -u -r1.57 -r1.58 src/sys/net/if_atmsubr.c
cvs rdiff -u -r1.119 -r1.120 src/sys/net/if_bridge.c
cvs rdiff -u -r1.30 -r1.31 src/sys/net/if_bridgevar.h
cvs rdiff -u -r1.221 -r1.222 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.51 -r1.52 src/sys/net/if_faith.c
cvs rdiff -u -r1.98 -r1.99 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.107 -r1.108 src/sys/net/if_gif.c
cvs rdiff -u -r1.21 -r1.22 src/sys/net/if_gif.h src/sys/net/if_mpls.c
cvs rdiff -u -r1.167 -r1.168 src/sys/net/if_gre.c
cvs rdiff -u -r1.46 -r1.47 src/sys/net/if_hippisubr.c
cvs rdiff -u -r1.53 -r1.54 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.84 -r1.85 src/sys/net/if_loop.c
cvs rdiff -u -r1.150 -r1.151 src/sys/net/if_ppp.c
cvs rdiff -u -r1.27 -r1.28 src/sys/net/if_pppvar.h
cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_sl.c
cvs rdiff -u -r1.140 -r1.141 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.87 -r1.88 src/sys/net/if_stf.c
cvs rdiff -u -r1.102 -r1.103 src/sys/net/if_strip.c
cvs rdiff -u -r1.75 -r1.76 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.124 -r1.125 src/sys/net/if_tun.c
cvs rdiff -u -r1.166 -r1.167 src/sys/net/route.c
cvs rdiff -u -r1.100 -r1.101 src/sys/net/route.h
cvs rdiff -u -r1.37 -r1.38 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet/if_atm.h
cvs rdiff -u -r1.63 -r1.64 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/ip_carp.h
cvs rdiff -u -r1.252 -r1.253 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.111 -r1.112 src/sys/netinet/ip_var.h
cvs rdiff -u -r1.37 -r1.38 src/sys/netisdn/i4b_ipr.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/hd64570.c
diff -u src/sys/dev/ic/hd64570.c:1.48 src/sys/dev/ic/hd64570.c:1.49
--- src/sys/dev/ic/hd64570.c:1.48	Wed Apr 20 09:01:03 2016
+++ src/sys/dev/ic/hd64570.c	Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: hd64570.c,v 1.48 2016/04/20 09:01:03 knakahara Exp $	*/
+/*	$NetBSD: hd64570.c,v 1.49 2016/04/28 00:16:56 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 1999 Christian E. Hopps
@@ -65,7 +65,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.48 2016/04/20 09:01:03 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd64570.c,v 1.49 2016/04/28 00:16:56 ozaki-r Exp $");
 
 #include "opt_inet.h"
 
@@ -160,7 +160,7 @@ static	void sca_port_up(sca_port_t *);
 static	void sca_port_down(sca_port_t *);
 
 static	int sca_output(struct ifnet *, struct mbuf *, const struct sockaddr *,
-			struct rtentry *);
+			const struct rtentry *);
 static	int sca_ioctl(struct ifnet *, u_long, void *);
 static	void sca_start(struct ifnet *);
 static	void sca_watchdog(struct ifnet *);
@@ -792,7 +792,7 @@ sca_output(
 struct ifnet *ifp,
 struct mbuf *m,
 const struct sockaddr *dst,
-struct rtentry *rt0)
+const struct rtentry *rt0)
 {
 	struct hdlc_header *hdlc;
 	struct ifqueue *ifq = NULL;

Index: src/sys/dev/pci/if_lmc.c
diff -u src/sys/dev/pci/if_lmc.c:1.58 src/sys/dev/pci/if_lmc.c:1.59
--- src/sys/dev/pci/if_lmc.c:1.58	Wed Apr 20 09:01:03 2016
+++ src/sys/dev/pci/if_lmc.c	Thu Apr 28 00:16:56 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.58 2016/04/20 09:01:03 knakahara Exp $ */
+/* $NetBSD: if_lmc.c,v 1.59 2016/04/28 00:16:56 ozaki-r Exp $ */
 
 /*-
  * Copyright (c) 2002-2006 David Boggs. 
@@ -74,7 +74,7 @@
  */
 
 # include 
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.58 

CVS commit: src/sys

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Thu Apr 28 00:16:57 UTC 2016

Modified Files:
src/sys/dev/ic: hd64570.c
src/sys/dev/pci: if_lmc.c if_lmc.h
src/sys/dev/usb: if_upl.c uhso.c
src/sys/dist/pf/net: if_pflog.c if_pfsync.c
src/sys/net: if.c if.h if_atm.h if_atmsubr.c if_bridge.c if_bridgevar.h
if_ethersubr.c if_faith.c if_fddisubr.c if_gif.c if_gif.h if_gre.c
if_hippisubr.c if_ieee1394subr.c if_loop.c if_mpls.c if_ppp.c
if_pppvar.h if_sl.c if_spppsubr.c if_srt.c if_stf.c if_strip.c
if_tokensubr.c if_tun.c route.c route.h
src/sys/netinet: if_atm.c if_atm.h ip_carp.c ip_carp.h ip_output.c
ip_var.h
src/sys/netisdn: i4b_ipr.c

Log Message:
Constify rtentry of if_output

We no longer need to change rtentry below if_output.

The change makes it clear where rtentries are changed (or not)
and helps forthcoming locking (os psrefing) rtentries.


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/ic/hd64570.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/if_lmc.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/if_lmc.h
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/usb/if_upl.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dist/pf/net/if_pflog.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dist/pf/net/if_pfsync.c
cvs rdiff -u -r1.330 -r1.331 src/sys/net/if.c
cvs rdiff -u -r1.201 -r1.202 src/sys/net/if.h
cvs rdiff -u -r1.20 -r1.21 src/sys/net/if_atm.h src/sys/net/if_srt.c
cvs rdiff -u -r1.57 -r1.58 src/sys/net/if_atmsubr.c
cvs rdiff -u -r1.119 -r1.120 src/sys/net/if_bridge.c
cvs rdiff -u -r1.30 -r1.31 src/sys/net/if_bridgevar.h
cvs rdiff -u -r1.221 -r1.222 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.51 -r1.52 src/sys/net/if_faith.c
cvs rdiff -u -r1.98 -r1.99 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.107 -r1.108 src/sys/net/if_gif.c
cvs rdiff -u -r1.21 -r1.22 src/sys/net/if_gif.h src/sys/net/if_mpls.c
cvs rdiff -u -r1.167 -r1.168 src/sys/net/if_gre.c
cvs rdiff -u -r1.46 -r1.47 src/sys/net/if_hippisubr.c
cvs rdiff -u -r1.53 -r1.54 src/sys/net/if_ieee1394subr.c
cvs rdiff -u -r1.84 -r1.85 src/sys/net/if_loop.c
cvs rdiff -u -r1.150 -r1.151 src/sys/net/if_ppp.c
cvs rdiff -u -r1.27 -r1.28 src/sys/net/if_pppvar.h
cvs rdiff -u -r1.122 -r1.123 src/sys/net/if_sl.c
cvs rdiff -u -r1.140 -r1.141 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.87 -r1.88 src/sys/net/if_stf.c
cvs rdiff -u -r1.102 -r1.103 src/sys/net/if_strip.c
cvs rdiff -u -r1.75 -r1.76 src/sys/net/if_tokensubr.c
cvs rdiff -u -r1.124 -r1.125 src/sys/net/if_tun.c
cvs rdiff -u -r1.166 -r1.167 src/sys/net/route.c
cvs rdiff -u -r1.100 -r1.101 src/sys/net/route.h
cvs rdiff -u -r1.37 -r1.38 src/sys/netinet/if_atm.c
cvs rdiff -u -r1.12 -r1.13 src/sys/netinet/if_atm.h
cvs rdiff -u -r1.63 -r1.64 src/sys/netinet/ip_carp.c
cvs rdiff -u -r1.7 -r1.8 src/sys/netinet/ip_carp.h
cvs rdiff -u -r1.252 -r1.253 src/sys/netinet/ip_output.c
cvs rdiff -u -r1.111 -r1.112 src/sys/netinet/ip_var.h
cvs rdiff -u -r1.37 -r1.38 src/sys/netisdn/i4b_ipr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 28 00:02:40 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_impl.h
dt_module.c dt_open.c

Log Message:
Introduce dt_bootfile() and use it to avoid hard-coded kernel values. Fixes
dtrace hang for kernels not named netbsd.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.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/dist/lib/libdtrace/common/dt_impl.h
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h:1.6 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h:1.7
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h:1.6	Thu Sep 24 10:25:29 2015
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h	Wed Apr 27 20:02:40 2016
@@ -744,6 +744,10 @@ extern int _dtrace_argmax;		/* default m
 extern const char *_dtrace_libdir;	/* default library directory */
 extern const char *_dtrace_moddir;	/* default kernel module directory */
 
+#ifndef illumos
+extern const char *dt_bootfile(char *, size_t);
+#endif
+
 #if defined(__FreeBSD__) || defined(__NetBSD__)
 extern int gmatch(const char *, const char *);
 extern int yylex(void);

Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.12 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.13
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c:1.12	Mon Oct  5 21:18:47 2015
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c	Wed Apr 27 20:02:40 2016
@@ -1180,7 +1180,7 @@ dt_module_update(dtrace_hdl_t *dtp, stru
 
 	if (strcmp("netbsd", name) == 0) {
 		/* want the kernel */
-		strncpy(fname, "/netbsd", sizeof(fname));
+		dt_bootfile(fname, sizeof(fname));
 	} else {
 
 		/* build stand module path from system */

Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.10 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.11
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c:1.10	Wed Feb 24 16:11:34 2016
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c	Wed Apr 27 20:02:40 2016
@@ -1025,6 +1025,37 @@ dt_get_sysinfo(int cmd, char *buf, size_
 }
 #endif
 
+#ifndef illumos
+# ifdef __FreeBSD__
+#  define DEFKERNEL	"kernel"
+#  define BOOTFILE	"kern.bootfile"
+# endif
+# ifdef __NetBSD__
+#  define DEFKERNEL	"netbsd"
+#  define BOOTFILE	"machdep.booted_kernel"
+# endif
+
+const char *
+dt_bootfile(char *bootfile, size_t len)
+{
+	char *p;
+	size_t olen = len;
+
+	/* This call shouldn't fail, but use a default just in case.*/
+	if (sysctlbyname(BOOTFILE, bootfile, , NULL, 0) != 0)
+		strlcpy(bootfile, DEFKERNEL, olen);
+
+	if ((p = strrchr(bootfile, '/')) != NULL)
+		p++;
+	else
+		p = bootfile;
+	return p;
+}
+
+# undef DEFKERNEL
+# undef BOOTFILE
+#endif
+
 static dtrace_hdl_t *
 dt_vopen(int version, int flags, int *errp,
 const dtrace_vector_t *vector, void *arg)
@@ -1309,37 +1340,25 @@ alloc:
 
 	/*
 	 * On FreeBSD the kernel module name can't be hard-coded. The
-	 * 'kern.bootfile' sysctl value tells us exactly which file is being
-	 * used as the kernel.
+	 * 'kern.bootfile' sysctl value tells us exactly which file is
+	 * being used as the kernel.
 	 */
 #ifndef illumos
+# ifdef __FreeBSD__
+#  define THREAD	"struct thread"
+#  define MUTEX		"struct mtx"
+#  define RWLOCK	"struct rwlock"
+# endif
+# ifdef __NetBSD__
+#  define THREAD	"struct lwp"
+#  define MUTEX		"struct kmutex"
+#  define RWLOCK	"struct krwlock"
+# endif
 	{
-	char bootfile[MAXPATHLEN];
-	char *p;
-	size_t len = sizeof(bootfile);
+	const char *p;
+	char kernname[512];
 
-#ifdef __FreeBSD__
-#define DEFKERNEL	"kernel"
-#define BOOTFILE	"kern.bootfile"
-#define THREAD		"struct thread"
-#define MUTEX		"struct mtx"
-#define RWLOCK		"struct rwlock"
-#endif
-#ifdef __NetBSD__
-#define DEFKERNEL	"netbsd"
-#define BOOTFILE	"machdep.booted_kernel"
-#define THREAD		"struct lwp"
-#define MUTEX		"struct kmutex"
-#define RWLOCK		"struct krwlock"
-#endif
-	/* This call shouldn't fail, but use a default just in case. */
-	if (sysctlbyname(BOOTFILE, bootfile, , NULL, 0) != 0)
-		strlcpy(bootfile, DEFKERNEL, sizeof(bootfile));
-
-	if ((p = strrchr(bootfile, '/')) != NULL)
-		p++;
-	else
-		p = bootfile;
+	p = dt_bootfile(kernname, sizeof(kernname));
 
 	/*
 	 * Format the global variables based on the kernel module name.
@@ -1349,8 +1368,11 @@ alloc:
 	snprintf(threadmtx_str, sizeof(threadmtx_str), "%s *(%s`%s *)",
 	THREAD, p, 

CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu Apr 28 00:02:40 UTC 2016

Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_impl.h
dt_module.c dt_open.c

Log Message:
Introduce dt_bootfile() and use it to avoid hard-coded kernel values. Fixes
dtrace hang for kernels not named netbsd.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_impl.h
cvs rdiff -u -r1.12 -r1.13 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_module.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_open.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 21:15:40 UTC 2016

Modified Files:
src/sys/kern: kern_exit.c kern_sig.c
src/sys/sys: proc.h

Log Message:
We need a flag for WCONTINUED so that we can reset it... Fixes bash issue.


To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/sys/kern/kern_exit.c
cvs rdiff -u -r1.325 -r1.326 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.329 -r1.330 src/sys/sys/proc.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/kern/kern_exit.c
diff -u src/sys/kern/kern_exit.c:1.257 src/sys/kern/kern_exit.c:1.258
--- src/sys/kern/kern_exit.c:1.257	Mon Apr 25 12:35:47 2016
+++ src/sys/kern/kern_exit.c	Wed Apr 27 17:15:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exit.c,v 1.257 2016/04/25 16:35:47 christos Exp $	*/
+/*	$NetBSD: kern_exit.c,v 1.258 2016/04/27 21:15:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.257 2016/04/25 16:35:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.258 2016/04/27 21:15:40 christos Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_dtrace.h"
@@ -1011,8 +1011,10 @@ find_stopped_child(struct proc *parent, 
 			}
 
 			if ((options & WCONTINUED) != 0 &&
-			child->p_xsig == SIGCONT) {
+			child->p_xsig == SIGCONT &&
+			(child->p_sflag & PS_CONTINUED)) {
 if ((options & WNOWAIT) == 0) {
+	child->p_sflag &= ~PS_CONTINUED;
 	child->p_waited = 1;
 	parent->p_nstopchild--;
 }

Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.325 src/sys/kern/kern_sig.c:1.326
--- src/sys/kern/kern_sig.c:1.325	Tue Apr  5 23:11:31 2016
+++ src/sys/kern/kern_sig.c	Wed Apr 27 17:15:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_sig.c,v 1.325 2016/04/06 03:11:31 christos Exp $	*/
+/*	$NetBSD: kern_sig.c,v 1.326 2016/04/27 21:15:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.325 2016/04/06 03:11:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.326 2016/04/27 21:15:40 christos Exp $");
 
 #include "opt_ptrace.h"
 #include "opt_dtrace.h"
@@ -1382,6 +1382,7 @@ kpsignal2(struct proc *p, ksiginfo_t *ks
 			 */
 			if ((prop & SA_CONT) != 0) {
 p->p_xsig = SIGCONT;
+p->p_sflag |= PS_CONTINUED;
 child_psignal(p, 0);
 if (action == SIG_DFL) {
 	KASSERT(signo != SIGKILL);
@@ -1750,6 +1751,8 @@ issignal(struct lwp *l)
 /* Take the signal. */
 (void)sigget(sp, NULL, signo, NULL);
 p->p_xsig = signo;
+if (p->p_sflag & PS_CONTINUED)
+	p->p_sflag &= ~PS_CONTINUED;
 signo = 0;
 sigswitch(true, PS_NOCLDSTOP, p->p_xsig);
 			} else if (prop & SA_IGNORE) {

Index: src/sys/sys/proc.h
diff -u src/sys/sys/proc.h:1.329 src/sys/sys/proc.h:1.330
--- src/sys/sys/proc.h:1.329	Mon Apr  4 19:07:06 2016
+++ src/sys/sys/proc.h	Wed Apr 27 17:15:40 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.329 2016/04/04 23:07:06 christos Exp $	*/
+/*	$NetBSD: proc.h,v 1.330 2016/04/27 21:15:40 christos Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -384,6 +384,7 @@ struct proc {
 #define	PS_STOPEXIT	0x0200 /* Will be stopped at process exit */
 #define	PS_NOTIFYSTOP	0x1000 /* Notify parent of successful STOP */
 #define	PS_COREDUMP	0x2000 /* Process core-dumped */
+#define	PS_CONTINUED	0x4000 /* Process is continued */
 #define	PS_STOPPING	0x8000 /* Transitioning SACTIVE -> SSTOP */
 
 /*

CVS commit: src/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 21:15:40 UTC 2016

Modified Files:
src/sys/kern: kern_exit.c kern_sig.c
src/sys/sys: proc.h

Log Message:
We need a flag for WCONTINUED so that we can reset it... Fixes bash issue.


To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/sys/kern/kern_exit.c
cvs rdiff -u -r1.325 -r1.326 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.329 -r1.330 src/sys/sys/proc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/lib/libc/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 21:14:24 UTC 2016

Modified Files:
src/tests/lib/libc/sys: t_wait.c

Log Message:
- Adjust to the correct wait6 semantics (returns pid)
- Avoid race in setrlimit(2)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/sys/t_wait.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/sys/t_wait.c
diff -u src/tests/lib/libc/sys/t_wait.c:1.3 src/tests/lib/libc/sys/t_wait.c:1.4
--- src/tests/lib/libc/sys/t_wait.c:1.3	Tue Apr  5 23:52:27 2016
+++ src/tests/lib/libc/sys/t_wait.c	Wed Apr 27 17:14:24 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: t_wait.c,v 1.3 2016/04/06 03:52:27 christos Exp $ */
+/* $NetBSD: t_wait.c,v 1.4 2016/04/27 21:14:24 christos Exp $ */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__RCSID("$NetBSD: t_wait.c,v 1.3 2016/04/06 03:52:27 christos Exp $");
+__RCSID("$NetBSD: t_wait.c,v 1.4 2016/04/27 21:14:24 christos Exp $");
 
 #include 
 #include 
@@ -97,7 +97,7 @@ ATF_TC_BODY(wait6_exited, tc)
 		exit(0x5a5a5a5a);
 		/*NOTREACHED*/
 	default:
-		ATF_REQUIRE(!wait6(P_PID, pid, , WEXITED, , )); 
+		ATF_REQUIRE(wait6(P_PID, pid, , WEXITED, , ) == pid); 
 		ATF_REQUIRE(WIFEXITED(st) && WEXITSTATUS(st) == 0x5a);
 		ATF_REQUIRE(si.si_status = 0x5a5a5a5a);
 		ATF_REQUIRE(si.si_pid == pid);
@@ -131,7 +131,7 @@ ATF_TC_BODY(wait6_terminated, tc)
 		ATF_REQUIRE(pid > 0); 
 	default:
 		ATF_REQUIRE(kill(pid, SIGTERM) == 0);
-		ATF_REQUIRE(!wait6(P_PID, pid, , WEXITED, , )); 
+		ATF_REQUIRE(wait6(P_PID, pid, , WEXITED, , ) == pid); 
 		ATF_REQUIRE(WIFSIGNALED(st) && WTERMSIG(st) == SIGTERM);
 		ATF_REQUIRE(si.si_status == SIGTERM);
 		ATF_REQUIRE(si.si_pid == pid);
@@ -166,7 +166,7 @@ ATF_TC_BODY(wait6_coredumped, tc)
 	case -1:
 		ATF_REQUIRE(pid > 0); 
 	default:
-		ATF_REQUIRE(!wait6(P_PID, pid, , WEXITED, , )); 
+		ATF_REQUIRE(wait6(P_PID, pid, , WEXITED, , ) == pid); 
 		ATF_REQUIRE(WIFSIGNALED(st) && WTERMSIG(st) == SIGSEGV
 		&& WCOREDUMP(st));
 		ATF_REQUIRE(si.si_status == SIGSEGV);
@@ -194,16 +194,16 @@ ATF_TC_BODY(wait6_stop_and_go, tc)
 	pid_t pid;
 	static const struct rlimit rl = { 0, 0 };
 
+	ATF_REQUIRE(setrlimit(RLIMIT_CORE, ) == 0);
 	switch (pid = fork()) {
 	case 0:
-		ATF_REQUIRE(setrlimit(RLIMIT_CORE, ) == 0);
 		sleep(100);
 		/*FALLTHROUGH*/
 	case -1:
 		ATF_REQUIRE(pid > 0); 
 	default:
 		ATF_REQUIRE(kill(pid, SIGSTOP) == 0);
-		ATF_REQUIRE(!wait6(P_PID, pid, , WSTOPPED, , )); 
+		ATF_REQUIRE(wait6(P_PID, pid, , WSTOPPED, , ) == pid); 
 		ATF_REQUIRE(WIFSTOPPED(st) && WSTOPSIG(st) == SIGSTOP);
 		ATF_REQUIRE(si.si_status == SIGSTOP);
 		ATF_REQUIRE(si.si_pid == pid);
@@ -213,7 +213,7 @@ ATF_TC_BODY(wait6_stop_and_go, tc)
 		(uintmax_t)si.si_utime);
 
 		ATF_REQUIRE(kill(pid, SIGCONT) == 0);
-		ATF_REQUIRE(!wait6(P_PID, pid, , WCONTINUED, , )); 
+		ATF_REQUIRE(wait6(P_PID, pid, , WCONTINUED, , ) == pid); 
 		ATF_REQUIRE(WIFCONTINUED(st));
 		ATF_REQUIRE(si.si_status == SIGCONT);
 		ATF_REQUIRE(si.si_pid == pid);
@@ -223,7 +223,7 @@ ATF_TC_BODY(wait6_stop_and_go, tc)
 		(uintmax_t)si.si_utime);
 
 		ATF_REQUIRE(kill(pid, SIGQUIT) == 0);
-		ATF_REQUIRE(!wait6(P_PID, pid, , WEXITED, , )); 
+		ATF_REQUIRE(wait6(P_PID, pid, , WEXITED, , ) == pid); 
 		ATF_REQUIRE(WIFSIGNALED(st) && WTERMSIG(st) == SIGQUIT);
 		ATF_REQUIRE(si.si_status == SIGQUIT);
 		ATF_REQUIRE(si.si_pid == pid);

CVS commit: src/tests/lib/libc/sys

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 21:14:24 UTC 2016

Modified Files:
src/tests/lib/libc/sys: t_wait.c

Log Message:
- Adjust to the correct wait6 semantics (returns pid)
- Avoid race in setrlimit(2)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/sys/t_wait.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/net80211

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 20:17:00 UTC 2016

Modified Files:
src/sys/net80211: ieee80211.h

Log Message:
Add 80211n ht frame.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/net80211/ieee80211.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/net80211

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 20:17:00 UTC 2016

Modified Files:
src/sys/net80211: ieee80211.h

Log Message:
Add 80211n ht frame.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/net80211/ieee80211.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/net80211/ieee80211.h
diff -u src/sys/net80211/ieee80211.h:1.26 src/sys/net80211/ieee80211.h:1.27
--- src/sys/net80211/ieee80211.h:1.26	Sat Mar 30 10:14:31 2013
+++ src/sys/net80211/ieee80211.h	Wed Apr 27 16:17:00 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211.h,v 1.26 2013/03/30 14:14:31 christos Exp $	*/
+/*	$NetBSD: ieee80211.h,v 1.27 2016/04/27 20:17:00 christos Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -81,6 +81,17 @@ struct ieee80211_qosframe {
 	/* see below */
 } __packed;
 
+struct ieee80211_htframe {		/* 11n */
+	u_int8_t	i_fc[2];
+	u_int8_t	i_dur[2];
+	u_int8_t	i_addr1[IEEE80211_ADDR_LEN];
+	u_int8_t	i_addr2[IEEE80211_ADDR_LEN];
+	u_int8_t	i_addr3[IEEE80211_ADDR_LEN];
+	u_int8_t	i_seq[2];
+	u_int8_t	i_qos[2];
+	u_int8_t	i_ht[4];
+} __packed;
+
 struct ieee80211_qoscntl {
 	u_int8_t	i_qos[2];
 };

CVS commit: src/distrib/sets/lists/base

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:52:14 UTC 2016

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
Add new firmware code.


To generate a diff of this commit:
cvs rdiff -u -r1.1123 -r1.1124 src/distrib/sets/lists/base/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/microcode/ral

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:50:06 UTC 2016

Modified Files:
src/sys/dev/microcode/ral: Makefile build.c microcode.h

Log Message:
Sync with OpenBSD


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/microcode/ral/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/ral/build.c \
src/sys/dev/microcode/ral/microcode.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/sets/lists/base

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:52:14 UTC 2016

Modified Files:
src/distrib/sets/lists/base: mi

Log Message:
Add new firmware code.


To generate a diff of this commit:
cvs rdiff -u -r1.1123 -r1.1124 src/distrib/sets/lists/base/mi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1123 src/distrib/sets/lists/base/mi:1.1124
--- src/distrib/sets/lists/base/mi:1.1123	Tue Mar 15 14:40:50 2016
+++ src/distrib/sets/lists/base/mi	Wed Apr 27 15:52:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1123 2016/03/15 18:40:50 christos Exp $
+# $NetBSD: mi,v 1.1124 2016/04/27 19:52:14 christos Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -379,6 +379,7 @@
 ./libdata/firmware/ral/ral-rt2561		base-firmware-root
 ./libdata/firmware/ral/ral-rt2561s		base-firmware-root
 ./libdata/firmware/ral/ral-rt2661		base-firmware-root
+./libdata/firmware/ral/ral-rt2860		base-firmware-root
 ./libdata/firmware/rumbase-firmware-root
 ./libdata/firmware/rum/rum-license		base-firmware-root
 ./libdata/firmware/rum/rum-rt2573		base-firmware-root

CVS commit: src/sys/dev/microcode/ral

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:50:34 UTC 2016

Added Files:
src/sys/dev/microcode/ral: ral-rt2860

Log Message:
add rt2860


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/microcode/ral/ral-rt2860

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/dev/microcode/ral/ral-rt2860
Binary files are different

CVS commit: src/sys/dev/ic

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:49:26 UTC 2016

Modified Files:
src/sys/dev/ic: rt2860.c rt2860reg.h rt2860var.h

Log Message:
Make RT 2860 for the if_ral_pci.c driver compile.
This work was done by Jeff Rizzo


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/rt2860.c src/sys/dev/ic/rt2860var.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/rt2860reg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/microcode/ral

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:50:06 UTC 2016

Modified Files:
src/sys/dev/microcode/ral: Makefile build.c microcode.h

Log Message:
Sync with OpenBSD


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/microcode/ral/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/microcode/ral/build.c \
src/sys/dev/microcode/ral/microcode.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/microcode/ral/Makefile
diff -u src/sys/dev/microcode/ral/Makefile:1.5 src/sys/dev/microcode/ral/Makefile:1.6
--- src/sys/dev/microcode/ral/Makefile:1.5	Thu Jun  8 11:22:03 2006
+++ src/sys/dev/microcode/ral/Makefile	Wed Apr 27 15:50:06 2016
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.5 2006/06/08 15:22:03 rpaulo Exp $
+#	$NetBSD: Makefile,v 1.6 2016/04/27 19:50:06 christos Exp $
 
 NOMAN=	# defined
 
-FILES=	ral-rt2561 ral-rt2561s ral-rt2661 ral-license
+FILES=	ral-rt2561 ral-rt2561s ral-rt2661 ral-rt2860 ral-license
 
 # XXX
 includes:

Index: src/sys/dev/microcode/ral/build.c
diff -u src/sys/dev/microcode/ral/build.c:1.1 src/sys/dev/microcode/ral/build.c:1.2
--- src/sys/dev/microcode/ral/build.c:1.1	Sun Jun  4 16:30:17 2006
+++ src/sys/dev/microcode/ral/build.c	Wed Apr 27 15:50:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: build.c,v 1.1 2006/06/04 20:30:17 rpaulo Exp $	*/
+/*	$NetBSD: build.c,v 1.2 2016/04/27 19:50:06 christos Exp $	*/
 /*	$OpenBSD: build.c,v 1.1 2006/01/09 20:03:40 damien Exp $	*/
 
 /*-
@@ -54,6 +54,7 @@ main(void)
 	output("ral-rt2561",  rt2561,  sizeof rt2561);
 	output("ral-rt2561s", rt2561s, sizeof rt2561s);
 	output("ral-rt2661",  rt2661,  sizeof rt2661);
+	output("ral-rt2860",  rt2860,  sizeof rt2860);
 
 	return 0;
 }
Index: src/sys/dev/microcode/ral/microcode.h
diff -u src/sys/dev/microcode/ral/microcode.h:1.1 src/sys/dev/microcode/ral/microcode.h:1.2
--- src/sys/dev/microcode/ral/microcode.h:1.1	Sun Jun  4 16:30:17 2006
+++ src/sys/dev/microcode/ral/microcode.h	Wed Apr 27 15:50:06 2016
@@ -1,8 +1,7 @@
-/*	$NetBSD: microcode.h,v 1.1 2006/06/04 20:30:17 rpaulo Exp $	*/
-/*	$OpenBSD: microcode.h,v 1.1 2006/01/09 20:03:40 damien Exp $	*/
+/*	$OpenBSD: microcode.h,v 1.7 2010/04/05 14:14:02 damien Exp $	*/
 
 /*-
- * Copyright (c) 2005-2006, Ralink Technology, Corp.
+ * Copyright (c) 2005-2010, Ralink Technology, Corp.
  *	Paul Lin 
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -20,7 +19,7 @@
 
 /*
  * This file contains the loadable 8051 microcodes for the Ralink RT2561,
- * RT2561S and RT2661 chipsets.
+ * RT2561S, RT2661 and RT2860 chipsets.
  */
 
 static const uint8_t rt2561[] = {
@@ -2266,3 +2265,751 @@ static const uint8_t rt2661[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x43, 0xcf
 };
+
+static const uint8_t rt2860[] = {
+	0x02, 0x03, 0x5b, 0x02, 0x02, 0xa6, 0x22, 0x22, 0xff, 0xff, 0xff,
+	0x02, 0x01, 0x2c, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x1e,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0xdd, 0xc0, 0xe0, 0xc0,
+	0xf0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0, 0x75, 0xd0, 0x18, 0xc2,
+	0xaf, 0x30, 0x45, 0x03, 0x12, 0x10, 0x09, 0x90, 0x04, 0x16, 0xe0,
+	0x30, 0xe3, 0x03, 0x74, 0x08, 0xf0, 0x90, 0x04, 0x14, 0xe0, 0x20,
+	0xe7, 0x03, 0x02, 0x00, 0xcb, 0x74, 0x80, 0xf0, 0x90, 0x70, 0x12,
+	0xe0, 0xf5, 0x36, 0x90, 0x04, 0x04, 0xe0, 0x24, 0xcf, 0x60, 0x30,
+	0x14, 0x60, 0x42, 0x24, 0xe2, 0x60, 0x47, 0x14, 0x60, 0x55, 0x24,
+	0x21, 0x70, 0x60, 0xe5, 0x55, 0x24, 0xfe, 0x60, 0x07, 0x14, 0x60,
+	0x08, 0x24, 0x02, 0x70, 0x08, 0x7d, 0x01, 0x80, 0x28, 0x7d, 0x02,
+	0x80, 0x24, 0x90, 0x70, 0x10, 0xe0, 0xf5, 0x50, 0x85, 0x36, 0x40,
+	0xd2, 0x01, 0x80, 0x3e, 0xe5, 0x55, 0x64, 0x03, 0x60, 0x04, 0xe5,
+	0x55, 0x70, 0x04, 0x7d, 0x02, 0x80, 0x09, 0x85, 0x36, 0x41, 0xd2,
+	0x02, 0x80, 0x29, 0xad, 0x55, 0xaf, 0x36, 0x12, 0x02, 0x82, 0x80,
+	0x20, 0x90, 0x70, 0x10, 0xe0, 0xf5, 0x47, 0x90, 0x70, 0x11, 0xe0,
+	0xf5, 0x44, 0x12, 0x10, 0x25, 0x80, 0x06, 0x90, 0x70, 0x10, 0xe0,
+	0xf5, 0x45, 0xe4, 0xfd, 0xaf, 0x36, 0x12, 0x02, 0x82, 0xd2, 0x04,
+	0x90, 0x70, 0x13, 0xe4, 0xf0, 0x90, 0x70, 0x13, 0xe4, 0xf0, 0xd2,
+	0xaf, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, 0x83, 0xd0, 0xf0, 0xd0, 0xe0,
+	0x32, 0xc0, 0xe0, 0xc0, 0xf0, 0xc0, 0x83, 0xc0, 0x82, 0xc0, 0xd0,
+	0xe8, 0xc0, 0xe0, 0xe9, 0xc0, 0xe0, 0xea, 0xc0, 0xe0, 0xeb, 0xc0,
+	0xe0, 0xec, 0xc0, 0xe0, 0xed, 0xc0, 0xe0, 0xee, 0xc0, 0xe0, 0xef,
+	0xc0, 0xe0, 0xc2, 0xaf, 0x30, 0x45, 0x03, 0x12, 0x10, 0x12, 0xd2,
+	0xaf, 0xd0, 0xe0, 0xff, 0xd0, 0xe0, 0xfe, 0xd0, 0xe0, 0xfd, 0xd0,
+	0xe0, 0xfc, 0xd0, 0xe0, 0xfb, 0xd0, 0xe0, 0xfa, 0xd0, 0xe0, 0xf9,
+	0xd0, 0xe0, 0xf8, 0xd0, 0xd0, 0xd0, 0x82, 0xd0, 0x83, 0xd0, 0xf0,
+	0xd0, 0xe0, 0x32, 0xc0, 0xe0, 0xc0, 0xf0, 0xc0, 0x83, 0xc0, 0x82,
+	0xc0, 0xd0, 0x75, 0xd0, 0x10, 0xc2, 0xaf, 0x30, 0x45, 0x03, 0x12,
+	0x10, 0x0c, 0x30, 0x58, 0x0a, 0xe5, 0x54, 0x60, 0x04, 

CVS commit: src/sys/dev/ic

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:49:26 UTC 2016

Modified Files:
src/sys/dev/ic: rt2860.c rt2860reg.h rt2860var.h

Log Message:
Make RT 2860 for the if_ral_pci.c driver compile.
This work was done by Jeff Rizzo


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/ic/rt2860.c src/sys/dev/ic/rt2860var.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/rt2860reg.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/ic/rt2860.c
diff -u src/sys/dev/ic/rt2860.c:1.1 src/sys/dev/ic/rt2860.c:1.2
--- src/sys/dev/ic/rt2860.c:1.1	Tue Apr 26 17:17:20 2016
+++ src/sys/dev/ic/rt2860.c	Wed Apr 27 15:49:26 2016
@@ -1,3 +1,4 @@
+/*	$NetBSD: rt2860.c,v 1.2 2016/04/27 19:49:26 christos Exp $	*/
 /*	$OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $	*/
 
 /*-
@@ -21,43 +22,46 @@
  * http://www.ralinktech.com/
  */
 
-#include "bpfilter.h"
+#include 
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.2 2016/04/27 19:49:26 christos Exp $");
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
-#if NBPFILTER > 0
 #include 
-#endif
 #include 
 #include 
+#include 
 #include 
 
-#include 
-#include 
-
 #include 
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 
 #include 
 
+#define RAL_DEBUG
 #ifdef RAL_DEBUG
 #define DPRINTF(x)	do { if (rt2860_debug > 0) printf x; } while (0)
 #define DPRINTFN(n, x)	do { if (rt2860_debug >= (n)) printf x; } while (0)
@@ -67,94 +71,94 @@ int rt2860_debug = 0;
 #define DPRINTFN(n, x)
 #endif
 
-void		rt2860_attachhook(struct device *);
-int		rt2860_alloc_tx_ring(struct rt2860_softc *,
+static void	rt2860_attachhook(struct device *);
+static int	rt2860_alloc_tx_ring(struct rt2860_softc *,
 		struct rt2860_tx_ring *);
-void		rt2860_reset_tx_ring(struct rt2860_softc *,
+static void	rt2860_reset_tx_ring(struct rt2860_softc *,
 		struct rt2860_tx_ring *);
-void		rt2860_free_tx_ring(struct rt2860_softc *,
+static void	rt2860_free_tx_ring(struct rt2860_softc *,
 		struct rt2860_tx_ring *);
-int		rt2860_alloc_tx_pool(struct rt2860_softc *);
-void		rt2860_free_tx_pool(struct rt2860_softc *);
-int		rt2860_alloc_rx_ring(struct rt2860_softc *,
+static int	rt2860_alloc_tx_pool(struct rt2860_softc *);
+static void	rt2860_free_tx_pool(struct rt2860_softc *);
+static int	rt2860_alloc_rx_ring(struct rt2860_softc *,
 		struct rt2860_rx_ring *);
-void		rt2860_reset_rx_ring(struct rt2860_softc *,
+static void	rt2860_reset_rx_ring(struct rt2860_softc *,
 		struct rt2860_rx_ring *);
-void		rt2860_free_rx_ring(struct rt2860_softc *,
+static void	rt2860_free_rx_ring(struct rt2860_softc *,
 		struct rt2860_rx_ring *);
-struct		ieee80211_node *rt2860_node_alloc(struct ieee80211com *);
-int		rt2860_media_change(struct ifnet *);
-void		rt2860_iter_func(void *, struct ieee80211_node *);
-void		rt2860_updatestats(struct rt2860_softc *);
-void		rt2860_newassoc(struct ieee80211com *, struct ieee80211_node *,
+static struct	ieee80211_node *rt2860_node_alloc(struct ieee80211_node_table *);
+static int	rt2860_media_change(struct ifnet *);
+static void	rt2860_iter_func(void *, struct ieee80211_node *);
+static void	rt2860_updatestats(struct rt2860_softc *);
+static void	rt2860_newassoc(struct ieee80211_node *,
 		int);
-void		rt2860_node_leave(struct ieee80211com *,
-		struct ieee80211_node *);
-int		rt2860_ampdu_rx_start(struct ieee80211com *,
+#ifdef notyet
+static int	rt2860_ampdu_rx_start(struct ieee80211com *,
 		struct ieee80211_node *, uint8_t);
-void		rt2860_ampdu_rx_stop(struct ieee80211com *,
+static void	rt2860_ampdu_rx_stop(struct ieee80211com *,
 		struct ieee80211_node *, uint8_t);
-int		rt2860_newstate(struct ieee80211com *, enum ieee80211_state,
+#endif
+static int	rt2860_newstate(struct ieee80211com *, enum ieee80211_state,
 		int);
-uint16_t	rt3090_efuse_read_2(struct rt2860_softc *, uint16_t);
-uint16_t	rt2860_eeprom_read_2(struct rt2860_softc *, uint16_t);
-void		rt2860_intr_coherent(struct rt2860_softc *);
-void		rt2860_drain_stats_fifo(struct rt2860_softc *);
-void		rt2860_tx_intr(struct rt2860_softc *, int);
-void		rt2860_rx_intr(struct rt2860_softc *);
-void		rt2860_tbtt_intr(struct rt2860_softc *);
-void		rt2860_gp_intr(struct rt2860_softc *);
-int		rt2860_tx(struct rt2860_softc *, struct mbuf *,
+static uint16_t	rt3090_efuse_read_2(struct rt2860_softc *, uint16_t);
+static uint16_t	rt2860_eeprom_read_2(struct rt2860_softc *, uint16_t);
+static void	rt2860_intr_coherent(struct rt2860_softc *);
+static void	rt2860_drain_stats_fifo(struct rt2860_softc *);
+static void	rt2860_tx_intr(struct rt2860_softc *, int);
+static void	rt2860_rx_intr(struct rt2860_softc *);
+static void	rt2860_tbtt_intr(struct rt2860_softc *);
+static void	

CVS commit: src/sys/dev/microcode/ral

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:50:34 UTC 2016

Added Files:
src/sys/dev/microcode/ral: ral-rt2860

Log Message:
add rt2860


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/dev/microcode/ral/ral-rt2860

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:48:11 UTC 2016

Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.1241 -r1.1242 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1240 -r1.1241 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.

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:47:40 UTC 2016

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
more ral devices from OpenBSD


To generate a diff of this commit:
cvs rdiff -u -r1.1248 -r1.1249 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.1248 src/sys/dev/pci/pcidevs:1.1249
--- src/sys/dev/pci/pcidevs:1.1248	Tue Apr 26 04:48:12 2016
+++ src/sys/dev/pci/pcidevs	Wed Apr 27 15:47:40 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1248 2016/04/26 08:48:12 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1249 2016/04/27 19:47:40 christos Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -568,6 +568,7 @@ vendor ICENSEMBLE	0x1412	IC Ensemble / V
 vendor MICROSOFT	0x1414	Microsoft
 vendor OXFORDSEMI	0x1415	Oxford Semiconductor
 vendor CHELSIO		0x1425	Chelsio Communications
+vendor EDIMAX		0x1432	Edimax
 vendor TAMARACK		0x143d	Tamarack Microelectronics
 vendor SAMSUNGELEC3	0x144d	Samsung Electronics (3rd vendor ID)
 vendor ASKEY		0x144f	Askey Computer
@@ -631,7 +632,9 @@ vendor FREESCALE	0x1957	Freescale Semico
 vendor ATTANSIC		0x1969	Attansic Technologies
 vendor JMICRON		0x197b	JMicron Technology
 vendor ASPEED		0x1a03	ASPEED Technology
+vendor AWT		0x1a3b	AWT
 vendor EVE		0x1adb	EVE
+vendor FUSIONIO		0x1aed	Fusion-io
 vendor QUMRANET		0x1af4	Qumranet
 vendor ASMEDIA		0x1b21  ASMedia
 vendor REDHAT		0x1b36	Red Hat
@@ -1630,6 +1633,9 @@ product AVM FRITZ_PCI_V2_ISDN	0x0e00	Fri
 product AVM B1			0x0700	Basic Rate B1 ISDN Interface
 product AVM T1			0x1200	Primary Rate T1 ISDN Interface
 
+/* AWT products */
+product AWT RT2890		0x1059	RT2890
+
 /* RMI products */
 product RMI XLR_PCIX		0x000b	XLR PCI-X bridge
 product RMI XLS_PCIE		0xabcd	XLS PCIe-PCIe bridge
@@ -2139,6 +2145,15 @@ product DOMEX PCISCSI	0x0001	DMX-3191D
 /* Dynalink products */
 product DYNALINK IS64PH		0x1702	IS64PH ISDN Adapter
 
+/* Edimax products */
+product EDIMAX RT2860_1		0x7708	RT2860
+product EDIMAX RT2860_4		0x7727	RT2860
+product EDIMAX RT2860_2		0x7728	RT2860
+product EDIMAX RT2860_5		0x7738	RT2860
+product EDIMAX RT2860_6		0x7748	RT2860
+product EDIMAX RT2860_3		0x7758	RT2860
+product EDIMAX RT2860_7		0x7768	RT2860
+
 /* ELSA products */
 product ELSA	QS1PCI		0x1000	QuickStep 1000 ISDN Card
 product ELSA	GLORIAXL	0x8901	Gloria XL 1624
@@ -5455,8 +5470,21 @@ product	RALINK	RT2560		0x0201	RT2560 802
 product	RALINK	RT2561S		0x0301	RT2561S 802.11b/g
 product	RALINK	RT2561		0x0302	RT2561 802.11b/g
 product	RALINK	RT2661		0x0401	RT2661 802.11b/g/n
+product RALINK	RT2860		0x0601	RT2860
+product RALINK	RT2890		0x0681	RT2890
+product RALINK	RT2760		0x0701	RT2760
+product RALINK	RT2790		0x0781	RT2790
+product RALINK	RT3060		0x3060	RT3060
+product RALINK	RT3062		0x3062	RT3062
 product	RALINK	RT3090		0x3090	RT3090 802.11b/g/n
-
+product RALINK	RT3091		0x3091	RT3091
+product RALINK	RT3092		0x3092	RT3092
+product RALINK	RT3298		0x3298	Bluetooth
+product RALINK	RT3562		0x3562	RT3562
+product RALINK	RT3592		0x3592	RT3592
+product RALINK	RT3593		0x3593	RT3593
+product RALINK	RT5390		0x5390	RT5390
+	
 /* RATOC Systems products */
 product RATOC	REXPCI31	0x0853	REX PCI-31/33 SCSI
 

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:47:40 UTC 2016

Modified Files:
src/sys/dev/pci: pcidevs

Log Message:
more ral devices from OpenBSD


To generate a diff of this commit:
cvs rdiff -u -r1.1248 -r1.1249 src/sys/dev/pci/pcidevs

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:47:25 UTC 2016

Modified Files:
src/sys/dev/pci: if_ral_pci.c

Log Message:
Sync with OpenBSD (add rt2860). Handle 32/64 memory bars,
some power management, more device matches.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_ral_pci.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/if_ral_pci.c
diff -u src/sys/dev/pci/if_ral_pci.c:1.21 src/sys/dev/pci/if_ral_pci.c:1.22
--- src/sys/dev/pci/if_ral_pci.c:1.21	Sat Mar 29 15:28:25 2014
+++ src/sys/dev/pci/if_ral_pci.c	Wed Apr 27 15:47:25 2016
@@ -1,9 +1,8 @@
-/*	$NetBSD: if_ral_pci.c,v 1.21 2014/03/29 19:28:25 christos Exp $	*/
-/*	$OpenBSD: if_ral_pci.c,v 1.6 2006/01/09 20:03:43 damien Exp $  */
+/*	$NetBSD: if_ral_pci.c,v 1.22 2016/04/27 19:47:25 christos Exp $	*/
+/*	$OpenBSD: if_ral_pci.c,v 1.24 2015/11/24 17:11:39 mpi Exp $  */
 
 /*-
- * Copyright (c) 2005, 2006
- *	Damien Bergamini 
+ * Copyright (c) 2005-2010 Damien Bergamini 
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -19,10 +18,10 @@
  */
 
 /*
- * PCI front-end for the Ralink RT2560/RT2561/RT2561S/RT2661 driver.
+ * PCI front-end for the Ralink RT2560/RT2561/RT2860/RT3090 driver.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.21 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.22 2016/04/27 19:47:25 christos Exp $");
 
 
 #include 
@@ -51,31 +50,56 @@ __KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
 #include 
 
+#define RAL_POWER_MANAGEMENT 0	/* Disabled for now */
+
 static struct ral_opns {
 	int	(*attach)(void *, int);
 	int	(*detach)(void *);
+#if RAL_POWER_MANAGEMENT
+	void	(*suspend)(void *);
+	void	(*wakeup)(void *);
+#endif
 	int	(*intr)(void *);
 
 }  ral_rt2560_opns = {
 	rt2560_attach,
 	rt2560_detach,
+#if RAL_POWER_MANAGEMENT
+	rt2560_suspend,
+	rt2560_wakeup,
+#endif
 	rt2560_intr
 
 }, ral_rt2661_opns = {
 	rt2661_attach,
 	rt2661_detach,
+#if RAL_POWER_MANAGEMENT
+	rt2661_suspend,
+	rt2661_wakeup,
+#endif
 	rt2661_intr
+
+}, ral_rt2860_opns = {
+	rt2860_attach,
+	rt2860_detach,
+#if RAL_POWER_MANAGEMENT
+	rt2860_suspend,
+	rt2860_wakeup,
+#endif
+	rt2860_intr
 };
 
 struct ral_pci_softc {
 	union {
 		struct rt2560_softc	sc_rt2560;
 		struct rt2661_softc	sc_rt2661;
+		struct rt2860_softc	sc_rt2860;
 	} u;
 #define sc_sc	u.sc_rt2560
 
@@ -92,9 +116,45 @@ struct ral_pci_softc {
 int	ral_pci_match(device_t, cfdata_t, void *);
 void	ral_pci_attach(device_t, device_t, void *);
 int	ral_pci_detach(device_t, int);
+#if RAL_POWER_MANAGEMENT
+int	ral_pci_activate(struct device *, devact_t);
+void	ral_pci_wakeup(struct ral_pci_softc *);
+#else
+#define ral_pci_activate NULL
+#endif
 
 CFATTACH_DECL_NEW(ral_pci, sizeof (struct ral_pci_softc),
-	ral_pci_match, ral_pci_attach, ral_pci_detach, NULL);
+	ral_pci_match, ral_pci_attach, ral_pci_detach, ral_pci_activate);
+
+static const struct ral_pci_matchid {
+	pci_vendor_id_t ral_vendor;
+	pci_product_id_tral_product;
+} ral_pci_devices[] = {
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2560 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561 },
+ 	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2561S },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2661 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2860 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2890 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2760 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT2790 },
+	{ PCI_VENDOR_AWT,PCI_PRODUCT_AWT_RT2890 },
+	{ PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_1 },
+	{ PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_2 },
+	{ PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_3 },
+	{ PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_4 },
+	{ PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_5 },
+	{ PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_6 },
+	{ PCI_VENDOR_EDIMAX, PCI_PRODUCT_EDIMAX_RT2860_7 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3060 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3062 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3090 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3091 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3092 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3562 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3592 },
+	{ PCI_VENDOR_RALINK, PCI_PRODUCT_RALINK_RT3593 }
+};
 
 int
 ral_pci_match(device_t parent, cfdata_t cfdata,
@@ -102,16 +162,11 @@ ral_pci_match(device_t parent, cfdata_t 
 {
 	struct pci_attach_args *pa = aux;
 
-	if (PCI_VENDOR(pa->pa_id) == PCI_VENDOR_RALINK) {
-		switch (PCI_PRODUCT(pa->pa_id)) {
-			case PCI_PRODUCT_RALINK_RT2560:
-			case PCI_PRODUCT_RALINK_RT2561:
-			case PCI_PRODUCT_RALINK_RT2561S:
-			case 

CVS commit: src/sys/dev/pci

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:47:25 UTC 2016

Modified Files:
src/sys/dev/pci: if_ral_pci.c

Log Message:
Sync with OpenBSD (add rt2860). Handle 32/64 memory bars,
some power management, more device matches.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_ral_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/conf

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:46:11 UTC 2016

Modified Files:
src/sys/conf: files

Log Message:
Add rt2860 now that it compiles.


To generate a diff of this commit:
cvs rdiff -u -r1.1156 -r1.1157 src/sys/conf/files

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/files
diff -u src/sys/conf/files:1.1156 src/sys/conf/files:1.1157
--- src/sys/conf/files:1.1156	Tue Apr 26 06:38:42 2016
+++ src/sys/conf/files	Wed Apr 27 15:46:11 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1156 2016/04/26 10:38:42 skrll Exp $
+#	$NetBSD: files,v 1.1157 2016/04/27 19:46:11 christos Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20150846
@@ -661,10 +661,11 @@ file	dev/ic/rtw.c			rtw
 file	dev/ic/rtwphy.c			rtw
 file	dev/ic/rtwphyio.c		rtw
 
-# Ralink RT2500/RT2600 802.11
+# Ralink RT2500/RT2600/RT2860 802.11
 device	ral: arp, ether, ifnet, wlan, firmload
 file	dev/ic/rt2560.c			ral
 file	dev/ic/rt2661.c			ral
+file	dev/ic/rt2860.c			ral
 
 # Marvell Libertas Open
 device  malo: arp, ether, ifnet, wlan, firmload

CVS commit: src/sys/conf

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Wed Apr 27 19:46:11 UTC 2016

Modified Files:
src/sys/conf: files

Log Message:
Add rt2860 now that it compiles.


To generate a diff of this commit:
cvs rdiff -u -r1.1156 -r1.1157 src/sys/conf/files

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/usb

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Wed Apr 27 19:35:17 UTC 2016

Modified Files:
src/sys/dev/usb: hid.c uhid.c uhidev.c ukbd.c ums.c uts.c

Log Message:
Pull in opt_usb.h in _KERNEL_OPT case for various *_DEBUG options.
Makes various driver-specific debugging options work again.

XXX more to fix in dev/usb


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/hid.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/uts.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/usb

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Wed Apr 27 19:35:17 UTC 2016

Modified Files:
src/sys/dev/usb: hid.c uhid.c uhidev.c ukbd.c ums.c uts.c

Log Message:
Pull in opt_usb.h in _KERNEL_OPT case for various *_DEBUG options.
Makes various driver-specific debugging options work again.

XXX more to fix in dev/usb


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/hid.c
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.131 -r1.132 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.89 -r1.90 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/uts.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/hid.c
diff -u src/sys/dev/usb/hid.c:1.44 src/sys/dev/usb/hid.c:1.45
--- src/sys/dev/usb/hid.c:1.44	Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/hid.c	Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: hid.c,v 1.44 2016/04/23 10:15:31 skrll Exp $	*/
+/*	$NetBSD: hid.c,v 1.45 2016/04/27 19:35:17 jakllsch Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
 
 /*
@@ -32,7 +32,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.44 2016/04/23 10:15:31 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.45 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
 
 #include 
 #include 

Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.95 src/sys/dev/usb/uhid.c:1.96
--- src/sys/dev/usb/uhid.c:1.95	Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/uhid.c	Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhid.c,v 1.95 2016/04/23 10:15:32 skrll Exp $	*/
+/*	$NetBSD: uhid.c,v 1.96 2016/04/27 19:35:17 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,10 +35,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.95 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.96 2016/04/27 19:35:17 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
+#include "opt_usb.h"
 #endif
 
 #include 

Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.65 src/sys/dev/usb/uhidev.c:1.66
--- src/sys/dev/usb/uhidev.c:1.65	Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/uhidev.c	Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhidev.c,v 1.65 2016/04/23 10:15:32 skrll Exp $	*/
+/*	$NetBSD: uhidev.c,v 1.66 2016/04/27 19:35:17 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.65 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhidev.c,v 1.66 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
 
 #include 
 #include 

Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.131 src/sys/dev/usb/ukbd.c:1.132
--- src/sys/dev/usb/ukbd.c:1.131	Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/ukbd.c	Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/*  $NetBSD: ukbd.c,v 1.131 2016/04/23 10:15:32 skrll Exp $*/
+/*  $NetBSD: ukbd.c,v 1.132 2016/04/27 19:35:17 jakllsch Exp $*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,11 +35,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.131 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ukbd.c,v 1.132 2016/04/27 19:35:17 jakllsch Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ukbd.h"
 #include "opt_ukbd_layout.h"
+#include "opt_usb.h"
 #include "opt_wsdisplay_compat.h"
 #include "opt_ddb.h"
 #endif /* _KERNEL_OPT */

Index: src/sys/dev/usb/ums.c
diff -u src/sys/dev/usb/ums.c:1.89 src/sys/dev/usb/ums.c:1.90
--- src/sys/dev/usb/ums.c:1.89	Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/ums.c	Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ums.c,v 1.89 2016/04/23 10:15:32 skrll Exp $	*/
+/*	$NetBSD: ums.c,v 1.90 2016/04/27 19:35:17 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.89 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.90 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_usb.h"
+#endif
 
 #include 
 #include 

Index: src/sys/dev/usb/uts.c
diff -u src/sys/dev/usb/uts.c:1.4 src/sys/dev/usb/uts.c:1.5
--- src/sys/dev/usb/uts.c:1.4	Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/uts.c	Wed Apr 27 19:35:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: uts.c,v 1.4 2016/04/23 10:15:32 skrll Exp $	*/
+/*	$NetBSD: uts.c,v 1.5 2016/04/27 19:35:17 jakllsch Exp $	*/
 
 /*
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.4 2016/04/23 10:15:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uts.c,v 1.5 2016/04/27 19:35:17 jakllsch Exp $");
+
+#ifdef 

CVS import: xsrc/external/mit/xf86-video-amdgpu/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 09:35:46 UTC 2016

Update of /cvsroot/xsrc/external/mit/xf86-video-amdgpu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv29947

Log Message:
initial import of xf86-video-amdgpu-1.1.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-amdgpu-1-1-0

N xsrc/external/mit/xf86-video-amdgpu/dist/ChangeLog
N xsrc/external/mit/xf86-video-amdgpu/dist/missing
N xsrc/external/mit/xf86-video-amdgpu/dist/ltmain.sh
N xsrc/external/mit/xf86-video-amdgpu/dist/COPYING
N xsrc/external/mit/xf86-video-amdgpu/dist/depcomp
N xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.in
N xsrc/external/mit/xf86-video-amdgpu/dist/install-sh
N xsrc/external/mit/xf86-video-amdgpu/dist/configure.ac
N xsrc/external/mit/xf86-video-amdgpu/dist/config.h.in
N xsrc/external/mit/xf86-video-amdgpu/dist/config.sub
N xsrc/external/mit/xf86-video-amdgpu/dist/compile
N xsrc/external/mit/xf86-video-amdgpu/dist/configure
N xsrc/external/mit/xf86-video-amdgpu/dist/config.guess
N xsrc/external/mit/xf86-video-amdgpu/dist/aclocal.m4
N xsrc/external/mit/xf86-video-amdgpu/dist/README
N xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.am
N xsrc/external/mit/xf86-video-amdgpu/dist/INSTALL
N xsrc/external/mit/xf86-video-amdgpu/dist/conf/10-amdgpu.conf
N xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.in
N xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.am
N xsrc/external/mit/xf86-video-amdgpu/dist/man/amdgpu.man
N xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.in
N xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.am
N xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_version.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/compat-api.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdpciids.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_kms.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_chipset_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor_wrappers.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_misc.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_chipinfo_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_list.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/ati_pciids_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_present.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.in
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri3.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pci_device_match_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pci_chipset_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/simple_list.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drv.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_sync.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.am
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/pcidb/parse_pci_ids.pl
N xsrc/external/mit/xf86-video-amdgpu/dist/src/pcidb/ati_pciids.csv

No conflicts created by this import

CVS import: xsrc/external/mit/xf86-video-amdgpu/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 09:35:46 UTC 2016

Update of /cvsroot/xsrc/external/mit/xf86-video-amdgpu/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv29947

Log Message:
initial import of xf86-video-amdgpu-1.1.0

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-amdgpu-1-1-0

N xsrc/external/mit/xf86-video-amdgpu/dist/ChangeLog
N xsrc/external/mit/xf86-video-amdgpu/dist/missing
N xsrc/external/mit/xf86-video-amdgpu/dist/ltmain.sh
N xsrc/external/mit/xf86-video-amdgpu/dist/COPYING
N xsrc/external/mit/xf86-video-amdgpu/dist/depcomp
N xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.in
N xsrc/external/mit/xf86-video-amdgpu/dist/install-sh
N xsrc/external/mit/xf86-video-amdgpu/dist/configure.ac
N xsrc/external/mit/xf86-video-amdgpu/dist/config.h.in
N xsrc/external/mit/xf86-video-amdgpu/dist/config.sub
N xsrc/external/mit/xf86-video-amdgpu/dist/compile
N xsrc/external/mit/xf86-video-amdgpu/dist/configure
N xsrc/external/mit/xf86-video-amdgpu/dist/config.guess
N xsrc/external/mit/xf86-video-amdgpu/dist/aclocal.m4
N xsrc/external/mit/xf86-video-amdgpu/dist/README
N xsrc/external/mit/xf86-video-amdgpu/dist/Makefile.am
N xsrc/external/mit/xf86-video-amdgpu/dist/INSTALL
N xsrc/external/mit/xf86-video-amdgpu/dist/conf/10-amdgpu.conf
N xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.in
N xsrc/external/mit/xf86-video-amdgpu/dist/conf/Makefile.am
N xsrc/external/mit/xf86-video-amdgpu/dist/man/amdgpu.man
N xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.in
N xsrc/external/mit/xf86-video-amdgpu/dist/man/Makefile.am
N xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_version.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/compat-api.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdpciids.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_kms.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_chipset_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_bo_helper.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor_wrappers.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_misc.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_chipinfo_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_list.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_video.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/ati_pciids_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_probe.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_present.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.in
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri3.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pci_device_match_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pci_chipset_gen.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/simple_list.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drv.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_dri2.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_glamor.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_pixmap.h
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_sync.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/drmmode_display.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/Makefile.am
N xsrc/external/mit/xf86-video-amdgpu/dist/src/amdgpu_drm_queue.c
N xsrc/external/mit/xf86-video-amdgpu/dist/src/pcidb/parse_pci_ids.pl
N xsrc/external/mit/xf86-video-amdgpu/dist/src/pcidb/ati_pciids.csv

No conflicts created by this import

CVS commit: xsrc/external/mit/libXi/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 09:32:11 UTC 2016

Modified Files:
xsrc/external/mit/libXi/dist/src: XGMotion.c XGetDCtl.c XGetFCtl.c
XGetProp.c XIProperties.c XISelEv.c XQueryDv.c

Log Message:
merge libXi 1.7.6


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXi/dist/src/XGMotion.c \
xsrc/external/mit/libXi/dist/src/XGetDCtl.c \
xsrc/external/mit/libXi/dist/src/XGetProp.c \
xsrc/external/mit/libXi/dist/src/XIProperties.c \
xsrc/external/mit/libXi/dist/src/XISelEv.c \
xsrc/external/mit/libXi/dist/src/XQueryDv.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXi/dist/src/XGetFCtl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libXi/dist/src/XGMotion.c
diff -u xsrc/external/mit/libXi/dist/src/XGMotion.c:1.3 xsrc/external/mit/libXi/dist/src/XGMotion.c:1.4
--- xsrc/external/mit/libXi/dist/src/XGMotion.c:1.3	Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XGMotion.c	Wed Apr 27 09:32:10 2016
@@ -81,7 +81,7 @@ XGetDeviceMotionEvents(
 
 LockDisplay(dpy);
 if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
-	return ((XDeviceTimeCoord *) NoSuchExtension);
+return NULL;
 
 GetReq(GetDeviceMotionEvents, req);
 req->reqType = info->codes->major_opcode;
Index: xsrc/external/mit/libXi/dist/src/XGetDCtl.c
diff -u xsrc/external/mit/libXi/dist/src/XGetDCtl.c:1.3 xsrc/external/mit/libXi/dist/src/XGetDCtl.c:1.4
--- xsrc/external/mit/libXi/dist/src/XGetDCtl.c:1.3	Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XGetDCtl.c	Wed Apr 27 09:32:11 2016
@@ -79,7 +79,7 @@ XGetDeviceControl(
 
 LockDisplay(dpy);
 if (_XiCheckExtInit(dpy, XInput_Add_XChangeDeviceControl, info) == -1)
-	return ((XDeviceControl *) NoSuchExtension);
+return NULL;
 
 GetReq(GetDeviceControl, req);
 req->reqType = info->codes->major_opcode;
Index: xsrc/external/mit/libXi/dist/src/XGetProp.c
diff -u xsrc/external/mit/libXi/dist/src/XGetProp.c:1.3 xsrc/external/mit/libXi/dist/src/XGetProp.c:1.4
--- xsrc/external/mit/libXi/dist/src/XGetProp.c:1.3	Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XGetProp.c	Wed Apr 27 09:32:11 2016
@@ -75,7 +75,7 @@ XGetDeviceDontPropagateList(
 
 LockDisplay(dpy);
 if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
-	return ((XEventClass *) NoSuchExtension);
+return NULL;
 
 GetReq(GetDeviceDontPropagateList, req);
 req->reqType = info->codes->major_opcode;
Index: xsrc/external/mit/libXi/dist/src/XIProperties.c
diff -u xsrc/external/mit/libXi/dist/src/XIProperties.c:1.3 xsrc/external/mit/libXi/dist/src/XIProperties.c:1.4
--- xsrc/external/mit/libXi/dist/src/XIProperties.c:1.3	Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XIProperties.c	Wed Apr 27 09:32:11 2016
@@ -51,7 +51,7 @@ XIListProperties(Display* dpy, int devic
 LockDisplay(dpy);
 *num_props_return = 0;
 if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1)
-	goto cleanup;
+goto cleanup_unlocked;
 
 GetReq(XIListProperties, req);
 req->reqType = info->codes->major_opcode;
@@ -76,6 +76,7 @@ XIListProperties(Display* dpy, int devic
 
 cleanup:
 UnlockDisplay(dpy);
+cleanup_unlocked:
 SyncHandle();
 return props;
 }
Index: xsrc/external/mit/libXi/dist/src/XISelEv.c
diff -u xsrc/external/mit/libXi/dist/src/XISelEv.c:1.3 xsrc/external/mit/libXi/dist/src/XISelEv.c:1.4
--- xsrc/external/mit/libXi/dist/src/XISelEv.c:1.3	Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XISelEv.c	Wed Apr 27 09:32:11 2016
@@ -60,7 +60,7 @@ XISelectEvents(Display* dpy, Window win,
 LockDisplay(dpy);
 if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1) {
 r = NoSuchExtension;
-goto out;
+goto out_unlocked;
 }
 
 for (i = 0; i < num_masks; i++) {
@@ -114,6 +114,7 @@ XISelectEvents(Display* dpy, Window win,
 free(buff);
 out:
 UnlockDisplay(dpy);
+out_unlocked:
 SyncHandle();
 return r;
 
@@ -134,7 +135,7 @@ XIGetSelectedEvents(Display* dpy, Window
 *num_masks_return = -1;
 LockDisplay(dpy);
 if (_XiCheckExtInit(dpy, XInput_2_0, info) == -1)
-goto out;
+goto out_unlocked;
 
 GetReq(XIGetSelectedEvents, req);
 
@@ -209,6 +210,8 @@ out:
 Xfree(mask_in);
 
 UnlockDisplay(dpy);
+
+out_unlocked:
 SyncHandle();
 
 return mask_out;
Index: xsrc/external/mit/libXi/dist/src/XQueryDv.c
diff -u xsrc/external/mit/libXi/dist/src/XQueryDv.c:1.3 xsrc/external/mit/libXi/dist/src/XQueryDv.c:1.4
--- xsrc/external/mit/libXi/dist/src/XQueryDv.c:1.3	Sun Mar 16 22:27:35 2014
+++ xsrc/external/mit/libXi/dist/src/XQueryDv.c	Wed Apr 27 09:32:11 2016
@@ -78,7 +78,7 @@ XQueryDeviceState(
 
 LockDisplay(dpy);
 if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
-	return ((XDeviceState *) 

CVS commit: xsrc/external/mit/libXi/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 09:32:11 UTC 2016

Modified Files:
xsrc/external/mit/libXi/dist/src: XGMotion.c XGetDCtl.c XGetFCtl.c
XGetProp.c XIProperties.c XISelEv.c XQueryDv.c

Log Message:
merge libXi 1.7.6


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXi/dist/src/XGMotion.c \
xsrc/external/mit/libXi/dist/src/XGetDCtl.c \
xsrc/external/mit/libXi/dist/src/XGetProp.c \
xsrc/external/mit/libXi/dist/src/XIProperties.c \
xsrc/external/mit/libXi/dist/src/XISelEv.c \
xsrc/external/mit/libXi/dist/src/XQueryDv.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXi/dist/src/XGetFCtl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS import: xsrc/external/mit/libXi/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 09:30:56 UTC 2016

Update of /cvsroot/xsrc/external/mit/libXi/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28603

Log Message:
initial import of libXi-1.7.6

Status:

Vendor Tag: xorg
Release Tags:   libXi-1-7-6

U xsrc/external/mit/libXi/dist/configure
U xsrc/external/mit/libXi/dist/config.sub
U xsrc/external/mit/libXi/dist/docbook.am
U xsrc/external/mit/libXi/dist/configure.ac
U xsrc/external/mit/libXi/dist/ChangeLog
U xsrc/external/mit/libXi/dist/aclocal.m4
U xsrc/external/mit/libXi/dist/Makefile.in
U xsrc/external/mit/libXi/dist/xi.pc.in
U xsrc/external/mit/libXi/dist/ltmain.sh
U xsrc/external/mit/libXi/dist/COPYING
U xsrc/external/mit/libXi/dist/config.guess
U xsrc/external/mit/libXi/dist/install-sh
U xsrc/external/mit/libXi/dist/missing
U xsrc/external/mit/libXi/dist/Makefile.am
U xsrc/external/mit/libXi/dist/depcomp
U xsrc/external/mit/libXi/dist/README
U xsrc/external/mit/libXi/dist/INSTALL
N xsrc/external/mit/libXi/dist/compile
U xsrc/external/mit/libXi/dist/specs/encoding.xml
U xsrc/external/mit/libXi/dist/specs/Makefile.in
U xsrc/external/mit/libXi/dist/specs/library.xml
U xsrc/external/mit/libXi/dist/specs/Makefile.am
U xsrc/external/mit/libXi/dist/specs/inputlib.xml
U xsrc/external/mit/libXi/dist/src/XIGrabDevice.c
U xsrc/external/mit/libXi/dist/src/XListDev.c
U xsrc/external/mit/libXi/dist/src/XISetCPtr.c
U xsrc/external/mit/libXi/dist/src/XGtSelect.c
C xsrc/external/mit/libXi/dist/src/XGetProp.c
U xsrc/external/mit/libXi/dist/src/XIWarpPointer.c
U xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c
U xsrc/external/mit/libXi/dist/src/XExtInt.c
U xsrc/external/mit/libXi/dist/src/XChgKMap.c
U xsrc/external/mit/libXi/dist/src/XDevBell.c
U xsrc/external/mit/libXi/dist/src/XFreeLst.c
C xsrc/external/mit/libXi/dist/src/XGetFCtl.c
U xsrc/external/mit/libXi/dist/src/XIQueryPointer.c
C xsrc/external/mit/libXi/dist/src/XGMotion.c
U xsrc/external/mit/libXi/dist/src/XDelDProp.c
U xsrc/external/mit/libXi/dist/src/XUngrDev.c
U xsrc/external/mit/libXi/dist/src/XChgKbd.c
U xsrc/external/mit/libXi/dist/src/XChgPnt.c
U xsrc/external/mit/libXi/dist/src/XGrDvKey.c
U xsrc/external/mit/libXi/dist/src/XIQueryVersion.c
U xsrc/external/mit/libXi/dist/src/XCloseDev.c
U xsrc/external/mit/libXi/dist/src/XChDProp.c
U xsrc/external/mit/libXi/dist/src/XSetMode.c
U xsrc/external/mit/libXi/dist/src/XGetMMap.c
U xsrc/external/mit/libXi/dist/src/XIGetDevFocus.c
U xsrc/external/mit/libXi/dist/src/XSelect.c
U xsrc/external/mit/libXi/dist/src/XSetMMap.c
U xsrc/external/mit/libXi/dist/src/XIint.h
U xsrc/external/mit/libXi/dist/src/XGrDvBut.c
U xsrc/external/mit/libXi/dist/src/XListDProp.c
U xsrc/external/mit/libXi/dist/src/XOpenDev.c
U xsrc/external/mit/libXi/dist/src/Makefile.in
U xsrc/external/mit/libXi/dist/src/XIQueryDevice.c
C xsrc/external/mit/libXi/dist/src/XIProperties.c
U xsrc/external/mit/libXi/dist/src/XChgFCtl.c
U xsrc/external/mit/libXi/dist/src/XChgDCtl.c
U xsrc/external/mit/libXi/dist/src/XGetBMap.c
U xsrc/external/mit/libXi/dist/src/XIAllowEvents.c
U xsrc/external/mit/libXi/dist/src/XGetKMap.c
U xsrc/external/mit/libXi/dist/src/XExtToWire.c
U xsrc/external/mit/libXi/dist/src/XIBarrier.c
U xsrc/external/mit/libXi/dist/src/XIHierarchy.c
U xsrc/external/mit/libXi/dist/src/XChgProp.c
U xsrc/external/mit/libXi/dist/src/XIDefineCursor.c
C xsrc/external/mit/libXi/dist/src/XQueryDv.c
U xsrc/external/mit/libXi/dist/src/XSetBMap.c
U xsrc/external/mit/libXi/dist/src/XSetDVal.c
U xsrc/external/mit/libXi/dist/src/XGtFocus.c
U xsrc/external/mit/libXi/dist/src/XGetVers.c
U xsrc/external/mit/libXi/dist/src/XGrabDev.c
U xsrc/external/mit/libXi/dist/src/Makefile.am
C xsrc/external/mit/libXi/dist/src/XISelEv.c
U xsrc/external/mit/libXi/dist/src/XUngrDvB.c
U xsrc/external/mit/libXi/dist/src/XStFocus.c
U xsrc/external/mit/libXi/dist/src/XGetDProp.c
U xsrc/external/mit/libXi/dist/src/XGetCPtr.c
U xsrc/external/mit/libXi/dist/src/config.h.in
U xsrc/external/mit/libXi/dist/src/XSndExEv.c
C xsrc/external/mit/libXi/dist/src/XGetDCtl.c
U xsrc/external/mit/libXi/dist/src/XISetDevFocus.c
U xsrc/external/mit/libXi/dist/src/XAllowDv.c
U xsrc/external/mit/libXi/dist/src/XUngrDvK.c
U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput2.h
U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput.h
U xsrc/external/mit/libXi/dist/man/XGetDeviceDontPropagateList.man
U xsrc/external/mit/libXi/dist/man/XIUngrabTouchBegin.man
U xsrc/external/mit/libXi/dist/man/XIUngrabEnter.man
U xsrc/external/mit/libXi/dist/man/XISetClientPointer.man
U xsrc/external/mit/libXi/dist/man/XIGetSelectedEvents.man
U xsrc/external/mit/libXi/dist/man/XIGrabButton.man
U xsrc/external/mit/libXi/dist/man/XISetClientPointer.txt
U xsrc/external/mit/libXi/dist/man/XIGrabDevice.txt
U xsrc/external/mit/libXi/dist/man/XChangeDeviceControl.man
U xsrc/external/mit/libXi/dist/man/XChangeDeviceDontPropagateList.man
U xsrc/external/mit/libXi/dist/man/XIQueryVersion.txt
U 

CVS import: xsrc/external/mit/libXi/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 09:30:56 UTC 2016

Update of /cvsroot/xsrc/external/mit/libXi/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv28603

Log Message:
initial import of libXi-1.7.6

Status:

Vendor Tag: xorg
Release Tags:   libXi-1-7-6

U xsrc/external/mit/libXi/dist/configure
U xsrc/external/mit/libXi/dist/config.sub
U xsrc/external/mit/libXi/dist/docbook.am
U xsrc/external/mit/libXi/dist/configure.ac
U xsrc/external/mit/libXi/dist/ChangeLog
U xsrc/external/mit/libXi/dist/aclocal.m4
U xsrc/external/mit/libXi/dist/Makefile.in
U xsrc/external/mit/libXi/dist/xi.pc.in
U xsrc/external/mit/libXi/dist/ltmain.sh
U xsrc/external/mit/libXi/dist/COPYING
U xsrc/external/mit/libXi/dist/config.guess
U xsrc/external/mit/libXi/dist/install-sh
U xsrc/external/mit/libXi/dist/missing
U xsrc/external/mit/libXi/dist/Makefile.am
U xsrc/external/mit/libXi/dist/depcomp
U xsrc/external/mit/libXi/dist/README
U xsrc/external/mit/libXi/dist/INSTALL
N xsrc/external/mit/libXi/dist/compile
U xsrc/external/mit/libXi/dist/specs/encoding.xml
U xsrc/external/mit/libXi/dist/specs/Makefile.in
U xsrc/external/mit/libXi/dist/specs/library.xml
U xsrc/external/mit/libXi/dist/specs/Makefile.am
U xsrc/external/mit/libXi/dist/specs/inputlib.xml
U xsrc/external/mit/libXi/dist/src/XIGrabDevice.c
U xsrc/external/mit/libXi/dist/src/XListDev.c
U xsrc/external/mit/libXi/dist/src/XISetCPtr.c
U xsrc/external/mit/libXi/dist/src/XGtSelect.c
C xsrc/external/mit/libXi/dist/src/XGetProp.c
U xsrc/external/mit/libXi/dist/src/XIWarpPointer.c
U xsrc/external/mit/libXi/dist/src/XIPassiveGrab.c
U xsrc/external/mit/libXi/dist/src/XExtInt.c
U xsrc/external/mit/libXi/dist/src/XChgKMap.c
U xsrc/external/mit/libXi/dist/src/XDevBell.c
U xsrc/external/mit/libXi/dist/src/XFreeLst.c
C xsrc/external/mit/libXi/dist/src/XGetFCtl.c
U xsrc/external/mit/libXi/dist/src/XIQueryPointer.c
C xsrc/external/mit/libXi/dist/src/XGMotion.c
U xsrc/external/mit/libXi/dist/src/XDelDProp.c
U xsrc/external/mit/libXi/dist/src/XUngrDev.c
U xsrc/external/mit/libXi/dist/src/XChgKbd.c
U xsrc/external/mit/libXi/dist/src/XChgPnt.c
U xsrc/external/mit/libXi/dist/src/XGrDvKey.c
U xsrc/external/mit/libXi/dist/src/XIQueryVersion.c
U xsrc/external/mit/libXi/dist/src/XCloseDev.c
U xsrc/external/mit/libXi/dist/src/XChDProp.c
U xsrc/external/mit/libXi/dist/src/XSetMode.c
U xsrc/external/mit/libXi/dist/src/XGetMMap.c
U xsrc/external/mit/libXi/dist/src/XIGetDevFocus.c
U xsrc/external/mit/libXi/dist/src/XSelect.c
U xsrc/external/mit/libXi/dist/src/XSetMMap.c
U xsrc/external/mit/libXi/dist/src/XIint.h
U xsrc/external/mit/libXi/dist/src/XGrDvBut.c
U xsrc/external/mit/libXi/dist/src/XListDProp.c
U xsrc/external/mit/libXi/dist/src/XOpenDev.c
U xsrc/external/mit/libXi/dist/src/Makefile.in
U xsrc/external/mit/libXi/dist/src/XIQueryDevice.c
C xsrc/external/mit/libXi/dist/src/XIProperties.c
U xsrc/external/mit/libXi/dist/src/XChgFCtl.c
U xsrc/external/mit/libXi/dist/src/XChgDCtl.c
U xsrc/external/mit/libXi/dist/src/XGetBMap.c
U xsrc/external/mit/libXi/dist/src/XIAllowEvents.c
U xsrc/external/mit/libXi/dist/src/XGetKMap.c
U xsrc/external/mit/libXi/dist/src/XExtToWire.c
U xsrc/external/mit/libXi/dist/src/XIBarrier.c
U xsrc/external/mit/libXi/dist/src/XIHierarchy.c
U xsrc/external/mit/libXi/dist/src/XChgProp.c
U xsrc/external/mit/libXi/dist/src/XIDefineCursor.c
C xsrc/external/mit/libXi/dist/src/XQueryDv.c
U xsrc/external/mit/libXi/dist/src/XSetBMap.c
U xsrc/external/mit/libXi/dist/src/XSetDVal.c
U xsrc/external/mit/libXi/dist/src/XGtFocus.c
U xsrc/external/mit/libXi/dist/src/XGetVers.c
U xsrc/external/mit/libXi/dist/src/XGrabDev.c
U xsrc/external/mit/libXi/dist/src/Makefile.am
C xsrc/external/mit/libXi/dist/src/XISelEv.c
U xsrc/external/mit/libXi/dist/src/XUngrDvB.c
U xsrc/external/mit/libXi/dist/src/XStFocus.c
U xsrc/external/mit/libXi/dist/src/XGetDProp.c
U xsrc/external/mit/libXi/dist/src/XGetCPtr.c
U xsrc/external/mit/libXi/dist/src/config.h.in
U xsrc/external/mit/libXi/dist/src/XSndExEv.c
C xsrc/external/mit/libXi/dist/src/XGetDCtl.c
U xsrc/external/mit/libXi/dist/src/XISetDevFocus.c
U xsrc/external/mit/libXi/dist/src/XAllowDv.c
U xsrc/external/mit/libXi/dist/src/XUngrDvK.c
U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput2.h
U xsrc/external/mit/libXi/dist/include/X11/extensions/XInput.h
U xsrc/external/mit/libXi/dist/man/XGetDeviceDontPropagateList.man
U xsrc/external/mit/libXi/dist/man/XIUngrabTouchBegin.man
U xsrc/external/mit/libXi/dist/man/XIUngrabEnter.man
U xsrc/external/mit/libXi/dist/man/XISetClientPointer.man
U xsrc/external/mit/libXi/dist/man/XIGetSelectedEvents.man
U xsrc/external/mit/libXi/dist/man/XIGrabButton.man
U xsrc/external/mit/libXi/dist/man/XISetClientPointer.txt
U xsrc/external/mit/libXi/dist/man/XIGrabDevice.txt
U xsrc/external/mit/libXi/dist/man/XChangeDeviceControl.man
U xsrc/external/mit/libXi/dist/man/XChangeDeviceDontPropagateList.man
U xsrc/external/mit/libXi/dist/man/XIQueryVersion.txt
U 

CVS commit: src/usr.sbin/cpuctl/arch

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 08:53:28 UTC 2016

Modified Files:
src/usr.sbin/cpuctl/arch: i386.c

Log Message:
Add some name from the latest Intel SDM.
 - Quark X1000, Xeon E5 v4 and the future processors.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/usr.sbin/cpuctl/arch/i386.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.sbin/cpuctl/arch

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 08:53:28 UTC 2016

Modified Files:
src/usr.sbin/cpuctl/arch: i386.c

Log Message:
Add some name from the latest Intel SDM.
 - Quark X1000, Xeon E5 v4 and the future processors.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/usr.sbin/cpuctl/arch/i386.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.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.71 src/usr.sbin/cpuctl/arch/i386.c:1.72
--- src/usr.sbin/cpuctl/arch/i386.c:1.71	Wed Apr 27 06:58:06 2016
+++ src/usr.sbin/cpuctl/arch/i386.c	Wed Apr 27 08:53:28 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386.c,v 1.71 2016/04/27 06:58:06 msaitoh Exp $	*/
+/*	$NetBSD: i386.c,v 1.72 2016/04/27 08:53:28 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.71 2016/04/27 06:58:06 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.72 2016/04/27 08:53:28 msaitoh Exp $");
 #endif /* not lint */
 
 #include 
@@ -300,7 +300,7 @@ const struct cpu_cpuid_nameclass i386_cp
 "Pentium (P54C)", "Pentium (P24T)",
 "Pentium/MMX", "Pentium", 0,
 "Pentium (P54C)", "Pentium/MMX (Tillamook)",
-0, 0, 0, 0, 0, 0, 0,
+"Quark X1000", 0, 0, 0, 0, 0, 0,
 			},
 			"Pentium",	/* Default */
 			NULL,
@@ -370,12 +370,17 @@ const struct cpu_cpuid_nameclass i386_cp
 [0x4c] = "Atom X[57]-Z8000 (Airmont)",
 [0x4d] = "Atom C2000",
 [0x4e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)",
-[0x4f] = "Future gen Xeon (Broadwell)",
+[0x4f] = "Xeon E5 v4 (Broadwell)",
+[0x55] = "Future Xeon",
 [0x56] = "Xeon D-1500 (Broadwell)",
 [0x57] = "Next gen Xeon Phi",
 [0x5a] = "Atom E3500",
+[0x5c] = "Next Atom (Goldmont)",
 [0x5d] = "Atom X3-C3000 (Silvermont)",
 [0x5e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)",
+[0x5f] = "Future Atom (Goldmont)",
+[0x8e] = "Future Core",
+[0x9e] = "Future Core",
 			},
 			"Pentium Pro, II or III",	/* Default */
 			NULL,

CVS commit: src/sys/arch/x86/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 08:51:32 UTC 2016

Modified Files:
src/sys/arch/x86/include: specialreg.h

Log Message:
Add some bit definitions mainly taken from the latest Intel SDM:
 - Add SGX, UMIP, RDPID and SGXLC.
 - Add avx512dq, avx512bw and avx512vl.
Fix the bit location of CLFLUSHOPT.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/x86/include/specialreg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 08:51:32 UTC 2016

Modified Files:
src/sys/arch/x86/include: specialreg.h

Log Message:
Add some bit definitions mainly taken from the latest Intel SDM:
 - Add SGX, UMIP, RDPID and SGXLC.
 - Add avx512dq, avx512bw and avx512vl.
Fix the bit location of CLFLUSHOPT.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/x86/include/specialreg.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/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.86 src/sys/arch/x86/include/specialreg.h:1.87
--- src/sys/arch/x86/include/specialreg.h:1.86	Wed Jan 13 07:19:29 2016
+++ src/sys/arch/x86/include/specialreg.h	Wed Apr 27 08:51:32 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: specialreg.h,v 1.86 2016/01/13 07:19:29 msaitoh Exp $	*/
+/*	$NetBSD: specialreg.h,v 1.87 2016/04/27 08:51:32 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -318,6 +318,7 @@
 /* %ebx */
 #define CPUID_SEF_FSGSBASE	__BIT(0)
 #define CPUID_SEF_TSC_ADJUST	__BIT(1)
+#define CPUID_SEF_SGX		__BIT(2)
 #define CPUID_SEF_BMI1		__BIT(3)
 #define CPUID_SEF_HLE		__BIT(4)
 #define CPUID_SEF_AVX2		__BIT(5)
@@ -332,6 +333,7 @@
 #define CPUID_SEF_MPX		__BIT(14)
 #define CPUID_SEF_PQE		__BIT(15)
 #define CPUID_SEF_AVX512F	__BIT(16)
+#define CPUID_SEF_AVX512DQ	__BIT(17)
 #define CPUID_SEF_RDSEED	__BIT(18)
 #define CPUID_SEF_ADX		__BIT(19)
 #define CPUID_SEF_SMAP		__BIT(20)
@@ -341,25 +343,32 @@
 #define CPUID_SEF_AVX512ER	__BIT(27)
 #define CPUID_SEF_AVX512CD	__BIT(28)
 #define CPUID_SEF_SHA		__BIT(29)
+#define CPUID_SEF_AVX512BW	__BIT(30)
+#define CPUID_SEF_AVX512VL	__BIT(31)
 
 #define CPUID_SEF_FLAGS	"\20" \
-	"\1" "FSGSBASE"	"\2" "TSCADJUST"		"\4" "BMI1"	\
+	"\1" "FSGSBASE"	"\2" "TSCADJUST" "\3" "SGX"	"\4" "BMI1"	\
 	"\5" "HLE"	"\6" "AVX2"	"\7" "FDPEXONLY" "\10" "SMEP"	\
 	"\11" "BMI2"	"\12" "ERMS"	"\13" "INVPCID"	"\14" "RTM"	\
 	"\15" "QM"	"\16" "FPUCSDS"	"\17" "MPX"	"\20" "PQE"	\
-	"\21" "AVX512F"			"\23" "RDSEED"	"\24" "ADX"	\
-	"\25" "SMAP"	"\26" "CLFLUSHOPT"\
-			"\32" "PT"	"\33" "AVX512PF""\34" "AVX512ER" \
-	"\35" "AVX512CD""\36" "SHA"
+	"\21" "AVX512F"	"\22" "AVX512DQ" "\23" "RDSEED"	"\24" "ADX"	\
+	"\25" "SMAP"	"\28" "CLFLUSHOPT" \
+			"\32" "PT"	"\33" "AVX512PF" "\34" "AVX512ER" \
+	"\35" "AVX512CD""\36" "SHA"	"\37" "AVX512BW" "\38" "AVX512VL"
 
 /* %ecx */
 #define CPUID_SEF_PREFETCHWT1	__BIT(0)
+#define CPUID_SEF_UMIP		__BIT(2)
 #define CPUID_SEF_PKU		__BIT(3)
 #define CPUID_SEF_OSPKE		__BIT(4)
+#define CPUID_SEF_RDPID		__BIT(22)
+#define CPUID_SEF_SGXLC		__BIT(30)
 
 #define CPUID_SEF_FLAGS1	"\20" \
-	"\1" "PREFETCHWT1""\4" "PKU"	\
-	"\5" "OSPKE"
+	"\1" "PREFETCHWT1"		"\3" "UMIP"	"\4" "PKU"	\
+	"\5" "OSPKE"			\
+	"\27" "RDPID"			\
+	"\37" "SGXLC"
 
 /*
  * CPUID Processor extended state Enumeration Fn000d

CVS commit: src/sys/arch/x86/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 08:47:03 UTC 2016

Modified Files:
src/sys/arch/x86/include: cacheinfo.h

Log Message:
Add new desc 0x64 and 0xc4.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/include/cacheinfo.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/include

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 08:47:03 UTC 2016

Modified Files:
src/sys/arch/x86/include: cacheinfo.h

Log Message:
Add new desc 0x64 and 0xc4.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/include/cacheinfo.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/x86/include/cacheinfo.h
diff -u src/sys/arch/x86/include/cacheinfo.h:1.21 src/sys/arch/x86/include/cacheinfo.h:1.22
--- src/sys/arch/x86/include/cacheinfo.h:1.21	Fri Jan  8 02:25:15 2016
+++ src/sys/arch/x86/include/cacheinfo.h	Wed Apr 27 08:47:03 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: cacheinfo.h,v 1.21 2016/01/08 02:25:15 msaitoh Exp $	*/
+/*	$NetBSD: cacheinfo.h,v 1.22 2016/04/27 08:47:03 msaitoh Exp $	*/
 
 #ifndef _X86_CACHEINFO_H_
 #define _X86_CACHEINFO_H_
@@ -234,6 +234,7 @@ __CI_TBL(CAI_DTLB, 0x5c, 0xff, 64,  
 __CI_TBL(CAI_DTLB, 0x5d, 0xff, 64,4 * 1024, "4K/4M: 256 entries"),\
 __CI_TBL(CAI_ITLB, 0x61, 0xff, 48,4 * 1024, NULL), \
 __CI_TBL(CAI_L1_1GBDTLB,0x63,   4,  4,1024*1024 * 1024, NULL), \
+__CI_TBL(CAI_DTLB, 0x64,4,512,4 * 1024, NULL), \
 __CI_TBL(CAI_ITLB, 0x6a,8, 64,4 * 1024, NULL), \
 __CI_TBL(CAI_DTLB, 0x6b,8,256,4 * 1024, NULL), \
 __CI_TBL(CAI_L2_DTLB2, 0x6c,8,128,   0, "2M/4M: 128 entries"),\
@@ -252,6 +253,7 @@ __CI_TBL(CAI_DTLB2,0xc0,4,  8,  
 __CI_TBL(CAI_L2_STLB2, 0xc1,8,1024,   4 * 1024, "4K/2M: 1024 entries"), \
 __CI_TBL(CAI_DTLB2,0xc2,4, 16,4 * 1024, "4K/2M: 16 entries"), \
 __CI_TBL(CAI_L2_STLB,  0xc3,6,1536,   4 * 1024, NULL), \
+__CI_TBL(CAI_DTLB2,0xc4,4, 32,4 * 1024, "2M/4M: 32 entries"), \
 __CI_TBL(CAI_L2_STLB,  0xca,4,512,4 * 1024, NULL), \
 __CI_TBL(CAI_ICACHE,   0x06,4,8 * 1024, 32, NULL), \
 __CI_TBL(CAI_ICACHE,   0x08,4,   16 * 1024, 32, NULL), \

CVS commit: src/sys/arch/x86/x86

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 08:45:22 UTC 2016

Modified Files:
src/sys/arch/x86/x86: procfs_machdep.c

Log Message:
Take some changes from the Linux's latest x86/include/asm/cpufeatures.h.
 - Add ptsc, avx512dq, avx512bw and avx512vl
 - Remove some Linux mappings.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x86/x86/procfs_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/x86/x86

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 08:45:22 UTC 2016

Modified Files:
src/sys/arch/x86/x86: procfs_machdep.c

Log Message:
Take some changes from the Linux's latest x86/include/asm/cpufeatures.h.
 - Add ptsc, avx512dq, avx512bw and avx512vl
 - Remove some Linux mappings.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/x86/x86/procfs_machdep.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/x86/x86/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.11 src/sys/arch/x86/x86/procfs_machdep.c:1.12
--- src/sys/arch/x86/x86/procfs_machdep.c:1.11	Fri Feb 12 05:32:47 2016
+++ src/sys/arch/x86/x86/procfs_machdep.c	Wed Apr 27 08:45:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: procfs_machdep.c,v 1.11 2016/02/12 05:32:47 msaitoh Exp $ */
+/*	$NetBSD: procfs_machdep.c,v 1.12 2016/04/27 08:45:22 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.11 2016/02/12 05:32:47 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.12 2016/04/27 08:45:22 msaitoh Exp $");
 
 #include 
 #include 
@@ -105,12 +105,13 @@ static const char * const x86_features[]
 	"3dnowprefetch", "osvw", "ibs", "xop", "skinit", "wdt", NULL, "lwp",
 	"fma4", "tce", NULL, "nodeid_msr",
 	NULL, "tbm", "topoext", "perfctr_core",
-	"perfctr_nb", NULL, "bpext", NULL, "perfctr_l2", "mwaitx", NULL, NULL},
+	"perfctr_nb", NULL, "bpext", "ptsc",
+	"perfctr_l2", "mwaitx", NULL, NULL},
 
 	{ /* (7) Linux mapping */
-	"ida", "arat", "cpb", "ebp", NULL, "pln", "pts", "dtherm",
-	"hw_pstate", "proc_feedback", "hwp", "hwp_notify", "hwp_act_window",
-	"hwp_epp", "hwp_pkg_req", "intel_pt",
+	NULL, NULL, "cpb", "ebp", NULL, "pln", "pts", "dtherm",
+	"hw_pstate", "proc_feedback", NULL, NULL,
+	NULL, NULL, NULL, "intel_pt",
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 
@@ -125,10 +126,10 @@ static const char * const x86_features[]
 	{ /* (9) Intel-defined: 0007 ebx */
 	"fsgsbase", "tsc_adjust", NULL, "bmi1", "hle", "avx2", NULL, "smep",
 	"bmi2", "erms", "invpcid", "rtm", "cqm", NULL, "mpx", NULL,
-	"avx512f", NULL, "rdseed", "adx",
+	"avx512f", "avx512dq", "rdseed", "adx",
 	"smap", NULL, "pcommit", "clflushopt",
 	"clwb", NULL, "avx512pf", "avx512er",
-	"avx512cd", "sha_ni", NULL, NULL},
+	"avx512cd", "sha_ni", "avx512bw", "avx512vl"},
 
 	{ /* (10) 000d eax */
 	"xsaveopt", "xsavec", "xgetbv1", "xsaves", NULL, NULL, NULL, NULL,

Re: CVS commit: src/sys/dev/ic

[Christos Zoulas]

In article <27894.1461718...@splode.eterna.com.au>,
matthew green   wrote:
>"Christos Zoulas" writes:
>> Module Name: src
>> Committed By:christos
>> Date:Tue Apr 26 21:17:20 UTC 2016
>> 
>> Modified Files:
>>  src/sys/dev/ic: rt2860reg.h
>> Added Files:
>>  src/sys/dev/ic: rt2860.c rt2860var.h
>> 
>> Log Message:
>> Unmodified OpenBSD sources (except Ids)
>... could you describe what these sources do? :-)

There are part of if_ral_pci.c for the 2860 variant of the chip.

christos

CVS commit: src/share/man/man9

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Apr 27 08:18:40 UTC 2016

Modified Files:
src/share/man/man9: psref.9

Log Message:
Fix usages of PSLIST_ENTRY_* in the example code


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/psref.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/man/man9

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Apr 27 08:18:40 UTC 2016

Modified Files:
src/share/man/man9: psref.9

Log Message:
Fix usages of PSLIST_ENTRY_* in the example code


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/man/man9/psref.9

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/man9/psref.9
diff -u src/share/man/man9/psref.9:1.4 src/share/man/man9/psref.9:1.5
--- src/share/man/man9/psref.9:1.4	Wed Apr 27 08:05:31 2016
+++ src/share/man/man9/psref.9	Wed Apr 27 08:18:40 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: psref.9,v 1.4 2016/04/27 08:05:31 ozaki-r Exp $
+.\"	$NetBSD: psref.9,v 1.5 2016/04/27 08:18:40 ozaki-r Exp $
 .\"
 .\" Copyright (c) 2016 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -302,7 +302,7 @@ publish_as_frotz(uint64_t key, ...)
 	f = kmem_alloc(sizeof(*f), KM_SLEEP);
 	f->f_key = key;
 	f->f_... = ...;
-	PSLIST_ENTRY_INIT(>f_entry);
+	PSLIST_ENTRY_INIT(f, f_entry);
 	psref_target_init(>f_target, frobbotzim_prc);
 
 	mutex_enter();
@@ -379,7 +379,7 @@ destroy_frotz(int key)
 	if (f != NULL) {
 		/* Wait for all readers to drain before freeing.  */
 		psref_target_destroy(>f_target, frobbotzim_prc);
-		PSLIST_ENTRY_DESTROY(>f_entry);
+		PSLIST_ENTRY_DESTROY(f, f_entry);
 		kmem_free(f, sizeof(*f));
 	}
 }

CVS commit: src/share/man/man9

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Apr 27 08:05:31 UTC 2016

Modified Files:
src/share/man/man9: psref.9

Log Message:
Fix usage of frobbotzim_prc in the example code


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/psref.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/man/man9

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Apr 27 08:05:31 UTC 2016

Modified Files:
src/share/man/man9: psref.9

Log Message:
Fix usage of frobbotzim_prc in the example code


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/psref.9

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/man9/psref.9
diff -u src/share/man/man9/psref.9:1.3 src/share/man/man9/psref.9:1.4
--- src/share/man/man9/psref.9:1.3	Fri Apr 15 17:55:58 2016
+++ src/share/man/man9/psref.9	Wed Apr 27 08:05:31 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: psref.9,v 1.3 2016/04/15 17:55:58 riastradh Exp $
+.\"	$NetBSD: psref.9,v 1.4 2016/04/27 08:05:31 ozaki-r Exp $
 .\"
 .\" Copyright (c) 2016 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 8, 2016
+.Dd April 27, 2016
 .Dt PSREF 9
 .Os
 .\"
@@ -324,7 +324,7 @@ use_frotz(int key, int op)
 	do_stuff_with_frotz(f, op);
 
 	/* Release passive reference, possibly waking destroy_frotz.  */
-	psref_release(, >f_psref, _prc);
+	psref_release(, >f_psref, frobbotzim_prc);
 
 	return 0;
 }
@@ -341,7 +341,7 @@ lookup_frotz(int key, struct psref *ref)
 		/* f is stable until pserialize_read_exit.  */
 		if (f->f_key == key) {
 			/* Acquire a passive reference.  */
-			psref_acquire(ref, >f_target, _prc);
+			psref_acquire(ref, >f_target, frobbotzim_prc);
 			/* f is now stable until psref_release.  */
 			break;
 		}
@@ -378,7 +378,7 @@ destroy_frotz(int key)
 
 	if (f != NULL) {
 		/* Wait for all readers to drain before freeing.  */
-		psref_target_destroy(>f_target, _prc);
+		psref_target_destroy(>f_target, frobbotzim_prc);
 		PSLIST_ENTRY_DESTROY(>f_entry);
 		kmem_free(f, sizeof(*f));
 	}

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Apr 27 07:51:14 UTC 2016

Modified Files:
src/sys/netinet6: in6_ifattach.c

Log Message:
Get rid of unused argument from get_rand_ifid


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/netinet6/in6_ifattach.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/netinet6

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Apr 27 07:51:14 UTC 2016

Modified Files:
src/sys/netinet6: in6_ifattach.c

Log Message:
Get rid of unused argument from get_rand_ifid


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/netinet6/in6_ifattach.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/netinet6/in6_ifattach.c
diff -u src/sys/netinet6/in6_ifattach.c:1.96 src/sys/netinet6/in6_ifattach.c:1.97
--- src/sys/netinet6/in6_ifattach.c:1.96	Fri Apr  1 08:12:00 2016
+++ src/sys/netinet6/in6_ifattach.c	Wed Apr 27 07:51:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_ifattach.c,v 1.96 2016/04/01 08:12:00 ozaki-r Exp $	*/
+/*	$NetBSD: in6_ifattach.c,v 1.97 2016/04/27 07:51:14 ozaki-r Exp $	*/
 /*	$KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.96 2016/04/01 08:12:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_ifattach.c,v 1.97 2016/04/27 07:51:14 ozaki-r Exp $");
 
 #include 
 #include 
@@ -71,7 +71,7 @@ callout_t in6_tmpaddrtimer_ch;
 #if 0
 static int get_hostid_ifid(struct ifnet *, struct in6_addr *);
 #endif
-static int get_rand_ifid(struct ifnet *, struct in6_addr *);
+static int get_rand_ifid(struct in6_addr *);
 static int generate_tmp_ifid(u_int8_t *, const u_int8_t *, u_int8_t *);
 static int get_ifid(struct ifnet *, struct ifnet *, struct in6_addr *);
 static int in6_ifattach_linklocal(struct ifnet *, struct ifnet *);
@@ -141,8 +141,7 @@ get_hostid_ifid(struct ifnet *ifp, struc
  * We currently use MD5(hostname) for it.
  */
 static int
-get_rand_ifid(struct ifnet *ifp,
-	struct in6_addr *in6)	/* upper 64bits are preserved */
+get_rand_ifid(struct in6_addr *in6)	/* upper 64bits are preserved */
 {
 	MD5_CTX ctxt;
 	u_int8_t digest[16];
@@ -500,7 +499,7 @@ get_ifid(struct ifnet *ifp0, struct ifne
 #endif
 
 	/* last resort: get from random number source */
-	if (get_rand_ifid(ifp, in6) == 0) {
+	if (get_rand_ifid(in6) == 0) {
 		nd6log(LOG_DEBUG,
 		"%s: interface identifier generated by random number\n",
 		if_name(ifp0));

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 07:23:01 UTC 2016

Modified Files:
xsrc/external/mit/xkbcomp/dist: expr.c
xsrc/external/mit/xrandr/dist: xrandr.c
Added Files:
xsrc/external/mit/xrandr/dist: compile

Log Message:
merge xkbcomp 1.3.1 and xrandr 1.5.0.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xkbcomp/dist/expr.c
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xrandr/dist/compile
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xrandr/dist/xrandr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xkbcomp/dist/expr.c
diff -u xsrc/external/mit/xkbcomp/dist/expr.c:1.2 xsrc/external/mit/xkbcomp/dist/expr.c:1.3
--- xsrc/external/mit/xkbcomp/dist/expr.c:1.2	Wed Jul 22 08:39:03 2015
+++ xsrc/external/mit/xkbcomp/dist/expr.c	Wed Apr 27 07:23:01 2016
@@ -729,9 +729,8 @@ ExprResolveString(ExprDef * expr,
 val_rtrn->str = XkbAtomGetString(NULL, expr->value.str);
 if (val_rtrn->str == NULL)
 {
-	static char empty_char = '\0';
-char *empty = _char;
-val_rtrn->str = empty;
+static char empty_char = '\0';
+val_rtrn->str = _char;
 }
 return True;
 case ExprIdent:

Index: xsrc/external/mit/xrandr/dist/xrandr.c
diff -u xsrc/external/mit/xrandr/dist/xrandr.c:1.12 xsrc/external/mit/xrandr/dist/xrandr.c:1.13
--- xsrc/external/mit/xrandr/dist/xrandr.c:1.12	Wed Jul 22 08:47:22 2015
+++ xsrc/external/mit/xrandr/dist/xrandr.c	Wed Apr 27 07:23:01 2016
@@ -153,7 +153,11 @@ usage(void)
"  --delmode  \n"
"  --listproviders\n"
"  --setprovideroutputsource  \n"
-   "  --setprovideroffloadsink  \n");
+   "  --setprovideroffloadsink  \n"
+	   "  --listmonitors\n"
+	   "  --listactivemonitors\n"
+	   "  --setmonitor  {auto|/x/++} {none|,,...}\n"
+	   "  --delmonitor \n");
 }
 
 static void _X_NORETURN _X_ATTRIBUTE_PRINTF(1,2)
@@ -304,6 +308,8 @@ typedef struct _transform transform_t;
 typedef struct _umode	umode_t;
 typedef struct _output_prop output_prop_t;
 typedef struct _provider provider_t;
+typedef struct _monitors monitors_t;
+typedef struct _umonitor umonitor_t;
 
 struct _transform {
 XTransform	transform;
@@ -397,6 +403,22 @@ struct _provider {
 XRRProviderInfo	*info;
 };
 
+struct _monitors {
+int			n;
+XRRMonitorInfo	*monitors;
+};
+
+struct _umonitor {
+struct _umonitor	*next;
+char		*name;
+Bool		set;
+Bool		primary;
+int			x, y, width, height;
+int			mmwidth, mmheight;
+int			noutput;
+name_t		*outputs;
+};
+
 static const char *connection[3] = {
 "connected",
 "disconnected",
@@ -431,7 +453,10 @@ static int	minWidth, maxWidth, minHeight
 static Bool	has_1_2 = False;
 static Bool	has_1_3 = False;
 static Bool	has_1_4 = False;
+static Bool	has_1_5 = False;
 static name_t   provider_name, output_source_provider_name, offload_sink_provider_name;
+static monitors_t	*monitors;
+static umonitor_t	*umonitors;
 
 static int
 mode_height (XRRModeInfo *mode_info, Rotation rotation)
@@ -541,7 +566,7 @@ mode_geometry (XRRModeInfo *mode_info, R
 
 /* v refresh frequency in Hz */
 static double
-mode_refresh (XRRModeInfo *mode_info)
+mode_refresh (const XRRModeInfo *mode_info)
 {
 double rate;
 double vTotal = mode_info->vTotal;
@@ -567,7 +592,7 @@ mode_refresh (XRRModeInfo *mode_info)
 
 /* h sync frequency in Hz */
 static double
-mode_hsync (XRRModeInfo *mode_info)
+mode_hsync (const XRRModeInfo *mode_info)
 {
 double rate;
 
@@ -579,6 +604,30 @@ mode_hsync (XRRModeInfo *mode_info)
 }
 
 static void
+print_verbose_mode (const XRRModeInfo *mode, Bool current, Bool preferred)
+{
+int f;
+
+printf ("  %s (0x%x) %6.3fMHz",
+	mode->name, (int)mode->id,
+	(double)mode->dotClock / 100.0);
+for (f = 0; mode_flags[f].flag; f++)
+	if (mode->modeFlags & mode_flags[f].flag)
+	printf (" %s", mode_flags[f].string);
+if (current)
+	printf (" *current");
+if (preferred)
+	printf (" +preferred");
+printf ("\n");
+printf ("h: width  %4d start %4d end %4d total %4d skew %4d clock %6.2fKHz\n",
+	mode->width, mode->hSyncStart, mode->hSyncEnd,
+	mode->hTotal, mode->hSkew, mode_hsync (mode) / 1000);
+printf ("v: height %4d start %4d end %4d total %4d   clock %6.2fHz\n",
+	mode->height, mode->vSyncStart, mode->vSyncEnd, mode->vTotal,
+	mode_refresh (mode));
+}
+
+static void
 init_name (name_t *name)
 {
 name->kind = name_none;
@@ -2194,6 +2243,8 @@ static void
 pick_crtcs (void)
 {
 output_t	*output;
+int saved_crtc_noutput[num_crtcs];
+int n;
 
 /*
  * First try to match up newly enabled outputs with spare crtcs
@@ -2225,7 +2276,18 @@ pick_crtcs (void)
  */
 for (output = all_outputs; output; output = output->next)
 	

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 07:23:01 UTC 2016

Modified Files:
xsrc/external/mit/xkbcomp/dist: expr.c
xsrc/external/mit/xrandr/dist: xrandr.c
Added Files:
xsrc/external/mit/xrandr/dist: compile

Log Message:
merge xkbcomp 1.3.1 and xrandr 1.5.0.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xkbcomp/dist/expr.c
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/xrandr/dist/compile
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xrandr/dist/xrandr.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS import: xsrc/external/mit/xinput/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 07:19:33 UTC 2016

Update of /cvsroot/xsrc/external/mit/xinput/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv6919

Log Message:
initial import of xinput-1.6.2

Status:

Vendor Tag: xorg
Release Tags:   xinput-1-6-2

U xsrc/external/mit/xinput/dist/depcomp
U xsrc/external/mit/xinput/dist/configure
U xsrc/external/mit/xinput/dist/config.sub
U xsrc/external/mit/xinput/dist/configure.ac
U xsrc/external/mit/xinput/dist/AUTHORS
U xsrc/external/mit/xinput/dist/ChangeLog
U xsrc/external/mit/xinput/dist/aclocal.m4
U xsrc/external/mit/xinput/dist/NEWS
U xsrc/external/mit/xinput/dist/Makefile.in
U xsrc/external/mit/xinput/dist/COPYING
U xsrc/external/mit/xinput/dist/config.guess
U xsrc/external/mit/xinput/dist/install-sh
U xsrc/external/mit/xinput/dist/missing
U xsrc/external/mit/xinput/dist/Makefile.am
U xsrc/external/mit/xinput/dist/README
U xsrc/external/mit/xinput/dist/INSTALL
U xsrc/external/mit/xinput/dist/compile
U xsrc/external/mit/xinput/dist/config.h.in
U xsrc/external/mit/xinput/dist/src/test_xi2.c
U xsrc/external/mit/xinput/dist/src/setptr.c
U xsrc/external/mit/xinput/dist/src/list.c
U xsrc/external/mit/xinput/dist/src/transform.c
U xsrc/external/mit/xinput/dist/src/xinput.c
U xsrc/external/mit/xinput/dist/src/xinput.h
U xsrc/external/mit/xinput/dist/src/setcp.c
U xsrc/external/mit/xinput/dist/src/Makefile.in
U xsrc/external/mit/xinput/dist/src/property.c
U xsrc/external/mit/xinput/dist/src/setmode.c
U xsrc/external/mit/xinput/dist/src/feedback.c
U xsrc/external/mit/xinput/dist/src/Makefile.am
U xsrc/external/mit/xinput/dist/src/setint.c
U xsrc/external/mit/xinput/dist/src/state.c
U xsrc/external/mit/xinput/dist/src/hierarchy.c
U xsrc/external/mit/xinput/dist/src/test.c
U xsrc/external/mit/xinput/dist/src/buttonmap.c
U xsrc/external/mit/xinput/dist/man/xinput.man
U xsrc/external/mit/xinput/dist/man/Makefile.in
U xsrc/external/mit/xinput/dist/man/Makefile.am

No conflicts created by this import

CVS import: xsrc/external/mit/xkbcomp/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 07:19:35 UTC 2016

Update of /cvsroot/xsrc/external/mit/xkbcomp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10584

Log Message:
initial import of xkbcomp-1.3.1

Status:

Vendor Tag: xorg
Release Tags:   xkbcomp-1-3-1

U xsrc/external/mit/xkbcomp/dist/geometry.c
U xsrc/external/mit/xkbcomp/dist/tokens.h
U xsrc/external/mit/xkbcomp/dist/xkbcomp.pc.in
U xsrc/external/mit/xkbcomp/dist/keycodes.c
U xsrc/external/mit/xkbcomp/dist/parseutils.c
U xsrc/external/mit/xkbcomp/dist/configure
U xsrc/external/mit/xkbcomp/dist/config.sub
U xsrc/external/mit/xkbcomp/dist/keytypes.c
U xsrc/external/mit/xkbcomp/dist/symbols.c
U xsrc/external/mit/xkbcomp/dist/compat.h
U xsrc/external/mit/xkbcomp/dist/keycodes.h
U xsrc/external/mit/xkbcomp/dist/utils.h
U xsrc/external/mit/xkbcomp/dist/xkbscan.c
U xsrc/external/mit/xkbcomp/dist/configure.ac
U xsrc/external/mit/xkbcomp/dist/compat.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.c
U xsrc/external/mit/xkbcomp/dist/ChangeLog
U xsrc/external/mit/xkbcomp/dist/utils.c
U xsrc/external/mit/xkbcomp/dist/aclocal.m4
U xsrc/external/mit/xkbcomp/dist/Makefile.in
U xsrc/external/mit/xkbcomp/dist/misc.h
U xsrc/external/mit/xkbcomp/dist/alias.h
U xsrc/external/mit/xkbcomp/dist/xkbpath.c
U xsrc/external/mit/xkbcomp/dist/xkbparse.c
U xsrc/external/mit/xkbcomp/dist/action.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.h
U xsrc/external/mit/xkbcomp/dist/misc.c
C xsrc/external/mit/xkbcomp/dist/expr.c
U xsrc/external/mit/xkbcomp/dist/COPYING
U xsrc/external/mit/xkbcomp/dist/vmod.c
U xsrc/external/mit/xkbcomp/dist/config.guess
U xsrc/external/mit/xkbcomp/dist/install-sh
U xsrc/external/mit/xkbcomp/dist/missing
U xsrc/external/mit/xkbcomp/dist/indicators.c
U xsrc/external/mit/xkbcomp/dist/ylwrap
U xsrc/external/mit/xkbcomp/dist/vmod.h
U xsrc/external/mit/xkbcomp/dist/Makefile.am
U xsrc/external/mit/xkbcomp/dist/depcomp
U xsrc/external/mit/xkbcomp/dist/README
U xsrc/external/mit/xkbcomp/dist/xkbparse.y
U xsrc/external/mit/xkbcomp/dist/indicators.h
U xsrc/external/mit/xkbcomp/dist/INSTALL
U xsrc/external/mit/xkbcomp/dist/xkbpath.h
U xsrc/external/mit/xkbcomp/dist/compile
U xsrc/external/mit/xkbcomp/dist/parseutils.h
U xsrc/external/mit/xkbcomp/dist/listing.c
U xsrc/external/mit/xkbcomp/dist/keymap.c
U xsrc/external/mit/xkbcomp/dist/action.h
U xsrc/external/mit/xkbcomp/dist/config.h.in
U xsrc/external/mit/xkbcomp/dist/expr.h
U xsrc/external/mit/xkbcomp/dist/alias.c
U xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man
U xsrc/external/mit/xkbcomp/dist/man/Makefile.in
U xsrc/external/mit/xkbcomp/dist/man/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xkbcomp/dist

CVS import: xsrc/external/mit/xinput/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 07:19:33 UTC 2016

Update of /cvsroot/xsrc/external/mit/xinput/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv6919

Log Message:
initial import of xinput-1.6.2

Status:

Vendor Tag: xorg
Release Tags:   xinput-1-6-2

U xsrc/external/mit/xinput/dist/depcomp
U xsrc/external/mit/xinput/dist/configure
U xsrc/external/mit/xinput/dist/config.sub
U xsrc/external/mit/xinput/dist/configure.ac
U xsrc/external/mit/xinput/dist/AUTHORS
U xsrc/external/mit/xinput/dist/ChangeLog
U xsrc/external/mit/xinput/dist/aclocal.m4
U xsrc/external/mit/xinput/dist/NEWS
U xsrc/external/mit/xinput/dist/Makefile.in
U xsrc/external/mit/xinput/dist/COPYING
U xsrc/external/mit/xinput/dist/config.guess
U xsrc/external/mit/xinput/dist/install-sh
U xsrc/external/mit/xinput/dist/missing
U xsrc/external/mit/xinput/dist/Makefile.am
U xsrc/external/mit/xinput/dist/README
U xsrc/external/mit/xinput/dist/INSTALL
U xsrc/external/mit/xinput/dist/compile
U xsrc/external/mit/xinput/dist/config.h.in
U xsrc/external/mit/xinput/dist/src/test_xi2.c
U xsrc/external/mit/xinput/dist/src/setptr.c
U xsrc/external/mit/xinput/dist/src/list.c
U xsrc/external/mit/xinput/dist/src/transform.c
U xsrc/external/mit/xinput/dist/src/xinput.c
U xsrc/external/mit/xinput/dist/src/xinput.h
U xsrc/external/mit/xinput/dist/src/setcp.c
U xsrc/external/mit/xinput/dist/src/Makefile.in
U xsrc/external/mit/xinput/dist/src/property.c
U xsrc/external/mit/xinput/dist/src/setmode.c
U xsrc/external/mit/xinput/dist/src/feedback.c
U xsrc/external/mit/xinput/dist/src/Makefile.am
U xsrc/external/mit/xinput/dist/src/setint.c
U xsrc/external/mit/xinput/dist/src/state.c
U xsrc/external/mit/xinput/dist/src/hierarchy.c
U xsrc/external/mit/xinput/dist/src/test.c
U xsrc/external/mit/xinput/dist/src/buttonmap.c
U xsrc/external/mit/xinput/dist/man/xinput.man
U xsrc/external/mit/xinput/dist/man/Makefile.in
U xsrc/external/mit/xinput/dist/man/Makefile.am

No conflicts created by this import

CVS import: xsrc/external/mit/xrandr/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 07:19:36 UTC 2016

Update of /cvsroot/xsrc/external/mit/xrandr/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10582

Log Message:
initial import of xrandr-1.5.0

Status:

Vendor Tag: xorg
Release Tags:   xrandr-1-5-0

U xsrc/external/mit/xrandr/dist/xrandr_test.pl
U xsrc/external/mit/xrandr/dist/Makefile.am
U xsrc/external/mit/xrandr/dist/configure
U xsrc/external/mit/xrandr/dist/configure.ac
U xsrc/external/mit/xrandr/dist/aclocal.m4
U xsrc/external/mit/xrandr/dist/Makefile.in
U xsrc/external/mit/xrandr/dist/config.h.in
U xsrc/external/mit/xrandr/dist/COPYING
U xsrc/external/mit/xrandr/dist/ChangeLog
U xsrc/external/mit/xrandr/dist/INSTALL
U xsrc/external/mit/xrandr/dist/README
C xsrc/external/mit/xrandr/dist/compile
U xsrc/external/mit/xrandr/dist/config.guess
U xsrc/external/mit/xrandr/dist/config.sub
U xsrc/external/mit/xrandr/dist/depcomp
U xsrc/external/mit/xrandr/dist/install-sh
U xsrc/external/mit/xrandr/dist/missing
C xsrc/external/mit/xrandr/dist/xrandr.c
U xsrc/external/mit/xrandr/dist/keystone.5c
U xsrc/external/mit/xrandr/dist/man/Makefile.am
U xsrc/external/mit/xrandr/dist/man/Makefile.in
U xsrc/external/mit/xrandr/dist/man/xrandr.man

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrandr/dist

CVS import: xsrc/external/mit/xrandr/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 07:19:36 UTC 2016

Update of /cvsroot/xsrc/external/mit/xrandr/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10582

Log Message:
initial import of xrandr-1.5.0

Status:

Vendor Tag: xorg
Release Tags:   xrandr-1-5-0

U xsrc/external/mit/xrandr/dist/xrandr_test.pl
U xsrc/external/mit/xrandr/dist/Makefile.am
U xsrc/external/mit/xrandr/dist/configure
U xsrc/external/mit/xrandr/dist/configure.ac
U xsrc/external/mit/xrandr/dist/aclocal.m4
U xsrc/external/mit/xrandr/dist/Makefile.in
U xsrc/external/mit/xrandr/dist/config.h.in
U xsrc/external/mit/xrandr/dist/COPYING
U xsrc/external/mit/xrandr/dist/ChangeLog
U xsrc/external/mit/xrandr/dist/INSTALL
U xsrc/external/mit/xrandr/dist/README
C xsrc/external/mit/xrandr/dist/compile
U xsrc/external/mit/xrandr/dist/config.guess
U xsrc/external/mit/xrandr/dist/config.sub
U xsrc/external/mit/xrandr/dist/depcomp
U xsrc/external/mit/xrandr/dist/install-sh
U xsrc/external/mit/xrandr/dist/missing
C xsrc/external/mit/xrandr/dist/xrandr.c
U xsrc/external/mit/xrandr/dist/keystone.5c
U xsrc/external/mit/xrandr/dist/man/Makefile.am
U xsrc/external/mit/xrandr/dist/man/Makefile.in
U xsrc/external/mit/xrandr/dist/man/xrandr.man

2 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xrandr/dist

CVS import: xsrc/external/mit/xkbcomp/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 07:19:35 UTC 2016

Update of /cvsroot/xsrc/external/mit/xkbcomp/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10584

Log Message:
initial import of xkbcomp-1.3.1

Status:

Vendor Tag: xorg
Release Tags:   xkbcomp-1-3-1

U xsrc/external/mit/xkbcomp/dist/geometry.c
U xsrc/external/mit/xkbcomp/dist/tokens.h
U xsrc/external/mit/xkbcomp/dist/xkbcomp.pc.in
U xsrc/external/mit/xkbcomp/dist/keycodes.c
U xsrc/external/mit/xkbcomp/dist/parseutils.c
U xsrc/external/mit/xkbcomp/dist/configure
U xsrc/external/mit/xkbcomp/dist/config.sub
U xsrc/external/mit/xkbcomp/dist/keytypes.c
U xsrc/external/mit/xkbcomp/dist/symbols.c
U xsrc/external/mit/xkbcomp/dist/compat.h
U xsrc/external/mit/xkbcomp/dist/keycodes.h
U xsrc/external/mit/xkbcomp/dist/utils.h
U xsrc/external/mit/xkbcomp/dist/xkbscan.c
U xsrc/external/mit/xkbcomp/dist/configure.ac
U xsrc/external/mit/xkbcomp/dist/compat.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.c
U xsrc/external/mit/xkbcomp/dist/ChangeLog
U xsrc/external/mit/xkbcomp/dist/utils.c
U xsrc/external/mit/xkbcomp/dist/aclocal.m4
U xsrc/external/mit/xkbcomp/dist/Makefile.in
U xsrc/external/mit/xkbcomp/dist/misc.h
U xsrc/external/mit/xkbcomp/dist/alias.h
U xsrc/external/mit/xkbcomp/dist/xkbpath.c
U xsrc/external/mit/xkbcomp/dist/xkbparse.c
U xsrc/external/mit/xkbcomp/dist/action.c
U xsrc/external/mit/xkbcomp/dist/xkbcomp.h
U xsrc/external/mit/xkbcomp/dist/misc.c
C xsrc/external/mit/xkbcomp/dist/expr.c
U xsrc/external/mit/xkbcomp/dist/COPYING
U xsrc/external/mit/xkbcomp/dist/vmod.c
U xsrc/external/mit/xkbcomp/dist/config.guess
U xsrc/external/mit/xkbcomp/dist/install-sh
U xsrc/external/mit/xkbcomp/dist/missing
U xsrc/external/mit/xkbcomp/dist/indicators.c
U xsrc/external/mit/xkbcomp/dist/ylwrap
U xsrc/external/mit/xkbcomp/dist/vmod.h
U xsrc/external/mit/xkbcomp/dist/Makefile.am
U xsrc/external/mit/xkbcomp/dist/depcomp
U xsrc/external/mit/xkbcomp/dist/README
U xsrc/external/mit/xkbcomp/dist/xkbparse.y
U xsrc/external/mit/xkbcomp/dist/indicators.h
U xsrc/external/mit/xkbcomp/dist/INSTALL
U xsrc/external/mit/xkbcomp/dist/xkbpath.h
U xsrc/external/mit/xkbcomp/dist/compile
U xsrc/external/mit/xkbcomp/dist/parseutils.h
U xsrc/external/mit/xkbcomp/dist/listing.c
U xsrc/external/mit/xkbcomp/dist/keymap.c
U xsrc/external/mit/xkbcomp/dist/action.h
U xsrc/external/mit/xkbcomp/dist/config.h.in
U xsrc/external/mit/xkbcomp/dist/expr.h
U xsrc/external/mit/xkbcomp/dist/alias.c
U xsrc/external/mit/xkbcomp/dist/man/xkbcomp.man
U xsrc/external/mit/xkbcomp/dist/man/Makefile.in
U xsrc/external/mit/xkbcomp/dist/man/Makefile.am

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/xkbcomp/dist

CVS commit: src/usr.sbin/cpuctl/arch

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 06:58:06 UTC 2016

Modified Files:
src/usr.sbin/cpuctl/arch: i386.c

Log Message:
- Add structure extended feature registers into ci_feat_val[]. The locations
  are the same as x86/include/cpu.h. Curreltly those values are not used yet.
- KNF.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/usr.sbin/cpuctl/arch/i386.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.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.70 src/usr.sbin/cpuctl/arch/i386.c:1.71
--- src/usr.sbin/cpuctl/arch/i386.c:1.70	Fri Jan  8 02:28:44 2016
+++ src/usr.sbin/cpuctl/arch/i386.c	Wed Apr 27 06:58:06 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386.c,v 1.70 2016/01/08 02:28:44 msaitoh Exp $	*/
+/*	$NetBSD: i386.c,v 1.71 2016/04/27 06:58:06 msaitoh Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.70 2016/01/08 02:28:44 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.71 2016/04/27 06:58:06 msaitoh Exp $");
 #endif /* not lint */
 
 #include 
@@ -98,14 +98,16 @@ struct cpu_info {
 	uint32_t	ci_signature;	 /* X86 cpuid type */
 	uint32_t	ci_family;	 /* from ci_signature */
 	uint32_t	ci_model;	 /* from ci_signature */
-	uint32_t	ci_feat_val[8];	 /* X86 CPUID feature bits
+	uint32_t	ci_feat_val[9];	 /* X86 CPUID feature bits
 	  *	[0] basic features %edx
 	  *	[1] basic features %ecx
 	  *	[2] extended features %edx
 	  *	[3] extended features %ecx
 	  *	[4] VIA padlock features
-	  *	[5] XCR0 bits (d:0 %eax)
-	  *	[6] xsave flags (d:1 %eax)
+	  *	[5] structure ext. feat. %ebx
+	  *	[6] structure ext. feat. %ecx
+	  *	[7] XCR0 bits (d:0 %eax)
+	  *	[8] xsave flags (d:1 %eax)
 	  */
 	uint32_t	ci_cpu_class;	 /* CPU class */
 	uint32_t	ci_brand_id;	 /* Intel brand id */
@@ -163,7 +165,7 @@ static const char * const i386_intel_bra
 	"Pentium III Xeon", /* Intel (R) Pentium (R) III Xeon (TM) processor */
 	"Pentium III",  /* Intel (R) Pentium (R) III processor */
 	"",		/* 0x05: Reserved */
-	"Mobile Pentium III", /* Mobile Intel (R) Pentium (R) III processor-M */
+	"Mobile Pentium III",/* Mobile Intel (R) Pentium (R) III processor-M */
 	"Mobile Celeron",   /* Mobile Intel (R) Celeron (R) processor */
 	"Pentium 4",	/* Intel (R) Pentium (R) 4 processor */
 	"Pentium 4",	/* Intel (R) Pentium (R) 4 processor */
@@ -1519,18 +1521,25 @@ cpu_probe_base_features(struct cpu_info 
 		ci->ci_cpu_serial[1] = descs[3];
 	}
 
+	if (ci->ci_cpuid_level < 0x7)
+		return;
+
+	x86_cpuid(7, descs);
+	ci->ci_feat_val[5] = descs[1];
+	ci->ci_feat_val[6] = descs[2];
+
 	if (ci->ci_cpuid_level < 0xd)
 		return;
 
 	/* Get support XCR0 bits */
 	x86_cpuid2(0xd, 0, descs);
-	ci->ci_feat_val[5] = descs[0];	/* Actually 64 bits */
+	ci->ci_feat_val[7] = descs[0];	/* Actually 64 bits */
 	ci->ci_cur_xsave = descs[1];
 	ci->ci_max_xsave = descs[2];
 
 	/* Additional flags (eg xsaveopt support) */
 	x86_cpuid2(0xd, 1, descs);
-	ci->ci_feat_val[6] = descs[0];   /* Actually 64 bits */
+	ci->ci_feat_val[8] = descs[0];   /* Actually 64 bits */
 }
 
 static void
@@ -1878,9 +1887,9 @@ identifycpu(int fd, const char *cpuname)
 	print_bits(cpuname, "padloack features", CPUID_FLAGS_PADLOCK,
 	ci->ci_feat_val[4]);
 
-	print_bits(cpuname, "xsave features", XCR0_FLAGS1, ci->ci_feat_val[5]);
+	print_bits(cpuname, "xsave features", XCR0_FLAGS1, ci->ci_feat_val[7]);
 	print_bits(cpuname, "xsave instructions", CPUID_PES1_FLAGS,
-	ci->ci_feat_val[6]);
+	ci->ci_feat_val[8]);
 
 	if (ci->ci_max_xsave != 0) {
 		aprint_normal("%s: xsave area size: current %d, maximum %d",
@@ -1902,9 +1911,8 @@ identifycpu(int fd, const char *cpuname)
 		ci->ci_cpu_serial[2] / 65536, ci->ci_cpu_serial[2] % 65536);
 	}
 
-	if (ci->ci_cpu_class == CPUCLASS_386) {
+	if (ci->ci_cpu_class == CPUCLASS_386)
 		errx(1, "NetBSD requires an 80486 or later processor");
-	}
 
 	if (ci->ci_cpu_type == CPU_486DLC) {
 #ifndef CYRIX_CACHE_WORKS

CVS commit: src/usr.sbin/cpuctl/arch

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr 27 06:58:06 UTC 2016

Modified Files:
src/usr.sbin/cpuctl/arch: i386.c

Log Message:
- Add structure extended feature registers into ci_feat_val[]. The locations
  are the same as x86/include/cpu.h. Curreltly those values are not used yet.
- KNF.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/usr.sbin/cpuctl/arch/i386.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/man/man9

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Apr 27 06:57:24 UTC 2016

Modified Files:
src/share/man/man9: pslist.9

Log Message:
Fix declaration of PSLIST_READER_FIRST


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man9/pslist.9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/man/man9

[Ryota Ozaki]

Module Name:src
Committed By:   ozaki-r
Date:   Wed Apr 27 06:57:24 UTC 2016

Modified Files:
src/share/man/man9: pslist.9

Log Message:
Fix declaration of PSLIST_READER_FIRST


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/share/man/man9/pslist.9

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/man9/pslist.9
diff -u src/share/man/man9/pslist.9:1.15 src/share/man/man9/pslist.9:1.16
--- src/share/man/man9/pslist.9:1.15	Mon Apr 11 13:45:20 2016
+++ src/share/man/man9/pslist.9	Wed Apr 27 06:57:24 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pslist.9,v 1.15 2016/04/11 13:45:20 riastradh Exp $
+.\"	$NetBSD: pslist.9,v 1.16 2016/04/27 06:57:24 ozaki-r Exp $
 .\"
 .\" Copyright (c) 2016 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 8, 2016
+.Dd April 27, 2016
 .Dt PSLIST 9
 .Os
 .\"
@@ -64,7 +64,7 @@
 .Fn PSLIST_WRITER_FOREACH "TYPE *element" "struct pslist_head *head" "TYPE" "PSLIST_ENTRY NAME"
 .\" Reader operations
 .Ft TYPE *
-.Fn PSLIST_READER_FIRST "TYPE *element" "TYPE" "PSLIST_ENTRY NAME"
+.Fn PSLIST_READER_FIRST "struct pslist *head" "TYPE" "PSLIST_ENTRY NAME"
 .Ft TYPE *
 .Fn PSLIST_READER_NEXT "TYPE *element" "TYPE" "PSLIST_ENTRY NAME"
 .Fn PSLIST_READER_FOREACH "TYPE *element" "struct pslist_head *head" "TYPE" "PSLIST_ENTRY NAME"

CVS import: xsrc/external/mit/videoproto/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 06:41:49 UTC 2016

Update of /cvsroot/xsrc/external/mit/videoproto/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10898

Log Message:
initial import of videoproto-2.3.3

Status:

Vendor Tag: xorg
Release Tags:   videoproto-2-3-3

U xsrc/external/mit/videoproto/dist/xv-protocol-v2.txt
U xsrc/external/mit/videoproto/dist/Makefile.am
U xsrc/external/mit/videoproto/dist/configure
U xsrc/external/mit/videoproto/dist/configure.ac
U xsrc/external/mit/videoproto/dist/aclocal.m4
U xsrc/external/mit/videoproto/dist/videoproto.pc.in
U xsrc/external/mit/videoproto/dist/vldXvMC.h
U xsrc/external/mit/videoproto/dist/Xv.h
U xsrc/external/mit/videoproto/dist/XvMC.h
U xsrc/external/mit/videoproto/dist/XvMCproto.h
U xsrc/external/mit/videoproto/dist/Xvproto.h
U xsrc/external/mit/videoproto/dist/Makefile.in
U xsrc/external/mit/videoproto/dist/ChangeLog
U xsrc/external/mit/videoproto/dist/COPYING
U xsrc/external/mit/videoproto/dist/config.guess
U xsrc/external/mit/videoproto/dist/INSTALL
U xsrc/external/mit/videoproto/dist/README
U xsrc/external/mit/videoproto/dist/compile
U xsrc/external/mit/videoproto/dist/config.sub
U xsrc/external/mit/videoproto/dist/install-sh
U xsrc/external/mit/videoproto/dist/missing

No conflicts created by this import

CVS import: xsrc/external/mit/inputproto/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 06:41:48 UTC 2016

Update of /cvsroot/xsrc/external/mit/inputproto/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv19237

Log Message:
initial import of inputproto-2.3.2

Status:

Vendor Tag: xorg
Release Tags:   inputproto-2-3-2

U xsrc/external/mit/inputproto/dist/configure
U xsrc/external/mit/inputproto/dist/config.sub
U xsrc/external/mit/inputproto/dist/configure.ac
U xsrc/external/mit/inputproto/dist/XI2.h
U xsrc/external/mit/inputproto/dist/inputproto.pc.in
U xsrc/external/mit/inputproto/dist/XI2proto.h
U xsrc/external/mit/inputproto/dist/ChangeLog
U xsrc/external/mit/inputproto/dist/aclocal.m4
U xsrc/external/mit/inputproto/dist/Makefile.in
U xsrc/external/mit/inputproto/dist/XIproto.h
U xsrc/external/mit/inputproto/dist/COPYING
U xsrc/external/mit/inputproto/dist/config.guess
U xsrc/external/mit/inputproto/dist/install-sh
U xsrc/external/mit/inputproto/dist/XI.h
U xsrc/external/mit/inputproto/dist/missing
U xsrc/external/mit/inputproto/dist/Makefile.am
U xsrc/external/mit/inputproto/dist/README
U xsrc/external/mit/inputproto/dist/INSTALL
N xsrc/external/mit/inputproto/dist/compile
U xsrc/external/mit/inputproto/dist/specs/XIproto.txt
U xsrc/external/mit/inputproto/dist/specs/Makefile.in
U xsrc/external/mit/inputproto/dist/specs/XI2proto.txt
U xsrc/external/mit/inputproto/dist/specs/Makefile.am

No conflicts created by this import

CVS import: xsrc/external/mit/inputproto/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 06:41:48 UTC 2016

Update of /cvsroot/xsrc/external/mit/inputproto/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv19237

Log Message:
initial import of inputproto-2.3.2

Status:

Vendor Tag: xorg
Release Tags:   inputproto-2-3-2

U xsrc/external/mit/inputproto/dist/configure
U xsrc/external/mit/inputproto/dist/config.sub
U xsrc/external/mit/inputproto/dist/configure.ac
U xsrc/external/mit/inputproto/dist/XI2.h
U xsrc/external/mit/inputproto/dist/inputproto.pc.in
U xsrc/external/mit/inputproto/dist/XI2proto.h
U xsrc/external/mit/inputproto/dist/ChangeLog
U xsrc/external/mit/inputproto/dist/aclocal.m4
U xsrc/external/mit/inputproto/dist/Makefile.in
U xsrc/external/mit/inputproto/dist/XIproto.h
U xsrc/external/mit/inputproto/dist/COPYING
U xsrc/external/mit/inputproto/dist/config.guess
U xsrc/external/mit/inputproto/dist/install-sh
U xsrc/external/mit/inputproto/dist/XI.h
U xsrc/external/mit/inputproto/dist/missing
U xsrc/external/mit/inputproto/dist/Makefile.am
U xsrc/external/mit/inputproto/dist/README
U xsrc/external/mit/inputproto/dist/INSTALL
N xsrc/external/mit/inputproto/dist/compile
U xsrc/external/mit/inputproto/dist/specs/XIproto.txt
U xsrc/external/mit/inputproto/dist/specs/Makefile.in
U xsrc/external/mit/inputproto/dist/specs/XI2proto.txt
U xsrc/external/mit/inputproto/dist/specs/Makefile.am

No conflicts created by this import

CVS import: xsrc/external/mit/videoproto/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Apr 27 06:41:49 UTC 2016

Update of /cvsroot/xsrc/external/mit/videoproto/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv10898

Log Message:
initial import of videoproto-2.3.3

Status:

Vendor Tag: xorg
Release Tags:   videoproto-2-3-3

U xsrc/external/mit/videoproto/dist/xv-protocol-v2.txt
U xsrc/external/mit/videoproto/dist/Makefile.am
U xsrc/external/mit/videoproto/dist/configure
U xsrc/external/mit/videoproto/dist/configure.ac
U xsrc/external/mit/videoproto/dist/aclocal.m4
U xsrc/external/mit/videoproto/dist/videoproto.pc.in
U xsrc/external/mit/videoproto/dist/vldXvMC.h
U xsrc/external/mit/videoproto/dist/Xv.h
U xsrc/external/mit/videoproto/dist/XvMC.h
U xsrc/external/mit/videoproto/dist/XvMCproto.h
U xsrc/external/mit/videoproto/dist/Xvproto.h
U xsrc/external/mit/videoproto/dist/Makefile.in
U xsrc/external/mit/videoproto/dist/ChangeLog
U xsrc/external/mit/videoproto/dist/COPYING
U xsrc/external/mit/videoproto/dist/config.guess
U xsrc/external/mit/videoproto/dist/INSTALL
U xsrc/external/mit/videoproto/dist/README
U xsrc/external/mit/videoproto/dist/compile
U xsrc/external/mit/videoproto/dist/config.sub
U xsrc/external/mit/videoproto/dist/install-sh
U xsrc/external/mit/videoproto/dist/missing

No conflicts created by this import