Module Name: src
Committed By: martin
Date: Wed Jun 1 05:42:52 UTC 2022
Modified Files:
src/sys/arch/macppc/dev: snapper.c
Log Message:
Recognize the OF labels used for line output and headphone output on a
G5 powermac 7,3.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/macppc/dev/snapper.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/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.61 src/sys/arch/macppc/dev/snapper.c:1.62
--- src/sys/arch/macppc/dev/snapper.c:1.61 Sat Aug 7 16:18:58 2021
+++ src/sys/arch/macppc/dev/snapper.c Wed Jun 1 05:42:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: snapper.c,v 1.61 2021/08/07 16:18:58 thorpej Exp $ */
+/* $NetBSD: snapper.c,v 1.62 2022/06/01 05:42:52 martin Exp $ */
/* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */
/* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.61 2021/08/07 16:18:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.62 2022/06/01 05:42:52 martin Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -2200,10 +2200,12 @@ snapper_init(struct snapper_softc *sc, i
}
}
if (strcmp(audio_gpio, "lineout-mute") == 0 ||
- strcmp(name, "lineout-mute") == 0)
+ strcmp(name, "lineout-mute") == 0 ||
+ strcmp(name, "line-output-mute") == 0)
lineout_mute = addr;
if (strcmp(audio_gpio, "lineout-detect") == 0 ||
- strcmp(name, "lineout-detect") == 0) {
+ strcmp(name, "lineout-detect") == 0 ||
+ strcmp(name, "line-output-detect") == 0) {
uint32_t act = 0;
lineout_detect = addr;
OF_getprop(gpio, "audio-gpio-active-state", &act, 4);
