diff options
Diffstat (limited to 'sound/firewire')
| -rw-r--r-- | sound/firewire/fireworks/fireworks.c | 15 | ||||
| -rw-r--r-- | sound/firewire/fireworks/fireworks.h | 8 |
2 files changed, 15 insertions, 8 deletions
diff --git a/sound/firewire/fireworks/fireworks.c b/sound/firewire/fireworks/fireworks.c index 865dac3b37e6..ffb6dd796243 100644 --- a/sound/firewire/fireworks/fireworks.c +++ b/sound/firewire/fireworks/fireworks.c @@ -300,6 +300,21 @@ static void efw_remove(struct fw_unit *unit) snd_card_free(efw->card); } +#define SPECIFIER_1394TA 0x00a02d +#define VERSION_EFW 0x010000 + +#define SND_EFW_DEV_ENTRY(vendor, model) \ +{ \ + .match_flags = IEEE1394_MATCH_VENDOR_ID | \ + IEEE1394_MATCH_MODEL_ID | \ + IEEE1394_MATCH_SPECIFIER_ID | \ + IEEE1394_MATCH_VERSION, \ + .vendor_id = vendor,\ + .model_id = model, \ + .specifier_id = SPECIFIER_1394TA, \ + .version = VERSION_EFW, \ +} + static const struct ieee1394_device_id efw_id_table[] = { SND_EFW_DEV_ENTRY(VENDOR_LOUD, MODEL_MACKIE_400F), SND_EFW_DEV_ENTRY(VENDOR_LOUD, MODEL_MACKIE_1200F), diff --git a/sound/firewire/fireworks/fireworks.h b/sound/firewire/fireworks/fireworks.h index 2c0c7de8b824..c8d5879efe28 100644 --- a/sound/firewire/fireworks/fireworks.h +++ b/sound/firewire/fireworks/fireworks.h @@ -224,12 +224,4 @@ int snd_efw_get_multiplier_mode(unsigned int sampling_rate, unsigned int *mode); int snd_efw_create_hwdep_device(struct snd_efw *efw); -#define SND_EFW_DEV_ENTRY(vendor, model) \ -{ \ - .match_flags = IEEE1394_MATCH_VENDOR_ID | \ - IEEE1394_MATCH_MODEL_ID, \ - .vendor_id = vendor,\ - .model_id = model \ -} - #endif |