CVS commit: src/doc
Module Name:src Committed By: isaki Date: Sat May 4 04:54:15 UTC 2019 Modified Files: src/doc: BRANCHES Log Message: Add isaki-audio2 branch. To generate a diff of this commit: cvs rdiff -u -r1.348 -r1.349 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.348 src/doc/BRANCHES:1.349 --- src/doc/BRANCHES:1.348 Mon Jan 28 00:43:54 2019 +++ src/doc/BRANCHES Sat May 4 04:54:15 2019 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.348 2019/01/28 00:43:54 jdolecek Exp $ +# $NetBSD: BRANCHES,v 1.349 2019/05/04 04:54:15 isaki Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -459,6 +459,17 @@ Maintainer: Robert Swindells +Scope: src/sys +Notes: Rework audio subsystem, including multiple streaming, + filter pipeline. + Branch: itohy-usb1 Description: USB stack overhaul, mostly DMA related Status: Terminated
CVS commit: [isaki-audio2] src/sys
Module Name:src
Committed By: isaki
Date: Sat May 4 04:51:21 UTC 2019
Modified Files:
src/sys/arch/amiga/dev [isaki-audio2]: aucc.c
src/sys/arch/evbarm/mini2440 [isaki-audio2]: audio_mini2440.c
src/sys/arch/hppa/gsc [isaki-audio2]: harmony.c harmonyvar.h
src/sys/dev/ic [isaki-audio2]: arcofi.c arcofivar.h
Log Message:
Remove simple flags that indicate whether the device is opened.
These are handled in the upper layer now.
To generate a diff of this commit:
cvs rdiff -u -r1.44.2.1 -r1.44.2.2 src/sys/arch/amiga/dev/aucc.c
cvs rdiff -u -r1.2.2.2 -r1.2.2.3 \
src/sys/arch/evbarm/mini2440/audio_mini2440.c
cvs rdiff -u -r1.5.2.1 -r1.5.2.2 src/sys/arch/hppa/gsc/harmony.c
cvs rdiff -u -r1.1.38.1 -r1.1.38.2 src/sys/arch/hppa/gsc/harmonyvar.h
cvs rdiff -u -r1.1.28.4 -r1.1.28.5 src/sys/dev/ic/arcofi.c
cvs rdiff -u -r1.1.28.1 -r1.1.28.2 src/sys/dev/ic/arcofivar.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/amiga/dev/aucc.c
diff -u src/sys/arch/amiga/dev/aucc.c:1.44.2.1 src/sys/arch/amiga/dev/aucc.c:1.44.2.2
--- src/sys/arch/amiga/dev/aucc.c:1.44.2.1 Sun Apr 21 09:33:54 2019
+++ src/sys/arch/amiga/dev/aucc.c Sat May 4 04:51:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: aucc.c,v 1.44.2.1 2019/04/21 09:33:54 isaki Exp $ */
+/* $NetBSD: aucc.c,v 1.44.2.2 2019/05/04 04:51:20 isaki Exp $ */
/*
* Copyright (c) 1999 Bernardo Innocenti
@@ -46,7 +46,7 @@
#if NAUCC > 0
#include
-__KERNEL_RCSID(0, "$NetBSD: aucc.c,v 1.44.2.1 2019/04/21 09:33:54 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aucc.c,v 1.44.2.2 2019/05/04 04:51:20 isaki Exp $");
#include
#include
@@ -98,7 +98,6 @@ extern struct audio_channel channel[4];
* Software state.
*/
struct aucc_softc {
- int sc_open; /* single use device */
aucc_data_t sc_channel[4]; /* per channel freq, ... */
u_int sc_encoding; /* encoding AUDIO_ENCODING_.*/
int sc_channels; /* # of channels used */
@@ -312,9 +311,6 @@ aucc_open(void *addr, int flags)
sc = addr;
DPRINTF(("sa_open: unit %p\n",sc));
- if (sc->sc_open)
- return EBUSY;
- sc->sc_open = 1;
for (i = 0; i < AUCC_MAXINT; i++) {
sc->sc_channel[i].nd_intr = NULL;
sc->sc_channel[i].nd_intrdata = NULL;
@@ -330,11 +326,6 @@ aucc_open(void *addr, int flags)
void
aucc_close(void *addr)
{
- struct aucc_softc *sc;
-
- sc = addr;
- DPRINTF(("sa_close: sc=%p\n", sc));
- sc->sc_open = 0;
DPRINTF(("sa_close: closed.\n"));
}
Index: src/sys/arch/evbarm/mini2440/audio_mini2440.c
diff -u src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.2.2.2 src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.2.2.3
--- src/sys/arch/evbarm/mini2440/audio_mini2440.c:1.2.2.2 Wed May 1 13:45:52 2019
+++ src/sys/arch/evbarm/mini2440/audio_mini2440.c Sat May 4 04:51:20 2019
@@ -66,8 +66,6 @@ struct uda_softc {
s3c2440_i2s_buf_t sc_rec_buf;
void *sc_i2s_handle;
-
- bool sc_open;
};
int uda_ssio_open(void *, int);
@@ -161,7 +159,6 @@ uda_ssio_attach(device_t parent, device_
sc->sc_play_buf = NULL;
sc->sc_i2s_handle = aa->i2sa_handle;
- sc->sc_open = false;
mutex_init(>sc_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(>sc_intr_lock, MUTEX_DEFAULT, IPL_SCHED);
@@ -211,15 +208,10 @@ uda_ssio_attach(device_t parent, device_
int
uda_ssio_open(void *handle, int flags)
{
- struct uda1341_softc *uc = handle;
- struct uda_softc *sc = uc->parent;
int retval;
DPRINTF(("%s\n", __func__));
- if (sc->sc_open)
- return EBUSY;
-
/* We only support write operations */
if (!(flags & FREAD) && !(flags & FWRITE))
return EINVAL;
@@ -233,20 +225,16 @@ uda_ssio_open(void *handle, int flags)
return retval;
}
- sc->sc_open = true;
-
return 0; /* SUCCESS */
}
void
uda_ssio_close(void *handle)
{
- struct uda1341_softc *uc = handle;
- struct uda_softc *sc = uc->parent;
+
DPRINTF(("%s\n", __func__));
uda1341_close(handle);
- sc->sc_open = false;
}
int
Index: src/sys/arch/hppa/gsc/harmony.c
diff -u src/sys/arch/hppa/gsc/harmony.c:1.5.2.1 src/sys/arch/hppa/gsc/harmony.c:1.5.2.2
--- src/sys/arch/hppa/gsc/harmony.c:1.5.2.1 Sun Apr 21 10:11:44 2019
+++ src/sys/arch/hppa/gsc/harmony.c Sat May 4 04:51:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: harmony.c,v 1.5.2.1 2019/04/21 10:11:44 isaki Exp $ */
+/* $NetBSD: harmony.c,v 1.5.2.2 2019/05/04 04:51:20 isaki Exp $ */
/* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */
@@ -89,7 +89,6 @@
#include
#include
-int harmony_open(void *, int);
void harmony_close(void *);
int harmony_query_format(void *, audio_format_query_t *);
int harmony_set_format(void *, int,
@@ -117,7 +116,6 @@ int harmony_trigger_input(void *, void *
void harmony_get_locks(void *, kmutex_t **, kmutex_t **);
const struct audio_hw_if harmony_sa_hw_if = {
- .open = harmony_open,
.close = harmony_close,
.query_format = harmony_query_format,
.set_format = harmony_set_format,
@@ -420,18 +418,6 @@
CVS commit: [isaki-audio2] src/sys/arch/hpcmips/vr
Module Name:src
Committed By: isaki
Date: Sat May 4 04:44:03 UTC 2019
Modified Files:
src/sys/arch/hpcmips/vr [isaki-audio2]: vraiu.c
Log Message:
Remove sc_status flag. Such flag that indicates whether the device
is opened is handled in the upper layer now. And it also fixes that
was not able to call commit_setting() before open() since netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.16.2.1 -r1.16.2.2 src/sys/arch/hpcmips/vr/vraiu.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/hpcmips/vr/vraiu.c
diff -u src/sys/arch/hpcmips/vr/vraiu.c:1.16.2.1 src/sys/arch/hpcmips/vr/vraiu.c:1.16.2.2
--- src/sys/arch/hpcmips/vr/vraiu.c:1.16.2.1 Sun Apr 21 09:54:00 2019
+++ src/sys/arch/hpcmips/vr/vraiu.c Sat May 4 04:44:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vraiu.c,v 1.16.2.1 2019/04/21 09:54:00 isaki Exp $ */
+/* $NetBSD: vraiu.c,v 1.16.2.2 2019/05/04 04:44:03 isaki Exp $ */
/*
* Copyright (c) 2001 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.16.2.1 2019/04/21 09:54:00 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vraiu.c,v 1.16.2.2 2019/05/04 04:44:03 isaki Exp $");
#include
#include
@@ -72,7 +72,6 @@ struct vraiu_softc {
vrcmu_chipset_tag_t sc_cc;
void *sc_handler;
u_short *sc_buf; /* DMA buffer pointer */
- int sc_status; /* status */
u_int sc_rate; /* sampling rate */
u_char sc_volume; /* volume */
void (*sc_intr)(void *); /* interrupt routine */
@@ -106,8 +105,6 @@ const struct audio_format vraiu_formats
/*
* Define our interface to the higher level audio driver.
*/
-int vraiu_open(void *, int);
-void vraiu_close(void *);
int vraiu_query_format(void *, audio_format_query_t *);
int vraiu_round_blocksize(void *, int, int, const audio_params_t *);
int vraiu_commit_settings(void *);
@@ -127,8 +124,6 @@ int vraiu_get_props(void *);
void vraiu_get_locks(void *, kmutex_t **, kmutex_t **);
const struct audio_hw_if vraiu_hw_if = {
- .open = vraiu_open,
- .close = vraiu_close,
.query_format = vraiu_query_format,
.set_format = vraiu_set_format,
.round_blocksize = vraiu_round_blocksize,
@@ -169,7 +164,6 @@ vraiu_attach(device_t parent, device_t s
va = aux;
sc = device_private(self);
sc->sc_dev = self;
- sc->sc_status = ENXIO;
sc->sc_intr = NULL;
sc->sc_iot = va->va_iot;
sc->sc_vrip = va->va_vc;
@@ -253,7 +247,6 @@ vraiu_attach(device_t parent, device_t s
}
printf("\n");
- sc->sc_status = 0;
sc->sc_rate = SPS8000;
DPRINTFN(1, ("vraiu_attach: reset AIU\n"))
bus_space_write_2(sc->sc_iot, sc->sc_ioh, SEQ_REG_W, AIURST);
@@ -262,31 +255,6 @@ vraiu_attach(device_t parent, device_t s
}
int
-vraiu_open(void *self, int flags)
-{
- struct vraiu_softc *sc;
-
- DPRINTFN(1, ("vraiu_open\n"));
- sc = self;
- if (sc->sc_status) {
- DPRINTFN(0, ("vraiu_open: device error\n"));
- return sc->sc_status;
- }
- sc->sc_status = EBUSY;
- return 0;
-}
-
-void
-vraiu_close(void *self)
-{
- struct vraiu_softc *sc;
-
- DPRINTFN(1, ("vraiu_close\n"));
- sc = self;
- sc->sc_status = 0;
-}
-
-int
vraiu_query_format(void *self, audio_format_query_t *afp)
{
@@ -340,8 +308,6 @@ vraiu_commit_settings(void *self)
DPRINTFN(1, ("vraiu_commit_settings\n"));
sc = self;
- if (sc->sc_status != EBUSY)
- return sc->sc_status;
DPRINTFN(1, ("vraiu_commit_settings: set conversion rate %d\n",
sc->sc_rate))
CVS commit: [isaki-audio2] src/sys
Module Name:src
Committed By: isaki
Date: Sat May 4 04:13:25 UTC 2019
Modified Files:
src/sys/arch/amiga/dev [isaki-audio2]: toccata.c
src/sys/arch/arm/imx [isaki-audio2]: imx23_digfilt.c
src/sys/arch/arm/sunxi [isaki-audio2]: sunxi_i2s.c
src/sys/arch/zaurus/dev [isaki-audio2]: wm8731_zaudio.c wm8750_zaudio.c
src/sys/dev [isaki-audio2]: audio_dai.h audio_if.h
src/sys/dev/audio [isaki-audio2]: audio.c
src/sys/dev/bluetooth [isaki-audio2]: btsco.c
src/sys/dev/fdt [isaki-audio2]: ausoc.c
src/sys/dev/ic [isaki-audio2]: ad1848var.h arcofi.c interwave.c
interwavevar.h
src/sys/dev/isa [isaki-audio2]: ad1848_isa.c ad1848var.h ess.c gus.c
wss.c ym.c
src/sys/dev/isapnp [isaki-audio2]: gus_isapnp.c
src/sys/dev/pci [isaki-audio2]: esa.c gcscaudio.c yds.c
Log Message:
Remove obsoleted methods in audio_hw_if.
- drain: is handled in audio upper layer now.
- mappage: is handled in audio upper layer now.
- setfd: no one uses and it's meaningless now.
To generate a diff of this commit:
cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/sys/arch/amiga/dev/toccata.c
cvs rdiff -u -r1.1.24.1 -r1.1.24.2 src/sys/arch/arm/imx/imx23_digfilt.c
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 src/sys/arch/arm/sunxi/sunxi_i2s.c
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/sys/arch/zaurus/dev/wm8731_zaudio.c
cvs rdiff -u -r1.2.4.2 -r1.2.4.3 src/sys/arch/zaurus/dev/wm8750_zaudio.c
cvs rdiff -u -r1.4.2.1 -r1.4.2.2 src/sys/dev/audio_dai.h
cvs rdiff -u -r1.70.24.3 -r1.70.24.4 src/sys/dev/audio_if.h
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/dev/audio/audio.c
cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/dev/bluetooth/btsco.c
cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/sys/dev/fdt/ausoc.c
cvs rdiff -u -r1.18.54.1 -r1.18.54.2 src/sys/dev/ic/ad1848var.h
cvs rdiff -u -r1.1.28.3 -r1.1.28.4 src/sys/dev/ic/arcofi.c
cvs rdiff -u -r1.40.2.1 -r1.40.2.2 src/sys/dev/ic/interwave.c
cvs rdiff -u -r1.18.42.1 -r1.18.42.2 src/sys/dev/ic/interwavevar.h
cvs rdiff -u -r1.38.54.1 -r1.38.54.2 src/sys/dev/isa/ad1848_isa.c
cvs rdiff -u -r1.44 -r1.44.54.1 src/sys/dev/isa/ad1848var.h
cvs rdiff -u -r1.84.2.2 -r1.84.2.3 src/sys/dev/isa/ess.c
cvs rdiff -u -r1.115.2.1 -r1.115.2.2 src/sys/dev/isa/gus.c
cvs rdiff -u -r1.72.2.1 -r1.72.2.2 src/sys/dev/isa/wss.c
cvs rdiff -u -r1.45.2.1 -r1.45.2.2 src/sys/dev/isa/ym.c
cvs rdiff -u -r1.39.2.3 -r1.39.2.4 src/sys/dev/isapnp/gus_isapnp.c
cvs rdiff -u -r1.63.2.2 -r1.63.2.3 src/sys/dev/pci/esa.c
cvs rdiff -u -r1.16.2.2 -r1.16.2.3 src/sys/dev/pci/gcscaudio.c
cvs rdiff -u -r1.61.2.2 -r1.61.2.3 src/sys/dev/pci/yds.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/amiga/dev/toccata.c
diff -u src/sys/arch/amiga/dev/toccata.c:1.18.2.1 src/sys/arch/amiga/dev/toccata.c:1.18.2.2
--- src/sys/arch/amiga/dev/toccata.c:1.18.2.1 Sun Apr 21 05:59:59 2019
+++ src/sys/arch/amiga/dev/toccata.c Sat May 4 04:13:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: toccata.c,v 1.18.2.1 2019/04/21 05:59:59 isaki Exp $ */
+/* $NetBSD: toccata.c,v 1.18.2.2 2019/05/04 04:13:23 isaki Exp $ */
/*-
* Copyright (c) 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.18.2.1 2019/04/21 05:59:59 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: toccata.c,v 1.18.2.2 2019/05/04 04:13:23 isaki Exp $");
#include
#include
@@ -179,12 +179,6 @@ void toccata_get_locks(void *, kmutex_t
const struct audio_hw_if audiocs_hw_if = {
.open = toccata_open,
.close = toccata_close,
- /*
- * XXX toccata_drain could be written:
- * sleep for play interrupt. This loses less than 512 bytes of
- * sample data, otherwise up to 1024.
- */
- .drain = NULL,
.query_format = ad1848_query_format,
.set_format = ad1848_set_format,
.round_blocksize = toccata_round_blocksize,
Index: src/sys/arch/arm/imx/imx23_digfilt.c
diff -u src/sys/arch/arm/imx/imx23_digfilt.c:1.1.24.1 src/sys/arch/arm/imx/imx23_digfilt.c:1.1.24.2
--- src/sys/arch/arm/imx/imx23_digfilt.c:1.1.24.1 Wed Apr 24 12:01:50 2019
+++ src/sys/arch/arm/imx/imx23_digfilt.c Sat May 4 04:13:23 2019
@@ -1,4 +1,4 @@
-/* $Id: imx23_digfilt.c,v 1.1.24.1 2019/04/24 12:01:50 isaki Exp $ */
+/* $Id: imx23_digfilt.c,v 1.1.24.2 2019/05/04 04:13:23 isaki Exp $ */
/*
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -159,14 +159,12 @@ static const struct audio_hw_if digfilt_
.halt_output = digfilt_halt_output,
.speaker_ctl = NULL,
.getdev = digfilt_getdev,
- .setfd = NULL,
.set_port = digfilt_set_port,
.get_port = digfilt_get_port,
.query_devinfo = digfilt_query_devinfo,
.allocm = digfilt_allocm,
.freem = digfilt_freem,
.round_buffersize = digfilt_round_buffersize,
- .mappage = NULL,
.get_props = digfilt_get_props,
.trigger_output = NULL,
.trigger_input = NULL,
Index: src/sys/arch/arm/sunxi/sunxi_i2s.c
diff -u
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Sat May 4 02:52:55 UTC 2019
Modified Files:
src/bin/sh: eval.c
Log Message:
When a return occurs in the test part of a loop statement (while/until)
(inside a function or dot script) the exit status of that return
statement should become the exit status of the function (or dot
script) - we were ignoring it,
That is
fn() { while return 7; do return 9; done; return 11; }
should exit with status 7. It was exiting 0.
This is apparently another old ash bug that has been fixed
everywhere else in the past.
Issue pointed out by Martijn Dekker, (fairly obvious) fix borrowed
from FreeBSD, due for return sometime next century.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/bin/sh/eval.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.174 src/bin/sh/eval.c:1.175
--- src/bin/sh/eval.c:1.174 Sat Feb 9 09:17:59 2019
+++ src/bin/sh/eval.c Sat May 4 02:52:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.174 2019/02/09 09:17:59 kre Exp $ */
+/* $NetBSD: eval.c,v 1.175 2019/05/04 02:52:55 kre Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)eval.c 8.9 (Berkeley) 6/8/95";
#else
-__RCSID("$NetBSD: eval.c,v 1.174 2019/02/09 09:17:59 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.175 2019/05/04 02:52:55 kre Exp $");
#endif
#endif /* not lint */
@@ -407,6 +407,8 @@ evalloop(union node *n, int flags)
}
if (evalskip == SKIPBREAK && --skipcount <= 0)
evalskip = SKIPNONE;
+ if (evalskip == SKIPFUNC || evalskip == SKIPFILE)
+status = exitstatus;
break;
}
if (n->type == NWHILE) {
CVS commit: src
Module Name:src
Committed By: kre
Date: Sat May 4 02:52:22 UTC 2019
Modified Files:
src/bin/sh: parser.c
src/tests/bin/sh: t_expand.sh
Log Message:
Fix an (apparent) ancient ash bug, that was apparently fixed sometime
in the past, but managed to re-surface...
The expression "${0+\}}" should expand to "}" not "\}"
Almost all other shells handle it that way (incl FreeBSD & dash).
Issue pointed out by Martijn Dekker.
Add ATF sub-tests for the 4 old var expand operators (${var+word}
${var-word} ${var-word} and ${var?word} - including the forms
with the ':' included) and amongst those tests include test cases
for this issue, so if the bug tries to appear again, we can squash
it quicker. (The newer pattern matching operators are already
well tested as part of testing patterns.)
To generate a diff of this commit:
cvs rdiff -u -r1.167 -r1.168 src/bin/sh/parser.c
cvs rdiff -u -r1.21 -r1.22 src/tests/bin/sh/t_expand.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.167 src/bin/sh/parser.c:1.168
--- src/bin/sh/parser.c:1.167 Wed Feb 27 04:10:56 2019
+++ src/bin/sh/parser.c Sat May 4 02:52:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: parser.c,v 1.167 2019/02/27 04:10:56 kre Exp $ */
+/* $NetBSD: parser.c,v 1.168 2019/05/04 02:52:22 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95";
#else
-__RCSID("$NetBSD: parser.c,v 1.167 2019/02/27 04:10:56 kre Exp $");
+__RCSID("$NetBSD: parser.c,v 1.168 2019/05/04 02:52:22 kre Exp $");
#endif
#endif /* not lint */
@@ -1974,6 +1974,7 @@ readtoken1(int firstc, char const *syn,
CVTRACE(DBG_LEXER, quotef==0, (" QF=1 "));
quotef = 1; /* current token is quoted */
if (quoted && c != '\\' && c != '`' &&
+ (c != '}' || varnest == 0) &&
c != '$' && (c != '"' || magicq)) {
/*
* retain the \ (which we *know* needs CTLESC)
Index: src/tests/bin/sh/t_expand.sh
diff -u src/tests/bin/sh/t_expand.sh:1.21 src/tests/bin/sh/t_expand.sh:1.22
--- src/tests/bin/sh/t_expand.sh:1.21 Wed Apr 10 08:13:11 2019
+++ src/tests/bin/sh/t_expand.sh Sat May 4 02:52:22 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_expand.sh,v 1.21 2019/04/10 08:13:11 kre Exp $
+# $NetBSD: t_expand.sh,v 1.22 2019/05/04 02:52:22 kre Exp $
#
# Copyright (c) 2007, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1332,10 +1332,283 @@ embedded_nl_body() {
EOF
}
+check3()
+{
+ check "X=foo; ${1}" "$2" 0
+ check "X=; ${1}" "$3" 0
+ check "unset X; ${1}" "$4" 0
+}
+
+atf_test_case alternative
+alternative_head() {
+ atf_set descr 'Test various possibilities for ${var+xxx}'
+}
+alternative_body() {
+ reset alternative
+
+ # just to verify (validate) that the test method works as expected
+ # (this is currently the very first test performed in this test set)
+ check 'printf %s a b'ab 0 # 1
+
+ check3 'set -- ${X+bar}; echo "$#:$1"' 1:bar 1:bar 0: # 4
+ check3 'set -- ${X+}; echo "$#:$1"' 0: 0: 0: # 7
+ check3 'set -- ${X+""}; echo "$#:$1"' 1: 1: 0: # 10
+ check3 'set -- "${X+}"; echo "$#:$1"' 1: 1: 1: # 13
+ check3 'set -- "${X+bar}"; echo "$#:$1"' 1:bar 1:bar 1: # 16
+
+ check3 'set -- ${X+a b c}; echo "$#:$1"' 3:a 3:a 0: # 19
+ check3 'set -- ${X+"a b c"}; echo "$#:$1"' '1:a b c' '1:a b c' 0:
+ check3 'set -- "${X+a b c}"; echo "$#:$1"' '1:a b c' '1:a b c' 1:
+ check3 'set -- ${X+a b\ c}; echo "$#:$1"' 2:a 2:a 0: # 28
+ check3 'set -- ${X+"a b" c}; echo "$#:$1"' '2:a b' '2:a b' 0:
+
+ check3 'printf %s "" ${X+}' '' '' '' # 34
+ check3 'printf %s ""${X+bar}' bar bar '' # 37
+
+ check3 'Y=bar; printf %s ${X+x}${Y+y}' xy xy y # 40
+ check3 'Y=bar; printf %s ""${X+${Y+z}}' z z '' # 43
+ check3 'Y=; printf %s ""${X+${Y+z}}' z z '' # 46
+ check3 'unset Y; printf %s ""${X+${Y+z}}' '' '' '' # 49
+ check3 'Y=1; printf %s a ${X+"${Y+z}"}' az az a # 52
+
+ check3 'printf %s ${X+}x}' x} x} x} # 55
+ check3 'printf %s ${X+}}' } } } # 58
+ check3 'printf %s "" ${X+"}"x}' }x }x '' # 61
+ check3 'printf %s "" ${X+\}x}' }x }x '' # 64
+ check3 'printf %s "${X+\}x}"' }x }x '' # 67
+ check3 'printf %s "${X+\}}"' } } '' # 70
+
+ check3 'set -- ${X:+bar}; echo "$#:$1"' 1:bar 0: 0: # 73
+ check3 'set -- ${X:+}; echo "$#:$1"' 0: 0: 0: # 76
+ check3 'set -- ${X:+""}; echo "$#:$1"' 1: 0: 0: # 79
+ check3 'set -- "${X:+}"; echo "$#:$1"' 1: 1: 1: # 80
+ check3 'set -- "${X:+bar}"; echo "$#:$1"' 1:bar 1: 1: # 83
+
+ check3 'set -- ${X:+a b c}; echo "$#:$1"' 3:a 0: 0: # 86
+ check3 'set -- ${X:+"a b c"}; echo "$#:$1"' '1:a b c' 0: 0: # 89
+ check3 'set -- "${X:+a b c}"; echo "$#:$1"' '1:a b c' 1: 1: # 92
+ check3 'set -- ${X:+a b\ c}; echo "$#:$1"' 2:a 0: 0: # 95
+ check3 'set -- ${X:+"a b" c}; echo "$#:$1"' '2:a b' 0: 0: # 98
+
+ check3 'printf %s "" ${X:+}' '' '' '' #101
+ check3 'printf
CVS commit: src/sys/arch/ia64/conf
Module Name:src
Committed By: scole
Date: Sat May 4 02:06:59 UTC 2019
Modified Files:
src/sys/arch/ia64/conf: Makefile.ia64
Log Message:
Disable optimization for pmap.c to prevent RAW assembler dependency
warnings.
If port ever becomes more stable, should revert this and figure out
exactly why only pmap seems to have this issue in the kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/conf/Makefile.ia64
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/conf/Makefile.ia64
diff -u src/sys/arch/ia64/conf/Makefile.ia64:1.6 src/sys/arch/ia64/conf/Makefile.ia64:1.7
--- src/sys/arch/ia64/conf/Makefile.ia64:1.6 Sat Sep 22 12:24:02 2018
+++ src/sys/arch/ia64/conf/Makefile.ia64 Sat May 4 02:06:59 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ia64,v 1.6 2018/09/22 12:24:02 rin Exp $
+# $NetBSD: Makefile.ia64,v 1.7 2019/05/04 02:06:59 scole Exp $
# Makefile for NetBSD
#
@@ -34,6 +34,11 @@ GENASSYM_CONF= ${IA64}/ia64/genassym.cf
CPPFLAGS+= -mconstant-gp -Dia64
AFLAGS+= -x assembler-with-cpp -Wa,-x
+# XXX don't optimize pmap.c to get rid of assembler warnings like:
+# Warning: Use of 'st8' may violate RAW dependency 'RR#' (data)
+# Happening with gcc7 and iirc several years worth of prior gcc versions
+COPTS.pmap.c+= -O0
+
##
## (3) libkern and compat
##
CVS commit: src/sys/arch/sgimips/gio
Module Name:src Committed By: macallan Date: Sat May 4 00:45:18 UTC 2019 Modified Files: src/sys/arch/sgimips/gio: newportreg.h Log Message: moar registers to the right branch this time (hopefully) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sgimips/gio/newportreg.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/sgimips/gio/newportreg.h diff -u src/sys/arch/sgimips/gio/newportreg.h:1.6 src/sys/arch/sgimips/gio/newportreg.h:1.7 --- src/sys/arch/sgimips/gio/newportreg.h:1.6 Wed Jan 11 21:23:07 2012 +++ src/sys/arch/sgimips/gio/newportreg.h Sat May 4 00:45:18 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: newportreg.h,v 1.6 2012/01/11 21:23:07 macallan Exp $ */ +/* $NetBSD: newportreg.h,v 1.7 2019/05/04 00:45:18 macallan Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -143,6 +143,7 @@ #define REX3_REG_ZPATTERN 0x0014 #define REX3_REG_COLORBACK 0x0018 +#define REX3_REG_COLORVRAM 0x001c #define REX3_REG_XSTART 0x0100 @@ -191,6 +192,17 @@ #define REX3_REG_TOPSCAN 0x1320 #define REX3_REG_XYWIN 0x1324 +#define REX3_REG_CLIPMODE 0x1328 +#define REX3_CLIPMODE_SMASK0 0x0001 +#define REX3_CLIPMODE_SMASK1 0x0002 +#define REX3_CLIPMODE_SMASK2 0x0004 +#define REX3_CLIPMODE_SMASK3 0x0008 +#define REX3_CLIPMODE_SMASK4 0x0010 +#define REX3_CLIPMODE_CIDMATCH0 0x0100 +#define REX3_CLIPMODE_CIDMATCH1 0x0200 +#define REX3_CLIPMODE_CIDMATCH2 0x0400 +#define REX3_CLIPMODE_CIDMATCH3 0x0800 + #define REX3_REG_STATUS 0x1338 #define REX3_STATUS_GFXBUSY 0x0008 @@ -261,6 +273,10 @@ #define XMAP9_DCBCRS_PUP_CMAP 4 #define XMAP9_DCBCRS_MODE_SETUP 5 #define XMAP9_MODE_GAMMA_BYPASS 0x04 +#define XMAP9_MODE_PIXMODE_CI 0x00 +#define XMAP9_MODE_PIXMODE_RGB0 0x000100 +#define XMAP9_MODE_PIXMODE_RGB1 0x000200 +#define XMAP9_MODE_PIXMODE_RGB2 0x000300 #define XMAP9_MODE_PIXSIZE_8BPP 0x000400 #define XMAP9_MODE_PIXSIZE_24BPP 0x000c00 #define XMAP9_DCBCRS_MODE_SELECT 7
CVS commit: [isaki-audio2] src/sys/arch/sgimips/gio
Module Name:src Committed By: macallan Date: Sat May 4 00:40:07 UTC 2019 Modified Files: src/sys/arch/sgimips/gio [isaki-audio2]: newportreg.h Log Message: moar registers ( so I don't forget to commit this along with the actual newport changes... ) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.50.1 src/sys/arch/sgimips/gio/newportreg.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/sgimips/gio/newportreg.h diff -u src/sys/arch/sgimips/gio/newportreg.h:1.6 src/sys/arch/sgimips/gio/newportreg.h:1.6.50.1 --- src/sys/arch/sgimips/gio/newportreg.h:1.6 Wed Jan 11 21:23:07 2012 +++ src/sys/arch/sgimips/gio/newportreg.h Sat May 4 00:40:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: newportreg.h,v 1.6 2012/01/11 21:23:07 macallan Exp $ */ +/* $NetBSD: newportreg.h,v 1.6.50.1 2019/05/04 00:40:07 macallan Exp $ */ /* * Copyright (c) 2003 Ilpo Ruotsalainen @@ -143,6 +143,7 @@ #define REX3_REG_ZPATTERN 0x0014 #define REX3_REG_COLORBACK 0x0018 +#define REX3_REG_COLORVRAM 0x001c #define REX3_REG_XSTART 0x0100 @@ -191,6 +192,17 @@ #define REX3_REG_TOPSCAN 0x1320 #define REX3_REG_XYWIN 0x1324 +#define REX3_REG_CLIPMODE 0x1328 +#define REX3_CLIPMODE_SMASK0 0x0001 +#define REX3_CLIPMODE_SMASK1 0x0002 +#define REX3_CLIPMODE_SMASK2 0x0004 +#define REX3_CLIPMODE_SMASK3 0x0008 +#define REX3_CLIPMODE_SMASK4 0x0010 +#define REX3_CLIPMODE_CIDMATCH0 0x0100 +#define REX3_CLIPMODE_CIDMATCH1 0x0200 +#define REX3_CLIPMODE_CIDMATCH2 0x0400 +#define REX3_CLIPMODE_CIDMATCH3 0x0800 + #define REX3_REG_STATUS 0x1338 #define REX3_STATUS_GFXBUSY 0x0008 @@ -261,6 +273,10 @@ #define XMAP9_DCBCRS_PUP_CMAP 4 #define XMAP9_DCBCRS_MODE_SETUP 5 #define XMAP9_MODE_GAMMA_BYPASS 0x04 +#define XMAP9_MODE_PIXMODE_CI 0x00 +#define XMAP9_MODE_PIXMODE_RGB0 0x000100 +#define XMAP9_MODE_PIXMODE_RGB1 0x000200 +#define XMAP9_MODE_PIXMODE_RGB2 0x000300 #define XMAP9_MODE_PIXSIZE_8BPP 0x000400 #define XMAP9_MODE_PIXSIZE_24BPP 0x000c00 #define XMAP9_DCBCRS_MODE_SELECT 7
CVS commit: src/sys
Module Name:src
Committed By: kamil
Date: Fri May 3 22:34:21 UTC 2019
Modified Files:
src/sys/kern: kern_exec.c kern_fork.c kern_lwp.c kern_sig.c sys_lwp.c
src/sys/sys: signalvar.h
Log Message:
Register KTR events for debugger related signals
Register signals for:
- crashes (FPE, SEGV, FPE, ILL, BUS)
- LWP events
- CHLD (FORK/VFORK/VFORK_DONE) events -- temporarily disabled
- EXEC events
While there refactor related functions in order to simplify the code.
Add missing comment documentation for recently added kernel functions.
To generate a diff of this commit:
cvs rdiff -u -r1.463 -r1.464 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.211 -r1.212 src/sys/kern/kern_fork.c
cvs rdiff -u -r1.199 -r1.200 src/sys/kern/kern_lwp.c
cvs rdiff -u -r1.356 -r1.357 src/sys/kern/kern_sig.c
cvs rdiff -u -r1.66 -r1.67 src/sys/kern/sys_lwp.c
cvs rdiff -u -r1.92 -r1.93 src/sys/sys/signalvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.463 src/sys/kern/kern_exec.c:1.464
--- src/sys/kern/kern_exec.c:1.463 Wed May 1 17:21:55 2019
+++ src/sys/kern/kern_exec.c Fri May 3 22:34:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.463 2019/05/01 17:21:55 kamil Exp $ */
+/* $NetBSD: kern_exec.c,v 1.464 2019/05/03 22:34:21 kamil Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.463 2019/05/01 17:21:55 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.464 2019/05/03 22:34:21 kamil Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -1271,9 +1271,7 @@ execve_runproc(struct lwp *l, struct exe
if ((p->p_slflag & (PSL_TRACED|PSL_SYSCALL)) == PSL_TRACED) {
mutex_enter(p->p_lock);
- eventswitch(SIGTRAP, TRAP_EXEC);
- // XXX ktrpoint(KTR_PSIG)
- mutex_exit(p->p_lock);
+ eventswitch(TRAP_EXEC);
mutex_enter(proc_lock);
}
Index: src/sys/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.211 src/sys/kern/kern_fork.c:1.212
--- src/sys/kern/kern_fork.c:1.211 Wed May 1 18:01:54 2019
+++ src/sys/kern/kern_fork.c Fri May 3 22:34:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.211 2019/05/01 18:01:54 kamil Exp $ */
+/* $NetBSD: kern_fork.c,v 1.212 2019/05/03 22:34:21 kamil Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.211 2019/05/01 18:01:54 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.212 2019/05/03 22:34:21 kamil Exp $");
#include "opt_ktrace.h"
#include "opt_dtrace.h"
@@ -203,6 +203,9 @@ sys___clone(struct lwp *l, const struct
*/
static struct timeval fork_tfmrate = { 10, 0 };
+/*
+ * Check if a process is traced and shall inform about FORK events.
+ */
static inline bool
tracefork(struct proc *p, int flags)
{
@@ -211,6 +214,9 @@ tracefork(struct proc *p, int flags)
(PSL_TRACEFORK|PSL_TRACED) && (flags & FORK_PPWAIT) == 0;
}
+/*
+ * Check if a process is traced and shall inform about VFORK events.
+ */
static inline bool
tracevfork(struct proc *p, int flags)
{
@@ -219,6 +225,9 @@ tracevfork(struct proc *p, int flags)
(PSL_TRACEVFORK|PSL_TRACED) && (flags & FORK_PPWAIT) != 0;
}
+/*
+ * Check if a process is traced and shall inform about VFORK_DONE events.
+ */
static inline bool
tracevforkdone(struct proc *p, int flags)
{
@@ -595,9 +604,7 @@ fork1(struct lwp *l1, int flags, int exi
*/
if (tracefork(p1, flags) || tracevfork(p1, flags)) {
mutex_enter(p1->p_lock);
- eventswitch(SIGTRAP, TRAP_CHLD);
- // XXX ktrpoint(KTR_PSIG)
- mutex_exit(p1->p_lock);
+ eventswitch(TRAP_CHLD);
mutex_enter(proc_lock);
}
@@ -614,16 +621,16 @@ fork1(struct lwp *l1, int flags, int exi
if (tracevforkdone(p1, flags)) {
mutex_enter(p1->p_lock);
p1->p_vfpid_done = retval[0];
- eventswitch(SIGTRAP, TRAP_CHLD);
- // XXX ktrpoint(KTR_PSIG)
- mutex_exit(p1->p_lock);
- // proc_lock unlocked
+ eventswitch(TRAP_CHLD);
} else
mutex_exit(proc_lock);
return 0;
}
+/*
+ * MI code executed in each newly spawned process before returning to userland.
+ */
void
child_return(void *arg)
{
@@ -639,9 +646,7 @@ child_return(void *arg)
}
mutex_enter(p->p_lock);
- eventswitch(SIGTRAP, TRAP_CHLD);
- // XXX ktrpoint(KTR_PSIG)
- mutex_exit(p->p_lock);
+ eventswitch(TRAP_CHLD);
}
my_tracer_is_gone:
Index: src/sys/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.199 src/sys/kern/kern_lwp.c:1.200
--- src/sys/kern/kern_lwp.c:1.199 Thu May 2 22:23:49 2019
+++ src/sys/kern/kern_lwp.c Fri May 3 22:34:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.199 2019/05/02 22:23:49 kamil Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.200 2019/05/03 22:34:21 kamil Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009 The NetBSD
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: kamil Date: Fri May 3 19:06:50 UTC 2019 Modified Files: src/external/gpl3/gdb/dist/gdb: nbsd-nat.c Log Message: Improve comment in the GDB NetBSD code To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/nbsd-nat.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/gpl3/gdb/dist/gdb/nbsd-nat.c diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.8 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.9 --- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.8 Fri May 3 19:03:57 2019 +++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Fri May 3 19:06:50 2019 @@ -364,8 +364,7 @@ nbsd_wait (struct target_ops *ops, * Always perform polling on exact PID, overwrite the default polling on * WAIT_ANY. * - * This avoids events reported in random order reported for FORK / VFORK - * when child and parent events are otherwise reported in random order. + * This avoids events reported in random order reported for FORK / VFORK. * * Polling on traced parent always simplifies the code. */
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: kamil
Date: Fri May 3 19:03:57 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: infrun.c nbsd-nat.c
Log Message:
Overwrite waiton_ptid in nbsd-nat, rather than generic core
This avoids compatibility issues with remote access to !NetBSD platform.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/infrun.c
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb/dist/gdb/nbsd-nat.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/gpl3/gdb/dist/gdb/infrun.c
diff -u src/external/gpl3/gdb/dist/gdb/infrun.c:1.2 src/external/gpl3/gdb/dist/gdb/infrun.c:1.3
--- src/external/gpl3/gdb/dist/gdb/infrun.c:1.2 Fri May 3 07:05:28 2019
+++ src/external/gpl3/gdb/dist/gdb/infrun.c Fri May 3 19:03:57 2019
@@ -3874,11 +3874,7 @@ fetch_inferior_event (void *client_data)
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
struct cleanup *ts_old_chain;
int cmd_done = 0;
-#if defined(__NetBSD__)
- ptid_t waiton_ptid = inferior_ptid;
-#else
ptid_t waiton_ptid = minus_one_ptid;
-#endif
memset (ecs, 0, sizeof (*ecs));
Index: src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.7 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.8
--- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.7 Fri May 3 07:05:28 2019
+++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Fri May 3 19:03:57 2019
@@ -360,6 +360,17 @@ nbsd_wait (struct target_ops *ops,
{
ptid_t wptid;
+ /*
+ * Always perform polling on exact PID, overwrite the default polling on
+ * WAIT_ANY.
+ *
+ * This avoids events reported in random order reported for FORK / VFORK
+ * when child and parent events are otherwise reported in random order.
+ *
+ * Polling on traced parent always simplifies the code.
+ */
+ ptid = inferior_ptid;
+
if (debug_nbsd_lwp)
fprintf_unfiltered (gdb_stdlog, "NLWP: calling super_wait (%d, %ld, %ld) target_options=%#x\n",
ptid_get_pid (ptid), ptid_get_lwp (ptid),
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: mlelstv
Date: Fri May 3 16:06:56 UTC 2019
Modified Files:
src/sys/dev/scsipi: scsi_base.c
Log Message:
Avoid null pointer deref in printing xfer mode when no target driver
is attached. Fixes kern/54157.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/scsipi/scsi_base.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/scsipi/scsi_base.c
diff -u src/sys/dev/scsipi/scsi_base.c:1.92 src/sys/dev/scsipi/scsi_base.c:1.93
--- src/sys/dev/scsipi/scsi_base.c:1.92 Sat Jun 17 22:35:50 2017
+++ src/sys/dev/scsipi/scsi_base.c Fri May 3 16:06:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_base.c,v 1.92 2017/06/17 22:35:50 mlelstv Exp $ */
+/* $NetBSD: scsi_base.c,v 1.93 2019/05/03 16:06:56 mlelstv Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: scsi_base.c,v 1.92 2017/06/17 22:35:50 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsi_base.c,v 1.93 2019/05/03 16:06:56 mlelstv Exp $");
#include
#include
@@ -136,9 +136,17 @@ scsi_kill_pending(struct scsipi_periph *
static void
scsi_print_xfer_mode(struct scsipi_periph *periph)
{
+ struct scsipi_channel *chan = periph->periph_channel;
+ struct scsipi_adapter *adapt = chan->chan_adapter;
int period, freq, speed, mbs;
- aprint_normal_dev(periph->periph_dev, "");
+ if (periph->periph_dev)
+ aprint_normal_dev(periph->periph_dev, "");
+ else
+ aprint_normal("probe(%s:%d:%d:%d): ",
+ device_xname(adapt->adapt_dev),
+ chan->chan_channel, periph->periph_target,
+ periph->periph_lun);
if (periph->periph_mode & (PERIPH_CAP_SYNC | PERIPH_CAP_DT)) {
period = scsipi_sync_factor_to_period(periph->periph_period);
aprint_normal("sync (%d.%02dns offset %d)",
CVS commit: src
Module Name:src
Committed By: sevan
Date: Fri May 3 11:29:07 UTC 2019
Modified Files:
src/distrib/sets/lists/misc: mi
src/share/examples/supfiles: Makefile
Removed Files:
src/share/examples/supfiles: sup.netbsd.org
Log Message:
sup.NetBSD.org is no longer around.
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.12 -r1.13 src/share/examples/supfiles/Makefile
cvs rdiff -u -r1.6 -r0 src/share/examples/supfiles/sup.netbsd.org
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.210 src/distrib/sets/lists/misc/mi:1.211
--- src/distrib/sets/lists/misc/mi:1.210 Wed Dec 19 13:57:44 2018
+++ src/distrib/sets/lists/misc/mi Fri May 3 11:29:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.210 2018/12/19 13:57:44 maxv Exp $
+# $NetBSD: mi,v 1.211 2019/05/03 11:29:06 sevan Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1610,7 +1610,7 @@
./usr/share/examples/supfiles/sup.au.netbsd.org misc-obsolete obsolete
./usr/share/examples/supfiles/sup.de.netbsd.org misc-obsolete obsolete
./usr/share/examples/supfiles/sup.jp.netbsd.org misc-sup-examples share
-./usr/share/examples/supfiles/sup.netbsd.org misc-sup-examples share
+./usr/share/examples/supfiles/sup.netbsd.org misc-sup-examples obsolete
./usr/share/examples/supfiles/sup.no.netbsd.org misc-obsolete obsolete
./usr/share/examples/supfiles/sup.uk.netbsd.org misc-obsolete obsolete
./usr/share/examples/supfiles/sup2.fr.netbsd.org misc-sup-examples share
Index: src/share/examples/supfiles/Makefile
diff -u src/share/examples/supfiles/Makefile:1.12 src/share/examples/supfiles/Makefile:1.13
--- src/share/examples/supfiles/Makefile:1.12 Thu Jul 27 23:02:27 2006
+++ src/share/examples/supfiles/Makefile Fri May 3 11:29:06 2019
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2006/07/27 23:02:27 lukem Exp $
+# $NetBSD: Makefile,v 1.13 2019/05/03 11:29:06 sevan Exp $
NOOBJ= # defined
.include
.if ${MKSHARE} != "no"
-FILES= sup.jp.netbsd.org \
- sup.netbsd.org sup2.fr.netbsd.org
+FILES= sup.jp.netbsd.org sup2.fr.netbsd.org
FILESDIR=/usr/share/examples/supfiles
.endif
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: kamil
Date: Fri May 3 07:05:28 UTC 2019
Modified Files:
src/external/gpl3/gdb/dist/gdb: infrun.c nbsd-nat.c
Log Message:
Quick clean up the NetBSD support in GDB
Changes:
- always perform polling on inferior_ptid, never -1
-1 can cause catching fork/vfork events in random order
polling on pid will guarantee to report events in expected order
- assume availability of KERN_PROC_PATHNAME
- drop dead code for KERN_PROC_AUXV (FreeBSD-specific sysctl)
AUXV on NetBSD is handled with PIOD_READ_AUXV
- drop unused nbsd_fetch_kinfo_proc
- drop unneeded hacks for fork/vfork code
- drop support for FreeBSD specific flags returned for PT_LWPINFO
NetBSD uses PT_GET_SIGINFO / PT_GET_PROCESS_STATE for most pieces of
information
- port nbsd_thread_name to NetBSD
- enable LWP and FORK events in nbsd_enable_proc_events
- use NetBSD new batteries for distinguishing event type in to_wait
map most events into GDB types
breakpoint, single step, hw breakpoint/watchpoint ones are still not
used with the full power here
- add support for EXEC events
- clean up
This change makes GDB functional with threaded code and it is good enough
to pass t_regress / threads test.
It's possible to execute and step processes with multiple threads, use
scheduler-lock, follow-fork etc features.
What does not work:
- the LWP EXIT event and wait() are not synchronized and can deadlock
this has been observed with exiting go applications
- GDB VFORK code is still disabled and awaits kernel fixing
Short term goal is to correct LWP EXIT and follow up with VFORK fixes.
Long term goal is to rewrite NetBSD GDB support and write new support in
the remote process plugin (gdb-server) framework.
PR kern/53120
PR port-arm/51677
PR bin/54060
PR bin/49662
PR kern/52548
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 src/external/gpl3/gdb/dist/gdb/infrun.c
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gdb/dist/gdb/nbsd-nat.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/gpl3/gdb/dist/gdb/infrun.c
diff -u src/external/gpl3/gdb/dist/gdb/infrun.c:1.1.1.7 src/external/gpl3/gdb/dist/gdb/infrun.c:1.2
--- src/external/gpl3/gdb/dist/gdb/infrun.c:1.1.1.7 Tue Nov 28 18:18:23 2017
+++ src/external/gpl3/gdb/dist/gdb/infrun.c Fri May 3 07:05:28 2019
@@ -3874,7 +3874,11 @@ fetch_inferior_event (void *client_data)
struct cleanup *old_chain = make_cleanup (null_cleanup, NULL);
struct cleanup *ts_old_chain;
int cmd_done = 0;
+#if defined(__NetBSD__)
+ ptid_t waiton_ptid = inferior_ptid;
+#else
ptid_t waiton_ptid = minus_one_ptid;
+#endif
memset (ecs, 0, sizeof (*ecs));
Index: src/external/gpl3/gdb/dist/gdb/nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.6 src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.7
--- src/external/gpl3/gdb/dist/gdb/nbsd-nat.c:1.6 Sat Jun 23 03:15:55 2018
+++ src/external/gpl3/gdb/dist/gdb/nbsd-nat.c Fri May 3 07:05:28 2019
@@ -45,7 +45,6 @@ nbsd_pid_to_exec_file (struct target_ops
static char buf[PATH_MAX];
char name[PATH_MAX];
-#ifdef KERN_PROC_PATHNAME
size_t buflen;
int mib[4];
@@ -56,7 +55,6 @@ nbsd_pid_to_exec_file (struct target_ops
buflen = sizeof buf;
if (sysctl (mib, 4, buf, , NULL, 0) == 0)
return buf;
-#endif
xsnprintf (name, PATH_MAX, "/proc/%d/exe", pid);
len = readlink (name, buf, PATH_MAX - 1);
@@ -131,79 +129,6 @@ nbsd_find_memory_regions (struct target_
return 0;
}
-#ifdef KERN_PROC_AUXV
-static enum target_xfer_status (*super_xfer_partial) (struct target_ops *ops,
- enum target_object object,
- const char *annex,
- gdb_byte *readbuf,
- const gdb_byte *writebuf,
- ULONGEST offset,
- ULONGEST len,
- ULONGEST *xfered_len);
-
-/* Implement the "to_xfer_partial target_ops" method. */
-
-static enum target_xfer_status
-nbsd_xfer_partial (struct target_ops *ops, enum target_object object,
- const char *annex, gdb_byte *readbuf,
- const gdb_byte *writebuf,
- ULONGEST offset, ULONGEST len, ULONGEST *xfered_len)
-{
- pid_t pid = ptid_get_pid (inferior_ptid);
-
- switch (object)
-{
-case TARGET_OBJECT_AUXV:
- {
- struct cleanup *cleanup = make_cleanup (null_cleanup, NULL);
- unsigned char *buf;
- size_t buflen;
- int mib[4];
-
- if (writebuf != NULL)
- return TARGET_XFER_E_IO;
- mib[0] = CTL_KERN;
- mib[1] = KERN_PROC;
- mib[2] = KERN_PROC_AUXV;
- mib[3] = pid;
- if (offset == 0)
- {
- buf = readbuf;
- buflen = len;
- }
- else
- {
- buflen = offset + len;
- buf = XCNEWVEC (unsigned char, buflen);
- cleanup = make_cleanup (xfree, buf);
- }
- if (sysctl (mib, 4, buf, , NULL, 0) == 0)
- {
- if (offset != 0)
- {
- if (buflen > offset)
- {
- buflen -= offset;
- memcpy (readbuf, buf + offset,
CVS commit: [isaki-audio2] src/sys/dev
Module Name:src Committed By: isaki Date: Fri May 3 06:29:05 UTC 2019 Modified Files: src/sys/dev/audio [isaki-audio2]: audio.c Removed Files: src/sys/dev [isaki-audio2]: audiovar.h Log Message: Remove dev/audiovar.h. It already have been just a link to dev/audio/audiovar.h in this branch. To generate a diff of this commit: cvs rdiff -u -r1.68.8.1 -r0 src/sys/dev/audiovar.h cvs rdiff -u -r1.1.2.4 -r1.1.2.5 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/audio.c diff -u src/sys/dev/audio/audio.c:1.1.2.4 src/sys/dev/audio/audio.c:1.1.2.5 --- src/sys/dev/audio/audio.c:1.1.2.4 Fri May 3 05:15:33 2019 +++ src/sys/dev/audio/audio.c Fri May 3 06:29:05 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: audio.c,v 1.1.2.4 2019/05/03 05:15:33 isaki Exp $ */ +/* $NetBSD: audio.c,v 1.1.2.5 2019/05/03 06:29:05 isaki Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -152,7 +152,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.1.2.4 2019/05/03 05:15:33 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.1.2.5 2019/05/03 06:29:05 isaki Exp $"); #ifdef _KERNEL_OPT #include "audio.h" @@ -193,7 +193,7 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1. #include #include -#include +#include #include #include #include
CVS commit: [isaki-audio2] src/sys
Module Name:src
Committed By: isaki
Date: Fri May 3 06:19:42 UTC 2019
Modified Files:
src/sys/arch/arm/xscale [isaki-audio2]: pxa2x0_ac97.c
src/sys/dev [isaki-audio2]: spkr_audio.c
src/sys/dev/ic [isaki-audio2]: msm6258.c pl041var.h
src/sys/dev/isa [isaki-audio2]: cms.c
src/sys/dev/isapnp [isaki-audio2]: gus_isapnp.c
src/sys/dev/pci [isaki-audio2]: auvia.c emuxki.c
Log Message:
Remove unnecessary header file.
To generate a diff of this commit:
cvs rdiff -u -r1.15.2.2 -r1.15.2.3 src/sys/arch/arm/xscale/pxa2x0_ac97.c
cvs rdiff -u -r1.6 -r1.6.12.1 src/sys/dev/spkr_audio.c
cvs rdiff -u -r1.25.2.1 -r1.25.2.2 src/sys/dev/ic/msm6258.c
cvs rdiff -u -r1.1.16.1 -r1.1.16.2 src/sys/dev/ic/pl041var.h
cvs rdiff -u -r1.22 -r1.22.20.1 src/sys/dev/isa/cms.c
cvs rdiff -u -r1.39.2.2 -r1.39.2.3 src/sys/dev/isapnp/gus_isapnp.c
cvs rdiff -u -r1.82.2.2 -r1.82.2.3 src/sys/dev/pci/auvia.c
cvs rdiff -u -r1.67.2.5 -r1.67.2.6 src/sys/dev/pci/emuxki.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/xscale/pxa2x0_ac97.c
diff -u src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.15.2.2 src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.15.2.3
--- src/sys/arch/arm/xscale/pxa2x0_ac97.c:1.15.2.2 Tue Apr 23 13:38:48 2019
+++ src/sys/arch/arm/xscale/pxa2x0_ac97.c Fri May 3 06:19:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_ac97.c,v 1.15.2.2 2019/04/23 13:38:48 isaki Exp $ */
+/* $NetBSD: pxa2x0_ac97.c,v 1.15.2.3 2019/05/03 06:19:42 isaki Exp $ */
/*
* Copyright (c) 2003, 2005 Wasabi Systems, Inc.
@@ -48,7 +48,6 @@
#include
#include
-#include
#include
#include
Index: src/sys/dev/spkr_audio.c
diff -u src/sys/dev/spkr_audio.c:1.6 src/sys/dev/spkr_audio.c:1.6.12.1
--- src/sys/dev/spkr_audio.c:1.6 Sun Jun 11 21:54:22 2017
+++ src/sys/dev/spkr_audio.c Fri May 3 06:19:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_audio.c,v 1.6 2017/06/11 21:54:22 pgoyette Exp $ */
+/* $NetBSD: spkr_audio.c,v 1.6.12.1 2019/05/03 06:19:42 isaki Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.6 2017/06/11 21:54:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.6.12.1 2019/05/03 06:19:42 isaki Exp $");
#include
#include
@@ -41,7 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_audio.c
#include
#include
#include
-#include
#include
Index: src/sys/dev/ic/msm6258.c
diff -u src/sys/dev/ic/msm6258.c:1.25.2.1 src/sys/dev/ic/msm6258.c:1.25.2.2
--- src/sys/dev/ic/msm6258.c:1.25.2.1 Sun Apr 21 14:00:19 2019
+++ src/sys/dev/ic/msm6258.c Fri May 3 06:19:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: msm6258.c,v 1.25.2.1 2019/04/21 14:00:19 isaki Exp $ */
+/* $NetBSD: msm6258.c,v 1.25.2.2 2019/05/03 06:19:42 isaki Exp $ */
/*
* Copyright (c) 2001 Tetsuya Isaki. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: msm6258.c,v 1.25.2.1 2019/04/21 14:00:19 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msm6258.c,v 1.25.2.2 2019/05/03 06:19:42 isaki Exp $");
#include
#include
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: msm6258.c,v
#include
#include
-#include
#include
static inline uint8_t pcm2adpcm_step(struct msm6258_codecvar *, int16_t);
Index: src/sys/dev/ic/pl041var.h
diff -u src/sys/dev/ic/pl041var.h:1.1.16.1 src/sys/dev/ic/pl041var.h:1.1.16.2
--- src/sys/dev/ic/pl041var.h:1.1.16.1 Sat Apr 27 11:52:53 2019
+++ src/sys/dev/ic/pl041var.h Fri May 3 06:19:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pl041var.h,v 1.1.16.1 2019/04/27 11:52:53 isaki Exp $ */
+/* $NetBSD: pl041var.h,v 1.1.16.2 2019/05/03 06:19:42 isaki Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -29,7 +29,6 @@
#ifndef _PL041VAR_H
#define _PL041VAR_H
-#include
#include
struct aaci_softc {
Index: src/sys/dev/isa/cms.c
diff -u src/sys/dev/isa/cms.c:1.22 src/sys/dev/isa/cms.c:1.22.20.1
--- src/sys/dev/isa/cms.c:1.22 Sat Dec 10 17:41:44 2016
+++ src/sys/dev/isa/cms.c Fri May 3 06:19:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cms.c,v 1.22 2016/12/10 17:41:44 maya Exp $ */
+/* $NetBSD: cms.c,v 1.22.20.1 2019/05/03 06:19:42 isaki Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.22 2016/12/10 17:41:44 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.22.20.1 2019/05/03 06:19:42 isaki Exp $");
#include
#include
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: cms.c,v 1.22
#include
#include
-#include
#include
#include
Index: src/sys/dev/isapnp/gus_isapnp.c
diff -u src/sys/dev/isapnp/gus_isapnp.c:1.39.2.2 src/sys/dev/isapnp/gus_isapnp.c:1.39.2.3
--- src/sys/dev/isapnp/gus_isapnp.c:1.39.2.2 Fri May 3 05:43:46 2019
+++ src/sys/dev/isapnp/gus_isapnp.c Fri May 3 06:19:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gus_isapnp.c,v 1.39.2.2 2019/05/03 05:43:46 isaki Exp $ */
+/* $NetBSD:
