Merge branch 'topic/caiaq' into for-linus
* topic/caiaq: ALSA: snd_usb_caiaq: bump version number ALSA: snd_usb_caiaq: give better shortname ALSA: Core - add snd_card_set_id() function ALSA: snd_usb_caiaq: give better longname ALSA: snd_usb_caiaq: use strlcpy ALSA: snd_usb_caiaq: clean whitespaces
This commit is contained in:
Takashi Iwai
commit
ab2f06cb6b
@ -313,6 +313,7 @@ struct snd_card *snd_card_new(int idx, const char *id,
|
||||
int snd_card_disconnect(struct snd_card *card);
|
||||
int snd_card_free(struct snd_card *card);
|
||||
int snd_card_free_when_closed(struct snd_card *card);
|
||||
void snd_card_set_id(struct snd_card *card, const char *id);
|
||||
int snd_card_register(struct snd_card *card);
|
||||
int snd_card_info_init(void);
|
||||
int snd_card_info_done(void);
|
||||
|
||||
@ -152,15 +152,8 @@ int snd_card_create(int idx, const char *xid,
|
||||
card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL);
|
||||
if (!card)
|
||||
return -ENOMEM;
|
||||
if (xid) {
|
||||
if (!snd_info_check_reserved_words(xid)) {
|
||||
snd_printk(KERN_ERR
|
||||
"given id string '%s' is reserved.\n", xid);
|
||||
err = -EBUSY;
|
||||
goto __error;
|
||||
}
|
||||
strlcpy(card->id, xid, sizeof(card->id));
|
||||
}
|
||||
if (xid)
|
||||
snd_card_set_id(card, xid);
|
||||
err = 0;
|
||||
mutex_lock(&snd_card_mutex);
|
||||
if (idx < 0) {
|
||||
@ -483,22 +476,39 @@ int snd_card_free(struct snd_card *card)
|
||||
|
||||
EXPORT_SYMBOL(snd_card_free);
|
||||
|
||||
static void choose_default_id(struct snd_card *card)
|
||||
/**
|
||||
* snd_card_set_id - set card identification name
|
||||
* @card: soundcard structure
|
||||
* @nid: new identification string
|
||||
*
|
||||
* This function sets the card identification and checks for name
|
||||
* collisions.
|
||||
*/
|
||||
void snd_card_set_id(struct snd_card *card, const char *nid)
|
||||
{
|
||||
int i, len, idx_flag = 0, loops = SNDRV_CARDS;
|
||||
char *id, *spos;
|
||||
const char *spos, *src;
|
||||
char *id;
|
||||
|
||||
id = spos = card->shortname;
|
||||
while (*id != '\0') {
|
||||
if (*id == ' ')
|
||||
spos = id + 1;
|
||||
id++;
|
||||
/* check if user specified own card->id */
|
||||
if (card->id[0] != '\0')
|
||||
return;
|
||||
if (nid == NULL) {
|
||||
id = card->shortname;
|
||||
spos = src = id;
|
||||
while (*id != '\0') {
|
||||
if (*id == ' ')
|
||||
spos = id + 1;
|
||||
id++;
|
||||
}
|
||||
} else {
|
||||
spos = src = nid;
|
||||
}
|
||||
id = card->id;
|
||||
while (*spos != '\0' && !isalnum(*spos))
|
||||
spos++;
|
||||
if (isdigit(*spos))
|
||||
*id++ = isalpha(card->shortname[0]) ? card->shortname[0] : 'D';
|
||||
*id++ = isalpha(src[0]) ? src[0] : 'D';
|
||||
while (*spos != '\0' && (size_t)(id - card->id) < sizeof(card->id) - 1) {
|
||||
if (isalnum(*spos))
|
||||
*id++ = *spos;
|
||||
@ -513,16 +523,20 @@ static void choose_default_id(struct snd_card *card)
|
||||
|
||||
while (1) {
|
||||
if (loops-- == 0) {
|
||||
snd_printk(KERN_ERR "unable to choose default card id (%s)\n", id);
|
||||
snd_printk(KERN_ERR "unable to set card id (%s)\n", id);
|
||||
strcpy(card->id, card->proc_root->name);
|
||||
return;
|
||||
}
|
||||
if (!snd_info_check_reserved_words(id))
|
||||
goto __change;
|
||||
mutex_lock(&snd_card_mutex);
|
||||
for (i = 0; i < snd_ecards_limit; i++) {
|
||||
if (snd_cards[i] && !strcmp(snd_cards[i]->id, id))
|
||||
if (snd_cards[i] && !strcmp(snd_cards[i]->id, id)) {
|
||||
mutex_unlock(&snd_card_mutex);
|
||||
goto __change;
|
||||
}
|
||||
}
|
||||
mutex_unlock(&snd_card_mutex);
|
||||
break;
|
||||
|
||||
__change:
|
||||
@ -539,14 +553,16 @@ static void choose_default_id(struct snd_card *card)
|
||||
spos = id + len - 2;
|
||||
if ((size_t)len <= sizeof(card->id) - 2)
|
||||
spos++;
|
||||
*spos++ = '_';
|
||||
*spos++ = '1';
|
||||
*spos++ = '\0';
|
||||
*(char *)spos++ = '_';
|
||||
*(char *)spos++ = '1';
|
||||
*(char *)spos++ = '\0';
|
||||
idx_flag++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
EXPORT_SYMBOL(snd_card_set_id);
|
||||
|
||||
#ifndef CONFIG_SYSFS_DEPRECATED
|
||||
static ssize_t
|
||||
card_id_show_attr(struct device *dev,
|
||||
@ -641,7 +657,7 @@ int snd_card_register(struct snd_card *card)
|
||||
return 0;
|
||||
}
|
||||
if (card->id[0] == '\0')
|
||||
choose_default_id(card);
|
||||
snd_card_set_id(card, NULL);
|
||||
snd_cards[card->number] = card;
|
||||
mutex_unlock(&snd_card_mutex);
|
||||
init_info_for_card(card);
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
#include "input.h"
|
||||
|
||||
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>");
|
||||
MODULE_DESCRIPTION("caiaq USB audio, version 1.3.14");
|
||||
MODULE_DESCRIPTION("caiaq USB audio, version 1.3.15");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
|
||||
"{Native Instruments, RigKontrol3},"
|
||||
@ -250,8 +250,8 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
|
||||
return dev->audio_parm_answer == 1 ? 0 : -EINVAL;
|
||||
}
|
||||
|
||||
int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *dev,
|
||||
int digital, int analog, int erp)
|
||||
int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev,
|
||||
int digital, int analog, int erp)
|
||||
{
|
||||
char tmp[3] = { digital, analog, erp };
|
||||
return snd_usb_caiaq_send_command(dev, EP1_CMD_AUTO_MSG,
|
||||
@ -382,7 +382,7 @@ static int create_card(struct usb_device* usb_dev, struct snd_card **cardp)
|
||||
|
||||
static int __devinit init_card(struct snd_usb_caiaqdev *dev)
|
||||
{
|
||||
char *c;
|
||||
char *c, usbpath[32];
|
||||
struct usb_device *usb_dev = dev->chip.dev;
|
||||
struct snd_card *card = dev->chip.card;
|
||||
int err, len;
|
||||
@ -424,27 +424,31 @@ static int __devinit init_card(struct snd_usb_caiaqdev *dev)
|
||||
usb_string(usb_dev, usb_dev->descriptor.iProduct,
|
||||
dev->product_name, CAIAQ_USB_STR_LEN);
|
||||
|
||||
usb_string(usb_dev, usb_dev->descriptor.iSerialNumber,
|
||||
dev->serial, CAIAQ_USB_STR_LEN);
|
||||
strlcpy(card->driver, MODNAME, sizeof(card->driver));
|
||||
strlcpy(card->shortname, dev->product_name, sizeof(card->shortname));
|
||||
|
||||
/* terminate serial string at first white space occurence */
|
||||
c = strchr(dev->serial, ' ');
|
||||
if (c)
|
||||
*c = '\0';
|
||||
/* if the id was not passed as module option, fill it with a shortened
|
||||
* version of the product string which does not contain any
|
||||
* whitespaces */
|
||||
|
||||
strcpy(card->driver, MODNAME);
|
||||
strcpy(card->shortname, dev->product_name);
|
||||
if (*card->id == '\0') {
|
||||
char id[sizeof(card->id)];
|
||||
|
||||
len = snprintf(card->longname, sizeof(card->longname),
|
||||
"%s %s (serial %s, ",
|
||||
dev->vendor_name, dev->product_name, dev->serial);
|
||||
memset(id, 0, sizeof(id));
|
||||
|
||||
if (len < sizeof(card->longname) - 2)
|
||||
len += usb_make_path(usb_dev, card->longname + len,
|
||||
sizeof(card->longname) - len);
|
||||
for (c = card->shortname, len = 0;
|
||||
*c && len < sizeof(card->id); c++)
|
||||
if (*c != ' ')
|
||||
id[len++] = *c;
|
||||
|
||||
snd_card_set_id(card, id);
|
||||
}
|
||||
|
||||
usb_make_path(usb_dev, usbpath, sizeof(usbpath));
|
||||
snprintf(card->longname, sizeof(card->longname),
|
||||
"%s %s (%s)",
|
||||
dev->vendor_name, dev->product_name, usbpath);
|
||||
|
||||
card->longname[len++] = ')';
|
||||
card->longname[len] = '\0';
|
||||
setup_card(dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -81,7 +81,6 @@ struct snd_usb_caiaqdev {
|
||||
|
||||
char vendor_name[CAIAQ_USB_STR_LEN];
|
||||
char product_name[CAIAQ_USB_STR_LEN];
|
||||
char serial[CAIAQ_USB_STR_LEN];
|
||||
|
||||
int n_streams, n_audio_in, n_audio_out;
|
||||
int streaming, first_packet, output_running;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user