[alsa-devel] [PATCH 21/30] ALSA: oxfw: Change the way to name card

[Takashi Iwai]

At Sun, 30 Nov 2014 13:33:31 +0900,
Takashi Sakamoto wrote:
> 
> On Nov 30 2014 04:37, Takashi Iwai wrote:
> >> diff --git a/sound/firewire/oxfw/oxfw.c b/sound/firewire/oxfw/oxfw.c
> >> index 951d9a4..3308253 100644
> >> --- a/sound/firewire/oxfw/oxfw.c
> >> +++ b/sound/firewire/oxfw/oxfw.c
> >> @@ -25,14 +25,34 @@ MODULE_AUTHOR("Clemens Ladisch <clemens at ladisch.de>");
> >>  MODULE_LICENSE("GPL v2");
> >>  MODULE_ALIAS("snd-firewire-speakers");
> >>  
> >> -static u32 oxfw_read_firmware_version(struct fw_unit *unit)
> >> +static int name_card(struct snd_oxfw *oxfw)
> >>  {
> >> -	__be32 data;
> >> +	struct fw_device *fw_dev = fw_parent_device(oxfw->unit);
> >> +	const char *d, *v, *m;
> >> +	u32 firmware;
> >>  	int err;
> >>  
> >> -	err = snd_fw_transaction(unit, TCODE_READ_QUADLET_REQUEST,
> >> -				 OXFORD_FIRMWARE_ID_ADDRESS, &data, 4, 0);
> >> -	return err >= 0 ? be32_to_cpu(data) : 0;
> >> +	err = snd_fw_transaction(oxfw->unit, TCODE_READ_QUADLET_REQUEST,
> >> +				 OXFORD_FIRMWARE_ID_ADDRESS, &firmware, 4, 0);
> >> +	if (err < 0)
> >> +		goto end;
> >> +	be32_to_cpus(&firmware);
> >> +
> >> +	d = oxfw->device_info->driver_name;
> >> +	v = oxfw->device_info->vendor_name;
> >> +	m = oxfw->device_info->driver_name;
> >> +
> >> +	strcpy(oxfw->card->driver, d);
> >> +	strcpy(oxfw->card->shortname, m);
> >> +	strcpy(oxfw->card->mixername, m);
> > 
> > So, this ends up with the identical strings for both driver and
> > shortname?  This doesn't sound like an improvement.
> 
> Basically, hard-coded strings can be replaced by strings read from
> config-rom on the devices. My original intension of this commit is
> following to this.
> 
> But FWSpeakers/FireWave has long strings for vendor/model strings on
> config-rom, therefore his commit can obsolete long name only.
> 
> Actually this patch is a help for later patch:
> [PATCH 26/30] ALSA: oxfw: Add support for Behringer/Mackie devices
> http://mailman.alsa-project.org/pipermail/alsa-devel/2014-November/084818.html

But still it's not applied to LaCie and other that have device_info,
no?  So they'll end up with the even shorter names than now.

I'd be better to create a short_name from "Vendor Model" where
driver_name can be a fallback of model name.


Takashi