date:20150315

CVS commit: src/sys/ufs/ffs

2015-03-15 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Sun Mar 15 09:21:01 UTC 2015

Modified Files:
src/sys/ufs/ffs: ffs_vfsops.c

Log Message:
ffs_reload(): fix a bug that prevents Big Endian FSes from being reloaded.
'newfs' should be tagged as FS_SWAPPED, not 'fs'.

Was here before my changes.

While here, also KNF a bit.


To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 src/sys/ufs/ffs/ffs_vfsops.c

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

Modified files:

Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.323 src/sys/ufs/ffs/ffs_vfsops.c:1.324
--- src/sys/ufs/ffs/ffs_vfsops.c:1.323	Sat Mar 14 19:52:54 2015
+++ src/sys/ufs/ffs/ffs_vfsops.c	Sun Mar 15 09:21:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffs_vfsops.c,v 1.323 2015/03/14 19:52:54 maxv Exp $	*/
+/*	$NetBSD: ffs_vfsops.c,v 1.324 2015/03/15 09:21:01 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.323 2015/03/14 19:52:54 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: ffs_vfsops.c,v 1.324 2015/03/15 09:21:01 maxv Exp $);
 
 #if defined(_KERNEL_OPT)
 #include opt_ffs.h
@@ -727,16 +727,16 @@ ffs_reload(struct mount *mp, kauth_cred_
 
 #ifdef FFS_EI
 	if (ump-um_flags  UFS_NEEDSWAP) {
-		ffs_sb_swap((struct fs*)bp-b_data, newfs);
-		fs-fs_flags |= FS_SWAPPED;
+		ffs_sb_swap((struct fs *)bp-b_data, newfs);
+		newfs-fs_flags |= FS_SWAPPED;
 	} else
 #endif
-		fs-fs_flags = ~FS_SWAPPED;
+		newfs-fs_flags = ~FS_SWAPPED;
 
 	brelse(bp, 0);
 
-	if ((newfs-fs_magic != FS_UFS1_MAGIC 
-	 newfs-fs_magic != FS_UFS2_MAGIC)) {
+	if ((newfs-fs_magic != FS_UFS1_MAGIC) 
+	(newfs-fs_magic != FS_UFS2_MAGIC)) {
 		kmem_free(newfs, fs_sbsize);
 		return (EIO);		/* XXX needs translation */
 	}
@@ -757,7 +757,6 @@ ffs_reload(struct mount *mp, kauth_cred_
 		return (EINVAL);
 	}
 
-
 	/* Store off old fs_sblockloc for fs_oldfscompat_read. */
 	sblockloc = fs-fs_sblockloc;
 	/*

CVS commit: src/sys/arch/sparc64/sparc64

2015-03-15 Thread Takeshi Nakayama

Module Name:src
Committed By:   nakayama
Date:   Sun Mar 15 10:38:58 UTC 2015

Modified Files:
src/sys/arch/sparc64/sparc64: autoconf.c machdep.c

Log Message:
Reuse results of bootpath and bootargs from openfirmware
instead of calling openfirmware in each sysctl CPU_BOOT*.

This change reduces openfirmware calls from userland since sysctl
CPU_BOOTED_KERNEL is used in system commands such as pstat and
netstat.


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.280 -r1.281 src/sys/arch/sparc64/sparc64/machdep.c

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

Modified files:

Index: src/sys/arch/sparc64/sparc64/autoconf.c
diff -u src/sys/arch/sparc64/sparc64/autoconf.c:1.201 src/sys/arch/sparc64/sparc64/autoconf.c:1.202
--- src/sys/arch/sparc64/sparc64/autoconf.c:1.201	Sat Jan 10 22:19:26 2015
+++ src/sys/arch/sparc64/sparc64/autoconf.c	Sun Mar 15 10:38:58 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.201 2015/01/10 22:19:26 palle Exp $ */
+/*	$NetBSD: autoconf.c,v 1.202 2015/03/15 10:38:58 nakayama Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -48,7 +48,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.201 2015/01/10 22:19:26 palle Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.202 2015/03/15 10:38:58 nakayama Exp $);
 
 #include opt_ddb.h
 #include opt_kgdb.h
@@ -146,6 +146,7 @@ int kgdb_break_at_attach;
 char	machine_banner[100];
 char	machine_model[100];
 char	ofbootpath[OFPATHLEN], *ofboottarget, *ofbootpartition;
+char	ofbootargs[OFPATHLEN], *ofbootfile, *ofbootflags;
 int	ofbootpackage;
 
 static	int mbprint(void *, const char *);
@@ -418,8 +419,9 @@ get_bootpath_from_prom(void)
 	/* Setup pointer to boot flags */
 	if (OF_getprop(chosen, bootargs, sbuf, sizeof(sbuf)) == -1)
 		return;
+	strcpy(ofbootargs, sbuf);
 
-	cp = sbuf;
+	cp = ofbootargs;
 
 	/* Find start of boot flags */
 	while (*cp) {
@@ -427,8 +429,12 @@ get_bootpath_from_prom(void)
 		if (*cp == '-' || *cp == '\0')
 			break;
 		while(*cp != ' '  *cp != '\t'  *cp != '\0') cp++;
-		
+		if (*cp != '\0')
+			*cp++ = '\0';
 	}
+	if (cp != ofbootargs)
+		ofbootfile = ofbootargs;
+	ofbootflags = cp;
 	if (*cp != '-')
 		return;
 

Index: src/sys/arch/sparc64/sparc64/machdep.c
diff -u src/sys/arch/sparc64/sparc64/machdep.c:1.280 src/sys/arch/sparc64/sparc64/machdep.c:1.281
--- src/sys/arch/sparc64/sparc64/machdep.c:1.280	Tue Oct 28 13:04:51 2014
+++ src/sys/arch/sparc64/sparc64/machdep.c	Sun Mar 15 10:38:58 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.280 2014/10/28 13:04:51 nakayama Exp $ */
+/*	$NetBSD: machdep.c,v 1.281 2015/03/15 10:38:58 nakayama Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.280 2014/10/28 13:04:51 nakayama Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.281 2015/03/15 10:38:58 nakayama Exp $);
 
 #include opt_ddb.h
 #include opt_multiprocessor.h
@@ -295,59 +295,6 @@ setregs(struct lwp *l, struct exec_packa
 #endif
 }
 
-static char *parse_bootfile(char *);
-static char *parse_bootargs(char *);
-
-static char *
-parse_bootfile(char *args)
-{
-	char *cp;
-
-	/*
-	 * bootargs is of the form: [kernelname] [args...]
-	 * It can be the empty string if we booted from the default
-	 * kernel name.
-	 */
-	cp = args;
-	for (cp = args; *cp != 0  *cp != ' '  *cp != '\t'; cp++) {
-		if (*cp == '-') {
-			int c;
-			/*
-			 * If this `-' is most likely the start of boot
-			 * options, we're done.
-			 */
-			if (cp == args)
-break;
-			if ((c = *(cp-1)) == ' ' || c == '\t')
-break;
-		}
-	}
-	/* Now we've separated out the kernel name from the args */
-	*cp = '\0';
-	return (args);
-}
-
-static char *
-parse_bootargs(char *args)
-{
-	char *cp;
-
-	for (cp = args; *cp != '\0'; cp++) {
-		if (*cp == '-') {
-			int c;
-			/*
-			 * Looks like options start here, but check this
-			 * `-' is not part of the kernel name.
-			 */
-			if (cp == args)
-break;
-			if ((c = *(cp-1)) == ' ' || c == '\t')
-break;
-		}
-	}
-	return (cp);
-}
-
 /*
  * machine dependent system variables.
  */
