Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/sunxi Rename mic1 control to mic s...



details:   https://anonhg.NetBSD.org/src/rev/f01668c84327
branches:  trunk
changeset: 319080:f01668c84327
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed May 16 00:12:57 2018 +0000

description:
Rename mic1 control to mic so audiorecord can use it

diffstat:

 sys/arch/arm/sunxi/sun50i_a64_acodec.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r cfb717f3e6fb -r f01668c84327 sys/arch/arm/sunxi/sun50i_a64_acodec.c
--- a/sys/arch/arm/sunxi/sun50i_a64_acodec.c    Tue May 15 19:16:38 2018 +0000
+++ b/sys/arch/arm/sunxi/sun50i_a64_acodec.c    Wed May 16 00:12:57 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i_a64_acodec.c,v 1.6 2018/05/15 01:26:45 jmcneill Exp $ */
+/* $NetBSD: sun50i_a64_acodec.c,v 1.7 2018/05/16 00:12:57 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun50i_a64_acodec.c,v 1.6 2018/05/15 01:26:45 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun50i_a64_acodec.c,v 1.7 2018/05/16 00:12:57 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -140,9 +140,9 @@
 
        [A64_CODEC_RECORD_LINE_VOLUME]  = { AudioNline,
            A64_CODEC_RECORD_CLASS, A64_LINEIN_CTRL, A64_LINEING },
-       [A64_CODEC_RECORD_MIC1_VOLUME]  = { "mic1",
+       [A64_CODEC_RECORD_MIC1_VOLUME]  = { AudioNmicrophone,
            A64_CODEC_RECORD_CLASS, A64_MIC1_CTRL, A64_MIC1G },
-       [A64_CODEC_RECORD_MIC2_VOLUME]  = { "mic2",
+       [A64_CODEC_RECORD_MIC2_VOLUME]  = { AudioNmicrophone "2",
            A64_CODEC_RECORD_CLASS, A64_MIC2_CTRL, A64_MIC2G },
        [A64_CODEC_RECORD_AGC_VOLUME]   = { AudioNagc,
            A64_CODEC_RECORD_CLASS, A64_ADC_CTRL, A64_ADCG },
@@ -482,9 +482,9 @@
                di->un.s.num_mem = 4;
                strcpy(di->un.s.member[0].label.name, AudioNline);
                di->un.s.member[0].mask = A64_ADCMIX_SRC_LINEIN;
-               strcpy(di->un.s.member[1].label.name, "mic1");
+               strcpy(di->un.s.member[1].label.name, AudioNmicrophone);
                di->un.s.member[1].mask = A64_ADCMIX_SRC_MIC1;
-               strcpy(di->un.s.member[2].label.name, "mic2");
+               strcpy(di->un.s.member[2].label.name, AudioNmicrophone "2");
                di->un.s.member[2].mask = A64_ADCMIX_SRC_MIC2;
                strcpy(di->un.s.member[3].label.name, AudioNdac);
                di->un.s.member[3].mask = A64_ADCMIX_SRC_OMIXER;



Home | Main Index | Thread Index | Old Index