2008-11-15 06:35:30

by Kusanagi Kouichi

Subject: [PATCH] ALSA: hda - Add digital BEEP generator support for Realtek codecs.

Add digital BEEP generator support for Realtek codecs.

Signed-off-by: Kusanagi Kouichi <[email protected]>
---
sound/pci/hda/hda_beep.h | 2 +-
sound/pci/hda/patch_realtek.c | 62 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 63 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index de4036e..b483779 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -38,7 +38,7 @@ struct hda_beep {
int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);
void snd_hda_detach_beep_device(struct hda_codec *codec);
#else
-#define snd_hda_attach_beep_device(...)
+#define snd_hda_attach_beep_device(...) 0
#define snd_hda_detach_beep_device(...)
#endif
#endif
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a378c01..d586600 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -31,6 +31,7 @@
#include "hda_codec.h"
#include "hda_local.h"
#include "hda_patch.h"
+#include "hda_beep.h"

#define ALC880_FRONT_EVENT 0x01
#define ALC880_DCVOL_EVENT 0x02
@@ -2788,6 +2789,7 @@ static void alc_free(struct hda_codec *codec)
kfree(spec->kctl_alloc);
}
kfree(spec);
+ snd_hda_detach_beep_device(codec);
codec->spec = NULL; /* to be sure */
}

@@ -3960,6 +3962,12 @@ static int patch_alc880(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x1);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC880_AUTO)
setup_preset(spec, &alc880_presets[board_config]);

@@ -5558,6 +5566,12 @@ static int patch_alc260(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x1);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC260_AUTO)
setup_preset(spec, &alc260_presets[board_config]);

@@ -6811,6 +6825,12 @@ static int patch_alc882(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x1);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC882_AUTO)
setup_preset(spec, &alc882_presets[board_config]);

@@ -8916,6 +8936,12 @@ static int patch_alc883(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x1);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC883_AUTO)
setup_preset(spec, &alc883_presets[board_config]);

@@ -10739,6 +10765,12 @@ static int patch_alc262(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x1);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC262_AUTO)
setup_preset(spec, &alc262_presets[board_config]);

@@ -11752,6 +11784,12 @@ static int patch_alc268(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x1);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC268_AUTO)
setup_preset(spec, &alc268_presets[board_config]);

@@ -12458,6 +12496,12 @@ static int patch_alc269(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x1);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC269_AUTO)
setup_preset(spec, &alc269_presets[board_config]);

@@ -13624,6 +13668,12 @@ static int patch_alc861(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x23);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC861_AUTO)
setup_preset(spec, &alc861_presets[board_config]);

@@ -14578,6 +14628,12 @@ static int patch_alc861vd(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x23);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC861VD_AUTO)
setup_preset(spec, &alc861vd_presets[board_config]);

@@ -16412,6 +16468,12 @@ static int patch_alc662(struct hda_codec *codec)
}
}

+ err = snd_hda_attach_beep_device(codec, 0x1);
+ if (err < 0) {
+ alc_free(codec);
+ return err;
+ }
+
if (board_config != ALC662_AUTO)
setup_preset(spec, &alc662_presets[board_config]);

--
1.5.6.5

2008-11-17 16:53:46

by Takashi Iwai

Subject: Re: [PATCH] ALSA: hda - Add digital BEEP generator support for Realtek codecs.

At Sat, 15 Nov 2008 15:20:14 +0900,
Kusanagi Kouichi wrote:
>
> Add digital BEEP generator support for Realtek codecs.
>
> Signed-off-by: Kusanagi Kouichi <[email protected]>

Thanks for the patch. Do these beep widgets have the mute amp bits?
If not, we'd likely need to add mute switches as well (otherwise it
gets too annoying) controlling on software. Check patch_sigmatel.c in
the latest master branch or topic/fix/hda branch of sound git tree:
git://git.kernel.org/pub/scm/linux/kernel/tiwai/sound-2.6.git

Another concern is that I don't want to add the digital beep control
unconditionally. On many devices, the beep is implemented in the old
good analog way. We'd need to add the check of analog/digital beep in
a new spec field and in the preset table not to duplicate beep
controls on these.


thanks,

Takashi

> ---
> sound/pci/hda/hda_beep.h | 2 +-
> sound/pci/hda/patch_realtek.c | 62 +++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 63 insertions(+), 1 deletions(-)
>
> diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
> index de4036e..b483779 100644
> --- a/sound/pci/hda/hda_beep.h
> +++ b/sound/pci/hda/hda_beep.h
> @@ -38,7 +38,7 @@ struct hda_beep {
> int snd_hda_attach_beep_device(struct hda_codec *codec, int nid);
> void snd_hda_detach_beep_device(struct hda_codec *codec);
> #else
> -#define snd_hda_attach_beep_device(...)
> +#define snd_hda_attach_beep_device(...) 0
> #define snd_hda_detach_beep_device(...)
> #endif
> #endif
> diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
> index a378c01..d586600 100644
> --- a/sound/pci/hda/patch_realtek.c
> +++ b/sound/pci/hda/patch_realtek.c
> @@ -31,6 +31,7 @@
> #include "hda_codec.h"
> #include "hda_local.h"
> #include "hda_patch.h"
> +#include "hda_beep.h"
>
> #define ALC880_FRONT_EVENT 0x01
> #define ALC880_DCVOL_EVENT 0x02
> @@ -2788,6 +2789,7 @@ static void alc_free(struct hda_codec *codec)
> kfree(spec->kctl_alloc);
> }
> kfree(spec);
> + snd_hda_detach_beep_device(codec);
> codec->spec = NULL; /* to be sure */
> }
>
> @@ -3960,6 +3962,12 @@ static int patch_alc880(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x1);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC880_AUTO)
> setup_preset(spec, &alc880_presets[board_config]);
>
> @@ -5558,6 +5566,12 @@ static int patch_alc260(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x1);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC260_AUTO)
> setup_preset(spec, &alc260_presets[board_config]);
>
> @@ -6811,6 +6825,12 @@ static int patch_alc882(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x1);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC882_AUTO)
> setup_preset(spec, &alc882_presets[board_config]);
>
> @@ -8916,6 +8936,12 @@ static int patch_alc883(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x1);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC883_AUTO)
> setup_preset(spec, &alc883_presets[board_config]);
>
> @@ -10739,6 +10765,12 @@ static int patch_alc262(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x1);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC262_AUTO)
> setup_preset(spec, &alc262_presets[board_config]);
>
> @@ -11752,6 +11784,12 @@ static int patch_alc268(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x1);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC268_AUTO)
> setup_preset(spec, &alc268_presets[board_config]);
>
> @@ -12458,6 +12496,12 @@ static int patch_alc269(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x1);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC269_AUTO)
> setup_preset(spec, &alc269_presets[board_config]);
>
> @@ -13624,6 +13668,12 @@ static int patch_alc861(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x23);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC861_AUTO)
> setup_preset(spec, &alc861_presets[board_config]);
>
> @@ -14578,6 +14628,12 @@ static int patch_alc861vd(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x23);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC861VD_AUTO)
> setup_preset(spec, &alc861vd_presets[board_config]);
>
> @@ -16412,6 +16468,12 @@ static int patch_alc662(struct hda_codec *codec)
> }
> }
>
> + err = snd_hda_attach_beep_device(codec, 0x1);
> + if (err < 0) {
> + alc_free(codec);
> + return err;
> + }
> +
> if (board_config != ALC662_AUTO)
> setup_preset(spec, &alc662_presets[board_config]);
>
> --
> 1.5.6.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>