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 d2c633a..0b67edd 100644 (file)
--- a/sound/isa/sb/sb8_midi.c
+++ b/sound/isa/sb/sb8_midi.c
@@ -32,20 +32,22 @@
 #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) {
                if (inb(SBP(chip, DATA_AVAIL)) & 0x80) {
@@ -59,14 +61,10 @@ irqreturn_t snd_sb8dsp_midi_interrupt(sb_t * chip)
        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 = substream->rmidi->private_data;
@@ -90,10 +88,10 @@ 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 = substream->rmidi->private_data;
@@ -117,10 +115,10 @@ 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 = substream->rmidi->private_data;
        spin_lock_irqsave(&chip->open_lock, flags);
@@ -135,10 +133,10 @@ 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 = substream->rmidi->private_data;
        spin_lock_irqsave(&chip->open_lock, flags);
@@ -153,10 +151,10 @@ 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 = substream->rmidi->private_data;
        spin_lock_irqsave(&chip->open_lock, flags);
@@ -176,10 +174,10 @@ 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;
 
@@ -214,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 = substream->rmidi->private_data;
+       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);
@@ -225,10 +223,10 @@ 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 = substream->rmidi->private_data;
        spin_lock_irqsave(&chip->open_lock, flags);
@@ -252,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)