Update of /cvsroot/alsa/alsa-kernel/isa/wavefront
In directory sc8-pr-cvs1:/tmp/cvs-serv30435/isa/wavefront
Modified Files:
wavefront.c
Log Message:
use the standard port address, 0 = disable, 1 = auto-probe, others manual.
negative values are accepted as disable, too.
Index: wavefront.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/isa/wavefront/wavefront.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wavefront.c 14 Oct 2003 13:08:18 -0000 1.25
+++ wavefront.c 30 Oct 2003 14:21:09 -0000 1.26
@@ -418,13 +418,6 @@
snd_hwdep_t *fx_processor;
int hw_dev = 0, midi_dev = 0, err;
- if (cs4232_mpu_port[dev] < 0)
- cs4232_mpu_port[dev] = SNDRV_AUTO_PORT;
- if (fm_port[dev] < 0)
- fm_port[dev] = SNDRV_AUTO_PORT;
- if (ics2115_port[dev] < 0)
- ics2115_port[dev] = SNDRV_AUTO_PORT;
-
#ifdef CONFIG_PNP
if (!isapnp[dev]) {
#endif
@@ -490,7 +483,7 @@
/* ---------- OPL3 synth --------- */
- if (fm_port[dev] != SNDRV_AUTO_PORT) {
+ if (fm_port[dev] > 0 && fm_port[dev] != SNDRV_AUTO_PORT) {
opl3_t *opl3;
if ((err = snd_opl3_create(card,
@@ -561,7 +554,7 @@
/* ------ ICS2115 internal MIDI ------------ */
- if (ics2115_port[dev] >= 0 && ics2115_port[dev] != SNDRV_AUTO_PORT) {
+ if (ics2115_port[dev] > 0 && ics2115_port[dev] != SNDRV_AUTO_PORT) {
ics2115_internal_rmidi =
snd_wavefront_new_midi (card,
midi_dev,
@@ -578,7 +571,7 @@
/* ------ ICS2115 external MIDI ------------ */
- if (ics2115_port[dev] >= 0 && ics2115_port[dev] != SNDRV_AUTO_PORT) {
+ if (ics2115_port[dev] > 0 && ics2115_port[dev] != SNDRV_AUTO_PORT) {
ics2115_external_rmidi =
snd_wavefront_new_midi (card,
midi_dev,
@@ -631,7 +624,7 @@
if (dma2[dev] >= 0 && dma2[dev] < 8)
sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
- if (cs4232_mpu_port[dev] != SNDRV_AUTO_PORT) {
+ if (cs4232_mpu_port[dev] > 0 && cs4232_mpu_port[dev] != SNDRV_AUTO_PORT) {
sprintf (card->longname + strlen (card->longname),
" MPU-401 0x%lx irq %d",
cs4232_mpu_port[dev],
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
