diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:33:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-09-10 15:33:09 +0200 |
| commit | 1110afbe728838ac7ce973c37af9e11385dbaef9 (patch) | |
| tree | 1c1f3d08cf38527717e16223020e66d04e297550 | |
| parent | fd30afa454282bbe1b36d5d77bd72c0ea5b3f97c (diff) | |
| parent | 6e2efaacb3579fd9643d0dc59963b58b801c03a1 (diff) | |
| download | op-kernel-dev-1110afbe728838ac7ce973c37af9e11385dbaef9.zip op-kernel-dev-1110afbe728838ac7ce973c37af9e11385dbaef9.tar.gz | |
Merge branch 'topic/ymfpci' into for-linus
* topic/ymfpci:
sound: ymfpci: increase timer resolution to 96 kHz
| -rw-r--r-- | include/sound/ymfpci.h | 1 | ||||
| -rw-r--r-- | sound/pci/ymfpci/ymfpci_main.c | 20 |
2 files changed, 16 insertions, 5 deletions
diff --git a/include/sound/ymfpci.h b/include/sound/ymfpci.h index 05ead66..444cd6b 100644 --- a/include/sound/ymfpci.h +++ b/include/sound/ymfpci.h @@ -331,6 +331,7 @@ struct snd_ymfpci { struct snd_ac97 *ac97; struct snd_rawmidi *rawmidi; struct snd_timer *timer; + unsigned int timer_ticks; struct pci_dev *pci; struct snd_card *card; diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c index 2f09252..5518371 100644 --- a/sound/pci/ymfpci/ymfpci_main.c +++ b/sound/pci/ymfpci/ymfpci_main.c @@ -834,7 +834,7 @@ static irqreturn_t snd_ymfpci_interrupt(int irq, void *dev_id) status = snd_ymfpci_readw(chip, YDSXGR_INTFLAG); if (status & 1) { if (chip->timer) - snd_timer_interrupt(chip->timer, chip->timer->sticks); + snd_timer_interrupt(chip->timer, chip->timer_ticks); } snd_ymfpci_writew(chip, YDSXGR_INTFLAG, status); @@ -1885,8 +1885,18 @@ static int snd_ymfpci_timer_start(struct snd_timer *timer) unsigned int count; chip = snd_timer_chip(timer); - count = (timer->sticks << 1) - 1; spin_lock_irqsave(&chip->reg_lock, flags); + if (timer->sticks > 1) { + chip->timer_ticks = timer->sticks; + count = timer->sticks - 1; + } else { + /* + * Divisor 1 is not allowed; fake it by using divisor 2 and + * counting two ticks for each interrupt. + */ + chip->timer_ticks = 2; + count = 2 - 1; + } snd_ymfpci_writew(chip, YDSXGR_TIMERCOUNT, count); snd_ymfpci_writeb(chip, YDSXGR_TIMERCTRL, 0x03); spin_unlock_irqrestore(&chip->reg_lock, flags); @@ -1909,14 +1919,14 @@ static int snd_ymfpci_timer_precise_resolution(struct snd_timer *timer, unsigned long *num, unsigned long *den) { *num = 1; - *den = 48000; + *den = 96000; return 0; } static struct snd_timer_hardware snd_ymfpci_timer_hw = { .flags = SNDRV_TIMER_HW_AUTO, - .resolution = 20833, /* 1/fs = 20.8333...us */ - .ticks = 0x8000, + .resolution = 10417, /* 1 / 96 kHz = 10.41666...us */ + .ticks = 0x10000, .start = snd_ymfpci_timer_start, .stop = snd_ymfpci_timer_stop, .precise_resolution = snd_ymfpci_timer_precise_resolution, |
