date:20161004

CVS commit: src/sys/dev/ic

2016-10-04 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Wed Oct  5 03:46:38 UTC 2016

Modified Files:
src/sys/dev/ic: nvme.c

Log Message:
The maximum number of IO queue entries is hardware supported value.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/nvme.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/nvme.c
diff -u src/sys/dev/ic/nvme.c:1.14 src/sys/dev/ic/nvme.c:1.15
--- src/sys/dev/ic/nvme.c:1.14	Tue Sep 27 03:33:32 2016
+++ src/sys/dev/ic/nvme.c	Wed Oct  5 03:46:38 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvme.c,v 1.14 2016/09/27 03:33:32 pgoyette Exp $	*/
+/*	$NetBSD: nvme.c,v 1.15 2016/10/05 03:46:38 nonaka Exp $	*/
 /*	$OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.14 2016/09/27 03:33:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.15 2016/10/05 03:46:38 nonaka Exp $");
 
 #include 
 #include 
@@ -357,6 +357,8 @@ nvme_attach(struct nvme_softc *sc)
 	}
 	if (NVME_CAP_MPSMAX(cap) < mps)
 		mps = NVME_CAP_MPSMAX(cap);
+	if (ioq_entries > NVME_CAP_MQES(cap))
+		ioq_entries = NVME_CAP_MQES(cap);
 
 	/* set initial values to be used for admin queue during probe */
 	sc->sc_rdy_to = NVME_CAP_TO(cap);
@@ -445,16 +447,22 @@ free_admin_q:
 int
 nvme_rescan(device_t self, const char *attr, const int *flags)
 {
-	int i;
 	struct nvme_softc *sc = device_private(self);
 	struct nvme_attach_args naa;
+	uint64_t cap;
+	int ioq_entries = nvme_ioq_size;
+	int i;
+
+	cap = nvme_read8(sc, NVME_CAP);
+	if (ioq_entries > NVME_CAP_MQES(cap))
+		ioq_entries = NVME_CAP_MQES(cap);
 
 	for (i = 0; i < sc->sc_nn; i++) {
 		if (sc->sc_namespaces[i].dev)
 			continue;
 		memset(, 0, sizeof(naa));
 		naa.naa_nsid = i + 1;
-		naa.naa_qentries = nvme_ioq_size;
+		naa.naa_qentries = ioq_entries;
 		sc->sc_namespaces[i].dev = config_found(sc->sc_dev, ,
 		nvme_print);
 	}

CVS commit: src/sys/dev/ic

2016-10-04 Thread NONAKA Kimihiro

Module Name:src
Committed By:   nonaka
Date:   Wed Oct  5 03:46:38 UTC 2016

Modified Files:
src/sys/dev/ic: nvme.c

Log Message:
The maximum number of IO queue entries is hardware supported value.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/nvme.c

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

CVS commit: src/sbin/gpt

2016-10-04 Thread Robert Elz

Module Name:src
Committed By:   kre
Date:   Wed Oct  5 03:06:24 UTC 2016

Modified Files:
src/sbin/gpt: show.c

Log Message:
Avoiding having parameter name shadow its own function's name.
Strictly this shouldnt be (and hasn't been for almost a year) a problem,
but there are compilers that warn about locals shadowing globals (which
this is/was) and it is easy to avoid, so ...No functinal difference.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sbin/gpt/show.c

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

Modified files:

Index: src/sbin/gpt/show.c
diff -u src/sbin/gpt/show.c:1.38 src/sbin/gpt/show.c:1.39
--- src/sbin/gpt/show.c:1.38	Thu Jun  9 17:43:36 2016
+++ src/sbin/gpt/show.c	Wed Oct  5 03:06:24 2016
@@ -33,7 +33,7 @@
 __FBSDID("$FreeBSD: src/sbin/gpt/show.c,v 1.14 2006/06/22 22:22:32 marcel Exp $");
 #endif
 #ifdef __RCSID
-__RCSID("$NetBSD: show.c,v 1.38 2016/06/09 17:43:36 kre Exp $");
+__RCSID("$NetBSD: show.c,v 1.39 2016/10/05 03:06:24 kre Exp $");
 #endif
 
 #include 
@@ -158,7 +158,7 @@ print_part_type(int map_type, int flags,
 }
 
 static int
-show(gpt_t gpt, int show)
+show(gpt_t gpt, int xshow)
 {
 	map_t m;
 
@@ -178,7 +178,7 @@ show(gpt_t gpt, int show)
 			printf(" ");
 		putchar(' ');
 		putchar(' ');
-		print_part_type(m->map_type, show, m->map_data, m->map_start);
+		print_part_type(m->map_type, xshow, m->map_data, m->map_start);
 		putchar('\n');
 		m = m->map_next;
 	}

CVS commit: src/sbin/gpt

2016-10-04 Thread Robert Elz

Module Name:src
Committed By:   kre
Date:   Wed Oct  5 03:06:24 UTC 2016

Modified Files:
src/sbin/gpt: show.c

Log Message:
Avoiding having parameter name shadow its own function's name.
Strictly this shouldnt be (and hasn't been for almost a year) a problem,
but there are compilers that warn about locals shadowing globals (which
this is/was) and it is easy to avoid, so ...No functinal difference.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sbin/gpt/show.c

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

CVS commit: src

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 23:52:02 UTC 2016

Modified Files:
src/distrib/sets/lists/xbase: mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/share/nls: Makefile
Added Files:
src/external/mit/xorg/share/nls/pt_PT.UTF-8: Makefile

Log Message:
build new pt_PT.UTF-8 locale from libX11 1.6.4.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.18 -r1.19 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/share/nls/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/nls/pt_PT.UTF-8/Makefile

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

CVS commit: src

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 23:52:02 UTC 2016

Modified Files:
src/distrib/sets/lists/xbase: mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/share/nls: Makefile
Added Files:
src/external/mit/xorg/share/nls/pt_PT.UTF-8: Makefile

Log Message:
build new pt_PT.UTF-8 locale from libX11 1.6.4.


To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.18 -r1.19 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/share/nls/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/nls/pt_PT.UTF-8/Makefile

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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.134 src/distrib/sets/lists/xbase/mi:1.135
--- src/distrib/sets/lists/xbase/mi:1.134	Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xbase/mi	Tue Oct  4 23:52:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.134 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: mi,v 1.135 2016/10/04 23:52:02 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -509,6 +509,10 @@
 ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/Compose		-unknown-	xorg
 ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS	-unknown-	xorg
 ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE	-unknown-	xorg
+./usr/X11R7/lib/X11/locale/pt_PT.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/pt_PT.UTF-8/Compose		-unknown-	xorg
+./usr/X11R7/lib/X11/locale/pt_PT.UTF-8/XI18N_OBJS	-unknown-	xorg
+./usr/X11R7/lib/X11/locale/pt_PT.UTF-8/XLC_LOCALE	-unknown-	xorg
 ./usr/X11R7/lib/X11/locale/ru_RU.UTF-8			base-x11-root	xorg
 ./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/Compose		-unknown-	xorg
 ./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS	-unknown-	xorg

Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.18 src/etc/mtree/NetBSD.dist.Xorg:1.19
--- src/etc/mtree/NetBSD.dist.Xorg:1.18	Thu Aug 18 08:11:22 2016
+++ src/etc/mtree/NetBSD.dist.Xorg	Tue Oct  4 23:52:02 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.Xorg,v 1.18 2016/08/18 08:11:22 mrg Exp $
+#	$NetBSD: NetBSD.dist.Xorg,v 1.19 2016/10/04 23:52:02 mrg Exp $
 ./usr/X11R7
 ./usr/X11R7/bin
 ./usr/X11R7/include
@@ -94,6 +94,7 @@
 ./usr/X11R7/lib/X11/locale/mulelao-1
 ./usr/X11R7/lib/X11/locale/nokhchi-1
 ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8
+./usr/X11R7/lib/X11/locale/pt_PT.UTF-8
 ./usr/X11R7/lib/X11/locale/ru_RU.UTF-8
 ./usr/X11R7/lib/X11/locale/sr_CS.UTF-8
 ./usr/X11R7/lib/X11/locale/tatar-cyr

Index: src/external/mit/xorg/share/nls/Makefile
diff -u src/external/mit/xorg/share/nls/Makefile:1.4 src/external/mit/xorg/share/nls/Makefile:1.5
--- src/external/mit/xorg/share/nls/Makefile:1.4	Sun Mar 16 23:25:15 2014
+++ src/external/mit/xorg/share/nls/Makefile	Tue Oct  4 23:52:02 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2014/03/16 23:25:15 mrg Exp $
+#	$NetBSD: Makefile,v 1.5 2016/10/04 23:52:02 mrg Exp $
 
 .include 
 
@@ -17,6 +17,7 @@ SUBDIR=	\
 	microsoft-cp1251 microsoft-cp1255 microsoft-cp1256 mulelao-1 \
 	nokhchi-1 \
 	pt_BR.UTF-8 \
+	pt_PT.UTF-8 \
 	ru_RU.UTF-8 \
 	sr_CS.UTF-8 \
 	tatar-cyr th_TH th_TH.UTF-8 tscii-0 \
@@ -61,6 +62,6 @@ realall: ${FILES}
 build_subdirs:
 .for _dir in ${SUBDIR}
 	mkdir ${.CURDIR}/${_dir}
-	printf '#	$$NetBSD: Makefile,v 1.4 2014/03/16 23:25:15 mrg Exp $$\n\nNLS_SUBDIR=	${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
+	printf '#	$$NetBSD: Makefile,v 1.5 2016/10/04 23:52:02 mrg Exp $$\n\nNLS_SUBDIR=	${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
 
 .endfor

Added files:

Index: src/external/mit/xorg/share/nls/pt_PT.UTF-8/Makefile
diff -u /dev/null src/external/mit/xorg/share/nls/pt_PT.UTF-8/Makefile:1.1
--- /dev/null	Tue Oct  4 23:52:03 2016
+++ src/external/mit/xorg/share/nls/pt_PT.UTF-8/Makefile	Tue Oct  4 23:52:02 2016
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2016/10/04 23:52:02 mrg Exp $
+
+NLS_SUBDIR=	pt_PT.UTF-8
+
+.include "../Makefile.nls"

CVS commit: src/doc

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 23:47:12 UTC 2016

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new bind to address CVE-2016-2776


To generate a diff of this commit:
cvs rdiff -u -r1.1363 -r1.1364 src/doc/3RDPARTY
cvs rdiff -u -r1.2192 -r1.2193 src/doc/CHANGES

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

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1363 src/doc/3RDPARTY:1.1364
--- src/doc/3RDPARTY:1.1363	Thu Sep 29 16:44:06 2016
+++ src/doc/3RDPARTY	Tue Oct  4 19:47:12 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1363 2016/09/29 20:44:06 kre Exp $
+#	$NetBSD: 3RDPARTY,v 1.1364 2016/10/04 23:47:12 christos Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -114,8 +114,8 @@ Notes:
 bc includes dc, both of which are in the NetBSD tree.
 
 Package:	bind [named and utils]
-Version:	9.10.4-P1
-Current Vers:	9.10.4-P2
+Version:	9.10.4-P3/BSD	9.11.0/MPL
+Current Vers:	9.10.4-P3/BSD
 Maintainer:	Paul Vixie <vi...@vix.com>
 Archive Site:	ftp://ftp.isc.org/isc/bind9/
 Home Page:	http://www.isc.org/software/bind/

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2192 src/doc/CHANGES:1.2193
--- src/doc/CHANGES:1.2192	Tue Oct  4 05:55:56 2016
+++ src/doc/CHANGES	Tue Oct  4 19:47:12 2016
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2192 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2193 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -377,3 +377,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0:
 		 header. Enable unconditionally the timespec struct
 		definition in . Changes conform to the C11 standard.
 		[kamil 20161004]
+	bind: Import version 9.10.4-P3. [christos 20161004]

CVS commit: src/doc

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 23:47:12 UTC 2016

Modified Files:
src/doc: 3RDPARTY CHANGES

Log Message:
new bind to address CVE-2016-2776


To generate a diff of this commit:
cvs rdiff -u -r1.1363 -r1.1364 src/doc/3RDPARTY
cvs rdiff -u -r1.2192 -r1.2193 src/doc/CHANGES

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

CVS commit: src/external/bsd/bind/dist

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 23:46:01 UTC 2016

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/bin/named: lwdgrbn.c
src/external/bsd/bind/dist/bin/pkcs11: pkcs11-destroy.8 pkcs11-keygen.8
pkcs11-list.8
src/external/bsd/bind/dist/bin/tests/system/lwresd: lwtest.c
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api message.c nsec3.c rbtdb.c
src/external/bsd/bind/dist/lib/dns/rdata/generic: opt_41.c
src/external/bsd/bind/dist/lib/dns/tests: rdata_test.c

Log Message:
Merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/named/lwdgrbn.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/bin/pkcs11/pkcs11-destroy.8 \
src/external/bsd/bind/dist/bin/pkcs11/pkcs11-keygen.8
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/bin/pkcs11/pkcs11-list.8
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/bind/dist/bin/tests/system/lwresd/lwtest.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/dns/nsec3.c
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/lib/dns/rbtdb.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/lib/dns/tests/rdata_test.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/bsd/bind/dist/CHANGES
diff -u src/external/bsd/bind/dist/CHANGES:1.21

CVS commit: src/external/bsd/bind/dist

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 23:46:01 UTC 2016

Modified Files:
src/external/bsd/bind/dist: CHANGES README srcid version
src/external/bsd/bind/dist/bin/named: lwdgrbn.c
src/external/bsd/bind/dist/bin/pkcs11: pkcs11-destroy.8 pkcs11-keygen.8
pkcs11-list.8
src/external/bsd/bind/dist/bin/tests/system/lwresd: lwtest.c
src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html
Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html
Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html
man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html
man.dnssec-dsfromkey.html man.dnssec-importkey.html
man.dnssec-keyfromlabel.html man.dnssec-keygen.html
man.dnssec-revoke.html man.dnssec-settime.html
man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html
man.host.html man.isc-hmac-fixup.html man.named-checkconf.html
man.named-checkzone.html man.named-journalprint.html
man.named-rrchecker.html man.named.html man.nsec3hash.html
man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html
man.rndc.html
src/external/bsd/bind/dist/lib/dns: api message.c nsec3.c rbtdb.c
src/external/bsd/bind/dist/lib/dns/rdata/generic: opt_41.c
src/external/bsd/bind/dist/lib/dns/tests: rdata_test.c

Log Message:
Merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/bind/dist/CHANGES
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/README
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/srcid
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/version
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/named/lwdgrbn.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/bin/pkcs11/pkcs11-destroy.8 \
src/external/bsd/bind/dist/bin/pkcs11/pkcs11-keygen.8
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/dist/bin/pkcs11/pkcs11-list.8
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/bind/dist/bin/tests/system/lwresd/lwtest.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \
src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \
src/external/bsd/bind/dist/doc/arm/man.arpaname.html \
src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.delv.html \
src/external/bsd/bind/dist/doc/arm/man.dig.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \
src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \
src/external/bsd/bind/dist/doc/arm/man.genrandom.html \
src/external/bsd/bind/dist/doc/arm/man.host.html \
src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \
src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \
src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \
src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \
src/external/bsd/bind/dist/doc/arm/man.named.html \
src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \
src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \
src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \
src/external/bsd/bind/dist/doc/arm/man.rndc.html
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/lib/dns/api
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/dist/lib/dns/message.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/dns/nsec3.c
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/lib/dns/rbtdb.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/bsd/bind/dist/lib/dns/rdata/generic/opt_41.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/lib/dns/tests/rdata_test.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/acpitools/aml

2016-10-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 22:22:17 UTC 2016

Modified Files:
src/usr.sbin/acpitools/aml: aml_memman.h

Log Message:
Drop pointless packed attributes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_memman.h

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/acpitools/aml/aml_memman.h
diff -u src/usr.sbin/acpitools/aml/aml_memman.h:1.2 src/usr.sbin/acpitools/aml/aml_memman.h:1.3
--- src/usr.sbin/acpitools/aml/aml_memman.h:1.2	Sun Jan 18 09:46:59 2009
+++ src/usr.sbin/acpitools/aml/aml_memman.h	Tue Oct  4 22:22:16 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: aml_memman.h,v 1.2 2009/01/18 09:46:59 lukem Exp $	*/
+/*	$NetBSD: aml_memman.h,v 1.3 2016/10/04 22:22:16 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000 Mitsuru IWASAKI 
@@ -48,7 +48,7 @@ struct	memman_block {
 	unsigned int	available;	/* number of available chunks */
 	unsigned int	allocated_mem;	/* block + misc (in bytes) */
 
-}__attribute__((packed));
+};
 
 LIST_HEAD(memman_block_list, memman_block);
 
@@ -57,7 +57,7 @@ struct	memman_node {
 	LIST_ENTRY(memman_node)	links;
 	void	*node;
 	struct	memman_block *memblock;
-}__attribute__((packed));
+};
 
 LIST_HEAD(memman_node_list, memman_node);
 
@@ -88,7 +88,7 @@ struct	memman_flexmem_info {
 	LIST_ENTRY(memman_flexmem_info) links;
 	void	*addr;
 	size_t	mem_size;
-}__attribute__((packed));
+};
 
 LIST_HEAD(memman_flexmem_info_list, memman_flexmem_info);

CVS commit: src/usr.sbin/acpitools/aml

2016-10-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 22:22:17 UTC 2016

Modified Files:
src/usr.sbin/acpitools/aml: aml_memman.h

Log Message:
Drop pointless packed attributes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/acpitools/aml/aml_memman.h

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

CVS commit: xsrc/external/mit/libX11/dist

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 22:04:39 UTC 2016

Modified Files:
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8: Compose.pre
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c GetFPath.c
ListExt.c ModMap.c XlibInt.c
xsrc/external/mit/libX11/dist/src/xcms: cmsTrig.c
xsrc/external/mit/libX11/dist/src/xlibi18n: XlcDL.c
Added Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4

Log Message:
merge libX11 1.6.4.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libX11/dist/m4/libtool.m4 \
xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \
xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \
xsrc/external/mit/libX11/dist/m4/ltversion.m4 \
xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libX11/dist/nls/en_US.UTF-8/Compose.pre
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libX11/dist/src/Font.c \
xsrc/external/mit/libX11/dist/src/FontNames.c \
xsrc/external/mit/libX11/dist/src/GetFPath.c \
xsrc/external/mit/libX11/dist/src/ListExt.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libX11/dist/src/ModMap.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/src/XlibInt.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libX11/dist/src/xcms/cmsTrig.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libX11/dist/src/xlibi18n/XlcDL.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/libX11/dist

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 22:03:25 UTC 2016

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

Log Message:
initial import of libX11-1.6.4

Status:

Vendor Tag: xorg
Release Tags:   libX11-1-6-4

U xsrc/external/mit/libX11/dist/x11-xcb.pc.in
U xsrc/external/mit/libX11/dist/configure
U xsrc/external/mit/libX11/dist/config.sub
U xsrc/external/mit/libX11/dist/INSTALL
U xsrc/external/mit/libX11/dist/ltmain.sh
U xsrc/external/mit/libX11/dist/AUTHORS
U xsrc/external/mit/libX11/dist/NEWS
U xsrc/external/mit/libX11/dist/test-driver
U xsrc/external/mit/libX11/dist/compile
U xsrc/external/mit/libX11/dist/Makefile.in
U xsrc/external/mit/libX11/dist/x11.pc.in
U xsrc/external/mit/libX11/dist/README
U xsrc/external/mit/libX11/dist/ChangeLog
U xsrc/external/mit/libX11/dist/install-sh
U xsrc/external/mit/libX11/dist/missing
U xsrc/external/mit/libX11/dist/Makefile.am
U xsrc/external/mit/libX11/dist/COPYING
U xsrc/external/mit/libX11/dist/cpprules.in
U xsrc/external/mit/libX11/dist/config.guess
U xsrc/external/mit/libX11/dist/docbook.am
U xsrc/external/mit/libX11/dist/configure.ac
U xsrc/external/mit/libX11/dist/aclocal.m4
U xsrc/external/mit/libX11/dist/depcomp
U xsrc/external/mit/libX11/dist/include/Makefile.am
U xsrc/external/mit/libX11/dist/include/Makefile.in
U xsrc/external/mit/libX11/dist/include/X11/XlibConf.h.in
U xsrc/external/mit/libX11/dist/include/X11/cursorfont.h
U xsrc/external/mit/libX11/dist/include/X11/XKBlib.h
U xsrc/external/mit/libX11/dist/include/X11/Xlocale.h
U xsrc/external/mit/libX11/dist/include/X11/Xlibint.h
U xsrc/external/mit/libX11/dist/include/X11/Xregion.h
U xsrc/external/mit/libX11/dist/include/X11/Xcms.h
U xsrc/external/mit/libX11/dist/include/X11/Xresource.h
U xsrc/external/mit/libX11/dist/include/X11/Xlib-xcb.h
U xsrc/external/mit/libX11/dist/include/X11/ImUtil.h
U xsrc/external/mit/libX11/dist/include/X11/Xlib.h
U xsrc/external/mit/libX11/dist/include/X11/Xutil.h
U xsrc/external/mit/libX11/dist/m4/ax_define_dir.m4
C xsrc/external/mit/libX11/dist/m4/ltoptions.m4
U xsrc/external/mit/libX11/dist/m4/ltsugar.m4
C xsrc/external/mit/libX11/dist/m4/libtool.m4
C xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4
C xsrc/external/mit/libX11/dist/m4/ltversion.m4
U xsrc/external/mit/libX11/dist/src/DestWind.c
U xsrc/external/mit/libX11/dist/src/FilterEv.c
U xsrc/external/mit/libX11/dist/src/CrCmap.c
U xsrc/external/mit/libX11/dist/src/GetHints.c
U xsrc/external/mit/libX11/dist/src/PmapBgnd.c
U xsrc/external/mit/libX11/dist/src/DrRects.c
U xsrc/external/mit/libX11/dist/src/WrBitF.c
U xsrc/external/mit/libX11/dist/src/Key.h
U xsrc/external/mit/libX11/dist/src/ConvSel.c
U xsrc/external/mit/libX11/dist/src/FSSaver.c
U xsrc/external/mit/libX11/dist/src/SetHints.c
U xsrc/external/mit/libX11/dist/src/LowerWin.c
U xsrc/external/mit/libX11/dist/src/OMWrap.c
U xsrc/external/mit/libX11/dist/src/RdBitF.c
U xsrc/external/mit/libX11/dist/src/GetMoEv.c
U xsrc/external/mit/libX11/dist/src/LiHosts.c
U xsrc/external/mit/libX11/dist/src/locking.h
U xsrc/external/mit/libX11/dist/src/OCWrap.c
U xsrc/external/mit/libX11/dist/src/SetBack.c
U xsrc/external/mit/libX11/dist/src/DrArc.c
U xsrc/external/mit/libX11/dist/src/ChSaveSet.c
U xsrc/external/mit/libX11/dist/src/SetTile.c
U xsrc/external/mit/libX11/dist/src/XlibAsync.c
U xsrc/external/mit/libX11/dist/src/GetNrmHint.c
U xsrc/external/mit/libX11/dist/src/QuTileShp.c
U xsrc/external/mit/libX11/dist/src/VisUtil.c
U xsrc/external/mit/libX11/dist/src/TextToStr.c
U xsrc/external/mit/libX11/dist/src/Synchro.c
U xsrc/external/mit/libX11/dist/src/CrPixmap.c
U xsrc/external/mit/libX11/dist/src/GetColor.c
U xsrc/external/mit/libX11/dist/src/RepWindow.c
U xsrc/external/mit/libX11/dist/src/ChkIfEv.c
U xsrc/external/mit/libX11/dist/src/PutBEvent.c
U xsrc/external/mit/libX11/dist/src/KeysymStr.c
U xsrc/external/mit/libX11/dist/src/GetSSaver.c
U xsrc/external/mit/libX11/dist/src/ClDisplay.c
U xsrc/external/mit/libX11/dist/src/SetLStyle.c
U xsrc/external/mit/libX11/dist/src/LiProps.c
U xsrc/external/mit/libX11/dist/src/GetSOwner.c
U xsrc/external/mit/libX11/dist/src/SetIFocus.c
U xsrc/external/mit/libX11/dist/src/Misc.c
U xsrc/external/mit/libX11/dist/src/CirWin.c
U xsrc/external/mit/libX11/dist/src/GetWMCMapW.c
U xsrc/external/mit/libX11/dist/src/UngrabPtr.c
U xsrc/external/mit/libX11/dist/src/PeekIfEv.c
U xsrc/external/mit/libX11/dist/src/ScrResStr.c
U xsrc/external/mit/libX11/dist/src/EvToWire.c
U xsrc/external/mit/libX11/dist/src/PixFormats.c
U xsrc/external/mit/libX11/dist/src/DrArcs.c
U xsrc/external/mit/libX11/dist/src/QuTree.c
U xsrc/external/mit/libX11/dist/src/MoveWin.c
U xsrc/external/mit/libX11/dist/src/Cr.h
U xsrc/external/mit/libX11/dist/src/PutImage.c
U xsrc/external/mit/libX11/dist/src/SetTSOrig.c
U xsrc/external/mit/libX11/dist/src/FreeEData.c
U xsrc/external/mit/libX11/dist/src/Iconify.c
U xsrc/external/mit/libX11/dist/src/FreeGC.c
U

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 22:03:25 UTC 2016

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

