Update of /cvsroot/alsa/alsa-kernel/pci/korg1212 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20010/pci/korg1212
Modified Files: korg1212.c Log Message: use the new module_param*() functions. Index: korg1212.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/pci/korg1212/korg1212.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- korg1212.c 6 Mar 2004 16:51:30 -0000 1.36 +++ korg1212.c 7 Apr 2004 17:48:20 -0000 1.37 @@ -26,13 +26,13 @@ #include <linux/pci.h> #include <linux/slab.h> #include <linux/wait.h> +#include <linux/moduleparam.h> #include <sound/core.h> #include <sound/info.h> #include <sound/control.h> #include <sound/pcm.h> #include <sound/pcm_params.h> -#define SNDRV_GET_ID #include <sound/initval.h> #include <asm/io.h> @@ -417,14 +417,15 @@ static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */ +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 Korg 1212 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 Korg 1212 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 Korg 1212 soundcard."); MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC); MODULE_AUTHOR("Haroldo Gamal <[EMAIL PROTECTED]>"); @@ -2543,25 +2544,3 @@ module_init(alsa_card_korg1212_init) module_exit(alsa_card_korg1212_exit) - -#ifndef MODULE - -/* format is: snd-korg1212=enable,index,id */ - -static int __init alsa_card_korg1212_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-korg1212=", alsa_card_korg1212_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