[PATCH] ALSA: emu10k1: handle dock disconnects

[PATCH] ALSA: emu10k1: handle dock disconnects

[Michael Gernoth]

When the dock on an E-mu 1010 card is disconnected, all outputs get
muted by the hardware. Add logic to detect a disconnect and unmute.

Signed-off-by: Michael Gernoth <michael@gernoth.net>
---
 sound/pci/emu10k1/emu10k1_main.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index b4458a6..ee50c1d 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -707,6 +707,7 @@ static int emu1010_firmware_thread(void *data)
 {
 	struct snd_emu10k1 *emu = data;
 	u32 tmp, tmp2, reg;
+	u32 last_reg = 0;
 	int err;
 
 	for (;;) {
@@ -782,7 +783,15 @@ static int emu1010_firmware_thread(void *data)
 			msleep(10);
 			/* Unmute all. Default is muted after a firmware load */
 			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
+		} else if (!reg && last_reg) {
+			/* Audio Dock removed */
+			dev_info(emu->card->dev,
+				 "emu1010: Audio Dock detached\n");
+			/* Unmute all */
+			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
 		}
+
+		last_reg = reg;
 	}
 	dev_info(emu->card->dev, "emu1010: firmware thread stopping\n");
 	return 0;
-- 
2.1.4

Re: [PATCH] ALSA: emu10k1: handle dock disconnects

[Takashi Iwai]

At Sat, 11 Apr 2015 14:34:44 +0200,
Michael Gernoth wrote:
> 
> When the dock on an E-mu 1010 card is disconnected, all outputs get
> muted by the hardware. Add logic to detect a disconnect and unmute.
> 
> Signed-off-by: Michael Gernoth <michael@gernoth.net>

Applied, thanks.


Takashi

> ---
>  sound/pci/emu10k1/emu10k1_main.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
> index b4458a6..ee50c1d 100644
> --- a/sound/pci/emu10k1/emu10k1_main.c
> +++ b/sound/pci/emu10k1/emu10k1_main.c
> @@ -707,6 +707,7 @@ static int emu1010_firmware_thread(void *data)
>  {
>  	struct snd_emu10k1 *emu = data;
>  	u32 tmp, tmp2, reg;
> +	u32 last_reg = 0;
>  	int err;
>  
>  	for (;;) {
> @@ -782,7 +783,15 @@ static int emu1010_firmware_thread(void *data)
>  			msleep(10);
>  			/* Unmute all. Default is muted after a firmware load */
>  			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
> +		} else if (!reg && last_reg) {
> +			/* Audio Dock removed */
> +			dev_info(emu->card->dev,
> +				 "emu1010: Audio Dock detached\n");
> +			/* Unmute all */
> +			snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE);
>  		}
> +
> +		last_reg = reg;
>  	}
>  	dev_info(emu->card->dev, "emu1010: firmware thread stopping\n");
>  	return 0;
> -- 
> 2.1.4
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>