Log Message:
initial import of libX11-1.6.4

Status:

Vendor Tag: xorg
Release Tags:   libX11-1-6-4

U xsrc/external/mit/libX11/dist/x11-xcb.pc.in
U xsrc/external/mit/libX11/dist/configure
U xsrc/external/mit/libX11/dist/config.sub
U xsrc/external/mit/libX11/dist/INSTALL
U xsrc/external/mit/libX11/dist/ltmain.sh
U xsrc/external/mit/libX11/dist/AUTHORS
U xsrc/external/mit/libX11/dist/NEWS
U xsrc/external/mit/libX11/dist/test-driver
U xsrc/external/mit/libX11/dist/compile
U xsrc/external/mit/libX11/dist/Makefile.in
U xsrc/external/mit/libX11/dist/x11.pc.in
U xsrc/external/mit/libX11/dist/README
U xsrc/external/mit/libX11/dist/ChangeLog
U xsrc/external/mit/libX11/dist/install-sh
U xsrc/external/mit/libX11/dist/missing
U xsrc/external/mit/libX11/dist/Makefile.am
U xsrc/external/mit/libX11/dist/COPYING
U xsrc/external/mit/libX11/dist/cpprules.in
U xsrc/external/mit/libX11/dist/config.guess
U xsrc/external/mit/libX11/dist/docbook.am
U xsrc/external/mit/libX11/dist/configure.ac
U xsrc/external/mit/libX11/dist/aclocal.m4
U xsrc/external/mit/libX11/dist/depcomp
U xsrc/external/mit/libX11/dist/include/Makefile.am
U xsrc/external/mit/libX11/dist/include/Makefile.in
U xsrc/external/mit/libX11/dist/include/X11/XlibConf.h.in
U xsrc/external/mit/libX11/dist/include/X11/cursorfont.h
U xsrc/external/mit/libX11/dist/include/X11/XKBlib.h
U xsrc/external/mit/libX11/dist/include/X11/Xlocale.h
U xsrc/external/mit/libX11/dist/include/X11/Xlibint.h
U xsrc/external/mit/libX11/dist/include/X11/Xregion.h
U xsrc/external/mit/libX11/dist/include/X11/Xcms.h
U xsrc/external/mit/libX11/dist/include/X11/Xresource.h
U xsrc/external/mit/libX11/dist/include/X11/Xlib-xcb.h
U xsrc/external/mit/libX11/dist/include/X11/ImUtil.h
U xsrc/external/mit/libX11/dist/include/X11/Xlib.h
U xsrc/external/mit/libX11/dist/include/X11/Xutil.h
U xsrc/external/mit/libX11/dist/m4/ax_define_dir.m4
C xsrc/external/mit/libX11/dist/m4/ltoptions.m4
U xsrc/external/mit/libX11/dist/m4/ltsugar.m4
C xsrc/external/mit/libX11/dist/m4/libtool.m4
C xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4
C xsrc/external/mit/libX11/dist/m4/ltversion.m4
U xsrc/external/mit/libX11/dist/src/DestWind.c
U xsrc/external/mit/libX11/dist/src/FilterEv.c
U xsrc/external/mit/libX11/dist/src/CrCmap.c
U xsrc/external/mit/libX11/dist/src/GetHints.c
U xsrc/external/mit/libX11/dist/src/PmapBgnd.c
U xsrc/external/mit/libX11/dist/src/DrRects.c
U xsrc/external/mit/libX11/dist/src/WrBitF.c
U xsrc/external/mit/libX11/dist/src/Key.h
U xsrc/external/mit/libX11/dist/src/ConvSel.c
U xsrc/external/mit/libX11/dist/src/FSSaver.c
U xsrc/external/mit/libX11/dist/src/SetHints.c
U xsrc/external/mit/libX11/dist/src/LowerWin.c
U xsrc/external/mit/libX11/dist/src/OMWrap.c
U xsrc/external/mit/libX11/dist/src/RdBitF.c
U xsrc/external/mit/libX11/dist/src/GetMoEv.c
U xsrc/external/mit/libX11/dist/src/LiHosts.c
U xsrc/external/mit/libX11/dist/src/locking.h
U xsrc/external/mit/libX11/dist/src/OCWrap.c
U xsrc/external/mit/libX11/dist/src/SetBack.c
U xsrc/external/mit/libX11/dist/src/DrArc.c
U xsrc/external/mit/libX11/dist/src/ChSaveSet.c
U xsrc/external/mit/libX11/dist/src/SetTile.c
U xsrc/external/mit/libX11/dist/src/XlibAsync.c
U xsrc/external/mit/libX11/dist/src/GetNrmHint.c
U xsrc/external/mit/libX11/dist/src/QuTileShp.c
U xsrc/external/mit/libX11/dist/src/VisUtil.c
U xsrc/external/mit/libX11/dist/src/TextToStr.c
U xsrc/external/mit/libX11/dist/src/Synchro.c
U xsrc/external/mit/libX11/dist/src/CrPixmap.c
U xsrc/external/mit/libX11/dist/src/GetColor.c
U xsrc/external/mit/libX11/dist/src/RepWindow.c
U xsrc/external/mit/libX11/dist/src/ChkIfEv.c
U xsrc/external/mit/libX11/dist/src/PutBEvent.c
U xsrc/external/mit/libX11/dist/src/KeysymStr.c
U xsrc/external/mit/libX11/dist/src/GetSSaver.c
U xsrc/external/mit/libX11/dist/src/ClDisplay.c
U xsrc/external/mit/libX11/dist/src/SetLStyle.c
U xsrc/external/mit/libX11/dist/src/LiProps.c
U xsrc/external/mit/libX11/dist/src/GetSOwner.c
U xsrc/external/mit/libX11/dist/src/SetIFocus.c
U xsrc/external/mit/libX11/dist/src/Misc.c
U xsrc/external/mit/libX11/dist/src/CirWin.c
U xsrc/external/mit/libX11/dist/src/GetWMCMapW.c
U xsrc/external/mit/libX11/dist/src/UngrabPtr.c
U xsrc/external/mit/libX11/dist/src/PeekIfEv.c
U xsrc/external/mit/libX11/dist/src/ScrResStr.c
U xsrc/external/mit/libX11/dist/src/EvToWire.c
U xsrc/external/mit/libX11/dist/src/PixFormats.c
U xsrc/external/mit/libX11/dist/src/DrArcs.c
U xsrc/external/mit/libX11/dist/src/QuTree.c
U xsrc/external/mit/libX11/dist/src/MoveWin.c
U xsrc/external/mit/libX11/dist/src/Cr.h
U xsrc/external/mit/libX11/dist/src/PutImage.c
U xsrc/external/mit/libX11/dist/src/SetTSOrig.c
U xsrc/external/mit/libX11/dist/src/FreeEData.c
U xsrc/external/mit/libX11/dist/src/Iconify.c
U xsrc/external/mit/libX11/dist/src/FreeGC.c
U

CVS commit: xsrc/external/mit

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 22:01:50 UTC 2016

Modified Files:
xsrc/external/mit/libXi/dist: INSTALL
xsrc/external/mit/libXi/dist/src: XGMotion.c XGetBMap.c XGetDCtl.c
XGetFCtl.c XListDev.c XQueryDv.c
xsrc/external/mit/libXrandr/dist/src: XrrProvider.c
xsrc/external/mit/libXrender/dist/src: Filter.c Xrender.c
xsrc/external/mit/libXtst/dist/man: XTestQueryExtension.man
xsrc/external/mit/libXtst/dist/src: XRecord.c
xsrc/external/mit/libXvMC/dist/src: XvMC.c
xsrc/external/mit/libxcb/dist/src: xcb_in.c
Added Files:
xsrc/external/mit/libXrandr/dist: compile

Log Message:
merge libXi 1.7.7, libXrandr 1.5.1, libXrender 0.9.10, libXtst 1.2.3,
libXv 1.0.11, libXvMC 1.0.10., and libxcb 1.11.1.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXi/dist/INSTALL
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXi/dist/src/XGMotion.c \
xsrc/external/mit/libXi/dist/src/XGetDCtl.c \
xsrc/external/mit/libXi/dist/src/XQueryDv.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXi/dist/src/XGetBMap.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXi/dist/src/XGetFCtl.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXi/dist/src/XListDev.c
cvs rdiff -u -r0 -r1.3 xsrc/external/mit/libXrandr/dist/compile
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXrandr/dist/src/XrrProvider.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXrender/dist/src/Filter.c \
xsrc/external/mit/libXrender/dist/src/Xrender.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXtst/dist/src/XRecord.c
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libXvMC/dist/src/XvMC.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libxcb/dist/src/xcb_in.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/libxcb/dist

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:58:39 UTC 2016

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

Log Message:
initial import of libxcb-1.11.1

Status:

Vendor Tag: xorg
Release Tags:   libxcb-1-11-1

U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in
U xsrc/external/mit/libxcb/dist/xcb.pc.in
U xsrc/external/mit/libxcb/dist/Makefile.am
U xsrc/external/mit/libxcb/dist/compile
U xsrc/external/mit/libxcb/dist/missing
U xsrc/external/mit/libxcb/dist/config.sub
U xsrc/external/mit/libxcb/dist/check-pc-requires
U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in
U xsrc/external/mit/libxcb/dist/xcb-render.pc.in
U xsrc/external/mit/libxcb/dist/xcb-res.pc.in
U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in
U xsrc/external/mit/libxcb/dist/xcb-record.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in
U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in
U xsrc/external/mit/libxcb/dist/configure
U xsrc/external/mit/libxcb/dist/Makefile.in
U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in
U xsrc/external/mit/libxcb/dist/NEWS
U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xkb.pc.in
U xsrc/external/mit/libxcb/dist/install-sh
U xsrc/external/mit/libxcb/dist/xcb-present.pc.in
U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in
U xsrc/external/mit/libxcb/dist/config.guess
U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in
U xsrc/external/mit/libxcb/dist/autogen.sh
U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in
U xsrc/external/mit/libxcb/dist/INSTALL
U xsrc/external/mit/libxcb/dist/depcomp
U xsrc/external/mit/libxcb/dist/COPYING
U xsrc/external/mit/libxcb/dist/README
U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in
U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in
U xsrc/external/mit/libxcb/dist/ltmain.sh
U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dri3.pc.in
U xsrc/external/mit/libxcb/dist/configure.ac
U xsrc/external/mit/libxcb/dist/aclocal.m4
U xsrc/external/mit/libxcb/dist/src/xcb_windefs.h
U xsrc/external/mit/libxcb/dist/src/xcb_xid.c
U xsrc/external/mit/libxcb/dist/src/xcb_out.c
U xsrc/external/mit/libxcb/dist/src/Makefile.am
U xsrc/external/mit/libxcb/dist/src/xcb_list.c
U xsrc/external/mit/libxcb/dist/src/c_client.py
U xsrc/external/mit/libxcb/dist/src/xcbint.h
U xsrc/external/mit/libxcb/dist/src/Makefile.in
C xsrc/external/mit/libxcb/dist/src/xcb_in.c
U xsrc/external/mit/libxcb/dist/src/xcb_ext.c
U xsrc/external/mit/libxcb/dist/src/xcbext.h
U xsrc/external/mit/libxcb/dist/src/xcb_auth.c
U xsrc/external/mit/libxcb/dist/src/xcb.h
U xsrc/external/mit/libxcb/dist/src/xcb_conn.c
U xsrc/external/mit/libxcb/dist/src/xcb_util.c
U xsrc/external/mit/libxcb/dist/src/config.h.in
U xsrc/external/mit/libxcb/dist/tools/constants
U xsrc/external/mit/libxcb/dist/tools/api_conv.pl
U xsrc/external/mit/libxcb/dist/tools/README
U xsrc/external/mit/libxcb/dist/build-aux/config.sub
U xsrc/external/mit/libxcb/dist/build-aux/compile
U xsrc/external/mit/libxcb/dist/build-aux/missing
U xsrc/external/mit/libxcb/dist/build-aux/install-sh
U xsrc/external/mit/libxcb/dist/build-aux/config.guess
U xsrc/external/mit/libxcb/dist/build-aux/depcomp
U xsrc/external/mit/libxcb/dist/build-aux/ltmain.sh
U xsrc/external/mit/libxcb/dist/build-aux/test-driver
U xsrc/external/mit/libxcb/dist/man/xcb-examples.man
U xsrc/external/mit/libxcb/dist/man/Makefile.am
U xsrc/external/mit/libxcb/dist/man/Makefile.in
U xsrc/external/mit/libxcb/dist/man/xcb-requests.man
U xsrc/external/mit/libxcb/dist/m4/lt~obsolete.m4
U xsrc/external/mit/libxcb/dist/m4/ltoptions.m4
U xsrc/external/mit/libxcb/dist/m4/xcb.m4
U xsrc/external/mit/libxcb/dist/m4/ltversion.m4
U xsrc/external/mit/libxcb/dist/m4/libtool.m4
U xsrc/external/mit/libxcb/dist/m4/ltsugar.m4
U xsrc/external/mit/libxcb/dist/tests/check_public.c
U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl
U xsrc/external/mit/libxcb/dist/tests/Makefile.am
U xsrc/external/mit/libxcb/dist/tests/check_suites.h
U xsrc/external/mit/libxcb/dist/tests/check_all.c
U xsrc/external/mit/libxcb/dist/tests/Makefile.in
U xsrc/external/mit/libxcb/dist/doc/Makefile.am
U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in
U xsrc/external/mit/libxcb/dist/doc/Makefile.in
U xsrc/external/mit/libxcb/dist/doc/xkb_issues
U xsrc/external/mit/libxcb/dist/doc/xkb_internals
U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html
U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:58:39 UTC 2016

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

Log Message:
initial import of libxcb-1.11.1

Status:

Vendor Tag: xorg
Release Tags:   libxcb-1-11-1

U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in
U xsrc/external/mit/libxcb/dist/xcb.pc.in
U xsrc/external/mit/libxcb/dist/Makefile.am
U xsrc/external/mit/libxcb/dist/compile
U xsrc/external/mit/libxcb/dist/missing
U xsrc/external/mit/libxcb/dist/config.sub
U xsrc/external/mit/libxcb/dist/check-pc-requires
U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in
U xsrc/external/mit/libxcb/dist/xcb-render.pc.in
U xsrc/external/mit/libxcb/dist/xcb-res.pc.in
U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in
U xsrc/external/mit/libxcb/dist/xcb-record.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in
U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in
U xsrc/external/mit/libxcb/dist/configure
U xsrc/external/mit/libxcb/dist/Makefile.in
U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in
U xsrc/external/mit/libxcb/dist/NEWS
U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xkb.pc.in
U xsrc/external/mit/libxcb/dist/install-sh
U xsrc/external/mit/libxcb/dist/xcb-present.pc.in
U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in
U xsrc/external/mit/libxcb/dist/config.guess
U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in
U xsrc/external/mit/libxcb/dist/autogen.sh
U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in
U xsrc/external/mit/libxcb/dist/INSTALL
U xsrc/external/mit/libxcb/dist/depcomp
U xsrc/external/mit/libxcb/dist/COPYING
U xsrc/external/mit/libxcb/dist/README
U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in
U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in
U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in
U xsrc/external/mit/libxcb/dist/ltmain.sh
U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in
U xsrc/external/mit/libxcb/dist/xcb-dri3.pc.in
U xsrc/external/mit/libxcb/dist/configure.ac
U xsrc/external/mit/libxcb/dist/aclocal.m4
U xsrc/external/mit/libxcb/dist/src/xcb_windefs.h
U xsrc/external/mit/libxcb/dist/src/xcb_xid.c
U xsrc/external/mit/libxcb/dist/src/xcb_out.c
U xsrc/external/mit/libxcb/dist/src/Makefile.am
U xsrc/external/mit/libxcb/dist/src/xcb_list.c
U xsrc/external/mit/libxcb/dist/src/c_client.py
U xsrc/external/mit/libxcb/dist/src/xcbint.h
U xsrc/external/mit/libxcb/dist/src/Makefile.in
C xsrc/external/mit/libxcb/dist/src/xcb_in.c
U xsrc/external/mit/libxcb/dist/src/xcb_ext.c
U xsrc/external/mit/libxcb/dist/src/xcbext.h
U xsrc/external/mit/libxcb/dist/src/xcb_auth.c
U xsrc/external/mit/libxcb/dist/src/xcb.h
U xsrc/external/mit/libxcb/dist/src/xcb_conn.c
U xsrc/external/mit/libxcb/dist/src/xcb_util.c
U xsrc/external/mit/libxcb/dist/src/config.h.in
U xsrc/external/mit/libxcb/dist/tools/constants
U xsrc/external/mit/libxcb/dist/tools/api_conv.pl
U xsrc/external/mit/libxcb/dist/tools/README
U xsrc/external/mit/libxcb/dist/build-aux/config.sub
U xsrc/external/mit/libxcb/dist/build-aux/compile
U xsrc/external/mit/libxcb/dist/build-aux/missing
U xsrc/external/mit/libxcb/dist/build-aux/install-sh
U xsrc/external/mit/libxcb/dist/build-aux/config.guess
U xsrc/external/mit/libxcb/dist/build-aux/depcomp
U xsrc/external/mit/libxcb/dist/build-aux/ltmain.sh
U xsrc/external/mit/libxcb/dist/build-aux/test-driver
U xsrc/external/mit/libxcb/dist/man/xcb-examples.man
U xsrc/external/mit/libxcb/dist/man/Makefile.am
U xsrc/external/mit/libxcb/dist/man/Makefile.in
U xsrc/external/mit/libxcb/dist/man/xcb-requests.man
U xsrc/external/mit/libxcb/dist/m4/lt~obsolete.m4
U xsrc/external/mit/libxcb/dist/m4/ltoptions.m4
U xsrc/external/mit/libxcb/dist/m4/xcb.m4
U xsrc/external/mit/libxcb/dist/m4/ltversion.m4
U xsrc/external/mit/libxcb/dist/m4/libtool.m4
U xsrc/external/mit/libxcb/dist/m4/ltsugar.m4
U xsrc/external/mit/libxcb/dist/tests/check_public.c
U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl
U xsrc/external/mit/libxcb/dist/tests/Makefile.am
U xsrc/external/mit/libxcb/dist/tests/check_suites.h
U xsrc/external/mit/libxcb/dist/tests/check_all.c
U xsrc/external/mit/libxcb/dist/tests/Makefile.in
U xsrc/external/mit/libxcb/dist/doc/Makefile.am
U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in
U xsrc/external/mit/libxcb/dist/doc/Makefile.in
U xsrc/external/mit/libxcb/dist/doc/xkb_issues
U xsrc/external/mit/libxcb/dist/doc/xkb_internals
U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html
U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:55 UTC 2016

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

Log Message:
initial import of libXrandr-1.5.1

Status:

Vendor Tag: xorg
Release Tags:   libXrandr-1-5-1