@@ -355,31 +302,28 @@ static int
 sysctl_machdep_boot(SYSCTLFN_ARGS)
 {
 	struct sysctlnode node = *rnode;
-	u_int chosen;
-	char bootargs[256];
-	const char *cp;
-
-	if ((chosen = OF_finddevice(/chosen)) == -1)
-		return (ENOENT);
-	if (node.sysctl_num == CPU_BOOTED_DEVICE)
-		cp = bootpath;
-	else
-		cp = bootargs;
-	if (OF_getprop(chosen, cp, bootargs, sizeof bootargs)  0)
-		return (ENOENT);
+	char bootpath[256];
+	const char *cp = NULL;
+	extern char ofbootpath[], *ofbootpartition, *ofbootfile, *ofbootflags;
 
 	switch (node.sysctl_num) {
 	case CPU_BOOTED_KERNEL:
-		cp = parse_bootfile(bootargs);
-if (cp != NULL  cp[0] == '\0')
+		cp = ofbootfile;
+if (cp == NULL || cp[0] == '\0')

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

2015-03-15 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Mar 15 13:15:26 UTC 2015

Modified Files:
src/sys/arch/arm/allwinner: awin_eth.c awin_gige.c awin_gpio.c
awin_usb.c

Log Message:
sprinkle __diagused to fix no options DIAGNOSTIC build


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/allwinner/awin_eth.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/allwinner/awin_gige.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/allwinner/awin_gpio.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/allwinner/awin_usb.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/allwinner/awin_eth.c
diff -u src/sys/arch/arm/allwinner/awin_eth.c:1.7 src/sys/arch/arm/allwinner/awin_eth.c:1.8
--- src/sys/arch/arm/allwinner/awin_eth.c:1.7	Sat Sep  6 19:00:50 2014
+++ src/sys/arch/arm/allwinner/awin_eth.c	Sun Mar 15 13:15:26 2015
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.7 2014/09/06 19:00:50 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.8 2015/03/15 13:15:26 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -141,10 +141,8 @@ awin_eth_clear_set(struct awin_eth_softc
 static int
 awin_eth_match(device_t parent, cfdata_t cf, void *aux)
 {
-	struct awinio_attach_args * const aio = aux;
-#ifdef DIAGNOSTIC
-	const struct awin_locators * const loc = aio-aio_loc;
-#endif
+	struct awinio_attach_args * const aio __diagused = aux;
+	const struct awin_locators * const loc __diagused = aio-aio_loc;
 	const struct awin_gpio_pinset * const pinset =
 	awin_eth_pinsets[cf-cf_flags  1];
 

Index: src/sys/arch/arm/allwinner/awin_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.21 src/sys/arch/arm/allwinner/awin_gige.c:1.22
--- src/sys/arch/arm/allwinner/awin_gige.c:1.21	Sun Dec  7 00:37:52 2014
+++ src/sys/arch/arm/allwinner/awin_gige.c	Sun Mar 15 13:15:26 2015
@@ -34,7 +34,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.21 2014/12/07 00:37:52 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.22 2015/03/15 13:15:26 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -90,13 +90,11 @@ CFATTACH_DECL_NEW(awin_gige, sizeof(stru
 static int
 awin_gige_match(device_t parent, cfdata_t cf, void *aux)
 {
-	struct awinio_attach_args * const aio = aux;
 	const struct awin_gpio_pinset *pinset =
 	awin_chip_id() == AWIN_CHIP_ID_A31 ?
 	awin_gige_gpio_pinset_a31 : awin_gige_gpio_pinset;
-#ifdef DIAGNOSTIC
-	const struct awin_locators * const loc = aio-aio_loc;
-#endif
+	struct awinio_attach_args * const aio __diagused = aux;
+	const struct awin_locators * const loc __diagused = aio-aio_loc;
 	if (cf-cf_flags  1)
 		return 0;
 

Index: src/sys/arch/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.16 src/sys/arch/arm/allwinner/awin_gpio.c:1.17
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.16	Sun Dec  7 18:32:13 2014
+++ src/sys/arch/arm/allwinner/awin_gpio.c	Sun Mar 15 13:15:26 2015
@@ -35,7 +35,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.16 2014/12/07 18:32:13 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.17 2015/03/15 13:15:26 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -254,8 +254,8 @@ CFATTACH_DECL_NEW(awin_gpio, sizeof(stru
 static int
 awin_gpio_match(device_t parent, cfdata_t cf, void *aux)
 {
-	struct awinio_attach_args * const aio = aux;
-	const struct awin_locators * const loc = aio-aio_loc;
+	struct awinio_attach_args * const aio __diagused = aux;
+	const struct awin_locators * const loc __diagused = aio-aio_loc;
 
 	KASSERT(!strcmp(cf-cf_name, loc-loc_name));
 	KASSERT(loc-loc_port == AWINIOCF_PORT_DEFAULT);

Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.19 src/sys/arch/arm/allwinner/awin_usb.c:1.20
--- src/sys/arch/arm/allwinner/awin_usb.c:1.19	Sun Dec  7 16:20:33 2014
+++ src/sys/arch/arm/allwinner/awin_usb.c	Sun Mar 15 13:15:26 2015
@@ -34,7 +34,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.19 2014/12/07 16:20:33 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.20 2015/03/15 13:15:26 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -403,8 +403,8 @@ static const uint32_t awinusb_usb_pcr_a8
 int
 awinusb_match(device_t parent, cfdata_t cf, void *aux)
 {
-	struct awinio_attach_args * const aio = aux;
-	const struct awin_locators * const loc = aio-aio_loc;
+	struct awinio_attach_args * const aio __diagused = aux;
+	const struct awin_locators * const loc __diagused = aio-aio_loc;
 
 	KASSERT(loc-loc_port != AWINIOCF_PORT_DEFAULT);
 	KASSERT(!strcmp(cf-cf_name, loc-loc_name));

CVS commit: [nick-nhusb] src/sys/dev/usb

2015-03-15 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Sun Mar 15 11:52:47 UTC 2015

Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c

Log Message:
Only dump sqtds if we're not isochronous


To generate a diff of this commit:
cvs rdiff -u -r1.234.2.40 -r1.234.2.41 src/sys/dev/usb/ehci.c

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

Modified files:

Index: src/sys/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.40 src/sys/dev/usb/ehci.c:1.234.2.41
--- src/sys/dev/usb/ehci.c:1.234.2.40	Sat Mar  7 22:15:50 2015
+++ src/sys/dev/usb/ehci.c	Sun Mar 15 11:52:47 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: ehci.c,v 1.234.2.40 2015/03/07 22:15:50 skrll Exp $ */
+/*	$NetBSD: ehci.c,v 1.234.2.41 2015/03/15 11:52:47 skrll Exp $ */
 
 /*
  * Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.40 2015/03/07 22:15:50 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.41 2015/03/15 11:52:47 skrll Exp $);
 
 #include ohci.h
 #include uhci.h
@@ -1036,11 +1036,6 @@ ehci_idone(struct ehci_xfer *ex)
 	}
 
 	USBHIST_LOG(ehcidebug, xfer=%p, pipe=%p ready, xfer, epipe, 0, 0);
-#ifdef EHCI_DEBUG
-	USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
-	ehci_dump_sqtds(ex-ex_sqtdstart);
-	USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
-#endif
 
 	/* The transfer is done, compute actual length and status. */
 
@@ -1145,6 +1140,12 @@ ehci_idone(struct ehci_xfer *ex)
 
 	/* Continue processing xfers using queue heads */
 
+#ifdef EHCI_DEBUG
+	USBHIST_LOGN(ehcidebug, 5, --- dump start ---, 0, 0, 0, 0);
+	ehci_dump_sqtds(ex-ex_sqtdstart);
+	USBHIST_LOGN(ehcidebug, 5, --- dump end ---, 0, 0, 0, 0);
+#endif
+
 	lsqtd = ex-ex_sqtdend;
 	actlen = 0;
 	for (sqtd = ex-ex_sqtdstart; sqtd != lsqtd-nextqtd;

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

2015-03-15 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Sun Mar 15 18:31:29 UTC 2015

Modified Files:
src/sys/arch/arm/broadcom: bcm2835_vcaudio.c

Log Message:
port-arm/49057: Raspberry Pi Audio volume control does not work

AUDS server messages expect volume to be expressed in units of 1/256 dB,
where we previously (incorrectly) treated it as as percentage. Map the
NetBSD audio level (0-255) to 20 steps (levels from FreeBSD bcm2835_audio.c)
and provide independent volume knobs for outputs.auto, outputs.hdmi, and
outputs.headphones.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/broadcom/bcm2835_vcaudio.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/broadcom/bcm2835_vcaudio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.8 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.9
--- src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.8	Fri Mar 13 22:48:41 2015
+++ src/sys/arch/arm/broadcom/bcm2835_vcaudio.c	Sun Mar 15 18:31:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_vcaudio.c,v 1.8 2015/03/13 22:48:41 jmcneill Exp $ */
+/* $NetBSD: bcm2835_vcaudio.c,v 1.9 2015/03/15 18:31:29 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2013 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_vcaudio.c,v 1.8 2015/03/13 22:48:41 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_vcaudio.c,v 1.9 2015/03/15 18:31:29 jmcneill Exp $);
 
 #include sys/param.h
 #include sys/types.h
@@ -52,14 +52,25 @@ __KERNEL_RCSID(0, $NetBSD: bcm2835_vcau
 
 #include bcm2835_vcaudioreg.h
 
-#define vol2pct(vol)	(((vol) * 100) / 255)
+/* levels with 5% volume step */
+static int vcaudio_levels[] = {
+	-10239, -4605, -3794, -3218, -2772,
+	-2407, -2099, -1832, -1597, -1386,
+	-1195, -1021, -861, -713, -575,
+	-446, -325, -210, -102, 0,
+};
+
+#define vol2db(vol)	vcaudio_levels[((vol) * 20)  8]
+#define vol2vc(vol)	((uint32_t)(-(vol2db((vol))  8) / 100))
 
 enum {
 	VCAUDIO_OUTPUT_CLASS,
 	VCAUDIO_INPUT_CLASS,
 	VCAUDIO_OUTPUT_MASTER_VOLUME,
 	VCAUDIO_INPUT_DAC_VOLUME,
+	VCAUDIO_OUTPUT_AUTO_VOLUME,
 	VCAUDIO_OUTPUT_HEADPHONE_VOLUME,
+	VCAUDIO_OUTPUT_HDMI_VOLUME,
 	VCAUDIO_OUTPUT_SELECT,
 	VCAUDIO_ENUM_LAST,
 };
@@ -125,7 +136,7 @@ struct vcaudio_softc {
 
 	shortsc_peer_version;
 
-	intsc_hpvol;
+	intsc_hwvol[3];
 	enum vcaudio_dest		sc_dest;
 
 	uint8_tsc_swvol;
@@ -267,7 +278,9 @@ vcaudio_init(struct vcaudio_softc *sc)
 	int error;
 
 	sc-sc_swvol = 255;
-	sc-sc_hpvol = 128;
+	sc-sc_hwvol[VCAUDIO_DEST_AUTO] = 255;
+	sc-sc_hwvol[VCAUDIO_DEST_HP] = 255;
+	sc-sc_hwvol[VCAUDIO_DEST_HDMI] = 255;
 	sc-sc_dest = VCAUDIO_DEST_AUTO;
 
 	sc-sc_format.mode = AUMODE_PLAY|AUMODE_RECORD;
@@ -352,7 +365,7 @@ vcaudio_init(struct vcaudio_softc *sc)
 
 	memset(msg, 0, sizeof(msg));
 	msg.type = VC_AUDIO_MSG_TYPE_CONTROL;
-	msg.u.control.volume = vol2pct(sc-sc_hpvol);
+	msg.u.control.volume = vol2vc(sc-sc_hwvol[sc-sc_dest]);
 	msg.u.control.dest = sc-sc_dest;
 	error = vcaudio_msg_sync(sc, msg, sizeof(msg));
 	if (error) {
@@ -642,58 +655,59 @@ vcaudio_halt_input(void *priv)
 }
 
 static int
-vcaudio_set_port(void *priv, mixer_ctrl_t *mc)
+vcaudio_set_volume(struct vcaudio_softc *sc, enum vcaudio_dest dest,
+int hwvol)
 {
-	struct vcaudio_softc *sc = priv;
 	VC_AUDIO_MSG_T msg;
 	int error;
 
-	switch (mc-dev) {
-	case VCAUDIO_OUTPUT_MASTER_VOLUME:
-	case VCAUDIO_INPUT_DAC_VOLUME:
-		sc-sc_swvol = mc-un.value.level[AUDIO_MIXER_LEVEL_LEFT];
+	sc-sc_hwvol[dest] = hwvol;
+	if (dest != sc-sc_dest)
 		return 0;
-	case VCAUDIO_OUTPUT_HEADPHONE_VOLUME:
-		sc-sc_hpvol = mc-un.value.level[AUDIO_MIXER_LEVEL_LEFT];
 
-		vchi_service_use(sc-sc_service);
+	vchi_service_use(sc-sc_service);
 
-		memset(msg, 0, sizeof(msg));
-		msg.type = VC_AUDIO_MSG_TYPE_CONTROL;
-		msg.u.control.volume = vol2pct(sc-sc_hpvol);
-		msg.u.control.dest = sc-sc_dest;
+	memset(msg, 0, sizeof(msg));
+	msg.type = VC_AUDIO_MSG_TYPE_CONTROL;
+	msg.u.control.volume = vol2vc(hwvol);
+	msg.u.control.dest = dest;
 
-		error = vcaudio_msg_sync(sc, msg, sizeof(msg));
-		if (error) {
-			device_printf(sc-sc_dev,
-			couldn't send CONTROL message (%d)\n, error);
-		}
+	error = vcaudio_msg_sync(sc, msg, sizeof(msg));
+	if (error) {
+		device_printf(sc-sc_dev,
+		couldn't send CONTROL message (%d)\n, error);
+	}
 
-		vchi_service_release(sc-sc_service);
+	vchi_service_release(sc-sc_service);
 
-		return error;
+	return error;
+}
+
+static int
+vcaudio_set_port(void *priv, mixer_ctrl_t *mc)
+{
+	struct vcaudio_softc *sc = priv;
+
+	switch (mc-dev) {
+	case VCAUDIO_OUTPUT_MASTER_VOLUME:
+	case VCAUDIO_INPUT_DAC_VOLUME:
+		sc-sc_swvol = mc-un.value.level[AUDIO_MIXER_LEVEL_LEFT];
+		return 0;
+	case VCAUDIO_OUTPUT_AUTO_VOLUME:
+		return vcaudio_set_volume(sc, VCAUDIO_DEST_AUTO,
+		mc-un.value.level[AUDIO_MIXER_LEVEL_LEFT]);
+	case VCAUDIO_OUTPUT_HEADPHONE_VOLUME:
+

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm

2015-03-15 Thread Christos Zoulas

Module Name:src
Committed By:   christos
Date:   Sun Mar 15 18:58:09 UTC 2015

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
fix the big endian builds. Perhaps just remove the MAX define for everyone?


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc

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

Modified files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.3	Tue Mar 10 09:28:47 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Sun Mar 15 14:58:09 2015
@@ -3,8 +3,13 @@ CPUID_SRCS = armv4cpuid.S armcap.c armv4
 CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 .if ${MACHINE_ARCH:M*armv4*} == 
+.	if ${MACHINE_ARCH} == earmeb
+CPPFLAGS += -D__ARM_MAX_ARCH__=5
+.	else
 CPPFLAGS += -D__ARM_MAX_ARCH__=8
+.endif
 .else
 CPPFLAGS += -D__ARM_MAX_ARCH__=4
 .endif
 .include ../../crypto.inc
+

CVS commit: [netbsd-7] src/sys/dev/usb

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 22:47:55 UTC 2015

Modified Files:
src/sys/dev/usb [netbsd-7]: if_run.c

Log Message:
Pull up following revision(s) (requested by nonakap in ticket #592):
sys/dev/usb/if_run.c: revision 1.11
Add pmf hooks.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/dev/usb/if_run.c

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

Modified files:

Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.10 src/sys/dev/usb/if_run.c:1.10.4.1
--- src/sys/dev/usb/if_run.c:1.10	Tue Jan 28 13:08:13 2014
+++ src/sys/dev/usb/if_run.c	Sun Mar 15 22:47:55 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_run.c,v 1.10 2014/01/28 13:08:13 martin Exp $	*/
+/*	$NetBSD: if_run.c,v 1.10.4.1 2015/03/15 22:47:55 snj Exp $	*/
 /*	$OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_run.c,v 1.10 2014/01/28 13:08:13 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_run.c,v 1.10.4.1 2015/03/15 22:47:55 snj Exp $);
 
 #include sys/param.h
 #include sys/sockio.h
@@ -662,6 +662,9 @@ run_attach(device_t parent, device_t sel
 	ieee80211_announce(ic);
 
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc-sc_udev, sc-sc_dev);
+
+	if (!pmf_device_register(self, NULL, NULL))
+		aprint_error_dev(self, couldn't establish power handler\n);
 }
 
 static int
@@ -675,6 +678,8 @@ run_detach(device_t self, int flags)
 	if (ifp-if_softc == NULL)
 		return (0);
 
+	pmf_device_deregister(self);
+
 	s = splnet();
 
 	sc-sc_flags |= RUN_DETACHING;

CVS commit: [netbsd-7] src/tests/usr.bin/config/support/conf

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 23:01:46 UTC 2015

Modified Files:
src/tests/usr.bin/config/support/conf [netbsd-7]: Makefile
Added Files:
src/tests/usr.bin/config/support/conf [netbsd-7]: Makefile.kern.inc

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #596):
distrib/sets/lists/tests/mi: revision 1.604
tests/usr.bin/config/support/conf/Makefile: revision 1.2
tests/usr.bin/config/support/conf/Makefile.kern.inc: revision 1.1
config(1): Fix test breakage
Now config(1) checks the content of $S/conf/Makefile.kern.inc.  Install it
into config(1) test directory to fix test.  Noticed by Martin Husemann.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.12.1 src/tests/usr.bin/config/support/conf/Makefile
cvs rdiff -u -r0 -r1.1.2.2 \
src/tests/usr.bin/config/support/conf/Makefile.kern.inc

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

Modified files:

Index: src/tests/usr.bin/config/support/conf/Makefile
diff -u src/tests/usr.bin/config/support/conf/Makefile:1.1 src/tests/usr.bin/config/support/conf/Makefile:1.1.12.1
--- src/tests/usr.bin/config/support/conf/Makefile:1.1	Sat Mar 17 16:33:12 2012
+++ src/tests/usr.bin/config/support/conf/Makefile	Sun Mar 15 23:01:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:12 jruoho Exp $
+# $NetBSD: Makefile,v 1.1.12.1 2015/03/15 23:01:46 snj Exp $
 
 .include bsd.own.mk
 
@@ -6,7 +6,8 @@ TESTSDIR=	${TESTSBASE}/usr.bin/config
 ATFFILE=	no
 
 FILESDIR=	${TESTSDIR}/support/conf
-FILES=		files
+FILES=		Makefile.kern.inc \
+		files
 
 .include bsd.test.mk
 .include bsd.files.mk

Added files:

Index: src/tests/usr.bin/config/support/conf/Makefile.kern.inc
diff -u /dev/null src/tests/usr.bin/config/support/conf/Makefile.kern.inc:1.1.2.2
--- /dev/null	Sun Mar 15 23:01:46 2015
+++ src/tests/usr.bin/config/support/conf/Makefile.kern.inc	Sun Mar 15 23:01:46 2015
@@ -0,0 +1,4 @@
+#	$NetBSD: Makefile.kern.inc,v 1.1.2.2 2015/03/15 23:01:46 snj Exp $
+
+build_kernel: .USE
+	XXX

CVS commit: [netbsd-7] src/sys/external/bsd/compiler_rt/dist/lib/builtins

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 22:39:58 UTC 2015

Modified Files:
src/sys/external/bsd/compiler_rt/dist/lib/builtins [netbsd-7]:
gcc_personality_v0.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #580):
sys/external/bsd/compiler_rt/dist/lib/builtins/gcc_personality_v0.c: 
revision 1.2
Don't use __gcc_personality_sj0 on ARM.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.8.1 \
src/sys/external/bsd/compiler_rt/dist/lib/builtins/gcc_personality_v0.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/external/bsd/compiler_rt/dist/lib/builtins/gcc_personality_v0.c
diff -u src/sys/external/bsd/compiler_rt/dist/lib/builtins/gcc_personality_v0.c:1.1.1.2 src/sys/external/bsd/compiler_rt/dist/lib/builtins/gcc_personality_v0.c:1.1.1.2.8.1
--- src/sys/external/bsd/compiler_rt/dist/lib/builtins/gcc_personality_v0.c:1.1.1.2	Tue Mar 18 22:28:43 2014
+++ src/sys/external/bsd/compiler_rt/dist/lib/builtins/gcc_personality_v0.c	Sun Mar 15 22:39:58 2015
@@ -180,7 +180,7 @@ static uintptr_t readEncodedPointer(cons
  * on each frame as the stack is unwound during a C++ exception
  * throw through a C function compiled with -fexceptions.
  */
-#if __arm__
+#if __USING_SJLJ_EXCEPTIONS__
 // the setjump-longjump based exceptions personality routine has a different name
 COMPILER_RT_ABI _Unwind_Reason_Code
 __gcc_personality_sj0(int version, _Unwind_Action actions,

CVS commit: [netbsd-7] src/sys/net/npf

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 22:41:24 UTC 2015

Modified Files:
src/sys/net/npf [netbsd-7]: npf_conn.c

Log Message:
Pull up following revision(s) (requested by rmind in ticket #586):
sys/net/npf/npf_conn.c: revision 1.16
npf_conn_establish: fix the previous change - drop the reference on error.


To generate a diff of this commit:
cvs rdiff -u -r1.10.2.4 -r1.10.2.5 src/sys/net/npf/npf_conn.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/net/npf/npf_conn.c
diff -u src/sys/net/npf/npf_conn.c:1.10.2.4 src/sys/net/npf/npf_conn.c:1.10.2.5
--- src/sys/net/npf/npf_conn.c:1.10.2.4	Wed Feb  4 07:13:04 2015
+++ src/sys/net/npf/npf_conn.c	Sun Mar 15 22:41:24 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: npf_conn.c,v 1.10.2.4 2015/02/04 07:13:04 snj Exp $	*/
+/*	$NetBSD: npf_conn.c,v 1.10.2.5 2015/03/15 22:41:24 snj Exp $	*/
 
 /*-
  * Copyright (c) 2014-2015 Mindaugas Rasiukevicius rmind at netbsd org
@@ -99,7 +99,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_conn.c,v 1.10.2.4 2015/02/04 07:13:04 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_conn.c,v 1.10.2.5 2015/03/15 22:41:24 snj Exp $);
 
 #include sys/param.h
 #include sys/types.h
@@ -528,8 +528,8 @@ err:
 	 * here since there might be references acquired already.
 	 */
 	if (error) {
-		const u_int dflags = CONN_REMOVED | CONN_EXPIRE;
-		atomic_or_uint(con-c_flags, dflags);
+		atomic_or_uint(con-c_flags, CONN_REMOVED | CONN_EXPIRE);
+		atomic_dec_uint(con-c_refcnt);
 		npf_stats_inc(NPF_STAT_RACE_CONN);
 	} else {
 		NPF_PRINTF((NPF: establish conn %p\n, con));
@@ -569,6 +569,8 @@ npf_conn_destroy(npf_conn_t *con)
 /*
  * npf_conn_setnat: associate NAT entry with the connection, update and
  * re-insert connection entry using the translation values.
+ *
+ * = The caller must be holding a reference.
  */
 int
 npf_conn_setnat(const npf_cache_t *npc, npf_conn_t *con,

CVS commit: [netbsd-7] src/sys/arch/arm/broadcom

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 22:55:47 UTC 2015

Modified Files:
src/sys/arch/arm/broadcom [netbsd-7]: bcm2835_vcaudio.c files.bcm2835

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #594):
sys/arch/arm/broadcom/bcm2835_vcaudio.c: revision 1.8, 1.9
sys/arch/arm/broadcom/files.bcm2835: revision 1.25
port-arm/49057: Raspberry Pi Audio volume control does not work
- Use software volume control for outputs.master/inputs.dac
- Previous volume control (for analog output only) is available on new
  outputs.headphones mixer control.
- Add an outputs.select enum to choose between auto, headphones, and
  hdmi outputs.
--
port-arm/49057: Raspberry Pi Audio volume control does not work
AUDS server messages expect volume to be expressed in units of 1/256 dB,
where we previously (incorrectly) treated it as as percentage. Map the
NetBSD audio level (0-255) to 20 steps (levels from FreeBSD bcm2835_audio.c)
and provide independent volume knobs for outputs.auto, outputs.hdmi, and
outputs.headphones.


To generate a diff of this commit:
cvs rdiff -u -r1.3.4.1 -r1.3.4.2 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c
cvs rdiff -u -r1.21.2.3 -r1.21.2.4 src/sys/arch/arm/broadcom/files.bcm2835

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/broadcom/bcm2835_vcaudio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.3.4.1 src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.3.4.2
--- src/sys/arch/arm/broadcom/bcm2835_vcaudio.c:1.3.4.1	Sun Oct 19 15:22:00 2014
+++ src/sys/arch/arm/broadcom/bcm2835_vcaudio.c	Sun Mar 15 22:55:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_vcaudio.c,v 1.3.4.1 2014/10/19 15:22:00 martin Exp $ */
+/* $NetBSD: bcm2835_vcaudio.c,v 1.3.4.2 2015/03/15 22:55:47 snj Exp $ */
 
 /*-
  * Copyright (c) 2013 Jared D. McNeill jmcne...@invisible.ca
@@ -31,7 +31,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_vcaudio.c,v 1.3.4.1 2014/10/19 15:22:00 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_vcaudio.c,v 1.3.4.2 2015/03/15 22:55:47 snj Exp $);
 
 #include sys/param.h
 #include sys/types.h
@@ -44,6 +44,7 @@ __KERNEL_RCSID(0, $NetBSD: bcm2835_vcau
 #include sys/audioio.h
 #include dev/audio_if.h
 #include dev/auconv.h
+#include dev/auvolconv.h
 
 #include interface/compat/vchi_bsd.h
 #include interface/vchiq_arm/vchiq_netbsd.h
@@ -51,13 +52,26 @@ __KERNEL_RCSID(0, $NetBSD: bcm2835_vcau
 
 #include bcm2835_vcaudioreg.h
 
-#define vol2pct(vol)	(((vol) * 100) / 255)
+/* levels with 5% volume step */
+static int vcaudio_levels[] = {
+	-10239, -4605, -3794, -3218, -2772,
+	-2407, -2099, -1832, -1597, -1386,
+	-1195, -1021, -861, -713, -575,
+	-446, -325, -210, -102, 0,
+};
+
+#define vol2db(vol)	vcaudio_levels[((vol) * 20)  8]
+#define vol2vc(vol)	((uint32_t)(-(vol2db((vol))  8) / 100))
 
 enum {
 	VCAUDIO_OUTPUT_CLASS,
 	VCAUDIO_INPUT_CLASS,
 	VCAUDIO_OUTPUT_MASTER_VOLUME,
 	VCAUDIO_INPUT_DAC_VOLUME,
+	VCAUDIO_OUTPUT_AUTO_VOLUME,
+	VCAUDIO_OUTPUT_HEADPHONE_VOLUME,
+	VCAUDIO_OUTPUT_HDMI_VOLUME,
+	VCAUDIO_OUTPUT_SELECT,
 	VCAUDIO_ENUM_LAST,
 };
 
@@ -122,8 +136,10 @@ struct vcaudio_softc {
 
 	shortsc_peer_version;
 
-	intsc_volume;
+	intsc_hwvol[3];
 	enum vcaudio_dest		sc_dest;
+
+	uint8_tsc_swvol;
 };
 
 static int	vcaudio_match(device_t, cfdata_t, void *);
@@ -163,6 +179,10 @@ static int	vcaudio_trigger_input(void *,
 
 static void	vcaudio_get_locks(void *, kmutex_t **, kmutex_t **);
 
+static stream_filter_t *vcaudio_swvol_filter(struct audio_softc *,
+const audio_params_t *, const audio_params_t *);
+static void	vcaudio_swvol_dtor(stream_filter_t *);
+
 static const struct audio_hw_if vcaudio_hw_if = {
 	.open = vcaudio_open,
 	.close = vcaudio_close,
@@ -257,7 +277,10 @@ vcaudio_init(struct vcaudio_softc *sc)
 	VC_AUDIO_MSG_T msg;
 	int error;
 
-	sc-sc_volume = 128;
+	sc-sc_swvol = 255;
+	sc-sc_hwvol[VCAUDIO_DEST_AUTO] = 255;
+	sc-sc_hwvol[VCAUDIO_DEST_HP] = 255;
+	sc-sc_hwvol[VCAUDIO_DEST_HDMI] = 255;
 	sc-sc_dest = VCAUDIO_DEST_AUTO;
 
 	sc-sc_format.mode = AUMODE_PLAY|AUMODE_RECORD;
@@ -342,8 +365,8 @@ vcaudio_init(struct vcaudio_softc *sc)
 
 	memset(msg, 0, sizeof(msg));
 	msg.type = VC_AUDIO_MSG_TYPE_CONTROL;
-	msg.u.control.volume = vol2pct(sc-sc_volume);
-	msg.u.control.dest = VCAUDIO_DEST_AUTO;
+	msg.u.control.volume = vol2vc(sc-sc_hwvol[sc-sc_dest]);
+	msg.u.control.dest = sc-sc_dest;
 	error = vcaudio_msg_sync(sc, msg, sizeof(msg));
 	if (error) {
 		aprint_error_dev(sc-sc_dev,
@@ -585,6 +608,9 @@ vcaudio_set_params(void *priv, int setmo
 		AUMODE_PLAY, play, true, pfil);
 		if (index  0)
 			return EINVAL;
+		if (pfil-req_size  0)
+			play = pfil-filters[0].param;
+		pfil-prepend(pfil, vcaudio_swvol_filter, play);
 	}
 
 	return 0;
@@ -629,33 +655,59 @@ vcaudio_halt_input(void *priv)
 }
 
 static int
-vcaudio_set_port(void *priv, mixer_ctrl_t *mc)

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

2015-03-15 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Sun Mar 15 22:54:03 UTC 2015

Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c

Log Message:
Do invalidate the cache as RPI2 build with Clang can't fetch the memory
config otherwise.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/evbarm/rpi/rpi_machdep.c

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

Modified files:

Index: src/sys/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.58 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.59
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.58	Wed Mar  4 17:02:17 2015
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c	Sun Mar 15 22:54:03 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: rpi_machdep.c,v 1.58 2015/03/04 17:02:17 skrll Exp $	*/
+/*	$NetBSD: rpi_machdep.c,v 1.59 2015/03/15 22:54:03 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.58 2015/03/04 17:02:17 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.59 2015/03/15 22:54:03 joerg Exp $);
 
 #include opt_arm_debug.h
 #include opt_bcm283x.h
@@ -431,13 +431,7 @@ rpi_bootparams(void)
 
 	bcm2835_mbox_read(iot, ioh, BCMMBOX_CHANARM2VC, res);
 
-	/*
-	 * No need to invalid the cache as the memory has never been referenced
-	 * by the ARM.
-	 *
-	 * cpu_dcache_inv_range((vaddr_t)vb, sizeof(vb));
-	 *
-	 */
+	cpu_dcache_inv_range((vaddr_t)vb, sizeof(vb));
 
 	if (!vcprop_buffer_success_p(vb.vb_hdr)) {
 		bootconfig.dramblocks = 1;

CVS commit: [netbsd-7] src/doc

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 23:04:55 UTC 2015

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

Log Message:
580, 586-589, 591-596


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.227 -r1.1.2.228 src/doc/CHANGES-7.0

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
diff -u src/doc/CHANGES-7.0:1.1.2.227 src/doc/CHANGES-7.0:1.1.2.228
--- src/doc/CHANGES-7.0:1.1.2.227	Thu Mar 12 19:20:58 2015
+++ src/doc/CHANGES-7.0	Sun Mar 15 23:04:54 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0,v 1.1.2.227 2015/03/12 19:20:58 snj Exp $
+# $NetBSD: CHANGES-7.0,v 1.1.2.228 2015/03/15 23:04:54 snj Exp $
 
 A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014
 until the 7.0 release:
@@ -18518,3 +18518,62 @@ distrib/i386/installimage/Makefile		1.7
 	Bump i386 install iamge size limit.
 	[bouyer, ticket #588]
 
+sys/external/bsd/compiler_rt/dist/lib/builtins/gcc_personality_v0.c 1.2
+
+	Don't use __gcc_personality_sj0 on ARM.
+	[joerg, ticket #580]
+
+sys/net/npf/npf_conn.c1.16
+
+	Avoid reference leak in npf_conn_establish.
+	[rmind, ticket #586]
+
+sys/fs/puffs/puffs_vfsops.c			1.117
+
+	Remove a debug message.
+	[tron, ticket #587]
+
+usr.sbin/makemandb/makemandb.c			1.28
+
+	MDOC_MAX is a valid token if the type is text. Adjust.
+	PR bin/49742.
+	[joerg, ticket #589]
+
+sys/arch/arm/cortex/gic.c			1.15
+
+	G/C armgic_last_priority
+	[skrll, ticket #591]
+
+sys/dev/usb/if_run.c1.11
+
+	Add pmf hooks.
+	[nonakap, ticket #592]
+
+sys/arch/evbarm/conf/RPI			1.61
+sys/arch/evbarm/conf/RPI2			1.3
+
+	Add ARM11_COMPAT_MMU to RPI, and explicitly disable it on RPI2.
+	[jmcneill, ticket #593]
+
+sys/arch/arm/broadcom/bcm2835_vcaudio.c		1.8, 1.9
+sys/arch/arm/broadcom/files.bcm2835		1.25
+
+	Fix Raspberry Pi audio volume control.  PR port-arm/49057.
+	[jmcneill, ticket #594]
+
+sys/arch/arm/allwinner/awin_eth.c		1.8
+sys/arch/arm/allwinner/awin_gige.c		1.22
+sys/arch/arm/allwinner/awin_gpio.c		1.17
+sys/arch/arm/allwinner/awin_usb.c		1.20
+
+	Fix no options DIAGNOSTIC build for allwinner kernels.
+	[jmcneill, ticket #595]
+
+distrib/sets/lists/tests/mi			1.604
+tests/usr.bin/config/support/conf/Makefile	1.2
+tests/usr.bin/config/support/conf/Makefile.kern.inc 1.1
+
+	Now config(1) checks the content of $S/conf/Makefile.kern.inc.
+	Install it into config(1) test directory to fix tests.
+	[bouyer, ticket #596]
+

CVS commit: [netbsd-5] src/doc

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 21:18:04 UTC 2015

Modified Files:
src/doc [netbsd-5]: CHANGES-5.3

Log Message:
1951


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.101 -r1.1.2.102 src/doc/CHANGES-5.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-5.3
diff -u src/doc/CHANGES-5.3:1.1.2.101 src/doc/CHANGES-5.3:1.1.2.102
--- src/doc/CHANGES-5.3:1.1.2.101	Fri Feb 27 02:55:45 2015
+++ src/doc/CHANGES-5.3	Sun Mar 15 21:18:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.3,v 1.1.2.101 2015/02/27 02:55:45 snj Exp $
+# $NetBSD: CHANGES-5.3,v 1.1.2.102 2015/03/15 21:18:04 snj Exp $
 
 A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3
 release:
@@ -3750,3 +3750,11 @@ include/wchar.h	patch
 	_POSIX_C_SOURCE = 200112L and _XOPEN_SOURCE = 600.
 	[christos, ticket #1943]
 
+usr.bin/gzip/Makefilepatch
+usr.bin/gzip/gzip.11.20-1.24
+usr.bin/gzip/gzip.c1.98-1.107
+usr.bin/gzip/zuncompress.c			1.7-1.8
+
+	Sync gzip core with HEAD.
+	[mrg, ticket #1951]
+

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

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 21:17:44 UTC 2015

Modified Files:
src/doc [netbsd-5-1]: CHANGES-5.1.6

Log Message:
1951


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-5.1.6

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-5.1.6
diff -u src/doc/CHANGES-5.1.6:1.1.2.17 src/doc/CHANGES-5.1.6:1.1.2.18
--- src/doc/CHANGES-5.1.6:1.1.2.17	Mon Feb 23 09:42:23 2015
+++ src/doc/CHANGES-5.1.6	Sun Mar 15 21:17:44 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.1.6,v 1.1.2.17 2015/02/23 09:42:23 msaitoh Exp $
+# $NetBSD: CHANGES-5.1.6,v 1.1.2.18 2015/03/15 21:17:44 snj Exp $
 
 A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6
 release:
@@ -2546,3 +2546,12 @@ dist/bind/lib/dns/zone.c			patch
 	an untrusted replacement could cause named to crash with an assertion
 	failure.
 	[spz, ticket #1950]
+
+usr.bin/gzip/Makefilepatch
+usr.bin/gzip/gzip.11.20-1.24
+usr.bin/gzip/gzip.c1.98-1.107
+usr.bin/gzip/zuncompress.c			1.7-1.8
+
+	Sync gzip core with HEAD.
+	[mrg, ticket #1951]
+

CVS commit: [netbsd-5-2] src/doc

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 21:17:27 UTC 2015

Modified Files:
src/doc [netbsd-5-2]: CHANGES-5.2.4

Log Message:
1951


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-5.2.4

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-5.2.4
diff -u src/doc/CHANGES-5.2.4:1.1.2.18 src/doc/CHANGES-5.2.4:1.1.2.19
--- src/doc/CHANGES-5.2.4:1.1.2.18	Mon Feb 23 09:40:44 2015
+++ src/doc/CHANGES-5.2.4	Sun Mar 15 21:17:27 2015
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2.4,v 1.1.2.18 2015/02/23 09:40:44 msaitoh Exp $
+# $NetBSD: CHANGES-5.2.4,v 1.1.2.19 2015/03/15 21:17:27 snj Exp $
 
 A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4
 release:
@@ -2546,3 +2546,12 @@ dist/bind/lib/dns/zone.c			patch
 	an untrusted replacement could cause named to crash with an assertion
 	failure.
 	[spz, ticket #1950]
+
+usr.bin/gzip/Makefilepatch
+usr.bin/gzip/gzip.11.20-1.24
+usr.bin/gzip/gzip.c1.98-1.107
+usr.bin/gzip/zuncompress.c			1.7-1.8
+
+	Sync gzip core with HEAD.
+	[mrg, ticket #1951]
+

CVS commit: [netbsd-7] src/sys/arch/arm/cortex

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 22:46:38 UTC 2015

Modified Files:
src/sys/arch/arm/cortex [netbsd-7]: gic.c

Log Message:
Pull up following revision(s) (requested by skrll in ticket #591):
sys/arch/arm/cortex/gic.c: revision 1.15
G/C armgic_last_priority


To generate a diff of this commit:
cvs rdiff -u -r1.10.2.2 -r1.10.2.3 src/sys/arch/arm/cortex/gic.c

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

Modified files:

Index: src/sys/arch/arm/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.10.2.2 src/sys/arch/arm/cortex/gic.c:1.10.2.3
--- src/sys/arch/arm/cortex/gic.c:1.10.2.2	Sat Mar  7 05:04:49 2015
+++ src/sys/arch/arm/cortex/gic.c	Sun Mar 15 22:46:38 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: gic.c,v 1.10.2.2 2015/03/07 05:04:49 snj Exp $	*/
+/*	$NetBSD: gic.c,v 1.10.2.3 2015/03/15 22:46:38 snj Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
 #define _INTR_PRIVATE
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gic.c,v 1.10.2.2 2015/03/07 05:04:49 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: gic.c,v 1.10.2.3 2015/03/15 22:46:38 snj Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -181,8 +181,6 @@ armgic_block_irqs(struct pic_softc *pic,
 	gicd_write(sc, GICD_ICENABLERn(group), irq_mask);
 }
 
-static uint32_t armgic_last_priority;
-
 static void
 armgic_set_priority(struct pic_softc *pic, int ipl)
 {
@@ -190,7 +188,6 @@ armgic_set_priority(struct pic_softc *pi
 
 	const uint32_t priority = armgic_ipl_to_priority(ipl);
 	gicc_write(sc, GICC_PMR, priority);
-	armgic_last_priority = priority;
 }
 
 #ifdef __HAVE_PIC_FAST_SOFTINTS

CVS commit: [netbsd-7] src/usr.sbin/makemandb

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 22:44:28 UTC 2015

Modified Files:
src/usr.sbin/makemandb [netbsd-7]: makemandb.c

Log Message:
Pull up following revision(s) (requested by joerg in ticket #589):
usr.sbin/makemandb/makemandb.c: revision 1.28
MDOC_MAX is a valid token if the type is text. Adjust.


To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/usr.sbin/makemandb/makemandb.c

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

Modified files:

Index: src/usr.sbin/makemandb/makemandb.c
diff -u src/usr.sbin/makemandb/makemandb.c:1.24.2.1 src/usr.sbin/makemandb/makemandb.c:1.24.2.2
--- src/usr.sbin/makemandb/makemandb.c:1.24.2.1	Sat Mar  7 06:21:08 2015
+++ src/usr.sbin/makemandb/makemandb.c	Sun Mar 15 22:44:28 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: makemandb.c,v 1.24.2.1 2015/03/07 06:21:08 snj Exp $	*/
+/*	$NetBSD: makemandb.c,v 1.24.2.2 2015/03/15 22:44:28 snj Exp $	*/
 /*
  * Copyright (c) 2011 Abhinav Upadhyay er.abhinav.upadh...@gmail.com
  * Copyright (c) 2011 Kristaps Dzonsons krist...@bsd.lv
@@ -17,7 +17,7 @@
  */
 
 #include sys/cdefs.h
-__RCSID($NetBSD: makemandb.c,v 1.24.2.1 2015/03/07 06:21:08 snj Exp $);
+__RCSID($NetBSD: makemandb.c,v 1.24.2.2 2015/03/15 22:44:28 snj Exp $);
 
 #include sys/stat.h
 #include sys/types.h
@@ -981,7 +981,7 @@ pmdoc_Nd(const struct mdoc_node *n, mand
 	char *temp;
 	char *nd_text;
 
-	if (n == NULL || n-tok == MDOC_MAX)
+	if (n == NULL || (n-type != MDOC_TEXT  n-tok == MDOC_MAX))
 		return;
 
 	if (n-type == MDOC_TEXT) {
@@ -1104,7 +1104,7 @@ pmdoc_Pp(const struct mdoc_node *n, mand
 static void
 pmdoc_Sh(const struct mdoc_node *n, mandb_rec *rec)
 {
-	if (n == NULL || n-tok == MDOC_MAX)
+	if (n == NULL || (n-type != MDOC_TEXT  n-tok == MDOC_MAX))
 		return;
 	int xr_found = 0;

CVS commit: [netbsd-7] src/sys/arch/evbarm/conf

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 22:52:18 UTC 2015

Modified Files:
src/sys/arch/evbarm/conf [netbsd-7]: RPI RPI2

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #593):
sys/arch/evbarm/conf/RPI: revision 1.61
sys/arch/evbarm/conf/RPI2: revision 1.3
re-add ARM11_COMPAT_MMU, lost in the rpi2 shuffle
--
add no options ARM11_COMPAT_MMU


To generate a diff of this commit:
cvs rdiff -u -r1.46.2.6 -r1.46.2.7 src/sys/arch/evbarm/conf/RPI
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/evbarm/conf/RPI2

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/RPI
diff -u src/sys/arch/evbarm/conf/RPI:1.46.2.6 src/sys/arch/evbarm/conf/RPI:1.46.2.7
--- src/sys/arch/evbarm/conf/RPI:1.46.2.6	Wed Mar 11 20:22:56 2015
+++ src/sys/arch/evbarm/conf/RPI	Sun Mar 15 22:52:18 2015
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: RPI,v 1.46.2.6 2015/03/11 20:22:56 snj Exp $
+#	$NetBSD: RPI,v 1.46.2.7 2015/03/15 22:52:18 snj Exp $
 #
 #	RPi -- Raspberry Pi
 #
@@ -20,6 +20,7 @@ options 	RTC_OFFSET=0	# hardware clock i
 options 	CPU_ARM1176
 options 	PMAPCOUNTERS
 options 	TPIDRPRW_IS_CURLWP
+options 	ARM11_COMPAT_MMU
 options 	__HAVE_MM_MD_CACHE_ALIASING
 makeoptions 	CPUFLAGS=-march=armv6z -mtune=arm1176jzf-s -mfpu=vfp
 

Index: src/sys/arch/evbarm/conf/RPI2
diff -u src/sys/arch/evbarm/conf/RPI2:1.2.2.2 src/sys/arch/evbarm/conf/RPI2:1.2.2.3
--- src/sys/arch/evbarm/conf/RPI2:1.2.2.2	Wed Mar 11 20:22:56 2015
+++ src/sys/arch/evbarm/conf/RPI2	Sun Mar 15 22:52:18 2015
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: RPI2,v 1.2.2.2 2015/03/11 20:22:56 snj Exp $
+#	$NetBSD: RPI2,v 1.2.2.3 2015/03/15 22:52:18 snj Exp $
 #
 #	RPi2 -- Raspberry Pi 2
 #
@@ -8,6 +8,7 @@ include arch/evbarm/conf/RPI
 
 no options 	CPU_ARM1176
 no options 	TPIDRPRW_IS_CURLWP
+no options 	ARM11_COMPAT_MMU
 no options 	__HAVE_MM_MD_CACHE_ALIASING
 no makeoptions	CPUFLAGS

CVS commit: [netbsd-7] src/sys/arch/arm/allwinner

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 22:59:39 UTC 2015

Modified Files:
src/sys/arch/arm/allwinner [netbsd-7]: awin_eth.c awin_gige.c
awin_gpio.c awin_usb.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #595):
sys/arch/arm/allwinner/awin_eth.c: revision 1.8
sys/arch/arm/allwinner/awin_gige.c: revision 1.22
sys/arch/arm/allwinner/awin_gpio.c: revision 1.17
sys/arch/arm/allwinner/awin_usb.c: revision 1.20
sprinkle __diagused to fix no options DIAGNOSTIC build


To generate a diff of this commit:
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/arch/arm/allwinner/awin_eth.c
cvs rdiff -u -r1.4.10.2 -r1.4.10.3 src/sys/arch/arm/allwinner/awin_gige.c
cvs rdiff -u -r1.8.10.4 -r1.8.10.5 src/sys/arch/arm/allwinner/awin_gpio.c
cvs rdiff -u -r1.12.2.2 -r1.12.2.3 src/sys/arch/arm/allwinner/awin_usb.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/allwinner/awin_eth.c
diff -u src/sys/arch/arm/allwinner/awin_eth.c:1.5.2.1 src/sys/arch/arm/allwinner/awin_eth.c:1.5.2.2
--- src/sys/arch/arm/allwinner/awin_eth.c:1.5.2.1	Sun Nov  9 14:42:33 2014
+++ src/sys/arch/arm/allwinner/awin_eth.c	Sun Mar 15 22:59:39 2015
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.5.2.1 2014/11/09 14:42:33 martin Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.5.2.2 2015/03/15 22:59:39 snj Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -141,10 +141,8 @@ awin_eth_clear_set(struct awin_eth_softc
 static int
 awin_eth_match(device_t parent, cfdata_t cf, void *aux)
 {
-	struct awinio_attach_args * const aio = aux;
-#ifdef DIAGNOSTIC
-	const struct awin_locators * const loc = aio-aio_loc;
-#endif
+	struct awinio_attach_args * const aio __diagused = aux;
+	const struct awin_locators * const loc __diagused = aio-aio_loc;
 	const struct awin_gpio_pinset * const pinset =
 	awin_eth_pinsets[cf-cf_flags  1];
 

Index: src/sys/arch/arm/allwinner/awin_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.4.10.2 src/sys/arch/arm/allwinner/awin_gige.c:1.4.10.3
--- src/sys/arch/arm/allwinner/awin_gige.c:1.4.10.2	Tue Nov 25 08:03:06 2014
+++ src/sys/arch/arm/allwinner/awin_gige.c	Sun Mar 15 22:59:39 2015
@@ -31,7 +31,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.4.10.2 2014/11/25 08:03:06 snj Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.4.10.3 2015/03/15 22:59:39 snj Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -76,13 +76,11 @@ CFATTACH_DECL_NEW(awin_gige, sizeof(stru
 static int
 awin_gige_match(device_t parent, cfdata_t cf, void *aux)
 {
-	struct awinio_attach_args * const aio = aux;
 	const struct awin_gpio_pinset *pinset =
 	awin_chip_id() == AWIN_CHIP_ID_A31 ?
 	awin_gige_gpio_pinset_a31 : awin_gige_gpio_pinset;
-#ifdef DIAGNOSTIC
-	const struct awin_locators * const loc = aio-aio_loc;
-#endif
+	struct awinio_attach_args * const aio __diagused = aux;
+	const struct awin_locators * const loc __diagused = aio-aio_loc;
 	if (cf-cf_flags  1)
 		return 0;
 

Index: src/sys/arch/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.8.10.4 src/sys/arch/arm/allwinner/awin_gpio.c:1.8.10.5
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.8.10.4	Tue Nov 25 08:03:06 2014
+++ src/sys/arch/arm/allwinner/awin_gpio.c	Sun Mar 15 22:59:39 2015
@@ -35,7 +35,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.8.10.4 2014/11/25 08:03:06 snj Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.8.10.5 2015/03/15 22:59:39 snj Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -243,8 +243,8 @@ CFATTACH_DECL_NEW(awin_gpio, sizeof(stru
 static int
 awin_gpio_match(device_t parent, cfdata_t cf, void *aux)
 {
-	struct awinio_attach_args * const aio = aux;
-	const struct awin_locators * const loc = aio-aio_loc;
+	struct awinio_attach_args * const aio __diagused = aux;
+	const struct awin_locators * const loc __diagused = aio-aio_loc;
 
 	KASSERT(!strcmp(cf-cf_name, loc-loc_name));
 	KASSERT(loc-loc_port == AWINIOCF_PORT_DEFAULT);

Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.12.2.2 src/sys/arch/arm/allwinner/awin_usb.c:1.12.2.3
--- src/sys/arch/arm/allwinner/awin_usb.c:1.12.2.2	Thu Nov 20 10:05:06 2014
+++ src/sys/arch/arm/allwinner/awin_usb.c	Sun Mar 15 22:59:39 2015
@@ -34,7 +34,7 @@
 
 #include sys/cdefs.h
 
-__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.12.2.2 2014/11/20 10:05:06 snj Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.12.2.3 2015/03/15 22:59:39 snj Exp $);
 
 #include sys/param.h
 #include sys/bus.h
@@ -354,8 +354,8 @@ static const uint32_t awinusb_usb_ahb_re
 int
 awinusb_match(device_t parent, cfdata_t cf, void *aux)
 {
-	struct awinio_attach_args * const aio = aux;
-	const struct awin_locators * const loc = aio-aio_loc;
+	struct awinio_attach_args * const aio

CVS commit: [netbsd-5-2] src/usr.bin/gzip

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 21:15:22 UTC 2015

Modified Files:
src/usr.bin/gzip [netbsd-5-2]: Makefile gzip.1 gzip.c zuncompress.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1951):
usr.bin/gzip/Makefile: patch
usr.bin/gzip/gzip.1: revisions 1.20-1.24
usr.bin/gzip/gzip.c: revisions 1.98-1.107
usr.bin/gzip/zuncompress.c: revisions 1.7-1.8
Sync gzip core with HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.2.1 src/usr.bin/gzip/Makefile
cvs rdiff -u -r1.19 -r1.19.2.1 src/usr.bin/gzip/gzip.1
cvs rdiff -u -r1.93.4.3 -r1.93.4.3.6.1 src/usr.bin/gzip/gzip.c
cvs rdiff -u -r1.6.28.1 -r1.6.28.1.2.1 src/usr.bin/gzip/zuncompress.c

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

Modified files:

Index: src/usr.bin/gzip/Makefile
diff -u src/usr.bin/gzip/Makefile:1.12 src/usr.bin/gzip/Makefile:1.12.2.1
--- src/usr.bin/gzip/Makefile:1.12	Fri Aug 29 00:02:24 2008
+++ src/usr.bin/gzip/Makefile	Sun Mar 15 21:15:21 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2008/08/29 00:02:24 gmcgarry Exp $
+#	$NetBSD: Makefile,v 1.12.2.1 2015/03/15 21:15:21 snj Exp $
 
 USE_FORT?= yes	# data-driven bugs?
 
@@ -30,3 +30,6 @@ LINKS+=		${BINDIR}/gzip ${BINDIR}/gunzip
 .if (defined(HAVE_GCC)  ${HAVE_GCC} == 4) || defined(HAVE_PCC)
 COPTS.gzip.c+=	-Wno-pointer-sign
 .endif
+
+# NetBSD-5 has no -lzma
+CPPFLAGS+=	-DNO_XZ_SUPPORT

Index: src/usr.bin/gzip/gzip.1
diff -u src/usr.bin/gzip/gzip.1:1.19 src/usr.bin/gzip/gzip.1:1.19.2.1
--- src/usr.bin/gzip/gzip.1:1.19	Thu May 29 14:51:27 2008
+++ src/usr.bin/gzip/gzip.1	Sun Mar 15 21:15:21 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: gzip.1,v 1.19 2008/05/29 14:51:27 mrg Exp $
+.\	$NetBSD: gzip.1,v 1.19.2.1 2015/03/15 21:15:21 snj Exp $
 .\
 .\ Copyright (c) 1997, 2003, 2004 Matthew R. Green
 .\ All rights reserved.
@@ -24,7 +24,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd April 27, 2004
+.Dd January 13, 2015
 .Dt GZIP 1
 .Os
 .Sh NAME
@@ -138,8 +138,8 @@ embedded in the file.
 This option causes the stored filename in the input file to be used
 as the output file.
 .It Fl n , -no-name
-This option stops the filename from being stored in the output
-file.
+This option stops the filename and timestamp from being stored in
+the output file.
 .It Fl q , -quiet
 With this option, no warnings or errors are printed.
 .It Fl r , -recursive
@@ -171,6 +171,7 @@ Options on the command line will overrid
 .Sh SEE ALSO
 .Xr bzip2 1 ,
 .Xr compress 1 ,
+.Xr xz 1 ,
 .Xr fts 3 ,
 .Xr zlib 3
 .Sh HISTORY
@@ -190,9 +191,9 @@ program for
 This manual documents
 .Nx
 .Nm
-version 20040427.
+version 20150113.
 .Sh AUTHORS
 This implementation of
 .Nm
 was written by
-.An Matthew R. Green Aq m...@eterna.com.au .
+.An Matthew R. Green Aq Mt m...@eterna.com.au .

Index: src/usr.bin/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.93.4.3 src/usr.bin/gzip/gzip.c:1.93.4.3.6.1
--- src/usr.bin/gzip/gzip.c:1.93.4.3	Sun Nov  8 22:55:24 2009
+++ src/usr.bin/gzip/gzip.c	Sun Mar 15 21:15:22 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: gzip.c,v 1.93.4.3 2009/11/08 22:55:24 snj Exp $	*/
+/*	$NetBSD: gzip.c,v 1.93.4.3.6.1 2015/03/15 21:15:22 snj Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
 #ifndef lint
 __COPYRIGHT(@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
  Matthew R. Green.  All rights reserved.);
-__RCSID($NetBSD: gzip.c,v 1.93.4.3 2009/11/08 22:55:24 snj Exp $);
+__RCSID($NetBSD: gzip.c,v 1.93.4.3.6.1 2015/03/15 21:15:22 snj Exp $);
 #endif /* not lint */
 
 /*
@@ -81,6 +81,9 @@ enum filetype {
 #ifndef NO_PACK_SUPPORT
 	FT_PACK,
 #endif
+#ifndef NO_XZ_SUPPORT
+	FT_XZ,
+#endif
 	FT_LAST,
 	FT_UNKNOWN
 };
@@ -101,6 +104,12 @@ enum filetype {
 #define PACK_MAGIC	\037\036
 #endif
 
+#ifndef NO_XZ_SUPPORT
+#include lzma.h
+#define XZ_SUFFIX	.xz
+#define XZ_MAGIC	\3757zXZ
+#endif
+
 #define GZ_SUFFIX	.gz
 
 #define BUFLEN		(64 * 1024)
@@ -141,6 +150,9 @@ static suffixes_t suffixes[] = {
 #ifndef NO_COMPRESS_SUPPORT
 	SUFFIX(Z_SUFFIX,	),
 #endif
+#ifndef NO_XZ_SUPPORT
+	SUFFIX(XZ_SUFFIX,	),
+#endif
 	SUFFIX(GZ_SUFFIX,	),	/* Overwritten by -S  */
 #endif /* SMALL */
 #undef SUFFIX
@@ -148,7 +160,7 @@ static suffixes_t suffixes[] = {
 #define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0])
 #define SUFFIX_MAXLEN	30
 
-static	const char	gzip_version[] = NetBSD gzip 20091011;
+static	const char	gzip_version[] = NetBSD gzip 20150113;
 
 static	int	cflag;			/* stdout mode */
 static	int	dflag;			/* decompress mode */
@@ -157,6 +169,7 @@ static	int	numflag = 6;		/* gzip -1..-9 
 
 #ifndef SMALL
 static	int	fflag;			/* force mode */
+static	int	kflag;			/* don't delete input files */
 static	int	nflag;			/* don't save name/timestamp */
 static	int	Nflag;			/* don't restore name/timestamp */
 static	int	qflag;			/* quiet mode */
@@ -172,16 +185,17 @@

CVS commit: [netbsd-5] src/usr.bin/gzip

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 21:15:01 UTC 2015

Modified Files:
src/usr.bin/gzip [netbsd-5]: Makefile gzip.1 gzip.c zuncompress.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1951):
usr.bin/gzip/Makefile: patch
usr.bin/gzip/gzip.1: revisions 1.20-1.24
usr.bin/gzip/gzip.c: revisions 1.98-1.107
usr.bin/gzip/zuncompress.c: revisions 1.7-1.8
Sync gzip core with HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.12.4.1 -r1.12.4.2 src/usr.bin/gzip/Makefile
cvs rdiff -u -r1.19 -r1.19.4.1 src/usr.bin/gzip/gzip.1
cvs rdiff -u -r1.93.4.3 -r1.93.4.4 src/usr.bin/gzip/gzip.c
cvs rdiff -u -r1.6.28.1 -r1.6.28.2 src/usr.bin/gzip/zuncompress.c

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

Modified files:

Index: src/usr.bin/gzip/Makefile
diff -u src/usr.bin/gzip/Makefile:1.12.4.1 src/usr.bin/gzip/Makefile:1.12.4.2
--- src/usr.bin/gzip/Makefile:1.12.4.1	Sun Nov 17 17:59:55 2013
+++ src/usr.bin/gzip/Makefile	Sun Mar 15 21:15:01 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12.4.1 2013/11/17 17:59:55 bouyer Exp $
+#	$NetBSD: Makefile,v 1.12.4.2 2015/03/15 21:15:01 snj Exp $
 
 USE_FORT?= yes	# data-driven bugs?
 
@@ -32,3 +32,6 @@ LINKS+=		${BINDIR}/gzip ${BINDIR}/gunzip
 .if (defined(HAVE_GCC)  ${HAVE_GCC} == 4) || defined(HAVE_PCC)
 COPTS.gzip.c+=	-Wno-pointer-sign
 .endif
+
+# NetBSD-5 has no -lzma
+CPPFLAGS+=	-DNO_XZ_SUPPORT

Index: src/usr.bin/gzip/gzip.1
diff -u src/usr.bin/gzip/gzip.1:1.19 src/usr.bin/gzip/gzip.1:1.19.4.1
--- src/usr.bin/gzip/gzip.1:1.19	Thu May 29 14:51:27 2008
+++ src/usr.bin/gzip/gzip.1	Sun Mar 15 21:15:01 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: gzip.1,v 1.19 2008/05/29 14:51:27 mrg Exp $
+.\	$NetBSD: gzip.1,v 1.19.4.1 2015/03/15 21:15:01 snj Exp $
 .\
 .\ Copyright (c) 1997, 2003, 2004 Matthew R. Green
 .\ All rights reserved.
@@ -24,7 +24,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd April 27, 2004
+.Dd January 13, 2015
 .Dt GZIP 1
 .Os
 .Sh NAME
@@ -138,8 +138,8 @@ embedded in the file.
 This option causes the stored filename in the input file to be used
 as the output file.
 .It Fl n , -no-name
-This option stops the filename from being stored in the output
-file.
+This option stops the filename and timestamp from being stored in
+the output file.
 .It Fl q , -quiet
 With this option, no warnings or errors are printed.
 .It Fl r , -recursive
@@ -171,6 +171,7 @@ Options on the command line will overrid
 .Sh SEE ALSO
 .Xr bzip2 1 ,
 .Xr compress 1 ,
+.Xr xz 1 ,
 .Xr fts 3 ,
 .Xr zlib 3
 .Sh HISTORY
@@ -190,9 +191,9 @@ program for
 This manual documents
 .Nx
 .Nm
-version 20040427.
+version 20150113.
 .Sh AUTHORS
 This implementation of
 .Nm
 was written by
-.An Matthew R. Green Aq m...@eterna.com.au .
+.An Matthew R. Green Aq Mt m...@eterna.com.au .

Index: src/usr.bin/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.93.4.3 src/usr.bin/gzip/gzip.c:1.93.4.4
--- src/usr.bin/gzip/gzip.c:1.93.4.3	Sun Nov  8 22:55:24 2009
+++ src/usr.bin/gzip/gzip.c	Sun Mar 15 21:15:01 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: gzip.c,v 1.93.4.3 2009/11/08 22:55:24 snj Exp $	*/
+/*	$NetBSD: gzip.c,v 1.93.4.4 2015/03/15 21:15:01 snj Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
 #ifndef lint
 __COPYRIGHT(@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
  Matthew R. Green.  All rights reserved.);
-__RCSID($NetBSD: gzip.c,v 1.93.4.3 2009/11/08 22:55:24 snj Exp $);
+__RCSID($NetBSD: gzip.c,v 1.93.4.4 2015/03/15 21:15:01 snj Exp $);
 #endif /* not lint */
 
 /*
@@ -81,6 +81,9 @@ enum filetype {
 #ifndef NO_PACK_SUPPORT
 	FT_PACK,
 #endif
+#ifndef NO_XZ_SUPPORT
+	FT_XZ,
+#endif
 	FT_LAST,
 	FT_UNKNOWN
 };
@@ -101,6 +104,12 @@ enum filetype {
 #define PACK_MAGIC	\037\036
 #endif
 
+#ifndef NO_XZ_SUPPORT
+#include lzma.h
+#define XZ_SUFFIX	.xz
+#define XZ_MAGIC	\3757zXZ
+#endif
+
 #define GZ_SUFFIX	.gz
 
 #define BUFLEN		(64 * 1024)
@@ -141,6 +150,9 @@ static suffixes_t suffixes[] = {
 #ifndef NO_COMPRESS_SUPPORT
 	SUFFIX(Z_SUFFIX,	),
 #endif
+#ifndef NO_XZ_SUPPORT
+	SUFFIX(XZ_SUFFIX,	),
+#endif
 	SUFFIX(GZ_SUFFIX,	),	/* Overwritten by -S  */
 #endif /* SMALL */
 #undef SUFFIX
@@ -148,7 +160,7 @@ static suffixes_t suffixes[] = {
 #define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0])
 #define SUFFIX_MAXLEN	30
 
-static	const char	gzip_version[] = NetBSD gzip 20091011;
+static	const char	gzip_version[] = NetBSD gzip 20150113;
 
 static	int	cflag;			/* stdout mode */
 static	int	dflag;			/* decompress mode */
@@ -157,6 +169,7 @@ static	int	numflag = 6;		/* gzip -1..-9 
 
 #ifndef SMALL
 static	int	fflag;			/* force mode */
+static	int	kflag;			/* don't delete input files */
 static	int	nflag;			/* don't save name/timestamp */
 static	int	Nflag;			/* don't restore name/timestamp */
 static	int	qflag;			/* quiet mode */
@@ -172,16 +185,17 @@ static	int

CVS commit: [netbsd-5-1] src/usr.bin/gzip

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 21:15:11 UTC 2015

Modified Files:
src/usr.bin/gzip [netbsd-5-1]: Makefile gzip.1 gzip.c zuncompress.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1951):
usr.bin/gzip/Makefile: patch
usr.bin/gzip/gzip.1: revisions 1.20-1.24
usr.bin/gzip/gzip.c: revisions 1.98-1.107
usr.bin/gzip/zuncompress.c: revisions 1.7-1.8
Sync gzip core with HEAD.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.12.12.1 src/usr.bin/gzip/Makefile
cvs rdiff -u -r1.19 -r1.19.12.1 src/usr.bin/gzip/gzip.1
cvs rdiff -u -r1.93.4.3 -r1.93.4.3.2.1 src/usr.bin/gzip/gzip.c
cvs rdiff -u -r1.6.36.1 -r1.6.36.2 src/usr.bin/gzip/zuncompress.c

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

Modified files:

Index: src/usr.bin/gzip/Makefile
diff -u src/usr.bin/gzip/Makefile:1.12 src/usr.bin/gzip/Makefile:1.12.12.1
--- src/usr.bin/gzip/Makefile:1.12	Fri Aug 29 00:02:24 2008
+++ src/usr.bin/gzip/Makefile	Sun Mar 15 21:15:11 2015
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2008/08/29 00:02:24 gmcgarry Exp $
+#	$NetBSD: Makefile,v 1.12.12.1 2015/03/15 21:15:11 snj Exp $
 
 USE_FORT?= yes	# data-driven bugs?
 
@@ -30,3 +30,6 @@ LINKS+=		${BINDIR}/gzip ${BINDIR}/gunzip
 .if (defined(HAVE_GCC)  ${HAVE_GCC} == 4) || defined(HAVE_PCC)
 COPTS.gzip.c+=	-Wno-pointer-sign
 .endif
+
+# NetBSD-5 has no -lzma
+CPPFLAGS+=	-DNO_XZ_SUPPORT

Index: src/usr.bin/gzip/gzip.1
diff -u src/usr.bin/gzip/gzip.1:1.19 src/usr.bin/gzip/gzip.1:1.19.12.1
--- src/usr.bin/gzip/gzip.1:1.19	Thu May 29 14:51:27 2008
+++ src/usr.bin/gzip/gzip.1	Sun Mar 15 21:15:11 2015
@@ -1,4 +1,4 @@
-.\	$NetBSD: gzip.1,v 1.19 2008/05/29 14:51:27 mrg Exp $
+.\	$NetBSD: gzip.1,v 1.19.12.1 2015/03/15 21:15:11 snj Exp $
 .\
 .\ Copyright (c) 1997, 2003, 2004 Matthew R. Green
 .\ All rights reserved.
@@ -24,7 +24,7 @@
 .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\ SUCH DAMAGE.
 .\
-.Dd April 27, 2004
+.Dd January 13, 2015
 .Dt GZIP 1
 .Os
 .Sh NAME
@@ -138,8 +138,8 @@ embedded in the file.
 This option causes the stored filename in the input file to be used
 as the output file.
 .It Fl n , -no-name
-This option stops the filename from being stored in the output
-file.
+This option stops the filename and timestamp from being stored in
+the output file.
 .It Fl q , -quiet
 With this option, no warnings or errors are printed.
 .It Fl r , -recursive
@@ -171,6 +171,7 @@ Options on the command line will overrid
 .Sh SEE ALSO
 .Xr bzip2 1 ,
 .Xr compress 1 ,
+.Xr xz 1 ,
 .Xr fts 3 ,
 .Xr zlib 3
 .Sh HISTORY
@@ -190,9 +191,9 @@ program for
 This manual documents
 .Nx
 .Nm
-version 20040427.
+version 20150113.
 .Sh AUTHORS
 This implementation of
 .Nm
 was written by
-.An Matthew R. Green Aq m...@eterna.com.au .
+.An Matthew R. Green Aq Mt m...@eterna.com.au .

Index: src/usr.bin/gzip/gzip.c
diff -u src/usr.bin/gzip/gzip.c:1.93.4.3 src/usr.bin/gzip/gzip.c:1.93.4.3.2.1
--- src/usr.bin/gzip/gzip.c:1.93.4.3	Sun Nov  8 22:55:24 2009
+++ src/usr.bin/gzip/gzip.c	Sun Mar 15 21:15:11 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: gzip.c,v 1.93.4.3 2009/11/08 22:55:24 snj Exp $	*/
+/*	$NetBSD: gzip.c,v 1.93.4.3.2.1 2015/03/15 21:15:11 snj Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 2003, 2004, 2006 Matthew R. Green
@@ -30,7 +30,7 @@
 #ifndef lint
 __COPYRIGHT(@(#) Copyright (c) 1997, 1998, 2003, 2004, 2006\
  Matthew R. Green.  All rights reserved.);
-__RCSID($NetBSD: gzip.c,v 1.93.4.3 2009/11/08 22:55:24 snj Exp $);
+__RCSID($NetBSD: gzip.c,v 1.93.4.3.2.1 2015/03/15 21:15:11 snj Exp $);
 #endif /* not lint */
 
 /*
@@ -81,6 +81,9 @@ enum filetype {
 #ifndef NO_PACK_SUPPORT
 	FT_PACK,
 #endif
+#ifndef NO_XZ_SUPPORT
+	FT_XZ,
+#endif
 	FT_LAST,
 	FT_UNKNOWN
 };
@@ -101,6 +104,12 @@ enum filetype {
 #define PACK_MAGIC	\037\036
 #endif
 
+#ifndef NO_XZ_SUPPORT
+#include lzma.h
+#define XZ_SUFFIX	.xz
+#define XZ_MAGIC	\3757zXZ
+#endif
+
 #define GZ_SUFFIX	.gz
 
 #define BUFLEN		(64 * 1024)
@@ -141,6 +150,9 @@ static suffixes_t suffixes[] = {
 #ifndef NO_COMPRESS_SUPPORT
 	SUFFIX(Z_SUFFIX,	),
 #endif
+#ifndef NO_XZ_SUPPORT
+	SUFFIX(XZ_SUFFIX,	),
+#endif
 	SUFFIX(GZ_SUFFIX,	),	/* Overwritten by -S  */
 #endif /* SMALL */
 #undef SUFFIX
@@ -148,7 +160,7 @@ static suffixes_t suffixes[] = {
 #define NUM_SUFFIXES (sizeof suffixes / sizeof suffixes[0])
 #define SUFFIX_MAXLEN	30
 
-static	const char	gzip_version[] = NetBSD gzip 20091011;
+static	const char	gzip_version[] = NetBSD gzip 20150113;
 
 static	int	cflag;			/* stdout mode */
 static	int	dflag;			/* decompress mode */
@@ -157,6 +169,7 @@ static	int	numflag = 6;		/* gzip -1..-9 
 
 #ifndef SMALL
 static	int	fflag;			/* force mode */
+static	int	kflag;			/* don't delete input files */
 static	int	nflag;			/* don't save name/timestamp */
 static	int	Nflag;			/* don't restore name/timestamp */
 static	int	qflag;			/* quiet mode */
@@ -172,16 +185,17 @@

CVS commit: [netbsd-7] src/sys/fs/puffs

2015-03-15 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Sun Mar 15 22:43:02 UTC 2015

Modified Files:
src/sys/fs/puffs [netbsd-7]: puffs_vfsops.c

Log Message:
Pull up following revision(s) (requested by tron in ticket #587):
sys/fs/puffs/puffs_vfsops.c: revision 1.117
Remove debug printf


To generate a diff of this commit:
cvs rdiff -u -r1.113.2.3 -r1.113.2.4 src/sys/fs/puffs/puffs_vfsops.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/fs/puffs/puffs_vfsops.c
diff -u src/sys/fs/puffs/puffs_vfsops.c:1.113.2.3 src/sys/fs/puffs/puffs_vfsops.c:1.113.2.4
--- src/sys/fs/puffs/puffs_vfsops.c:1.113.2.3	Fri Feb 27 19:39:56 2015
+++ src/sys/fs/puffs/puffs_vfsops.c	Sun Mar 15 22:43:02 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: puffs_vfsops.c,v 1.113.2.3 2015/02/27 19:39:56 martin Exp $	*/
+/*	$NetBSD: puffs_vfsops.c,v 1.113.2.4 2015/03/15 22:43:02 snj Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006  Antti Kantee.  All Rights Reserved.
@@ -30,7 +30,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vfsops.c,v 1.113.2.3 2015/02/27 19:39:56 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vfsops.c,v 1.113.2.4 2015/03/15 22:43:02 snj Exp $);
 
 #include sys/param.h
 #include sys/kernel.h
@@ -124,7 +124,6 @@ puffs_vfsop_mount(struct mount *mp, cons
 		goto out;
 	}
 
-printf(args-pa_flags = 0x%x\n, args-pa_flags);
 	if ((args-pa_flags  ~PUFFS_KFLAG_MASK) != 0) {
 		printf(puffs_mount: invalid KFLAGs 0x%x\n, args-pa_flags);
 		error = EINVAL;

CVS commit: src/sys/ufs/ffs

CVS commit: src/sys/arch/sparc64/sparc64

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

CVS commit: [nick-nhusb] src/sys/dev/usb

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

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm

CVS commit: [netbsd-7] src/sys/dev/usb

CVS commit: [netbsd-7] src/tests/usr.bin/config/support/conf

CVS commit: [netbsd-7] src/sys/external/bsd/compiler_rt/dist/lib/builtins

CVS commit: [netbsd-7] src/sys/net/npf

CVS commit: [netbsd-7] src/sys/arch/arm/broadcom

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

CVS commit: [netbsd-7] src/doc

CVS commit: [netbsd-5] src/doc

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

CVS commit: [netbsd-5-2] src/doc

CVS commit: [netbsd-7] src/sys/arch/arm/cortex

CVS commit: [netbsd-7] src/usr.sbin/makemandb

CVS commit: [netbsd-7] src/sys/arch/evbarm/conf

CVS commit: [netbsd-7] src/sys/arch/arm/allwinner

CVS commit: [netbsd-5-2] src/usr.bin/gzip

CVS commit: [netbsd-5] src/usr.bin/gzip

CVS commit: [netbsd-5-1] src/usr.bin/gzip

CVS commit: [netbsd-7] src/sys/fs/puffs

24 matches

Site Navigation

Mail list logo

Footer information