diff options
Diffstat (limited to 'sys/i386/isa/sound/adlib_card.c')
| -rw-r--r-- | sys/i386/isa/sound/adlib_card.c | 30 |
1 files changed, 11 insertions, 19 deletions
diff --git a/sys/i386/isa/sound/adlib_card.c b/sys/i386/isa/sound/adlib_card.c index a2e7b05..41039b9 100644 --- a/sys/i386/isa/sound/adlib_card.c +++ b/sys/i386/isa/sound/adlib_card.c @@ -1,10 +1,10 @@ /* * sound/adlib_card.c - * + * * Detection routine for the AdLib card. - * + * * Copyright by Hannu Savolainen 1993 - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: 1. Redistributions of source code must retain the above copyright @@ -12,7 +12,7 @@ * Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -24,31 +24,23 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * + * */ #include <i386/isa/sound/sound_config.h> -#if defined(CONFIGURE_SOUNDCARD) && !defined(EXCLUDE_YM3812) +#if defined(CONFIG_YM3812) -long -attach_adlib_card (long mem_start, struct address_info *hw_config) +void +attach_adlib_card(struct address_info * hw_config) { - - if (opl3_detect (FM_MONO)) - { - mem_start = opl3_init (mem_start); - } - return mem_start; + opl3_init(hw_config->io_base, hw_config->osp); } int -probe_adlib (struct address_info *hw_config) +probe_adlib(struct address_info * hw_config) { - if (opl3_detect (FM_MONO)) - return 4; - else - return 0; + return opl3_detect(hw_config->io_base, hw_config->osp); } #endif |