U xsrc/external/mit/libXrandr/dist/configure
U xsrc/external/mit/libXrandr/dist/config.sub
U xsrc/external/mit/libXrandr/dist/INSTALL
U xsrc/external/mit/libXrandr/dist/compile
U xsrc/external/mit/libXrandr/dist/ltmain.sh
U xsrc/external/mit/libXrandr/dist/AUTHORS
U xsrc/external/mit/libXrandr/dist/xrandr.pc.in
U xsrc/external/mit/libXrandr/dist/README
U xsrc/external/mit/libXrandr/dist/ChangeLog
U xsrc/external/mit/libXrandr/dist/missing
U xsrc/external/mit/libXrandr/dist/install-sh
U xsrc/external/mit/libXrandr/dist/Makefile.am
U xsrc/external/mit/libXrandr/dist/COPYING
U xsrc/external/mit/libXrandr/dist/Makefile.in
U xsrc/external/mit/libXrandr/dist/config.h.in
U xsrc/external/mit/libXrandr/dist/config.guess
U xsrc/external/mit/libXrandr/dist/configure.ac
U xsrc/external/mit/libXrandr/dist/aclocal.m4
U xsrc/external/mit/libXrandr/dist/depcomp
U xsrc/external/mit/libXrandr/dist/include/X11/extensions/Xrandr.h
C xsrc/external/mit/libXrandr/dist/src/XrrProvider.c
U xsrc/external/mit/libXrandr/dist/src/Xrandrint.h
U xsrc/external/mit/libXrandr/dist/src/XrrMode.c
U xsrc/external/mit/libXrandr/dist/src/XrrProperty.c
U xsrc/external/mit/libXrandr/dist/src/XrrConfig.c
U xsrc/external/mit/libXrandr/dist/src/XrrMonitor.c
U xsrc/external/mit/libXrandr/dist/src/XrrProviderProperty.c
U xsrc/external/mit/libXrandr/dist/src/Makefile.am
U xsrc/external/mit/libXrandr/dist/src/Makefile.in
U xsrc/external/mit/libXrandr/dist/src/XrrScreen.c
U xsrc/external/mit/libXrandr/dist/src/Xrandr.c
U xsrc/external/mit/libXrandr/dist/src/XrrCrtc.c
U xsrc/external/mit/libXrandr/dist/src/XrrOutput.c
U xsrc/external/mit/libXrandr/dist/man/XRRFreeScreenConfigInfo.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigSizes.man
U xsrc/external/mit/libXrandr/dist/man/XRRQueryVersion.man
U xsrc/external/mit/libXrandr/dist/man/XRRRootToScreen.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigRates.man
U xsrc/external/mit/libXrandr/dist/man/XRRSelectInput.man
U xsrc/external/mit/libXrandr/dist/man/Xrandr.man
U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfigAndRate.man
U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfig.man
U xsrc/external/mit/libXrandr/dist/man/XRRQueryExtension.man
U xsrc/external/mit/libXrandr/dist/man/XRRGetScreenInfo.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentRate.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigTimes.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigRotations.man
U xsrc/external/mit/libXrandr/dist/man/Makefile.am
U xsrc/external/mit/libXrandr/dist/man/Makefile.in
U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentConfiguration.man

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:57:03 UTC 2016

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

Log Message:
initial import of libXvMC-1.0.10

Status:

Vendor Tag: xorg
Release Tags:   libXvMC-1-0-10

U xsrc/external/mit/libXvMC/dist/configure
U xsrc/external/mit/libXvMC/dist/xvmc.pc.in
U xsrc/external/mit/libXvMC/dist/INSTALL
U xsrc/external/mit/libXvMC/dist/XvMC_API.txt
U xsrc/external/mit/libXvMC/dist/config.sub
U xsrc/external/mit/libXvMC/dist/ltmain.sh
U xsrc/external/mit/libXvMC/dist/ChangeLog
U xsrc/external/mit/libXvMC/dist/compile
U xsrc/external/mit/libXvMC/dist/README
U xsrc/external/mit/libXvMC/dist/install-sh
U xsrc/external/mit/libXvMC/dist/missing
U xsrc/external/mit/libXvMC/dist/Makefile.am
U xsrc/external/mit/libXvMC/dist/COPYING
U xsrc/external/mit/libXvMC/dist/Makefile.in
U xsrc/external/mit/libXvMC/dist/config.h.in
U xsrc/external/mit/libXvMC/dist/config.guess
U xsrc/external/mit/libXvMC/dist/configure.ac
U xsrc/external/mit/libXvMC/dist/aclocal.m4
U xsrc/external/mit/libXvMC/dist/depcomp
U xsrc/external/mit/libXvMC/dist/include/Makefile.am
U xsrc/external/mit/libXvMC/dist/include/Makefile.in
U xsrc/external/mit/libXvMC/dist/include/X11/Makefile.am
U xsrc/external/mit/libXvMC/dist/include/X11/Makefile.in
U xsrc/external/mit/libXvMC/dist/include/X11/extensions/XvMClib.h
U xsrc/external/mit/libXvMC/dist/include/X11/extensions/Makefile.am
U xsrc/external/mit/libXvMC/dist/include/X11/extensions/Makefile.in
U xsrc/external/mit/libXvMC/dist/src/XvMClibint.h
C xsrc/external/mit/libXvMC/dist/src/XvMC.c
U xsrc/external/mit/libXvMC/dist/src/Makefile.am
U xsrc/external/mit/libXvMC/dist/src/Makefile.in
U xsrc/external/mit/libXvMC/dist/wrapper/XvMCWrapper.c
U xsrc/external/mit/libXvMC/dist/wrapper/Makefile.am
U xsrc/external/mit/libXvMC/dist/wrapper/Makefile.in

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:57 UTC 2016

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

Log Message:
initial import of libXrender-0.9.10

Status:

Vendor Tag: xorg
Release Tags:   libXrender-0-9-10

U xsrc/external/mit/libXrender/dist/configure
U xsrc/external/mit/libXrender/dist/config.sub
U xsrc/external/mit/libXrender/dist/INSTALL
U xsrc/external/mit/libXrender/dist/aclocal.m4
U xsrc/external/mit/libXrender/dist/xrender.pc.in
U xsrc/external/mit/libXrender/dist/ltmain.sh
U xsrc/external/mit/libXrender/dist/AUTHORS
U xsrc/external/mit/libXrender/dist/compile
U xsrc/external/mit/libXrender/dist/README
U xsrc/external/mit/libXrender/dist/ChangeLog
U xsrc/external/mit/libXrender/dist/missing
U xsrc/external/mit/libXrender/dist/install-sh
U xsrc/external/mit/libXrender/dist/Makefile.am
U xsrc/external/mit/libXrender/dist/COPYING
U xsrc/external/mit/libXrender/dist/Makefile.in
U xsrc/external/mit/libXrender/dist/config.h.in
U xsrc/external/mit/libXrender/dist/config.guess
U xsrc/external/mit/libXrender/dist/configure.ac
U xsrc/external/mit/libXrender/dist/depcomp
U xsrc/external/mit/libXrender/dist/include/X11/extensions/Xrender.h
U xsrc/external/mit/libXrender/dist/src/AddTrap.c
U xsrc/external/mit/libXrender/dist/src/Tri.c
U xsrc/external/mit/libXrender/dist/src/Composite.c
U xsrc/external/mit/libXrender/dist/src/Cursor.c
U xsrc/external/mit/libXrender/dist/src/FillRects.c
U xsrc/external/mit/libXrender/dist/src/Picture.c
C xsrc/external/mit/libXrender/dist/src/Xrender.c
U xsrc/external/mit/libXrender/dist/src/Color.c
U xsrc/external/mit/libXrender/dist/src/Xrenderint.h
C xsrc/external/mit/libXrender/dist/src/Filter.c
U xsrc/external/mit/libXrender/dist/src/Glyph.c
U xsrc/external/mit/libXrender/dist/src/FillRect.c
U xsrc/external/mit/libXrender/dist/src/Makefile.am
U xsrc/external/mit/libXrender/dist/src/Poly.c
U xsrc/external/mit/libXrender/dist/src/Makefile.in
U xsrc/external/mit/libXrender/dist/src/Trap.c
U xsrc/external/mit/libXrender/dist/doc/libXrender.txt

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:59 UTC 2016

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

Log Message:
initial import of libXtst-1.2.3

Status:

Vendor Tag: xorg
Release Tags:   libXtst-1-2-3

U xsrc/external/mit/libXtst/dist/configure
U xsrc/external/mit/libXtst/dist/config.sub
U xsrc/external/mit/libXtst/dist/INSTALL
N xsrc/external/mit/libXtst/dist/compile
U xsrc/external/mit/libXtst/dist/ltmain.sh
U xsrc/external/mit/libXtst/dist/xtst.pc.in
U xsrc/external/mit/libXtst/dist/ChangeLog
U xsrc/external/mit/libXtst/dist/README
U xsrc/external/mit/libXtst/dist/install-sh
U xsrc/external/mit/libXtst/dist/missing
U xsrc/external/mit/libXtst/dist/Makefile.am
U xsrc/external/mit/libXtst/dist/COPYING
U xsrc/external/mit/libXtst/dist/Makefile.in
U xsrc/external/mit/libXtst/dist/config.h.in
U xsrc/external/mit/libXtst/dist/config.guess
U xsrc/external/mit/libXtst/dist/docbook.am
U xsrc/external/mit/libXtst/dist/configure.ac
U xsrc/external/mit/libXtst/dist/aclocal.m4
U xsrc/external/mit/libXtst/dist/depcomp
U xsrc/external/mit/libXtst/dist/include/X11/extensions/XTest.h
U xsrc/external/mit/libXtst/dist/include/X11/extensions/record.h
U xsrc/external/mit/libXtst/dist/src/Makefile.am
U xsrc/external/mit/libXtst/dist/src/Makefile.in
C xsrc/external/mit/libXtst/dist/src/XRecord.c
U xsrc/external/mit/libXtst/dist/src/XTest.c
U xsrc/external/mit/libXtst/dist/man/XTest.xml
U xsrc/external/mit/libXtst/dist/man/x.stamp
U xsrc/external/mit/libXtst/dist/man/XTestFakeKeyEvent.man
C xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeMotionEvent.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeRelativeMotionEvent.man
U xsrc/external/mit/libXtst/dist/man/XTestGrabControl.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeButtonEvent.man
U xsrc/external/mit/libXtst/dist/man/Makefile.am
U xsrc/external/mit/libXtst/dist/man/XTestCompareCurrentCursorWithWindow.man
U xsrc/external/mit/libXtst/dist/man/XTestDiscard.man
U xsrc/external/mit/libXtst/dist/man/XTestSetGContextOfGC.man
U xsrc/external/mit/libXtst/dist/man/Makefile.in
U xsrc/external/mit/libXtst/dist/man/XTestSetVisualIDOfVisual.man
U xsrc/external/mit/libXtst/dist/man/XTestCompareCursorWithWindow.man
U xsrc/external/mit/libXtst/dist/specs/recordlib.xml
U xsrc/external/mit/libXtst/dist/specs/xtestlib.xml
U xsrc/external/mit/libXtst/dist/specs/Makefile.am
U xsrc/external/mit/libXtst/dist/specs/Makefile.in

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:57:03 UTC 2016

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

Log Message:
initial import of libXvMC-1.0.10

Status:

Vendor Tag: xorg
Release Tags:   libXvMC-1-0-10

U xsrc/external/mit/libXvMC/dist/configure
U xsrc/external/mit/libXvMC/dist/xvmc.pc.in
U xsrc/external/mit/libXvMC/dist/INSTALL
U xsrc/external/mit/libXvMC/dist/XvMC_API.txt
U xsrc/external/mit/libXvMC/dist/config.sub
U xsrc/external/mit/libXvMC/dist/ltmain.sh
U xsrc/external/mit/libXvMC/dist/ChangeLog
U xsrc/external/mit/libXvMC/dist/compile
U xsrc/external/mit/libXvMC/dist/README
U xsrc/external/mit/libXvMC/dist/install-sh
U xsrc/external/mit/libXvMC/dist/missing
U xsrc/external/mit/libXvMC/dist/Makefile.am
U xsrc/external/mit/libXvMC/dist/COPYING
U xsrc/external/mit/libXvMC/dist/Makefile.in
U xsrc/external/mit/libXvMC/dist/config.h.in
U xsrc/external/mit/libXvMC/dist/config.guess
U xsrc/external/mit/libXvMC/dist/configure.ac
U xsrc/external/mit/libXvMC/dist/aclocal.m4
U xsrc/external/mit/libXvMC/dist/depcomp
U xsrc/external/mit/libXvMC/dist/include/Makefile.am
U xsrc/external/mit/libXvMC/dist/include/Makefile.in
U xsrc/external/mit/libXvMC/dist/include/X11/Makefile.am
U xsrc/external/mit/libXvMC/dist/include/X11/Makefile.in
U xsrc/external/mit/libXvMC/dist/include/X11/extensions/XvMClib.h
U xsrc/external/mit/libXvMC/dist/include/X11/extensions/Makefile.am
U xsrc/external/mit/libXvMC/dist/include/X11/extensions/Makefile.in
U xsrc/external/mit/libXvMC/dist/src/XvMClibint.h
C xsrc/external/mit/libXvMC/dist/src/XvMC.c
U xsrc/external/mit/libXvMC/dist/src/Makefile.am
U xsrc/external/mit/libXvMC/dist/src/Makefile.in
U xsrc/external/mit/libXvMC/dist/wrapper/XvMCWrapper.c
U xsrc/external/mit/libXvMC/dist/wrapper/Makefile.am
U xsrc/external/mit/libXvMC/dist/wrapper/Makefile.in

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:57:01 UTC 2016

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

Log Message:
initial import of libXv-1.0.11

Status:

Vendor Tag: xorg
Release Tags:   libXv-1-0-11

U xsrc/external/mit/libXv/dist/configure
U xsrc/external/mit/libXv/dist/config.sub
U xsrc/external/mit/libXv/dist/INSTALL
U xsrc/external/mit/libXv/dist/compile
U xsrc/external/mit/libXv/dist/ltmain.sh
U xsrc/external/mit/libXv/dist/AUTHORS
U xsrc/external/mit/libXv/dist/ChangeLog
U xsrc/external/mit/libXv/dist/README
U xsrc/external/mit/libXv/dist/install-sh
U xsrc/external/mit/libXv/dist/missing
U xsrc/external/mit/libXv/dist/Makefile.am
U xsrc/external/mit/libXv/dist/COPYING
U xsrc/external/mit/libXv/dist/Makefile.in
U xsrc/external/mit/libXv/dist/config.h.in
U xsrc/external/mit/libXv/dist/config.guess
U xsrc/external/mit/libXv/dist/xv.pc.in
U xsrc/external/mit/libXv/dist/configure.ac
U xsrc/external/mit/libXv/dist/aclocal.m4
U xsrc/external/mit/libXv/dist/depcomp
U xsrc/external/mit/libXv/dist/include/Makefile.am
U xsrc/external/mit/libXv/dist/include/Makefile.in
U xsrc/external/mit/libXv/dist/include/X11/Makefile.am
U xsrc/external/mit/libXv/dist/include/X11/Makefile.in
U xsrc/external/mit/libXv/dist/include/X11/extensions/Makefile.am
U xsrc/external/mit/libXv/dist/include/X11/extensions/Xvlib.h
U xsrc/external/mit/libXv/dist/include/X11/extensions/Makefile.in
U xsrc/external/mit/libXv/dist/src/Xvlibint.h
U xsrc/external/mit/libXv/dist/src/Xv.c
U xsrc/external/mit/libXv/dist/src/Makefile.am
U xsrc/external/mit/libXv/dist/src/Makefile.in
U xsrc/external/mit/libXv/dist/man/XvSelectPortNotify.man
U xsrc/external/mit/libXv/dist/man/XvVideoNotify.man
U xsrc/external/mit/libXv/dist/man/XvQueryEncodings.man
U xsrc/external/mit/libXv/dist/man/xv-library-v2.2.txt
U xsrc/external/mit/libXv/dist/man/XvGetPortAttribute.man
U xsrc/external/mit/libXv/dist/man/XvQueryAdaptors.man
U xsrc/external/mit/libXv/dist/man/XvQueryBestSize.man
U xsrc/external/mit/libXv/dist/man/XvPutStill.man
U xsrc/external/mit/libXv/dist/man/XvShmCreateImage.man
U xsrc/external/mit/libXv/dist/man/XvPutVideo.man
U xsrc/external/mit/libXv/dist/man/XvListImageFormats.man
U xsrc/external/mit/libXv/dist/man/XvPortNotify.man
U xsrc/external/mit/libXv/dist/man/XvQueryPortAttributes.man
U xsrc/external/mit/libXv/dist/man/XvFreeAdaptorInfo.man
U xsrc/external/mit/libXv/dist/man/Xv.man
U xsrc/external/mit/libXv/dist/man/XvStopVideo.man
U xsrc/external/mit/libXv/dist/man/XvCreateImage.man
U xsrc/external/mit/libXv/dist/man/XvGrabPort.man
U xsrc/external/mit/libXv/dist/man/XvSetPortAttribute.man
U xsrc/external/mit/libXv/dist/man/XvQueryExtension.man
U xsrc/external/mit/libXv/dist/man/XvUngrabPort.man
U xsrc/external/mit/libXv/dist/man/Makefile.am
U xsrc/external/mit/libXv/dist/man/XvPutImage.man
U xsrc/external/mit/libXv/dist/man/Makefile.in
U xsrc/external/mit/libXv/dist/man/XvGetStill.man
U xsrc/external/mit/libXv/dist/man/XvGetVideo.man
U xsrc/external/mit/libXv/dist/man/XvSelectVideoNotify.man
U xsrc/external/mit/libXv/dist/man/XvShmPutImage.man
U xsrc/external/mit/libXv/dist/man/XvFreeEncodingInfo.man

No conflicts created by this import

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:57 UTC 2016

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

Log Message:
initial import of libXrender-0.9.10

Status:

Vendor Tag: xorg
Release Tags:   libXrender-0-9-10

U xsrc/external/mit/libXrender/dist/configure
U xsrc/external/mit/libXrender/dist/config.sub
U xsrc/external/mit/libXrender/dist/INSTALL
U xsrc/external/mit/libXrender/dist/aclocal.m4
U xsrc/external/mit/libXrender/dist/xrender.pc.in
U xsrc/external/mit/libXrender/dist/ltmain.sh
U xsrc/external/mit/libXrender/dist/AUTHORS
U xsrc/external/mit/libXrender/dist/compile
U xsrc/external/mit/libXrender/dist/README
U xsrc/external/mit/libXrender/dist/ChangeLog
U xsrc/external/mit/libXrender/dist/missing
U xsrc/external/mit/libXrender/dist/install-sh
U xsrc/external/mit/libXrender/dist/Makefile.am
U xsrc/external/mit/libXrender/dist/COPYING
U xsrc/external/mit/libXrender/dist/Makefile.in
U xsrc/external/mit/libXrender/dist/config.h.in
U xsrc/external/mit/libXrender/dist/config.guess
U xsrc/external/mit/libXrender/dist/configure.ac
U xsrc/external/mit/libXrender/dist/depcomp
U xsrc/external/mit/libXrender/dist/include/X11/extensions/Xrender.h
U xsrc/external/mit/libXrender/dist/src/AddTrap.c
U xsrc/external/mit/libXrender/dist/src/Tri.c
U xsrc/external/mit/libXrender/dist/src/Composite.c
U xsrc/external/mit/libXrender/dist/src/Cursor.c
U xsrc/external/mit/libXrender/dist/src/FillRects.c
U xsrc/external/mit/libXrender/dist/src/Picture.c
C xsrc/external/mit/libXrender/dist/src/Xrender.c
U xsrc/external/mit/libXrender/dist/src/Color.c
U xsrc/external/mit/libXrender/dist/src/Xrenderint.h
C xsrc/external/mit/libXrender/dist/src/Filter.c
U xsrc/external/mit/libXrender/dist/src/Glyph.c
U xsrc/external/mit/libXrender/dist/src/FillRect.c
U xsrc/external/mit/libXrender/dist/src/Makefile.am
U xsrc/external/mit/libXrender/dist/src/Poly.c
U xsrc/external/mit/libXrender/dist/src/Makefile.in
U xsrc/external/mit/libXrender/dist/src/Trap.c
U xsrc/external/mit/libXrender/dist/doc/libXrender.txt

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:57:01 UTC 2016

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

Log Message:
initial import of libXv-1.0.11

Status:

Vendor Tag: xorg
Release Tags:   libXv-1-0-11

U xsrc/external/mit/libXv/dist/configure
U xsrc/external/mit/libXv/dist/config.sub
U xsrc/external/mit/libXv/dist/INSTALL
U xsrc/external/mit/libXv/dist/compile
U xsrc/external/mit/libXv/dist/ltmain.sh
U xsrc/external/mit/libXv/dist/AUTHORS
U xsrc/external/mit/libXv/dist/ChangeLog
U xsrc/external/mit/libXv/dist/README
U xsrc/external/mit/libXv/dist/install-sh
U xsrc/external/mit/libXv/dist/missing
U xsrc/external/mit/libXv/dist/Makefile.am
U xsrc/external/mit/libXv/dist/COPYING
U xsrc/external/mit/libXv/dist/Makefile.in
U xsrc/external/mit/libXv/dist/config.h.in
U xsrc/external/mit/libXv/dist/config.guess
U xsrc/external/mit/libXv/dist/xv.pc.in
U xsrc/external/mit/libXv/dist/configure.ac
U xsrc/external/mit/libXv/dist/aclocal.m4
U xsrc/external/mit/libXv/dist/depcomp
U xsrc/external/mit/libXv/dist/include/Makefile.am
U xsrc/external/mit/libXv/dist/include/Makefile.in
U xsrc/external/mit/libXv/dist/include/X11/Makefile.am
U xsrc/external/mit/libXv/dist/include/X11/Makefile.in
U xsrc/external/mit/libXv/dist/include/X11/extensions/Makefile.am
U xsrc/external/mit/libXv/dist/include/X11/extensions/Xvlib.h
U xsrc/external/mit/libXv/dist/include/X11/extensions/Makefile.in
U xsrc/external/mit/libXv/dist/src/Xvlibint.h
U xsrc/external/mit/libXv/dist/src/Xv.c
U xsrc/external/mit/libXv/dist/src/Makefile.am
U xsrc/external/mit/libXv/dist/src/Makefile.in
U xsrc/external/mit/libXv/dist/man/XvSelectPortNotify.man
U xsrc/external/mit/libXv/dist/man/XvVideoNotify.man
U xsrc/external/mit/libXv/dist/man/XvQueryEncodings.man
U xsrc/external/mit/libXv/dist/man/xv-library-v2.2.txt
U xsrc/external/mit/libXv/dist/man/XvGetPortAttribute.man
U xsrc/external/mit/libXv/dist/man/XvQueryAdaptors.man
U xsrc/external/mit/libXv/dist/man/XvQueryBestSize.man
U xsrc/external/mit/libXv/dist/man/XvPutStill.man
U xsrc/external/mit/libXv/dist/man/XvShmCreateImage.man
U xsrc/external/mit/libXv/dist/man/XvPutVideo.man
U xsrc/external/mit/libXv/dist/man/XvListImageFormats.man
U xsrc/external/mit/libXv/dist/man/XvPortNotify.man
U xsrc/external/mit/libXv/dist/man/XvQueryPortAttributes.man
U xsrc/external/mit/libXv/dist/man/XvFreeAdaptorInfo.man
U xsrc/external/mit/libXv/dist/man/Xv.man
U xsrc/external/mit/libXv/dist/man/XvStopVideo.man
U xsrc/external/mit/libXv/dist/man/XvCreateImage.man
U xsrc/external/mit/libXv/dist/man/XvGrabPort.man
U xsrc/external/mit/libXv/dist/man/XvSetPortAttribute.man
U xsrc/external/mit/libXv/dist/man/XvQueryExtension.man
U xsrc/external/mit/libXv/dist/man/XvUngrabPort.man
U xsrc/external/mit/libXv/dist/man/Makefile.am
U xsrc/external/mit/libXv/dist/man/XvPutImage.man
U xsrc/external/mit/libXv/dist/man/Makefile.in
U xsrc/external/mit/libXv/dist/man/XvGetStill.man
U xsrc/external/mit/libXv/dist/man/XvGetVideo.man
U xsrc/external/mit/libXv/dist/man/XvSelectVideoNotify.man
U xsrc/external/mit/libXv/dist/man/XvShmPutImage.man
U xsrc/external/mit/libXv/dist/man/XvFreeEncodingInfo.man

