date:20190502

CVS commit: [isaki-audio2] src/sys

2019-05-02 Thread Tetsuya Isaki

Module Name:src
Committed By:   isaki
Date:   Fri May  3 05:43:47 UTC 2019

Modified Files:
src/sys/arch/arm/sunxi [isaki-audio2]: sunxi_codec.h
src/sys/arch/i386/pnpbios [isaki-audio2]: ess_pnpbios.c sb_pnpbios.c
ym_pnpbios.c
src/sys/dev [isaki-audio2]: files.audio
src/sys/dev/hdaudio [isaki-audio2]: hdaudiovar.h
src/sys/dev/isa [isaki-audio2]: ad1848_isa.c sb_isa.c
src/sys/dev/isapnp [isaki-audio2]: ess_isapnp.c gus_isapnp.c
mpu_isapnp.c sb_isapnp.c
src/sys/dev/ofisa [isaki-audio2]: ess_ofisa.c sb_ofisa.c
src/sys/dev/pci [isaki-audio2]: cs428x.c
src/sys/dev/usb [isaki-audio2]: umidi.c umidi_quirks.c
Removed Files:
src/sys/dev [isaki-audio2]: auconv.c auconv.h mulaw.h

Log Message:
Remove dev/auconv.[ch].
 Now it is handled in dev/audio/audio.c and dev/audio/linear.c.
Remove dev/mulaw.h.
 It already have been just a link to dev/audio/mulaw.h in this
 branch.


To generate a diff of this commit:
cvs rdiff -u -r1.4.8.1 -r1.4.8.2 src/sys/arch/arm/sunxi/sunxi_codec.h
cvs rdiff -u -r1.22 -r1.22.56.1 src/sys/arch/i386/pnpbios/ess_pnpbios.c
cvs rdiff -u -r1.17 -r1.17.20.1 src/sys/arch/i386/pnpbios/sb_pnpbios.c
cvs rdiff -u -r1.18 -r1.18.20.1 src/sys/arch/i386/pnpbios/ym_pnpbios.c
cvs rdiff -u -r1.37.2.1 -r0 src/sys/dev/auconv.c
cvs rdiff -u -r1.21.8.1 -r0 src/sys/dev/auconv.h
cvs rdiff -u -r1.11.16.1 -r1.11.16.2 src/sys/dev/files.audio
cvs rdiff -u -r1.25.8.1 -r0 src/sys/dev/mulaw.h
cvs rdiff -u -r1.6 -r1.6.6.1 src/sys/dev/hdaudio/hdaudiovar.h
cvs rdiff -u -r1.38 -r1.38.54.1 src/sys/dev/isa/ad1848_isa.c \
src/sys/dev/isa/sb_isa.c
cvs rdiff -u -r1.22 -r1.22.64.1 src/sys/dev/isapnp/ess_isapnp.c
cvs rdiff -u -r1.39.2.1 -r1.39.2.2 src/sys/dev/isapnp/gus_isapnp.c
cvs rdiff -u -r1.20 -r1.20.52.1 src/sys/dev/isapnp/mpu_isapnp.c
cvs rdiff -u -r1.52 -r1.52.96.1 src/sys/dev/isapnp/sb_isapnp.c
cvs rdiff -u -r1.27 -r1.27.20.1 src/sys/dev/ofisa/ess_ofisa.c
cvs rdiff -u -r1.18 -r1.18.20.1 src/sys/dev/ofisa/sb_ofisa.c
cvs rdiff -u -r1.18.14.1 -r1.18.14.2 src/sys/dev/pci/cs428x.c
cvs rdiff -u -r1.76 -r1.76.2.1 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.21 -r1.21.20.1 src/sys/dev/usb/umidi_quirks.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/sunxi/sunxi_codec.h
diff -u src/sys/arch/arm/sunxi/sunxi_codec.h:1.4.8.1 src/sys/arch/arm/sunxi/sunxi_codec.h:1.4.8.2
--- src/sys/arch/arm/sunxi/sunxi_codec.h:1.4.8.1	Sat Apr 27 05:30:37 2019
+++ src/sys/arch/arm/sunxi/sunxi_codec.h	Fri May  3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_codec.h,v 1.4.8.1 2019/04/27 05:30:37 isaki Exp $ */
+/* $NetBSD: sunxi_codec.h,v 1.4.8.2 2019/05/03 05:43:46 isaki Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill 
@@ -31,7 +31,6 @@
 
 #include 
 #include 
-#include 
 
 #include 
 

Index: src/sys/arch/i386/pnpbios/ess_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22 src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22.56.1
--- src/sys/arch/i386/pnpbios/ess_pnpbios.c:1.22	Fri Jul  1 18:14:15 2011
+++ src/sys/arch/i386/pnpbios/ess_pnpbios.c	Fri May  3 05:43:46 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: ess_pnpbios.c,v 1.22 2011/07/01 18:14:15 dyoung Exp $	*/
+/*	$NetBSD: ess_pnpbios.c,v 1.22.56.1 2019/05/03 05:43:46 isaki Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.c,v 1.22 2011/07/01 18:14:15 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.c,v 1.22.56.1 2019/05/03 05:43:46 isaki Exp $");
 
 #include 
 #include 
@@ -45,7 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

Index: src/sys/arch/i386/pnpbios/sb_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.17 src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.17.20.1
--- src/sys/arch/i386/pnpbios/sb_pnpbios.c:1.17	Mon Jul 11 11:31:49 2016
+++ src/sys/arch/i386/pnpbios/sb_pnpbios.c	Fri May  3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sb_pnpbios.c,v 1.17 2016/07/11 11:31:49 msaitoh Exp $ */
+/* $NetBSD: sb_pnpbios.c,v 1.17.20.1 2019/05/03 05:43:46 isaki Exp $ */
 /*
  * Copyright (c) 1999
  * 	Matthias Drochner.  All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c,v 1.17 2016/07/11 11:31:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c,v 1.17.20.1 2019/05/03 05:43:46 isaki Exp $");
 
 #include 
 #include 
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

Index: src/sys/arch/i386/pnpbios/ym_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.18 src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.18.20.1
--- src/sys/arch/i386/pnpbios/ym_pnpbios.c:1.18	Thu Jul 14 10:19:05 2016
+++ src/sys/arch/i386/pnpbios/ym_pnpbios.c	Fri May  3 05:43:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD:

CVS commit: [isaki-audio2] src/sys/dev

2019-05-02 Thread Tetsuya Isaki

Module Name:src
Committed By:   isaki
Date:   Fri May  3 05:15:33 UTC 2019

Modified Files:
src/sys/dev [isaki-audio2]: audio_if.h
src/sys/dev/audio [isaki-audio2]: audio.c

Log Message:
Remove query_encoding and set_params interfaces from audio_hw_if
and remove related backward compatible routines.
All drivers were converted to use new query_format/set_format.


To generate a diff of this commit:
cvs rdiff -u -r1.70.24.2 -r1.70.24.3 src/sys/dev/audio_if.h
cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/dev/audio/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_if.h
diff -u src/sys/dev/audio_if.h:1.70.24.2 src/sys/dev/audio_if.h:1.70.24.3
--- src/sys/dev/audio_if.h:1.70.24.2	Sat Apr 27 12:05:28 2019
+++ src/sys/dev/audio_if.h	Fri May  3 05:15:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio_if.h,v 1.70.24.2 2019/04/27 12:05:28 isaki Exp $	*/
+/*	$NetBSD: audio_if.h,v 1.70.24.3 2019/05/03 05:15:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1994 Havard Eidnes.
@@ -182,20 +182,10 @@ struct audio_hw_if {
 	/* Obsoleted in AUDIO2. */
 	int	(*drain)(void *);	/* Optional: drain buffers */
 
-	/* Encoding. */
-	/* Obsoleted in AUDIO2. */
-	int	(*query_encoding)(void *, audio_encoding_t *);
-
-	/* Set the audio encoding parameters (record and play).
-	 * Return 0 on success, or an error code if the
-	 * requested parameters are impossible.
-	 * The values in the params struct may be changed (e.g. rounding
-	 * to the nearest sample rate.)
-	 */
-	/* Obsoleted in AUDIO2. */
-	int	(*set_params)(void *, int, int, audio_params_t *,
-		audio_params_t *, stream_filter_list_t *,
-		stream_filter_list_t *);
+	int	(*query_format)(void *, audio_format_query_t *);
+	int	(*set_format)(void *, int,
+		const audio_params_t *, const audio_params_t *,
+		audio_filter_reg_t *, audio_filter_reg_t *);
 
 	/* Hardware may have some say in the blocksize to choose */
 	int	(*round_blocksize)(void *, int, int, const audio_params_t *);
