summaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/hda_beep.h
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-05-19 12:50:04 +0200
committerTakashi Iwai <tiwai@suse.de>2009-05-19 12:54:55 +0200
commitfa7979663190240b838ab8c8bad7f59e618bf77c (patch)
treee008dbd603562a54300ed8d189bd9bb59b5aa697 /sound/pci/hda/hda_beep.h
parent4abc1cc2f9fe4b6bb3acc1d78e2c15af47b8133d (diff)
downloadlinux-stable-fa7979663190240b838ab8c8bad7f59e618bf77c.tar.gz
linux-stable-fa7979663190240b838ab8c8bad7f59e618bf77c.tar.bz2
linux-stable-fa7979663190240b838ab8c8bad7f59e618bf77c.zip
ALSA: hda - Fix digital beep tone calculation
The digital beep tone is calculated in two different ways depending on the codec chip. The standard one is using a divider, and another one is a linear tone for IDT/STAC codecs. Currently, only the latter type is used for all codecs, which resulted in a wrong tone pitch. This patch adds the calculation of the standard HD-audio type. Also clean-up the fields in hda_beep struct. Reference: bko#13162 http://bugzilla.kernel.org/show_bug.cgi?id=13162 Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_beep.h')
-rw-r--r--sound/pci/hda/hda_beep.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h
index 51bf6a5daf39..0c3de787c717 100644
--- a/sound/pci/hda/hda_beep.h
+++ b/sound/pci/hda/hda_beep.h
@@ -30,8 +30,9 @@ struct hda_beep {
struct hda_codec *codec;
char phys[32];
int tone;
- int nid;
- int enabled;
+ hda_nid_t nid;
+ unsigned int enabled:1;
+ unsigned int linear_tone:1; /* linear tone for IDT/STAC codec */
struct work_struct beep_work; /* scheduled task for beep event */
};