No conflicts created by this import

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:59 UTC 2016

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

Log Message:
initial import of libXtst-1.2.3

Status:

Vendor Tag: xorg
Release Tags:   libXtst-1-2-3

U xsrc/external/mit/libXtst/dist/configure
U xsrc/external/mit/libXtst/dist/config.sub
U xsrc/external/mit/libXtst/dist/INSTALL
N xsrc/external/mit/libXtst/dist/compile
U xsrc/external/mit/libXtst/dist/ltmain.sh
U xsrc/external/mit/libXtst/dist/xtst.pc.in
U xsrc/external/mit/libXtst/dist/ChangeLog
U xsrc/external/mit/libXtst/dist/README
U xsrc/external/mit/libXtst/dist/install-sh
U xsrc/external/mit/libXtst/dist/missing
U xsrc/external/mit/libXtst/dist/Makefile.am
U xsrc/external/mit/libXtst/dist/COPYING
U xsrc/external/mit/libXtst/dist/Makefile.in
U xsrc/external/mit/libXtst/dist/config.h.in
U xsrc/external/mit/libXtst/dist/config.guess
U xsrc/external/mit/libXtst/dist/docbook.am
U xsrc/external/mit/libXtst/dist/configure.ac
U xsrc/external/mit/libXtst/dist/aclocal.m4
U xsrc/external/mit/libXtst/dist/depcomp
U xsrc/external/mit/libXtst/dist/include/X11/extensions/XTest.h
U xsrc/external/mit/libXtst/dist/include/X11/extensions/record.h
U xsrc/external/mit/libXtst/dist/src/Makefile.am
U xsrc/external/mit/libXtst/dist/src/Makefile.in
C xsrc/external/mit/libXtst/dist/src/XRecord.c
U xsrc/external/mit/libXtst/dist/src/XTest.c
U xsrc/external/mit/libXtst/dist/man/XTest.xml
U xsrc/external/mit/libXtst/dist/man/x.stamp
U xsrc/external/mit/libXtst/dist/man/XTestFakeKeyEvent.man
C xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeMotionEvent.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeRelativeMotionEvent.man
U xsrc/external/mit/libXtst/dist/man/XTestGrabControl.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeButtonEvent.man
U xsrc/external/mit/libXtst/dist/man/Makefile.am
U xsrc/external/mit/libXtst/dist/man/XTestCompareCurrentCursorWithWindow.man
U xsrc/external/mit/libXtst/dist/man/XTestDiscard.man
U xsrc/external/mit/libXtst/dist/man/XTestSetGContextOfGC.man
U xsrc/external/mit/libXtst/dist/man/Makefile.in
U xsrc/external/mit/libXtst/dist/man/XTestSetVisualIDOfVisual.man
U xsrc/external/mit/libXtst/dist/man/XTestCompareCursorWithWindow.man
U xsrc/external/mit/libXtst/dist/specs/recordlib.xml
U xsrc/external/mit/libXtst/dist/specs/xtestlib.xml
U xsrc/external/mit/libXtst/dist/specs/Makefile.am
U xsrc/external/mit/libXtst/dist/specs/Makefile.in

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:55 UTC 2016

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

Log Message:
initial import of libXrandr-1.5.1

Status:

Vendor Tag: xorg
Release Tags:   libXrandr-1-5-1

U xsrc/external/mit/libXrandr/dist/configure
U xsrc/external/mit/libXrandr/dist/config.sub
U xsrc/external/mit/libXrandr/dist/INSTALL
U xsrc/external/mit/libXrandr/dist/compile
U xsrc/external/mit/libXrandr/dist/ltmain.sh
U xsrc/external/mit/libXrandr/dist/AUTHORS
U xsrc/external/mit/libXrandr/dist/xrandr.pc.in
U xsrc/external/mit/libXrandr/dist/README
U xsrc/external/mit/libXrandr/dist/ChangeLog
U xsrc/external/mit/libXrandr/dist/missing
U xsrc/external/mit/libXrandr/dist/install-sh
U xsrc/external/mit/libXrandr/dist/Makefile.am
U xsrc/external/mit/libXrandr/dist/COPYING
U xsrc/external/mit/libXrandr/dist/Makefile.in
U xsrc/external/mit/libXrandr/dist/config.h.in
U xsrc/external/mit/libXrandr/dist/config.guess
U xsrc/external/mit/libXrandr/dist/configure.ac
U xsrc/external/mit/libXrandr/dist/aclocal.m4
U xsrc/external/mit/libXrandr/dist/depcomp
U xsrc/external/mit/libXrandr/dist/include/X11/extensions/Xrandr.h
C xsrc/external/mit/libXrandr/dist/src/XrrProvider.c
U xsrc/external/mit/libXrandr/dist/src/Xrandrint.h
U xsrc/external/mit/libXrandr/dist/src/XrrMode.c
U xsrc/external/mit/libXrandr/dist/src/XrrProperty.c
U xsrc/external/mit/libXrandr/dist/src/XrrConfig.c
U xsrc/external/mit/libXrandr/dist/src/XrrMonitor.c
U xsrc/external/mit/libXrandr/dist/src/XrrProviderProperty.c
U xsrc/external/mit/libXrandr/dist/src/Makefile.am
U xsrc/external/mit/libXrandr/dist/src/Makefile.in
U xsrc/external/mit/libXrandr/dist/src/XrrScreen.c
U xsrc/external/mit/libXrandr/dist/src/Xrandr.c
U xsrc/external/mit/libXrandr/dist/src/XrrCrtc.c
U xsrc/external/mit/libXrandr/dist/src/XrrOutput.c
U xsrc/external/mit/libXrandr/dist/man/XRRFreeScreenConfigInfo.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigSizes.man
U xsrc/external/mit/libXrandr/dist/man/XRRQueryVersion.man
U xsrc/external/mit/libXrandr/dist/man/XRRRootToScreen.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigRates.man
U xsrc/external/mit/libXrandr/dist/man/XRRSelectInput.man
U xsrc/external/mit/libXrandr/dist/man/Xrandr.man
U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfigAndRate.man
U xsrc/external/mit/libXrandr/dist/man/XRRSetScreenConfig.man
U xsrc/external/mit/libXrandr/dist/man/XRRQueryExtension.man
U xsrc/external/mit/libXrandr/dist/man/XRRGetScreenInfo.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentRate.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigTimes.man
U xsrc/external/mit/libXrandr/dist/man/XRRConfigRotations.man
U xsrc/external/mit/libXrandr/dist/man/Makefile.am
U xsrc/external/mit/libXrandr/dist/man/Makefile.in
U xsrc/external/mit/libXrandr/dist/man/XRRConfigCurrentConfiguration.man

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

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

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:54 UTC 2016

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

Log Message:
initial import of libXi-1.7.7

Status:

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

U xsrc/external/mit/libXi/dist/configure
U xsrc/external/mit/libXi/dist/config.sub
C xsrc/external/mit/libXi/dist/INSTALL
U xsrc/external/mit/libXi/dist/compile
U xsrc/external/mit/libXi/dist/ltmain.sh
U xsrc/external/mit/libXi/dist/ChangeLog
U xsrc/external/mit/libXi/dist/README
U xsrc/external/mit/libXi/dist/install-sh
U xsrc/external/mit/libXi/dist/xi.pc.in
U xsrc/external/mit/libXi/dist/missing
U xsrc/external/mit/libXi/dist/Makefile.am
U xsrc/external/mit/libXi/dist/COPYING
U xsrc/external/mit/libXi/dist/Makefile.in
U xsrc/external/mit/libXi/dist/config.guess
U xsrc/external/mit/libXi/dist/docbook.am
U xsrc/external/mit/libXi/dist/configure.ac
U xsrc/external/mit/libXi/dist/aclocal.m4
U xsrc/external/mit/libXi/dist/depcomp
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/src/XIPassiveGrab.c
U xsrc/external/mit/libXi/dist/src/XSelect.c
U xsrc/external/mit/libXi/dist/src/XGetVers.c
U xsrc/external/mit/libXi/dist/src/XGrDvKey.c
U xsrc/external/mit/libXi/dist/src/XIAllowEvents.c
C xsrc/external/mit/libXi/dist/src/XListDev.c
U xsrc/external/mit/libXi/dist/src/XIQueryVersion.c
U xsrc/external/mit/libXi/dist/src/XGtSelect.c
U xsrc/external/mit/libXi/dist/src/XISelEv.c
U xsrc/external/mit/libXi/dist/src/XChgKMap.c
U xsrc/external/mit/libXi/dist/src/XIProperties.c
U xsrc/external/mit/libXi/dist/src/XAllowDv.c
U xsrc/external/mit/libXi/dist/src/XIGrabDevice.c
U xsrc/external/mit/libXi/dist/src/XGtFocus.c
C xsrc/external/mit/libXi/dist/src/XQueryDv.c
U xsrc/external/mit/libXi/dist/src/XGetKMap.c
U xsrc/external/mit/libXi/dist/src/XIBarrier.c
U xsrc/external/mit/libXi/dist/src/XChgDCtl.c
U xsrc/external/mit/libXi/dist/src/XISetDevFocus.c
U xsrc/external/mit/libXi/dist/src/XSetDVal.c
C xsrc/external/mit/libXi/dist/src/XGetFCtl.c
U xsrc/external/mit/libXi/dist/src/XSetMode.c
U xsrc/external/mit/libXi/dist/src/XUngrDvK.c
U xsrc/external/mit/libXi/dist/src/XCloseDev.c
U xsrc/external/mit/libXi/dist/src/XChgFCtl.c
U xsrc/external/mit/libXi/dist/src/XIWarpPointer.c
U xsrc/external/mit/libXi/dist/src/XExtToWire.c
U xsrc/external/mit/libXi/dist/src/XIDefineCursor.c
C xsrc/external/mit/libXi/dist/src/XGetBMap.c
U xsrc/external/mit/libXi/dist/src/XChDProp.c
U xsrc/external/mit/libXi/dist/src/XGetProp.c
U xsrc/external/mit/libXi/dist/src/XGrabDev.c
U xsrc/external/mit/libXi/dist/src/XISetCPtr.c
U xsrc/external/mit/libXi/dist/src/XGrDvBut.c
U xsrc/external/mit/libXi/dist/src/XIint.h
U xsrc/external/mit/libXi/dist/src/XFreeLst.c
U xsrc/external/mit/libXi/dist/src/XDelDProp.c
C xsrc/external/mit/libXi/dist/src/XGetDCtl.c
U xsrc/external/mit/libXi/dist/src/XStFocus.c
U xsrc/external/mit/libXi/dist/src/XUngrDev.c
U xsrc/external/mit/libXi/dist/src/XChgProp.c
U xsrc/external/mit/libXi/dist/src/XIGetDevFocus.c
U xsrc/external/mit/libXi/dist/src/XSetMMap.c
U xsrc/external/mit/libXi/dist/src/XIQueryDevice.c
U xsrc/external/mit/libXi/dist/src/Makefile.am
U xsrc/external/mit/libXi/dist/src/XExtInt.c
U xsrc/external/mit/libXi/dist/src/XGetMMap.c
U xsrc/external/mit/libXi/dist/src/XSetBMap.c
U xsrc/external/mit/libXi/dist/src/XChgPnt.c
U xsrc/external/mit/libXi/dist/src/XOpenDev.c
U xsrc/external/mit/libXi/dist/src/XSndExEv.c
C xsrc/external/mit/libXi/dist/src/XGMotion.c
U xsrc/external/mit/libXi/dist/src/XDevBell.c
U xsrc/external/mit/libXi/dist/src/XGetCPtr.c
U xsrc/external/mit/libXi/dist/src/Makefile.in
U xsrc/external/mit/libXi/dist/src/config.h.in
U xsrc/external/mit/libXi/dist/src/XChgKbd.c
U xsrc/external/mit/libXi/dist/src/XIQueryPointer.c
U xsrc/external/mit/libXi/dist/src/XGetDProp.c
U xsrc/external/mit/libXi/dist/src/XListDProp.c
U xsrc/external/mit/libXi/dist/src/XUngrDvB.c
U xsrc/external/mit/libXi/dist/src/XIHierarchy.c
U xsrc/external/mit/libXi/dist/man/XIFreeDeviceInfo.man
U xsrc/external/mit/libXi/dist/man/XIGrabButton.txt
U xsrc/external/mit/libXi/dist/man/XIGrabEnter.txt
U xsrc/external/mit/libXi/dist/man/XChangeKeyboardDevice.txt
U xsrc/external/mit/libXi/dist/man/XIGetSelectedEvents.man
U xsrc/external/mit/libXi/dist/man/XSetDeviceValuators.txt
U xsrc/external/mit/libXi/dist/man/XIUngrabTouchBegin.man
U xsrc/external/mit/libXi/dist/man/XIGrabButton.man
U xsrc/external/mit/libXi/dist/man/XIDefineCursor.txt
U xsrc/external/mit/libXi/dist/man/XGrabDeviceButton.man
U xsrc/external/mit/libXi/dist/man/XOpenDevice.txt
U xsrc/external/mit/libXi/dist/man/XIDeleteProperty.man
U xsrc/external/mit/libXi/dist/man/XIUngrabEnter.man
U xsrc/external/mit/libXi/dist/man/XGetDeviceMotionEvents.man
U xsrc/external/mit/libXi/dist/man/XQueryDeviceState.man
U xsrc/external/mit/libXi/dist/man/XGetDeviceControl.man
U

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:54 UTC 2016

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

Log Message:
initial import of libXi-1.7.7

Status:

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

U xsrc/external/mit/libXi/dist/configure
U xsrc/external/mit/libXi/dist/config.sub
C xsrc/external/mit/libXi/dist/INSTALL
U xsrc/external/mit/libXi/dist/compile
U xsrc/external/mit/libXi/dist/ltmain.sh
U xsrc/external/mit/libXi/dist/ChangeLog
U xsrc/external/mit/libXi/dist/README
U xsrc/external/mit/libXi/dist/install-sh
U xsrc/external/mit/libXi/dist/xi.pc.in
U xsrc/external/mit/libXi/dist/missing
U xsrc/external/mit/libXi/dist/Makefile.am
U xsrc/external/mit/libXi/dist/COPYING
U xsrc/external/mit/libXi/dist/Makefile.in
U xsrc/external/mit/libXi/dist/config.guess
U xsrc/external/mit/libXi/dist/docbook.am
U xsrc/external/mit/libXi/dist/configure.ac
U xsrc/external/mit/libXi/dist/aclocal.m4
U xsrc/external/mit/libXi/dist/depcomp
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/src/XIPassiveGrab.c
U xsrc/external/mit/libXi/dist/src/XSelect.c
U xsrc/external/mit/libXi/dist/src/XGetVers.c
U xsrc/external/mit/libXi/dist/src/XGrDvKey.c
U xsrc/external/mit/libXi/dist/src/XIAllowEvents.c
C xsrc/external/mit/libXi/dist/src/XListDev.c
U xsrc/external/mit/libXi/dist/src/XIQueryVersion.c
U xsrc/external/mit/libXi/dist/src/XGtSelect.c
U xsrc/external/mit/libXi/dist/src/XISelEv.c
U xsrc/external/mit/libXi/dist/src/XChgKMap.c
U xsrc/external/mit/libXi/dist/src/XIProperties.c
U xsrc/external/mit/libXi/dist/src/XAllowDv.c
U xsrc/external/mit/libXi/dist/src/XIGrabDevice.c
U xsrc/external/mit/libXi/dist/src/XGtFocus.c
C xsrc/external/mit/libXi/dist/src/XQueryDv.c
U xsrc/external/mit/libXi/dist/src/XGetKMap.c
U xsrc/external/mit/libXi/dist/src/XIBarrier.c
U xsrc/external/mit/libXi/dist/src/XChgDCtl.c
U xsrc/external/mit/libXi/dist/src/XISetDevFocus.c
U xsrc/external/mit/libXi/dist/src/XSetDVal.c
C xsrc/external/mit/libXi/dist/src/XGetFCtl.c
U xsrc/external/mit/libXi/dist/src/XSetMode.c
U xsrc/external/mit/libXi/dist/src/XUngrDvK.c
U xsrc/external/mit/libXi/dist/src/XCloseDev.c
U xsrc/external/mit/libXi/dist/src/XChgFCtl.c
U xsrc/external/mit/libXi/dist/src/XIWarpPointer.c
U xsrc/external/mit/libXi/dist/src/XExtToWire.c
U xsrc/external/mit/libXi/dist/src/XIDefineCursor.c
C xsrc/external/mit/libXi/dist/src/XGetBMap.c
U xsrc/external/mit/libXi/dist/src/XChDProp.c
U xsrc/external/mit/libXi/dist/src/XGetProp.c
U xsrc/external/mit/libXi/dist/src/XGrabDev.c
U xsrc/external/mit/libXi/dist/src/XISetCPtr.c
U xsrc/external/mit/libXi/dist/src/XGrDvBut.c
U xsrc/external/mit/libXi/dist/src/XIint.h
U xsrc/external/mit/libXi/dist/src/XFreeLst.c
U xsrc/external/mit/libXi/dist/src/XDelDProp.c
C xsrc/external/mit/libXi/dist/src/XGetDCtl.c
U xsrc/external/mit/libXi/dist/src/XStFocus.c
U xsrc/external/mit/libXi/dist/src/XUngrDev.c
U xsrc/external/mit/libXi/dist/src/XChgProp.c
U xsrc/external/mit/libXi/dist/src/XIGetDevFocus.c
U xsrc/external/mit/libXi/dist/src/XSetMMap.c
U xsrc/external/mit/libXi/dist/src/XIQueryDevice.c
U xsrc/external/mit/libXi/dist/src/Makefile.am
U xsrc/external/mit/libXi/dist/src/XExtInt.c
U xsrc/external/mit/libXi/dist/src/XGetMMap.c
U xsrc/external/mit/libXi/dist/src/XSetBMap.c
U xsrc/external/mit/libXi/dist/src/XChgPnt.c
U xsrc/external/mit/libXi/dist/src/XOpenDev.c
U xsrc/external/mit/libXi/dist/src/XSndExEv.c
C xsrc/external/mit/libXi/dist/src/XGMotion.c
U xsrc/external/mit/libXi/dist/src/XDevBell.c
U xsrc/external/mit/libXi/dist/src/XGetCPtr.c
U xsrc/external/mit/libXi/dist/src/Makefile.in
U xsrc/external/mit/libXi/dist/src/config.h.in
U xsrc/external/mit/libXi/dist/src/XChgKbd.c
U xsrc/external/mit/libXi/dist/src/XIQueryPointer.c
U xsrc/external/mit/libXi/dist/src/XGetDProp.c
U xsrc/external/mit/libXi/dist/src/XListDProp.c
U xsrc/external/mit/libXi/dist/src/XUngrDvB.c
U xsrc/external/mit/libXi/dist/src/XIHierarchy.c
U xsrc/external/mit/libXi/dist/man/XIFreeDeviceInfo.man
U xsrc/external/mit/libXi/dist/man/XIGrabButton.txt
U xsrc/external/mit/libXi/dist/man/XIGrabEnter.txt
U xsrc/external/mit/libXi/dist/man/XChangeKeyboardDevice.txt
U xsrc/external/mit/libXi/dist/man/XIGetSelectedEvents.man
U xsrc/external/mit/libXi/dist/man/XSetDeviceValuators.txt
U xsrc/external/mit/libXi/dist/man/XIUngrabTouchBegin.man
U xsrc/external/mit/libXi/dist/man/XIGrabButton.man
U xsrc/external/mit/libXi/dist/man/XIDefineCursor.txt
U xsrc/external/mit/libXi/dist/man/XGrabDeviceButton.man
U xsrc/external/mit/libXi/dist/man/XOpenDevice.txt
U xsrc/external/mit/libXi/dist/man/XIDeleteProperty.man
U xsrc/external/mit/libXi/dist/man/XIUngrabEnter.man
U xsrc/external/mit/libXi/dist/man/XGetDeviceMotionEvents.man
U xsrc/external/mit/libXi/dist/man/XQueryDeviceState.man
U xsrc/external/mit/libXi/dist/man/XGetDeviceControl.man
U

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:51 UTC 2016

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

Log Message:
initial import of libXfixes-5.0.3

Status:

Vendor Tag: xorg
Release Tags:   libXfixes-5-0-3

U xsrc/external/mit/libXfixes/dist/configure
U xsrc/external/mit/libXfixes/dist/xfixes.pc.in
U xsrc/external/mit/libXfixes/dist/config.sub
U xsrc/external/mit/libXfixes/dist/INSTALL
N xsrc/external/mit/libXfixes/dist/compile
U xsrc/external/mit/libXfixes/dist/ltmain.sh
U xsrc/external/mit/libXfixes/dist/AUTHORS
U xsrc/external/mit/libXfixes/dist/ChangeLog
U xsrc/external/mit/libXfixes/dist/README
U xsrc/external/mit/libXfixes/dist/install-sh
U xsrc/external/mit/libXfixes/dist/missing
U xsrc/external/mit/libXfixes/dist/Makefile.am
U xsrc/external/mit/libXfixes/dist/COPYING
U xsrc/external/mit/libXfixes/dist/Makefile.in
U xsrc/external/mit/libXfixes/dist/config.h.in
U xsrc/external/mit/libXfixes/dist/config.guess
U xsrc/external/mit/libXfixes/dist/configure.ac
U xsrc/external/mit/libXfixes/dist/aclocal.m4
U xsrc/external/mit/libXfixes/dist/depcomp
U xsrc/external/mit/libXfixes/dist/include/X11/extensions/Xfixes.h
U xsrc/external/mit/libXfixes/dist/src/Selection.c
U xsrc/external/mit/libXfixes/dist/src/Cursor.c
U xsrc/external/mit/libXfixes/dist/src/Xfixesint.h
U xsrc/external/mit/libXfixes/dist/src/Makefile.am
U xsrc/external/mit/libXfixes/dist/src/Xfixes.c
U xsrc/external/mit/libXfixes/dist/src/Region.c
U xsrc/external/mit/libXfixes/dist/src/Makefile.in
U xsrc/external/mit/libXfixes/dist/src/SaveSet.c
U xsrc/external/mit/libXfixes/dist/man/Makefile.am
U xsrc/external/mit/libXfixes/dist/man/Xfixes.man
U xsrc/external/mit/libXfixes/dist/man/Makefile.in