@@ -252,10 +242,6 @@ struct audio_hw_if {
 	int	(*dev_ioctl)(void *, u_long, void *, int, struct lwp *);
 	void	(*get_locks)(void *, kmutex_t **, kmutex_t **);
 
-	int	(*query_format)(void *, audio_format_query_t *);
-	int	(*set_format)(void *, int,
-		const audio_params_t *, const audio_params_t *,
-		audio_filter_reg_t *, audio_filter_reg_t *);
 };
 
 struct audio_attach_args {

Index: src/sys/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.1.2.3 src/sys/dev/audio/audio.c:1.1.2.4
--- src/sys/dev/audio/audio.c:1.1.2.3	Sat Apr 27 12:05:28 2019
+++ src/sys/dev/audio/audio.c	Fri May  3 05:15:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.1.2.3 2019/04/27 12:05:28 isaki Exp $	*/
+/*	$NetBSD: audio.c,v 1.1.2.4 2019/05/03 05:15:33 isaki Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -104,8 +104,8 @@
  *	open 			x	x +
  *	close 			x	x +
  *	drain 			x	x	(Not used in AUDIO2)
- *	query_encoding		-	x	(Not used in AUDIO2)
- *	set_params 		-	x	(Obsoleted in AUDIO2)
+ *	query_format		-	x
+ *	set_format		-	x
  *	round_blocksize		-	x
  *	commit_settings		-	x
  *	init_output 		x	x
@@ -129,8 +129,6 @@
  *	trigger_input 		x	x +
  *	dev_ioctl 		-	x
  *	get_locks 		-	-	Called at attach time
- *	query_format		-	x	(Added in AUDIO2)
- *	set_format		-	x	(Added in AUDIO2)
  *
  * *1 Note: Before 8.0, since these have been called only at attach time,
  *   neither lock were necessary.  In AUDIO2, on the other hand, since
@@ -154,7 +152,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.1.2.3 2019/04/27 12:05:28 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.1.2.4 2019/05/03 05:15:33 isaki Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -164,7 +162,6 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.
 #if NAUDIO > 0
 
 #ifdef _KERNEL
-#define OLD_FILTER
 
 #include 
 #include 
@@ -197,7 +194,6 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -211,7 +207,7 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.
 
 /*
  * 0: No debug logs
- * 1: action changes like open/close/set_param...
+ * 1: action changes like open/close/set_format...
  * 2: + normal operations like read/write/ioctl...
  * 3: + TRACEs except interrupt
  * 4: + TRACEs including interrupt
@@ -485,15 +481,6 @@ struct portname {
 	int mask;
 };
 
-#if defined(OLD_FILTER)
-typedef struct uio_fetcher {
-	stream_fetcher_t base;
-	struct uio *uio;
-	int usedhigh;
-	int last_used;
-} uio_fetcher_t;
-#endif
-
 static int audiomatch(device_t, cfdata_t, void *);
 static void audioattach(device_t, device_t, void *);
 static int audiodetach(device_t, int);
@@ -570,7 +557,7 @@ static void audio_track_setinfo_water(au
 	const struct audio_info *);
 static int audio_hw_setinfo(struct audio_softc *, const struct audio_info *,
 	struct audio_info *);
-static int audio_hw_set_params(struct audio_softc *, int,
+static int

CVS commit: [isaki-audio2] src/sys/arch/dreamcast/dev/g2

2019-05-02 Thread Tetsuya Isaki

Module Name:src
Committed By:   isaki
Date:   Fri May  3 04:15:23 UTC 2019

Modified Files:
src/sys/arch/dreamcast/dev/g2 [isaki-audio2]: aica.c

Log Message:
Adapt to audio2.
- audio2 limits the lowest frequency.
- Remove unused sc_encodings.
- In audio2, round_buffersize(RECORD) will not be called if the
  driver does not support recording.


To generate a diff of this commit:
cvs rdiff -u -r1.25.2.1 -r1.25.2.2 src/sys/arch/dreamcast/dev/g2/aica.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/dreamcast/dev/g2/aica.c
diff -u src/sys/arch/dreamcast/dev/g2/aica.c:1.25.2.1 src/sys/arch/dreamcast/dev/g2/aica.c:1.25.2.2
--- src/sys/arch/dreamcast/dev/g2/aica.c:1.25.2.1	Sun Apr 21 05:11:21 2019
+++ src/sys/arch/dreamcast/dev/g2/aica.c	Fri May  3 04:15:23 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: aica.c,v 1.25.2.1 2019/04/21 05:11:21 isaki Exp $	*/
+/*	$NetBSD: aica.c,v 1.25.2.2 2019/05/03 04:15:23 isaki Exp $	*/
 
 /*
  * Copyright (c) 2003 SHIMIZU Ryo 
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.25.2.1 2019/04/21 05:11:21 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.25.2.2 2019/05/03 04:15:23 isaki Exp $");
 
 #include 
 #include 
@@ -40,8 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: aica.c,v 1.2
 #include 
 
 #include 
-#include 
-#include 
+#include 	/* AUDIO_MIN_FREQUENCY */
 
 #include 
 
@@ -65,7 +64,6 @@ struct aica_softc {
 
 	/* audio property */
 	int			sc_open;
-	int			sc_encodings;
 	int			sc_precision;
 	int			sc_channels;
 	int			sc_rate;
@@ -85,41 +83,19 @@ struct aica_softc {
 	int			sc_nextfill;
 };
 
-const struct {
-	const char *name;
-	int	encoding;
-	int	precision;
-} aica_encodings[] = {
-	{AudioEadpcm,		AUDIO_ENCODING_ADPCM,		4},
-	{AudioEslinear,		AUDIO_ENCODING_SLINEAR,		8},
-	{AudioEulinear,		AUDIO_ENCODING_ULINEAR,		8},
-	{AudioEmulaw,		AUDIO_ENCODING_ULAW,		8},
-	{AudioEalaw,		AUDIO_ENCODING_ALAW,		8},
-	{AudioEslinear_be,	AUDIO_ENCODING_SLINEAR_BE,	16},
-	{AudioEslinear_le,	AUDIO_ENCODING_SLINEAR_LE,	16},
-	{AudioEulinear_be,	AUDIO_ENCODING_ULINEAR_BE,	16},
-	{AudioEulinear_le,	AUDIO_ENCODING_ULINEAR_LE,	16},
-};
-
-#define AICA_NFORMATS	5
-#define AICA_FORMAT(enc, prec, ch, chmask) \
-	{ \
-		.mode		= AUMODE_PLAY, \
-		.encoding	= (enc), \
-		.validbits	= (prec), \
-		.precision	= (prec), \
-		.channels	= (ch), \
-		.channel_mask	= (chmask), \
-		.frequency_type	= 0, \
-		.frequency	= { 1, 65536 }, \
-	}
-static const struct audio_format aica_formats[AICA_NFORMATS] = {
-	AICA_FORMAT(AUDIO_ENCODING_ADPCM,   4, 1, AUFMT_MONAURAL),
-	AICA_FORMAT(AUDIO_ENCODING_SLINEAR_LE, 16, 1, AUFMT_MONAURAL),
-	AICA_FORMAT(AUDIO_ENCODING_SLINEAR_LE, 16, 2, AUFMT_STEREO),
-	AICA_FORMAT(AUDIO_ENCODING_SLINEAR_LE,  8, 1, AUFMT_MONAURAL),
-	AICA_FORMAT(AUDIO_ENCODING_SLINEAR_LE,  8, 2, AUFMT_STEREO),
+static const struct audio_format aica_formats[] = {
+	{
+		.mode		= AUMODE_PLAY,
+		.encoding	= AUDIO_ENCODING_SLINEAR_LE,
+		.validbits	= 16,
+		.precision	= 16,
+		.channels	= 2,
+		.channel_mask	= AUFMT_STEREO,
+		.frequency_type	= 0,
+		.frequency	= { AUDIO_MIN_FREQUENCY, 65536 },
+	},
 };
+#define AICA_NFORMATS	__arraycount(aica_formats)
 
 int aica_match(device_t, cfdata_t, void *);
 void aica_attach(device_t, device_t, void *);
@@ -151,9 +127,10 @@ int aica_intr(void *);
 /* for audio */
 int aica_open(void *, int);
 void aica_close(void *);
-int aica_query_encoding(void *, struct audio_encoding *);
-int aica_set_params(void *, int, int, audio_params_t *,
-audio_params_t *, stream_filter_list_t *, stream_filter_list_t *);
+int aica_query_format(void *, audio_format_query_t *);
+int aica_set_format(void *, int,
+const audio_params_t *, const audio_params_t *,
+audio_filter_reg_t *, audio_filter_reg_t *);
 int aica_round_blocksize(void *, int, int, const audio_params_t *);
 size_t aica_round_buffersize(void *, int, size_t);
 int aica_trigger_output(void *, void *, void *, int, void (*)(void *), void *,
@@ -173,8 +150,8 @@ void aica_get_locks(void *, kmutex_t **,
 const struct audio_hw_if aica_hw_if = {
 	.open			= aica_open,
 	.close			= aica_close,
-	.query_encoding		= aica_query_encoding,
-	.set_params		= aica_set_params,
+	.query_format		= aica_query_format,
+	.set_format		= aica_set_format,
 	.round_blocksize	= aica_round_blocksize,
 	.halt_output		= aica_halt_output,
 	.halt_input		= aica_halt_input,
@@ -442,38 +419,23 @@ aica_close(void *addr)
 }
 
 int
-aica_query_encoding(void *addr, struct audio_encoding *fp)
+aica_query_format(void *addr, audio_format_query_t *afp)
 {
-	if (fp->index >= sizeof(aica_encodings) / sizeof(aica_encodings[0]))
-		return EINVAL;
 
-	strcpy(fp->name, aica_encodings[fp->index].name);
-	fp->encoding = aica_encodings[fp->index].encoding;
-	fp->precision = aica_encodings[fp->index].precision;
-	fp->flags = 0;
-
-	return 0;
+	return audio_query_format(aica_formats, AICA_NFORMATS, afp);
 }
 
 int

CVS commit: [isaki-audio2] src/sys/dev/isa

2019-05-02 Thread Tetsuya Isaki

Module Name:src
Committed By:   isaki
Date:   Fri May  3 03:00:33 UTC 2019

Modified Files:
src/sys/dev/isa [isaki-audio2]: pas.c sb.c sbdsp.c sbdspvar.h

Log Message:
Adapt sbdsp to audio2.
- Use new query_format/set_format interfaces.
  The formats are created from sb[pr]modes tables.
- Drop INDEPENDENT property for models proir to SB_16.


To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/dev/isa/pas.c
cvs rdiff -u -r1.90 -r1.90.2.1 src/sys/dev/isa/sb.c
cvs rdiff -u -r1.139.2.1 -r1.139.2.2 src/sys/dev/isa/sbdsp.c
cvs rdiff -u -r1.61 -r1.61.54.1 src/sys/dev/isa/sbdspvar.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/isa/pas.c
diff -u src/sys/dev/isa/pas.c:1.71 src/sys/dev/isa/pas.c:1.71.2.1
--- src/sys/dev/isa/pas.c:1.71	Sat Mar 16 12:09:58 2019
+++ src/sys/dev/isa/pas.c	Fri May  3 03:00:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: pas.c,v 1.71 2019/03/16 12:09:58 isaki Exp $	*/
+/*	$NetBSD: pas.c,v 1.71.2.1 2019/05/03 03:00:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -57,7 +57,7 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.71 2019/03/16 12:09:58 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pas.c,v 1.71.2.1 2019/05/03 03:00:33 isaki Exp $");
 
 #include 
 #include 
@@ -125,8 +125,8 @@ void	pasconf(int, int, int, int);
 const struct audio_hw_if pas_hw_if = {
 	.open			= sbdsp_open,
 	.close			= sbdsp_close,
-	.query_encoding		= sbdsp_query_encoding,
-	.set_params		= sbdsp_set_params,
+	.query_format		= sbdsp_query_format,
+	.set_format		= sbdsp_set_format,
 	.round_blocksize	= sbdsp_round_blocksize,
 	.halt_output		= sbdsp_halt_output,
 	.halt_input		= sbdsp_halt_input,
@@ -138,7 +138,6 @@ const struct audio_hw_if pas_hw_if = {
 	.allocm			= sb_malloc,
 	.freem			= sb_free,
 	.round_buffersize	= sb_round_buffersize,
-	.mappage		= sb_mappage,
 	.get_props		= sbdsp_get_props,
 	.trigger_output		= sbdsp_trigger_output,
 	.trigger_input		= sbdsp_trigger_input,

Index: src/sys/dev/isa/sb.c
diff -u src/sys/dev/isa/sb.c:1.90 src/sys/dev/isa/sb.c:1.90.2.1
--- src/sys/dev/isa/sb.c:1.90	Sat Mar 16 12:09:58 2019
+++ src/sys/dev/isa/sb.c	Fri May  3 03:00:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: sb.c,v 1.90 2019/03/16 12:09:58 isaki Exp $	*/
+/*	$NetBSD: sb.c,v 1.90.2.1 2019/05/03 03:00:33 isaki Exp $	*/
 
 /*
  * Copyright (c) 1991-1993 Regents of the University of California.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.90 2019/03/16 12:09:58 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sb.c,v 1.90.2.1 2019/05/03 03:00:33 isaki Exp $");
 
 #include "midi.h"
 
@@ -82,8 +82,8 @@ int	sb_getdev(void *, struct audio_devic
 const struct audio_hw_if sb_hw_if = {
 	.open			= sbdsp_open,
 	.close			= sbdsp_close,
-	.query_encoding		= sbdsp_query_encoding,
-	.set_params		= sbdsp_set_params,
+	.query_format		= sbdsp_query_format,
+	.set_format		= sbdsp_set_format,
 	.round_blocksize	= sbdsp_round_blocksize,
 	.halt_output		= sbdsp_halt_output,
 	.halt_input		= sbdsp_halt_input,
@@ -95,7 +95,6 @@ const struct audio_hw_if sb_hw_if = {
 	.allocm			= sb_malloc,
 	.freem			= sb_free,
 	.round_buffersize	= sb_round_buffersize,
-	.mappage		= sb_mappage,
 	.get_props		= sbdsp_get_props,
 	.trigger_output		= sbdsp_trigger_output,
 	.trigger_input		= sbdsp_trigger_input,

Index: src/sys/dev/isa/sbdsp.c
diff -u src/sys/dev/isa/sbdsp.c:1.139.2.1 src/sys/dev/isa/sbdsp.c:1.139.2.2
--- src/sys/dev/isa/sbdsp.c:1.139.2.1	Sun Apr 21 06:17:02 2019
+++ src/sys/dev/isa/sbdsp.c	Fri May  3 03:00:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: sbdsp.c,v 1.139.2.1 2019/04/21 06:17:02 isaki Exp $	*/
+/*	$NetBSD: sbdsp.c,v 1.139.2.2 2019/05/03 03:00:33 isaki Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.139.2.1 2019/04/21 06:17:02 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.139.2.2 2019/05/03 03:00:33 isaki Exp $");
 
 #include "midi.h"
 #include "mpu.h"
@@ -95,6 +95,7 @@ __KERNEL_RCSID(0, "$NetBSD: sbdsp.c,v 1.
 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -206,8 +207,34 @@ static struct sbmode sbrmodes[] = {
  { .model = -1 }
 };
 
+/*
+ * We actually can specify any value within the frequency range defined
+ * above.  But according to definition of SB_RATE_TO_TC macro, only some
+ * of them are dividable (it's preferable, not mandatory).  There are 9
+ * values in the range that satisfy this condition but it's too much.
+ */
+static const int sbdsp_rates[] = {
+	4000,
+	/* 5000, */
+	/* 6250, */
+	/* 1, */
+	12500,
+	/* 15625, */
+	2,
+	/* 25000, */
+	31250,
+};
+
 void	sbversion(struct sbdsp_softc *);
 void	sbdsp_jazz16_probe(struct sbdsp_softc *);
+void	sbdsp_sbmode2format(struct audio_format *, const struct sbmode *, int);
+int	sbdsp_set_format16(struct sbdsp_softc *, int,
+	const

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

2019-05-02 Thread matthew green

Module Name:src
Committed By:   mrg
Date:   Fri May  3 02:36:17 UTC 2019

Added Files:
src/sys/arch/arm/dts: sun8i-a83t-cubietruck-plus.dts

Log Message:
the standard sun8i-a83t-cubietruck-plus.dts is missing temp sensor
support that is in sun8i-a83t.dtsi.  this one includes both.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts

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

Added files:

Index: src/sys/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts
diff -u /dev/null src/sys/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts:1.1
--- /dev/null	Fri May  3 02:36:17 2019
+++ src/sys/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts	Fri May  3 02:36:17 2019
@@ -0,0 +1,32 @@
+/*	$NetBSD: sun8i-a83t-cubietruck-plus.dts,v 1.1 2019/05/03 02:36:17 mrg Exp $	*/
+
+/*
+ * Copyright (c) 2019 Matthew R. Green
+ * 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
+ *
+ * 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 "../../../external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts"
+#include "sun8i-a83t.dtsi"

CVS commit: src/sys/net

2019-05-02 Thread Paul Goyette

Module Name:src
Committed By:   pgoyette
Date:   Fri May  3 02:10:58 UTC 2019

Modified Files:
src/sys/net: rtsock_shared.c

Log Message:
Only initialize the NET_MPSAFE stuff once, for the non-compat version
of route_init().


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/net/rtsock_shared.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/rtsock_shared.c
diff -u src/sys/net/rtsock_shared.c:1.8 src/sys/net/rtsock_shared.c:1.9
--- src/sys/net/rtsock_shared.c:1.8	Mon Apr 29 16:12:30 2019
+++ src/sys/net/rtsock_shared.c	Fri May  3 02:10:58 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock_shared.c,v 1.8 2019/04/29 16:12:30 roy Exp $	*/
+/*	$NetBSD: rtsock_shared.c,v 1.9 2019/05/03 02:10:58 pgoyette Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.8 2019/04/29 16:12:30 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock_shared.c,v 1.9 2019/05/03 02:10:58 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1634,14 +1634,12 @@ COMPATNAME(route_init)(void)
 
 #ifndef COMPAT_RTSOCK
 	rt_init();
-#endif
 #ifdef NET_MPSAFE
 	rt_so_mtx = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
 
 	cv_init(_update_cv, "rtsock_cv");
 #endif
 
-#ifndef COMPAT_RTSOCK
 	sysctl_net_route_setup(NULL, PF_ROUTE, "rtable");
 #endif
 	ri->ri_intrq.ifq_maxlen = ri->ri_maxqlen;

CVS commit: src/sys/arch/atari/atari

2019-05-02 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Fri May  3 01:08:28 UTC 2019

Modified Files:
src/sys/arch/atari/atari: autoconf.c locore.s

Log Message:
Make sure interrupts are disabled during cpu_configure(9).

Fixes 'panic: kernel diagnostic assertion "cv_is_valid(cv)" failed'
during fdcisa(4) probe on Milan's DIAGNOSTIC kernel, caused by
a stray interrupt from the FDC right after isa_intr_establish().
No visible bad side effect on TT030 with this change.

Should be pulled up to netbsd-8.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/atari/atari/autoconf.c
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/atari/atari/locore.s

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

Modified files:

Index: src/sys/arch/atari/atari/autoconf.c
diff -u src/sys/arch/atari/atari/autoconf.c:1.65 src/sys/arch/atari/atari/autoconf.c:1.66
--- src/sys/arch/atari/atari/autoconf.c:1.65	Mon Mar 24 18:39:57 2014
+++ src/sys/arch/atari/atari/autoconf.c	Fri May  3 01:08:28 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.65 2014/03/24 18:39:57 christos Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.66 2019/05/03 01:08:28 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.65 2014/03/24 18:39:57 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.66 2019/05/03 01:08:28 tsutsui Exp $");
 
 #include "opt_md.h"
 
@@ -73,10 +73,14 @@ cpu_configure(void)
 
 	atari_realconfig = 1;
 
+	(void)splhigh();
+
 	init_sicallback();
 
 	if (config_rootfound("mainbus", __UNCONST("mainbus")) == NULL)
 		panic("no mainbus found");
+
+	(void)spl0();
 }
 
 void

Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.113 src/sys/arch/atari/atari/locore.s:1.114
--- src/sys/arch/atari/atari/locore.s:1.113	Tue Mar 19 20:30:05 2019
+++ src/sys/arch/atari/atari/locore.s	Fri May  3 01:08:28 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.s,v 1.113 2019/03/19 20:30:05 thorpej Exp $	*/
+/*	$NetBSD: locore.s,v 1.114 2019/05/03 01:08:28 tsutsui Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -1000,8 +1000,6 @@ Lcacheon:
 	/*
 	 * Final setup for C code
 	 */
-	movw	#PSL_LOWIPL,%sr		|  lower SPL
-
 #ifdef notdef
 	movl	%d6,_C_LABEL(bootdev)	|and boot device
 #endif

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

2019-05-02 Thread Jared D. McNeill

Module Name:src
Committed By:   jmcneill
Date:   Thu May  2 23:07:40 UTC 2019

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

Log Message:
Fix definition of GICD_IROUTER; the input to this macro is the INTID,
which can be a value between 32 and 1019.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/cortex/gic_reg.h

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

Modified files:

Index: src/sys/arch/arm/cortex/gic_reg.h
diff -u src/sys/arch/arm/cortex/gic_reg.h:1.10 src/sys/arch/arm/cortex/gic_reg.h:1.11
--- src/sys/arch/arm/cortex/gic_reg.h:1.10	Sat Nov 24 15:40:57 2018
+++ src/sys/arch/arm/cortex/gic_reg.h	Thu May  2 23:07:40 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: gic_reg.h,v 1.10 2018/11/24 15:40:57 skrll Exp $	*/
+/*	$NetBSD: gic_reg.h,v 1.11 2019/05/02 23:07:40 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -138,7 +138,7 @@
 #define	GICD_SGIR		0xF00 // Software Generated Interrupt Register
 #define	GICD_CPENDSGIR(n)	(0xF10+4*(n)) // SGI Clear-Pending Registers
 #define	GICD_SPENDSGIR(n)	(0xF20+4*(n)) // SGI Set-Pending Registers
-#define	GICD_IROUTER(n)		(0x6100+8*(n)) // Interrupt Routing Registers
+#define	GICD_IROUTER(n)		(0x6000+8*(n)) // Interrupt Routing Registers
 
 #define	GICD_CTRL_RWP			__BIT(31)	// GICv3
 #define	GICD_CTRL_E1NWF			__BIT(7)	// GICv3

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

2019-05-02 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Thu May  2 22:52:21 UTC 2019

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

Log Message:
Adapt t_ptrace_wait* tests for recent kernel changes

Adapt AUXV reading loop to handle io.piod_len == 0 as EOF.

Temporarily disable trace_thread_lwpcreate until it will be verified that
it is stable.


To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/tests/lib/libc/sys/t_ptrace_wait.c

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

Modified files:

Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.119 src/tests/lib/libc/sys/t_ptrace_wait.c:1.120
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.119	Thu May  2 00:34:06 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Thu May  2 22:52:21 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.119 2019/05/02 00:34:06 kamil Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.120 2019/05/02 22:52:21 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.119 2019/05/02 00:34:06 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.120 2019/05/02 22:52:21 kamil Exp $");
 
 #include 
 #include 
@@ -4063,10 +4063,10 @@ bytes_transfer_alignment(const char *ope
 		errno = 0;
 		i = 0;
 		/* Read the whole AUXV vector, it has no clear length */
-		while (errno != EIO) {
+		while (io.piod_len > 0) {
 			io.piod_offs = (void *)(intptr_t)i;
 			SYSCALL_REQUIRE(ptrace(PT_IO, child, , sizeof(io))
-			!= -1 || (errno == EIO && i > 0));
+			!= -1 || (io.piod_len == 0 && i > 0));
 			++i;
 		}
 	}
@@ -5359,7 +5359,7 @@ trace_threads(bool trace_create, bool tr
 	/* Track created and exited threads */
 	bool traced_lwps[__arraycount(t)];
 
-	if (trace_exit)
+	if (trace_create || trace_exit)
 		atf_tc_skip("PR kern/51995");
 
 	DPRINTF("Before forking process PID=%d\n", getpid());

CVS commit: src/sys/kern

2019-05-02 Thread Kamil Rytarowski

Module Name:src
Committed By:   kamil
Date:   Thu May  2 22:23:49 UTC 2019

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

Log Message:
Introduce fixes for ptrace(2)

Stop disabling LWP create and exit events for PT_SYSCALL tracing.
PT_SYSCALL disabled EXEC reporting for legacy reasons, there is no need
to repeat it for LWP and CHLD events.

Pass full siginfo from trapsignal events (SEGV, BUS, ILL, TRAP, FPE).
This adds missing information about signals like fault address.

Set ps_lwp always.

Before passing siginfo to userland through p_sigctx.ps_info, make sure
that it was zeroed for unused bytes. LWP and CHLD events do not set si_addr
and si_trap, these pieces of information are passed for crashes (like
software breakpoint).

LLDB crash reporting works now correctly:

(lldb) r
Process 552 launched: '/tmp/a.out' (x86_64)
Process 552 stopped
* thread #1, stop reason = signal SIGSEGV: invalid address (fault address: 
0x123456)


To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.355 -r1.356 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.65 -r1.66 src/sys/kern/sys_lwp.c

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

Modified files:

Index: src/sys/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.198 src/sys/kern/kern_lwp.c:1.199
--- src/sys/kern/kern_lwp.c:1.198	Wed May  1 21:57:34 2019
+++ src/sys/kern/kern_lwp.c	Thu May  2 22:23:49 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_lwp.c,v 1.198 2019/05/01 21:57:34 kamil Exp $	*/
+/*	$NetBSD: kern_lwp.c,v 1.199 2019/05/02 22:23:49 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -211,7 +211,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.198 2019/05/01 21:57:34 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.199 2019/05/02 22:23:49 kamil Exp $");
 
 #include "opt_ddb.h"
 #include "opt_lockdebug.h"
@@ -1079,7 +1079,7 @@ lwp_exit(struct lwp *l)
 	 */
 	mutex_enter(proc_lock);
 
-	if ((p->p_slflag & (PSL_TRACED|PSL_TRACELWP_EXIT|PSL_SYSCALL)) ==
+	if ((p->p_slflag & (PSL_TRACED|PSL_TRACELWP_EXIT)) ==
 	(PSL_TRACED|PSL_TRACELWP_EXIT)) {
 		mutex_enter(p->p_lock);
 		p->p_lwp_exited = l->l_lid;

Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.355 src/sys/kern/kern_sig.c:1.356
--- src/sys/kern/kern_sig.c:1.355	Wed May  1 21:52:35 2019
+++ src/sys/kern/kern_sig.c	Thu May  2 22:23:49 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_sig.c,v 1.355 2019/05/01 21:52:35 kamil Exp $	*/
+/*	$NetBSD: kern_sig.c,v 1.356 2019/05/02 22:23:49 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.355 2019/05/01 21:52:35 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.356 2019/05/02 22:23:49 kamil Exp $");
 
 #include "opt_ptrace.h"
 #include "opt_dtrace.h"
@@ -913,8 +913,14 @@ trapsignal(struct lwp *l, ksiginfo_t *ks
 	mutex_enter(p->p_lock);
 
 	if (ISSET(p->p_slflag, PSL_TRACED) &&
-	!(p->p_pptr == p->p_opptr && ISSET(p->p_lflag, PL_PPWAIT))) {
-		eventswitch(signo, ksi->ksi_code);
+	!(p->p_pptr == p->p_opptr && ISSET(p->p_lflag, PL_PPWAIT)) &&
+	p->p_xsig != SIGKILL &&
+	!sigismember(>p_sigpend.sp_set, SIGKILL)) {
+		p->p_xsig = signo;
+		p->p_sigctx.ps_faked = true;
+		p->p_sigctx.ps_lwp = ksi->ksi_lid;
+		p->p_sigctx.ps_info = ksi->ksi_info;
+		sigswitch(0, signo, false);
 		// XXX ktrpoint(KTR_PSIG)
 		mutex_exit(p->p_lock);
 		return;
@@ -1556,6 +1562,8 @@ eventswitch(int signo, int code)
 
 	p->p_xsig = signo;
 	p->p_sigctx.ps_faked = true;
+	p->p_sigctx.ps_lwp = l->l_lid;
+	memset(>p_sigctx.ps_info, 0, sizeof(p->p_sigctx.ps_info));
 	p->p_sigctx.ps_info._signo = signo;
 	p->p_sigctx.ps_info._code = code;
 

Index: src/sys/kern/sys_lwp.c
diff -u src/sys/kern/sys_lwp.c:1.65 src/sys/kern/sys_lwp.c:1.66
--- src/sys/kern/sys_lwp.c:1.65	Wed May  1 22:55:55 2019
+++ src/sys/kern/sys_lwp.c	Thu May  2 22:23:49 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_lwp.c,v 1.65 2019/05/01 22:55:55 kamil Exp $	*/
+/*	$NetBSD: sys_lwp.c,v 1.66 2019/05/02 22:23:49 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sys_lwp.c,v 1.65 2019/05/01 22:55:55 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_lwp.c,v 1.66 2019/05/02 22:23:49 kamil Exp $");
 
 #include 
 #include 
@@ -78,12 +78,12 @@ mi_startlwp(void *arg)
 	(p->p_emul->e_startlwp)(arg);
 
 	/* If the process is traced, report lwp creation to a debugger */
-	if ((p->p_slflag & (PSL_TRACED|PSL_TRACELWP_CREATE|PSL_SYSCALL)) ==
+	if ((p->p_slflag & (PSL_TRACED|PSL_TRACELWP_CREATE)) ==
 	(PSL_TRACED|PSL_TRACELWP_CREATE)) {
 		/* Paranoid check */
 		mutex_enter(proc_lock);
-		if ((p->p_slflag & (PSL_TRACED|PSL_TRACELWP_CREATE|PSL_SYSCALL)) !=
-

CVS commit: src/sys/dev/pci

2019-05-02 Thread Jaromir Dolecek

Module Name:src
Committed By:   jdolecek
Date:   Thu May  2 21:33:12 UTC 2019

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

Log Message:
add NetMos NM9912 entries

PR kern/54149 by Mouse


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/pci/pucdata.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/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.103 src/sys/dev/pci/pucdata.c:1.104
--- src/sys/dev/pci/pucdata.c:1.103	Thu Nov 29 23:53:44 2018
+++ src/sys/dev/pci/pucdata.c	Thu May  2 21:33:12 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: pucdata.c,v 1.103 2018/11/29 23:53:44 jmcneill Exp $	*/
+/*	$NetBSD: pucdata.c,v 1.104 2019/05/02 21:33:12 jdolecek Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999 Christopher G. Demetriou.  All rights reserved.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.103 2018/11/29 23:53:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.104 2019/05/02 21:33:12 jdolecek Exp $");
 
 #include 
 #include 
@@ -1010,6 +1010,23 @@ const struct puc_device_description puc_
 	},
 	},
 
+	/* NetMos PCIe NM9912 */
+	{ "NetMos NM9912 Dual PCI-E UART and 1284 Printer Port",
+	{   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9912, 0, 0x1000 },
+	{   0x, 0x, 0, 0x },
+	{
+		{ PUC_PORT_TYPE_COM, 0x10, 0x, 0 },
+	},
+	},
+
+	{ "NetMos NM9912 Dual PCI-E UART and 1284 Printer Port",
+	{   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9912, 0, 0x2000 },
+	{   0x, 0x, 0, 0x },
+	{
+		{ PUC_PORT_TYPE_LPT, 0x10, 0x, 0 },
+	},
+	},
+
 	/* NetMos PCIe NM9922 (PCI multi function): 2S */
 	{   "NetMos NM9922 UART",
 	{   PCI_VENDOR_NETMOS, PCI_PRODUCT_NETMOS_NM9922, 0, 0 },

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

2019-05-02 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Thu May  2 20:56:21 UTC 2019

Modified Files:
xsrc/external/mit/MesaLib/dist/src/util: u_atomic.c

Log Message:
fix for clang.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/MesaLib/dist/src/util/u_atomic.c

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

Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/util/u_atomic.c
diff -u xsrc/external/mit/MesaLib/dist/src/util/u_atomic.c:1.3 xsrc/external/mit/MesaLib/dist/src/util/u_atomic.c:1.4
--- xsrc/external/mit/MesaLib/dist/src/util/u_atomic.c:1.3	Mon Apr 15 16:32:43 2019
+++ xsrc/external/mit/MesaLib/dist/src/util/u_atomic.c	Thu May  2 16:56:21 2019
@@ -63,7 +63,11 @@ __atomic_fetch_sub_8(volatile long long 
 }
 
 WEAK long long
-__sync_val_compare_and_swap_8(volatile long long *ptr, long long oldval, long long newval)
+__sync_val_compare_and_swap_8(volatile long long *ptr, long long oldval, long long newval
+#ifdef __clang__
+	, ...
+#endif
+)
 {
long long r;

CVS commit: src/sys/arch/ia64/ia64

2019-05-02 Thread Sean Cole

Module Name:src
Committed By:   scole
Date:   Thu May  2 17:34:01 UTC 2019

Modified Files:
src/sys/arch/ia64/ia64: syscall_stubs.S

Log Message:
Add more code from FreeBSD, still needs work


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/ia64/syscall_stubs.S

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

Modified files:

Index: src/sys/arch/ia64/ia64/syscall_stubs.S
diff -u src/sys/arch/ia64/ia64/syscall_stubs.S:1.5 src/sys/arch/ia64/ia64/syscall_stubs.S:1.6
--- src/sys/arch/ia64/ia64/syscall_stubs.S:1.5	Wed Jan  9 18:03:34 2019
+++ src/sys/arch/ia64/ia64/syscall_stubs.S	Thu May  2 17:34:01 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: syscall_stubs.S,v 1.5 2019/01/09 18:03:34 scole Exp $	*/
+/*	$NetBSD: syscall_stubs.S,v 1.6 2019/05/02 17:34:01 scole Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2003 Marcel Moolenaar
@@ -74,9 +74,510 @@
  * information they need and we have the freedom to move code around.
  */
 
+/* XXX fix */	
+#define syscall		0	
+#define SYS_sigreturn	0
+	
 	.section	.text.gateway, "ax"
 	.align		PAGE_SIZE
 	.global		ia64_gateway_page
 ia64_gateway_page:
-#warning this is a stub!!!
+{   .mmb
+mov r14=ar.k7   // Memory stack
+mov r15=ar.k6   // Register stack
+epc
+;;
+}
+{   .mlx
+mov r11=psr
+movlr31=epc_syscall
+;;
+}
+{   .mib
+rum psr.be
+mov b7=r31
+br  b7
+;;
+}
+gw_ret:
+{   .mmi
+mov ar.rnat=r22
+;;
+mov ar.rsc=r24
+mov ar.pfs=r20
+}
+{   .mib
+mov ar.fpsr=r25
+mov b0=r18
+br.sptk b6
+;;
+}
+gw_ret_ia32:
+{   .mmi
+flushrs
+nop 0
+nop 0
+;;
+}
+{   .mib
+nop 0
+nop 0
+br.ia.sptk  b6
+;;
+}
 
+
+ENTRY_NOPROFILE(break_sigtramp, 0)
+{   .mib
+mov ar.rsc=0
+cmp.ne  p15,p0=0,gp
+cover
+;;
+}
+{   .mmi
+flushrs
+(p15)   invala
+add r16=16+UC_MCONTEXT+MC_SPECIAL,sp
+;;
+}
+{   .mmi
+mov r17=ar.bsp
+mov r18=ar.rnat
+add r14=40,r16
+;;
+}
+{   .mmi
+st8 [r14]=r17,64// bspstore
+(p15)   mov ar.bspstore=gp
+add r15=48,r16
+;;
+}
+{   .mmi
+st8 [r15]=r18   // rnat
+st8 [r14]=r0// ndirty
+nop 0
+;;
+}
+{   .mmi
+alloc   r14=ar.pfs, 0, 0, 3, 0
+mov ar.rsc=15
+mov out0=r8
+;;
+}
+{   .mmi
+ld8 r16=[r10],8 // function address
+;;
+ld8 gp=[r10]// function's gp value
+mov b7=r16
+;;
+}
+{   .mib
+mov out1=r9
+add out2=16,sp
+br.call.sptkrp=b7
+;;
+}
+{   .mmi
+mov r15=SYS_sigreturn
+add out0=16,sp
+break   0x10
+;;
+}
+{   .mmi
+mov r15=SYS_exit
+mov out0=ret0
+break   0x10
+;;
+}
+END(break_sigtramp)
+
+ENTRY_NOPROFILE(epc_sigtramp, 0)
+{   .mmi
+ld8 r16=[r10],8 // function address
+mov ar.rsc=0
+cmp.ne  p15,p0=0,gp
+;;
+}
+{   .mmi
+(p15)   invala
+(p15)   mov ar.bspstore=gp
+mov b7=r16
+;;
+}
+{   .mmi
+alloc   r14=ar.pfs, 0, 0, 3, 0
+mov ar.rsc=15
+nop 0
+;;
+}
+{   .mii
+ld8 gp=[r10]// function's gp value
+mov out0=r8
+mov out1=r9
+}
+{   .mib
+add out2=16,sp
+nop 0
+br.call.sptkrp=b7
+;;
+}
+add out0=16,sp
+/* XXX fix */	
+#if 0
+CALLSYS_NOERROR(sigreturn)
+mov out0=ret0
+CALLSYS_NOERROR(exit)
+#endif	
+END(epc_sigtramp)
+
+.align  PAGE_SIZE
+
+.text
+
+ENTRY_NOPROFILE(epc_syscall, 8)
+.prologue
+.unwabi @svr4, 'E'
+.save   rp, r0
+.body
+{   .mmi
+mov r16=ar.rsc
+mov ar.rsc=0
+nop 0
+;;
+}
+{   .mmi
+mov r18=ar.bspstore
+;;
+mov

CVS commit: src/sys/arch/ia64/ia64

2019-05-02 Thread Sean Cole

Module Name:src
Committed By:   scole
Date:   Thu May  2 17:31:56 UTC 2019

Modified Files:
src/sys/arch/ia64/ia64: genassym.cf

Log Message:
Restore UC_MCONTEXT, UC_MCONTEXT, and clean up some whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/ia64/ia64/genassym.cf

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/ia64/ia64/genassym.cf
diff -u src/sys/arch/ia64/ia64/genassym.cf:1.15 src/sys/arch/ia64/ia64/genassym.cf:1.16
--- src/sys/arch/ia64/ia64/genassym.cf:1.15	Thu May  2 16:55:50 2019
+++ src/sys/arch/ia64/ia64/genassym.cf	Thu May  2 17:31:56 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.15 2019/05/02 16:55:50 scole Exp $
+#	$NetBSD: genassym.cf,v 1.16 2019/05/02 17:31:56 scole Exp $
 
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -85,8 +85,8 @@ define	KSTACK_PAGES		KSTACK_PAGES
 
 define	IA64_VM_MINKERN_REGION	IA64_VM_MINKERN_REGION
 define	IA64_PBVM_RR		IA64_PBVM_RR
-define  IA64_PBVM_PAGE_SHIFT	IA64_PBVM_PAGE_SHIFT
-define  IA64_PSR_I		IA64_PSR_I
+define	IA64_PBVM_PAGE_SHIFT	IA64_PBVM_PAGE_SHIFT
+define	IA64_PSR_I		IA64_PSR_I
 define	IA64_PSR_DT		IA64_PSR_DT
 define	IA64_PSR_DFL		IA64_PSR_DFL
 define	IA64_PSR_DFH		IA64_PSR_DFH
@@ -95,7 +95,7 @@ define	IA64_PSR_RT		IA64_PSR_RT
 define	IA64_PSR_BN		IA64_PSR_BN
 define	IA64_PBVM_BASE		IA64_PBVM_BASE
 define	IA64_PBVM_PGTBL		IA64_PBVM_PGTBL
-define  IA64_DCR_DEFAULT	IA64_DCR_DEFAULT
+define	IA64_DCR_DEFAULT	IA64_DCR_DEFAULT
 
 define	PTE_PRESENT		PTE_PRESENT
 define	PTE_ACCESSED		PTE_ACCESSED
@@ -112,17 +112,20 @@ define	EFAULT			EFAULT
 # Important offsets into the lwp and proc structs & associated constants
 define	L_PCB			offsetof(struct lwp, l_addr)
 
-define  SIZEOF_PCB		sizeof(struct pcb)
-define  SIZEOF_TRAPFRAME	sizeof(struct trapframe)
+define	SIZEOF_PCB		sizeof(struct pcb)
+define	SIZEOF_TRAPFRAME	sizeof(struct trapframe)
 define	SIZEOF_SPECIAL		sizeof(struct _special)
 
+define	MC_SPECIAL		offsetof(struct __mcontext, mc_special)
+define	UC_MCONTEXT		offsetof(struct __ucontext, uc_mcontext)
+
 # general constants 
 define	VM_MAX_ADDRESS		VM_MAX_ADDRESS
 
 # Important offsets into the user struct & associated constants
 define	UPAGES			UPAGES
 
-define 	FRAME_SYSCALL		FRAME_SYSCALL
+define	FRAME_SYSCALL		FRAME_SYSCALL
 
 define	PC_CURLWP		offsetof(struct cpu_info, ci_curlwp) 
 define	PCB_ONFAULT		offsetof(struct pcb, pcb_onfault)

CVS commit: src/sys/arch/ia64

2019-05-02 Thread Sean Cole

Module Name:src
Committed By:   scole
Date:   Thu May  2 16:55:51 UTC 2019

Modified Files:
src/sys/arch/ia64/ia64: genassym.cf support.S
src/sys/arch/ia64/include: setjmp.h

Log Message:
Remove some unused assembly and other variables to reduce compile warnings


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/ia64/genassym.cf
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/ia64/support.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/setjmp.h

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

Modified files:

Index: src/sys/arch/ia64/ia64/genassym.cf
diff -u src/sys/arch/ia64/ia64/genassym.cf:1.14 src/sys/arch/ia64/ia64/genassym.cf:1.15
--- src/sys/arch/ia64/ia64/genassym.cf:1.14	Tue Nov 20 20:36:24 2018
+++ src/sys/arch/ia64/ia64/genassym.cf	Thu May  2 16:55:50 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.14 2018/11/20 20:36:24 scole Exp $
+#	$NetBSD: genassym.cf,v 1.15 2019/05/02 16:55:50 scole Exp $
 
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -63,48 +63,22 @@
 #	@(#)genassym.c	5.11 (Berkeley) 5/10/91
 #
 
-if defined(_KERNEL_OPT)
-include "opt_compat_linux.h"
-include "opt_multiprocessor.h"
-endif
-
 include 
 include 
 include 
 include 
-include 
 include 
 include 
 
-include 
-include 
-include 
-include 
-include 
-
 include 
 
 include 
 include 
 include 
-include 
 include 
 include 
 include 
 
-ifdef COMPAT_LINUX
-include 
-include 
-endif
-
-ifdef COMPAT_IA32
-
-endif
-
-ifdef MULTIPROCESSOR
-include 
-endif
-
 define	PAGE_SIZE		PAGE_SIZE
 define	PAGE_SHIFT		PAGE_SHIFT
 define	KSTACK_PAGES		KSTACK_PAGES
@@ -112,7 +86,13 @@ define	KSTACK_PAGES		KSTACK_PAGES
 define	IA64_VM_MINKERN_REGION	IA64_VM_MINKERN_REGION
 define	IA64_PBVM_RR		IA64_PBVM_RR
 define  IA64_PBVM_PAGE_SHIFT	IA64_PBVM_PAGE_SHIFT
+define  IA64_PSR_I		IA64_PSR_I
+define	IA64_PSR_DT		IA64_PSR_DT
+define	IA64_PSR_DFL		IA64_PSR_DFL
 define	IA64_PSR_DFH		IA64_PSR_DFH
+define	IA64_PSR_IT		IA64_PSR_IT
+define	IA64_PSR_RT		IA64_PSR_RT
+define	IA64_PSR_BN		IA64_PSR_BN
 define	IA64_PBVM_BASE		IA64_PBVM_BASE
 define	IA64_PBVM_PGTBL		IA64_PBVM_PGTBL
 define  IA64_DCR_DEFAULT	IA64_DCR_DEFAULT
@@ -125,61 +105,23 @@ define	PTE_AR_RWX		PTE_AR_RWX
 define	PTE_MA_WB		PTE_MA_WB
 define	PTE_MA_UC		PTE_MA_UC
 
-define	DT_NULL			DT_NULL
-define	DT_RELA			DT_RELA
-define	DT_RELAENT		DT_RELAENT
-define	DT_RELASZ		DT_RELASZ
-define	DT_SYMTAB		DT_SYMTAB
-define	DT_SYMENT		DT_SYMENT
-
-
-define	LSRUN			LSRUN
-define	LSONPROC		LSONPROC
-
 # errno values
 define	ENAMETOOLONG		ENAMETOOLONG
 define	EFAULT			EFAULT
 
 # Important offsets into the lwp and proc structs & associated constants
 define	L_PCB			offsetof(struct lwp, l_addr)
-define	L_PRIORITY		offsetof(struct lwp, l_priority)
-define	L_STAT			offsetof(struct lwp, l_stat)
-define	L_WCHAN			offsetof(struct lwp, l_wchan)
-define	L_PROC			offsetof(struct lwp, l_proc)
-define	L_CPU			offsetof(struct lwp, l_cpu)
-define	P_FLAG			offsetof(struct proc, p_flag)
-define	P_RASLIST		offsetof(struct proc, p_raslist)
-
-define	PK_SYSTEM		PK_SYSTEM
-
-define	M_DATA			offsetof(struct mbuf, m_data)
-define	M_LEN			offsetof(struct mbuf, m_len)
-define	M_NEXT			offsetof(struct mbuf, m_next)
-
-define	IP_SRC			offsetof(struct ip, ip_src)
-define	IP_DST			offsetof(struct ip, ip_dst)
-
-define	IP6_SRC			offsetof(struct ip6_hdr, ip6_src)
-define	IP6_DST			offsetof(struct ip6_hdr, ip6_dst)
-
-define	CI_NTRAP		offsetof(struct cpu_info, ci_data.cpu_ntrap)
-define	CI_NINTR		offsetof(struct cpu_info, ci_data.cpu_nintr)
 
 define  SIZEOF_PCB		sizeof(struct pcb)
 define  SIZEOF_TRAPFRAME	sizeof(struct trapframe)
 define	SIZEOF_SPECIAL		sizeof(struct _special)
 
-define	MC_SPECIAL		offsetof(struct __mcontext, mc_special)
-define	UC_MCONTEXT		offsetof(struct __ucontext, uc_mcontext)
-
 # general constants 
 define	VM_MAX_ADDRESS		VM_MAX_ADDRESS
 
 # Important offsets into the user struct & associated constants
 define	UPAGES			UPAGES
 
-#XXX: 
-
 define 	FRAME_SYSCALL		FRAME_SYSCALL
 
 define	PC_CURLWP		offsetof(struct cpu_info, ci_curlwp) 

Index: src/sys/arch/ia64/ia64/support.S
diff -u src/sys/arch/ia64/ia64/support.S:1.8 src/sys/arch/ia64/ia64/support.S:1.9
--- src/sys/arch/ia64/ia64/support.S:1.8	Sat Apr  6 03:06:25 2019
+++ src/sys/arch/ia64/ia64/support.S	Thu May  2 16:55:50 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: support.S,v 1.8 2019/04/06 03:06:25 thorpej Exp $	*/
+/*	$NetBSD: support.S,v 1.9 2019/05/02 16:55:50 scole Exp $	*/
 
 /*-
  * Copyright (c) 1998 Doug Rabson
@@ -56,7 +56,6 @@
  */
 
 #include 
-#include 
 
 #include "assym.h"
 

Index: src/sys/arch/ia64/include/setjmp.h
diff -u src/sys/arch/ia64/include/setjmp.h:1.2 src/sys/arch/ia64/include/setjmp.h:1.3
--- src/sys/arch/ia64/include/setjmp.h:1.2	Sun Sep 10 21:16:56 2006
+++ src/sys/arch/ia64/include/setjmp.h	Thu May  2 16:55:51 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: setjmp.h,v 1.2 2006/09/10 21:16:56 cherry Exp $	*/
+/*	$NetBSD:

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

2019-05-02 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu May  2 15:37:10 UTC 2019

Modified Files:
src/sys/arch/arm/include: armreg.h

Log Message:
It's the Normal Memory Remap Register (not Normal Region Remap Register)


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/arm/include/armreg.h

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

Modified files:

Index: src/sys/arch/arm/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.126 src/sys/arch/arm/include/armreg.h:1.127
--- src/sys/arch/arm/include/armreg.h:1.126	Thu May  2 11:49:04 2019
+++ src/sys/arch/arm/include/armreg.h	Thu May  2 15:37:10 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: armreg.h,v 1.126 2019/05/02 11:49:04 skrll Exp $	*/
+/*	$NetBSD: armreg.h,v 1.127 2019/05/02 15:37:10 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -870,8 +870,8 @@ ARMREG_READ_INLINE(l2ctrl, "p15,1,%0,c9,
 /* cp10 c10 registers */
 ARMREG_READ_INLINE(prrr, "p15,0,%0,c10,c2,0") /* Primary Region Remap Register */
 ARMREG_WRITE_INLINE(prrr, "p15,0,%0,c10,c2,0") /* Primary Region Remap Register */
-ARMREG_READ_INLINE(nmrr, "p15,0,%0,c10,c2,1") /* Normal Region Remap Register */
-ARMREG_WRITE_INLINE(nmrr, "p15,0,%0,c10,c2,1") /* Normal Region Remap Register */
+ARMREG_READ_INLINE(nmrr, "p15,0,%0,c10,c2,1") /* Normal Memory Remap Register */
+ARMREG_WRITE_INLINE(nmrr, "p15,0,%0,c10,c2,1") /* Normal Memory Remap Register */
 /* cp15 c13 registers */
 ARMREG_READ_INLINE(contextidr, "p15,0,%0,c13,c0,1") /* Context ID Register */
 ARMREG_WRITE_INLINE(contextidr, "p15,0,%0,c13,c0,1") /* Context ID Register */

CVS commit: src/lib/libm/man

2019-05-02 Thread Michał Górny

Module Name:src
Committed By:   mgorny
Date:   Thu May  2 15:08:35 UTC 2019

Modified Files:
src/lib/libm/man: nextafter.3

Log Message:
Explicitly indicate that nexttowardl() is identical to nextafterl().

Requested by kamil.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libm/man/nextafter.3

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

Modified files:

Index: src/lib/libm/man/nextafter.3
diff -u src/lib/libm/man/nextafter.3:1.7 src/lib/libm/man/nextafter.3:1.8
--- src/lib/libm/man/nextafter.3:1.7	Sun Apr 28 07:33:02 2019
+++ src/lib/libm/man/nextafter.3	Thu May  2 15:08:35 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: nextafter.3,v 1.7 2019/04/28 07:33:02 wiz Exp $
+.\" $NetBSD: nextafter.3,v 1.8 2019/05/02 15:08:35 mgorny Exp $
 .\"
 .\" Copyright (c) 2011 Jukka Ruohonen 
 .\" All rights reserved.
@@ -78,10 +78,9 @@ The three functions differ only in the t
 .Fa x .
 .Pp
 The
-.Fn nexttoward ,
-.Fn nexttowardf
+.Fn nexttoward
 and
-.Fn nexttowardl
+.Fn nexttowardf
 functions are equivalent to the
 .Fn nextafter
 family of functions with two exceptions:
@@ -97,6 +96,10 @@ converted to the type of the function, p
 equals
 .Fa y .
 .El
+.Pp
+.Fn nexttowardl
+is equivalent to
+.Fn nextafterl .
 .Sh RETURN VALUES
 Upon successful completion, the described functions return
 the next representable floating-point value as described above.

CVS commit: src/external/mpl/bind/dist/bin/named

2019-05-02 Thread Takahiro Kambe

Module Name:src
Committed By:   taca
Date:   Thu May  2 14:57:01 UTC 2019

Modified Files:
src/external/mpl/bind/dist/bin/named: server.c

Log Message:
Fix one more writable directory check to "directory" in options seciton
when named is reloaded case.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mpl/bind/dist/bin/named/server.c

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

Modified files:

Index: src/external/mpl/bind/dist/bin/named/server.c
diff -u src/external/mpl/bind/dist/bin/named/server.c:1.5 src/external/mpl/bind/dist/bin/named/server.c:1.6
--- src/external/mpl/bind/dist/bin/named/server.c:1.5	Sun Apr 28 00:01:13 2019
+++ src/external/mpl/bind/dist/bin/named/server.c	Thu May  2 14:57:01 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: server.c,v 1.5 2019/04/28 00:01:13 christos Exp $	*/
+/*	$NetBSD: server.c,v 1.6 2019/05/02 14:57:01 taca Exp $	*/
 
 /*
  * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
@@ -6466,6 +6466,7 @@ directory_callback(const char *clausenam
 			"option 'directory' contains relative path '%s'",
 			directory);
 
+#if 0
 	if (!isc_file_isdirwritable(directory)) {
 		isc_log_write(named_g_lctx, NAMED_LOGCATEGORY_GENERAL,
 			  NAMED_LOGMODULE_SERVER, ISC_LOG_ERROR,
@@ -6473,6 +6474,7 @@ directory_callback(const char *clausenam
 			  directory);
 		return (ISC_R_NOPERM);
 	}
+#endif
 
 	result = isc_dir_chdir(directory);
 	if (result != ISC_R_SUCCESS) {

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

2019-05-02 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu May  2 11:49:04 UTC 2019

Modified Files:
src/sys/arch/arm/include: armreg.h

Log Message:
Fix Normal Region Remap Register bitmask names


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/sys/arch/arm/include/armreg.h

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

Modified files:

Index: src/sys/arch/arm/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.125 src/sys/arch/arm/include/armreg.h:1.126
--- src/sys/arch/arm/include/armreg.h:1.125	Wed Jan 30 02:02:23 2019
+++ src/sys/arch/arm/include/armreg.h	Thu May  2 11:49:04 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: armreg.h,v 1.125 2019/01/30 02:02:23 jmcneill Exp $	*/
+/*	$NetBSD: armreg.h,v 1.126 2019/05/02 11:49:04 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -523,12 +523,12 @@
 #define TTBCR_L_EPD0	__BIT(7)	// Don't use TTBR0
 #define TTBCR_L_T0SZ	__BITS(2,0)	// TTBR0 size offset
 
-#define NRRR_ORn(n)	__BITS(17+2*(n),16+2*(n)) // Outer Cacheable mappings
-#define NRRR_IRn(n)	__BITS(1+2*(n),0+2*(n)) // Inner Cacheable mappings
-#define NRRR_NC		0		// non-cacheable
-#define NRRR_WB_WA	1		// write-back write-allocate
-#define NRRR_WT		2		// write-through
-#define NRRR_WB		3		// write-back
+#define NMRR_ORn(n)	__BITS(17+2*(n),16+2*(n)) // Outer Cacheable mappings
+#define NMRR_IRn(n)	__BITS(1+2*(n),0+2*(n)) // Inner Cacheable mappings
+#define NMRR_NC		0		// non-cacheable
+#define NMRR_WBWA	1		// write-back write-allocate
+#define NMRR_WT		2		// write-through
+#define NMRR_WB		3		// write-back
 #define PRRR_NOSn(n)	__BITS(24+2*(n))// Memory region is Inner Shareable
 #define PRRR_NS1	__BIT(19)	// Normal Shareable S=1 is Shareable
 #define PRRR_NS0	__BIT(18)	// Normal Shareable S=0 is Shareable
@@ -870,8 +870,8 @@ ARMREG_READ_INLINE(l2ctrl, "p15,1,%0,c9,
 /* cp10 c10 registers */
 ARMREG_READ_INLINE(prrr, "p15,0,%0,c10,c2,0") /* Primary Region Remap Register */
 ARMREG_WRITE_INLINE(prrr, "p15,0,%0,c10,c2,0") /* Primary Region Remap Register */
-ARMREG_READ_INLINE(nrrr, "p15,0,%0,c10,c2,1") /* Normal Region Remap Register */
-ARMREG_WRITE_INLINE(nrrr, "p15,0,%0,c10,c2,1") /* Normal Region Remap Register */
+ARMREG_READ_INLINE(nmrr, "p15,0,%0,c10,c2,1") /* Normal Region Remap Register */
+ARMREG_WRITE_INLINE(nmrr, "p15,0,%0,c10,c2,1") /* Normal Region Remap Register */
 /* cp15 c13 registers */
 ARMREG_READ_INLINE(contextidr, "p15,0,%0,c13,c0,1") /* Context ID Register */
 ARMREG_WRITE_INLINE(contextidr, "p15,0,%0,c13,c0,1") /* Context ID Register */

CVS commit: src/sys/dev

2019-05-02 Thread Michael van Elst

Module Name:src
Committed By:   mlelstv
Date:   Thu May  2 09:19:28 UTC 2019

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

Log Message:
take interrupt lock when closing backend.


To generate a diff of this commit:
cvs rdiff -u -r1.459 -r1.460 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.459 src/sys/dev/audio.c:1.460
--- src/sys/dev/audio.c:1.459	Wed Feb 27 02:27:38 2019
+++ src/sys/dev/audio.c	Thu May  2 09:19:28 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: audio.c,v 1.459 2019/02/27 02:27:38 mrg Exp $	*/
+/*	$NetBSD: audio.c,v 1.460 2019/05/02 09:19:28 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2016 Nathanial Sloss 
@@ -148,7 +148,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.459 2019/02/27 02:27:38 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.460 2019/05/02 09:19:28 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "audio.h"
@@ -2366,8 +2366,11 @@ audio_open(dev_t dev, struct audio_softc
 bad:
 	audio_destroy_pfilters(vc);
 	audio_destroy_rfilters(vc);
-	if (hw->close != NULL && sc->sc_opens == 0 && sc->sc_recopens == 0)
+	if (hw->close != NULL && sc->sc_opens == 0 && sc->sc_recopens == 0) {
+		mutex_enter(sc->sc_intr_lock);
 		hw->close(sc->hw_hdl);
+		mutex_exit(sc->sc_intr_lock);
+	}
 	mutex_exit(sc->sc_lock);
 	if (sc->sc_usemixer) {
 		audio_free_ring(sc, >sc_mpr);

CVS commit: [isaki-audio2] src/sys

CVS commit: [isaki-audio2] src/sys/dev

CVS commit: [isaki-audio2] src/sys/arch/dreamcast/dev/g2

CVS commit: [isaki-audio2] src/sys/dev/isa

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

CVS commit: src/sys/net

CVS commit: src/sys/arch/atari/atari

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

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

CVS commit: src/sys/kern

CVS commit: src/sys/dev/pci

CVS commit: xsrc/external/mit/MesaLib/dist/src/util

CVS commit: src/sys/arch/ia64/ia64

CVS commit: src/sys/arch/ia64/ia64

CVS commit: src/sys/arch/ia64

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

CVS commit: src/lib/libm/man

CVS commit: src/external/mpl/bind/dist/bin/named

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

CVS commit: src/sys/dev

20 matches

Site Navigation

Mail list logo

Footer information