leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ALSA] ad1848_lib: replace common delay loop by function

Browse Source 
This patch replaces a common delay loop by a function.
It also uses ARRAY_SIZE macro for the rates table.
Acked-by: Rene Herman <rene.herman@gmail.com>

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Krzysztof Helt 2007-09-06 15:03:22 +02:00 committed by Jaroslav Kysela
parent ef285fe6ef
commit 8e6a2c2ec9
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sound/isa/ad1848/ad1848_lib.c
View File

@ -70,7 +70,7 @@ static unsigned int rates[14] = {
}; };
static struct snd_pcm_hw_constraint_list hw_constraints_rates = { static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
.count = 14, .count = ARRAY_SIZE(rates),
.list = rates, .list = rates,
.mask = 0, .mask = 0,
}; };
@ -99,24 +99,32 @@ static unsigned char snd_ad1848_original_image[16] =
* Basic I/O functions * Basic I/O functions
*/ */
static void snd_ad1848_wait(struct snd_ad1848 *chip)
{
int timeout;
for (timeout = 250; timeout > 0; timeout--) {
if ((inb(AD1848P(chip, REGSEL)) & AD1848_INIT) == 0)
break;
udelay(100);
}
}
void snd_ad1848_out(struct snd_ad1848 *chip, void snd_ad1848_out(struct snd_ad1848 *chip,
unsigned char reg, unsigned char reg,
unsigned char value) unsigned char value)
{ {
int timeout; snd_ad1848_wait(chip);
for (timeout = 250; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--)
udelay(100);
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
snd_printk(KERN_WARNING "auto calibration time out - reg = 0x%x, value = 0x%x\n", reg, value); snd_printk(KERN_WARNING "auto calibration time out - "
"reg = 0x%x, value = 0x%x\n", reg, value);
#endif #endif
outb(chip->mce_bit | reg, AD1848P(chip, REGSEL)); outb(chip->mce_bit | reg, AD1848P(chip, REGSEL));
outb(chip->image[reg] = value, AD1848P(chip, REG)); outb(chip->image[reg] = value, AD1848P(chip, REG));
mb(); mb();
#if 0 snd_printdd("codec out - reg 0x%x = 0x%x\n",
printk("codec out - reg 0x%x = 0x%x\n", chip->mce_bit | reg, value); chip->mce_bit | reg, value);
#endif
} }
EXPORT_SYMBOL(snd_ad1848_out); EXPORT_SYMBOL(snd_ad1848_out);
@ -124,10 +132,7 @@ EXPORT_SYMBOL(snd_ad1848_out);
static void snd_ad1848_dout(struct snd_ad1848 *chip, static void snd_ad1848_dout(struct snd_ad1848 *chip,
unsigned char reg, unsigned char value) unsigned char reg, unsigned char value)
{ {
int timeout; snd_ad1848_wait(chip);
for (timeout = 250; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--)
udelay(100);
outb(chip->mce_bit | reg, AD1848P(chip, REGSEL)); outb(chip->mce_bit | reg, AD1848P(chip, REGSEL));
outb(value, AD1848P(chip, REG)); outb(value, AD1848P(chip, REG));
mb(); mb();
@ -135,13 +140,11 @@ static void snd_ad1848_dout(struct snd_ad1848 *chip,
static unsigned char snd_ad1848_in(struct snd_ad1848 *chip, unsigned char reg) static unsigned char snd_ad1848_in(struct snd_ad1848 *chip, unsigned char reg)
{ {
int timeout; snd_ad1848_wait(chip);
for (timeout = 250; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--)
udelay(100);
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
snd_printk(KERN_WARNING "auto calibration time out - reg = 0x%x\n", reg); snd_printk(KERN_WARNING "auto calibration time out - "
"reg = 0x%x\n", reg);
#endif #endif
outb(chip->mce_bit | reg, AD1848P(chip, REGSEL)); outb(chip->mce_bit | reg, AD1848P(chip, REGSEL));
mb(); mb();
@ -183,8 +186,7 @@ static void snd_ad1848_mce_up(struct snd_ad1848 *chip)
unsigned long flags; unsigned long flags;
int timeout; int timeout;
for (timeout = 250; timeout > 0 && (inb(AD1848P(chip, REGSEL)) & AD1848_INIT); timeout--) snd_ad1848_wait(chip);
udelay(100);
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT) if (inb(AD1848P(chip, REGSEL)) & AD1848_INIT)
snd_printk(KERN_WARNING "mce_up - auto calibration time out (0)\n"); snd_printk(KERN_WARNING "mce_up - auto calibration time out (0)\n");
@ -319,11 +321,11 @@ static unsigned char snd_ad1848_get_rate(unsigned int rate)
{ {
int i; int i;
for (i = 0; i < 14; i++) for (i = 0; i < ARRAY_SIZE(rates); i++)
if (rate == rates[i]) if (rate == rates[i])
return freq_bits[i]; return freq_bits[i];
snd_BUG(); snd_BUG();
return freq_bits[13]; return freq_bits[ARRAY_SIZE(rates) - 1];
} }
static int snd_ad1848_ioctl(struct snd_pcm_substream *substream, static int snd_ad1848_ioctl(struct snd_pcm_substream *substream,