No conflicts created by this import

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

2016-10-04 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue Oct  4 21:56:51 UTC 2016

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

Log Message:
initial import of libXfixes-5.0.3

Status:

Vendor Tag: xorg
Release Tags:   libXfixes-5-0-3

U xsrc/external/mit/libXfixes/dist/configure
U xsrc/external/mit/libXfixes/dist/xfixes.pc.in
U xsrc/external/mit/libXfixes/dist/config.sub
U xsrc/external/mit/libXfixes/dist/INSTALL
N xsrc/external/mit/libXfixes/dist/compile
U xsrc/external/mit/libXfixes/dist/ltmain.sh
U xsrc/external/mit/libXfixes/dist/AUTHORS
U xsrc/external/mit/libXfixes/dist/ChangeLog
U xsrc/external/mit/libXfixes/dist/README
U xsrc/external/mit/libXfixes/dist/install-sh
U xsrc/external/mit/libXfixes/dist/missing
U xsrc/external/mit/libXfixes/dist/Makefile.am
U xsrc/external/mit/libXfixes/dist/COPYING
U xsrc/external/mit/libXfixes/dist/Makefile.in
U xsrc/external/mit/libXfixes/dist/config.h.in
U xsrc/external/mit/libXfixes/dist/config.guess
U xsrc/external/mit/libXfixes/dist/configure.ac
U xsrc/external/mit/libXfixes/dist/aclocal.m4
U xsrc/external/mit/libXfixes/dist/depcomp
U xsrc/external/mit/libXfixes/dist/include/X11/extensions/Xfixes.h
U xsrc/external/mit/libXfixes/dist/src/Selection.c
U xsrc/external/mit/libXfixes/dist/src/Cursor.c
U xsrc/external/mit/libXfixes/dist/src/Xfixesint.h
U xsrc/external/mit/libXfixes/dist/src/Makefile.am
U xsrc/external/mit/libXfixes/dist/src/Xfixes.c
U xsrc/external/mit/libXfixes/dist/src/Region.c
U xsrc/external/mit/libXfixes/dist/src/Makefile.in
U xsrc/external/mit/libXfixes/dist/src/SaveSet.c
U xsrc/external/mit/libXfixes/dist/man/Makefile.am
U xsrc/external/mit/libXfixes/dist/man/Xfixes.man
U xsrc/external/mit/libXfixes/dist/man/Makefile.in

No conflicts created by this import

CVS commit: src/usr.sbin/btpand

2016-10-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 21:40:31 UTC 2016

Modified Files:
src/usr.sbin/btpand: bnep.c btpand.h

Log Message:
The last argument before ... must not be default promoted, otherwise the
result is undefined behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/btpand/bnep.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/btpand/btpand.h

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/btpand/bnep.c
diff -u src/usr.sbin/btpand/bnep.c:1.11 src/usr.sbin/btpand/bnep.c:1.12
--- src/usr.sbin/btpand/bnep.c:1.11	Sat Aug 27 22:30:44 2011
+++ src/usr.sbin/btpand/bnep.c	Tue Oct  4 21:40:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: bnep.c,v 1.11 2011/08/27 22:30:44 joerg Exp $	*/
+/*	$NetBSD: bnep.c,v 1.12 2016/10/04 21:40:31 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2008 Iain Hibbert
@@ -26,7 +26,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: bnep.c,v 1.11 2011/08/27 22:30:44 joerg Exp $");
+__RCSID("$NetBSD: bnep.c,v 1.12 2016/10/04 21:40:31 joerg Exp $");
 
 #include 
 #include 
@@ -587,7 +587,7 @@ bnep_recv_filter_multi_addr_rsp(channel_
 }
 
 void
-bnep_send_control(channel_t *chan, uint8_t type, ...)
+bnep_send_control(channel_t *chan, int type, ...)
 {
 	packet_t *pkt;
 	uint8_t *p;

Index: src/usr.sbin/btpand/btpand.h
diff -u src/usr.sbin/btpand/btpand.h:1.4 src/usr.sbin/btpand/btpand.h:1.5
--- src/usr.sbin/btpand/btpand.h:1.4	Sun Oct 14 08:35:45 2012
+++ src/usr.sbin/btpand/btpand.h	Tue Oct  4 21:40:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: btpand.h,v 1.4 2012/10/14 08:35:45 plunky Exp $	*/
+/*	$NetBSD: btpand.h,v 1.5 2016/10/04 21:40:31 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2008-2009 Iain Hibbert
@@ -168,7 +168,7 @@ b2eaddr(void *dst, bdaddr_t *src)
 /* bnep.c */
 bool		bnep_send(channel_t *, packet_t *);
 bool		bnep_recv(packet_t *);
-void		bnep_send_control(channel_t *, uint8_t, ...);
+void		bnep_send_control(channel_t *, int, ...);
 
 /* channel.c */
 void		channel_init(void);

CVS commit: src/external/mit/xorg/server/drivers

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 21:37:10 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
build pnozz for xorg-server 1.10 and sparc.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/external/mit/xorg/server/drivers/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.89 src/external/mit/xorg/server/drivers/Makefile:1.90
--- src/external/mit/xorg/server/drivers/Makefile:1.89	Wed Sep 28 18:12:06 2016
+++ src/external/mit/xorg/server/drivers/Makefile	Tue Oct  4 21:37:10 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.89 2016/09/28 18:12:06 macallan Exp $
+#	$NetBSD: Makefile,v 1.90 2016/10/04 21:37:10 mrg Exp $
 
 .include 
 
@@ -309,6 +309,10 @@ SUBDIR+= \
 SUBDIR+= \
 	xf86-video-suncg14 \
 	xf86-video-suntcx
+.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
+SUBDIR+= \
+	xf86-video-pnozz
+.endif	# ${XORG_SERVER_SUBDIR} == "xorg-server.old"
 .endif	# ${MACHINE} == "sparc"
 .endif	# ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"

CVS commit: src/usr.sbin/btpand

2016-10-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 21:40:31 UTC 2016

Modified Files:
src/usr.sbin/btpand: bnep.c btpand.h

Log Message:
The last argument before ... must not be default promoted, otherwise the
result is undefined behavior.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/btpand/bnep.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/btpand/btpand.h

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

CVS commit: src/external/mit/xorg/server/drivers

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 21:37:10 UTC 2016

Modified Files:
src/external/mit/xorg/server/drivers: Makefile

Log Message:
build pnozz for xorg-server 1.10 and sparc.


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/external/mit/xorg/server/drivers/Makefile

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

CVS commit: src/sbin/atactl

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 21:37:46 UTC 2016

Modified Files:
src/sbin/atactl: atactl.c

Log Message:
add SMART 249: Total Raw NAND Writes (1GiB units), sourced from
intel spec sheets.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sbin/atactl/atactl.c

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

Modified files:

Index: src/sbin/atactl/atactl.c
diff -u src/sbin/atactl/atactl.c:1.76 src/sbin/atactl/atactl.c:1.77
--- src/sbin/atactl/atactl.c:1.76	Tue May 10 08:08:59 2016
+++ src/sbin/atactl/atactl.c	Tue Oct  4 21:37:46 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: atactl.c,v 1.76 2016/05/10 08:08:59 mrg Exp $	*/
+/*	$NetBSD: atactl.c,v 1.77 2016/10/04 21:37:46 mrg Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: atactl.c,v 1.76 2016/05/10 08:08:59 mrg Exp $");
+__RCSID("$NetBSD: atactl.c,v 1.77 2016/10/04 21:37:46 mrg Exp $");
 #endif
 
 
@@ -335,6 +335,7 @@ static const struct {
 	{ 246,		"Total Host Sector Writes", NULL },
 	{ 247,		"Host Program NAND Pages Count", NULL },
 	{ 248,		"FTL Program Pages Count ", NULL },
+	{ 249,		"Total Raw NAND Writes (1GiB units)", NULL },
 	{ 250,		"Read error retry rate", NULL },
 	{ 254,		"Free Fall Sensor", NULL },
 	{   0,		"Unknown", NULL },

CVS commit: src/sbin/atactl

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 21:37:46 UTC 2016

Modified Files:
src/sbin/atactl: atactl.c

Log Message:
add SMART 249: Total Raw NAND Writes (1GiB units), sourced from
intel spec sheets.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sbin/atactl/atactl.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

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 21:36:38 UTC 2016

Modified Files:
src/sys/dev/usb: if_urtwn.c usbdevs

Log Message:
PR/51529: Jake Slazenger: D-Link DWA 125 rev. D1 USB wireless network adapter
support


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.716 -r1.717 src/sys/dev/usb/usbdevs

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_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.45 src/sys/dev/usb/if_urtwn.c:1.46
--- src/sys/dev/usb/if_urtwn.c:1.45	Fri Jun 10 09:27:15 2016
+++ src/sys/dev/usb/if_urtwn.c	Tue Oct  4 17:36:38 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_urtwn.c,v 1.45 2016/06/10 13:27:15 ozaki-r Exp $	*/
+/*	$NetBSD: if_urtwn.c,v 1.46 2016/10/04 21:36:38 christos Exp $	*/
 /*	$OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.45 2016/06/10 13:27:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.46 2016/10/04 21:36:38 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -180,6 +180,7 @@ static const struct urtwn_dev {
 	URTWN_DEV(ZYXEL,	RTL8192CU),
 
 	/* URTWN_RTL8188E */
+	URTWN_RTL8188E_DEV(DLINK, DWA125D1),
 	URTWN_RTL8188E_DEV(ELECOM, WDC150SU2M),
 	URTWN_RTL8188E_DEV(REALTEK, RTL8188ETV),
 	URTWN_RTL8188E_DEV(REALTEK, RTL8188EU),

Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.716 src/sys/dev/usb/usbdevs:1.717
--- src/sys/dev/usb/usbdevs:1.716	Sat Aug 27 04:42:16 2016
+++ src/sys/dev/usb/usbdevs	Tue Oct  4 17:36:38 2016
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.716 2016/08/27 08:42:16 skrll Exp $
+$NetBSD: usbdevs,v 1.717 2016/10/04 21:36:38 christos Exp $
 
 /*
  * Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -1362,6 +1362,7 @@ product DLINK RTL8192CU_2	0x3309	RTL8192
 product DLINK RTL8192CU_3	0x330a	RTL8192CU
 product DLINK RTL8192CU_4	0x330b	RTL8192CU
 product DLINK DWA131B		0x330d	DWA-131 rev B
+product	DLINK DWA125D1		0x330f  DWA-125 rev D1
 product DLINK DWL122		0x3700	Wireless DWL122
 product DLINK DWLG120		0x3701	DWL-G120
 product DLINK DWL120F		0x3702	DWL-120 rev F

CVS commit: src/sys/dev/usb

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 21:36:56 UTC 2016

Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.708 -r1.709 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.709 -r1.710 src/sys/dev/usb/usbdevs_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/usb

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 21:36:38 UTC 2016

Modified Files:
src/sys/dev/usb: if_urtwn.c usbdevs

Log Message:
PR/51529: Jake Slazenger: D-Link DWA 125 rev. D1 USB wireless network adapter
support


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.716 -r1.717 src/sys/dev/usb/usbdevs

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/xserver

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 21:34:02 UTC 2016

Modified Files:
src/distrib/sets/lists/xserver: md.sparc

Log Message:
mark pnozz obsolete on xorg-server 1.18


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xserver/md.sparc

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/xserver

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 21:34:02 UTC 2016

Modified Files:
src/distrib/sets/lists/xserver: md.sparc

Log Message:
mark pnozz obsolete on xorg-server 1.18


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xserver/md.sparc

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/xserver/md.sparc
diff -u src/distrib/sets/lists/xserver/md.sparc:1.63 src/distrib/sets/lists/xserver/md.sparc:1.64
--- src/distrib/sets/lists/xserver/md.sparc:1.63	Wed Sep 28 18:17:10 2016
+++ src/distrib/sets/lists/xserver/md.sparc	Tue Oct  4 21:34:02 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.63 2016/09/28 18:17:10 macallan Exp $
+# $NetBSD: md.sparc,v 1.64 2016/10/04 21:34:02 mrg Exp $
 ./usr/X11R7/bin/X	-unknown-	xorg
 ./usr/X11R7/bin/Xorg	-unknown-	xorg
 ./usr/X11R7/bin/cvt	-unknown-	xorg
@@ -43,6 +43,8 @@
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/pnozz_drv.so		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/pnozz_drv.so.0		-unknown-	xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/pnozz_drv.so		-unknown-	xorg,xorg_server_ver=118,obsolete
+./usr/X11R7/lib/modules/drivers/pnozz_drv.so.0		-unknown-	xorg,xorg_server_ver=118,obsolete
 ./usr/X11R7/lib/modules/drivers/r128_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/r128_drv.so.6		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/radeon_drv.so		-unknown-	xorg
@@ -194,6 +196,7 @@
 ./usr/X11R7/man/cat4/mga.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/mousedrv.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/pnozz.0-unknown-	.cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/pnozz.0-unknown-	.cat,xorg,xorg_server_ver=118,obsolete
 ./usr/X11R7/man/cat4/r128.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/radeon.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/suncg14.0-unknown-	.cat,xorg
@@ -220,6 +223,7 @@
 ./usr/X11R7/man/html4/mga.html-unknown-	html,xorg
 ./usr/X11R7/man/html4/mousedrv.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/pnozz.html			-unknown-	html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/pnozz.html			-unknown-	html,xorg,xorg_server_ver=118,obsolete
 ./usr/X11R7/man/html4/r128.html-unknown-	html,xorg
 ./usr/X11R7/man/html4/radeon.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/suncg14.html			-unknown-	html,xorg
@@ -246,6 +250,7 @@
 ./usr/X11R7/man/man4/mga.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/mousedrv.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/pnozz.4-unknown-	.man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/pnozz.4-unknown-	.man,xorg,xorg_server_ver=118,obsolete
 ./usr/X11R7/man/man4/r128.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/radeon.4-unknown-	.man,xorg
 ./usr/X11R7/man/man4/suncg14.4-unknown-	.man,xorg

CVS commit: src/libexec/httpd

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 18:33:00 UTC 2016

Modified Files:
src/libexec/httpd: bozohttpd.8 bozohttpd.c main.c

Log Message:
update the -V documentation to be more clear about what it does.
inspired by Swift Griggs on netbsd-users.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.82 -r1.83 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.15 -r1.16 src/libexec/httpd/main.c

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

CVS commit: src/libexec/httpd

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 18:33:00 UTC 2016

Modified Files:
src/libexec/httpd: bozohttpd.8 bozohttpd.c main.c

Log Message:
update the -V documentation to be more clear about what it does.
inspired by Swift Griggs on netbsd-users.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.82 -r1.83 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.15 -r1.16 src/libexec/httpd/main.c

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

Modified files:

Index: src/libexec/httpd/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.60 src/libexec/httpd/bozohttpd.8:1.61
--- src/libexec/httpd/bozohttpd.8:1.60	Tue May 24 21:18:29 2016
+++ src/libexec/httpd/bozohttpd.8	Tue Oct  4 18:33:00 2016
@@ -1,8 +1,8 @@
-.\"	$NetBSD: bozohttpd.8,v 1.60 2016/05/24 21:18:29 agc Exp $
+.\"	$NetBSD: bozohttpd.8,v 1.61 2016/10/04 18:33:00 mrg Exp $
 .\"
 .\"	$eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
 .\"
-.\" Copyright (c) 1997-2015 Matthew R. Green
+.\" Copyright (c) 1997-2016 Matthew R. Green
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 17, 2016
+.Dd October 4, 2016
 .Dt BOZOHTTPD 8
 .Os
 .Sh NAME
@@ -276,8 +276,9 @@ translation.
 Note that enabling this support implies that users can run
 commands as web server user, this may have security implications.
 .It Fl V
-Sets the default virtual host directory to
-.Ar slashdir .
+Sets the backup virtual host directory to the
+.Ar slashdir
+argument.
 If no directory exists in
 .Ar virtualroot
 for the request, then
@@ -530,7 +531,7 @@ The focus has always been simplicity and
 and regular code audits.
 This manual documents
 .Nm
-version 20150501.
+version 20160415.
 .Sh AUTHORS
 .An -nosplit
 .Nm

Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.82 src/libexec/httpd/bozohttpd.c:1.83
--- src/libexec/httpd/bozohttpd.c:1.82	Thu Jun 30 13:17:48 2016
+++ src/libexec/httpd/bozohttpd.c	Tue Oct  4 18:33:00 2016
@@ -1,9 +1,9 @@
-/*	$NetBSD: bozohttpd.c,v 1.82 2016/06/30 13:17:48 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.83 2016/10/04 18:33:00 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
 /*
- * Copyright (c) 1997-2015 Matthew R. Green
+ * Copyright (c) 1997-2016 Matthew R. Green
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

Index: src/libexec/httpd/main.c
diff -u src/libexec/httpd/main.c:1.15 src/libexec/httpd/main.c:1.16
--- src/libexec/httpd/main.c:1.15	Tue Oct  4 18:26:47 2016
+++ src/libexec/httpd/main.c	Tue Oct  4 18:33:00 2016
@@ -1,10 +1,10 @@
-/*	$NetBSD: main.c,v 1.15 2016/10/04 18:26:47 mrg Exp $	*/
+/*	$NetBSD: main.c,v 1.16 2016/10/04 18:33:00 mrg Exp $	*/
 
 /*	$eterna: main.c,v 1.6 2011/11/18 09:21:15 mrg Exp $	*/
 /* from: eterna: bozohttpd.c,v 1.159 2009/05/23 02:14:30 mrg Exp 	*/
 
 /*
- * Copyright (c) 1997-2014 Matthew R. Green
+ * Copyright (c) 1997-2016 Matthew R. Green
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

CVS commit: src/libexec/httpd

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 18:26:47 UTC 2016

Modified Files:
src/libexec/httpd: main.c

Log Message:
add -V to the usage() list.  noted by Swift Griggs on netbsd-users.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/libexec/httpd/main.c

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

Modified files:

Index: src/libexec/httpd/main.c
diff -u src/libexec/httpd/main.c:1.14 src/libexec/httpd/main.c:1.15
--- src/libexec/httpd/main.c:1.14	Tue May 24 21:18:29 2016
+++ src/libexec/httpd/main.c	Tue Oct  4 18:26:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.14 2016/05/24 21:18:29 agc Exp $	*/
+/*	$NetBSD: main.c,v 1.15 2016/10/04 18:26:47 mrg Exp $	*/
 
 /*	$eterna: main.c,v 1.6 2011/11/18 09:21:15 mrg Exp $	*/
 /* from: eterna: bozohttpd.c,v 1.159 2009/05/23 02:14:30 mrg Exp 	*/
