Module Name: src
Committed By: jmcneill
Date: Sat Nov 19 23:36:38 UTC 2011
Modified Files:
src/sys/dev/pci [jmcneill-audiomp3]: gcscaudio.c
Log Message:
add gcscaudio_get_locks()
To generate a diff of this commit:
cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/sys/dev/pci/gcscaudio.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/gcscaudio.c
diff -u src/sys/dev/pci/gcscaudio.c:1.7.4.1 src/sys/dev/pci/gcscaudio.c:1.7.4.2
--- src/sys/dev/pci/gcscaudio.c:1.7.4.1 Sat Nov 19 23:31:26 2011
+++ src/sys/dev/pci/gcscaudio.c Sat Nov 19 23:36:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscaudio.c,v 1.7.4.1 2011/11/19 23:31:26 jmcneill Exp $ */
+/* $NetBSD: gcscaudio.c,v 1.7.4.2 2011/11/19 23:36:38 jmcneill Exp $ */
/*-
* Copyright (c) 2008 SHIMIZU Ryo <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.7.4.1 2011/11/19 23:31:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.7.4.2 2011/11/19 23:36:38 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -151,6 +151,7 @@ static int gcscaudio_trigger_output(void
static int gcscaudio_trigger_input(void *, void *, void *, int,
void (*)(void *), void *,
const audio_params_t *);
+static void gcscaudio_get_locks(void *, kmutex_t **, kmutex_t **);
static bool gcscaudio_resume(device_t, const pmf_qual_t *);
static int gcscaudio_intr(void *);
@@ -211,7 +212,8 @@ static const struct audio_hw_if gcscaudi
.trigger_output = gcscaudio_trigger_output,
.trigger_input = gcscaudio_trigger_input,
.dev_ioctl = NULL,
- .powerstate = NULL
+ .powerstate = NULL,
+ .get_locks = gcscaudio_get_locks,
};
static const struct audio_format gcscaudio_formats_2ch = {
@@ -1187,6 +1189,17 @@ gcscaudio_trigger_input(void *addr, void
return 0;
}
+static void
+gcscaudio_get_locks(void *arg, kmutex_t **intr, kmutex_t **thread)
+{
+ struct gcscaudio_softc *sc;
+
+ sc = (struct gcscaudio_softc *)arg;
+
+ *intr = &sc->sc_intr_lock;
+ *thread = &sc->sc_lock;
+}
+
static int
gcscaudio_intr(void *arg)
{
