* [PATCH 1/1] hdsp: right firmware path
@ 2009-05-22 14:46 Raphaël Doursenaud
2009-05-22 17:28 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Raphaël Doursenaud @ 2009-05-22 14:46 UTC (permalink / raw)
To: alsa-devel
-----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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] hdsp: right firmware path
2009-05-22 14:46 [PATCH 1/1] hdsp: right firmware path Raphaël Doursenaud
@ 2009-05-22 17:28 ` Takashi Iwai
2009-05-23 0:53 ` Raphaël Doursenaud
0 siblings, 1 reply; 3+ messages in thread
From: Takashi Iwai @ 2009-05-22 17:28 UTC (permalink / raw)
To: Raphaël Doursenaud; +Cc: alsa-devel
At Fri, 22 May 2009 16:46:13 +0200,
Raphaël Doursenaud wrote:
>
> -----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.
The firmware files of hdsp are actually located without "hdsploader/"
path but directly in /lib/firmware as default. Is it different on your
systems?
thanks,
Takashi
> 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-----
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] hdsp: right firmware path
2009-05-22 17:28 ` Takashi Iwai
@ 2009-05-23 0:53 ` Raphaël Doursenaud
0 siblings, 0 replies; 3+ messages in thread
From: Raphaël Doursenaud @ 2009-05-23 0:53 UTC (permalink / raw)
To: Takashi Iwai; +Cc: alsa-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Takashi Iwai a écrit :
> At Fri, 22 May 2009 16:46:13 +0200,
> Raphaël Doursenaud wrote:
> From: Raphaël Doursenaud <rdoursenaud@free.fr>
>
> Correct firmware path to reflect actual location.
> This was causing hotplug to fail.
>
>> The firmware files of hdsp are actually located without "hdsploader/"
>> path but directly in /lib/firmware as default. Is it different on your
>> systems?
>
>
>> thanks,
>
>> Takashi
Well, as usual, your right!
I should have checked first; this is distribution related.
Sorry for the noise.
- --
Raphaël Doursenaud
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkoXSRwACgkQaZKmNAdXaVWNSgCgq3M0u6U0ZSZ+dMmvNa4Mb3LR
CP0AnAkA79OhXVNGIYEf870A9QGktt6/
=TY7n
-----END PGP SIGNATURE-----
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-23 0:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-22 14:46 [PATCH 1/1] hdsp: right firmware path Raphaël Doursenaud
2009-05-22 17:28 ` Takashi Iwai
2009-05-23 0:53 ` Raphaël Doursenaud
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.