date:20170620

CVS commit: src/tests/net/arp

2017-06-20 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jun 21 03:10:42 UTC 2017

Modified Files:
src/tests/net/arp: t_arp.sh

Log Message:
Set net.inet.arp.keep only if it's required


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tests/net/arp/t_arp.sh

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

Modified files:

Index: src/tests/net/arp/t_arp.sh
diff -u src/tests/net/arp/t_arp.sh:1.24 src/tests/net/arp/t_arp.sh:1.25
--- src/tests/net/arp/t_arp.sh:1.24	Mon Jun 19 10:57:37 2017
+++ src/tests/net/arp/t_arp.sh	Wed Jun 21 03:10:42 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: t_arp.sh,v 1.24 2017/06/19 10:57:37 ozaki-r Exp $
+#	$NetBSD: t_arp.sh,v 1.25 2017/06/21 03:10:42 ozaki-r Exp $
 #
 # Copyright (c) 2015 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -115,12 +115,15 @@ setup_dst_server()
 
 setup_src_server()
 {
-	local keep=$1
+	local keep=${1:-0}
 
 	export RUMP_SERVER=$SOCKSRC
 
 	# Adjust ARP parameters
-	atf_check -s exit:0 -o ignore rump.sysctl -w net.inet.arp.keep=$keep
+	if [ $keep != 0 ]; then
+		atf_check -s exit:0 -o ignore \
+		rump.sysctl -w net.inet.arp.keep=$keep
+	fi
 
 	# Setup an interface
 	rump_server_add_iface $SOCKSRC shmif0 bus1
@@ -309,14 +312,13 @@ arp_garp_body()
 
 arp_cache_overwriting_body()
 {
-	local arp_keep=5
 	local bonus=2
 
 	rump_server_start $SOCKSRC
 	rump_server_start $SOCKDST
 
 	setup_dst_server
-	setup_src_server $arp_keep
+	setup_src_server
 
 	export RUMP_SERVER=$SOCKSRC
 
@@ -366,7 +368,6 @@ make_pkt_str_garp()
 
 test_proxy_arp()
 {
-	local arp_keep=5
 	local opts= title= flags=
 	local type=$1
 
@@ -374,7 +375,7 @@ test_proxy_arp()
 	rump_server_start $SOCKDST tap
 
 	setup_dst_server
-	setup_src_server $arp_keep
+	setup_src_server
 
 	export RUMP_SERVER=$SOCKDST
 	atf_check -s exit:0 -o ignore rump.sysctl -w net.inet.ip.forwarding=1
@@ -480,14 +481,13 @@ arp_proxy_arp_pubproxy_body()
 
 arp_link_activation_body()
 {
-	local arp_keep=5
 	local bonus=2
 
 	rump_server_start $SOCKSRC
 	rump_server_start $SOCKDST
 
 	setup_dst_server
-	setup_src_server $arp_keep
+	setup_src_server
 
 	# flush old packets
 	extract_new_packets bus1 > ./out
@@ -520,14 +520,13 @@ arp_link_activation_body()
 
 arp_static_body()
 {
-	local arp_keep=5
 	local macaddr_src=
 
 	rump_server_start $SOCKSRC
 	rump_server_start $SOCKDST
 
 	setup_dst_server
-	setup_src_server $arp_keep
+	setup_src_server
 
 	macaddr_src=$(get_macaddr $SOCKSRC shmif0)
 
@@ -608,7 +607,6 @@ arp_rtm_head()
 
 arp_rtm_body()
 {
-	local arp_keep=5
 	local macaddr_src= macaddr_dst=
 	local file=./tmp
 	local pid= str=
@@ -617,7 +615,7 @@ arp_rtm_body()
 	rump_server_start $SOCKDST
 
 	setup_dst_server
-	setup_src_server $arp_keep
+	setup_src_server
 
 	macaddr_src=$(get_macaddr $SOCKSRC shmif0)
 	macaddr_dst=$(get_macaddr $SOCKDST shmif0)

CVS commit: src/tests/net/arp

2017-06-20 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Wed Jun 21 03:10:42 UTC 2017

Modified Files:
src/tests/net/arp: t_arp.sh

Log Message:
Set net.inet.arp.keep only if it's required


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tests/net/arp/t_arp.sh

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

CVS commit: src/sys/arch/sh3/sh3

2017-06-20 Thread Valeriy E. Ushakov

Module Name:src
Committed By:   uwe
Date:   Tue Jun 20 23:20:01 UTC 2017

Modified Files:
src/sys/arch/sh3/sh3: exception.c

Log Message:
Use vmspace::vm_minsaddr instead of hardcoding USRSTACK.
Requested by joerg@.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sh3/sh3/exception.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/sh3/sh3/exception.c
diff -u src/sys/arch/sh3/sh3/exception.c:1.64 src/sys/arch/sh3/sh3/exception.c:1.65
--- src/sys/arch/sh3/sh3/exception.c:1.64	Wed Mar  4 09:39:26 2015
+++ src/sys/arch/sh3/sh3/exception.c	Tue Jun 20 23:20:01 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: exception.c,v 1.64 2015/03/04 09:39:26 skrll Exp $	*/
+/*	$NetBSD: exception.c,v 1.65 2017/06/20 23:20:01 uwe Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.64 2015/03/04 09:39:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.65 2017/06/20 23:20:01 uwe Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -393,11 +393,11 @@ tlb_exception(struct lwp *l, struct trap
 	/* User stack extension */
 	if (map != kernel_map &&
 	(va >= (vaddr_t)l->l_proc->p_vmspace->vm_maxsaddr) &&
-	(va < USRSTACK)) {
+	(va <  (vaddr_t)l->l_proc->p_vmspace->vm_minsaddr)) {
 		if (err == 0) {
 			struct vmspace *vm = l->l_proc->p_vmspace;
 			uint32_t nss;
-			nss = btoc(USRSTACK - va);
+			nss = btoc((vaddr_t)vm->vm_minsaddr - va);
 			if (nss > vm->vm_ssize)
 vm->vm_ssize = nss;
 		} else if (err == EACCES) {

CVS commit: [jdolecek-ncq] src/sys/dev/ata

2017-06-20 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Jun 20 21:55:09 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq

Log Message:
some more notes for dump on unopened device (PR kern/16789)


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/sys/dev/ata/TODO.ncq

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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.19 src/sys/dev/ata/TODO.ncq:1.1.2.20
--- src/sys/dev/ata/TODO.ncq:1.1.2.19	Tue Jun 20 20:58:22 2017
+++ src/sys/dev/ata/TODO.ncq	Tue Jun 20 21:55:09 2017
@@ -35,6 +35,9 @@ to the open path executing ata_get_param
 while waiting for the command to finish; specifically, if WDF_LOADED is not
 set 
 - happens due to wd_get_params() with just AT_WAIT in wdopen()
+- not easy to fix, open needs to read disklabel and all this mechanics
+  is too much for emergency crash dump code path
+- old bug - kern/16789
 
 add nibble to control number of tags (1==disable NCQ)?

CVS commit: [jdolecek-ncq] src/sys/dev/ata

2017-06-20 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Jun 20 21:55:09 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq

Log Message:
some more notes for dump on unopened device (PR kern/16789)


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/sys/dev/ata/TODO.ncq

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

CVS commit: src/etc/etc.evbarm

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 21:04:23 UTC 2017

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Don't try and build VEXPRESS_A15_INSTALL


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/etc/etc.evbarm/Makefile.inc

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

CVS commit: src/etc/etc.evbarm

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 21:04:23 UTC 2017

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Don't try and build VEXPRESS_A15_INSTALL


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/etc/etc.evbarm/Makefile.inc

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

Modified files:

Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.83 src/etc/etc.evbarm/Makefile.inc:1.84
--- src/etc/etc.evbarm/Makefile.inc:1.83	Tue Jun 20 10:55:03 2017
+++ src/etc/etc.evbarm/Makefile.inc	Tue Jun 20 21:04:23 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.83 2017/06/20 10:55:03 skrll Exp $
+#	$NetBSD: Makefile.inc,v 1.84 2017/06/20 21:04:23 skrll Exp $
 #
 #	etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -18,8 +18,8 @@ IMAGEENDIAN=	be
 KERNEL_SETS.armv4+=		IXM1200
 EVBARM_BOARDS.xscale+=		ADI_BRH
 KERNEL_SETS.xscale+=		NSLU2
-EVBARM_BOARDS.armv7+=		VEXPRESS_A15
-EVBARM_BOARDS.armv7hf+=		VEXPRESS_A15
+KERNEL_SETS.armv7+=		VEXPRESS_A15
+KERNEL_SETS.armv7hf+=		VEXPRESS_A15
 EVBARM_BOARDS.armv7+=		BCM5301X
 EVBARM_BOARDS.armv7hf+=		BCM5301X
 #EVBARM_BOARDS.armv7+=		BCM56340
@@ -78,8 +78,8 @@ KERNEL_SETS.armv6hf+=	 	RPI2
 EVBARM_BOARDS.armv6+=		TISDP2420
 EVBARM_BOARDS.armv6hf+= 	TISDP2420
 #EVBARM_BOARDS.armv6+=		TISDP2430
-EVBARM_BOARDS.armv7+=		VEXPRESS_A15
-EVBARM_BOARDS.armv7hf+=		VEXPRESS_A15
+KERNEL_SETS.armv7+=		VEXPRESS_A15
+KERNEL_SETS.armv7hf+=		VEXPRESS_A15
 EVBARM_BOARDS.armv7+=		ARMADAXP
 EVBARM_BOARDS.armv7hf+=		ARMADAXP
 EVBARM_BOARDS.armv7+=		BCM5301X

CVS commit: [jdolecek-ncq] src/sys/dev/ic

2017-06-20 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Jun 20 21:00:47 UTC 2017

Modified Files:
src/sys/dev/ic [jdolecek-ncq]: siisata.c

Log Message:
remove ata queue downsizing - every device, attached to the same channel,
uses slots according to it's own limits

wdc code changed to expect maximum one active xfer, and not check number
of openings in the channel; this is to facilitate using wdc functions
for e.g. handling of atapi commands  for drivers which support both ATAPI
and NCQ

siisata(4) part, including fix to hang on drive probe (missing ata_free_xfer())


To generate a diff of this commit:
cvs rdiff -u -r1.30.4.17 -r1.30.4.18 src/sys/dev/ic/siisata.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/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.30.4.17 src/sys/dev/ic/siisata.c:1.30.4.18
--- src/sys/dev/ic/siisata.c:1.30.4.17	Mon Jun 19 21:00:00 2017
+++ src/sys/dev/ic/siisata.c	Tue Jun 20 21:00:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.30.4.17 2017/06/19 21:00:00 jdolecek Exp $ */
+/* $NetBSD: siisata.c,v 1.30.4.18 2017/06/20 21:00:47 jdolecek Exp $ */
 
 /* from ahcisata_core.c */
 
@@ -79,7 +79,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.17 2017/06/19 21:00:00 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.30.4.18 2017/06/20 21:00:47 jdolecek Exp $");
 
 #include 
 #include 
@@ -588,7 +588,7 @@ siisata_reset_drive(struct ata_drive_dat
 	 * Try to get available slot. If there is none available, must
 	 * do full channel reset.
 	 */
-	xfer = ata_get_xfer(chp, false);
+	xfer = ata_get_xfer_ext(chp, false, 0);
 	if (xfer == NULL) {
 		siisata_reset_channel(chp, flags);
 		return;
@@ -738,7 +738,7 @@ siisata_probe_drive(struct ata_channel *
 	SIISATA_DEBUG_PRINT(("%s: %s: port %d start\n", SIISATANAME(sc),
 	__func__, chp->ch_channel), DEBUG_FUNCS);
 
-	xfer = ata_get_xfer(chp, true);
+	xfer = ata_get_xfer(chp);
 	if (xfer == NULL) {
 		aprint_error_dev(sc->sc_atac.atac_dev,
 		"failed to get xfer port %d\n",
@@ -821,6 +821,9 @@ siisata_probe_drive(struct ata_channel *
 	}
 
 	siisata_enable_port_interrupt(chp);
+
+	ata_free_xfer(chp, xfer);
+
 	SIISATA_DEBUG_PRINT(("%s: %s: port %d done\n", SIISATANAME(sc),
 	__func__, chp->ch_channel), DEBUG_PROBE);
 	return;
@@ -1597,7 +1600,7 @@ siisata_atapi_scsipi_request(struct scsi
 			scsipi_done(sc_xfer);
 			return;
 		}
-		xfer = ata_get_xfer(atac->atac_channels[channel], false);
+		xfer = ata_get_xfer_ext(atac->atac_channels[channel], false, 0);
 		if (xfer == NULL) {
 			sc_xfer->error = XS_RESOURCE_SHORTAGE;
 			scsipi_done(sc_xfer);

CVS commit: [jdolecek-ncq] src/sys/dev/ic

2017-06-20 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Jun 20 21:00:47 UTC 2017

Modified Files:
src/sys/dev/ic [jdolecek-ncq]: siisata.c

Log Message:
remove ata queue downsizing - every device, attached to the same channel,
uses slots according to it's own limits

wdc code changed to expect maximum one active xfer, and not check number
of openings in the channel; this is to facilitate using wdc functions
for e.g. handling of atapi commands  for drivers which support both ATAPI
and NCQ

siisata(4) part, including fix to hang on drive probe (missing ata_free_xfer())


To generate a diff of this commit:
cvs rdiff -u -r1.30.4.17 -r1.30.4.18 src/sys/dev/ic/siisata.c

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

CVS commit: [jdolecek-ncq] src/sys/dev

2017-06-20 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Jun 20 20:58:23 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq ata.c ata_wdc.c atavar.h
satapmp_subr.c wd.c
src/sys/dev/ic [jdolecek-ncq]: ahcisata_core.c mvsata.c wdc.c
src/sys/dev/scsipi [jdolecek-ncq]: atapi_wdc.c
src/sys/dev/usb [jdolecek-ncq]: umass_isdata.c

Log Message:
remove ata queue downsizing - every device, attached to the same channel,
uses slots according to it's own limits

wdc code changed to expect maximum one active xfer, and not check number
of openings in the channel; this is to facilitate using wdc functions
for e.g. handling of atapi commands  for drivers which support both ATAPI
and NCQ


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.132.8.11 -r1.132.8.12 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.105.6.4 -r1.105.6.5 src/sys/dev/ata/ata_wdc.c
cvs rdiff -u -r1.92.8.10 -r1.92.8.11 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.12.24.3 -r1.12.24.4 src/sys/dev/ata/satapmp_subr.c
cvs rdiff -u -r1.428.2.18 -r1.428.2.19 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.57.6.14 -r1.57.6.15 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.35.6.12 -r1.35.6.13 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.283.2.6 -r1.283.2.7 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.123.4.6 -r1.123.4.7 src/sys/dev/scsipi/atapi_wdc.c
cvs rdiff -u -r1.33.4.3 -r1.33.4.4 src/sys/dev/usb/umass_isdata.c

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

CVS commit: [jdolecek-ncq] src/sys/dev

2017-06-20 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Tue Jun 20 20:58:23 UTC 2017

Modified Files:
src/sys/dev/ata [jdolecek-ncq]: TODO.ncq ata.c ata_wdc.c atavar.h
satapmp_subr.c wd.c
src/sys/dev/ic [jdolecek-ncq]: ahcisata_core.c mvsata.c wdc.c
src/sys/dev/scsipi [jdolecek-ncq]: atapi_wdc.c
src/sys/dev/usb [jdolecek-ncq]: umass_isdata.c

Log Message:
remove ata queue downsizing - every device, attached to the same channel,
uses slots according to it's own limits

wdc code changed to expect maximum one active xfer, and not check number
of openings in the channel; this is to facilitate using wdc functions
for e.g. handling of atapi commands  for drivers which support both ATAPI
and NCQ


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/sys/dev/ata/TODO.ncq
cvs rdiff -u -r1.132.8.11 -r1.132.8.12 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.105.6.4 -r1.105.6.5 src/sys/dev/ata/ata_wdc.c
cvs rdiff -u -r1.92.8.10 -r1.92.8.11 src/sys/dev/ata/atavar.h
cvs rdiff -u -r1.12.24.3 -r1.12.24.4 src/sys/dev/ata/satapmp_subr.c
cvs rdiff -u -r1.428.2.18 -r1.428.2.19 src/sys/dev/ata/wd.c
cvs rdiff -u -r1.57.6.14 -r1.57.6.15 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.35.6.12 -r1.35.6.13 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.283.2.6 -r1.283.2.7 src/sys/dev/ic/wdc.c
cvs rdiff -u -r1.123.4.6 -r1.123.4.7 src/sys/dev/scsipi/atapi_wdc.c
cvs rdiff -u -r1.33.4.3 -r1.33.4.4 src/sys/dev/usb/umass_isdata.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/ata/TODO.ncq
diff -u src/sys/dev/ata/TODO.ncq:1.1.2.18 src/sys/dev/ata/TODO.ncq:1.1.2.19
--- src/sys/dev/ata/TODO.ncq:1.1.2.18	Mon Jun 19 21:00:00 2017
+++ src/sys/dev/ata/TODO.ncq	Tue Jun 20 20:58:22 2017
@@ -22,14 +22,6 @@ do proper NCQ error recovery (currently 
 maybe do device error handling in not-interrupt-context (maybe this should be
 done on a mpata branch?)
 
-atabus(4) queue depth can only shrink, causing NCQ to not be available if NCQ
-drive rescaned after detach of non-NCQ drive
-- careful with PMP, must be minimum of openings supported by drives
-  attached to the same channel
-- the downsize can leak transfers with PMP if other device happens
-  to have active or pending transfers (e.g. when non-NCQ device is attached
-  while there is already NCQ device present)
-
 add mechanics to re-check queue when xfer is finished - needed on PMP
 and for IDE disks, when one drive uses up all available xfers nothing
 ever restarts queue for the other drives

Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.132.8.11 src/sys/dev/ata/ata.c:1.132.8.12
--- src/sys/dev/ata/ata.c:1.132.8.11	Mon Jun 19 21:00:00 2017
+++ src/sys/dev/ata/ata.c	Tue Jun 20 20:58:22 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ata.c,v 1.132.8.11 2017/06/19 21:00:00 jdolecek Exp $	*/
+/*	$NetBSD: ata.c,v 1.132.8.12 2017/06/20 20:58:22 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.11 2017/06/19 21:00:00 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.132.8.12 2017/06/20 20:58:22 jdolecek Exp $");
 
 #include "opt_ata.h"
 
@@ -131,6 +131,7 @@ static void atabusconfig_thread(void *);
 
 static void ata_xfer_init(struct ata_xfer *, bool);
 static void ata_xfer_destroy(struct ata_xfer *);
+static void ata_channel_idle(struct ata_channel *);
 
 /*
  * atabus_init:
@@ -214,13 +215,14 @@ ata_queue_hwslot_to_xfer(struct ata_queu
 
 /*
  * This interface is supposed only to be used when there is exactly
- * one outstanding command, and there is no information about the slot,
+ * one outstanding command, when there is no information about the slot,
  * which triggered the command. ata_queue_hwslot_to_xfer() interface
- * is preferred in all standard cases.
+ * is preferred in all NCQ cases.
  */
 struct ata_xfer *
-ata_queue_active_xfer_peek(struct ata_queue *chq)
+ata_queue_get_active_xfer(struct ata_queue *chq)
 {
+	KASSERT(chq->queue_active <= 1);
 	return TAILQ_FIRST(>active_xfers);
 }
 
@@ -246,13 +248,8 @@ ata_queue_alloc(uint8_t openings)
 	if (openings == 0)
 		openings = 1;
 
-	/*
-	 * While hw supports up to 32 tags, in practice we must never
-	 * allow 32 active commands, since that would signal same as
-	 * channel error. So just limit this to 31.
-	 */
-	if (openings > 31)
-		openings = 31;
+	if (openings > ATA_MAX_OPENINGS)
+		openings = ATA_MAX_OPENINGS;
 
 	struct ata_queue *chq = malloc(offsetof(struct ata_queue, queue_xfers[openings]),
 	M_DEVBUF, M_WAITOK | M_ZERO);
@@ -268,17 +265,6 @@ ata_queue_alloc(uint8_t openings)
 	return chq;
 }
 
-static void
-ata_queue_downsize(struct ata_queue *chq, uint8_t openings)
-{
-	KASSERT(chq->queue_active == 0);
-	KASSERT(TAILQ_FIRST(>queue_xfer) == NULL);
-	KASSERT(openings < chq->queue_openings);
-
-	chq->queue_openings = openings;
-

CVS commit: src/sys/kern

2017-06-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Jun 20 20:34:49 UTC 2017

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

Log Message:
Change len type to be unsigned int for consistency with the input type.
Don't check for negative; it does not matter we clamp anyway. This
broke the compat32 getsockname() where an unitialized socklen_t ended
up randomly negative causing it to fail.


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/kern/uipc_syscalls.c

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

Modified files:

Index: src/sys/kern/uipc_syscalls.c
diff -u src/sys/kern/uipc_syscalls.c:1.186 src/sys/kern/uipc_syscalls.c:1.187
--- src/sys/kern/uipc_syscalls.c:1.186	Fri Feb  3 11:06:45 2017
+++ src/sys/kern/uipc_syscalls.c	Tue Jun 20 16:34:49 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_syscalls.c,v 1.186 2017/02/03 16:06:45 christos Exp $	*/
+/*	$NetBSD: uipc_syscalls.c,v 1.187 2017/06/20 20:34:49 christos Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.186 2017/02/03 16:06:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.187 2017/06/20 20:34:49 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pipe.h"
@@ -1362,7 +1362,7 @@ int
 copyout_sockname_sb(struct sockaddr *asa, unsigned int *alen, int flags,
 struct sockaddr_big *addr)
 {
-	int len;
+	unsigned int len;
 	int error;
 
 	if (asa == NULL)
@@ -1375,8 +1375,6 @@ copyout_sockname_sb(struct sockaddr *asa
 			return error;
 	} else
 		len = *alen;
-	if (len < 0)
-		return EINVAL;
 
 	if (addr == NULL) {
 		len = 0;

CVS commit: src/sys/kern

2017-06-20 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Tue Jun 20 20:34:49 UTC 2017

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

Log Message:
Change len type to be unsigned int for consistency with the input type.
Don't check for negative; it does not matter we clamp anyway. This
broke the compat32 getsockname() where an unitialized socklen_t ended
up randomly negative causing it to fail.


To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/kern/uipc_syscalls.c

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

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

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 20:20:02 UTC 2017

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

Log Message:
Add exynos5410-smdk5410.dts to DTS list


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/EXYNOS

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

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 20:20:02 UTC 2017

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

Log Message:
Add exynos5410-smdk5410.dts to DTS list


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/EXYNOS

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/EXYNOS
diff -u src/sys/arch/evbarm/conf/EXYNOS:1.21 src/sys/arch/evbarm/conf/EXYNOS:1.22
--- src/sys/arch/evbarm/conf/EXYNOS:1.21	Tue Jun 20 13:21:45 2017
+++ src/sys/arch/evbarm/conf/EXYNOS	Tue Jun 20 20:20:02 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: EXYNOS,v 1.21 2017/06/20 13:21:45 jmcneill Exp $
+#	$NetBSD: EXYNOS,v 1.22 2017/06/20 20:20:02 skrll Exp $
 #
 #	Samsung Exynos SoC kernel
 #
@@ -9,6 +9,7 @@ include	"arch/evbarm/conf/GENERIC.common
 
 makeoptions 	DTS="
 	exynos5410-odroidxu.dts
+	exynos5410-smdk5410.dts
 	exynos5422-odroidxu3-lite.dts
 	exynos5422-odroidxu3.dts
 	exynos5422-odroidxu4.dts

CVS commit: src/share/dict

2017-06-20 Thread Abhinav Upadhyay

Module Name:src
Committed By:   abhinav
Date:   Tue Jun 20 19:57:02 UTC 2017

Modified Files:
src/share/dict: web2

Log Message:
Remove `favour' and `finalise' added in previous commit.

These are British spellings while this file contains only American sepllings
and the American spellings of these words are already present. Thanks to
Thomas (wiz@) for noticing.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/share/dict/web2

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

CVS commit: src/share/dict

2017-06-20 Thread Abhinav Upadhyay

Module Name:src
Committed By:   abhinav
Date:   Tue Jun 20 19:57:02 UTC 2017

Modified Files:
src/share/dict: web2

Log Message:
Remove `favour' and `finalise' added in previous commit.

These are British spellings while this file contains only American sepllings
and the American spellings of these words are already present. Thanks to
Thomas (wiz@) for noticing.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/share/dict/web2

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

Modified files:

Index: src/share/dict/web2
diff -u src/share/dict/web2:1.32 src/share/dict/web2:1.33
--- src/share/dict/web2:1.32	Tue Jun 20 18:37:46 2017
+++ src/share/dict/web2	Tue Jun 20 19:57:02 2017
@@ -68484,7 +68484,6 @@ favosite
 Favosites
 Favositidae
 favositoid
-favour
 favous
 favus
 fawn
@@ -69835,7 +69834,6 @@ finagle
 finagler
 final
 finale
-finalise
 finalism
 finalist
 finality

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

2017-06-20 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Tue Jun 20 19:13:34 UTC 2017

Modified Files:
src/sys/arch/arm/samsung: exynos_platform.c

Log Message:
Implement platform reset for exynos5


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/samsung/exynos_platform.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/samsung/exynos_platform.c
diff -u src/sys/arch/arm/samsung/exynos_platform.c:1.5 src/sys/arch/arm/samsung/exynos_platform.c:1.6
--- src/sys/arch/arm/samsung/exynos_platform.c:1.5	Sun Jun 11 16:21:41 2017
+++ src/sys/arch/arm/samsung/exynos_platform.c	Tue Jun 20 19:13:34 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_platform.c,v 1.5 2017/06/11 16:21:41 jmcneill Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.6 2017/06/20 19:13:34 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared D. McNeill 
@@ -33,7 +33,7 @@
 #include "ukbd.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.5 2017/06/11 16:21:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.6 2017/06/20 19:13:34 jmcneill Exp $");
 
 #include 
 #include 
@@ -57,6 +57,8 @@ __KERNEL_RCSID(0, "$NetBSD: exynos_platf
 
 #include 
 
+#define	EXYNOS5_SWRESET_REG	0x10040400
+
 #define	DEVMAP_ALIGN(a)	((a) & ~L1_S_OFFSET)
 #define	DEVMAP_SIZE(s)	roundup2((s), L1_S_SIZE)
 #define	DEVMAP_ENTRY(va, pa, sz)			\
@@ -124,9 +126,13 @@ exynos_platform_device_register(device_t
 }
 
 static void
-exynos_platform_reset(void)
+exynos5_platform_reset(void)
 {
-	printf("%s: not implemented\n", __func__);
+	bus_space_tag_t bst = _generic_bs_tag;
+	bus_space_handle_t bsh;
+
+	bus_space_map(bst, EXYNOS5_SWRESET_REG, 4, 0, );
+	bus_space_write_4(bst, bsh, 0, 1);
 }
 
 static void
@@ -147,7 +153,7 @@ static const struct arm_platform exynos5
 	.init_attach_args = exynos_platform_init_attach_args,
 	.early_putchar = exynos_platform_early_putchar,
 	.device_register = exynos_platform_device_register,
-	.reset = exynos_platform_reset,
+	.reset = exynos5_platform_reset,
 	.delay = exynos_platform_delay,
 	.uart_freq = exynos_platform_uart_freq,
 };

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

2017-06-20 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Tue Jun 20 19:13:34 UTC 2017

Modified Files:
src/sys/arch/arm/samsung: exynos_platform.c

Log Message:
Implement platform reset for exynos5


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

2017-06-20 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Tue Jun 20 19:03:04 UTC 2017

Modified Files:
src/sys/arch/arm/rockchip: rockchip_dwcmmc.c

Log Message:
Update for new dwc_mmc driver


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/rockchip/rockchip_dwcmmc.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/rockchip/rockchip_dwcmmc.c
diff -u src/sys/arch/arm/rockchip/rockchip_dwcmmc.c:1.5 src/sys/arch/arm/rockchip/rockchip_dwcmmc.c:1.6
--- src/sys/arch/arm/rockchip/rockchip_dwcmmc.c:1.5	Sat Jan  3 13:29:02 2015
+++ src/sys/arch/arm/rockchip/rockchip_dwcmmc.c	Tue Jun 20 19:03:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_dwcmmc.c,v 1.5 2015/01/03 13:29:02 jmcneill Exp $ */
+/* $NetBSD: rockchip_dwcmmc.c,v 1.6 2017/06/20 19:03:04 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rockchip_dwcmmc.c,v 1.5 2015/01/03 13:29:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rockchip_dwcmmc.c,v 1.6 2017/06/20 19:03:04 jmcneill Exp $");
 
 #include 
 #include 
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: rockchip_dwc
 static int	rk_dwcmmc_match(device_t, cfdata_t, void *);
 static void	rk_dwcmmc_attach(device_t, device_t, void *);
 
-static void	rk_dwcmmc_attach_i(device_t);
-
 CFATTACH_DECL_NEW(rkdwcmmc, sizeof(struct dwc_mmc_softc),
 	rk_dwcmmc_match, rk_dwcmmc_attach, NULL, NULL);
 
@@ -68,8 +66,7 @@ rk_dwcmmc_attach(device_t parent, device
 	sc->sc_dev = self;
 	sc->sc_bst = obio->obio_bst;
 	sc->sc_dmat = obio->obio_dmat;
-	sc->sc_flags = DWC_MMC_F_USE_HOLD_REG | DWC_MMC_F_PWREN_CLEAR |
-		   DWC_MMC_F_FORCE_CLK;
+	sc->sc_flags = DWC_MMC_F_USE_HOLD_REG;
 	sc->sc_clock_freq = rockchip_mmc0_get_rate();
 #if 0
 	sc->sc_clock_max = 24000;
@@ -82,6 +79,9 @@ rk_dwcmmc_attach(device_t parent, device
 	aprint_naive("\n");
 	aprint_normal(": SD/MMC controller\n");
 
+	if (dwc_mmc_init(sc) != 0)
+		return;
+
 	sc->sc_ih = intr_establish(obio->obio_intr, IPL_BIO, IST_LEVEL,
 	dwc_mmc_intr, sc);
 	if (sc->sc_ih == NULL) {
@@ -89,14 +89,4 @@ rk_dwcmmc_attach(device_t parent, device
 		obio->obio_intr);
 		return;
 	}
-
-	config_interrupts(self, rk_dwcmmc_attach_i);
-}
-
-static void
-rk_dwcmmc_attach_i(device_t self)
-{
-	struct dwc_mmc_softc *sc = device_private(self);
-
-	dwc_mmc_init(sc);
 }

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

2017-06-20 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Tue Jun 20 19:03:04 UTC 2017

Modified Files:
src/sys/arch/arm/rockchip: rockchip_dwcmmc.c

Log Message:
Update for new dwc_mmc driver


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

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

CVS commit: src/share/dict

2017-06-20 Thread Abhinav Upadhyay

Module Name:src
Committed By:   abhinav
Date:   Tue Jun 20 18:37:47 UTC 2017

Modified Files:
src/share/dict: web2

Log Message:
Add following missing words:
  admin
  alphanumeric
  checkout
  favour
  finalise
  placeholder
  spam
  spillkin
  spillover
  workload


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/share/dict/web2

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

Modified files:

Index: src/share/dict/web2
diff -u src/share/dict/web2:1.31 src/share/dict/web2:1.32
--- src/share/dict/web2:1.31	Thu Jun  8 20:12:57 2017
+++ src/share/dict/web2	Tue Jun 20 18:37:46 2017
@@ -2646,6 +2646,7 @@ admedial
 admedian
 admensuration
 admi
+admin
 adminicle
 adminicula
 adminicular
@@ -5935,6 +5936,7 @@ alphabetist
 alphabetization
 alphabetize
 alphabetizer
+alphanumeric
 Alphard
 alphatoluic
 Alphean
@@ -33958,6 +33960,7 @@ checkless
 checkman
 checkmate
 checkoff
+checkout
 checkrack
 checkrein
 checkroll
@@ -68481,6 +68484,7 @@ favosite
 Favosites
 Favositidae
 favositoid
+favour
 favous
 favus
 fawn
@@ -69831,6 +69835,7 @@ finagle
 finagler
 final
 finale
+finalise
 finalism
 finalist
 finality
@@ -147003,6 +147008,7 @@ placeable
 Placean
 placebo
 placeful
+placeholder
 placeless
 placelessly
 placemaker
@@ -184907,6 +184913,7 @@ spaller
 spalling
 spalpeen
 spalt
+spam
 span
 spancel
 spandle
@@ -185951,6 +185958,8 @@ spill
 spillage
 spiller
 spillet
+spillkin
+spillover
 spillproof
 spillway
 spilly
@@ -232542,6 +232551,7 @@ workingman
 workingwoman
 workless
 worklessness
+workload
 workloom
 workman
 workmanlike

CVS commit: src/share/dict

2017-06-20 Thread Abhinav Upadhyay

Module Name:src
Committed By:   abhinav
Date:   Tue Jun 20 18:37:47 UTC 2017

Modified Files:
src/share/dict: web2

Log Message:
Add following missing words:
  admin
  alphanumeric
  checkout
  favour
  finalise
  placeholder
  spam
  spillkin
  spillover
  workload


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/share/dict/web2

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

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 17:43:51 UTC 2017

Modified Files:
src/sys/arch/arm/samsung: exynos5410_clock.c

Log Message:
Fix a few typos in clock parent names for mmc clocks.

>From jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/samsung/exynos5410_clock.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/samsung/exynos5410_clock.c
diff -u src/sys/arch/arm/samsung/exynos5410_clock.c:1.1 src/sys/arch/arm/samsung/exynos5410_clock.c:1.2
--- src/sys/arch/arm/samsung/exynos5410_clock.c:1.1	Tue Jun 20 13:21:45 2017
+++ src/sys/arch/arm/samsung/exynos5410_clock.c	Tue Jun 20 17:43:51 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos5410_clock.c,v 1.1 2017/06/20 13:21:45 jmcneill Exp $ */
+/* $NetBSD: exynos5410_clock.c,v 1.2 2017/06/20 17:43:51 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: exynos5410_clock.c,v 1.1 2017/06/20 13:21:45 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos5410_clock.c,v 1.2 2017/06/20 17:43:51 skrll Exp $");
 
 #include 
 #include 
@@ -322,11 +322,11 @@ static struct exynos_clk exynos5410_cloc
 	CLK_DIV("dout_mmc1", "mout_mmc1", EXYNOS5410_DIV_FSYS1, __BITS(19,16)),
 	CLK_DIV("dout_mmc2", "mout_mmc2", EXYNOS5410_DIV_FSYS2, __BITS(3,0)),
 
-	CLK_DIVF("dout_mmc_pre0", "div_mmc0", EXYNOS5410_DIV_FSYS1, __BITS(15,8),
+	CLK_DIVF("dout_mmc_pre0", "dout_mmc0", EXYNOS5410_DIV_FSYS1, __BITS(15,8),
 	CLK_SET_RATE_PARENT),
-	CLK_DIVF("dout_mmc_pre1", "div_mmc1", EXYNOS5410_DIV_FSYS1, __BITS(31,24),
+	CLK_DIVF("dout_mmc_pre1", "dout_mmc1", EXYNOS5410_DIV_FSYS1, __BITS(31,24),
 	CLK_SET_RATE_PARENT),
-	CLK_DIVF("dout_mmc_pre2", "div_mmc2", EXYNOS5410_DIV_FSYS2, __BITS(15,8),
+	CLK_DIVF("dout_mmc_pre2", "dout_mmc2", EXYNOS5410_DIV_FSYS2, __BITS(15,8),
 	CLK_SET_RATE_PARENT),
 
 	CLK_DIV("div_uart0", "mout_uart0", EXYNOS5410_DIV_PERIC0, __BITS(3,0)),
@@ -347,11 +347,11 @@ static struct exynos_clk exynos5410_cloc
 	CLK_GATE("rtc", "aclk66", EXYNOS5410_GATE_IP_PERIS, __BIT(20), 0),
 	CLK_GATE("tmu", "aclk66", EXYNOS5410_GATE_IP_PERIS, __BIT(21), 0),
 
-	CLK_GATE("sclk_mmc0", "div_mmc_pre0", EXYNOS5410_SRC_MASK_FSYS,
+	CLK_GATE("sclk_mmc0", "dout_mmc_pre0", EXYNOS5410_SRC_MASK_FSYS,
 	__BIT(0), CLK_SET_RATE_PARENT),
-	CLK_GATE("sclk_mmc1", "div_mmc_pre1", EXYNOS5410_SRC_MASK_FSYS,
+	CLK_GATE("sclk_mmc1", "dout_mmc_pre1", EXYNOS5410_SRC_MASK_FSYS,
 	__BIT(4), CLK_SET_RATE_PARENT),
-	CLK_GATE("sclk_mmc2", "div_mmc_pre2", EXYNOS5410_SRC_MASK_FSYS,
+	CLK_GATE("sclk_mmc2", "dout_mmc_pre2", EXYNOS5410_SRC_MASK_FSYS,
 	__BIT(8), CLK_SET_RATE_PARENT),
 
 	CLK_GATE("mmc0", "aclk200", EXYNOS5410_GATE_BUS_FSYS0, __BIT(12), 0),

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

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 17:43:51 UTC 2017

Modified Files:
src/sys/arch/arm/samsung: exynos5410_clock.c

Log Message:
Fix a few typos in clock parent names for mmc clocks.

>From jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/samsung/exynos5410_clock.c

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

CVS commit: [netbsd-7] src/doc

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 17:10:50 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
1436


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-7.2

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

CVS commit: [netbsd-7-1] src/doc

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 17:03:17 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: CHANGES-7.1.1

Log Message:
1436


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-7.1.1

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

Modified files:

Index: src/doc/CHANGES-7.1.1
diff -u src/doc/CHANGES-7.1.1:1.1.2.10 src/doc/CHANGES-7.1.1:1.1.2.11
--- src/doc/CHANGES-7.1.1:1.1.2.10	Thu Jun 15 05:52:21 2017
+++ src/doc/CHANGES-7.1.1	Tue Jun 20 17:03:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1.1,v 1.1.2.10 2017/06/15 05:52:21 snj Exp $
+# $NetBSD: CHANGES-7.1.1,v 1.1.2.11 2017/06/20 17:03:17 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.1.1
 release:
@@ -601,3 +601,949 @@ sys/dev/ic/sti.c1.19
 	Fix size checks so they can't be circumvented by integer overflows.
 	[spz, ticket #1432]
 
+distrib/sets/lists/base/ad.aarch64		patch
+distrib/sets/lists/base/ad.arm			patch
+distrib/sets/lists/base/ad.mips			patch
+distrib/sets/lists/base/ad.powerpc		patch
+distrib/sets/lists/base/md.amd64		patch
+distrib/sets/lists/base/md.sparc64		patch
+distrib/sets/lists/base/shl.mi			patch
+distrib/sets/lists/debug/ad.aarch64		patch
+distrib/sets/lists/debug/ad.arm			patch
+distrib/sets/lists/debug/ad.mips		patch
+distrib/sets/lists/debug/ad.powerpc		patch
+distrib/sets/lists/debug/md.amd64		patch
+distrib/sets/lists/debug/md.sparc64		patch
+distrib/sets/lists/debug/shl.mi			patch
+doc/3RDPARTY	patch
+external/bsd/bind/Makefile.inc  up to 1.26 via patch
+external/bsd/bind/dist/CHANGES  up to 1.27
+external/bsd/bind/dist/FAQ.xml  up to 1.1.1.12
+external/bsd/bind/dist/Makefile.in  up to 1.4
+external/bsd/bind/dist/README   up to 1.15
+external/bsd/bind/dist/acconfig.h   up to 1.10
+external/bsd/bind/dist/bin/check/Makefile.inup to 1.1.1.10
+external/bsd/bind/dist/bin/check/named-checkconf.8 up to 1.8
+external/bsd/bind/dist/bin/check/named-checkconf.c up to 1.14
+external/bsd/bind/dist/bin/check/named-checkconf.docbook up to 1.1.1.9
+external/bsd/bind/dist/bin/check/named-checkconf.html up to 1.1.1.10
+external/bsd/bind/dist/bin/check/named-checkzone.8 up to 1.9
+external/bsd/bind/dist/bin/check/named-checkzone.docbook up to 1.1.1.11
+external/bsd/bind/dist/bin/check/named-checkzone.html up to 1.1.1.11
+external/bsd/bind/dist/bin/check/win32/checkconf.dsp.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkconf.mak.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkconf.vcxproj.in up to 1.1.1.4
+external/bsd/bind/dist/bin/check/win32/checktool.dsp.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checktool.vcxproj.in up to 1.1.1.4
+external/bsd/bind/dist/bin/check/win32/checkzone.dsp.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkzone.mak.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkzone.vcxproj.in up to 1.1.1.4
+external/bsd/bind/dist/bin/confgen/Makefile.in  up to 1.1.1.9
+external/bsd/bind/dist/bin/confgen/ddns-confgen.8 up to 1.7
+external/bsd/bind/dist/bin/confgen/ddns-confgen.docbook up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/ddns-confgen.html up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/keygen.c up to 1.8
+external/bsd/bind/dist/bin/confgen/rndc-confgen.8 up to 1.8
+external/bsd/bind/dist/bin/confgen/rndc-confgen.c up to 1.9
+external/bsd/bind/dist/bin/confgen/rndc-confgen.docbook up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/rndc-confgen.html up to 1.1.1.8
+external/bsd/bind/dist/bin/delv/Makefile.in up to 1.1.1.3
+external/bsd/bind/dist/bin/delv/delv.1  up to 1.1.1.5
+external/bsd/bind/dist/bin/delv/delv.c  up to 1.6
+external/bsd/bind/dist/bin/delv/delv.docbookup to 1.1.1.3
+external/bsd/bind/dist/bin/delv/delv.html   up to 1.1.1.4
+external/bsd/bind/dist/bin/delv/win32/delv.dsp.in up to 1.1.1.2
+external/bsd/bind/dist/bin/delv/win32/delv.mak.in up to 1.1.1.2
+external/bsd/bind/dist/bin/delv/win32/delv.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/dig/Makefile.in  up to 1.1.1.11
+external/bsd/bind/dist/bin/dig/dig.1up to 1.13
+external/bsd/bind/dist/bin/dig/dig.cup to 1.13
+external/bsd/bind/dist/bin/dig/dig.docbook  up to 1.1.1.14
+external/bsd/bind/dist/bin/dig/dig.html up to 1.1.1.14
+external/bsd/bind/dist/bin/dig/dighost.cup to 1.19
+external/bsd/bind/dist/bin/dig/host.1   up to 1.7
+external/bsd/bind/dist/bin/dig/host.c   up to 1.12
+external/bsd/bind/dist/bin/dig/host.docbook up to 1.1.1.7
+external/bsd/bind/dist/bin/dig/host.htmlup to 1.1.1.8
+external/bsd/bind/dist/bin/dig/include/dig/dig.h up to 1.13
+external/bsd/bind/dist/bin/dig/nslookup.c   up to 1.13
+external/bsd/bind/dist/bin/dig/nslookup.docbook up to 1.1.1.9

CVS commit: [netbsd-7] src/doc

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 17:10:50 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.2

Log Message:
1436


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.21 -r1.1.2.22 src/doc/CHANGES-7.2

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

Modified files:

Index: src/doc/CHANGES-7.2
diff -u src/doc/CHANGES-7.2:1.1.2.21 src/doc/CHANGES-7.2:1.1.2.22
--- src/doc/CHANGES-7.2:1.1.2.21	Thu Jun 15 05:59:39 2017
+++ src/doc/CHANGES-7.2	Tue Jun 20 17:10:50 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.2,v 1.1.2.21 2017/06/15 05:59:39 snj Exp $
+# $NetBSD: CHANGES-7.2,v 1.1.2.22 2017/06/20 17:10:50 snj Exp $
 
 A complete list of changes from the NetBSD 7.1 release to the NetBSD 7.2
 release:
@@ -1339,3 +1339,949 @@ sys/dev/ic/sti.c1.19
 	Fix size checks so they can't be circumvented by integer overflows.
 	[spz, ticket #1432]
 
+distrib/sets/lists/base/ad.aarch64		patch
+distrib/sets/lists/base/ad.arm			patch
+distrib/sets/lists/base/ad.mips			patch
+distrib/sets/lists/base/ad.powerpc		patch
+distrib/sets/lists/base/md.amd64		patch
+distrib/sets/lists/base/md.sparc64		patch
+distrib/sets/lists/base/shl.mi			patch
+distrib/sets/lists/debug/ad.aarch64		patch
+distrib/sets/lists/debug/ad.arm			patch
+distrib/sets/lists/debug/ad.mips		patch
+distrib/sets/lists/debug/ad.powerpc		patch
+distrib/sets/lists/debug/md.amd64		patch
+distrib/sets/lists/debug/md.sparc64		patch
+distrib/sets/lists/debug/shl.mi			patch
+doc/3RDPARTY	patch
+external/bsd/bind/Makefile.inc  up to 1.26 via patch
+external/bsd/bind/dist/CHANGES  up to 1.27
+external/bsd/bind/dist/FAQ.xml  up to 1.1.1.12
+external/bsd/bind/dist/Makefile.in  up to 1.4
+external/bsd/bind/dist/README   up to 1.15
+external/bsd/bind/dist/acconfig.h   up to 1.10
+external/bsd/bind/dist/bin/check/Makefile.inup to 1.1.1.10
+external/bsd/bind/dist/bin/check/named-checkconf.8 up to 1.8
+external/bsd/bind/dist/bin/check/named-checkconf.c up to 1.14
+external/bsd/bind/dist/bin/check/named-checkconf.docbook up to 1.1.1.9
+external/bsd/bind/dist/bin/check/named-checkconf.html up to 1.1.1.10
+external/bsd/bind/dist/bin/check/named-checkzone.8 up to 1.9
+external/bsd/bind/dist/bin/check/named-checkzone.docbook up to 1.1.1.11
+external/bsd/bind/dist/bin/check/named-checkzone.html up to 1.1.1.11
+external/bsd/bind/dist/bin/check/win32/checkconf.dsp.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkconf.mak.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkconf.vcxproj.in up to 1.1.1.4
+external/bsd/bind/dist/bin/check/win32/checktool.dsp.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checktool.vcxproj.in up to 1.1.1.4
+external/bsd/bind/dist/bin/check/win32/checkzone.dsp.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkzone.mak.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkzone.vcxproj.in up to 1.1.1.4
+external/bsd/bind/dist/bin/confgen/Makefile.in  up to 1.1.1.9
+external/bsd/bind/dist/bin/confgen/ddns-confgen.8 up to 1.7
+external/bsd/bind/dist/bin/confgen/ddns-confgen.docbook up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/ddns-confgen.html up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/keygen.c up to 1.8
+external/bsd/bind/dist/bin/confgen/rndc-confgen.8 up to 1.8
+external/bsd/bind/dist/bin/confgen/rndc-confgen.c up to 1.9
+external/bsd/bind/dist/bin/confgen/rndc-confgen.docbook up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/rndc-confgen.html up to 1.1.1.8
+external/bsd/bind/dist/bin/delv/Makefile.in up to 1.1.1.3
+external/bsd/bind/dist/bin/delv/delv.1  up to 1.1.1.5
+external/bsd/bind/dist/bin/delv/delv.c  up to 1.6
+external/bsd/bind/dist/bin/delv/delv.docbookup to 1.1.1.3
+external/bsd/bind/dist/bin/delv/delv.html   up to 1.1.1.4
+external/bsd/bind/dist/bin/delv/win32/delv.dsp.in up to 1.1.1.2
+external/bsd/bind/dist/bin/delv/win32/delv.mak.in up to 1.1.1.2
+external/bsd/bind/dist/bin/delv/win32/delv.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/dig/Makefile.in  up to 1.1.1.11
+external/bsd/bind/dist/bin/dig/dig.1up to 1.13
+external/bsd/bind/dist/bin/dig/dig.cup to 1.13
+external/bsd/bind/dist/bin/dig/dig.docbook  up to 1.1.1.14
+external/bsd/bind/dist/bin/dig/dig.html up to 1.1.1.14
+external/bsd/bind/dist/bin/dig/dighost.cup to 1.19
+external/bsd/bind/dist/bin/dig/host.1   up to 1.7
+external/bsd/bind/dist/bin/dig/host.c   up to 1.12
+external/bsd/bind/dist/bin/dig/host.docbook up to 1.1.1.7
+external/bsd/bind/dist/bin/dig/host.htmlup to 1.1.1.8
+external/bsd/bind/dist/bin/dig/include/dig/dig.h up to 1.13
+external/bsd/bind/dist/bin/dig/nslookup.c   up to 1.13
+external/bsd/bind/dist/bin/dig/nslookup.docbook up to 1.1.1.9
+external/bsd/bind/dist/bin/dig/nslookup.html

CVS commit: [netbsd-7-1] src/doc

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 17:03:17 UTC 2017

Modified Files:
src/doc [netbsd-7-1]: CHANGES-7.1.1

Log Message:
1436


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-7.1.1

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

CVS commit: [netbsd-7-0] src/doc

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 16:59:09 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
1436


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-7.0.3

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

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.43 src/doc/CHANGES-7.0.3:1.1.2.44
--- src/doc/CHANGES-7.0.3:1.1.2.43	Thu Jun 15 05:51:23 2017
+++ src/doc/CHANGES-7.0.3	Tue Jun 20 16:59:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.43 2017/06/15 05:51:23 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.44 2017/06/20 16:59:09 snj Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -1908,3 +1908,949 @@ sys/dev/ic/sti.c1.19
 	Fix size checks so they can't be circumvented by integer overflows.
 	[spz, ticket #1432]
 
+distrib/sets/lists/base/ad.aarch64		patch
+distrib/sets/lists/base/ad.arm			patch
+distrib/sets/lists/base/ad.mips			patch
+distrib/sets/lists/base/ad.powerpc		patch
+distrib/sets/lists/base/md.amd64		patch
+distrib/sets/lists/base/md.sparc64		patch
+distrib/sets/lists/base/shl.mi			patch
+distrib/sets/lists/debug/ad.aarch64		patch
+distrib/sets/lists/debug/ad.arm			patch
+distrib/sets/lists/debug/ad.mips		patch
+distrib/sets/lists/debug/ad.powerpc		patch
+distrib/sets/lists/debug/md.amd64		patch
+distrib/sets/lists/debug/md.sparc64		patch
+distrib/sets/lists/debug/shl.mi			patch
+doc/3RDPARTY	patch
+external/bsd/bind/Makefile.inc  up to 1.26 via patch
+external/bsd/bind/dist/CHANGES  up to 1.27
+external/bsd/bind/dist/FAQ.xml  up to 1.1.1.12
+external/bsd/bind/dist/Makefile.in  up to 1.4
+external/bsd/bind/dist/README   up to 1.15
+external/bsd/bind/dist/acconfig.h   up to 1.10
+external/bsd/bind/dist/bin/check/Makefile.inup to 1.1.1.10
+external/bsd/bind/dist/bin/check/named-checkconf.8 up to 1.8
+external/bsd/bind/dist/bin/check/named-checkconf.c up to 1.14
+external/bsd/bind/dist/bin/check/named-checkconf.docbook up to 1.1.1.9
+external/bsd/bind/dist/bin/check/named-checkconf.html up to 1.1.1.10
+external/bsd/bind/dist/bin/check/named-checkzone.8 up to 1.9
+external/bsd/bind/dist/bin/check/named-checkzone.docbook up to 1.1.1.11
+external/bsd/bind/dist/bin/check/named-checkzone.html up to 1.1.1.11
+external/bsd/bind/dist/bin/check/win32/checkconf.dsp.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkconf.mak.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkconf.vcxproj.in up to 1.1.1.4
+external/bsd/bind/dist/bin/check/win32/checktool.dsp.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checktool.vcxproj.in up to 1.1.1.4
+external/bsd/bind/dist/bin/check/win32/checkzone.dsp.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkzone.mak.in up to 1.1.1.3
+external/bsd/bind/dist/bin/check/win32/checkzone.vcxproj.in up to 1.1.1.4
+external/bsd/bind/dist/bin/confgen/Makefile.in  up to 1.1.1.9
+external/bsd/bind/dist/bin/confgen/ddns-confgen.8 up to 1.7
+external/bsd/bind/dist/bin/confgen/ddns-confgen.docbook up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/ddns-confgen.html up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/keygen.c up to 1.8
+external/bsd/bind/dist/bin/confgen/rndc-confgen.8 up to 1.8
+external/bsd/bind/dist/bin/confgen/rndc-confgen.c up to 1.9
+external/bsd/bind/dist/bin/confgen/rndc-confgen.docbook up to 1.1.1.7
+external/bsd/bind/dist/bin/confgen/rndc-confgen.html up to 1.1.1.8
+external/bsd/bind/dist/bin/delv/Makefile.in up to 1.1.1.3
+external/bsd/bind/dist/bin/delv/delv.1  up to 1.1.1.5
+external/bsd/bind/dist/bin/delv/delv.c  up to 1.6
+external/bsd/bind/dist/bin/delv/delv.docbookup to 1.1.1.3
+external/bsd/bind/dist/bin/delv/delv.html   up to 1.1.1.4
+external/bsd/bind/dist/bin/delv/win32/delv.dsp.in up to 1.1.1.2
+external/bsd/bind/dist/bin/delv/win32/delv.mak.in up to 1.1.1.2
+external/bsd/bind/dist/bin/delv/win32/delv.vcxproj.in up to 1.1.1.3
+external/bsd/bind/dist/bin/dig/Makefile.in  up to 1.1.1.11
+external/bsd/bind/dist/bin/dig/dig.1up to 1.13
+external/bsd/bind/dist/bin/dig/dig.cup to 1.13
+external/bsd/bind/dist/bin/dig/dig.docbook  up to 1.1.1.14
+external/bsd/bind/dist/bin/dig/dig.html up to 1.1.1.14
+external/bsd/bind/dist/bin/dig/dighost.cup to 1.19
+external/bsd/bind/dist/bin/dig/host.1   up to 1.7
+external/bsd/bind/dist/bin/dig/host.c   up to 1.12
+external/bsd/bind/dist/bin/dig/host.docbook up to 1.1.1.7
+external/bsd/bind/dist/bin/dig/host.htmlup to 1.1.1.8
+external/bsd/bind/dist/bin/dig/include/dig/dig.h up to 1.13
+external/bsd/bind/dist/bin/dig/nslookup.c   up to 1.13
+external/bsd/bind/dist/bin/dig/nslookup.docbook up to 1.1.1.9

CVS commit: [netbsd-7-0] src/doc

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 16:59:09 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
1436


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.43 -r1.1.2.44 src/doc/CHANGES-7.0.3

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

CVS commit: [netbsd-7-0] src/doc

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 16:58:07 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: 3RDPARTY

Log Message:
Pull up following revision(s) (requested by spz in ticket #1436):
doc/3RDPARTY: patch
Update for new BIND.


To generate a diff of this commit:
cvs rdiff -u -r1.1145.2.18.2.19 -r1.1145.2.18.2.20 src/doc/3RDPARTY

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.1145.2.18.2.19 src/doc/3RDPARTY:1.1145.2.18.2.20
--- src/doc/3RDPARTY:1.1145.2.18.2.19	Fri Apr 21 05:16:38 2017
+++ src/doc/3RDPARTY	Tue Jun 20 16:58:07 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.1145.2.18.2.19 2017/04/21 05:16:38 snj Exp $
+#	$NetBSD: 3RDPARTY,v 1.1145.2.18.2.20 2017/06/20 16:58:07 snj Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -113,8 +113,8 @@ Notes:
 bc includes dc, both of which are in the NetBSD tree.
 
 Package:	bind [named and utils]
-Version:	9.10.4-P8
-Current Vers:	9.10.4-P8
+Version:	9.10.5-P1/BSD
+Current Vers:	9.10.5-P1/BSD
 Maintainer:	Paul Vixie 
 Archive Site:	ftp://ftp.isc.org/isc/bind9/
 Home Page:	http://www.isc.org/software/bind/

CVS commit: [netbsd-7-0] src/doc

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 16:58:07 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: 3RDPARTY

Log Message:
Pull up following revision(s) (requested by spz in ticket #1436):
doc/3RDPARTY: patch
Update for new BIND.


To generate a diff of this commit:
cvs rdiff -u -r1.1145.2.18.2.19 -r1.1145.2.18.2.20 src/doc/3RDPARTY

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

CVS commit: [netbsd-7-0] src/distrib/sets/lists

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 16:53:42 UTC 2017

Modified Files:
src/distrib/sets/lists/base [netbsd-7-0]: ad.aarch64 ad.arm ad.mips
ad.powerpc md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/debug [netbsd-7-0]: ad.aarch64 ad.arm ad.mips
ad.powerpc md.amd64 md.sparc64 shl.mi

Log Message:
Apply patch (requested by spz in ticket #1436):
Adjust for new BIND.


To generate a diff of this commit:
cvs rdiff -u -r1.2.2.7.2.3 -r1.2.2.7.2.4 \
src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.54.2.10.2.3 -r1.54.2.10.2.4 \
src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.48.2.10.2.3 -r1.48.2.10.2.4 \
src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.17.2.8.2.3 -r1.17.2.8.2.4 \
src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.244.2.9.2.3 -r1.244.2.9.2.4 \
src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.232.2.9.2.3 -r1.232.2.9.2.4 \
src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.712.2.9.2.3 -r1.712.2.9.2.4 \
src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2.2.7.2.3 -r1.2.2.7.2.4 \
src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.42.2.9.2.3 -r1.42.2.9.2.4 \
src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.38.2.8.2.3 -r1.38.2.8.2.4 \
src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.18.2.8.2.3 -r1.18.2.8.2.4 \
src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.63.2.8.2.3 -r1.63.2.8.2.4 \
src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.61.2.8.2.4 -r1.61.2.8.2.5 \
src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.71.2.12.2.3 -r1.71.2.12.2.4 \
src/distrib/sets/lists/debug/shl.mi

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

CVS commit: [netbsd-7-0] src/distrib/sets/lists

2017-06-20 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Tue Jun 20 16:53:42 UTC 2017

Modified Files:
src/distrib/sets/lists/base [netbsd-7-0]: ad.aarch64 ad.arm ad.mips
ad.powerpc md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/debug [netbsd-7-0]: ad.aarch64 ad.arm ad.mips
ad.powerpc md.amd64 md.sparc64 shl.mi

Log Message:
Apply patch (requested by spz in ticket #1436):
Adjust for new BIND.


To generate a diff of this commit:
cvs rdiff -u -r1.2.2.7.2.3 -r1.2.2.7.2.4 \
src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.54.2.10.2.3 -r1.54.2.10.2.4 \
src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.48.2.10.2.3 -r1.48.2.10.2.4 \
src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.17.2.8.2.3 -r1.17.2.8.2.4 \
src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.244.2.9.2.3 -r1.244.2.9.2.4 \
src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.232.2.9.2.3 -r1.232.2.9.2.4 \
src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.712.2.9.2.3 -r1.712.2.9.2.4 \
src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.2.2.7.2.3 -r1.2.2.7.2.4 \
src/distrib/sets/lists/debug/ad.aarch64
cvs rdiff -u -r1.42.2.9.2.3 -r1.42.2.9.2.4 \
src/distrib/sets/lists/debug/ad.arm
cvs rdiff -u -r1.38.2.8.2.3 -r1.38.2.8.2.4 \
src/distrib/sets/lists/debug/ad.mips
cvs rdiff -u -r1.18.2.8.2.3 -r1.18.2.8.2.4 \
src/distrib/sets/lists/debug/ad.powerpc
cvs rdiff -u -r1.63.2.8.2.3 -r1.63.2.8.2.4 \
src/distrib/sets/lists/debug/md.amd64
cvs rdiff -u -r1.61.2.8.2.4 -r1.61.2.8.2.5 \
src/distrib/sets/lists/debug/md.sparc64
cvs rdiff -u -r1.71.2.12.2.3 -r1.71.2.12.2.4 \
src/distrib/sets/lists/debug/shl.mi

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

Modified files:

Index: src/distrib/sets/lists/base/ad.aarch64
diff -u src/distrib/sets/lists/base/ad.aarch64:1.2.2.7.2.3 src/distrib/sets/lists/base/ad.aarch64:1.2.2.7.2.4
--- src/distrib/sets/lists/base/ad.aarch64:1.2.2.7.2.3	Wed May 18 09:15:15 2016
+++ src/distrib/sets/lists/base/ad.aarch64	Tue Jun 20 16:53:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.2.2.7.2.3 2016/05/18 09:15:15 snj Exp $
+# $NetBSD: ad.aarch64,v 1.2.2.7.2.4 2017/06/20 16:53:41 snj Exp $
 ./lib/eabi	base-compat-shlib	compat
 ./lib/eabi/npf	base-npf-shlib		compat
 ./lib/eabi/npf/ext_log.so			base-npf-shlib		compat,pic
@@ -98,7 +98,7 @@
 ./usr/lib/eabi/libbfd.so.13			base-compat-shlib	compat,pic,binutils
 ./usr/lib/eabi/libbfd.so.13.0			base-compat-shlib	compat,pic,binutils
 ./usr/lib/eabi/libbind9.so.8			base-compat-shlib	compat,pic
-./usr/lib/eabi/libbind9.so.8.4			base-compat-shlib	compat,pic
+./usr/lib/eabi/libbind9.so.8.5			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libblacklist.so.0			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libblacklist.so.0.0		base-compat-shlib	compat,pic
 ./usr/lib/eabi/libbluetooth.so.4			base-compat-shlib	compat,pic
@@ -128,7 +128,7 @@
 ./usr/lib/eabi/libdm.so.0base-compat-shlib	compat,pic
 ./usr/lib/eabi/libdm.so.0.0			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libdns.so.8			base-compat-shlib	compat,pic
-./usr/lib/eabi/libdns.so.8.4			base-compat-shlib	compat,pic
+./usr/lib/eabi/libdns.so.8.5			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libdns_sd.so.0			base-compat-shlib	compat,pic,mdns
 ./usr/lib/eabi/libdns_sd.so.0.0			base-compat-shlib	compat,pic,mdns
 ./usr/lib/eabi/libdwarf.so.1			base-compat-shlib	compat,pic
@@ -174,13 +174,13 @@
 ./usr/lib/eabi/libipsec.so.3			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libipsec.so.3.0			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libirs.so.8			base-compat-shlib	compat,pic
-./usr/lib/eabi/libirs.so.8.4			base-compat-shlib	compat,pic
+./usr/lib/eabi/libirs.so.8.5			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libisc.so.8			base-compat-shlib	compat,pic
-./usr/lib/eabi/libisc.so.8.4			base-compat-shlib	compat,pic
+./usr/lib/eabi/libisc.so.8.5			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libisccc.so.8			base-compat-shlib	compat,pic
-./usr/lib/eabi/libisccc.so.8.4			base-compat-shlib	compat,pic
+./usr/lib/eabi/libisccc.so.8.5			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libisccfg.so.8			base-compat-shlib	compat,pic
-./usr/lib/eabi/libisccfg.so.8.4			base-compat-shlib	compat,pic
+./usr/lib/eabi/libisccfg.so.8.5			base-compat-shlib	compat,pic
 ./usr/lib/eabi/libiscsi.so.2			base-compat-shlib	compat,pic,iscsi
 ./usr/lib/eabi/libiscsi.so.2.0			base-compat-shlib	compat,pic,iscsi
 ./usr/lib/eabi/libisns.so.0			base-compat-shlib	compat,pic
@@ -208,7 +208,7 @@
 ./usr/lib/eabi/liblutok.so.2			base-compat-shlib	compat,pic,kyua
 ./usr/lib/eabi/liblutok.so.2.0			base-compat-shlib	compat,pic,kyua
 ./usr/lib/eabi/liblwres.so.8			base-compat-shlib	compat,pic
-./usr/lib/eabi/liblwres.so.8.4			base-compat-shlib	compat,pic
+./usr/lib/eabi/liblwres.so.8.5			base-compat-shlib	compat,pic
 ./usr/lib/eabi/liblzf.so.1			base-compat-shlib	compat,pic
 ./usr/lib/eabi/liblzf.so.1.0

CVS commit: src/usr.bin/nbperf

2017-06-20 Thread Abhinav Upadhyay

Module Name:src
Committed By:   abhinav
Date:   Tue Jun 20 15:50:05 UTC 2017

Modified Files:
src/usr.bin/nbperf: nbperf.1

Log Message:
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/nbperf/nbperf.1

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

CVS commit: src/usr.bin/nbperf

2017-06-20 Thread Abhinav Upadhyay

Module Name:src
Committed By:   abhinav
Date:   Tue Jun 20 15:50:05 UTC 2017

Modified Files:
src/usr.bin/nbperf: nbperf.1

Log Message:
Fix typo


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/nbperf/nbperf.1

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/nbperf/nbperf.1
diff -u src/usr.bin/nbperf/nbperf.1:1.6 src/usr.bin/nbperf/nbperf.1:1.7
--- src/usr.bin/nbperf/nbperf.1:1.6	Thu Jan 31 16:32:02 2013
+++ src/usr.bin/nbperf/nbperf.1	Tue Jun 20 15:50:04 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: nbperf.1,v 1.6 2013/01/31 16:32:02 joerg Exp $
+.\"	$NetBSD: nbperf.1,v 1.7 2017/06/20 15:50:04 abhinav Exp $
 .\"
 .\" Copyright (c) 2009 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -86,7 +86,7 @@ The
 must be at least 1.24, the default.
 This makes the output for
 .Ar chm3
-noticable smaller than the output for
+noticeably smaller than the output for
 .Ar chm .
 .It Sy bpz
 This results in a non-order preserving minimal perfect hash function.

CVS commit: src/etc/etc.vax

2017-06-20 Thread Felix Deichmann

Module Name:src
Committed By:   flxd
Date:   Tue Jun 20 15:10:03 UTC 2017

Modified Files:
src/etc/etc.vax: MAKEDEV.conf

Log Message:
Add audio for vsaudio(4) and speaker to be on par with other archs.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/etc/etc.vax/MAKEDEV.conf

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

Modified files:

Index: src/etc/etc.vax/MAKEDEV.conf
diff -u src/etc/etc.vax/MAKEDEV.conf:1.17 src/etc/etc.vax/MAKEDEV.conf:1.18
--- src/etc/etc.vax/MAKEDEV.conf:1.17	Sat Aug 18 00:50:37 2012
+++ src/etc/etc.vax/MAKEDEV.conf	Tue Jun 20 15:10:03 2017
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.17 2012/08/18 00:50:37 abs Exp $
+# $NetBSD: MAKEDEV.conf,v 1.18 2017/06/20 15:10:03 flxd Exp $
 
 all_md)
 	makedev mt0 mt1 ts0 ts1 st0 st1 uk0 ss0 cd0 vt0
@@ -6,6 +6,7 @@ all_md)
 	makedev dz0 dl0 dhu0 racd0 racd1 rx0 rx1
 	makedev scsibus0 scsibus1 scsibus2 scsibus3
 	makedev ses0 ses1 ses2 ses3
+	makedev audio speaker
 	makedev std_vax
 	;;

CVS commit: src/etc/etc.vax

2017-06-20 Thread Felix Deichmann

Module Name:src
Committed By:   flxd
Date:   Tue Jun 20 15:10:03 UTC 2017

Modified Files:
src/etc/etc.vax: MAKEDEV.conf

Log Message:
Add audio for vsaudio(4) and speaker to be on par with other archs.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/etc/etc.vax/MAKEDEV.conf

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

CVS commit: src/libexec/ld.elf_so/arch/vax

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 15:02:55 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/vax: mdreloc.c

Log Message:
Add back symnum, fix debug print.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/libexec/ld.elf_so/arch/vax/mdreloc.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/ld.elf_so/arch/vax/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.32 src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.33
--- src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.32	Mon Jun 19 11:57:02 2017
+++ src/libexec/ld.elf_so/arch/vax/mdreloc.c	Tue Jun 20 15:02:54 2017
@@ -1,8 +1,8 @@
-/*	$NetBSD: mdreloc.c,v 1.32 2017/06/19 11:57:02 joerg Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.33 2017/06/20 15:02:54 joerg Exp $	*/
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.32 2017/06/19 11:57:02 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.33 2017/06/20 15:02:54 joerg Exp $");
 #endif /* not lint */
 
 #include 
@@ -58,6 +58,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 	for (rela = obj->rela; rela < obj->relalim; rela++) {
 		Elf_Addr*where;
 		Elf_Addr tmp;
+		unsigned longsymnum;
 
 		where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
 
@@ -120,12 +121,11 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 
 		default:
 			rdbg(("sym = %lu, type = %lu, offset = %p, "
-			"addend = %p, contents = %p, symbol = %s",
+			"addend = %p, contents = %p",
 			(u_long)ELF_R_SYM(rela->r_info),
 			(u_long)ELF_R_TYPE(rela->r_info),
 			(void *)rela->r_offset, (void *)rela->r_addend,
-			(void *)*where,
-			obj->strtab + obj->symtab[symnum].st_name));
+			(void *)*where));
 			_rtld_error("%s: Unsupported relocation type %ld "
 			"in non-PLT relocations",
 			obj->path, (u_long) ELF_R_TYPE(rela->r_info));

CVS commit: src/libexec/ld.elf_so/arch/vax

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 15:02:55 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/vax: mdreloc.c

Log Message:
Add back symnum, fix debug print.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/libexec/ld.elf_so/arch/vax/mdreloc.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

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 13:51:54 UTC 2017

Modified Files:
src/sys/dev: auconv.h mulaw.h

Log Message:
Fix defines to proper function names.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/auconv.h
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/mulaw.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/auconv.h
diff -u src/sys/dev/auconv.h:1.17 src/sys/dev/auconv.h:1.18
--- src/sys/dev/auconv.h:1.17	Tue Jun 20 07:21:50 2017
+++ src/sys/dev/auconv.h	Tue Jun 20 13:51:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: auconv.h,v 1.17 2017/06/20 07:21:50 nat Exp $	*/
+/*	$NetBSD: auconv.h,v 1.18 2017/06/20 13:51:54 nat Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -83,8 +83,8 @@ extern stream_filter_factory_t linear8_8
 extern stream_filter_factory_t linear8_8_to_linear16;
 extern stream_filter_factory_t linear8_8_to_linear8;
 
-#define linear16_to_linear8 linear_16_16_to_linear8
-#define linear8_to_linear16 linear_8_8_to_linear16
+#define linear16_to_linear8 linear16_16_to_linear8
+#define linear8_to_linear16 linear8_8_to_linear16
 
 /* sampling rate conversion (aurateconv.c) */
 extern stream_filter_factory_t aurateconv;

Index: src/sys/dev/mulaw.h
diff -u src/sys/dev/mulaw.h:1.21 src/sys/dev/mulaw.h:1.22
--- src/sys/dev/mulaw.h:1.21	Tue Jun 20 07:21:50 2017
+++ src/sys/dev/mulaw.h	Tue Jun 20 13:51:54 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: mulaw.h,v 1.21 2017/06/20 07:21:50 nat Exp $	*/
+/*	$NetBSD: mulaw.h,v 1.22 2017/06/20 13:51:54 nat Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@ extern stream_filter_factory_t linear24_
 /* Convert 8-bit mu-law to/from 16 bit unsigned/signed linear. */
 extern stream_filter_factory_t mulaw_to_linear16;
 extern stream_filter_factory_t linear16_16_to_mulaw;
-#define linear16_to_mulaw linear_16_16_to_mulaw;
+#define linear16_to_mulaw linear16_16_to_mulaw;
 /* Convert 8-bit mu-law to/from 8 bit unsigned/signed linear. */
 extern stream_filter_factory_t mulaw_to_linear8;
 extern stream_filter_factory_t linear8_to_mulaw;
@@ -59,7 +59,7 @@ extern stream_filter_factory_t linear24_
 /* Convert 8-bit alaw to/from 16 bit unsigned/signed linear. */
 extern stream_filter_factory_t alaw_to_linear16;
 extern stream_filter_factory_t linear16_16_to_alaw;
-#define linear16_to_alaw linear_16_16_to_alaw;
+#define linear16_to_alaw linear16_16_to_alaw;
 /* Convert 8-bit A-law to/from 8 bit unsigned/signed linear. */
 extern stream_filter_factory_t alaw_to_linear8;
 extern stream_filter_factory_t linear8_to_alaw;

CVS commit: src/sys/dev

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 13:51:54 UTC 2017

Modified Files:
src/sys/dev: auconv.h mulaw.h

Log Message:
Fix defines to proper function names.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/auconv.h
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/mulaw.h

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

CVS commit: src/libexec/ld.elf_so/arch/sh3

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 13:45:20 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/sh3: mdreloc.c

Log Message:
Add last_symnum, move up def and defobj.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/libexec/ld.elf_so/arch/sh3/mdreloc.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/ld.elf_so/arch/sh3/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sh3/mdreloc.c:1.33 src/libexec/ld.elf_so/arch/sh3/mdreloc.c:1.34
--- src/libexec/ld.elf_so/arch/sh3/mdreloc.c:1.33	Mon Jun 19 11:57:02 2017
+++ src/libexec/ld.elf_so/arch/sh3/mdreloc.c	Tue Jun 20 13:45:20 2017
@@ -1,8 +1,8 @@
-/*	$NetBSD: mdreloc.c,v 1.33 2017/06/19 11:57:02 joerg Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.34 2017/06/20 13:45:20 joerg Exp $	*/
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.33 2017/06/19 11:57:02 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.34 2017/06/20 13:45:20 joerg Exp $");
 #endif /* not lint */
 
 #include 
@@ -52,11 +52,12 @@ int
 _rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
 	const Elf_Rela *rela;
+	const Elf_Sym   *def = NULL;
+	const Obj_Entry *defobj = NULL;
+	unsigned long last_symnum = ULONG_MAX;
 
 	for (rela = obj->rela; rela < obj->relalim; rela++) {
 		Elf_Addr*where;
-		const Elf_Sym   *def;
-		const Obj_Entry *defobj;
 		Elf_Addr tmp;
 		unsigned long	 symnum;

CVS commit: src/libexec/ld.elf_so/arch/sh3

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 13:45:20 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/sh3: mdreloc.c

Log Message:
Add last_symnum, move up def and defobj.


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/libexec/ld.elf_so/arch/sh3/mdreloc.c

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

CVS commit: src/libexec/ld.elf_so/arch/mips

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 13:24:03 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/mips: mips_reloc.c

Log Message:
Fix C bug. Deal with more MIPS hacks overriding def.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/libexec/ld.elf_so/arch/mips/mips_reloc.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/ld.elf_so/arch/mips/mips_reloc.c
diff -u src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.66 src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.67
--- src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.66	Mon Jun 19 11:57:01 2017
+++ src/libexec/ld.elf_so/arch/mips/mips_reloc.c	Tue Jun 20 13:24:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: mips_reloc.c,v 1.66 2017/06/19 11:57:01 joerg Exp $	*/
+/*	$NetBSD: mips_reloc.c,v 1.67 2017/06/20 13:24:03 joerg Exp $	*/
 
 /*
  * Copyright 1997 Michael L. Hitch 
@@ -30,7 +30,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: mips_reloc.c,v 1.66 2017/06/19 11:57:01 joerg Exp $");
+__RCSID("$NetBSD: mips_reloc.c,v 1.67 2017/06/20 13:24:03 joerg Exp $");
 #endif /* not lint */
 
 #include 
@@ -228,8 +228,8 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 {
 	const Elf_Rel *rel;
 	Elf_Addr *got = obj->pltgot;
-	const Elf_Sym *sym, *def;
-	const Obj_Entry *defobj;
+	const Elf_Sym *sym, *def = NULL;
+	const Obj_Entry *defobj = NULL;
 	unsigned long last_symnum = ULONG_MAX;
 	Elf_Word i;
 #ifdef SUPPORT_OLD_BROKEN_LD
@@ -329,7 +329,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 		case R_TYPE(TLS_DTPREL32):
 		case R_TYPE(TLS_TPREL32):
 #endif
-			symnum = ELF_R_SYM(rela->r_info);
+			symnum = ELF_R_SYM(rel->r_info);
 			if (last_symnum != symnum) {
 last_symnum = symnum;
 def = _rtld_find_symdef(symnum, obj, ,
@@ -348,6 +348,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 
 		case R_TYPE(REL32): {
 			/* 32-bit PC-relative reference */
+			const Elf_Sym *def2;
 			const size_t rlen =
 			ELF_R_NXTTYPE_64_P(r_type)
 ? sizeof(Elf_Sxword)
@@ -355,13 +356,14 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 			Elf_Sxword old = load_ptr(where, rlen);
 			Elf_Sxword val = old;
 
-			def = obj->symtab + r_symndx;
+			def2 = obj->symtab + ELF_R_SYM(rel->r_info);
 
-			if (r_symndx >= obj->gotsym) {
-val += got[obj->local_gotno + r_symndx - obj->gotsym];
+			if (ELF_R_SYM(rel->r_info) >= obj->gotsym) {
+val += got[obj->local_gotno +
+ELF_R_SYM(rel->r_info) - obj->gotsym];
 rdbg(("REL32/G(%p) %p --> %p (%s) in %s",
 where, (void *)old, (void *)val,
-obj->strtab + def->st_name,
+obj->strtab + def2->st_name,
 obj->path));
 			} else {
 /*
@@ -380,7 +382,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
  * --rkb, Oct 6, 2001
  */
 
-if (def->st_info ==
+if (def2->st_info ==
 ELF_ST_INFO(STB_LOCAL, STT_SECTION)
 #ifdef SUPPORT_OLD_BROKEN_LD
 && !broken
@@ -392,7 +394,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 
 rdbg(("REL32/L(%p) %p -> %p (%s) in %s",
 where, (void *)old, (void *)val,
-obj->strtab + def->st_name, obj->path));
+obj->strtab + def2->st_name, obj->path));
 			}
 			store_ptr(where, val, rlen);
 			break;

CVS commit: src/libexec/ld.elf_so/arch/mips

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 13:24:03 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/mips: mips_reloc.c

Log Message:
Fix C bug. Deal with more MIPS hacks overriding def.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/libexec/ld.elf_so/arch/mips/mips_reloc.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

2017-06-20 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Tue Jun 20 13:21:45 UTC 2017

Modified Files:
src/sys/arch/arm/samsung: files.exynos
src/sys/arch/evbarm/conf: EXYNOS
Added Files:
src/sys/arch/arm/samsung: exynos5410_clock.c

Log Message:
Add Exynos 5410 clock controller driver.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/samsung/exynos5410_clock.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/EXYNOS

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/samsung/files.exynos
diff -u src/sys/arch/arm/samsung/files.exynos:1.23 src/sys/arch/arm/samsung/files.exynos:1.24
--- src/sys/arch/arm/samsung/files.exynos:1.23	Sun Jun 11 16:21:41 2017
+++ src/sys/arch/arm/samsung/files.exynos	Tue Jun 20 13:21:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: files.exynos,v 1.23 2017/06/11 16:21:41 jmcneill Exp $
+#	$NetBSD: files.exynos,v 1.24 2017/06/20 13:21:45 jmcneill Exp $
 #
 # Configuration info for Samsung Exynos SoC ARM Peripherals
 #
@@ -120,3 +120,7 @@ file	arch/arm/samsung/exynos_i2c.c		exyn
 device	exy5422clk: clk
 attach	exy5422clk at fdt with exynos5422_clock
 file	arch/arm/samsung/exynos5422_clock.c	exynos5422_clock
+
+device	exy5410clk: clk
+attach	exy5410clk at fdt with exynos5410_clock
+file	arch/arm/samsung/exynos5410_clock.c	exynos5410_clock

Index: src/sys/arch/evbarm/conf/EXYNOS
diff -u src/sys/arch/evbarm/conf/EXYNOS:1.20 src/sys/arch/evbarm/conf/EXYNOS:1.21
--- src/sys/arch/evbarm/conf/EXYNOS:1.20	Tue Jun 20 10:37:01 2017
+++ src/sys/arch/evbarm/conf/EXYNOS	Tue Jun 20 13:21:45 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: EXYNOS,v 1.20 2017/06/20 10:37:01 skrll Exp $
+#	$NetBSD: EXYNOS,v 1.21 2017/06/20 13:21:45 jmcneill Exp $
 #
 #	Samsung Exynos SoC kernel
 #
@@ -57,6 +57,7 @@ gic*		at fdt? pass 1		# GIC
 armgic0		at gic?
 
 # Clock controller
+exy5410clk*	at fdt? pass 3		# Exynos5410 clock controller
 exy5422clk*	at fdt? pass 3		# Exynos5422 clock controller
 
 # GPIO controller

Added files:

Index: src/sys/arch/arm/samsung/exynos5410_clock.c
diff -u /dev/null src/sys/arch/arm/samsung/exynos5410_clock.c:1.1
--- /dev/null	Tue Jun 20 13:21:45 2017
+++ src/sys/arch/arm/samsung/exynos5410_clock.c	Tue Jun 20 13:21:45 2017
@@ -0,0 +1,864 @@
+/* $NetBSD: exynos5410_clock.c,v 1.1 2017/06/20 13:21:45 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015-2017 Jared McNeill 
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include 
+__KERNEL_RCSID(0, "$NetBSD: exynos5410_clock.c,v 1.1 2017/06/20 13:21:45 jmcneill Exp $");
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+
+static struct clk *exynos5410_clock_decode(device_t, const void *, size_t);
+
+static const struct fdtbus_clock_controller_func exynos5410_car_fdtclock_funcs = {
+	.decode = exynos5410_clock_decode
+};
+
+/* DT clock ID to clock name mappings */
+static struct exynos5410_clock_id {
+	u_int		id;
+	const char	*name;
+} exynos5410_clock_ids[] = {
+/* core clocks */
+{ 1, "fin_pll" },
+{ 2, "fout_apll" },
+{ 3, "fout_cpll" },
+{ 4, "fout_dpll" },
+{ 5, "fout_mpll" },
+{ 6, "fout_kpll" },
+{ 7, "fout_epll" },
+
+/* gate for special clocks (sclk) */
+{ 128, "sclk_uart0" },
+{ 129, "sclk_uart1" },
+{ 130, "sclk_uart2" },
+{ 131, "sclk_uart3" },
+{ 132, "sclk_mmc0" },
+{ 133, "sclk_mmc1" },
+{ 134, "sclk_mmc2" },
+{ 150, "sclk_usbd300" },
+{ 151, "sclk_usbd301" },
+{ 152, "sclk_usbphy300" },
+{ 153,

CVS commit: src/sys/arch

2017-06-20 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Tue Jun 20 13:21:45 UTC 2017

Modified Files:
src/sys/arch/arm/samsung: files.exynos
src/sys/arch/evbarm/conf: EXYNOS
Added Files:
src/sys/arch/arm/samsung: exynos5410_clock.c

Log Message:
Add Exynos 5410 clock controller driver.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/samsung/exynos5410_clock.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/EXYNOS

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

CVS commit: src/libexec/ld.elf_so/arch/arm

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 12:41:49 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/arm: mdreloc.c

Log Message:
Expand symnum, GCC's uninitialized used tracking is too imprecise.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/libexec/ld.elf_so/arch/arm/mdreloc.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/ld.elf_so/arch/arm/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.40 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.41
--- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.40	Tue Jun 20 11:01:18 2017
+++ src/libexec/ld.elf_so/arch/arm/mdreloc.c	Tue Jun 20 12:41:49 2017
@@ -1,8 +1,8 @@
-/*	$NetBSD: mdreloc.c,v 1.40 2017/06/20 11:01:18 joerg Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.41 2017/06/20 12:41:49 joerg Exp $	*/
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.40 2017/06/20 11:01:18 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.41 2017/06/20 12:41:49 joerg Exp $");
 #endif /* not lint */
 
 #include 
@@ -128,15 +128,17 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 "%s: R_ARM_PC24 relocation @ %p to %s failed "
 "(displacement %ld (%#lx) out of range)",
 obj->path, where,
-obj->strtab + obj->symtab[symnum].st_name,
+obj->strtab + obj->symtab[
+ELF_R_SYM(rel->r_info)].st_name,
 (long) tmp, (long) tmp);
 return -1;
 			}
 			tmp >>= 2;
 			*where = (*where & 0xff00) | (tmp & 0x00ff);
 			rdbg(("PC24 %s in %s --> %p @ %p in %s",
-			obj->strtab + obj->symtab[symnum].st_name,
-			obj->path, (void *)*where, where, defobj->path));
+			obj->strtab + obj->symtab[ELF_R_SYM(rel->r_info)]
+			.st_name, obj->path, (void *)*where, where,
+			defobj->path));
 			break;
 		}
 #endif
@@ -160,8 +162,9 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 store_ptr(where, tmp);
 			}
 			rdbg(("ABS32/GLOB_DAT %s in %s --> %p @ %p in %s",
-			obj->strtab + obj->symtab[symnum].st_name,
-			obj->path, (void *)tmp, where, defobj->path));
+			obj->strtab + obj->symtab[ELF_R_SYM(rel->r_info)]
+			.st_name, obj->path, (void *)tmp, where,
+			defobj->path));
 			break;
 
 		case R_TYPE(RELATIVE):	/* word32 B + A */
@@ -201,8 +204,8 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 store_ptr(where, tmp);
 
 			rdbg(("TLS_DTPOFF32 %s in %s --> %p",
-			obj->strtab + obj->symtab[symnum].st_name,
-			obj->path, (void *)tmp));
+			obj->strtab + obj->symtab[ELF_R_SYM(rel->r_info)]
+			.st_name, obj->path, (void *)tmp));
 
 			break;
 		case R_TYPE(TLS_DTPMOD32):
@@ -213,8 +216,8 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 store_ptr(where, tmp);
 
 			rdbg(("TLS_DTPMOD32 %s in %s --> %p",
-			obj->strtab + obj->symtab[symnum].st_name,
-			obj->path, (void *)tmp));
+			obj->strtab + obj->symtab[ELF_R_SYM(rel->r_info)]
+			.st_name, obj->path, (void *)tmp));
 
 			break;
 
@@ -230,8 +233,8 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 			else
 store_ptr(where, tmp);
 			rdbg(("TLS_TPOFF32 %s in %s --> %p",
-			obj->strtab + obj->symtab[symnum].st_name,
-			obj->path, (void *)tmp));
+			obj->strtab + obj->symtab[ELF_R_SYM(rel->r_info)]
+			.st_name, obj->path, (void *)tmp));
 			break;
 
 		default:

CVS commit: src/libexec/ld.elf_so/arch/arm

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 12:41:49 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/arm: mdreloc.c

Log Message:
Expand symnum, GCC's uninitialized used tracking is too imprecise.


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/libexec/ld.elf_so/arch/arm/mdreloc.c

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

CVS commit: src/libexec/ld.elf_so/arch/arm

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 11:01:18 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/arm: mdreloc.c

Log Message:
Drop symbol number from default branch diagnostic, it isn't set at this
point and most likely not valid either.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/libexec/ld.elf_so/arch/arm/mdreloc.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/ld.elf_so/arch/arm/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.39 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.40
--- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.39	Mon Jun 19 11:57:01 2017
+++ src/libexec/ld.elf_so/arch/arm/mdreloc.c	Tue Jun 20 11:01:18 2017
@@ -1,8 +1,8 @@
-/*	$NetBSD: mdreloc.c,v 1.39 2017/06/19 11:57:01 joerg Exp $	*/
+/*	$NetBSD: mdreloc.c,v 1.40 2017/06/20 11:01:18 joerg Exp $	*/
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.39 2017/06/19 11:57:01 joerg Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.40 2017/06/20 11:01:18 joerg Exp $");
 #endif /* not lint */
 
 #include 
@@ -236,11 +236,10 @@ _rtld_relocate_nonplt_objects(Obj_Entry 
 
 		default:
 			rdbg(("sym = %lu, type = %lu, offset = %p, "
-			"contents = %p, symbol = %s",
+			"contents = %p",
 			(u_long)ELF_R_SYM(rel->r_info),
 			(u_long)ELF_R_TYPE(rel->r_info),
-			(void *)rel->r_offset, (void *)load_ptr(where),
-			obj->strtab + obj->symtab[symnum].st_name));
+			(void *)rel->r_offset, (void *)load_ptr(where)));
 			_rtld_error("%s: Unsupported relocation type %ld "
 			"in non-PLT relocations",
 			obj->path, (u_long) ELF_R_TYPE(rel->r_info));

CVS commit: src/libexec/ld.elf_so/arch/arm

2017-06-20 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Tue Jun 20 11:01:18 UTC 2017

Modified Files:
src/libexec/ld.elf_so/arch/arm: mdreloc.c

Log Message:
Drop symbol number from default branch diagnostic, it isn't set at this
point and most likely not valid either.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/libexec/ld.elf_so/arch/arm/mdreloc.c

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

CVS commit: src/etc/etc.evbarm

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 10:55:03 UTC 2017

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Replace ALLWINNER_A80 (it's never really worked) with VEXPRESS_A15.

Idea from jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/etc/etc.evbarm/Makefile.inc

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

CVS commit: src/etc/etc.evbarm

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 10:55:03 UTC 2017

Modified Files:
src/etc/etc.evbarm: Makefile.inc

Log Message:
Replace ALLWINNER_A80 (it's never really worked) with VEXPRESS_A15.

Idea from jmcneill@


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 src/etc/etc.evbarm/Makefile.inc

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

Modified files:

Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.82 src/etc/etc.evbarm/Makefile.inc:1.83
--- src/etc/etc.evbarm/Makefile.inc:1.82	Fri Jun  9 18:14:59 2017
+++ src/etc/etc.evbarm/Makefile.inc	Tue Jun 20 10:55:03 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.82 2017/06/09 18:14:59 ryo Exp $
+#	$NetBSD: Makefile.inc,v 1.83 2017/06/20 10:55:03 skrll Exp $
 #
 #	etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
 #
@@ -18,8 +18,8 @@ IMAGEENDIAN=	be
 KERNEL_SETS.armv4+=		IXM1200
 EVBARM_BOARDS.xscale+=		ADI_BRH
 KERNEL_SETS.xscale+=		NSLU2
-EVBARM_BOARDS.armv7+=		ALLWINNER_A80
-EVBARM_BOARDS.armv7hf+=		ALLWINNER_A80
+EVBARM_BOARDS.armv7+=		VEXPRESS_A15
+EVBARM_BOARDS.armv7hf+=		VEXPRESS_A15
 EVBARM_BOARDS.armv7+=		BCM5301X
 EVBARM_BOARDS.armv7hf+=		BCM5301X
 #EVBARM_BOARDS.armv7+=		BCM56340
@@ -78,8 +78,8 @@ KERNEL_SETS.armv6hf+=	 	RPI2
 EVBARM_BOARDS.armv6+=		TISDP2420
 EVBARM_BOARDS.armv6hf+= 	TISDP2420
 #EVBARM_BOARDS.armv6+=		TISDP2430
-EVBARM_BOARDS.armv7+=		ALLWINNER_A80
-EVBARM_BOARDS.armv7hf+=		ALLWINNER_A80
+EVBARM_BOARDS.armv7+=		VEXPRESS_A15
+EVBARM_BOARDS.armv7hf+=		VEXPRESS_A15
 EVBARM_BOARDS.armv7+=		ARMADAXP
 EVBARM_BOARDS.armv7hf+=		ARMADAXP
 EVBARM_BOARDS.armv7+=		BCM5301X

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

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 10:37:01 UTC 2017

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

Log Message:
Add exynos5410-odroidxu.dts to DTS list


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/EXYNOS

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

2017-06-20 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Tue Jun 20 10:37:01 UTC 2017

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

Log Message:
Add exynos5410-odroidxu.dts to DTS list


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/EXYNOS

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/EXYNOS
diff -u src/sys/arch/evbarm/conf/EXYNOS:1.19 src/sys/arch/evbarm/conf/EXYNOS:1.20
--- src/sys/arch/evbarm/conf/EXYNOS:1.19	Mon Jun 19 22:01:18 2017
+++ src/sys/arch/evbarm/conf/EXYNOS	Tue Jun 20 10:37:01 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: EXYNOS,v 1.19 2017/06/19 22:01:18 jmcneill Exp $
+#	$NetBSD: EXYNOS,v 1.20 2017/06/20 10:37:01 skrll Exp $
 #
 #	Samsung Exynos SoC kernel
 #
@@ -8,6 +8,7 @@ include	"arch/evbarm/conf/std.exynos"
 include	"arch/evbarm/conf/GENERIC.common"
 
 makeoptions 	DTS="
+	exynos5410-odroidxu.dts
 	exynos5422-odroidxu3-lite.dts
 	exynos5422-odroidxu3.dts
 	exynos5422-odroidxu4.dts

CVS commit: src/sys/dev/pci

2017-06-20 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Tue Jun 20 10:10:36 UTC 2017

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

Log Message:
- Add debug printf()s.
- If a legacy interrupt is a spurious interrupt, don't print debug message.
- Add comment.


To generate a diff of this commit:
cvs rdiff -u -r1.510 -r1.511 src/sys/dev/pci/if_wm.c

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

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.510 src/sys/dev/pci/if_wm.c:1.511
--- src/sys/dev/pci/if_wm.c:1.510	Mon Jun 19 10:59:01 2017
+++ src/sys/dev/pci/if_wm.c	Tue Jun 20 10:10:36 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.510 2017/06/19 10:59:01 msaitoh Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.511 2017/06/20 10:10:36 msaitoh Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.510 2017/06/19 10:59:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.511 2017/06/20 10:10:36 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -2990,6 +2990,9 @@ wm_ifflags_cb(struct ethercom *ec)
 	struct wm_softc *sc = ifp->if_softc;
 	int rc = 0;
 
+	DPRINTF(WM_DEBUG_INIT, ("%s: %s called\n",
+		device_xname(sc->sc_dev), __func__));
+
 	WM_CORE_LOCK(sc);
 
 	int change = ifp->if_flags ^ sc->sc_if_flags;
@@ -4069,6 +4072,9 @@ wm_reset(struct wm_softc *sc)
 break;
 			delay(100);
 		}
+		if (timeout == 0)
+			device_printf(sc->sc_dev,
+			"failed to disable busmastering\n");
 	}
 
 	/* Set the completion timeout for interface */
@@ -8469,12 +8475,14 @@ wm_intr_legacy(void *arg)
 	uint32_t icr, rndval = 0;
 	int handled = 0;
 
-	DPRINTF(WM_DEBUG_TX,
-	("%s: INTx: got intr\n", device_xname(sc->sc_dev)));
 	while (1 /* CONSTCOND */) {
 		icr = CSR_READ(sc, WMREG_ICR);
 		if ((icr & sc->sc_icr) == 0)
 			break;
+		if (handled == 0) {
+			DPRINTF(WM_DEBUG_TX,
+			("%s: INTx: got intr\n", device_xname(sc->sc_dev)));
+		}
 		if (rndval == 0)
 			rndval = icr;
 
@@ -13774,6 +13782,7 @@ wm_platform_pm_pch_lpt(struct wm_softc *
 		}
 		lat_enc = (uint16_t)(__SHIFTIN(scale, LTRV_SCALE) | value);
 
+		/* Determine the maximum latency tolerated by the platform */
 		preg = pci_conf_read(sc->sc_pc, sc->sc_pcitag,
 		WM_PCI_LTR_CAP_LPT);
 		max_snoop = preg & 0x;

CVS commit: src/sys/dev/pci

2017-06-20 Thread SAITOH Masanobu

Module Name:src
Committed By:   msaitoh
Date:   Tue Jun 20 10:10:36 UTC 2017

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

Log Message:
- Add debug printf()s.
- If a legacy interrupt is a spurious interrupt, don't print debug message.
- Add comment.


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

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 08:33:11 UTC 2017

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

Log Message:
Allow for bigger data types to mix into to avoid overflow.


To generate a diff of this commit:
cvs rdiff -u -r1.360 -r1.361 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.360 src/sys/dev/audio.c:1.361
--- src/sys/dev/audio.c:1.360	Tue Jun 20 07:45:01 2017
+++ src/sys/dev/audio.c	Tue Jun 20 08:33:11 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.360 2017/06/20 07:45:01 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.361 2017/06/20 08:33:11 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.360 2017/06/20 07:45:01 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.361 2017/06/20 08:33:11 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -5608,8 +5608,8 @@ done:
 	return error;
 }
 
-#define DEF_MIX_FUNC(name, type, MINVAL, MAXVAL)		\
-	static void		\
+#define DEF_MIX_FUNC(name, type, bigger_type, MINVAL, MAXVAL)		\
+	static void			\
 	mix_func##name(struct audio_softc *sc, struct audio_ringbuffer *cb, \
 		  struct virtual_channel *vc)\
 	{\
@@ -5633,9 +5633,9 @@ done:
 			if (cc > cc2)	\
 cc = cc2;\
 	\
-			for (m = 0; m < (cc / (name / 8)); m++) {	\
-tomix[m] = tomix[m] *			\
-(int32_t)(vc->sc_swvol) / 255;	\
+			for (m = 0; m < (cc / (name / NBBY)); m++) {	\
+tomix[m] = (bigger_type)tomix[m] *	\
+(bigger_type)(vc->sc_swvol) / 255;	\
 result = orig[m] + tomix[m];		\
 product = orig[m] * tomix[m];		\
 if (orig[m] > 0 && tomix[m] > 0)	\
@@ -5654,9 +5654,9 @@ done:
 		}			\
 	}\
 
-DEF_MIX_FUNC(8, int8_t, INT8_MIN, INT8_MAX);
-DEF_MIX_FUNC(16, int16_t, INT16_MIN, INT16_MAX);
-DEF_MIX_FUNC(32, int32_t, INT32_MIN, INT32_MAX);
+DEF_MIX_FUNC(8, int8_t, int32_t, INT8_MIN, INT8_MAX);
+DEF_MIX_FUNC(16, int16_t, int32_t, INT16_MIN, INT16_MAX);
+DEF_MIX_FUNC(32, int32_t, int64_t, INT32_MIN, INT32_MAX);
 
 void
 mix_func(struct audio_softc *sc, struct audio_ringbuffer *cb,

CVS commit: src/sys/dev

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 08:33:11 UTC 2017

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

Log Message:
Allow for bigger data types to mix into to avoid overflow.


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

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 07:45:01 UTC 2017

Modified Files:
src/sys/dev: audio.c audiovar.h

Log Message:
sc_iffreq -> sc_frequency.  NFCI.

Ok christos@.


To generate a diff of this commit:
cvs rdiff -u -r1.359 -r1.360 src/sys/dev/audio.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/audiovar.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/audio.c
diff -u src/sys/dev/audio.c:1.359 src/sys/dev/audio.c:1.360
--- src/sys/dev/audio.c:1.359	Tue Jun 20 07:42:31 2017
+++ src/sys/dev/audio.c	Tue Jun 20 07:45:01 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.359 2017/06/20 07:42:31 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.360 2017/06/20 07:45:01 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.359 2017/06/20 07:42:31 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.360 2017/06/20 07:45:01 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -535,7 +535,7 @@ audioattach(device_t parent, device_t se
 	vc->sc_lastinfovalid = false;
 	vc->sc_swvol = 255;
 	vc->sc_recswvol = 255;
-	sc->sc_iffreq = 44100;
+	sc->sc_frequency = 44100;
 	sc->sc_precision = 16;
 	sc->sc_channels = 2;
 
@@ -4149,7 +4149,7 @@ audio_set_vchan_defaults(struct audio_so
 		return EINVAL;
 	vc = chan->vc;
 
-	sc->sc_vchan_params.sample_rate = sc->sc_iffreq;
+	sc->sc_vchan_params.sample_rate = sc->sc_frequency;
 #if BYTE_ORDER == LITTLE_ENDIAN
 	sc->sc_vchan_params.encoding = AUDIO_ENCODING_SLINEAR_LE;
 #else
@@ -4165,12 +4165,12 @@ audio_set_vchan_defaults(struct audio_so
 	vc->sc_blkset = false;
 
 	AUDIO_INITINFO();
-	ai.record.sample_rate = sc->sc_iffreq;
+	ai.record.sample_rate = sc->sc_frequency;
 	ai.record.encoding= format->encoding;
 	ai.record.channels= sc->sc_channels;
 	ai.record.precision   = sc->sc_precision;
 	ai.record.pause	  = false;
-	ai.play.sample_rate   = sc->sc_iffreq;
+	ai.play.sample_rate   = sc->sc_frequency;
 	ai.play.encoding  = format->encoding;
 	ai.play.channels  = sc->sc_channels;
 	ai.play.precision = sc->sc_precision;
@@ -4180,7 +4180,7 @@ audio_set_vchan_defaults(struct audio_so
 	sc->sc_format->channels = sc->sc_channels;
 	sc->sc_format->precision = sc->sc_precision;
 	sc->sc_format->validbits = sc->sc_precision;
-	sc->sc_format->frequency[0] = sc->sc_iffreq;
+	sc->sc_format->frequency[0] = sc->sc_frequency;
 
 	auconv_delete_encodings(sc->sc_encodings);
 	error = auconv_create_encodings(sc->sc_format, VAUDIO_NFORMATS,
@@ -5941,7 +5941,7 @@ audio_sysctl_frequency(SYSCTLFN_ARGS)
 	node = *rnode;
 	sc = node.sysctl_data;
 
-	t = sc->sc_iffreq;
+	t = sc->sc_frequency;
 	node.sysctl_data = 
 	error = sysctl_lookup(SYSCTLFN_CALL());
 	if (error || newp == NULL)
@@ -5960,7 +5960,7 @@ audio_sysctl_frequency(SYSCTLFN_ARGS)
 		return EINVAL;
 	}
 
-	sc->sc_iffreq = t;
+	sc->sc_frequency = t;
 	error = audio_set_vchan_defaults(sc, AUMODE_PLAY | AUMODE_PLAY_ALL
 	| AUMODE_RECORD, >sc_format[0]);
 	if (error)
@@ -6082,13 +6082,13 @@ vchan_autoconfig(struct audio_softc *sc)
 		for (j = 0; j < __arraycount(auto_config_channels); j++) {
 			sc->sc_channels = auto_config_channels[j];
 			for (k = 0; k < __arraycount(auto_config_freq); k++) {
-sc->sc_iffreq = auto_config_freq[k];
+sc->sc_frequency = auto_config_freq[k];
 error = audio_set_vchan_defaults(sc,
 AUMODE_PLAY | AUMODE_PLAY_ALL |
 AUMODE_RECORD, >sc_format[0]);
 if (vc->sc_npfilters > 0 &&
 (vc->sc_mpr.s.param.
-	sample_rate != sc->sc_iffreq ||
+	sample_rate != sc->sc_frequency ||
 vc->sc_mpr.s.param.
 	 channels != sc->sc_channels))
 	error = EINVAL;
@@ -6099,7 +6099,7 @@ vchan_autoconfig(struct audio_softc *sc)
 	"Format SLINEAR, precision %d, "
 	"channels %d, frequency %d\n",
 	sc->sc_precision, sc->sc_channels,
-	sc->sc_iffreq);
+	sc->sc_frequency);
 	mutex_exit(sc->sc_lock);
 
 	return 0;

Index: src/sys/dev/audiovar.h
diff -u src/sys/dev/audiovar.h:1.55 src/sys/dev/audiovar.h:1.56
--- src/sys/dev/audiovar.h:1.55	Sun May  7 08:19:39 2017
+++ src/sys/dev/audiovar.h	Tue Jun 20 07:45:01 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audiovar.h,v 1.55 2017/05/07 08:19:39 nat Exp $	*/
+/*	$NetBSD: audiovar.h,v 1.56 2017/06/20 07:45:01 nat Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -291,7 +291,7 @@ struct audio_softc {
 	struct sysctllog	*sc_log;	/* sysctl log */
 	int		sc_channels;
 	int		sc_precision;
-	int		sc_iffreq;
+	int		sc_frequency;
 	struct audio_info 	sc_ai;		/* Recent info for  dev sound */
 	bool			sc_aivalid;
 #define VAUDIO_NFORMATS	1

CVS commit: src/sys/dev

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 07:45:01 UTC 2017

Modified Files:
src/sys/dev: audio.c audiovar.h

Log Message:
sc_iffreq -> sc_frequency.  NFCI.

Ok christos@.


To generate a diff of this commit:
cvs rdiff -u -r1.359 -r1.360 src/sys/dev/audio.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/audiovar.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

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 07:42:32 UTC 2017

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

Log Message:
No need to reset the audioinfo whem dealing with the hardware ring.  This
avoids a panic with some audio devices.

Ok christos@.


To generate a diff of this commit:
cvs rdiff -u -r1.358 -r1.359 src/sys/dev/audio.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/audio.c
diff -u src/sys/dev/audio.c:1.358 src/sys/dev/audio.c:1.359
--- src/sys/dev/audio.c:1.358	Thu Jun  8 13:05:03 2017
+++ src/sys/dev/audio.c	Tue Jun 20 07:42:31 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.358 2017/06/08 13:05:03 nat Exp $	*/
+/*	$NetBSD: audio.c,v 1.359 2017/06/20 07:42:31 nat Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.358 2017/06/08 13:05:03 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.359 2017/06/20 07:42:31 nat Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -4187,7 +4187,7 @@ audio_set_vchan_defaults(struct audio_so
 	>sc_encodings);
 
 	if (error == 0)
-		error = audiosetinfo(sc, , true, vc);
+		error = audiosetinfo(sc, , false, vc);
 
 	return error;
 }

CVS commit: src/sys/dev

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 07:42:32 UTC 2017

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

Log Message:
No need to reset the audioinfo whem dealing with the hardware ring.  This
avoids a panic with some audio devices.

Ok christos@.


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

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 07:21:50 UTC 2017

Modified Files:
src/sys/dev: auconv.c auconv.h mulaw.c mulaw.h

Log Message:
Add support for more formats.  At present 24 bit formats do not work and
have been disabled.

Ok christos@.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/auconv.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/auconv.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mulaw.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mulaw.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

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 07:21:50 UTC 2017

Modified Files:
src/sys/dev: auconv.c auconv.h mulaw.c mulaw.h

Log Message:
Add support for more formats.  At present 24 bit formats do not work and
have been disabled.

Ok christos@.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/auconv.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/auconv.h
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/mulaw.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/mulaw.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/auconv.c
diff -u src/sys/dev/auconv.c:1.26 src/sys/dev/auconv.c:1.27
--- src/sys/dev/auconv.c:1.26	Thu Jun  1 09:44:30 2017
+++ src/sys/dev/auconv.c	Tue Jun 20 07:21:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: auconv.c,v 1.26 2017/06/01 09:44:30 pgoyette Exp $	*/
+/*	$NetBSD: auconv.c,v 1.27 2017/06/20 07:21:50 nat Exp $	*/
 
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.26 2017/06/01 09:44:30 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auconv.c,v 1.27 2017/06/20 07:21:50 nat Exp $");
 
 #include 
 #include 
@@ -113,86 +113,216 @@ struct conv_table {
 	stream_filter_factory_t *play_conv;
 	stream_filter_factory_t *rec_conv;
 };
+#define TABLE_LIST(prec, valid, target) \
+	{AUDIO_ENCODING_SLINEAR_LE, prec, valid,			\
+	 linear##target##_##target##_to_linear##prec,			\
+		linear##prec##_##valid##_to_linear##target},		\
+	{AUDIO_ENCODING_SLINEAR_BE, prec, valid,			\
+	 linear##target##_##target##_to_linear##prec,			\
+		linear##prec##_##valid##_to_linear##target},		\
+	{AUDIO_ENCODING_ULINEAR_LE, prec, valid,			\
+	 linear##target##_##target##_to_linear##prec,			\
+		linear##prec##_##valid##_to_linear##target},		\
+	{AUDIO_ENCODING_ULINEAR_BE, prec, valid,			\
+	 linear##target##_##target##_to_linear##prec,			\
+		linear##prec##_##valid##_to_linear##target},
+#if NMULAW > 0
+#define MULAW_TABLE(prec, valid, target) \
+	{AUDIO_ENCODING_ULAW, 8, 8,	\
+	 linear##prec##_##valid##_to_mulaw,\
+	 mulaw_to_linear##target},	\
+	{AUDIO_ENCODING_ALAW, 8, 8,	\
+	 linear##prec##_##valid##_to_alaw,\
+	 alaw_to_linear##target},
+#endif
 /*
  * SLINEAR-16 or SLINEAR-24 should precede in a table because
  * aurateconv supports only SLINEAR.
  */
 static const struct conv_table s8_table[] = {
-	{AUDIO_ENCODING_SLINEAR_LE, 16, 16,
-	 linear8_to_linear16, linear16_to_linear8},
-	{AUDIO_ENCODING_SLINEAR_BE, 16, 16,
-	 linear8_to_linear16, linear16_to_linear8},
-	{AUDIO_ENCODING_ULINEAR_LE, 8, 8,
-	 change_sign8, change_sign8},
+	TABLE_LIST(32, 32, 8)
+	TABLE_LIST(24, 32, 8)
+	TABLE_LIST(24, 24, 8)
+	TABLE_LIST(16, 16, 8)
+	TABLE_LIST(8, 8, 8)
+#if NMULAW > 0
+	MULAW_TABLE(8, 8, 8)
+#endif
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table u8_table[] = {
-	{AUDIO_ENCODING_SLINEAR_LE, 16, 16,
-	 linear8_to_linear16, linear16_to_linear8},
-	{AUDIO_ENCODING_SLINEAR_BE, 16, 16,
-	 linear8_to_linear16, linear16_to_linear8},
-	{AUDIO_ENCODING_SLINEAR_LE, 8, 8,
-	 change_sign8, change_sign8},
-	{AUDIO_ENCODING_ULINEAR_LE, 16, 16,
-	 linear8_to_linear16, linear16_to_linear8},
-	{AUDIO_ENCODING_ULINEAR_BE, 16, 16,
-	 linear8_to_linear16, linear16_to_linear8},
+	TABLE_LIST(32, 32, 8)
+	TABLE_LIST(24, 32, 8)
+	TABLE_LIST(24, 24, 8)
+	TABLE_LIST(16, 16, 8)
+	TABLE_LIST(8, 8, 8)
+#if NMULAW > 0
+	MULAW_TABLE(8, 8, 8)
+#endif
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table s16le_table[] = {
-	{AUDIO_ENCODING_SLINEAR_BE, 16, 16,
-	 swap_bytes, swap_bytes},
-	{AUDIO_ENCODING_ULINEAR_LE, 16, 16,
-	 change_sign16, change_sign16},
-	{AUDIO_ENCODING_ULINEAR_BE, 16, 16,
-	 swap_bytes_change_sign16, swap_bytes_change_sign16},
+	TABLE_LIST(32, 32, 16)
+	TABLE_LIST(24, 32, 16)
+	TABLE_LIST(24, 24, 16)
+	TABLE_LIST(16, 16, 16)
+	TABLE_LIST(8, 8, 16)
+#if NMULAW > 0
+	MULAW_TABLE(16, 16, 16)
+#endif
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table s16be_table[] = {
-	{AUDIO_ENCODING_SLINEAR_LE, 16, 16,
-	 swap_bytes, swap_bytes},
-	{AUDIO_ENCODING_ULINEAR_BE, 16, 16,
-	 change_sign16, change_sign16},
-	{AUDIO_ENCODING_ULINEAR_LE, 16, 16,
-	 swap_bytes_change_sign16, swap_bytes_change_sign16},
+	TABLE_LIST(32, 32, 16)
+	TABLE_LIST(24, 32, 16)
+	TABLE_LIST(24, 24, 16)
+	TABLE_LIST(16, 16, 16)
+	TABLE_LIST(8, 8, 16)
+#if NMULAW > 0
+	MULAW_TABLE(16, 16, 16)
+#endif
 	{0, 0, 0, NULL, NULL}};
 static const struct conv_table u16le_table[] = {
-	{AUDIO_ENCODING_SLINEAR_LE, 16, 16,
-	 change_sign16, change_sign16},
-	{AUDIO_ENCODING_ULINEAR_BE, 16, 16,
-	 swap_bytes, swap_bytes},
-	{AUDIO_ENCODING_SLINEAR_BE, 16, 16,
-	 swap_bytes_change_sign16, swap_bytes_change_sign16},
+	TABLE_LIST(32, 32, 16)
+	TABLE_LIST(24, 32, 16)
+	TABLE_LIST(24, 24, 16)
+	TABLE_LIST(16, 16, 16)
+	TABLE_LIST(8, 8, 16)
+#if NMULAW > 0
+	MULAW_TABLE(16, 16, 16)
+#endif
 	{0, 0, 0, NULL, NULL}};
 static const

CVS commit: src/sys/dev

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 07:13:09 UTC 2017

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

Log Message:
Rate conversion works at 8 bits, so enable it.

Ok christos@.


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

2017-06-20 Thread Nathanial Sloss

Module Name:src
Committed By:   nat
Date:   Tue Jun 20 07:13:09 UTC 2017

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

Log Message:
Rate conversion works at 8 bits, so enable it.

Ok christos@.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/aurateconv.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/aurateconv.c
diff -u src/sys/dev/aurateconv.c:1.19 src/sys/dev/aurateconv.c:1.20
--- src/sys/dev/aurateconv.c:1.19	Wed Nov 23 23:07:31 2011
+++ src/sys/dev/aurateconv.c	Tue Jun 20 07:13:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: aurateconv.c,v 1.19 2011/11/23 23:07:31 jmcneill Exp $	*/
+/*	$NetBSD: aurateconv.c,v 1.20 2017/06/20 07:13:09 nat Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aurateconv.c,v 1.19 2011/11/23 23:07:31 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aurateconv.c,v 1.20 2017/06/20 07:13:09 nat Exp $");
 
 #include 
 #include 
@@ -68,6 +68,8 @@ typedef struct aurateconv {
 static int aurateconv_fetch_to(struct audio_softc *, stream_fetcher_t *,
 			   audio_stream_t *, int);
 static void aurateconv_dtor(stream_filter_t *);
+static int aurateconv_slinear8_LE(aurateconv_t *, audio_stream_t *,
+   int, int, int);
 static int aurateconv_slinear16_LE(aurateconv_t *, audio_stream_t *,
    int, int, int);
 static int aurateconv_slinear24_LE(aurateconv_t *, audio_stream_t *,
@@ -118,8 +120,9 @@ aurateconv(struct audio_softc *sc, const
 	}
 	if ((from->encoding != AUDIO_ENCODING_SLINEAR_LE
 	 && from->encoding != AUDIO_ENCODING_SLINEAR_BE)
-	|| (from->precision != 16 && from->precision != 24 && from->precision != 32)) {
-		printf("%s: encoding/precision must be SLINEAR_LE 16/24/32bit, "
+	|| (from->precision != 8 && from->precision != 16 &&
+			 from->precision != 24 && from->precision != 32)) {
+		printf("%s: encoding/precision must be SLINEAR_LE 8/16/24/32bit, "
 		   "or SLINEAR_BE 16/24/32bit", __func__);
 		return NULL;
 	}
@@ -189,6 +192,9 @@ aurateconv_fetch_to(struct audio_softc *
 	switch (this->from.encoding) {
 	case AUDIO_ENCODING_SLINEAR_LE:
 		switch (this->from.precision) {
+		case 8:
+			return aurateconv_slinear8_LE(this, dst, m,
+		   frame_src, frame_dst);
 		case 16:
 			return aurateconv_slinear16_LE(this, dst, m,
 		   frame_src, frame_dst);
@@ -458,6 +464,7 @@ aurateconv_slinear32_##EN (aurateconv_t 
 	return 0; \
 }
 
+AURATECONV_SLINEAR(8, LE)
 AURATECONV_SLINEAR(16, LE)
 AURATECONV_SLINEAR(24, LE)
 AURATECONV_SLINEAR32(LE)

69 matches

Mail list logo