提交 e588ed83 编写于 作者: T Tim Blechmann 提交者: Takashi Iwai

ALSA: hdsp - poll for iobox

sleeping for 2 seconds before checking for the iobox is not enough
on some systems.
this patch increases the timeout, but polls the card during that
time. it thus speeds up the module loading when the card has already
been initialized, while being more robust on systems, which require
a higher timeout than the predefined 2 seconds.
Signed-off-by: NTim Blechmann <tim@klingt.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 66a101dd
...@@ -653,7 +653,6 @@ static unsigned int hdsp_read(struct hdsp *hdsp, int reg) ...@@ -653,7 +653,6 @@ static unsigned int hdsp_read(struct hdsp *hdsp, int reg)
static int hdsp_check_for_iobox (struct hdsp *hdsp) static int hdsp_check_for_iobox (struct hdsp *hdsp)
{ {
if (hdsp->io_type == H9652 || hdsp->io_type == H9632) return 0; if (hdsp->io_type == H9652 || hdsp->io_type == H9632) return 0;
if (hdsp_read (hdsp, HDSP_statusRegister) & HDSP_ConfigError) { if (hdsp_read (hdsp, HDSP_statusRegister) & HDSP_ConfigError) {
snd_printk ("Hammerfall-DSP: no Digiface or Multiface connected!\n"); snd_printk ("Hammerfall-DSP: no Digiface or Multiface connected!\n");
...@@ -661,7 +660,29 @@ static int hdsp_check_for_iobox (struct hdsp *hdsp) ...@@ -661,7 +660,29 @@ static int hdsp_check_for_iobox (struct hdsp *hdsp)
return -EIO; return -EIO;
} }
return 0; return 0;
}
static int hdsp_wait_for_iobox(struct hdsp *hdsp, unsigned int loops,
unsigned int delay)
{
unsigned int i;
if (hdsp->io_type == H9652 || hdsp->io_type == H9632)
return 0;
for (i = 0; i != loops; ++i) {
if (hdsp_read(hdsp, HDSP_statusRegister) & HDSP_ConfigError)
msleep(delay);
else {
snd_printd("Hammerfall-DSP: iobox found after %ums!\n",
i * delay);
return 0;
}
}
snd_printk("Hammerfall-DSP: no Digiface or Multiface connected!\n");
hdsp->state &= ~HDSP_FirmwareLoaded;
return -EIO;
} }
static int snd_hdsp_load_firmware_from_cache(struct hdsp *hdsp) { static int snd_hdsp_load_firmware_from_cache(struct hdsp *hdsp) {
...@@ -5046,10 +5067,10 @@ static int __devinit snd_hdsp_create(struct snd_card *card, ...@@ -5046,10 +5067,10 @@ static int __devinit snd_hdsp_create(struct snd_card *card,
return err; return err;
if (!is_9652 && !is_9632) { if (!is_9652 && !is_9632) {
/* we wait 2 seconds to let freshly inserted cardbus cards do their hardware init */ /* we wait a maximum of 10 seconds to let freshly
ssleep(2); * inserted cardbus cards do their hardware init */
err = hdsp_wait_for_iobox(hdsp, 1000, 10);
err = hdsp_check_for_iobox(hdsp);
if (err < 0) if (err < 0)
return err; return err;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册