@@ -101,6 +101,7 @@ usage(bozohttpd_t *httpd, char *progname
 	bozowarn(httpd,
 		"   -v virtualroot\tenable virtual host support "
 		"in this directory");
+	bozowarn(httpd, "   -V\t\tUnknown virtual hosts go to `slashdir'");
 #ifndef NO_DIRINDEX_SUPPORT
 	bozowarn(httpd,
 		"   -X\t\t\tenable automatic directory index support");

CVS commit: src/libexec/httpd

2016-10-04 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Tue Oct  4 18:26:47 UTC 2016

Modified Files:
src/libexec/httpd: main.c

Log Message:
add -V to the usage() list.  noted by Swift Griggs on netbsd-users.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/libexec/httpd/main.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/pci

2016-10-04 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Oct  4 18:23:24 UTC 2016

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

Log Message:
react on ADAPTER_REQ_SET_XFER_MODE so that we set tagged queuing

pass tag type and set id


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/vioscsi.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/vioscsi.c
diff -u src/sys/dev/pci/vioscsi.c:1.7 src/sys/dev/pci/vioscsi.c:1.8
--- src/sys/dev/pci/vioscsi.c:1.7	Tue Oct  4 18:20:49 2016
+++ src/sys/dev/pci/vioscsi.c	Tue Oct  4 18:23:24 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: vioscsi.c,v 1.7 2016/10/04 18:20:49 jdolecek Exp $	*/
+/*	$NetBSD: vioscsi.c,v 1.8 2016/10/04 18:23:24 jdolecek Exp $	*/
 /*	$OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.7 2016/10/04 18:20:49 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.8 2016/10/04 18:23:24 jdolecek Exp $");
 
 #include 
 #include 
@@ -219,7 +219,19 @@ vioscsi_scsipi_request(struct scsipi_cha
 
 	DPRINTF(("%s: enter\n", __func__));
 
-	if (request != ADAPTER_REQ_RUN_XFER) {
+	switch (request) {
+	case ADAPTER_REQ_RUN_XFER:
+		break;
+	case ADAPTER_REQ_SET_XFER_MODE:
+	{
+		struct scsipi_xfer_mode *xm = arg;
+		xm->xm_mode = PERIPH_CAP_TQING;
+		xm->xm_period = 0;
+		xm->xm_offset = 0;
+		scsipi_async_event(chan, ASYNC_EVENT_XFER_MODE, xm);
+		return;
+	}
+	default:
 		DPRINTF(("%s: unhandled %d\n", __func__, request));
 		return;
 	}
@@ -260,6 +272,29 @@ vioscsi_scsipi_request(struct scsipi_cha
 	DPRINTF(("%s: command for %u:%u at slot %d\n", __func__,
 	periph->periph_target - 1, periph->periph_lun, slot));
 
+	/* tag */
+	switch (XS_CTL_TAGTYPE(xs)) {
+	case XS_CTL_HEAD_TAG:
+		req->task_attr = VIRTIO_SCSI_S_HEAD;
+		break;
+
+#if 0	/* XXX */
+	case XS_CTL_ACA_TAG:
+		req->task_attr = VIRTIO_SCSI_S_ACA;
+		break;
+#endif
+
+	case XS_CTL_ORDERED_TAG:
+		req->task_attr = VIRTIO_SCSI_S_ORDERED;
+		break;
+
+	case XS_CTL_SIMPLE_TAG:
+	default:
+		req->task_attr = VIRTIO_SCSI_S_SIMPLE;
+		break;
+	}
+	req->id = (intptr_t)vr;
+
 	if ((size_t)xs->cmdlen > sizeof(req->cdb)) {
 		DPRINTF(("%s: bad cmdlen %zu > %zu\n", __func__,
 		(size_t)xs->cmdlen, sizeof(req->cdb)));

CVS commit: src/sys/dev/pci

2016-10-04 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Oct  4 18:23:24 UTC 2016

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

Log Message:
react on ADAPTER_REQ_SET_XFER_MODE so that we set tagged queuing

pass tag type and set id


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/vioscsi.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/pci

2016-10-04 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Oct  4 18:20:49 UTC 2016

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

Log Message:
vioscsi_req_get()/virtio_enqueue_prep() failing is actually perfectly
normal - observed failures included 10, 27, 61 in-flight commands,
so probably depends on particular command mix; return with
XS_RESOURCE_SHORTAGE rather then panic

do vioscsi_req_put() when initial bus_dmamap_load() fails, as suggested
by the XXX; the vq_done hook is called by virtio, but in that case we never
get to commit the request to it


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/vioscsi.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/vioscsi.c
diff -u src/sys/dev/pci/vioscsi.c:1.6 src/sys/dev/pci/vioscsi.c:1.7
--- src/sys/dev/pci/vioscsi.c:1.6	Sun Nov  1 08:55:05 2015
+++ src/sys/dev/pci/vioscsi.c	Tue Oct  4 18:20:49 2016
@@ -1,3 +1,4 @@
+/*	$NetBSD: vioscsi.c,v 1.7 2016/10/04 18:20:49 jdolecek Exp $	*/
 /*	$OpenBSD: vioscsi.c,v 1.3 2015/03/14 03:38:49 jsg Exp $	*/
 
 /*
@@ -17,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.6 2015/11/01 08:55:05 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vioscsi.c,v 1.7 2016/10/04 18:20:49 jdolecek Exp $");
 
 #include 
 #include 
@@ -227,16 +228,15 @@ vioscsi_scsipi_request(struct scsipi_cha
 	periph = xs->xs_periph;
 
 	vr = vioscsi_req_get(sc);
-#ifdef DIAGNOSTIC
 	/*
-	 * This should never happen as we track the resources
-	 * in the mid-layer.
+	 * This can happen when we run out of queue slots.
 	 */
 	if (vr == NULL) {
-		scsipi_printaddr(xs->xs_periph);
-		panic("%s: unable to allocate request\n", __func__);
+		xs->error = XS_RESOURCE_SHORTAGE;
+		scsipi_done(xs);
+		return;
 	}
-#endif
+
 	req = >vr_req;
 	slot = vr - sc->sc_reqs;
 
@@ -284,7 +284,7 @@ vioscsi_scsipi_request(struct scsipi_cha
 	stuffup:
 		xs->error = XS_DRIVER_STUFFUP;
 nomore:
-		// XXX: free req?
+		vioscsi_req_put(sc, vr);
 		scsipi_done(xs);
 		return;
 	}

CVS commit: src/sys/dev/pci

2016-10-04 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Oct  4 18:20:49 UTC 2016

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

Log Message:
vioscsi_req_get()/virtio_enqueue_prep() failing is actually perfectly
normal - observed failures included 10, 27, 61 in-flight commands,
so probably depends on particular command mix; return with
XS_RESOURCE_SHORTAGE rather then panic

do vioscsi_req_put() when initial bus_dmamap_load() fails, as suggested
by the XXX; the vq_done hook is called by virtio, but in that case we never
get to commit the request to it


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/vioscsi.c

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

CVS commit: src/usr.bin/vmstat

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 17:36:21 UTC 2016

Modified Files:
src/usr.bin/vmstat: vmstat.c

Log Message:
No point in using float here; makes evbmips64 need __truncdfsf2, and that
causes static linking issues because of softfloat.


To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/vmstat/vmstat.c

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

CVS commit: src/usr.bin/vmstat

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 17:36:21 UTC 2016

Modified Files:
src/usr.bin/vmstat: vmstat.c

Log Message:
No point in using float here; makes evbmips64 need __truncdfsf2, and that
causes static linking issues because of softfloat.


To generate a diff of this commit:
cvs rdiff -u -r1.207 -r1.208 src/usr.bin/vmstat/vmstat.c

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

Modified files:

Index: src/usr.bin/vmstat/vmstat.c
diff -u src/usr.bin/vmstat/vmstat.c:1.207 src/usr.bin/vmstat/vmstat.c:1.208
--- src/usr.bin/vmstat/vmstat.c:1.207	Sun Sep  4 20:40:30 2016
+++ src/usr.bin/vmstat/vmstat.c	Tue Oct  4 13:36:21 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vmstat.c,v 1.207 2016/09/05 00:40:30 sevan Exp $ */
+/* $NetBSD: vmstat.c,v 1.208 2016/10/04 17:36:21 christos Exp $ */
 
 /*-
  * Copyright (c) 1998, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 3/1/95";
 #else
-__RCSID("$NetBSD: vmstat.c,v 1.207 2016/09/05 00:40:30 sevan Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.208 2016/10/04 17:36:21 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -1643,7 +1643,7 @@ dopoolcache_sysctl(int verbose)
 	bool first = true;
 	int ovflw;
 	uint64_t tot;
-	float p;
+	double p;
 
 	data = asysctlbyname("kern.pool", );
 	if (data == NULL)

CVS commit: src/sys/ufs/lfs

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 16:46:20 UTC 2016

Modified Files:
src/sys/ufs/lfs: lfs_pages.c

Log Message:
Grr, the optimizer on mips64 can't handle this... Use MIN_PAGE_SIZE.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/lfs/lfs_pages.c

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

Modified files:

Index: src/sys/ufs/lfs/lfs_pages.c
diff -u src/sys/ufs/lfs/lfs_pages.c:1.8 src/sys/ufs/lfs/lfs_pages.c:1.9
--- src/sys/ufs/lfs/lfs_pages.c:1.8	Thu Jul 21 14:10:47 2016
+++ src/sys/ufs/lfs/lfs_pages.c	Tue Oct  4 12:46:20 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: lfs_pages.c,v 1.8 2016/07/21 18:10:47 christos Exp $	*/
+/*	$NetBSD: lfs_pages.c,v 1.9 2016/10/04 16:46:20 christos Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.8 2016/07/21 18:10:47 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.9 2016/10/04 16:46:20 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -244,8 +244,7 @@ check_dirty(struct lfs *fs, struct vnode
 {
 	int by_list;
 	struct vm_page *curpg = NULL; /* XXX: gcc */
-	struct vm_page *pgs[MAXBSIZE /
-	(__builtin_constant_p(PAGE_SIZE) ? PAGE_SIZE : 1024)], *pg;
+	struct vm_page *pgs[MAXBSIZE / MIN_PAGE_SIZE], *pg;
 	off_t soff = 0; /* XXX: gcc */
 	voff_t off;
 	int i;

CVS commit: src/sys/ufs/lfs

2016-10-04 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Oct  4 16:46:20 UTC 2016

Modified Files:
src/sys/ufs/lfs: lfs_pages.c

Log Message:
Grr, the optimizer on mips64 can't handle this... Use MIN_PAGE_SIZE.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/lfs/lfs_pages.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/evbarm/conf

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:22:43 UTC 2016

Modified Files:
src/sys/arch/evbarm/conf: OVERO

Log Message:
Enable com2, sdhc1.
And add flash@nand@omapnand.
And smsh's locator use "cs" instead of "addr".


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/OVERO

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

CVS commit: src/sys/arch/evbarm/conf

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:22:43 UTC 2016

Modified Files:
src/sys/arch/evbarm/conf: OVERO

Log Message:
Enable com2, sdhc1.
And add flash@nand@omapnand.
And smsh's locator use "cs" instead of "addr".


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/evbarm/conf/OVERO

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

Modified files:

Index: src/sys/arch/evbarm/conf/OVERO
diff -u src/sys/arch/evbarm/conf/OVERO:1.44 src/sys/arch/evbarm/conf/OVERO:1.45
--- src/sys/arch/evbarm/conf/OVERO:1.44	Thu Aug  4 07:02:39 2016
+++ src/sys/arch/evbarm/conf/OVERO	Tue Oct  4 16:22:43 2016
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: OVERO,v 1.44 2016/08/04 07:02:39 kiyohara Exp $
+#	$NetBSD: OVERO,v 1.45 2016/10/04 16:22:43 kiyohara Exp $
 #
 #	OVERO -- Gumstix. Inc. Overo COMS platforms kernel
 #
@@ -205,6 +205,7 @@ tps65950pm3	at iic0 addr 0x4b
 com0		at obio2 addr 0x4902 intr 74 mult 4	# UART3 (console)
 options CONSADDR=0x4902, CONSPEED=115200
 #com1		at obio0 addr 0x4806c000 intr 73 mult 4	# UART2 (bluetooth)
+com2		at obio0 addr 0x4806a000 intr 72 mult 4	# UART1 (Gallop's GPS)
 
 # Operating System Timer
 omapmputmr0	at obio2 addr 0x49032000 intr 38		# GP Timer 2
@@ -226,11 +227,27 @@ prcm*		at obio1 addr 0x48306000 size 0x2
 
 # SDHC controllers
 sdhc0		at obio0 addr 0x4809c000 size 0x1000 intr 83
-#sdhc1		at obio0 addr 0x480b4000 size 0x1000 intr 86 # Wifi
+sdhc1		at obio0 addr 0x480b4000 size 0x1000 intr 86 # Wifi
 
 sdmmc*		at sdhc?	# SD/MMC bus
 ld*		at sdmmc?
 
+# NAND controller
+omapnand0	at gpmc? cs 0
+
+# NAND layer
+nand0		at nandbus?
+
+# use the bad block table
+options NAND_BBT
+
+# Define flash partitions for board
+flash0		at nand0 offset 0x00 size 0x08 readonly 1 # SPL
+flash1		at nand0 offset 0x08 size 0x1c readonly 1 # U-Boot
+flash2		at nand0 offset 0x24 size 0x04 readonly 1 # Environment
+flash3		at nand0 offset 0x28 size 0x80		# Kernel
+flash4		at nand0 offset 0xa8 size 0			# Filesystem
+
 # Hardware clocking and power management
 
 options		HWCLOCK
@@ -240,8 +257,8 @@ options		OMAP_CK_REF_SPEED=1200
 # overo expansion boards
 
 # SMSC LAN9221
-smsh0		at gpmc? addr 0x0100 intr 272	# Tobi, Chestnut43
-smsh1		at gpmc? addr 0x0200 intr 161	# Tobi-Duo
+smsh0		at gpmc? cs 5 intr 272			# Tobi, Chestnut43
+smsh1		at gpmc? cs 4 intr 161			# Tobi-Duo
 
 # MII/PHY support
 ukphy*		at mii? phy ?# smsh(4) internal PHY
@@ -336,7 +353,7 @@ options 	RND_COM
 pseudo-device	clockctl		# user control of clock subsystem
 pseudo-device	ksyms			# /dev/ksyms
 #pseudo-device	btuart			# Bluetooth HCI UART (H4)
-	# connect CSR module
+	# CSR or WiLink 8 module
 
 # a pseudo device needed for Coda	# also needs CODA (above)
 #pseudo-device	vcoda			# coda minicache <-> venus comm.

CVS commit: src/sys/arch/evbarm/conf

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:18:38 UTC 2016

Modified Files:
src/sys/arch/evbarm/conf: mk.gumstix

Log Message:
Add KERNEL_BASE_PHYS for duovero and pepper.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.gumstix

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

Modified files:

Index: src/sys/arch/evbarm/conf/mk.gumstix
diff -u src/sys/arch/evbarm/conf/mk.gumstix:1.5 src/sys/arch/evbarm/conf/mk.gumstix:1.6
--- src/sys/arch/evbarm/conf/mk.gumstix:1.5	Tue Apr 19 12:02:55 2016
+++ src/sys/arch/evbarm/conf/mk.gumstix	Tue Oct  4 16:18:38 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: mk.gumstix,v 1.5 2016/04/19 12:02:55 kiyohara Exp $
+#	$NetBSD: mk.gumstix,v 1.6 2016/10/04 16:18:38 kiyohara Exp $
 
 SYSTEM_FIRST_OBJ=	gumstix_start.o
 SYSTEM_FIRST_SFILE=	${THISARM}/gumstix/gumstix_start.S
@@ -9,6 +9,10 @@ _OSRELEASE!=${HOST_SH} $S/co
 KERNEL_BASE_PHYS=0xa020
 .elif ${BOARDTYPE} == "overo"
 KERNEL_BASE_PHYS=$(LOADADDRESS)
+.elif ${BOARDTYPE} == "duovero"
+KERNEL_BASE_PHYS=$(LOADADDRESS)
+.elif ${BOARDTYPE} == "pepper"
+KERNEL_BASE_PHYS=$(LOADADDRESS)
 .endif
 KERNEL_BASE_VIRT=$(LOADADDRESS)

CVS commit: src/sys/arch/evbarm/conf

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:18:38 UTC 2016

Modified Files:
src/sys/arch/evbarm/conf: mk.gumstix

Log Message:
Add KERNEL_BASE_PHYS for duovero and pepper.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/mk.gumstix

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

CVS commit: src/sys/arch/evbarm/conf

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:17:37 UTC 2016

Modified Files:
src/sys/arch/evbarm/conf: std.overo

Log Message:
Enable TPIDRPRW_IS_CURCPU.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.overo

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

Modified files:

Index: src/sys/arch/evbarm/conf/std.overo
diff -u src/sys/arch/evbarm/conf/std.overo:1.7 src/sys/arch/evbarm/conf/std.overo:1.8
--- src/sys/arch/evbarm/conf/std.overo:1.7	Thu Aug  4 07:02:39 2016
+++ src/sys/arch/evbarm/conf/std.overo	Tue Oct  4 16:17:37 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: std.overo,v 1.7 2016/08/04 07:02:39 kiyohara Exp $
+#	$NetBSD: std.overo,v 1.8 2016/10/04 16:17:37 kiyohara Exp $
 #
 # standard NetBSD/evbarm for OVERO options
 
@@ -9,7 +9,7 @@ include		"arch/evbarm/conf/files.overo"
 
 options 	CORTEX_PMC
 options 	__HAVE_FAST_SOFTINTS		# should be in types.h
-#options 	TPIDRPRW_IS_CURLWP
+options 	TPIDRPRW_IS_CURCPU
 
 options 	KERNEL_BASE_EXT=0x8000
 makeoptions	LOADADDRESS="0x8020"

CVS commit: src/sys/arch/evbarm/conf

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:17:37 UTC 2016

Modified Files:
src/sys/arch/evbarm/conf: std.overo

Log Message:
Enable TPIDRPRW_IS_CURCPU.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/std.overo

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

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:10:34 UTC 2016

Modified Files:
src/sys/arch/arm/omap: files.omap2

Log Message:
Support am335x's MMCHS2(sdhc@mainbus).
  Tested on Gumstix Pepper 43C.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/omap/files.omap2

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

Modified files:

Index: src/sys/arch/arm/omap/files.omap2
diff -u src/sys/arch/arm/omap/files.omap2:1.34 src/sys/arch/arm/omap/files.omap2:1.35
--- src/sys/arch/arm/omap/files.omap2:1.34	Tue Oct  4 15:23:40 2016
+++ src/sys/arch/arm/omap/files.omap2	Tue Oct  4 16:10:34 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.omap2,v 1.34 2016/10/04 15:23:40 kiyohara Exp $
+#	$NetBSD: files.omap2,v 1.35 2016/10/04 16:10:34 kiyohara Exp $
 #
 # Configuration info for Texas Instruments OMAP2/OMAP3 CPU support
 # Based on xscale/files.pxa2x0
@@ -134,8 +134,9 @@ file	arch/arm/omap/tiotg.c			tiotg
 attach  motg at tiotg_port
 
 # SDMMC controller
+attach	sdhc at mainbus with mainbussdhc
 attach	sdhc at obio with obiosdhc
-file	arch/arm/omap/omap3_sdhc.c		obiosdhc
+file	arch/arm/omap/omap3_sdhc.c		mainbussdhc | obiosdhc
 
 # NAND flash controller
 device	omapnand: nandbus

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:10:34 UTC 2016

Modified Files:
src/sys/arch/arm/omap: files.omap2

Log Message:
Support am335x's MMCHS2(sdhc@mainbus).
  Tested on Gumstix Pepper 43C.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/omap/files.omap2

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

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:06:42 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_sdhc.c

Log Message:
Support am335x's MMCHS2(sdhc@mainbus).
  Tested on Gumstix Pepper 43C.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/omap/omap3_sdhc.c

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

Modified files:

Index: src/sys/arch/arm/omap/omap3_sdhc.c
diff -u src/sys/arch/arm/omap/omap3_sdhc.c:1.25 src/sys/arch/arm/omap/omap3_sdhc.c:1.26
--- src/sys/arch/arm/omap/omap3_sdhc.c:1.25	Tue Oct  4 15:51:34 2016
+++ src/sys/arch/arm/omap/omap3_sdhc.c	Tue Oct  4 16:06:42 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap3_sdhc.c,v 1.25 2016/10/04 15:51:34 kiyohara Exp $	*/
+/*	$NetBSD: omap3_sdhc.c,v 1.26 2016/10/04 16:06:42 kiyohara Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.25 2016/10/04 15:51:34 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.26 2016/10/04 16:06:42 kiyohara Exp $");
 
 #include "opt_omap.h"
 #include "edma.h"
@@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -49,8 +50,10 @@ __KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c
 #include 
 
 #ifdef TI_AM335X
+#  include 
 #  include 
 #  include 
+#  include 
 #  include 
 #  include 
 #endif
@@ -82,25 +85,19 @@ int om3sdhcdebug = 1;
 #define SDHC_WRITE(sc, reg, val) \
 	bus_space_write_4((sc)->sc_bst, (sc)->sc_sdhc_bsh, (reg), (val))
 
-static int obiosdhc_match(device_t, cfdata_t, void *);
-static void obiosdhc_attach(device_t, device_t, void *);
-static int obiosdhc_detach(device_t, int);
-
-static int obiosdhc_bus_width(struct sdhc_softc *, int);
-static int obiosdhc_rod(struct sdhc_softc *, int);
-static int obiosdhc_write_protect(struct sdhc_softc *);
-static int obiosdhc_card_detect(struct sdhc_softc *);
-
-struct obiosdhc_softc {
+struct mmchs_softc {
 	struct sdhc_softc	sc;
+	bus_addr_t		sc_addr;
 	bus_space_tag_t		sc_bst;
 	bus_space_handle_t	sc_bsh;
 	bus_space_handle_t	sc_hl_bsh;
 	bus_space_handle_t	sc_sdhc_bsh;
 	struct sdhc_host	*sc_hosts[1];
+	int			sc_irq;
 	void 			*sc_ih;		/* interrupt vectoring */
 
 #if NEDMA > 0
+	int			sc_edmabase;
 	struct edma_channel	*sc_edma_tx;
 	struct edma_channel	*sc_edma_rx;
 	uint16_t		sc_edma_param_tx[EDMA_MAX_PARAMS];
@@ -114,26 +111,45 @@ struct obiosdhc_softc {
 #endif
 };
 
+static int obiosdhc_match(device_t, cfdata_t, void *);
+static void obiosdhc_attach(device_t, device_t, void *);
+#ifdef TI_AM335X
+static int mainbussdhc_match(device_t, cfdata_t, void *);
+static void mainbussdhc_attach(device_t, device_t, void *);
+#endif
+static int mmchs_detach(device_t, int);
+
+static int mmchs_attach(struct mmchs_softc *);
+static void mmchs_init(device_t);
+
+static int mmchs_bus_width(struct sdhc_softc *, int);
+static int mmchs_rod(struct sdhc_softc *, int);
+static int mmchs_write_protect(struct sdhc_softc *);
+static int mmchs_card_detect(struct sdhc_softc *);
+
 #if NEDMA > 0
-static int obiosdhc_edma_init(struct obiosdhc_softc *, unsigned int);
-static int obiosdhc_edma_xfer_data(struct sdhc_softc *, struct sdmmc_command *);
-static void obiosdhc_edma_done(void *);
-static int obiosdhc_edma_transfer(struct sdhc_softc *, struct sdmmc_command *);
+static int mmchs_edma_init(struct mmchs_softc *, unsigned int);
+static int mmchs_edma_xfer_data(struct sdhc_softc *, struct sdmmc_command *);
+static void mmchs_edma_done(void *);
+static int mmchs_edma_transfer(struct sdhc_softc *, struct sdmmc_command *);
 #endif
 
 #ifdef TI_AM335X
-struct am335x_sdhc {
+struct am335x_mmchs {
 	const char *as_name;
+	const char *as_parent_name;
 	bus_addr_t as_base_addr;
 	int as_intr;
 	struct omap_module as_module;
 };
 
-static const struct am335x_sdhc am335x_sdhc[] = {
-	/* XXX All offset by 0x100 because of the am335x's mmc registers.  */
-	{ "MMCHS0", SDMMC1_BASE_TIAM335X, 64, { AM335X_PRCM_CM_PER, 0x3c } },
-	{ "MMC1",   SDMMC2_BASE_TIAM335X, 28, { AM335X_PRCM_CM_PER, 0xf4 } },
-	{ "MMCHS2", SDMMC3_BASE_TIAM335X, 29, { AM335X_PRCM_CM_WKUP, 0xf8 } },
+static const struct am335x_mmchs am335x_mmchs[] = {
+	{ "MMCHS0", "obio",
+	SDMMC1_BASE_TIAM335X, 64, { AM335X_PRCM_CM_PER, 0x3c } },
+	{ "MMC1",   "obio",
+	SDMMC2_BASE_TIAM335X, 28, { AM335X_PRCM_CM_PER, 0xf4 } },
+	{ "MMCHS2", "mainbus",
+	SDMMC3_BASE_TIAM335X, 29, { AM335X_PRCM_CM_PER, 0xf8 } },
 };
 
 struct am335x_padconf {
@@ -155,17 +171,14 @@ const struct am335x_padconf am335x_padco
 };
 #endif
 
-CFATTACH_DECL_NEW(obiosdhc, sizeof(struct obiosdhc_softc),
-obiosdhc_match, obiosdhc_attach, obiosdhc_detach, NULL);
+CFATTACH_DECL_NEW(obiosdhc, sizeof(struct mmchs_softc),
+obiosdhc_match, obiosdhc_attach, mmchs_detach, NULL);
 
 static int
 obiosdhc_match(device_t parent,

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:03:39 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap2_reg.h sitara_cm.c sitara_cmreg.h

Log Message:
Print am335x ID and fetures.  Also add omap_{chip,dev}id().


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/omap/omap2_reg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/sitara_cm.c \
src/sys/arch/arm/omap/sitara_cmreg.h

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

Modified files:

Index: src/sys/arch/arm/omap/omap2_reg.h
diff -u src/sys/arch/arm/omap/omap2_reg.h:1.33 src/sys/arch/arm/omap/omap2_reg.h:1.34
--- src/sys/arch/arm/omap/omap2_reg.h:1.33	Mon Jul 11 14:51:11 2016
+++ src/sys/arch/arm/omap/omap2_reg.h	Tue Oct  4 16:03:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: omap2_reg.h,v 1.33 2016/07/11 14:51:11 kiyohara Exp $ */
+/* $NetBSD: omap2_reg.h,v 1.34 2016/10/04 16:03:39 kiyohara Exp $ */
 
 /*
  * Copyright (c) 2007 Microsoft
@@ -163,6 +163,18 @@
 #define DEVID_AMDM37X_ES11	0x1b89102f
 #define DEVID_AMDM37X_ES12	0x2b89102f
 
+#define CHIPID_AM3351		0x00fc0302
+#define CHIPID_AM3352		0x00fc0382
+#define CHIPID_AM3354		0x20fc0382
+#define CHIPID_AM3356		0x00fd0383
+#define CHIPID_AM3357		0x00ff0383
+#define CHIPID_AM3358		0x20fd0383
+#define CHIPID_AM3359		0x20ff0383
+
+#define DEVID_AM335X_SR_10	0x0b94402e
+#define DEVID_AM335X_SR_20	0x1b94402e
+#define DEVID_AM335X_SR_21	0x2b94402e
+
 /*
  * Clock Management registers base, offsets, and size
  */

Index: src/sys/arch/arm/omap/sitara_cm.c
diff -u src/sys/arch/arm/omap/sitara_cm.c:1.2 src/sys/arch/arm/omap/sitara_cm.c:1.3
--- src/sys/arch/arm/omap/sitara_cm.c:1.2	Sat Oct 18 08:33:24 2014
+++ src/sys/arch/arm/omap/sitara_cm.c	Tue Oct  4 16:03:39 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sitara_cm.c,v 1.2 2014/10/18 08:33:24 snj Exp $ */
+/* $NetBSD: sitara_cm.c,v 1.3 2016/10/04 16:03:39 kiyohara Exp $ */
 /*
  * Copyright (c) 2010
  *	Ben Gray .
@@ -47,7 +47,7 @@
  *
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sitara_cm.c,v 1.2 2014/10/18 08:33:24 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sitara_cm.c,v 1.3 2016/10/04 16:03:39 kiyohara Exp $");
 
 #include "opt_omap.h"
 
@@ -60,13 +60,17 @@ __KERNEL_RCSID(0, "$NetBSD: sitara_cm.c,
 #include 
 
 #include 
+#include 
 #include 
 #include 
 
 struct sitara_cm_softc {
-device_tsc_dev;
-	bus_space_tag_t sc_iot;
-	bus_space_handle_t  sc_ioh;
+	device_t		sc_dev;
+	bus_space_tag_t		sc_iot;
+	bus_space_handle_t	sc_ioh;
+
+	uint32_t		sc_cid;	/* Chip Identification */
+	uint32_t		sc_did;	/* Device IDCODE */
 };
 
 
@@ -391,6 +395,15 @@ sitara_cm_attach(device_t parent, device
 	struct sitara_cm_softc *sc = device_private(self);
 	struct obio_attach_args *obio = opaque;
 	uint32_t rev;
+	char cid, buf[256];
+	const char *did;
+	const char *fmt = "\177\020"
+	"b\0ICSS\0"
+	"b\1CPSW\0"
+	"b\7DCAN\0"
+	"f\16\1ICSS_FEA EtherCAT functionality\0=\0disabled\0=\1enabled\0"
+	"f\17\1ICSS_FEA TX_AUTO_SEQUENCE\0=\0disabled\0=\1enabled\0"
+	"b\29SGX\0";
 
 	aprint_naive("\n");
 
@@ -412,4 +425,60 @@ sitara_cm_attach(device_t parent, device
 		panic("sitara_cm_attach: read revision");
 	aprint_normal(": control module, rev %d.%d\n",
 	SCM_REVISION_MAJOR(rev), SCM_REVISION_MINOR(rev));
+
+	sitara_cm_reg_read_4(OMAP2SCM_DEVID, >sc_did);
+	sitara_cm_reg_read_4(OMAP2SCM_DEV_FEATURE, >sc_cid);
+	switch (sc->sc_cid) {
+	case CHIPID_AM3351:	cid = '1'; break;
+	case CHIPID_AM3352:	cid = '2'; break;
+	case CHIPID_AM3354:	cid = '4'; break;
+	case CHIPID_AM3356:	cid = '6'; break;
+	case CHIPID_AM3357:	cid = '7'; break;
+	case CHIPID_AM3358:	cid = '8'; break;
+	case CHIPID_AM3359:	cid = '9'; break;
+	default:
+		aprint_normal_dev(self, "unknwon ChipID found 0x%08x\n",
+		sc->sc_cid);
+		cid = 'x';
+		break;
+	}
+	aprint_normal_dev(self, "AM335%c", cid);
+	switch (sc->sc_did) {
+	case DEVID_AM335X_SR_10:	did = "1.0"; break;
+	case DEVID_AM335X_SR_20:	did = "2.0"; break;
+	case DEVID_AM335X_SR_21:	did = "2.1"; break;
+	default:
+		aprint_normal_dev(self, "unknwon DeviceID found 0x%08x\n",
+		sc->sc_did);
+		did = NULL;
+		break;
+	}
+	if (did != NULL)
+		aprint_normal(" Silicon Revision %s", did);
+	snprintb(buf, sizeof(buf), fmt, sc->sc_cid);
+	aprint_normal(": %s\n", buf);
+}
+
+uint32_t
+omap_chipid(void)
+{
+	struct sitara_cm_softc *sc;
+	device_t dev;
+
+	dev = device_find_by_xname("sitaracm0");
+	KASSERT(dev != NULL);
+	sc = device_private(dev);
+	return sc->sc_cid;
+}
+
+uint32_t
+omap_devid(void)
+{
+	struct sitara_cm_softc *sc;
+	device_t dev;
+
+	dev = device_find_by_xname("sitaracm0");
+	KASSERT(dev != NULL);
+	sc = device_private(dev);
+	return sc->sc_did;
 }
Index: src/sys/arch/arm/omap/sitara_cmreg.h
diff -u src/sys/arch/arm/omap/sitara_cmreg.h:1.2 src/sys/arch/arm/omap/sitara_cmreg.h:1.3
--- src/sys/arch/arm/omap/sitara_cmreg.h:1.2	Wed Jul 16 18:25:24

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 16:03:39 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap2_reg.h sitara_cm.c sitara_cmreg.h

Log Message:
Print am335x ID and fetures.  Also add omap_{chip,dev}id().


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/omap/omap2_reg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/sitara_cm.c \
src/sys/arch/arm/omap/sitara_cmreg.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/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:59:36 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_ehci.c

Log Message:
Support extclk.  This value get from prop-dictionary "port?-extclk".


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

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

Modified files:

Index: src/sys/arch/arm/omap/omap3_ehci.c
diff -u src/sys/arch/arm/omap/omap3_ehci.c:1.11 src/sys/arch/arm/omap/omap3_ehci.c:1.12
--- src/sys/arch/arm/omap/omap3_ehci.c:1.11	Sat Apr 23 10:15:28 2016
+++ src/sys/arch/arm/omap/omap3_ehci.c	Tue Oct  4 15:59:36 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_ehci.c,v 1.11 2016/04/23 10:15:28 skrll Exp $ */
+/* $NetBSD: omap3_ehci.c,v 1.12 2016/10/04 15:59:36 kiyohara Exp $ */
 
 /*-
  * Copyright (c) 2010-2012 Jared D. McNeill 
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.11 2016/04/23 10:15:28 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_ehci.c,v 1.12 2016/10/04 15:59:36 kiyohara Exp $");
 
 #include "locators.h"
 
@@ -196,6 +196,7 @@ struct omap3_ehci_softc {
 		enum omap3_ehci_port_mode mode;
 		int gpio;
 		bool value;
+		bool extclk;
 	} sc_portconfig[3];
 	struct {
 		uint16_t m, n, m2;
@@ -405,15 +406,24 @@ omap3_ehci_parse_properties(struct omap3
 	sc->sc_portconfig[0].mode = omap3_ehci_get_port_mode(prop, "port0-mode");
 	sc->sc_portconfig[0].gpio = omap3_ehci_get_port_gpio(prop, "port0-gpio");
 	prop_dictionary_get_bool(prop, "port0-gpioval", >sc_portconfig[0].value);
+#if defined(OMAP4) || defined(OMAP5)
+	prop_dictionary_get_bool(prop, "port0-extclk", >sc_portconfig[0].extclk);
+#endif
 	if (sc->sc_nports > 1) {
 		sc->sc_portconfig[1].mode = omap3_ehci_get_port_mode(prop, "port1-mode");
 		sc->sc_portconfig[1].gpio = omap3_ehci_get_port_gpio(prop, "port1-gpio");
 		prop_dictionary_get_bool(prop, "port1-gpioval", >sc_portconfig[1].value);
+#if defined(OMAP4) || defined(OMAP5)
+		prop_dictionary_get_bool(prop, "port1-extclk", >sc_portconfig[1].extclk);
+#endif
 	}
 	if (sc->sc_nports > 2) {
 		sc->sc_portconfig[2].mode = omap3_ehci_get_port_mode(prop, "port2-mode");
 		sc->sc_portconfig[2].gpio = omap3_ehci_get_port_gpio(prop, "port2-gpio");
 		prop_dictionary_get_bool(prop, "port2-gpioval", >sc_portconfig[2].value);
+#if defined(OMAP4) || defined(OMAP5)
+		prop_dictionary_get_bool(prop, "port2-extclk", >sc_portconfig[2].extclk);
+#endif
 	}
 
 #ifdef OMAP_3XXX
@@ -670,17 +680,43 @@ omap4_usbhost_init(struct omap3_ehci_sof
 	KASSERT(err == 0);
 
 	val = bus_space_read_4(iot, ioh, OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL);
-	val |= OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC60M_P3_CLK
-	|  OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC60M_P2_CLK
-	|  OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC480M_P3_CLK
-	|  OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC480M_P2_CLK
-	|  OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_UTMI_P3_CLK
-	|  OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_UTMI_P2_CLK;
+	if (sc->sc_portconfig[0].mode != OMAP3_EHCI_PORT_MODE_NONE) {
+		if (sc->sc_portconfig[0].extclk)
+			val |= OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_CLKSEL_UTMI_P1;
+		else
+			val |= OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_UTMI_P1_CLK;
+		if (sc->sc_portconfig[0].mode == OMAP3_EHCI_PORT_MODE_HSIC)
+			val |= OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC60M_P1_CLK
+			|  OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC480M_P1_CLK;
+	}
+	if (sc->sc_nports > 1
+	&& sc->sc_portconfig[1].mode != OMAP3_EHCI_PORT_MODE_NONE) {
+		if (sc->sc_portconfig[1].extclk)
+			val |= OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_CLKSEL_UTMI_P2;
+		else
+			val |= OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_UTMI_P2_CLK;
+		if (sc->sc_portconfig[1].mode == OMAP3_EHCI_PORT_MODE_HSIC)
+			val |= OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC60M_P2_CLK
+			|  OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC480M_P2_CLK;
+	}
+	if (sc->sc_nports > 2
+	&& sc->sc_portconfig[2].mode != OMAP3_EHCI_PORT_MODE_NONE) {
+		val |= OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_UTMI_P3_CLK;
+		if (sc->sc_portconfig[2].mode == OMAP3_EHCI_PORT_MODE_HSIC)
+			val |= OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC60M_P3_CLK
+			|  OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL_OPTFCLKEN_HSIC480M_P3_CLK;
+	}
 	bus_space_write_4(iot, ioh, OMAP4_CM_L3INIT_USB_HOST_HS_CLKCTRL, val);
 
 	val = bus_space_read_4(iot, ioh, OMAP4_CM_L3INIT_USB_TLL_HS_CLKCTRL);
-	val |= OMAP4_CM_L3INIT_USB_TLL_HS_CLKCTRL_USB_CH2_CLK
-	|  OMAP4_CM_L3INIT_USB_TLL_HS_CLKCTRL_USB_CH1_CLK;
+	if (sc->sc_portconfig[0].mode != OMAP3_EHCI_PORT_MODE_NONE)
+		val |= OMAP4_CM_L3INIT_USB_TLL_HS_CLKCTRL_USB_CH0_CLK;
+	if (sc->sc_nports > 1
+	&& sc->sc_portconfig[1].mode != OMAP3_EHCI_PORT_MODE_NONE)
+		val |= OMAP4_CM_L3INIT_USB_TLL_HS_CLKCTRL_USB_CH1_CLK;
+	if

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:59:36 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_ehci.c

Log Message:
Support extclk.  This value get from prop-dictionary "port?-extclk".


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/omap3_ehci.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/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:47:53 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_sdmmcreg.h

Log Message:
Add OMAP4430 MMCHS_CON macros.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap3_sdmmcreg.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/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:54:10 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap2430_intr.h

Log Message:
am335x's main interrupt source is 128.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omap2430_intr.h

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

Modified files:

Index: src/sys/arch/arm/omap/omap2430_intr.h
diff -u src/sys/arch/arm/omap/omap2430_intr.h:1.4 src/sys/arch/arm/omap/omap2430_intr.h:1.5
--- src/sys/arch/arm/omap/omap2430_intr.h:1.4	Sat Jul 14 07:42:57 2012
+++ src/sys/arch/arm/omap/omap2430_intr.h	Tue Oct  4 15:54:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap2430_intr.h,v 1.4 2012/07/14 07:42:57 matt Exp $ */
+/*	$NetBSD: omap2430_intr.h,v 1.5 2016/10/04 15:54:09 kiyohara Exp $ */
 
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
@@ -161,7 +161,11 @@ uint32_t omap_microtimer_interval(uint32
 #define	IRQ_MMC3		94	/* (3530) MMC/SD module 3 */
 #define	IRQ_GPT12_3530		95	/* (3530) GPT12 */
 
+#if defined(TI_AM335X)
+#define	PIC_MAXSOURCES		128
+#else
 #define	PIC_MAXSOURCES		96
+#endif
 #define	PIC_MAXMAXSOURCES	(PIC_MAXSOURCES+192)
 
 void omap_irq_handler(void *);

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:54:10 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap2430_intr.h

Log Message:
am335x's main interrupt source is 128.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omap2430_intr.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/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:46:07 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_uhhreg.h

Log Message:
Fix revision value.  VERS2 is 0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/omap3_uhhreg.h

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

Modified files:

Index: src/sys/arch/arm/omap/omap3_uhhreg.h
diff -u src/sys/arch/arm/omap/omap3_uhhreg.h:1.3 src/sys/arch/arm/omap/omap3_uhhreg.h:1.4
--- src/sys/arch/arm/omap/omap3_uhhreg.h:1.3	Sat Mar 29 23:32:41 2014
+++ src/sys/arch/arm/omap/omap3_uhhreg.h	Tue Oct  4 15:46:07 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: omap3_uhhreg.h,v 1.3 2014/03/29 23:32:41 matt Exp $ */
+/* $NetBSD: omap3_uhhreg.h,v 1.4 2016/10/04 15:46:07 kiyohara Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill 
@@ -32,7 +32,7 @@
 #define	UHH_REVISION0x00
 #define	 UHH_REVISION_MAJOR(x)			(((x) >> 4) & 0xf)
 #define	 UHH_REVISION_MINOR(x)			((x) & 0xf)
-#define  UHH_REVISION_VERS2			2
+#define  UHH_REVISION_VERS2			0
 
 #define UHH_HWINFO0x04
 #define  UHH_HWINFO_SAR_CNTX_SIZE		 __BITS(9,0)

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:46:07 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_uhhreg.h

Log Message:
Fix revision value.  VERS2 is 0.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/omap3_uhhreg.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/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:51:34 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_sdhc.c

Log Message:
Support ADMA2 on OMAP4430.
 Tested on Gumstix DuoVero.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/omap/omap3_sdhc.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/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:51:34 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_sdhc.c

Log Message:
Support ADMA2 on OMAP4430.
 Tested on Gumstix DuoVero.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/omap/omap3_sdhc.c

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

Modified files:

Index: src/sys/arch/arm/omap/omap3_sdhc.c
diff -u src/sys/arch/arm/omap/omap3_sdhc.c:1.24 src/sys/arch/arm/omap/omap3_sdhc.c:1.25
--- src/sys/arch/arm/omap/omap3_sdhc.c:1.24	Mon Aug 15 13:02:07 2016
+++ src/sys/arch/arm/omap/omap3_sdhc.c	Tue Oct  4 15:51:34 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap3_sdhc.c,v 1.24 2016/08/15 13:02:07 mlelstv Exp $	*/
+/*	$NetBSD: omap3_sdhc.c,v 1.25 2016/10/04 15:51:34 kiyohara Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.24 2016/08/15 13:02:07 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_sdhc.c,v 1.25 2016/10/04 15:51:34 kiyohara Exp $");
 
 #include "opt_omap.h"
 #include "edma.h"
@@ -259,8 +259,8 @@ obiosdhc_attach(device_t parent, device_
 	 */
 	sc->sc.sc_flags |= SDHC_FLAG_NO_HS_BIT;
 
-//	sc->sc.sc_flags |= SDHC_FLAG_USE_DMA;
-//	sc->sc.sc_flags |= SDHC_FLAG_USE_ADMA2;
+	sc->sc.sc_flags |= SDHC_FLAG_USE_DMA;
+	sc->sc.sc_flags |= SDHC_FLAG_USE_ADMA2;
 #endif
 	sc->sc.sc_host = sc->sc_hosts;
 	sc->sc.sc_clkbase = 96000;	/* 96MHZ */
@@ -480,6 +480,11 @@ no_dma:
 	SDHC_WRITE(sc, SDHC_CLOCK_CTL,
 	SDHC_READ(sc, SDHC_CLOCK_CTL) | SDHC_SDCLK_ENABLE);
 
+	if (sc->sc.sc_flags & SDHC_FLAG_USE_ADMA2)
+		bus_space_write_4(sc->sc_bst, sc->sc_bsh, MMCHS_CON,
+		bus_space_read_4(sc->sc_bst, sc->sc_bsh, MMCHS_CON) |
+		CON_MNS);
+
 	return;
 
 fail:

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:47:53 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap3_sdmmcreg.h

Log Message:
Add OMAP4430 MMCHS_CON macros.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap3_sdmmcreg.h

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

Modified files:

Index: src/sys/arch/arm/omap/omap3_sdmmcreg.h
diff -u src/sys/arch/arm/omap/omap3_sdmmcreg.h:1.9 src/sys/arch/arm/omap/omap3_sdmmcreg.h:1.10
--- src/sys/arch/arm/omap/omap3_sdmmcreg.h:1.9	Thu Aug  4 07:14:50 2016
+++ src/sys/arch/arm/omap/omap3_sdmmcreg.h	Tue Oct  4 15:47:53 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap3_sdmmcreg.h,v 1.9 2016/08/04 07:14:50 kiyohara Exp $	*/
+/*	$NetBSD: omap3_sdmmcreg.h,v 1.10 2016/10/04 15:47:53 kiyohara Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -92,6 +92,11 @@
 #define MMCHS_CSRE		0x024	/* Card status response error */
 #define MMCHS_SYSTEST		0x028	/* System Test */
 #define MMCHS_CON		0x02c	/* Configuration */
+#  define CON_SDMA_LNE			(1 << 21)	/*Slave DMA Lvl/Edg Rq*/
+#  define CON_MNS			(1 << 20)	/* DMA Mstr/Slv sel */
+#  define CON_DDR			(1 << 19)	/* Dual Data Rate */
+#  define CON_CF0			(1 << 18)	/*Boot status support*/
+#  define CON_BOOTACK			(1 << 17)	/*Boot acknowledge rcv*/
 #  define CON_CLKEXTFREE		(1 << 16)
 #  define CON_PADEN			(1 << 15)	/* Ctrl Pow for MMC */
 #  define CON_OBIE			(1 << 14)	/* Out-of-Band Intr */

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:38:31 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap2_icu.c

Log Message:
am335x's main interrupt source is 128.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap2_icu.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/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:38:31 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap2_icu.c

Log Message:
am335x's main interrupt source is 128.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap2_icu.c

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

Modified files:

Index: src/sys/arch/arm/omap/omap2_icu.c
diff -u src/sys/arch/arm/omap/omap2_icu.c:1.9 src/sys/arch/arm/omap/omap2_icu.c:1.10
--- src/sys/arch/arm/omap/omap2_icu.c:1.9	Mon Aug 20 12:38:28 2012
+++ src/sys/arch/arm/omap/omap2_icu.c	Tue Oct  4 15:38:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap2_icu.c,v 1.9 2012/08/20 12:38:28 matt Exp $	*/
+/*	$NetBSD: omap2_icu.c,v 1.10 2016/10/04 15:38:31 kiyohara Exp $	*/
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
@@ -30,7 +30,7 @@
 #define _INTR_PRIVATE
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.9 2012/08/20 12:38:28 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.10 2016/10/04 15:38:31 kiyohara Exp $");
 
 #include 
 #include 
@@ -82,11 +82,19 @@ static struct omap2icu_softc {
 	bus_space_tag_t sc_memt;
 	bus_space_handle_t sc_memh;
 	struct pic_softc sc_pic;
+#if defined(TI_AM335X)
+	uint32_t sc_enabled_irqs[4];
+#else
 	uint32_t sc_enabled_irqs[3];
+#endif
 } omap2icu_softc = {
 	.sc_pic = {
 		.pic_ops = _picops,
+#if defined(TI_AM335X)
+		.pic_maxsources = 128,
+#else
 		.pic_maxsources = 96,
+#endif
 		.pic_name = "omap2icu",
 	},
 };
@@ -161,7 +169,7 @@ omap_irq_handler(void *frame)
 void
 omap2icu_establish_irq(struct pic_softc *pic, struct intrsource *is)
 {
-	KASSERT(is->is_irq < 96);
+	KASSERT(is->is_irq < omap2icu_softc.sc_pic.pic_maxsources);
 	KASSERT(is->is_type == IST_LEVEL);
 }

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:32:03 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap2_nand.c

Log Message:
Remove a comment-out-ed and no-need line.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap2_nand.c

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

Modified files:

Index: src/sys/arch/arm/omap/omap2_nand.c
diff -u src/sys/arch/arm/omap/omap2_nand.c:1.5 src/sys/arch/arm/omap/omap2_nand.c:1.6
--- src/sys/arch/arm/omap/omap2_nand.c:1.5	Sat Oct 27 17:17:40 2012
+++ src/sys/arch/arm/omap/omap2_nand.c	Tue Oct  4 15:32:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: omap2_nand.c,v 1.5 2012/10/27 17:17:40 chs Exp $	*/
+/*	$NetBSD: omap2_nand.c,v 1.6 2016/10/04 15:32:02 kiyohara Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap2_nand.c,v 1.5 2012/10/27 17:17:40 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_nand.c,v 1.6 2016/10/04 15:32:02 kiyohara Exp $");
 
 #include "opt_omap.h"
 #include "opt_flash.h"
@@ -209,7 +209,6 @@ omap2_nand_attach(device_t parent, devic
 	sc->sc_dev = self;
 	sc->sc_cs = gpmc->gpmc_cs;
 
-//	cs_offset = GPMC_BASE + GPMC_CONFIG1_0 + sc->sc_cs * GPMC_CS_SIZE;
 	cs_offset = GPMC_CS_CONFIG_BASE(sc->sc_cs);
 
 	/* map i/o space */

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:32:03 UTC 2016

Modified Files:
src/sys/arch/arm/omap: omap2_nand.c

Log Message:
Remove a comment-out-ed and no-need line.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap2_nand.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/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:23:40 UTC 2016

Modified Files:
src/sys/arch/arm/omap: files.omap2 omap2_gpmc.c

Log Message:
Support locator "cs".


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/omap/files.omap2
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap2_gpmc.c

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

Modified files:

Index: src/sys/arch/arm/omap/files.omap2
diff -u src/sys/arch/arm/omap/files.omap2:1.33 src/sys/arch/arm/omap/files.omap2:1.34
--- src/sys/arch/arm/omap/files.omap2:1.33	Mon Jul  4 15:35:55 2016
+++ src/sys/arch/arm/omap/files.omap2	Tue Oct  4 15:23:40 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: files.omap2,v 1.33 2016/07/04 15:35:55 kiyohara Exp $
+#	$NetBSD: files.omap2,v 1.34 2016/10/04 15:23:40 kiyohara Exp $
 #
 # Configuration info for Texas Instruments OMAP2/OMAP3 CPU support
 # Based on xscale/files.pxa2x0
@@ -117,7 +117,7 @@ file	arch/arm/omap/omap2_l3i.c		omap2 | 
 # General Purpose Memory Controller
 # XXX some addl. chip select config parms may be desired here (e.g. timing)
 # XXX so far we just use the setup established by boot firmware
-device	gpmc { [addr=-1], [size=0], [intr=-1], [mult=1], [nobyteacc=0]
+device	gpmc { [cs=-1], [addr=-1], [size=0], [intr=-1], [mult=1], [nobyteacc=0]
 	  } : bus_space_generic
 attach	gpmc at mainbus
 file	arch/arm/omap/omap2_gpmc.c		gpmc

Index: src/sys/arch/arm/omap/omap2_gpmc.c
diff -u src/sys/arch/arm/omap/omap2_gpmc.c:1.9 src/sys/arch/arm/omap/omap2_gpmc.c:1.10
--- src/sys/arch/arm/omap/omap2_gpmc.c:1.9	Fri Jul  1 20:30:21 2011
+++ src/sys/arch/arm/omap/omap2_gpmc.c	Tue Oct  4 15:23:40 2016
@@ -1,7 +1,7 @@
-/*	$Id: omap2_gpmc.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $	*/
+/*	$Id: omap2_gpmc.c,v 1.10 2016/10/04 15:23:40 kiyohara Exp $	*/
 
 /* adapted from: */
-/*	$NetBSD: omap2_gpmc.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $ */
+/*	$NetBSD: omap2_gpmc.c,v 1.10 2016/10/04 15:23:40 kiyohara Exp $ */
 
 
 /*
@@ -102,7 +102,7 @@
 
 #include "opt_omap.h"
 #include 
-__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.9 2011/07/01 20:30:21 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c,v 1.10 2016/10/04 15:23:40 kiyohara Exp $");
 
 #include "locators.h"
 
@@ -278,7 +278,22 @@ gpmc_search(device_t parent, cfdata_t cf
 	aa.gpmc_intr = cf->cf_loc[GPMCCF_INTR];
 
 	cs = >sc_csconfig[0];
-	for (i=0; i < GPMC_NCS; i++) {
+	for (i = 0; i < GPMC_NCS; i++) {
+		if (cf->cf_loc[GPMCCF_CS] != GPMCCF_CS_DEFAULT) {
+			if (i != cf->cf_loc[GPMCCF_CS]) {
+cs++;
+continue;
+			}
+
+			if (aa.gpmc_addr != GPMCCF_ADDR_DEFAULT
+			&&  aa.gpmc_addr != cs->cs_addr)
+panic("cs:addr missmatch:"
+" cs %d(0x%08lx), addr 0x%08lx\n",
+cf->cf_loc[GPMCCF_CS], cs->cs_addr,
+aa.gpmc_addr);
+			aa.gpmc_addr = cs->cs_addr;
+		}
+
 		if ((aa.gpmc_addr >= cs->cs_addr)
 		&&  (aa.gpmc_addr < (cs->cs_addr + cs->cs_size))) {
 			/* XXX

CVS commit: src/sys/arch/arm/omap

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:23:40 UTC 2016

Modified Files:
src/sys/arch/arm/omap: files.omap2 omap2_gpmc.c

Log Message:
Support locator "cs".


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/omap/files.omap2
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/omap/omap2_gpmc.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/arm/cortex

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:18:23 UTC 2016

Modified Files:
src/sys/arch/arm/cortex: a9_mpsubr.S

Log Message:
Don't touch ACTLR on CORTEX A9, if ACTLR.SMP=1.  like Linux.
  Tested on Gumstix DuoVero(OMAP 4430).


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arm/cortex/a9_mpsubr.S

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

Modified files:

Index: src/sys/arch/arm/cortex/a9_mpsubr.S
diff -u src/sys/arch/arm/cortex/a9_mpsubr.S:1.46 src/sys/arch/arm/cortex/a9_mpsubr.S:1.47
--- src/sys/arch/arm/cortex/a9_mpsubr.S:1.46	Sat Dec 19 13:27:29 2015
+++ src/sys/arch/arm/cortex/a9_mpsubr.S	Tue Oct  4 15:18:23 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: a9_mpsubr.S,v 1.46 2015/12/19 13:27:29 skrll Exp $	*/
+/*	$NetBSD: a9_mpsubr.S,v 1.47 2016/10/04 15:18:23 kiyohara Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -507,10 +507,12 @@ cortex_init:
 #if defined(MULTIPROCESSOR) || defined(CPU_CORTEXA5) || defined(CPU_CORTEXA7) || defined(CPU_CORTEXA9) || defined(CPU_CORTEXA15) || defined(CPU_CORTEXA17)
 #if defined(CPU_CORTEXA5) || defined(CPU_CORTEXA7) || defined(CPU_CORTEXA9) || defined(CPU_CORTEXA15) || defined(CPU_CORTEXA17)
 	//
-	// Step 4a, set ACTLR.SMP=1
+	// Step 4a, set ACTLR.SMP=1, if ACTLR.SMP=0
+	// i.e. OMAP4430 was enabled yet.
 	//
 	mrc	p15, 0, r0, c1, c0, 1		// ACTLR read
-	orr	r0, r0, #CORTEXA9_AUXCTL_SMP	// enable SMP
+	tst	r0, #CORTEXA9_AUXCTL_SMP
+	orreq	r0, r0, #CORTEXA9_AUXCTL_SMP	// enable SMP
 
 #if defined(CPU_CORTEXA15)
 	// The A15 requires snoop-delayed exclusive handling to be set
@@ -524,16 +526,16 @@ cortex_init:
 	//
 	// Step 4a (continued on A5/A9), ACTLR.FW=1)
 	//
-	orr	r0, r0, #CORTEXA9_AUXCTL_FW	// enable cache/tlb/coherency
+	orreq	r0, r0, #CORTEXA9_AUXCTL_FW	// enable cache/tlb/coherency
 #endif	/* A5 || A9 */
 #if defined(CPU_CORTEXA9)
 	//
 	// Step 4b (continued on A9), ACTLR.L2PE=1)
 	//
-	orr	r0, r0, #CORTEXA9_AUXCTL_L2PE	// enable L2 cache prefetch
+	orreq	r0, r0, #CORTEXA9_AUXCTL_L2PE	// enable L2 cache prefetch
 #endif
 
-	mcr	p15, 0, r0, c1, c0, 1		// ACTLR write
+	mcreq	p15, 0, r0, c1, c0, 1		// ACTLR write
 	isb
 	dsb
 #endif	/* A5 || A7 || A9 || A15 || A17 */

CVS commit: src/sys/arch/arm/cortex

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:18:23 UTC 2016

Modified Files:
src/sys/arch/arm/cortex: a9_mpsubr.S

Log Message:
Don't touch ACTLR on CORTEX A9, if ACTLR.SMP=1.  like Linux.
  Tested on Gumstix DuoVero(OMAP 4430).


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arm/cortex/a9_mpsubr.S

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

CVS commit: src/sys/arch/arm/cortex

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:15:27 UTC 2016

Modified Files:
src/sys/arch/arm/cortex: scu_reg.h

Log Message:
Add SCU_SIZE.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/cortex/scu_reg.h

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

Modified files:

Index: src/sys/arch/arm/cortex/scu_reg.h
diff -u src/sys/arch/arm/cortex/scu_reg.h:1.1 src/sys/arch/arm/cortex/scu_reg.h:1.2
--- src/sys/arch/arm/cortex/scu_reg.h:1.1	Sat Sep  1 00:03:14 2012
+++ src/sys/arch/arm/cortex/scu_reg.h	Tue Oct  4 15:15:27 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: scu_reg.h,v 1.1 2012/09/01 00:03:14 matt Exp $ */
+/* $NetBSD: scu_reg.h,v 1.2 2016/10/04 15:15:27 kiyohara Exp $ */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,6 +36,8 @@
  * Used by Cortex-A5 and Cortex-A9
  */
 
+#define	SCU_SIZE		0x100
+
 #define	SCU_CTL			0x00	// SCU Control Register
 #define	SCU_CFG			0x04	// SCU Configuration Register
 #define	SCU_CPU_PWR_STS		0x08	// SCU CPU Power Status

CVS commit: src/sys/arch/arm/cortex

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:15:27 UTC 2016

Modified Files:
src/sys/arch/arm/cortex: scu_reg.h

Log Message:
Add SCU_SIZE.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/cortex/scu_reg.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/arm/cortex

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:12:29 UTC 2016

Modified Files:
src/sys/arch/arm/cortex: a9wdt.c

Log Message:
Register sysmon_wdog.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/cortex/a9wdt.c

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

Modified files:

Index: src/sys/arch/arm/cortex/a9wdt.c
diff -u src/sys/arch/arm/cortex/a9wdt.c:1.4 src/sys/arch/arm/cortex/a9wdt.c:1.5
--- src/sys/arch/arm/cortex/a9wdt.c:1.4	Wed Mar  4 23:18:21 2015
+++ src/sys/arch/arm/cortex/a9wdt.c	Tue Oct  4 15:12:29 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: a9wdt.c,v 1.4 2015/03/04 23:18:21 jmcneill Exp $	*/
+/*	$NetBSD: a9wdt.c,v 1.5 2016/10/04 15:12:29 kiyohara Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: a9wdt.c,v 1.4 2015/03/04 23:18:21 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9wdt.c,v 1.5 2016/10/04 15:12:29 kiyohara Exp $");
 
 #include 
 #include 
@@ -253,4 +253,8 @@ a9wdt_attach(device_t parent, device_t s
 			aprint_error_dev(self,
 			"failed to start kernel tickler: %d\n", error);
  	}
+
+	if (sysmon_wdog_register(>sc_smw) != 0)
+		aprint_error("%s: unable to register with sysmon\n",
+		device_xname(sc->sc_dev));
 }

CVS commit: src/bin/ksh

2016-10-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 15:09:03 UTC 2016

Modified Files:
src/bin/ksh: eval.c

Log Message:
Add explicit char cast to show that the value change is intended.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/bin/ksh/eval.c

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

Modified files:

Index: src/bin/ksh/eval.c
diff -u src/bin/ksh/eval.c:1.15 src/bin/ksh/eval.c:1.16
--- src/bin/ksh/eval.c:1.15	Fri Oct 18 19:53:34 2013
+++ src/bin/ksh/eval.c	Tue Oct  4 15:09:03 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.15 2013/10/18 19:53:34 christos Exp $	*/
+/*	$NetBSD: eval.c,v 1.16 2016/10/04 15:09:03 joerg Exp $	*/
 
 /*
  * Expansion - quoting, separation, substitution, globbing
@@ -6,7 +6,7 @@
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: eval.c,v 1.15 2013/10/18 19:53:34 christos Exp $");
+__RCSID("$NetBSD: eval.c,v 1.16 2016/10/04 15:09:03 joerg Exp $");
 #endif
 
 #include 
@@ -345,7 +345,7 @@ expand(cp, wp, f)
 		 * expected)
 		 */
 		*dp++ = MAGIC;
-		*dp++ = '@' + 0x80;
+		*dp++ = (char)('@' + 0x80);
 		break;
 	  case '=':
 		/* Enabling tilde expansion

CVS commit: src/sys/arch/arm/cortex

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:12:29 UTC 2016

Modified Files:
src/sys/arch/arm/cortex: a9wdt.c

Log Message:
Register sysmon_wdog.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/cortex/a9wdt.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/i2c

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:06:59 UTC 2016

Modified Files:
src/sys/dev/i2c: ds1307.c ds1307reg.h

Log Message:
Add DS1340.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/i2c/ds1307.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/ds1307reg.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/i2c/ds1307.c
diff -u src/sys/dev/i2c/ds1307.c:1.22 src/sys/dev/i2c/ds1307.c:1.23
--- src/sys/dev/i2c/ds1307.c:1.22	Tue Apr  5 10:53:16 2016
+++ src/sys/dev/i2c/ds1307.c	Tue Oct  4 15:06:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ds1307.c,v 1.22 2016/04/05 10:53:16 bouyer Exp $	*/
+/*	$NetBSD: ds1307.c,v 1.23 2016/10/04 15:06:59 kiyohara Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.22 2016/04/05 10:53:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ds1307.c,v 1.23 2016/10/04 15:06:59 kiyohara Exp $");
 
 #include 
 #include 
@@ -83,6 +83,13 @@ static const struct dsrtc_model dsrtc_mo
 		.dm_rtc_size = DS1339_RTC_SIZE,
 		.dm_flags = DSRTC_FLAG_BCD,
 	}, {
+		.dm_model = 1340,
+		.dm_ch_reg = DS_SECONDS,
+		.dm_ch_value = DS1340_SECONDS_EOSC,
+		.dm_rtc_start = DS1340_RTC_START,
+		.dm_rtc_size = DS1340_RTC_SIZE,
+		.dm_flags = DSRTC_FLAG_BCD,
+	}, {
 		.dm_model = 1672,
 		.dm_rtc_start = DS1672_RTC_START,
 		.dm_rtc_size = DS1672_RTC_SIZE,

Index: src/sys/dev/i2c/ds1307reg.h
diff -u src/sys/dev/i2c/ds1307reg.h:1.6 src/sys/dev/i2c/ds1307reg.h:1.7
--- src/sys/dev/i2c/ds1307reg.h:1.6	Tue Apr  5 10:53:16 2016
+++ src/sys/dev/i2c/ds1307reg.h	Tue Oct  4 15:06:59 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ds1307reg.h,v 1.6 2016/04/05 10:53:16 bouyer Exp $	*/
+/*	$NetBSD: ds1307reg.h,v 1.7 2016/10/04 15:06:59 kiyohara Exp $	*/
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -65,6 +65,10 @@
 #define	DS1339_NVRAM_START	0
 #define	DS1339_NVRAM_SIZE	0
 
+#define	DS1340_RTC_START	0
+#define	DS1340_RTC_SIZE		DS_RTC_SIZE
+#define	DS1340_SECONDS_EOSC		(1 << 7) /* Clock Hold */
+
 #define DS1672_CNTR1		0x00
 #define DS1672_CNTR2		0x01
 #define DS1672_CNTR3		0x02

CVS commit: src/bin/ksh

2016-10-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 15:09:03 UTC 2016

Modified Files:
src/bin/ksh: eval.c

Log Message:
Add explicit char cast to show that the value change is intended.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/bin/ksh/eval.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/i2c

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:06:59 UTC 2016

Modified Files:
src/sys/dev/i2c: ds1307.c ds1307reg.h

Log Message:
Add DS1340.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/i2c/ds1307.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/i2c/ds1307reg.h

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

CVS commit: src/usr.bin/ftp

2016-10-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 15:06:31 UTC 2016

Modified Files:
src/usr.bin/ftp: ftp.c

Log Message:
When using data outside the signed char range, it is better to
consistently use an unsigned char buffer.


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/usr.bin/ftp/ftp.c

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

Modified files:

Index: src/usr.bin/ftp/ftp.c
diff -u src/usr.bin/ftp/ftp.c:1.166 src/usr.bin/ftp/ftp.c:1.167
--- src/usr.bin/ftp/ftp.c:1.166	Sun Dec 13 14:06:13 2015
+++ src/usr.bin/ftp/ftp.c	Tue Oct  4 15:06:31 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp.c,v 1.166 2015/12/13 14:06:13 tron Exp $	*/
+/*	$NetBSD: ftp.c,v 1.167 2016/10/04 15:06:31 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
@@ -92,7 +92,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.166 2015/12/13 14:06:13 tron Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.167 2016/10/04 15:06:31 joerg Exp $");
 #endif
 #endif /* not lint */
 
@@ -2064,7 +2064,7 @@ abort_squared(int dummy)
 void
 abort_remote(FILE *din)
 {
-	char buf[BUFSIZ];
+	unsigned char buf[BUFSIZ];
 	int nfnd;
 
 	if (cout == NULL) {

CVS commit: src/usr.bin/ftp

2016-10-04 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Oct  4 15:06:31 UTC 2016

Modified Files:
src/usr.bin/ftp: ftp.c

Log Message:
When using data outside the signed char range, it is better to
consistently use an unsigned char buffer.


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/usr.bin/ftp/ftp.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/marvell

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:02:27 UTC 2016

Modified Files:
src/sys/dev/marvell: marvellreg.h

Log Message:
Add 88AP510.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/marvell/marvellreg.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/marvell

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:02:27 UTC 2016

Modified Files:
src/sys/dev/marvell: marvellreg.h

Log Message:
Add 88AP510.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/marvell/marvellreg.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/marvell/marvellreg.h
diff -u src/sys/dev/marvell/marvellreg.h:1.9 src/sys/dev/marvell/marvellreg.h:1.10
--- src/sys/dev/marvell/marvellreg.h:1.9	Wed Jun  3 04:00:06 2015
+++ src/sys/dev/marvell/marvellreg.h	Tue Oct  4 15:02:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: marvellreg.h,v 1.9 2015/06/03 04:00:06 hsuenaga Exp $	*/
+/*	$NetBSD: marvellreg.h,v 1.10 2016/10/04 15:02:27 kiyohara Exp $	*/
 /*
  * Copyright (c) 2009 KIYOHARA Takashi
  * All rights reserved.
@@ -59,6 +59,8 @@
 #define MARVELL_MV78XX0_MV78100		PCI_PRODUCT_MARVELL_MV78100
 #define MARVELL_MV78XX0_MV78200		PCI_PRODUCT_MARVELL_MV78200
 
+#define MARVELL_DOVE_88AP510		PCI_PRODUCT_MARVELL_88AP510
+
 #define MARVELL_ARMADAXP_MV78130	PCI_PRODUCT_MARVELL_MV78130
 #define MARVELL_ARMADAXP_MV78160	PCI_PRODUCT_MARVELL_MV78160
 #define MARVELL_ARMADAXP_MV78230	PCI_PRODUCT_MARVELL_MV78230

CVS commit: src/sys/dev/pci

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 15:00:40 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.1257 -r1.1258 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1256 -r1.1257 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

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 14:55:32 UTC 2016

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

Log Message:
Add Marvell 88AP510.


To generate a diff of this commit:
cvs rdiff -u -r1.1265 -r1.1266 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

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 14:55:32 UTC 2016

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

Log Message:
Add Marvell 88AP510.


To generate a diff of this commit:
cvs rdiff -u -r1.1265 -r1.1266 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.1265 src/sys/dev/pci/pcidevs:1.1266
--- src/sys/dev/pci/pcidevs:1.1265	Fri Sep 16 05:42:22 2016
+++ src/sys/dev/pci/pcidevs	Tue Oct  4 14:55:32 2016
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1265 2016/09/16 05:42:22 msaitoh Exp $
+$NetBSD: pcidevs,v 1.1266 2016/10/04 14:55:32 kiyohara Exp $
 
 /*
  * Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -2322,6 +2322,7 @@ product FREESCALE P5010		0x0429	P5010
 
 /* Marvell products */
 product MARVELL GT64010A	0x0146	GT-64010A System Controller
+product MARVELL 88AP510		0x0510	88AP510
 product MARVELL 88F1181		0x1181	88F1181
 product MARVELL 88F1281		0x1281	88F1281 SoC Orion2
 product MARVELL 88W8300_1	0x1fa6	Libertas 88W8300

CVS commit: src/sys/dev/nand

2016-10-04 Thread KIYOHARA Takashi

Module Name:src
Committed By:   kiyohara
Date:   Tue Oct  4 14:47:18 UTC 2016

Modified Files:
src/sys/dev/nand: nand.c

Log Message:
Use ONFI_STATUS_WP instead of 0x80.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/nand/nand.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/nand/nand.c
diff -u src/sys/dev/nand/nand.c:1.24 src/sys/dev/nand/nand.c:1.25
--- src/sys/dev/nand/nand.c:1.24	Tue Oct  4 14:43:55 2016
+++ src/sys/dev/nand/nand.c	Tue Oct  4 14:47:18 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nand.c,v 1.24 2016/10/04 14:43:55 kiyohara Exp $	*/
+/*	$NetBSD: nand.c,v 1.25 2016/10/04 14:47:18 kiyohara Exp $	*/
 
 /*-
  * Copyright (c) 2010 Department of Software Engineering,
@@ -34,7 +34,7 @@
 /* Common driver for NAND chips implementing the ONFI 2.2 specification */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.24 2016/10/04 14:43:55 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nand.c,v 1.25 2016/10/04 14:47:18 kiyohara Exp $");
 
 #include "locators.h"
 
@@ -640,7 +640,7 @@ nand_get_status(device_t self)
 static bool
 nand_check_wp(device_t self)
 {
-	if (nand_get_status(self) & 0x80)
+	if (nand_get_status(self) & ONFI_STATUS_WP)
 		return false;
 	else
 		return true;

1 2 >

1 - 100 of 129 matches

Mail list logo