Module Name: src
Committed By: isaki
Date: Wed Feb 17 12:37:33 UTC 2021
Modified Files:
src/sys/dev: spkr_audio.c
Log Message:
Attach this only if the parent device has playback capability.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/spkr_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/spkr_audio.c
diff -u src/sys/dev/spkr_audio.c:1.8 src/sys/dev/spkr_audio.c:1.9
--- src/sys/dev/spkr_audio.c:1.8 Fri Jun 21 09:34:30 2019
+++ src/sys/dev/spkr_audio.c Wed Feb 17 12:37:33 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: spkr_audio.c,v 1.8 2019/06/21 09:34:30 isaki Exp $ */
+/* $NetBSD: spkr_audio.c,v 1.9 2021/02/17 12:37:33 isaki Exp $ */
/*-
* Copyright (c) 2016 Nathanial Sloss <[email protected]>
@@ -27,10 +27,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.8 2019/06/21 09:34:30 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spkr_audio.c,v 1.9 2021/02/17 12:37:33 isaki Exp $");
#include <sys/param.h>
#include <sys/systm.h>
+#include <sys/audioio.h>
#include <sys/kernel.h>
#include <sys/errno.h>
#include <sys/device.h>
@@ -41,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: spkr_audio.c
#include <sys/conf.h>
#include <sys/sysctl.h>
-#include <dev/audio/audio_if.h>
+#include <dev/audio/audiovar.h>
#include <dev/audio/audiobellvar.h>
#include <dev/spkrvar.h>
@@ -90,8 +91,12 @@ spkr_audio_rest(device_t self, int ticks
static int
spkr_audio_probe(device_t parent, cfdata_t cf, void *aux)
{
+ struct audio_softc *asc = device_private(parent);
- return 1;
+ if ((asc->sc_props & AUDIO_PROP_PLAYBACK))
+ return 1;
+
+ return 0;
}
static void
