Update of /cvsroot/alsa/alsa-kernel/isa/es1688 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20010/isa/es1688
Modified Files: es1688.c Log Message: use the new module_param*() functions. Index: es1688.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/es1688/es1688.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- es1688.c 15 Mar 2004 19:33:52 -0000 1.14 +++ es1688.c 7 Apr 2004 17:48:14 -0000 1.15 @@ -24,6 +24,7 @@ #include <linux/init.h> #include <linux/time.h> #include <linux/wait.h> +#include <linux/moduleparam.h> #include <sound/core.h> #include <sound/es1688.h> #include <sound/mpu401.h> @@ -31,7 +32,6 @@ #define SNDRV_LEGACY_AUTO_PROBE #define SNDRV_LEGACY_FIND_FREE_IRQ #define SNDRV_LEGACY_FIND_FREE_DMA -#define SNDRV_GET_ID #include <sound/initval.h> #define chip_t es1688_t @@ -53,29 +53,30 @@ static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */ static int mpu_irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ; /* 5,7,9,10 */ static int dma8[SNDRV_CARDS] = SNDRV_DEFAULT_DMA; /* 0,1,3 */ +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 ESx688 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 ESx688 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 ESx688 soundcard."); MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC); -MODULE_PARM(port, "1-" __MODULE_STRING(SNDRV_CARDS) "l"); +module_param_array(port, long, boot_devs, 0444); MODULE_PARM_DESC(port, "Port # for ESx688 driver."); MODULE_PARM_SYNTAX(port, SNDRV_PORT12_DESC); -MODULE_PARM(mpu_port, "1-" __MODULE_STRING(SNDRV_CARDS) "l"); +module_param_array(mpu_port, long, boot_devs, 0444); MODULE_PARM_DESC(mpu_port, "MPU-401 port # for ESx688 driver."); MODULE_PARM_SYNTAX(mpu_port, SNDRV_PORT12_DESC); -MODULE_PARM(irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(irq, int, boot_devs, 0444); MODULE_PARM_DESC(irq, "IRQ # for ESx688 driver."); MODULE_PARM_SYNTAX(irq, SNDRV_IRQ_DESC); -MODULE_PARM(mpu_irq, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(mpu_irq, int, boot_devs, 0444); MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for ESx688 driver."); MODULE_PARM_SYNTAX(mpu_irq, SNDRV_IRQ_DESC); -MODULE_PARM(dma8, "1-" __MODULE_STRING(SNDRV_CARDS) "i"); +module_param_array(dma8, int, boot_devs, 0444); MODULE_PARM_DESC(dma8, "8-bit DMA # for ESx688 driver."); MODULE_PARM_SYNTAX(dma8, SNDRV_DMA8_DESC); @@ -213,32 +214,3 @@ module_init(alsa_card_es1688_init) module_exit(alsa_card_es1688_exit) - -#ifndef MODULE - -/* format is: snd-es1688=enable,index,id, - port,mpu_port, - irq,mpu_irq, - dma8 */ - -static int __init alsa_card_es1688_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 && - get_option_long(&str,&port[nr_dev]) == 2 && - get_option_long(&str,&mpu_port[nr_dev]) == 2 && - get_option(&str,&irq[nr_dev]) == 2 && - get_option(&str,&mpu_irq[nr_dev]) == 2 && - get_option(&str,&dma8[nr_dev]) == 2); - nr_dev++; - return 1; -} - -__setup("snd-es1688=", alsa_card_es1688_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