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

• Lines: 88
• Date: Fri Aug 11 08:26:44 2000
• Orig file: v2.4.0-test6/linux/drivers/sound/wf_midi.c
• Orig date: Fri Mar 10 16:40:44 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/sound/wf_midi.c linux/drivers/sound/wf_midi.c
@@ -51,7 +51,6 @@
 
 #include <linux/init.h>
 #include "sound_config.h"
-#include "soundmodule.h"
 
 #include <linux/wavefront.h>
 
@@ -550,19 +549,16 @@
 
 static struct midi_operations wf_mpu_midi_proto =
 {
-	{"WF-MPU MIDI", 0, MIDI_CAP_MPU401, SNDCARD_MPU401},
-	NULL,  /*converter*/
-	{0},   /* in_info */
-	wf_mpu_open,
-	wf_mpu_close,
-	wf_mpu_ioctl,
-	wf_mpu_out,
-	wf_mpu_start_read,
-	wf_mpu_end_read,
-	NULL,
-	NULL,
-	wf_mpu_buffer_status,
-	NULL
+	owner:		THIS_MODULE,
+	info:		{"WF-MPU MIDI", 0, MIDI_CAP_MPU401, SNDCARD_MPU401},
+	in_info:	{0},   /* in_info */
+	open:		wf_mpu_open,
+	close:		wf_mpu_close,
+	ioctl:		wf_mpu_ioctl,
+	outputc:	wf_mpu_out,
+	start_read:	wf_mpu_start_read,
+	end_read:	wf_mpu_end_read,
+	buffer_status:	wf_mpu_buffer_status,
 };
 
 static struct synth_info wf_mpu_synth_info_proto =
@@ -671,28 +667,27 @@
 
 static struct synth_operations wf_mpu_synth_proto =
 {
-	"WaveFront (ICS2115)",
-	NULL,  /* info field, filled in during configuration */
-	0,     /* MIDI dev XXX should this be -1 ? */
-	SYNTH_TYPE_MIDI,
-	SAMPLE_TYPE_WAVEFRONT,
-	wf_mpu_synth_open,
-	wf_mpu_synth_close,
-	wf_mpu_synth_ioctl,
-	midi_synth_kill_note,
-	midi_synth_start_note,
-	midi_synth_set_instr,
-	midi_synth_reset,
-	midi_synth_hw_control,
-	midi_synth_load_patch,
-	midi_synth_aftertouch,
-	midi_synth_controller,
-	midi_synth_panning,
-	NULL,
-	midi_synth_bender,
-	NULL,				/* alloc */
-	midi_synth_setup_voice,
-	midi_synth_send_sysex
+	owner:		THIS_MODULE,
+	id:		"WaveFront (ICS2115)",
+	info:		NULL,  /* info field, filled in during configuration */
+	midi_dev:	0,     /* MIDI dev XXX should this be -1 ? */
+	synth_type:	SYNTH_TYPE_MIDI,
+	synth_subtype:	SAMPLE_TYPE_WAVEFRONT,
+	open:		wf_mpu_synth_open,
+	close:		wf_mpu_synth_close,
+	ioctl:		wf_mpu_synth_ioctl,
+	kill_note:	midi_synth_kill_note,
+	start_note:	midi_synth_start_note,
+	set_instr:	midi_synth_set_instr,
+	reset:		midi_synth_reset,
+	hw_control:	midi_synth_hw_control,
+	load_patch:	midi_synth_load_patch,
+	aftertouch:	midi_synth_aftertouch,
+	controller:	midi_synth_controller,
+	panning:	midi_synth_panning,
+	bender:		midi_synth_bender,
+	setup_voice:	midi_synth_setup_voice,
+	send_sysex:	midi_synth_send_sysex
 };
 
 static int