UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: fm801: introduce fm801_ac97_is_ready()/fm801_ac97_is_valid() helpers 

The introduced functios check AC97 if it's ready for communication and
read data is valid.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Andy Shevchenko 2014-04-29 10:56:04 +03:00 committed by Takashi Iwai
parent 215dacc281
commit 02fd1a76bf
1 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
sound/pci/fm801.c
View File

@ -224,6 +224,30 @@ MODULE_DEVICE_TABLE(pci, snd_fm801_ids);
* common I/O routines * common I/O routines
*/ */
static bool fm801_ac97_is_ready(struct fm801 *chip, unsigned int iterations)
{
unsigned int idx;
for (idx = 0; idx < iterations; idx++) {
if (!(fm801_readw(chip, AC97_CMD) & FM801_AC97_BUSY))
return true;
udelay(10);
}
return false;
}
static bool fm801_ac97_is_valid(struct fm801 *chip, unsigned int iterations)
{
unsigned int idx;
for (idx = 0; idx < iterations; idx++) {
if (fm801_readw(chip, AC97_CMD) & FM801_AC97_VALID)
return true;
udelay(10);
}
return false;
}
static int snd_fm801_update_bits(struct fm801 *chip, unsigned short reg, static int snd_fm801_update_bits(struct fm801 *chip, unsigned short reg,
unsigned short mask, unsigned short value) unsigned short mask, unsigned short value)
{ {
@ -246,72 +270,53 @@ static void snd_fm801_codec_write(struct snd_ac97 *ac97,
unsigned short val) unsigned short val)
{ {
struct fm801 *chip = ac97->private_data; struct fm801 *chip = ac97->private_data;
int idx;
/* /*
* Wait until the codec interface is not ready.. * Wait until the codec interface is not ready..
*/ */
for (idx = 0; idx < 100; idx++) { if (!fm801_ac97_is_ready(chip, 100)) {
if (!(fm801_readw(chip, AC97_CMD) & FM801_AC97_BUSY)) dev_err(chip->card->dev, "AC'97 interface is busy (1)\n");
goto ok1; return;
udelay(10);
} }
dev_err(chip->card->dev, "AC'97 interface is busy (1)\n");
return;
ok1:
/* write data and address */ /* write data and address */
fm801_writew(chip, AC97_DATA, val); fm801_writew(chip, AC97_DATA, val);
fm801_writew(chip, AC97_CMD, reg | (ac97->addr << FM801_AC97_ADDR_SHIFT)); fm801_writew(chip, AC97_CMD, reg | (ac97->addr << FM801_AC97_ADDR_SHIFT));
/* /*
* Wait until the write command is not completed.. * Wait until the write command is not completed..
*/ */
for (idx = 0; idx < 1000; idx++) { if (!fm801_ac97_is_ready(chip, 1000))
if (!(fm801_readw(chip, AC97_CMD) & FM801_AC97_BUSY)) dev_err(chip->card->dev, "AC'97 interface #%d is busy (2)\n",
return; ac97->num);
udelay(10);
}
dev_err(chip->card->dev, "AC'97 interface #%d is busy (2)\n", ac97->num);
} }
static unsigned short snd_fm801_codec_read(struct snd_ac97 *ac97, unsigned short reg) static unsigned short snd_fm801_codec_read(struct snd_ac97 *ac97, unsigned short reg)
{ {
struct fm801 *chip = ac97->private_data; struct fm801 *chip = ac97->private_data;
int idx;
/* /*
* Wait until the codec interface is not ready.. * Wait until the codec interface is not ready..
*/ */
for (idx = 0; idx < 100; idx++) { if (!fm801_ac97_is_ready(chip, 100)) {
if (!(fm801_readw(chip, AC97_CMD) & FM801_AC97_BUSY)) dev_err(chip->card->dev, "AC'97 interface is busy (1)\n");
goto ok1; return 0;
udelay(10);
} }
dev_err(chip->card->dev, "AC'97 interface is busy (1)\n");
return 0;
ok1:
/* read command */ /* read command */
fm801_writew(chip, AC97_CMD, fm801_writew(chip, AC97_CMD,
reg | (ac97->addr << FM801_AC97_ADDR_SHIFT) | FM801_AC97_READ); reg | (ac97->addr << FM801_AC97_ADDR_SHIFT) | FM801_AC97_READ);
for (idx = 0; idx < 100; idx++) { if (!fm801_ac97_is_ready(chip, 100)) {
if (!(fm801_readw(chip, AC97_CMD) & FM801_AC97_BUSY)) dev_err(chip->card->dev, "AC'97 interface #%d is busy (2)\n",
goto ok2; ac97->num);
udelay(10); return 0;
} }
dev_err(chip->card->dev, "AC'97 interface #%d is busy (2)\n", ac97->num);
return 0;
ok2: if (!fm801_ac97_is_valid(chip, 1000)) {
for (idx = 0; idx < 1000; idx++) { dev_err(chip->card->dev,
if (fm801_readw(chip, AC97_CMD) & FM801_AC97_VALID) "AC'97 interface #%d is not valid (2)\n", ac97->num);
goto ok3; return 0;
udelay(10);
} }
dev_err(chip->card->dev, "AC'97 interface #%d is not valid (2)\n", ac97->num);
return 0;
ok3:
return fm801_readw(chip, AC97_DATA); return fm801_readw(chip, AC97_DATA);
} }