patch-2.1.86 linux/drivers/sound/v_midi.c

• Lines: 494
• Date: Mon Feb 9 11:14:15 1998
• Orig file: v2.1.85/linux/drivers/sound/v_midi.c
• Orig date: Tue Dec 30 10:59:17 1997

diff -u --recursive --new-file v2.1.85/linux/drivers/sound/v_midi.c linux/drivers/sound/v_midi.c
@@ -24,14 +24,14 @@
 #include "v_midi.h"
 
 static vmidi_devc *v_devc[2] = { NULL, NULL};
-static int			midi1,midi2;
+static int midi1,midi2;
+static void *midi_mem = NULL;
 
 #ifdef MODULE
 
 static struct address_info config;	/* dummy */
 
-int
-init_module(void)
+int init_module(void)
 {
 	printk("MIDI Loopback device driver\n");
 	if (!probe_v_midi(&config))
@@ -41,8 +41,7 @@
 	return 0;
 }
 
-void
-cleanup_module(void)
+void cleanup_module(void)
 {
 	unload_v_midi(&config);
 	SOUND_LOCK_END;
@@ -61,93 +60,87 @@
 
 void            (*midi_input_intr) (int dev, unsigned char data);
 
-static int
-v_midi_open (int dev, int mode,
+static int v_midi_open (int dev, int mode,
 	      void            (*input) (int dev, unsigned char data),
 	      void            (*output) (int dev)
 )
 {
-  vmidi_devc      *devc = midi_devs[dev]->devc;
-  unsigned long   flags;
+	vmidi_devc *devc = midi_devs[dev]->devc;
+	unsigned long flags;
 
-  if (devc == NULL)
-    return -(ENXIO);
+	if (devc == NULL)
+		return -(ENXIO);
 
-  save_flags (flags);
-  cli ();
-  if (devc->opened)
-    {
-      restore_flags (flags);
-      return -(EBUSY);
-    }
-  devc->opened = 1;
-  restore_flags (flags);
-
-  devc->intr_active = 1;
-
-  if (mode & OPEN_READ)
-    {
-      devc->input_opened = 1;
-      devc->midi_input_intr = input;
-    }
+	save_flags (flags);
+	cli();
+	if (devc->opened)
+	{
+		restore_flags (flags);
+		return -(EBUSY);
+	}
+	devc->opened = 1;
+	restore_flags (flags);
+
+	devc->intr_active = 1;
+
+	if (mode & OPEN_READ)
+	{
+		devc->input_opened = 1;
+		devc->midi_input_intr = input;
+	}
 
-  return 0;
+	return 0;
 }
 
-static void
-v_midi_close (int dev)
+static void v_midi_close (int dev)
 {
-  vmidi_devc        *devc = midi_devs[dev]->devc;
-  unsigned long   flags;
+	vmidi_devc *devc = midi_devs[dev]->devc;
+	unsigned long flags;
 
-  if (devc == NULL)
-    return;
+	if (devc == NULL)
+		return;
 
-  save_flags (flags);
-  cli ();
-  devc->intr_active = 0;
-  devc->input_opened = 0;
-  devc->opened = 0;
-  restore_flags (flags);
+	save_flags (flags);
+	cli ();
+	devc->intr_active = 0;
+	devc->input_opened = 0;
+	devc->opened = 0;
+	restore_flags (flags);
 }
 
-static int
-v_midi_out (int dev, unsigned char midi_byte)
+static int v_midi_out (int dev, unsigned char midi_byte)
 {
-  vmidi_devc        *devc = midi_devs[dev]->devc;
-  vmidi_devc        *pdevc = midi_devs[devc->pair_mididev]->devc;
-
-  if (devc == NULL)
-    return -(ENXIO);
+	vmidi_devc *devc = midi_devs[dev]->devc;
+	vmidi_devc *pdevc = midi_devs[devc->pair_mididev]->devc;
 
-  if (pdevc->input_opened > 0){
-	  if (MIDIbuf_avail(pdevc->my_mididev) > 500)
-		return 0;
-    pdevc->midi_input_intr (pdevc->my_mididev, midi_byte);
-  }
+	if (devc == NULL)
+		return -(ENXIO);
 
-  return 1;
+	if (pdevc->input_opened > 0){
+		if (MIDIbuf_avail(pdevc->my_mididev) > 500)
+			return 0;
+		pdevc->midi_input_intr (pdevc->my_mididev, midi_byte);
+	}
+	return 1;
 }
 
-static int
-v_midi_start_read (int dev)
+static int v_midi_start_read (int dev)
 {
-  return 0;
+	return 0;
 }
 
-static int
-v_midi_end_read (int dev)
+static int v_midi_end_read (int dev)
 {
-  vmidi_devc        *devc = midi_devs[dev]->devc;
-
-  if (devc == NULL)
-    return -(ENXIO);
+	vmidi_devc *devc = midi_devs[dev]->devc;
+	if (devc == NULL)
+		return -ENXIO;
 
-  devc->intr_active = 0;
-  return 0;
+	devc->intr_active = 0;
+	return 0;
 }
 
 /* why -EPERM and not -EINVAL?? */
+
 static int v_midi_ioctl (int dev, unsigned cmd, caddr_t arg)
 {
 	return -EPERM;
@@ -161,199 +154,143 @@
 
 static struct midi_operations v_midi_operations =
 {
-  {"Loopback MIDI Port 1", 0, 0, SNDCARD_VMIDI},
-  &std_midi_synth,
-  {0},
-  v_midi_open,
-  v_midi_close,
-  v_midi_ioctl,
-  v_midi_out,
-  v_midi_start_read,
-  v_midi_end_read,
-  NULL,
-  NULL,
-  NULL,
-  NULL
+	{"Loopback MIDI Port 1", 0, 0, SNDCARD_VMIDI},
+	&std_midi_synth,
+	{0},
+	v_midi_open,
+	v_midi_close,
+	v_midi_ioctl,
+	v_midi_out,
+	v_midi_start_read,
+	v_midi_end_read,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
 static struct midi_operations v_midi_operations2 =
 {
-  {"Loopback MIDI Port 2", 0, 0, SNDCARD_VMIDI},
-  &std_midi_synth,
-  {0},
-  v_midi_open,
-  v_midi_close,
-  v_midi_ioctl,
-  v_midi_out,
-  v_midi_start_read,
-  v_midi_end_read,
-  NULL,
-  NULL,
-  NULL,
-  NULL
+	{"Loopback MIDI Port 2", 0, 0, SNDCARD_VMIDI},
+	&std_midi_synth,
+	{0},
+	v_midi_open,
+	v_midi_close,
+	v_midi_ioctl,
+	v_midi_out,
+	v_midi_start_read,
+	v_midi_end_read,
+	NULL,
+	NULL,
+	NULL,
+	NULL
 };
 
-void
-attach_v_midi (struct address_info *hw_config)
+/*
+ *	We kmalloc just one of these - it makes life simpler and the code
+ *	cleaner and the memory handling far more efficient
+ */
+ 
+struct vmidi_memory
 {
+	/* Must be first */
+	struct midi_operations m_ops[2];
+	struct synth_operations s_ops[2];
+	struct vmidi_devc v_ops[2];
+};
 
-  /* printk("Attaching v_midi device.....\n"); */
-  if (sound_nblocks >= (1024 - 6)){
-     printk("Sound: Loop Back MIDI: not enough sound driver memory block table\n");
-     return;
-  } 
-
-  midi1 = sound_alloc_mididev();
-  if (midi1 == -1)
-    {
-      printk ("Sound: Too many midi devices detected\n");
-      return;
-    }
-  midi_devs[midi1] = (struct midi_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc (sizeof (struct midi_operations)));
-  sound_mem_sizes[sound_nblocks] = sizeof (struct midi_operations);
-	
-  if (sound_nblocks < 1024)
-    sound_nblocks++;;
-  if (midi_devs[midi1] == NULL)
-    {
-      printk (KERN_WARNING "Loop Back MIDI: Failed to allocate memory\n");
-      sound_unload_mididev(midi1);
-      return;
-    }
-
-  midi2 = sound_alloc_mididev();
-  if (midi2 == -1)
-    {
-      printk ("Sound: Too many midi devices detected\n");
-      sound_unload_mididev(midi1);
-      return;
-    }
-
-  midi_devs[midi2] = (struct midi_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc (sizeof (struct midi_operations)));
-  sound_mem_sizes[sound_nblocks] = sizeof (struct midi_operations);
-
-  if (sound_nblocks < 1024)
-    sound_nblocks++;;
-  if (midi_devs[midi2] == NULL)
-    {
-      printk (KERN_WARNING "Loop Back MIDI: Failed to allocate memory\n");
-      sound_unload_mididev(midi1);
-      sound_unload_mididev(midi2);
-      return;
-    }
-
-  /* printk("VMIDI1: %d   VMIDI2: %d\n",midi1,midi2); */
-
-  /* for MIDI-1 */
-  v_devc[0] = (struct vmidi_devc *) (sound_mem_blocks[sound_nblocks] = vmalloc (sizeof (struct vmidi_devc)));
-  sound_mem_sizes[sound_nblocks] = sizeof (struct vmidi_devc);
-
-  if (sound_nblocks < 1024)
-    sound_nblocks++;;
-  if (v_devc[0] == NULL)
-    {
-      printk (KERN_WARNING "Loop Back MIDI: Failed to allocate memory\n");
-      sound_unload_mididev(midi1);
-      sound_unload_mididev(midi2);
-      return;
-    }
-
-  memcpy ((char *) midi_devs[midi1], (char *) &v_midi_operations,
-	  sizeof (struct midi_operations));
-
-  v_devc[0]->my_mididev = midi1;
-  v_devc[0]->pair_mididev = midi2;
-  v_devc[0]->opened = v_devc[0]->input_opened = 0;
-  v_devc[0]->intr_active = 0;
-  v_devc[0]->midi_input_intr = NULL;
-
-  midi_devs[midi1]->devc = v_devc[0];
-
-  midi_devs[midi1]->converter = (struct synth_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc (sizeof (struct synth_operations)));
-  sound_mem_sizes[sound_nblocks] = sizeof (struct synth_operations);
-
-  if (sound_nblocks < 1024)
-    sound_nblocks++;;
-
-  if (midi_devs[midi1]->converter == NULL)
-    {
-      printk (KERN_WARNING "Loop Back MIDI: Failed to allocate memory\n");
-      sound_unload_mididev(midi1);
-      sound_unload_mididev(midi2);
-      return;
-    }
-
-  std_midi_synth.midi_dev = midi1;
-  memcpy ((char *) midi_devs[midi1]->converter, (char *) &std_midi_synth,
-	  sizeof (struct synth_operations));
-
-  midi_devs[midi1]->converter->id = "V_MIDI 1";
-
-  /* for MIDI-2 */
-  v_devc[1] = (struct vmidi_devc *) (sound_mem_blocks[sound_nblocks] = vmalloc (sizeof (struct vmidi_devc)));
-  sound_mem_sizes[sound_nblocks] = sizeof (struct vmidi_devc);
-
-  if (sound_nblocks < 1024)
-    sound_nblocks++;;
-  if (v_devc[1] == NULL)
-    {
-      printk (KERN_WARNING "Loop Back MIDI: Failed to allocate memory\n");
-      sound_unload_mididev(midi1);
-      sound_unload_mididev(midi2);
-      return;
-    }
-
-
-  memcpy ((char *) midi_devs[midi2], (char *) &v_midi_operations2,
-	  sizeof (struct midi_operations));
-
-  v_devc[1]->my_mididev = midi2;
-  v_devc[1]->pair_mididev = midi1;
-  v_devc[1]->opened = v_devc[1]->input_opened = 0;
-  v_devc[1]->intr_active = 0;
-  v_devc[1]->midi_input_intr = NULL;
-
-  midi_devs[midi2]->devc = v_devc[1];
-
-
-  midi_devs[midi2]->converter = (struct synth_operations *) (sound_mem_blocks[sound_nblocks] = vmalloc (sizeof (struct synth_operations)));
-  sound_mem_sizes[sound_nblocks] = sizeof (struct synth_operations);
-
-  if (sound_nblocks < 1024)
-    sound_nblocks++;;
-
-  if (midi_devs[midi2]->converter == NULL)
-    {
-      printk (KERN_WARNING "Loop Back MIDI: Failed to allocate memory\n");
-      sound_unload_mididev(midi1);
-      sound_unload_mididev(midi2);
-      return;
-    }
-
-  std_midi_synth.midi_dev = midi2;
-  memcpy ((char *) midi_devs[midi2]->converter, (char *) &std_midi_synth,
-	  sizeof (struct synth_operations));
+void attach_v_midi (struct address_info *hw_config)
+{
+	struct vmidi_memory *m;
+	/* printk("Attaching v_midi device.....\n"); */
 
-  midi_devs[midi2]->converter->id = "V_MIDI 2";
+	midi1 = sound_alloc_mididev();
+	if (midi1 == -1)
+	{
+		printk(KERN_ERR "v_midi: Too many midi devices detected\n");
+		return;
+	}
+	
+	m=(struct vmidi_memory *)kmalloc(sizeof(struct vmidi_memory), GFP_KERNEL);
+	if (m == NULL)
+	{
+		printk(KERN_WARNING "Loopback MIDI: Failed to allocate memory\n");
+		sound_unload_mididev(midi1);
+		return;
+	}
+	
+	midi_mem = m;
+	
+	midi_devs[midi1] = &m->m_ops[0];
+	
 
-  sequencer_init();
-  /* printk("Attached v_midi device\n"); */
+	midi2 = sound_alloc_mididev();
+	if (midi2 == -1)
+	{
+		printk (KERN_ERR "v_midi: Too many midi devices detected\n");
+		kfree(m);
+		sound_unload_mididev(midi1);
+		return;
+	}
+
+	midi_devs[midi2] = &m->m_ops[1];
+
+	/* printk("VMIDI1: %d   VMIDI2: %d\n",midi1,midi2); */
+
+	/* for MIDI-1 */
+	v_devc[0] = &m->v_ops[0];
+	memcpy ((char *) midi_devs[midi1], (char *) &v_midi_operations,
+		sizeof (struct midi_operations));
+
+	v_devc[0]->my_mididev = midi1;
+	v_devc[0]->pair_mididev = midi2;
+	v_devc[0]->opened = v_devc[0]->input_opened = 0;
+	v_devc[0]->intr_active = 0;
+	v_devc[0]->midi_input_intr = NULL;
+
+	midi_devs[midi1]->devc = v_devc[0];
+
+	midi_devs[midi1]->converter = &m->s_ops[0];
+	std_midi_synth.midi_dev = midi1;
+	memcpy ((char *) midi_devs[midi1]->converter, (char *) &std_midi_synth,
+		sizeof (struct synth_operations));
+	midi_devs[midi1]->converter->id = "V_MIDI 1";
+
+	/* for MIDI-2 */
+	v_devc[1] = &m->v_ops[1];
+
+	memcpy ((char *) midi_devs[midi2], (char *) &v_midi_operations2,
+		sizeof (struct midi_operations));
+
+	v_devc[1]->my_mididev = midi2;
+	v_devc[1]->pair_mididev = midi1;
+	v_devc[1]->opened = v_devc[1]->input_opened = 0;
+	v_devc[1]->intr_active = 0;
+	v_devc[1]->midi_input_intr = NULL;
+
+	midi_devs[midi2]->devc = v_devc[1];
+	midi_devs[midi2]->converter = &m->s_ops[1];
+
+	std_midi_synth.midi_dev = midi2;
+	memcpy ((char *) midi_devs[midi2]->converter, (char *) &std_midi_synth,
+		sizeof (struct synth_operations));
+	midi_devs[midi2]->converter->id = "V_MIDI 2";
 
+	sequencer_init();
+	/* printk("Attached v_midi device\n"); */
 }
 
-int
-probe_v_midi(struct address_info *hw_config)
+int probe_v_midi(struct address_info *hw_config)
 {
 	return(1);	/* always OK */
 }
 
 
-void
-unload_v_midi(struct address_info *hw_config)
+void unload_v_midi(struct address_info *hw_config)
 {
-      sound_unload_mididev(midi1);
-      sound_unload_mididev(midi2);
-;
+	sound_unload_mididev(midi1);
+	sound_unload_mididev(midi2);
+	kfree(midi_mem);
 }
 
 #endif