From: "Raphaël Doursenaud" <rdoursenaud@free.fr>
To: alsa-devel@alsa-project.org
Subject: [PATCH 1/1] hdsp: right firmware path
Date: Fri, 22 May 2009 16:46:13 +0200 [thread overview]
Message-ID: <4A16BAB5.3040604@free.fr> (raw)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
From: Raphaël Doursenaud <rdoursenaud@free.fr>
Correct firmware path to reflect actual location.
This was causing hotplug to fail.
Inspired by the emu10k1 module.
Signed-off-by: Raphael Doursenaud <rdoursenaud@free.fr>
- ---
sound/pci/rme9652/hdsp.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index 314e735..48f5434 100644
- --- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -59,11 +59,17 @@ MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{RME Hammerfall-DSP},"
"{RME HDSP-9652},"
"{RME HDSP-9632}}");
+
+#define MULTIFACE_FILENAME "hdsploader/multiface_firmware.bin"
+#define MULTIFACE_REV11_FILENAME "hdsploader/multiface_firmware_rev11.bin"
+#define DIGIFACE_FILENAME "hdsploader/digiface_firmware.bin"
+#define DIGIFACE_REV11_FILENAME "hdsploader/digiface_firmware_rev11.bin"
+
#ifdef HDSP_FW_LOADER
- -MODULE_FIRMWARE("multiface_firmware.bin");
- -MODULE_FIRMWARE("multiface_firmware_rev11.bin");
- -MODULE_FIRMWARE("digiface_firmware.bin");
- -MODULE_FIRMWARE("digiface_firmware_rev11.bin");
+MODULE_FIRMWARE(MULTIFACE_FILENAME);
+MODULE_FIRMWARE(MULTIFACE_REV11_FILENAME);
+MODULE_FIRMWARE(DIGIFACE_FILENAME);
+MODULE_FIRMWARE(DIGIFACE_REV11_FILENAME);
#endif
#define HDSP_MAX_CHANNELS 26
@@ -4928,15 +4934,15 @@ static int hdsp_request_fw_loader(struct hdsp *hdsp)
switch (hdsp->io_type) {
case Multiface:
if (hdsp->firmware_rev == 0xa)
- - fwfile = "multiface_firmware.bin";
+ fwfile = MULTIFACE_FILENAME;
else
- - fwfile = "multiface_firmware_rev11.bin";
+ fwfile = MULTIFACE_REV11_FILENAME;
break;
case Digiface:
if (hdsp->firmware_rev == 0xa)
- - fwfile = "digiface_firmware.bin";
+ fwfile = DIGIFACE_FILENAME;
else
- - fwfile = "digiface_firmware_rev11.bin";
+ fwfile = DIGIFACE_REV11_FILENAME;
break;
default:
snd_printk(KERN_ERR "Hammerfall-DSP: invalid io_type %d\n",
hdsp->io_type);
- --
Raphaël Doursenaud
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkoWurIACgkQaZKmNAdXaVVYYACdEyheX1+7sUbWURScDRFV66XV
s4gAniZHnEfwRG012ZQmaDAhDhNXQf9Z
=Ex8j
-----END PGP SIGNATURE-----
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next reply other threads:[~2009-05-22 14:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-22 14:46 Raphaël Doursenaud [this message]
2009-05-22 17:28 ` [PATCH 1/1] hdsp: right firmware path Takashi Iwai
2009-05-23 0:53 ` Raphaël Doursenaud
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A16BAB5.3040604@free.fr \
--to=rdoursenaud@free.fr \
--cc=alsa-devel@alsa-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.