Update of /cvsroot/alsa/alsa-kernel/isa In directory sc8-pr-cvs1:/tmp/cvs-serv32368/isa
Modified Files: als100.c azt2320.c cmi8330.c dt019x.c es18xx.c opl3sa2.c sgalaxy.c sscape.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: als100.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/als100.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- als100.c 12 Aug 2003 14:10:10 -0000 1.20 +++ als100.c 14 Oct 2003 13:08:14 -0000 1.21 @@ -359,9 +359,9 @@ (void)(get_option(&str,&enable[nr_dev]) == 2 && get_option(&str,&index[nr_dev]) == 2 && get_id(&str,&id[nr_dev]) == 2 && - get_option(&str,(int *)&port[nr_dev]) == 2 && - get_option(&str,(int *)&mpu_port[nr_dev]) == 2 && - get_option(&str,(int *)&fm_port[nr_dev]) == 2 && + get_option_long(&str,&port[nr_dev]) == 2 && + get_option_long(&str,&mpu_port[nr_dev]) == 2 && + get_option_long(&str,&fm_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 && Index: azt2320.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/azt2320.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- azt2320.c 12 Aug 2003 14:10:10 -0000 1.20 +++ azt2320.c 14 Oct 2003 13:08:14 -0000 1.21 @@ -393,9 +393,9 @@ (void)(get_option(&str,&enable[nr_dev]) == 2 && get_option(&str,&index[nr_dev]) == 2 && get_id(&str,&id[nr_dev]) == 2 && - get_option(&str,(int *)&port[nr_dev]) == 2 && - get_option(&str,(int *)&wss_port[nr_dev]) == 2 && - get_option(&str,(int *)&mpu_port[nr_dev]) == 2 && + get_option_long(&str,&port[nr_dev]) == 2 && + get_option_long(&str,&wss_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,&dma1[nr_dev]) == 2 && Index: cmi8330.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/cmi8330.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- cmi8330.c 12 Aug 2003 14:10:10 -0000 1.23 +++ cmi8330.c 14 Oct 2003 13:08:14 -0000 1.24 @@ -658,11 +658,11 @@ get_option(&str,&index[nr_dev]) == 2 && get_id(&str,&id[nr_dev]) == 2 && get_option(&str,&pnp) == 2 && - get_option(&str,(int *)&sbport[nr_dev]) == 2 && + get_option_long(&str,&sbport[nr_dev]) == 2 && get_option(&str,&sbirq[nr_dev]) == 2 && get_option(&str,&sbdma8[nr_dev]) == 2 && get_option(&str,&sbdma16[nr_dev]) == 2 && - get_option(&str,(int *)&wssport[nr_dev]) == 2 && + get_option_long(&str,&wssport[nr_dev]) == 2 && get_option(&str,&wssirq[nr_dev]) == 2 && get_option(&str,&wssdma[nr_dev]) == 2); #ifdef CONFIG_PNP Index: dt019x.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/dt019x.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dt019x.c 12 Aug 2003 14:10:10 -0000 1.11 +++ dt019x.c 14 Oct 2003 13:08:14 -0000 1.12 @@ -347,9 +347,9 @@ (void)(get_option(&str,&enable[nr_dev]) == 2 && get_option(&str,&index[nr_dev]) == 2 && get_id(&str,&id[nr_dev]) == 2 && - get_option(&str,(int *)&port[nr_dev]) == 2 && - get_option(&str,(int *)&mpu_port[nr_dev]) == 2 && - get_option(&str,(int *)&fm_port[nr_dev]) == 2 && + get_option_long(&str,&port[nr_dev]) == 2 && + get_option_long(&str,&mpu_port[nr_dev]) == 2 && + get_option_long(&str,&fm_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); Index: es18xx.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/es18xx.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- es18xx.c 12 Aug 2003 14:10:10 -0000 1.36 +++ es18xx.c 14 Oct 2003 13:08:14 -0000 1.37 @@ -2286,9 +2286,9 @@ get_option(&str,&index[nr_dev]) == 2 && get_id(&str,&id[nr_dev]) == 2 && get_option(&str,&pnp) == 2 && - get_option(&str,(int *)&port[nr_dev]) == 2 && - get_option(&str,(int *)&mpu_port[nr_dev]) == 2 && - get_option(&str,(int *)&fm_port[nr_dev]) == 2 && + get_option_long(&str,&port[nr_dev]) == 2 && + get_option_long(&str,&mpu_port[nr_dev]) == 2 && + get_option_long(&str,&fm_port[nr_dev]) == 2 && get_option(&str,&irq[nr_dev]) == 2 && get_option(&str,&dma1[nr_dev]) == 2 && get_option(&str,&dma2[nr_dev]) == 2); Index: opl3sa2.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/opl3sa2.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- opl3sa2.c 13 Aug 2003 13:01:22 -0000 1.29 +++ opl3sa2.c 14 Oct 2003 13:08:14 -0000 1.30 @@ -945,11 +945,11 @@ get_option(&str,&index[nr_dev]) == 2 && get_id(&str,&id[nr_dev]) == 2 && get_option(&str,&pnp) == 2 && - get_option(&str,(int *)&port[nr_dev]) == 2 && - get_option(&str,(int *)&sb_port[nr_dev]) == 2 && - get_option(&str,(int *)&wss_port[nr_dev]) == 2 && - get_option(&str,(int *)&fm_port[nr_dev]) == 2 && - get_option(&str,(int *)&midi_port[nr_dev]) == 2 && + get_option_long(&str,&port[nr_dev]) == 2 && + get_option_long(&str,&sb_port[nr_dev]) == 2 && + get_option_long(&str,&wss_port[nr_dev]) == 2 && + get_option_long(&str,&fm_port[nr_dev]) == 2 && + get_option_long(&str,&midi_port[nr_dev]) == 2 && get_option(&str,&irq[nr_dev]) == 2 && get_option(&str,&dma1[nr_dev]) == 2 && get_option(&str,&dma2[nr_dev]) == 2 && Index: sgalaxy.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sgalaxy.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- sgalaxy.c 23 Apr 2003 10:01:34 -0000 1.17 +++ sgalaxy.c 14 Oct 2003 13:08:14 -0000 1.18 @@ -341,10 +341,10 @@ (void)(get_option(&str,&enable[nr_dev]) == 2 && get_option(&str,&index[nr_dev]) == 2 && get_id(&str,&id[nr_dev]) == 2 && - get_option(&str,(int *)&sbport[nr_dev]) == 2 && - get_option(&str,(int *)&wssport[nr_dev]) == 2 && - get_option(&str,(int *)&irq[nr_dev]) == 2 && - get_option(&str,(int *)&dma1[nr_dev]) == 2); + get_option_long(&str,&sbport[nr_dev]) == 2 && + get_option_long(&str,&wssport[nr_dev]) == 2 && + get_option(&str,&irq[nr_dev]) == 2 && + get_option(&str,&dma1[nr_dev]) == 2); nr_dev++; return 1; } Index: sscape.c =================================================================== RCS file: /cvsroot/alsa/alsa-kernel/isa/sscape.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sscape.c 12 Oct 2003 08:44:58 -0000 1.6 +++ sscape.c 14 Oct 2003 13:08:14 -0000 1.7 @@ -31,6 +31,7 @@ #include <sound/hwdep.h> #include <sound/cs4231.h> #include <sound/mpu401.h> +#define SNDRV_GET_ID #include <sound/initval.h> #include <sound/sscape_ioctl.h> @@ -1538,8 +1539,8 @@ return 0; (void)((get_option(&str, &index[nr_dev]) == 2) && - (get_option(&str, (int*)&id[nr_dev]) == 2) && - (get_option(&str, (int*)&port[nr_dev]) == 2) && + (get_id(&str, &id[nr_dev]) == 2) && + (get_option_long(&str, &port[nr_dev]) == 2) && (get_option(&str, &irq[nr_dev]) == 2) && (get_option(&str, &mpu_irq[nr_dev]) == 2) && (get_option(&str, &dma[nr_dev]) == 2)); ------------------------------------------------------- This SF.net email is sponsored by: SF.net Giveback Program. SourceForge.net hosts over 70,000 Open Source Projects. See the people who have HELPED US provide better services: Click here: http://sourceforge.net/supporters.php _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog