fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / sound / isa / sb / sb8_midi.c

diff --git a/sound/isa/sb/sb8_midi.c b/sound/isa/sb/sb8_midi.c
index 17e0f4d..0b67edd 100644 (file)
--- a/sound/isa/sb/sb8_midi.c
+++ b/sound/isa/sb/sb8_midi.c
@@ -32,48 +32,42 @@
 #include <sound/core.h>
 #include <sound/sb.h>
 
-/*
-
- */
 
-irqreturn_t snd_sb8dsp_midi_interrupt(sb_t * chip)
+irqreturn_t snd_sb8dsp_midi_interrupt(struct snd_sb *chip)
 {
-       snd_rawmidi_t *rmidi;
+       struct snd_rawmidi *rmidi;
        int max = 64;
        char byte;
 
-       if (chip == NULL || (rmidi = chip->rmidi) == NULL) {
+       if (!chip)
+               return IRQ_NONE;
+       
+       rmidi = chip->rmidi;
+       if (!rmidi) {
                inb(SBP(chip, DATA_AVAIL));     /* ack interrupt */
                return IRQ_NONE;
        }
+
+       spin_lock(&chip->midi_input_lock);
        while (max-- > 0) {
-               spin_lock(&chip->midi_input_lock);
                if (inb(SBP(chip, DATA_AVAIL)) & 0x80) {
                        byte = inb(SBP(chip, READ));
                        if (chip->open & SB_OPEN_MIDI_INPUT_TRIGGER) {
-                               spin_unlock(&chip->midi_input_lock);
                                snd_rawmidi_receive(chip->midi_substream_input, &byte, 1);
-                       } else {
-                               spin_unlock(&chip->midi_input_lock);
                        }
-               } else {
-                       spin_unlock(&chip->midi_input_lock);
                }
        }
+       spin_unlock(&chip->midi_input_lock);
        return IRQ_HANDLED;
 }
 
-/*
-
- */
-
-static int snd_sb8dsp_midi_input_open(snd_rawmidi_substream_t * substream)
+static int snd_sb8dsp_midi_input_open(struct snd_rawmidi_substream *substream)
 {
        unsigned long flags;
-       sb_t *chip;
+       struct snd_sb *chip;
        unsigned int valid_open_flags;
 
-       chip = snd_magic_cast(sb_t, substream->rmidi->private_data, return -ENXIO);
+       chip = substream->rmidi->private_data;
        valid_open_flags = chip->hardware >= SB_HW_20
                ? SB_OPEN_MIDI_OUTPUT | SB_OPEN_MIDI_OUTPUT_TRIGGER : 0;
        spin_lock_irqsave(&chip->open_lock, flags);
@@ -94,13 +88,13 @@ static int snd_sb8dsp_midi_input_open(snd_rawmidi_substream_t * substream)
        return 0;
 }
 
-static int snd_sb8dsp_midi_output_open(snd_rawmidi_substream_t * substream)
+static int snd_sb8dsp_midi_output_open(struct snd_rawmidi_substream *substream)
 {
        unsigned long flags;
-       sb_t *chip;
+       struct snd_sb *chip;
        unsigned int valid_open_flags;
 
-       chip = snd_magic_cast(sb_t, substream->rmidi->private_data, return -ENXIO);
+       chip = substream->rmidi->private_data;
        valid_open_flags = chip->hardware >= SB_HW_20
                ? SB_OPEN_MIDI_INPUT | SB_OPEN_MIDI_INPUT_TRIGGER : 0;
        spin_lock_irqsave(&chip->open_lock, flags);
@@ -121,12 +115,12 @@ static int snd_sb8dsp_midi_output_open(snd_rawmidi_substream_t * substream)
        return 0;
 }
 
-static int snd_sb8dsp_midi_input_close(snd_rawmidi_substream_t * substream)
+static int snd_sb8dsp_midi_input_close(struct snd_rawmidi_substream *substream)
 {
        unsigned long flags;
-       sb_t *chip;
+       struct snd_sb *chip;
 
-       chip = snd_magic_cast(sb_t, substream->rmidi->private_data, return -ENXIO);
+       chip = substream->rmidi->private_data;
        spin_lock_irqsave(&chip->open_lock, flags);
        chip->open &= ~(SB_OPEN_MIDI_INPUT | SB_OPEN_MIDI_INPUT_TRIGGER);
        chip->midi_substream_input = NULL;
@@ -139,12 +133,12 @@ static int snd_sb8dsp_midi_input_close(snd_rawmidi_substream_t * substream)
        return 0;
 }
 
-static int snd_sb8dsp_midi_output_close(snd_rawmidi_substream_t * substream)
+static int snd_sb8dsp_midi_output_close(struct snd_rawmidi_substream *substream)
 {
        unsigned long flags;
-       sb_t *chip;
+       struct snd_sb *chip;
 
-       chip = snd_magic_cast(sb_t, substream->rmidi->private_data, return -ENXIO);
+       chip = substream->rmidi->private_data;
        spin_lock_irqsave(&chip->open_lock, flags);
        chip->open &= ~(SB_OPEN_MIDI_OUTPUT | SB_OPEN_MIDI_OUTPUT_TRIGGER);
        chip->midi_substream_output = NULL;
@@ -157,12 +151,12 @@ static int snd_sb8dsp_midi_output_close(snd_rawmidi_substream_t * substream)
        return 0;
 }
 
-static void snd_sb8dsp_midi_input_trigger(snd_rawmidi_substream_t * substream, int up)
+static void snd_sb8dsp_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)
 {
        unsigned long flags;
-       sb_t *chip;
+       struct snd_sb *chip;
 
-       chip = snd_magic_cast(sb_t, substream->rmidi->private_data, return);
+       chip = substream->rmidi->private_data;
        spin_lock_irqsave(&chip->open_lock, flags);
        if (up) {
                if (!(chip->open & SB_OPEN_MIDI_INPUT_TRIGGER)) {
@@ -180,15 +174,15 @@ static void snd_sb8dsp_midi_input_trigger(snd_rawmidi_substream_t * substream, i
        spin_unlock_irqrestore(&chip->open_lock, flags);
 }
 
-static void snd_sb8dsp_midi_output_write(snd_rawmidi_substream_t * substream)
+static void snd_sb8dsp_midi_output_write(struct snd_rawmidi_substream *substream)
 {
        unsigned long flags;
-       sb_t *chip;
+       struct snd_sb *chip;
        char byte;
        int max = 32;
 
        /* how big is Tx FIFO? */
-       chip = snd_magic_cast(sb_t, substream->rmidi->private_data, return);
+       chip = substream->rmidi->private_data;
        while (max-- > 0) {
                spin_lock_irqsave(&chip->open_lock, flags);
                if (snd_rawmidi_transmit_peek(substream, &byte, 1) != 1) {
@@ -218,8 +212,8 @@ static void snd_sb8dsp_midi_output_write(snd_rawmidi_substream_t * substream)
 
 static void snd_sb8dsp_midi_output_timer(unsigned long data)
 {
-       snd_rawmidi_substream_t * substream = (snd_rawmidi_substream_t *) data;
-       sb_t * chip = snd_magic_cast(sb_t, substream->rmidi->private_data, return);
+       struct snd_rawmidi_substream *substream = (struct snd_rawmidi_substream *) data;
+       struct snd_sb * chip = substream->rmidi->private_data;
        unsigned long flags;
 
        spin_lock_irqsave(&chip->open_lock, flags);
@@ -229,12 +223,12 @@ static void snd_sb8dsp_midi_output_timer(unsigned long data)
        snd_sb8dsp_midi_output_write(substream);
 }
 
-static void snd_sb8dsp_midi_output_trigger(snd_rawmidi_substream_t * substream, int up)
+static void snd_sb8dsp_midi_output_trigger(struct snd_rawmidi_substream *substream, int up)
 {
        unsigned long flags;
-       sb_t *chip;
+       struct snd_sb *chip;
 
-       chip = snd_magic_cast(sb_t, substream->rmidi->private_data, return);
+       chip = substream->rmidi->private_data;
        spin_lock_irqsave(&chip->open_lock, flags);
        if (up) {
                if (!(chip->open & SB_OPEN_MIDI_OUTPUT_TRIGGER)) {
@@ -256,27 +250,23 @@ static void snd_sb8dsp_midi_output_trigger(snd_rawmidi_substream_t * substream,
                snd_sb8dsp_midi_output_write(substream);
 }
 
-/*
-
- */
-
-static snd_rawmidi_ops_t snd_sb8dsp_midi_output =
+static struct snd_rawmidi_ops snd_sb8dsp_midi_output =
 {
        .open =         snd_sb8dsp_midi_output_open,
        .close =        snd_sb8dsp_midi_output_close,
        .trigger =      snd_sb8dsp_midi_output_trigger,
 };
 
-static snd_rawmidi_ops_t snd_sb8dsp_midi_input =
+static struct snd_rawmidi_ops snd_sb8dsp_midi_input =
 {
        .open =         snd_sb8dsp_midi_input_open,
        .close =        snd_sb8dsp_midi_input_close,
        .trigger =      snd_sb8dsp_midi_input_trigger,
 };
 
-int snd_sb8dsp_midi(sb_t *chip, int device, snd_rawmidi_t ** rrawmidi)
+int snd_sb8dsp_midi(struct snd_sb *chip, int device, struct snd_rawmidi ** rrawmidi)
 {
-       snd_rawmidi_t *rmidi;
+       struct snd_rawmidi *rmidi;
        int err;
 
        if (rrawmidi)