Skip to contentSkip to conversation

hdsp: right firmware path

PATCH In review Raphaël Doursenaud 2 participants 3 messages May 22, 2009 – May 23, 2009 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hdsp: right firmware path

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

From: Raphaël Doursenaud <[email protected]>

Correct firmware path to reflect actual location.
This was causing hotplug to fail.
Inspired by the emu10k1 module.

- ---

 sound/pci/rme9652/hdsp.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
sound/pci/rme9652/hdsp.c +0 -0
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
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#1 lore raw

At Fri, 22 May 2009 16:46:13 +0200,

Quoted 8 lines · Raphaël Doursenaud

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

From: Raphaël Doursenaud <[email protected]>

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

Quoted 66 lines

Inspired by the emu10k1 module.

- ---

 sound/pci/rme9652/hdsp.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)
sound/pci/rme9652/hdsp.c +15 -9
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-----

#2 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 4 lines · Takashi Iwai

At Fri, 22 May 2009 16:46:13 +0200,
Raphaël Doursenaud wrote:
From: Raphaël Doursenaud <[email protected]>

Quoted 11 lines

Correct firmware path to reflect actual location.
This was causing hotplug to fail.

Quoted 8 lines

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
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel