[alsa-cvslog] CVS: alsa-kernel/pci intel8x0.c,1.92,1.93
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv16331
Modified Files:
intel8x0.c
Log Message:
Added mpu_port initialization from the kernel command line
Index: intel8x0.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/intel8x0.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- intel8x0.c 23 Sep 2003 14:31:44 - 1.92
+++ intel8x0.c 14 Oct 2003 11:29:03 - 1.93
@@ -2749,7 +2749,7 @@
#ifndef MODULE
-/* format is: snd-intel8x0=enable,index,id,ac97_clock */
+/* format is: snd-intel8x0=enable,index,id,ac97_clock,mpu_port */
static int __init alsa_card_intel8x0_setup(char *str)
{
@@ -2760,7 +2760,11 @@
(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,ac97_clock[nr_dev]) == 2);
+ get_option(str,ac97_clock[nr_dev]) == 2
+#ifdef SUPPORT_MIDI
+ get_option(str,mpu_port[nr_dev]) == 2
+#endif
+ );
nr_dev++;
return 1;
}
---
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
[alsa-cvslog] CVS: alsa-kernel/isa/wavefront wavefront.c,1.24,1.25
Update of /cvsroot/alsa/alsa-kernel/isa/wavefront In directory sc8-pr-cvs1:/tmp/cvs-serv32368/isa/wavefront Modified Files: wavefront.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: wavefront.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/wavefront/wavefront.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- wavefront.c 12 Aug 2003 14:10:12 - 1.24 +++ wavefront.c 14 Oct 2003 13:08:18 - 1.25 @@ -756,13 +756,13 @@ get_option(str,index[nr_dev]) == 2 get_id(str,id[nr_dev]) == 2 get_option(str,isapnp[nr_dev]) == 2 - get_option(str,(int *)cs4232_pcm_port[nr_dev]) == 2 + get_option_long(str,cs4232_pcm_port[nr_dev]) == 2 get_option(str,cs4232_pcm_irq[nr_dev]) == 2 - get_option(str,(int *)cs4232_mpu_port[nr_dev]) == 2 + get_option_long(str,cs4232_mpu_port[nr_dev]) == 2 get_option(str,cs4232_mpu_irq[nr_dev]) == 2 - get_option(str,(int *)ics2115_port[nr_dev]) == 2 + get_option_long(str,ics2115_port[nr_dev]) == 2 get_option(str,ics2115_irq[nr_dev]) == 2 - get_option(str,(int *)fm_port[nr_dev]) == 2 + get_option_long(str,fm_port[nr_dev]) == 2 get_option(str,dma1[nr_dev]) == 2 get_option(str,dma2[nr_dev]) == 2 get_option(str,use_cs4232_midi[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
[alsa-cvslog] CVS: alsa-kernel/pci cmipci.c,1.48,1.49 via82xx.c,1.58,1.59
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv32368/pci
Modified Files:
cmipci.c via82xx.c
Log Message:
- fixed the boot parameters with long ints for non-intel architectures.
- added get_option_long() for parsing the parameter.
Index: cmipci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cmipci.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cmipci.c12 Aug 2003 14:10:12 - 1.48
+++ cmipci.c14 Oct 2003 13:08:19 - 1.49
@@ -3225,8 +3225,8 @@
(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 *)mpu_port[nr_dev]) == 2
- get_option(str,(int *)fm_port[nr_dev]) == 2);
+ get_option_long(str,mpu_port[nr_dev]) == 2
+ get_option_long(str,fm_port[nr_dev]) == 2);
nr_dev++;
return 1;
}
Index: via82xx.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/via82xx.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- via82xx.c 9 Oct 2003 16:13:13 - 1.58
+++ via82xx.c 14 Oct 2003 13:08:20 - 1.59
@@ -2160,17 +2160,15 @@
static int __init alsa_card_via82xx_setup(char *str)
{
static unsigned __initdata nr_dev = 0;
- int port;
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(str,port) == 2
+ get_option_long(str,mpu_port[nr_dev]) == 2
get_option(str,ac97_clock[nr_dev]) == 2
get_option(str,dxs_support[nr_dev]) == 2);
- mpu_port[nr_dev] = port;
nr_dev++;
return 1;
}
---
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
[alsa-cvslog] CVS: alsa-kernel/pci/ymfpci ymfpci.c,1.27,1.28
Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci In directory sc8-pr-cvs1:/tmp/cvs-serv32368/pci/ymfpci Modified Files: ymfpci.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: ymfpci.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- ymfpci.c7 Oct 2003 10:03:24 - 1.27 +++ ymfpci.c14 Oct 2003 13:08:20 - 1.28 @@ -323,8 +323,8 @@ (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 *)fm_port[nr_dev]) == 2 - get_option(str,(int *)mpu_port[nr_dev]) == 2); + get_option_long(str,fm_port[nr_dev]) == 2 + get_option_long(str,mpu_port[nr_dev]) == 2); nr_dev++; return 1; } --- 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
[alsa-cvslog] CVS: alsa-kernel/drivers mtpav.c,1.25,1.26 serial-u16550.c,1.21,1.22
Update of /cvsroot/alsa/alsa-kernel/drivers In directory sc8-pr-cvs1:/tmp/cvs-serv32368/drivers Modified Files: mtpav.c serial-u16550.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: mtpav.c === RCS file: /cvsroot/alsa/alsa-kernel/drivers/mtpav.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- mtpav.c 23 Apr 2003 10:01:27 - 1.25 +++ mtpav.c 14 Oct 2003 13:08:13 - 1.26 @@ -813,7 +813,7 @@ (void)(get_option(str,enable) == 2 get_option(str,index) == 2 get_id(str,id) == 2 - get_option(str,(int *)port) == 2 + get_option_long(str,port) == 2 get_option(str,irq) == 2 get_option(str,hwports) == 2); return 1; Index: serial-u16550.c === RCS file: /cvsroot/alsa/alsa-kernel/drivers/serial-u16550.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- serial-u16550.c 23 Apr 2003 10:01:27 - 1.21 +++ serial-u16550.c 14 Oct 2003 13:08:13 - 1.22 @@ -975,7 +975,7 @@ (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_long(str,port[nr_dev]) == 2 get_option(str,irq[nr_dev]) == 2 get_option(str,speed[nr_dev]) == 2 get_option(str,base[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
[alsa-cvslog] CVS: alsa-kernel/drivers/mpu401 mpu401.c,1.11,1.12
Update of /cvsroot/alsa/alsa-kernel/drivers/mpu401 In directory sc8-pr-cvs1:/tmp/cvs-serv32368/drivers/mpu401 Modified Files: mpu401.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: mpu401.c === RCS file: /cvsroot/alsa/alsa-kernel/drivers/mpu401/mpu401.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mpu401.c22 Jan 2003 09:19:38 - 1.11 +++ mpu401.c14 Oct 2003 13:08:13 - 1.12 @@ -157,7 +157,7 @@ #ifdef CONFIG_X86_PC9800 get_option(str,pc98ii[nr_dev]) == 2 #endif - get_option(str,(int *)port[nr_dev]) == 2 + get_option_long(str,port[nr_dev]) == 2 get_option(str,irq[nr_dev]) == 2); nr_dev++; return 1; --- 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
[alsa-cvslog] CVS: alsa-kernel/include initval.h,1.15,1.16
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv32368/include
Modified Files:
initval.h
Log Message:
- fixed the boot parameters with long ints for non-intel architectures.
- added get_option_long() for parsing the parameter.
Index: initval.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/initval.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- initval.h 14 May 2003 13:29:37 - 1.15
+++ initval.h 14 Oct 2003 13:08:14 - 1.16
@@ -163,4 +163,16 @@
}
#endif
+/* simple wrapper for long variable.
+ * the value more than 32bit won't work!
+ */
+inline static int get_option_long(char **str, long *valp)
+{
+ int val, ret;
+ ret = get_option(str, val);
+ if (ret)
+ *valp = val;
+ return ret;
+}
+
#endif /* __SOUND_INITVAL_H */
---
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
[alsa-cvslog] CVS: alsa-kernel/isa/ad1848 ad1848.c,1.9,1.10
Update of /cvsroot/alsa/alsa-kernel/isa/ad1848 In directory sc8-pr-cvs1:/tmp/cvs-serv32368/isa/ad1848 Modified Files: ad1848.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: ad1848.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1848/ad1848.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ad1848.c8 Jul 2003 10:41:05 - 1.9 +++ ad1848.c14 Oct 2003 13:08:14 - 1.10 @@ -174,7 +174,7 @@ (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_long(str,port[nr_dev]) == 2 get_option(str,irq[nr_dev]) == 2 get_option(str,dma1[nr_dev]) == 2 get_option(str,thinkpad[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
[alsa-cvslog] CVS: alsa-kernel/isa/cs423x cs4231.c,1.9,1.10 cs4236.c,1.36,1.37 pc98.c,1.5,1.6
Update of /cvsroot/alsa/alsa-kernel/isa/cs423x In directory sc8-pr-cvs1:/tmp/cvs-serv32368/isa/cs423x Modified Files: cs4231.c cs4236.c pc98.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: cs4231.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4231.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cs4231.c21 Oct 2002 18:28:21 - 1.9 +++ cs4231.c14 Oct 2003 13:08:15 - 1.10 @@ -194,8 +194,8 @@ 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_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,dma1[nr_dev]) == 2 Index: cs4236.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/cs4236.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- cs4236.c23 Sep 2003 14:17:21 - 1.36 +++ cs4236.c14 Oct 2003 13:08:15 - 1.37 @@ -638,11 +638,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 *)cport[nr_dev]) == 2 - get_option(str,(int *)mpu_port[nr_dev]) == 2 - get_option(str,(int *)fm_port[nr_dev]) == 2 - get_option(str,(int *)sb_port[nr_dev]) == 2 + get_option_long(str,port[nr_dev]) == 2 + get_option_long(str,cport[nr_dev]) == 2 + get_option_long(str,mpu_port[nr_dev]) == 2 + get_option_long(str,fm_port[nr_dev]) == 2 + get_option_long(str,sb_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: pc98.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/cs423x/pc98.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pc98.c 23 Sep 2003 14:17:21 - 1.5 +++ pc98.c 14 Oct 2003 13:08:15 - 1.6 @@ -455,9 +455,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,dma1[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
[alsa-cvslog] CVS: alsa-kernel/isa/es1688 es1688.c,1.10,1.11
Update of /cvsroot/alsa/alsa-kernel/isa/es1688 In directory sc8-pr-cvs1:/tmp/cvs-serv32368/isa/es1688 Modified Files: es1688.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: es1688.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/es1688/es1688.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- es1688.c21 Oct 2002 18:28:22 - 1.10 +++ es1688.c14 Oct 2003 13:08:15 - 1.11 @@ -226,8 +226,8 @@ (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_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); --- 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
[alsa-cvslog] CVS: alsa-kernel/isa/sb es968.c,1.19,1.20 sb16.c,1.37,1.38 sb8.c,1.16,1.17
Update of /cvsroot/alsa/alsa-kernel/isa/sb In directory sc8-pr-cvs1:/tmp/cvs-serv32368/isa/sb Modified Files: es968.c sb16.c sb8.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: es968.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/es968.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- es968.c 12 Aug 2003 14:10:12 - 1.19 +++ es968.c 14 Oct 2003 13:08:18 - 1.20 @@ -257,7 +257,7 @@ (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_long(str,port[nr_dev]) == 2 get_option(str,irq[nr_dev]) == 2 get_option(str,dma8[nr_dev]) == 2); nr_dev++; Index: sb16.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb16.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sb16.c 12 Aug 2003 14:10:12 - 1.37 +++ sb16.c 14 Oct 2003 13:08:18 - 1.38 @@ -696,9 +696,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,dma8[nr_dev]) == 2 get_option(str,dma16[nr_dev]) == 2 @@ -709,7 +709,7 @@ #endif #ifdef SNDRV_SBAWE_EMU8000 - get_option(str,(int *)awe_port[nr_dev]) == 2 + get_option_long(str,awe_port[nr_dev]) == 2 get_option(str,seq_ports[nr_dev]) == 2 #endif ); Index: sb8.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb8.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sb8.c 23 Apr 2003 10:01:41 - 1.16 +++ sb8.c 14 Oct 2003 13:08:18 - 1.17 @@ -242,7 +242,7 @@ (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_long(str,port[nr_dev]) == 2 get_option(str,irq[nr_dev]) == 2 get_option(str,dma8[nr_dev]) == 2); nr_dev++; --- 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
[alsa-cvslog] CVS: alsa-kernel/isa/gus gusclassic.c,1.11,1.12 gusextreme.c,1.11,1.12 gusmax.c,1.12,1.13 interwave.c,1.25,1.26
Update of /cvsroot/alsa/alsa-kernel/isa/gus In directory sc8-pr-cvs1:/tmp/cvs-serv32368/isa/gus Modified Files: gusclassic.c gusextreme.c gusmax.c interwave.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: gusclassic.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusclassic.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gusclassic.c14 Aug 2003 11:05:38 - 1.11 +++ gusclassic.c14 Oct 2003 13:08:16 - 1.12 @@ -284,7 +284,7 @@ (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_long(str,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: gusextreme.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusextreme.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gusextreme.c14 Aug 2003 11:05:38 - 1.11 +++ gusextreme.c14 Oct 2003 13:08:17 - 1.12 @@ -417,9 +417,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 *)gf1_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,gf1_port[nr_dev]) == 2 + get_option_long(str,mpu_port[nr_dev]) == 2 get_option(str,irq[nr_dev]) == 2 get_option(str,gf1_irq[nr_dev]) == 2 get_option(str,mpu_irq[nr_dev]) == 2 Index: gusmax.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/gusmax.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gusmax.c14 Aug 2003 11:05:38 - 1.12 +++ gusmax.c14 Oct 2003 13:08:18 - 1.13 @@ -424,7 +424,7 @@ (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_long(str,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: interwave.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/gus/interwave.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- interwave.c 12 Aug 2003 14:10:11 - 1.25 +++ interwave.c 14 Oct 2003 13:08:18 - 1.26 @@ -994,9 +994,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_long(str,port[nr_dev]) == 2 #ifdef SNDRV_STB - get_option(str,(int *)port_tc[nr_dev]) == 2 + get_option_long(str,port_tc[nr_dev]) == 2 #endif get_option(str,irq[nr_dev]) == 2 get_option(str,dma1[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
[alsa-cvslog] CVS: alsa-kernel/isa/ad1816a ad1816a.c,1.15,1.16
Update of /cvsroot/alsa/alsa-kernel/isa/ad1816a In directory sc8-pr-cvs1:/tmp/cvs-serv32368/isa/ad1816a Modified Files: ad1816a.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: ad1816a.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/ad1816a/ad1816a.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ad1816a.c 12 Aug 2003 14:10:11 - 1.15 +++ ad1816a.c 14 Oct 2003 13:08:14 - 1.16 @@ -338,9 +338,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,dma1[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
[alsa-cvslog] CVS: alsa-kernel/isa/opti9xx opti92x-ad1848.c,1.32,1.33
Update of /cvsroot/alsa/alsa-kernel/isa/opti9xx In directory sc8-pr-cvs1:/tmp/cvs-serv32368/isa/opti9xx Modified Files: opti92x-ad1848.c Log Message: - fixed the boot parameters with long ints for non-intel architectures. - added get_option_long() for parsing the parameter. Index: opti92x-ad1848.c === RCS file: /cvsroot/alsa/alsa-kernel/isa/opti9xx/opti92x-ad1848.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- opti92x-ad1848.c23 May 2003 11:15:13 - 1.32 +++ opti92x-ad1848.c14 Oct 2003 13:08:18 - 1.33 @@ -2240,9 +2240,9 @@ get_option(str,index) == 2 get_id(str,id) == 2 get_option(str,pnp) == 2 - get_option(str,(int *)port) == 2 - get_option(str,(int *)mpu_port) == 2 - get_option(str,(int *)fm_port) == 2 + get_option_long(str,port) == 2 + get_option_long(str,mpu_port) == 2 + get_option_long(str,fm_port) == 2 get_option(str,irq) == 2 get_option(str,mpu_irq) == 2 get_option(str,dma1) == 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
[alsa-cvslog] CVS: alsa-kernel/isa als100.c,1.20,1.21 azt2320.c,1.20,1.21 cmi8330.c,1.23,1.24 dt019x.c,1.11,1.12 es18xx.c,1.36,1.37 opl3sa2.c,1.29,1.30 sgalaxy.c,1.17,1.18 sscape.c,1.6,1.7
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.c12 Aug 2003 14:10:10 - 1.20 +++ als100.c14 Oct 2003 13:08:14 - 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 - 1.20 +++ azt2320.c 14 Oct 2003 13:08:14 - 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 - 1.23 +++ cmi8330.c 14 Oct 2003 13:08:14 - 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.c12 Aug 2003 14:10:10 - 1.11 +++ dt019x.c14 Oct 2003 13:08:14 - 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.c12 Aug 2003 14:10:10 - 1.36 +++ es18xx.c14 Oct 2003 13:08:14 - 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 +
[alsa-cvslog] CVS: alsa-kernel/include sb.h,1.12,1.13 ymfpci.h,1.11,1.12
Update of /cvsroot/alsa/alsa-kernel/include
In directory sc8-pr-cvs1:/tmp/cvs-serv10067/include
Modified Files:
sb.h ymfpci.h
Log Message:
- removed joystick control from the card control API.
added joystick (or joystick_port) module option instead.
- updated documents for this joystick fix.
- moved resource management for ALS4000 from sb-common header
to the als4000 local code.
Index: sb.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/sb.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sb.h16 May 2003 08:40:01 - 1.12
+++ sb.h14 Oct 2003 13:59:19 - 1.13
@@ -63,8 +63,6 @@
struct _snd_sb {
unsigned long port; /* base port of DSP chip */
struct resource *res_port;
- unsigned long alt_port; /* alternate port (ALS4000) */
- struct resource *res_alt_port;
unsigned long mpu_port; /* MPU port for SB DSP 4.0+ */
int irq;/* IRQ number of DSP chip */
int dma8; /* 8-bit DMA */
@@ -72,6 +70,7 @@
unsigned short version; /* version of DSP chip */
enum sb_hw_type hardware; /* see to SB_HW_ */
+ unsigned long alt_port; /* alternate port (ALS4000) */
struct pci_dev *pci;/* ALS4000 */
unsigned int open; /* see to SB_OPEN_ for sb8 */
Index: ymfpci.h
===
RCS file: /cvsroot/alsa/alsa-kernel/include/ymfpci.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ymfpci.h7 Oct 2003 10:03:23 - 1.11
+++ ymfpci.h14 Oct 2003 13:59:20 - 1.12
@@ -312,8 +312,6 @@
unsigned short old_legacy_ctrl;
#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
- unsigned int joystick_port;
- struct semaphore joystick_mutex;
struct resource *joystick_res;
struct gameport gameport;
#endif
@@ -392,9 +390,6 @@
int snd_ymfpci_pcm_4ch(ymfpci_t *chip, int device, snd_pcm_t **rpcm);
int snd_ymfpci_mixer(ymfpci_t *chip, int rear_switch);
int snd_ymfpci_timer(ymfpci_t *chip, int device);
-#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)
-int snd_ymfpci_joystick(ymfpci_t *chip);
-#endif
int snd_ymfpci_voice_alloc(ymfpci_t *chip, ymfpci_voice_type_t type, int pair,
ymfpci_voice_t **rvoice);
int snd_ymfpci_voice_free(ymfpci_t *chip, ymfpci_voice_t *pvoice);
@@ -402,6 +397,10 @@
#ifdef CONFIG_PM
void snd_ymfpci_suspend(ymfpci_t *chip);
void snd_ymfpci_resume(ymfpci_t *chip);
+#endif
+
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) defined(CONFIG_GAMEPORT_MODULE))
+#define SUPPORT_JOYSTICK
#endif
#endif /* __SOUND_YMFPCI_H */
---
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
[alsa-cvslog] CVS: alsa-kernel/pci als4000.c,1.21,1.22 azt3328.c,1.4,1.5 cmipci.c,1.49,1.50 ens1370.c,1.50,1.51 es1968.c,1.54,1.55 intel8x0.c,1.93,1.94 via82xx.c,1.59,1.60
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv10067/pci
Modified Files:
als4000.c azt3328.c cmipci.c ens1370.c es1968.c intel8x0.c
via82xx.c
Log Message:
- removed joystick control from the card control API.
added joystick (or joystick_port) module option instead.
- updated documents for this joystick fix.
- moved resource management for ALS4000 from sb-common header
to the als4000 local code.
Index: als4000.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/als4000.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- als4000.c 12 Aug 2003 14:10:12 - 1.21
+++ als4000.c 14 Oct 2003 13:59:20 - 1.22
@@ -63,6 +63,7 @@
#include linux/init.h
#include linux/pci.h
#include linux/slab.h
+#include linux/gameport.h
#include sound/core.h
#include sound/pcm.h
#include sound/rawmidi.h
@@ -78,14 +79,15 @@
MODULE_CLASSES({sound});
MODULE_DEVICES({{Avance Logic,ALS4000}});
+#if defined(CONFIG_GAMEPORT) || (defined(MODULE) defined(CONFIG_GAMEPORT_MODULE))
+#define SUPPORT_JOYSTICK 1
+#endif
+
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_PNP; /* Enable this card */
-static int joystick_port[SNDRV_CARDS] =
-#ifdef CONFIG_ISA
- {0x200};/* enable as default */
-#else
- {0};/* disabled */
+#ifdef SUPPORT_JOYSTICK
+static int joystick_port[SNDRV_CARDS];
#endif
MODULE_PARM(index, 1- __MODULE_STRING(SNDRV_CARDS) i);
@@ -105,6 +107,11 @@
typedef struct {
unsigned long gcr;
+ struct resource *res_gcr;
+#ifdef SUPPORT_JOYSTICK
+ struct gameport gameport;
+ struct resource *res_joystick;
+#endif
} snd_card_als4000_t;
static struct pci_device_id snd_als4000_ids[] = {
@@ -523,7 +530,7 @@
/**/
-static void __devinit snd_als4000_set_addr(unsigned long gcr,
+static void snd_als4000_set_addr(unsigned long gcr,
unsigned int sb,
unsigned int mpu,
unsigned int opl,
@@ -574,6 +581,18 @@
snd_card_als4000_t * acard = (snd_card_als4000_t *)card-private_data;
/* make sure that interrupts are disabled */
snd_als4000_gcr_write_addr( acard-gcr, 0x8c, 0);
+ /* free resources */
+#ifdef SUPPORT_JOYSTICK
+ if (acard-res_joystick) {
+ if (acard-gameport.io)
+ gameport_unregister_port(acard-gameport);
+ snd_als4000_set_addr(acard-gcr, 0, 0, 0, 0); /* disable joystick */
+ release_resource(acard-res_joystick);
+ kfree_nocheck(acard-res_joystick);
+ }
+#endif
+ release_resource(acard-res_gcr);
+ kfree_nocheck(acard-res_gcr);
}
static int __devinit snd_card_als4000_probe(struct pci_dev *pci,
@@ -588,6 +607,7 @@
opl3_t *opl3;
unsigned short word;
int err;
+ int joystick = 0;
if (dev = SNDRV_CARDS)
return -ENODEV;
@@ -617,9 +637,6 @@
pci_write_config_word(pci, PCI_COMMAND, word | PCI_COMMAND_IO);
pci_set_master(pci);
- /* disable all legacy ISA stuff except for joystick */
- snd_als4000_set_addr(gcr, 0, 0, 0, joystick_port[dev]);
-
card = snd_card_new(index[dev], id[dev], THIS_MODULE,
sizeof( snd_card_als4000_t ) );
if (card == NULL) {
@@ -630,8 +647,17 @@
acard = (snd_card_als4000_t *)card-private_data;
acard-gcr = gcr;
+ acard-res_gcr = res_gcr_port;
card-private_free = snd_card_als4000_free;
+ /* disable all legacy ISA stuff except for joystick */
+#ifdef SUPPORT_JOYSTICK
+ if (joystick_port[dev] 0
+ (acard-res_joystick = request_region(joystick_port[dev], 8, ALS4000
gameport)) != NULL)
+ joystick = joystick_port[dev];
+#endif
+ snd_als4000_set_addr(gcr, 0, 0, 0, joystick);
+
if ((err = snd_sbdsp_create(card,
gcr + 0x10,
pci-irq,
@@ -640,15 +666,12 @@
-1,
SB_HW_ALS4000,
chip)) 0) {
- release_resource(res_gcr_port);
- kfree_nocheck(res_gcr_port);
snd_card_free(card);
return err;
}
chip-pci = pci;
chip-alt_port = gcr;
- chip-res_alt_port = res_gcr_port;
snd_als4000_configure(chip);
@@ -680,6 +703,12 @@
}
}
+#ifdef SUPPORT_JOYSTICK
+ if (acard-res_joystick) {
+ acard-gameport.io =
[alsa-cvslog] CVS: alsa-kernel/isa/sb sb_common.c,1.17,1.18
Update of /cvsroot/alsa/alsa-kernel/isa/sb
In directory sc8-pr-cvs1:/tmp/cvs-serv10067/isa/sb
Modified Files:
sb_common.c
Log Message:
- removed joystick control from the card control API.
added joystick (or joystick_port) module option instead.
- updated documents for this joystick fix.
- moved resource management for ALS4000 from sb-common header
to the als4000 local code.
Index: sb_common.c
===
RCS file: /cvsroot/alsa/alsa-kernel/isa/sb/sb_common.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sb_common.c 23 Apr 2003 10:01:42 - 1.17
+++ sb_common.c 14 Oct 2003 13:59:20 - 1.18
@@ -185,10 +185,6 @@
release_resource(chip-res_port);
kfree_nocheck(chip-res_port);
}
- if (chip-res_alt_port) {
- release_resource(chip-res_alt_port);
- kfree_nocheck(chip-res_alt_port);
- }
if (chip-irq = 0)
free_irq(chip-irq, (void *) chip);
#ifdef CONFIG_ISA
---
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
[alsa-cvslog] CVS: alsa-kernel/Documentation Joystick.txt,NONE,1.1 ALSA-Configuration.txt,1.20,1.21
Update of /cvsroot/alsa/alsa-kernel/Documentation In directory sc8-pr-cvs1:/tmp/cvs-serv10067/Documentation Modified Files: ALSA-Configuration.txt Added Files: Joystick.txt Log Message: - removed joystick control from the card control API. added joystick (or joystick_port) module option instead. - updated documents for this joystick fix. - moved resource management for ALS4000 from sb-common header to the als4000 local code. --- NEW FILE: Joystick.txt --- Analog Joystick Support on ALSA Drivers === Oct. 14, 2003 Takashi Iwai [EMAIL PROTECTED] General --- First of all, you need to enable GAMEPORT support on Linux kernel for using a joystick with the ALSA driver. For the details of gameport support, refer to Documentation/input/joystick.txt. The joystick support of ALSA drivers is different between ISA and PCI cards. In the case of ISA (PnP) cards, it's usually handled by the independent module (ns558). Meanwhile, the ALSA PCI drivers have the built-in gameport support. Hence, when the ALSA PCI driver is built in the kernel, CONFIG_GAMEPORT must be 'y', too. Otherwise, the gameport support on that card will be (silently) disabled. Some adapter modules probe the physical connection of the device at the load time. It'd be safer to plug in the joystick device before loading the module. PCI Cards - For PCI cards, the joystick is enabled when the appropriate module option is specified. Some drivers don't need options, and the joystick support is always enabled. In the former ALSA version, there was a dynamic control API for the joystick activation. It was changed, however, to the static module options because of the system stability and the resource management. The following PCI drivers support the joystick natively. Driver Module Option Available Values --- als4000 joystick_port any address (e.g. 0x200), 0 = disable (default) au88x0 N/A N/A azf3328 joystick0 = disable, 1 = enable, -1 = auto (default) ens1370 joystick0 = disable (default), 1 = enable ens1371 joystick_port 0 = disable (default), 0x200,0x208,0x210,0x218 cmipci joystick0 = disable (default), 1 = enable cs4281 N/A N/A cs46xx N/A N/A es1938 N/A N/A es1968 joystick0 = disable (default), 1 = enable intel8x0(*1)joystick0 = disable (default), 1 = enable sonicvibes N/A N/A trident N/A N/A via82xx(*2) joystick0 = disable (default), 1 = enable ymfpci(*3) joystick_port 0 = disable (default), 0x201,0x202,0x204,0x205 --- *1) not all chips support joystick *2) VIA686A/B only *3) With YMF744/754 chips, the port address is chosen automatically and enabled by default The following drivers don't support gameport natively, but there are additional modules. Load the corresponding module to add the gameport support. Driver Additional Module - emu10k1 emu10k1-gp fm801 fm801-gp - Note: the pcigame and cs461x modules are for the OSS drivers only. These ALSA drivers (cs46xx, trident and au88x0) have the built-in gameport support. As mentioned above, ALSA PCI drivers have the built-in gameport support, so you don't have to load ns558 module. Just load joydev and the appropriate adapter module (e.g. analog). ISA Cards - ALSA ISA drivers don't have the built-in gameport support. Instead, you need to load ns558 module in addition to joydev and the adapter module (e.g. analog). Index: ALSA-Configuration.txt === RCS file: /cvsroot/alsa/alsa-kernel/Documentation/ALSA-Configuration.txt,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- ALSA-Configuration.txt 8 Oct 2003 15:10:46 - 1.20 +++ ALSA-Configuration.txt 14 Oct 2003 13:59:19 - 1.21 @@ -173,8 +173,7 @@ Module for soundcards based on Avance Logic ALS4000 PCI chip. joystick_port - port # for legacy joystick support. -default: 0x200 for the 1st card. -0 = disabled +0 = disabled (default) Module supports up to 8 cards, autoprobe and PnP. @@ -225,6 +224,7 @@ fm_port - 0x388 (default), -1 (disable) soft_ac3- Sofware-conversion of raw SPDIF packets (model 033 only) (default = 1) +joystick - Enable joystick (default off) Module supports autoprobe and multiple chips (max 8). @@ -377,6 +377,8 @@
[alsa-cvslog] CVS: alsa-kernel/pci/ymfpci ymfpci.c,1.28,1.29 ymfpci_main.c,1.42,1.43
Update of /cvsroot/alsa/alsa-kernel/pci/ymfpci
In directory sc8-pr-cvs1:/tmp/cvs-serv10067/pci/ymfpci
Modified Files:
ymfpci.c ymfpci_main.c
Log Message:
- removed joystick control from the card control API.
added joystick (or joystick_port) module option instead.
- updated documents for this joystick fix.
- moved resource management for ALS4000 from sb-common header
to the als4000 local code.
Index: ymfpci.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ymfpci/ymfpci.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ymfpci.c14 Oct 2003 13:08:20 - 1.28
+++ ymfpci.c14 Oct 2003 13:59:21 - 1.29
@@ -44,8 +44,11 @@
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_PNP; /* Enable this card */
-static long fm_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
-static long mpu_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = -1};
+static long fm_port[SNDRV_CARDS];
+static long mpu_port[SNDRV_CARDS];
+#ifdef SUPPORT_JOYSTICK
+static long joystick_port[SNDRV_CARDS];
+#endif
static int rear_switch[SNDRV_CARDS];
MODULE_PARM(index, 1- __MODULE_STRING(SNDRV_CARDS) i);
@@ -63,6 +66,11 @@
MODULE_PARM(fm_port, 1- __MODULE_STRING(SNDRV_CARDS) l);
MODULE_PARM_DESC(fm_port, FM OPL-3 Port.);
MODULE_PARM_SYNTAX(fm_port, SNDRV_ENABLED);
+#ifdef SUPPORT_JOYSTICK
+MODULE_PARM(joystick_port, 1- __MODULE_STRING(SNDRV_CARDS) l);
+MODULE_PARM_DESC(joystick_port, Joystick port address);
+MODULE_PARM_SYNTAX(joystick_port, SNDRV_ENABLED);
+#endif
MODULE_PARM(rear_switch, 1- __MODULE_STRING(SNDRV_CARDS) i);
MODULE_PARM_DESC(rear_switch, Enable shared rear/line-in switch);
MODULE_PARM_SYNTAX(rear_switch, SNDRV_ENABLED , SNDRV_BOOLEAN_FALSE_DESC);
@@ -86,6 +94,9 @@
snd_card_t *card;
struct resource *fm_res = NULL;
struct resource *mpu_res = NULL;
+#ifdef SUPPORT_JOYSTICK
+ struct resource *joystick_res = NULL;
+#endif
ymfpci_t *chip;
opl3_t *opl3;
char *str;
@@ -117,22 +128,32 @@
legacy_ctrl2 = 0x0800; /* SBEN = 0, SMOD = 01, LAD = 0 */
if (pci_id-device = 0x0010) { /* YMF 744/754 */
- if (fm_port[dev] 0) {
+ if (fm_port[dev] = 0) {
fm_port[dev] = pci_resource_start(pci, 1);
}
- if (fm_port[dev] = 0
+ if (fm_port[dev] 0
(fm_res = request_region(fm_port[dev], 4, YMFPCI OPL3)) != NULL)
{
legacy_ctrl |= YMFPCI_LEGACY_FMEN;
pci_write_config_word(pci, PCIR_DSXG_FMBASE, fm_port[dev]);
}
- if (mpu_port[dev] 0) {
+ if (mpu_port[dev] = 0) {
mpu_port[dev] = pci_resource_start(pci, 1) + 0x20;
}
- if (mpu_port[dev] = 0
+ if (mpu_port[dev] 0
(mpu_res = request_region(mpu_port[dev], 2, YMFPCI MPU401)) !=
NULL) {
legacy_ctrl |= YMFPCI_LEGACY_MEN;
pci_write_config_word(pci, PCIR_DSXG_MPU401BASE,
mpu_port[dev]);
}
+#ifdef SUPPORT_JOYSTICK
+ if (joystick_port[dev] 0) {
+ joystick_port[dev] = pci_resource_start(pci, 2);
+ }
+ if (joystick_port[dev] = 0
+ (joystick_res = request_region(joystick_port[dev], 1, YMFPCI
gameport)) != NULL) {
+ legacy_ctrl |= YMFPCI_LEGACY_JPEN;
+ pci_write_config_word(pci, PCIR_DSXG_JOYBASE,
joystick_port[dev]);
+ }
+#endif
} else {
switch (fm_port[dev]) {
case 0x388: legacy_ctrl2 |= 0; break;
@@ -162,6 +183,22 @@
legacy_ctrl2 = ~YMFPCI_LEGACY2_MPUIO;
mpu_port[dev] = -1;
}
+#ifdef SUPPORT_JOYSTICK
+ switch (joystick_port[dev]) {
+ case 0x201: legacy_ctrl2 |= 0 6; break;
+ case 0x202: legacy_ctrl2 |= 1 6; break;
+ case 0x204: legacy_ctrl2 |= 2 6; break;
+ case 0x205: legacy_ctrl2 |= 3 6; break;
+ default: joystick_port[dev] = -1; break;
+ }
+ if (joystick_port[dev] 0
+ (joystick_res = request_region(joystick_port[dev], 1, YMFPCI
gameport)) != NULL) {
+ legacy_ctrl |= YMFPCI_LEGACY_JPEN;
+ } else {
+ legacy_ctrl2 = ~YMFPCI_LEGACY2_JSIO;
+ joystick_port[dev] = -1;
+ }
+#endif
}
if (mpu_res) {
legacy_ctrl |= YMFPCI_LEGACY_MIEN;
@@ -182,10 +219,19 @@
[alsa-cvslog] CVS: alsa-kernel/pci/cs46xx cs46xx_lib.c,1.64,1.65
Update of /cvsroot/alsa/alsa-kernel/pci/cs46xx
In directory sc8-pr-cvs1:/tmp/cvs-serv12073/cs46xx
Modified Files:
cs46xx_lib.c
Log Message:
- fixed compile warnings with cast for memcpy_fromio/toio.
- use copy_to_user_fromio() in proc output.
Index: cs46xx_lib.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs46xx/cs46xx_lib.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- cs46xx_lib.c23 Sep 2003 14:31:44 - 1.64
+++ cs46xx_lib.c14 Oct 2003 14:08:49 - 1.65
@@ -2849,23 +2849,11 @@
if (file-f_pos + (size_t)size region-size)
size = region-size - file-f_pos;
if (size 0) {
- char *tmp;
- long res;
- unsigned long virt;
- if ((tmp = kmalloc(size, GFP_KERNEL)) == NULL)
- return -ENOMEM;
- virt = region-remap_addr + file-f_pos;
- memcpy_fromio(tmp, virt, size);
- if (copy_to_user(buf, tmp, size))
- res = -EFAULT;
- else {
- res = size;
- file-f_pos += size;
- }
- kfree(tmp);
- return res;
+ if (copy_to_user_fromio(buf, region-remap_addr + file-f_pos, size))
+ return -EFAULT;
+ file-f_pos += size;
}
- return 0;
+ return size;
}
static struct snd_info_entry_ops snd_cs46xx_proc_io_ops = {
---
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
[alsa-cvslog] CVS: alsa-kernel/pci/nm256 nm256.c,1.30,1.31
Update of /cvsroot/alsa/alsa-kernel/pci/nm256 In directory sc8-pr-cvs1:/tmp/cvs-serv12073/nm256 Modified Files: nm256.c Log Message: - fixed compile warnings with cast for memcpy_fromio/toio. - use copy_to_user_fromio() in proc output. Index: nm256.c === RCS file: /cvsroot/alsa/alsa-kernel/pci/nm256/nm256.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- nm256.c 12 Aug 2003 14:10:16 - 1.30 +++ nm256.c 14 Oct 2003 14:08:49 - 1.31 @@ -335,7 +335,7 @@ return; } #endif - memcpy_toio(chip-buffer + offset, src, size); + memcpy_toio((void *)chip-buffer + offset, src, size); } /* --- 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
[alsa-cvslog] CVS: alsa-kernel/pci cs4281.c,1.44,1.45 rme32.c,1.26,1.27 rme96.c,1.28,1.29
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv12073
Modified Files:
cs4281.c rme32.c rme96.c
Log Message:
- fixed compile warnings with cast for memcpy_fromio/toio.
- use copy_to_user_fromio() in proc output.
Index: cs4281.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/cs4281.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cs4281.c14 Aug 2003 11:05:38 - 1.44
+++ cs4281.c14 Oct 2003 14:08:48 - 1.45
@@ -1178,23 +1178,11 @@
if (file-f_pos + size CS4281_BA0_SIZE)
size = (long)CS4281_BA0_SIZE - file-f_pos;
if (size 0) {
- char *tmp;
- long res;
- unsigned long virt;
- if ((tmp = kmalloc(size, GFP_KERNEL)) == NULL)
- return -ENOMEM;
- virt = chip-ba0 + file-f_pos;
- memcpy_fromio(tmp, virt, size);
- if (copy_to_user(buf, tmp, size))
- res = -EFAULT;
- else {
- res = size;
- file-f_pos += size;
- }
- kfree(tmp);
- return res;
+ if (copy_to_user_fromio(buf, chip-ba0 + file-f_pos, size))
+ return -EFAULT;
+ file-f_pos += size;
}
- return 0;
+ return size;
}
static long snd_cs4281_BA1_read(snd_info_entry_t *entry, void *file_private_data,
@@ -1207,23 +1195,11 @@
if (file-f_pos + size CS4281_BA1_SIZE)
size = (long)CS4281_BA1_SIZE - file-f_pos;
if (size 0) {
- char *tmp;
- long res;
- unsigned long virt;
- if ((tmp = kmalloc(size, GFP_KERNEL)) == NULL)
- return -ENOMEM;
- virt = chip-ba1 + file-f_pos;
- memcpy_fromio(tmp, virt, size);
- if (copy_to_user(buf, tmp, size))
- res = -EFAULT;
- else {
- res = size;
- file-f_pos += size;
- }
- kfree(tmp);
- return res;
+ if (copy_to_user_fromio(buf, chip-ba1 + file-f_pos, size))
+ return -EFAULT;
+ file-f_pos += size;
}
- return 0;
+ return size;
}
static struct snd_info_entry_ops snd_cs4281_proc_ops_BA0 = {
Index: rme32.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/rme32.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- rme32.c 16 Aug 2003 09:58:29 - 1.26
+++ rme32.c 14 Oct 2003 14:08:48 - 1.27
@@ -1191,18 +1191,18 @@
}
bytes = diff rme32-playback_frlog;
if (bytes RME32_BUFFER_SIZE - rme32-playback_ptr) {
- memcpy_toio(rme32-iobase + RME32_IO_DATA_BUFFER +
rme32-playback_ptr,
+ memcpy_toio((void *)(rme32-iobase + RME32_IO_DATA_BUFFER +
rme32-playback_ptr),
runtime-dma_area + rme32-playback_ptr,
RME32_BUFFER_SIZE - rme32-playback_ptr);
bytes -= RME32_BUFFER_SIZE - rme32-playback_ptr;
if (bytes RME32_BUFFER_SIZE) {
bytes = RME32_BUFFER_SIZE;
}
- memcpy_toio(rme32-iobase + RME32_IO_DATA_BUFFER,
+ memcpy_toio((void *)(rme32-iobase + RME32_IO_DATA_BUFFER),
runtime-dma_area, bytes);
rme32-playback_ptr = bytes;
} else if (bytes != 0) {
- memcpy_toio(rme32-iobase + RME32_IO_DATA_BUFFER +
rme32-playback_ptr,
+ memcpy_toio((void *)(rme32-iobase + RME32_IO_DATA_BUFFER +
rme32-playback_ptr),
runtime-dma_area + rme32-playback_ptr, bytes);
rme32-playback_ptr += bytes;
}
@@ -1223,17 +1223,17 @@
ptr = frameptr rme32-capture_frlog;
if (ptr rme32-capture_ptr) {
memcpy_fromio(runtime-dma_area + rme32-capture_ptr,
- rme32-iobase + RME32_IO_DATA_BUFFER +
- rme32-capture_ptr,
+ (void *)(rme32-iobase + RME32_IO_DATA_BUFFER +
+ rme32-capture_ptr),
ptr - rme32-capture_ptr);
rme32-capture_ptr += ptr - rme32-capture_ptr;
} else if (ptr rme32-capture_ptr) {
memcpy_fromio(runtime-dma_area + rme32-capture_ptr,
-
[alsa-cvslog] CVS: alsa-kernel/pci/ac97 ac97_codec.c,1.105,1.106
Update of /cvsroot/alsa/alsa-kernel/pci/ac97
In directory sc8-pr-cvs1:/tmp/cvs-serv16825
Modified Files:
ac97_codec.c
Log Message:
added ALC655 entry (compatible with ALC650).
Index: ac97_codec.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/ac97/ac97_codec.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- ac97_codec.c1 Oct 2003 09:25:50 - 1.105
+++ ac97_codec.c14 Oct 2003 14:33:03 - 1.106
@@ -112,6 +112,7 @@
{ 0x414c4721, 0xfff0, ALC650D, patch_alc650, NULL },
{ 0x414c4722, 0xfff0, ALC650E, patch_alc650, NULL },
{ 0x414c4723, 0xfff0, ALC650F, patch_alc650, NULL },
+{ 0x414c4760, 0xfff0, ALC655,patch_alc650, NULL },
{ 0x414c4730, 0x, ALC101,NULL, NULL },
{ 0x414c4740, 0xfff0, ALC202,NULL, NULL },
{ 0x414c4750, 0xfff0, ALC250,NULL, NULL },
---
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
[alsa-cvslog] CVS: alsa-kernel/pci maestro3.c,1.41,1.42
Update of /cvsroot/alsa/alsa-kernel/pci
In directory sc8-pr-cvs1:/tmp/cvs-serv11744
Modified Files:
maestro3.c
Log Message:
don't enable MPU401 irq.
Index: maestro3.c
===
RCS file: /cvsroot/alsa/alsa-kernel/pci/maestro3.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- maestro3.c 12 Aug 2003 14:10:13 - 1.41
+++ maestro3.c 14 Oct 2003 16:47:53 - 1.42
@@ -2349,7 +2349,8 @@
{
unsigned long io = chip-iobase;
- outw(ASSP_INT_ENABLE | MPU401_INT_ENABLE, io + HOST_INT_CTRL);
+ /* TODO: MPU401 not supported yet */
+ outw(ASSP_INT_ENABLE /*| MPU401_INT_ENABLE*/, io + HOST_INT_CTRL);
outb(inb(io + ASSP_CONTROL_C) | ASSP_HOST_INT_ENABLE,
io + ASSP_CONTROL_C);
}
---
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
