@@ -16,16 +16,19 @@ MODULE_DESCRIPTION("RME Fireface series Driver");
MODULE_AUTHOR("Takashi Sakamoto <o-takashi@sakamocchi.jp>");
MODULE_LICENSE("GPL v2");
+struct snd_ff_spec spec_ff400 = {
+ .name = "Fireface400",
+};
+
static void name_card(struct snd_ff *ff)
{
struct fw_device *fw_dev = fw_parent_device(ff->unit);
- const char *const model = "Fireface 400";
strcpy(ff->card->driver, "Fireface");
- strcpy(ff->card->shortname, model);
- strcpy(ff->card->mixername, model);
+ strcpy(ff->card->shortname, ff->spec->name);
+ strcpy(ff->card->mixername, ff->spec->name);
snprintf(ff->card->longname, sizeof(ff->card->longname),
- "RME %s, GUID %08x%08x at %s, S%d", model,
+ "RME %s, GUID %08x%08x at %s, S%d", ff->spec->name,
fw_dev->config_rom[3], fw_dev->config_rom[4],
dev_name(&ff->unit->device), 100 << fw_dev->max_speed);
}
@@ -91,6 +94,7 @@ static int snd_ff_probe(struct fw_unit *unit,
mutex_init(&ff->mutex);
dev_set_drvdata(&unit->device, ff);
+ ff->spec = (const struct snd_ff_spec *)entry->driver_data;
name_card(ff);
/* Register this sound card later. */
@@ -140,6 +144,7 @@ static const struct ieee1394_device_id snd_ff_id_table[] = {
.specifier_id = 0x000a35,
.version = 0x000002,
.model_id = 0x101800,
+ .driver_data = (kernel_ulong_t)&spec_ff400,
},
{}
};
@@ -31,6 +31,10 @@
#include "../amdtp-stream.h"
#include "../iso-resources.h"
+struct snd_ff_spec {
+ const char *const name;
+};
+
struct snd_ff {
struct snd_card *card;
struct fw_unit *unit;
@@ -38,5 +42,7 @@ struct snd_ff {
bool probed;
struct delayed_work dwork;
+
+ const struct snd_ff_spec *spec;
};
#endif
RME Fireface series has several models and their specifications are different. Currently, we find no way to retrieve the specification from actual devices. This commit adds a structure to describe model specific data. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> --- sound/firewire/fireface/fireface.c | 13 +++++++++---- sound/firewire/fireface/fireface.h | 6 ++++++ 2 files changed, 15 insertions(+), 4 deletions(-)