Update of /cvsroot/alsa/alsa-kernel/pci/vx222 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20010/pci/vx222
Modified Files: vx222.c Log Message: use the new module_param*() functions. Index: vx222.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/vx222/vx222.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vx222.c 21 Jan 2004 18:32:48 -0000 1.3 +++ vx222.c 7 Apr 2004 17:48:21 -0000 1.4 @@ -23,8 +23,8 @@ #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/slab.h> +#include <linux/moduleparam.h> #include <sound/core.h> -#define SNDRV_GET_ID #include <sound/initval.h> #include "vx222.h" @@ -43,20 +43,21 @@ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; /* Enable this card */ static int mic[SNDRV_CARDS]; /* microphone */ static int ibl[SNDRV_CARDS]; /* microphone */ +static int boot_devs; -MODULE_PARM(index, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(index, int, boot_devs, 0444); MODULE_PARM_DESC(index, "Index value for Digigram " CARD_NAME " soundcard."); MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC); -MODULE_PARM(id, "1-" __MODULE_STRING(SNDRV_CARDS) "s"); +module_param_array(id, charp, boot_devs, 0444); MODULE_PARM_DESC(id, "ID string for Digigram " CARD_NAME " soundcard."); MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC); -MODULE_PARM(enable, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(enable, bool, boot_devs, 0444); MODULE_PARM_DESC(enable, "Enable Digigram " CARD_NAME " soundcard."); MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC); -MODULE_PARM(mic, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(mic, bool, boot_devs, 0444); MODULE_PARM_DESC(mic, "Enable Microphone."); MODULE_PARM_SYNTAX(mic, SNDRV_ENABLED "," SNDRV_BOOLEAN_FALSE_DESC); -MODULE_PARM(ibl, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(ibl, int, boot_devs, 0444); MODULE_PARM_DESC(ibl, "Capture IBL size."); MODULE_PARM_SYNTAX(ibl, SNDRV_ENABLED); @@ -290,24 +291,3 @@ module_init(alsa_card_vx222_init) module_exit(alsa_card_vx222_exit) - -#ifndef MODULE - -/* format is: snd-vx222=enable,index,id */ - -static int __init alsa_card_vx222_setup(char *str) -{ - static unsigned __initdata nr_dev = 0; - - if (nr_dev >= SNDRV_CARDS) - return 0; - (void)(get_option(&str,&enable[nr_dev]) == 2 && - get_option(&str,&index[nr_dev]) == 2 && - get_id(&str,&id[nr_dev]) == 2); - nr_dev++; - return 1; -} - -__setup("snd-vx222=", alsa_card_vx222_setup); - -#endif /* ifndef MODULE */ ------------------------------------------------------- This SF.Net email is sponsored by: IBM Linux Tutorials Free Linux tutorial presented by Daniel Robbins, President and CEO of GenToo technologies. Learn everything from fundamentals to system administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog