lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'topic/caiaq' into for-linus

Browse Source 
* 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
2009-06-10 07:26:23 +02:00
parent a963203c18 c6e24d4db8
commit ab2f06cb6b
6 changed files with 148 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/core.h
View File

@@ -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_disconnect(struct snd_card *card);
int snd_card_free(struct snd_card *card); int snd_card_free(struct snd_card *card);
int snd_card_free_when_closed(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_register(struct snd_card *card);
int snd_card_info_init(void); int snd_card_info_init(void);
int snd_card_info_done(void); int snd_card_info_done(void);

54
sound/core/init.c
View File

@@ -152,15 +152,8 @@ int snd_card_create(int idx, const char *xid,
card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL); card = kzalloc(sizeof(*card) + extra_size, GFP_KERNEL);
if (!card) if (!card)
return -ENOMEM; return -ENOMEM;
if (xid) { if (xid)
if (!snd_info_check_reserved_words(xid)) { snd_card_set_id(card, xid);
snd_printk(KERN_ERR
"given id string '%s' is reserved.\n", xid);
err = -EBUSY;
goto __error;
}
strlcpy(card->id, xid, sizeof(card->id));
}
err = 0; err = 0;
mutex_lock(&snd_card_mutex); mutex_lock(&snd_card_mutex);
if (idx < 0) { if (idx < 0) {
@@ -483,22 +476,39 @@ int snd_card_free(struct snd_card *card)
EXPORT_SYMBOL(snd_card_free); 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; int i, len, idx_flag = 0, loops = SNDRV_CARDS;
char *id, *spos; const char *spos, *src;
char *id;
id = spos = card->shortname; /* 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') { while (*id != '\0') {
if (*id == ' ') if (*id == ' ')
spos = id + 1; spos = id + 1;
id++; id++;
} }
} else {
spos = src = nid;
}
id = card->id; id = card->id;
while (*spos != '\0' && !isalnum(*spos)) while (*spos != '\0' && !isalnum(*spos))
spos++; spos++;
if (isdigit(*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) { while (*spos != '\0' && (size_t)(id - card->id) < sizeof(card->id) - 1) {
if (isalnum(*spos)) if (isalnum(*spos))
*id++ = *spos; *id++ = *spos;
@@ -513,16 +523,20 @@ static void choose_default_id(struct snd_card *card)
while (1) { while (1) {
if (loops-- == 0) { 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); strcpy(card->id, card->proc_root->name);
return; return;
} }
if (!snd_info_check_reserved_words(id)) if (!snd_info_check_reserved_words(id))
goto __change; goto __change;
mutex_lock(&snd_card_mutex);
for (i = 0; i < snd_ecards_limit; i++) { 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; goto __change;
} }
}
mutex_unlock(&snd_card_mutex);
break; break;
__change: __change:
@@ -539,14 +553,16 @@ static void choose_default_id(struct snd_card *card)
spos = id + len - 2; spos = id + len - 2;
if ((size_t)len <= sizeof(card->id) - 2) if ((size_t)len <= sizeof(card->id) - 2)
spos++; spos++;
*spos++ = '_'; *(char *)spos++ = '_';
*spos++ = '1'; *(char *)spos++ = '1';
*spos++ = '\0'; *(char *)spos++ = '\0';
idx_flag++; idx_flag++;
} }
} }
} }
EXPORT_SYMBOL(snd_card_set_id);
#ifndef CONFIG_SYSFS_DEPRECATED #ifndef CONFIG_SYSFS_DEPRECATED
static ssize_t static ssize_t
card_id_show_attr(struct device *dev, card_id_show_attr(struct device *dev,
@@ -641,7 +657,7 @@ int snd_card_register(struct snd_card *card)
return 0; return 0;
} }
if (card->id[0] == '\0') if (card->id[0] == '\0')
choose_default_id(card); snd_card_set_id(card, NULL);
snd_cards[card->number] = card; snd_cards[card->number] = card;
mutex_unlock(&snd_card_mutex); mutex_unlock(&snd_card_mutex);
init_info_for_card(card); init_info_for_card(card);

42
sound/usb/caiaq/device.c
View File

@@ -35,7 +35,7 @@
#include "input.h" #include "input.h"
MODULE_AUTHOR("Daniel Mack <daniel@caiaq.de>"); 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_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2}," MODULE_SUPPORTED_DEVICE("{{Native Instruments, RigKontrol2},"
"{Native Instruments, RigKontrol3}," "{Native Instruments, RigKontrol3},"
@@ -250,7 +250,7 @@ int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *dev,
return dev->audio_parm_answer == 1 ? 0 : -EINVAL; return dev->audio_parm_answer == 1 ? 0 : -EINVAL;
} }
int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *dev, int snd_usb_caiaq_set_auto_msg(struct snd_usb_caiaqdev *dev,
int digital, int analog, int erp) int digital, int analog, int erp)
{ {
char tmp[3] = { digital, analog, erp }; char tmp[3] = { digital, analog, erp };
@@ -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) 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 usb_device *usb_dev = dev->chip.dev;
struct snd_card *card = dev->chip.card; struct snd_card *card = dev->chip.card;
int err, len; 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, usb_string(usb_dev, usb_dev->descriptor.iProduct,
dev->product_name, CAIAQ_USB_STR_LEN); dev->product_name, CAIAQ_USB_STR_LEN);
usb_string(usb_dev, usb_dev->descriptor.iSerialNumber, strlcpy(card->driver, MODNAME, sizeof(card->driver));
dev->serial, CAIAQ_USB_STR_LEN); strlcpy(card->shortname, dev->product_name, sizeof(card->shortname));
/* terminate serial string at first white space occurence */ /* if the id was not passed as module option, fill it with a shortened
c = strchr(dev->serial, ' '); * version of the product string which does not contain any
if (c) * whitespaces */
*c = '\0';
strcpy(card->driver, MODNAME); if (*card->id == '\0') {
strcpy(card->shortname, dev->product_name); char id[sizeof(card->id)];
len = snprintf(card->longname, sizeof(card->longname), memset(id, 0, sizeof(id));
"%s %s (serial %s, ",
dev->vendor_name, dev->product_name, dev->serial);
if (len < sizeof(card->longname) - 2) for (c = card->shortname, len = 0;
len += usb_make_path(usb_dev, card->longname + len, *c && len < sizeof(card->id); c++)
sizeof(card->longname) - len); 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); setup_card(dev);
return 0; return 0;
} }

1
sound/usb/caiaq/device.h
View File

@@ -81,7 +81,6 @@ struct snd_usb_caiaqdev {
char vendor_name[CAIAQ_USB_STR_LEN]; char vendor_name[CAIAQ_USB_STR_LEN];
char product_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 n_streams, n_audio_in, n_audio_out;
int streaming, first_packet, output_running; int streaming, first_packet, output_running;