patch-2.4.0-test7 linux/drivers/sound/awe_wave.c

• Lines: 113
• Date: Fri Aug 11 08:26:43 2000
• Orig file: v2.4.0-test6/linux/drivers/sound/awe_wave.c
• Orig date: Fri Jun 23 21:55:10 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/awe_wave.c linux/drivers/sound/awe_wave.c
@@ -31,7 +31,6 @@
 #endif
 
 #include "sound_config.h"
-#include "soundmodule.h"
 
 #include "awe_wave.h"
 #include "awe_hw.h"
@@ -496,27 +495,28 @@
 
 static struct synth_operations awe_operations =
 {
-	"EMU8K",
-	&awe_info,
-	0,
-	SYNTH_TYPE_SAMPLE,
-	SAMPLE_TYPE_AWE32,
-	awe_open,
-	awe_close,
-	awe_ioctl,
-	awe_kill_note,
-	awe_start_note,
-	awe_set_instr_2,
-	awe_reset,
-	awe_hw_control,
-	awe_load_patch,
-	awe_aftertouch,
-	awe_controller,
-	awe_panning,
-	awe_volume_method,
-	awe_bender,
-	awe_alloc,
-	awe_setup_voice
+	owner:		THIS_MODULE,
+	id:		"EMU8K",
+	info:		&awe_info,
+	midi_dev:	0,
+	synth_type:	SYNTH_TYPE_SAMPLE,
+	synth_subtype:	SAMPLE_TYPE_AWE32,
+	open:		awe_open,
+	close:		awe_close,
+	ioctl:		awe_ioctl,
+	kill_note:	awe_kill_note,
+	start_note:	awe_start_note,
+	set_instr:	awe_set_instr_2,
+	reset:		awe_reset,
+	hw_control:	awe_hw_control,
+	load_patch:	awe_load_patch,
+	aftertouch:	awe_aftertouch,
+	controller:	awe_controller,
+	panning:	awe_panning,
+	volume_method:	awe_volume_method,
+	bender:		awe_bender,
+	alloc_voice:	awe_alloc,
+	setup_voice:	awe_setup_voice
 };
 
 
@@ -575,8 +575,6 @@
 
 	awe_present = TRUE;
 
-	SOUND_LOCK;
-
 	return 1;
 }
 
@@ -608,7 +606,6 @@
 #endif
 		sound_unload_synthdev(my_dev);
 		awe_present = FALSE;
-		SOUND_LOCK_END;
 	}
 }
 
@@ -4293,8 +4290,10 @@
 static int my_mixerdev = -1;
 
 static struct mixer_operations awe_mixer_operations = {
-	"AWE32 Equalizer",
-	awe_mixer_ioctl,
+	owner:	THIS_MODULE,
+	id:	"AWE",
+	name:	"AWE32 Equalizer",
+	ioctl:	awe_mixer_ioctl,
 };
 
 static void __init attach_mixer(void)
@@ -5225,17 +5224,13 @@
 
 static struct midi_operations awe_midi_operations =
 {
-	{"AWE Midi Emu", 0, 0, SNDCARD_SB},
-	NULL /*&std_midi_synth*/,
-	{0}, /* input_info */
-	awe_midi_open, /*open*/
-	awe_midi_close, /*close*/
-	awe_midi_ioctl, /*ioctl*/
-	awe_midi_outputc, /*outputc*/
-	NULL /*start_read*/,
-	NULL /*end_read*/,
-	NULL, /* kick */
-	NULL, /* command */
+	owner:		THIS_MODULE,
+	info:		{"AWE Midi Emu", 0, 0, SNDCARD_SB},
+	in_info:	{0},
+	open:		awe_midi_open, /*open*/
+	close:		awe_midi_close, /*close*/
+	ioctl:		awe_midi_ioctl, /*ioctl*/
+	outputc:	awe_midi_outputc, /*outputc*/
 };
 
 static int my_mididev = -1;