d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't pass configured information back to ISA for this subdevices,

Browse Source 
it cause conflicts
This commit is contained in:
ache 1997-07-08 15:35:28 +00:00
parent 42967d1e5f
commit 06397f39e1
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/i386/isa/sound/sb16_dsp.c
View File

@ -529,8 +529,9 @@ sb16_dsp_detect (struct address_info *hw_config)
if (sbc_major < 4) /* Set by the plain SB driver */
return 0; /* Not a SB16 */
hw_config->io_base = sb_config->io_base;
hw_config->irq = sb_config->irq;
/* cause conflicts */
/* hw_config->io_base = sb_config->io_base; */
/* hw_config->irq = sb_config->irq; */
#ifdef PC98
hw_config->dma = sb_config->dma;
#else
@ -558,7 +559,8 @@ sb16_dsp_detect (struct address_info *hw_config)
* dsp_showmessage(0xe3,99);
*/
sb16_dsp_ok = 1;
return 0x10;
/* return 0x10; */
return -1;
}
void

3
sys/i386/isa/sound/sb16_midi.c
View File

@ -315,7 +315,8 @@ probe_sb16midi (struct address_info *hw_config)
sb16midi_detected = ok;
if (ok) {
hw_config->irq = sb_config->irq;
/* cause conflicts */
/* hw_config->irq = sb_config->irq; */
return 2;
} else
return 0;