From 918019dbbdac1461aa95629db3d864b7701860ff Mon Sep 17 00:00:00 2001 From: swallace Date: Sun, 12 Mar 1995 23:34:12 +0000 Subject: Reorganize how sound devices are configured. Use a snd controller with individual devices for each type of sound card: opl, sb, sbxvi, sbmidi, pas, mpu, gus, gusxvi, gusmax, mss, uart EXCLUDE_* options are no longer required to be included in the config file. They are automatically determined by local.h depending on the devices included. Move #includes in local.h to os.h so files are included in the proper order to avoid warnings. soundcard.c now has additional code to reflect the device driver routines needed. Define new EXCLUDE_SB16MIDI for use in sb16_midi.c and dev_table.h. #ifndef EXCLUDE_SEQUENCER or EXCLUDE_AUDIO have been added to soundcard.c and sound_switch.c where appropriate. Probe outputs changed to reflect new device names. Readme.freebsd not needed. Update sound.doc with new config instructions. Reviewed by: wollman --- sys/i386/isa/sound/sb16_midi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/i386/isa/sound/sb16_midi.c') diff --git a/sys/i386/isa/sound/sb16_midi.c b/sys/i386/isa/sound/sb16_midi.c index ec412a6..f4114d9 100644 --- a/sys/i386/isa/sound/sb16_midi.c +++ b/sys/i386/isa/sound/sb16_midi.c @@ -32,7 +32,7 @@ #ifdef CONFIGURE_SOUNDCARD -#if !defined(EXCLUDE_SB) && !defined(EXCLUDE_SB16) && !defined(EXCLUDE_MIDI) +#if !defined(EXCLUDE_SB) && !defined(EXCLUDE_SB16MIDI) && !defined(EXCLUDE_MIDI) #include "sb.h" @@ -226,7 +226,7 @@ attach_sb16midi (long mem_start, struct address_info *hw_config) } #ifdef __FreeBSD__ - printk ("snd7: "); + printk ("sbmidi: "); #else printk (" "); #endif -- cgit v1.1