git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[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
..
c549ace
100644
(file)
--- a/
sound/isa/sb/sb8_midi.c
+++ b/
sound/isa/sb/sb8_midi.c
@@
-36,9
+36,9
@@
*/
*/
-irqreturn_t snd_sb8dsp_midi_interrupt(s
b_t
* chip)
+irqreturn_t snd_sb8dsp_midi_interrupt(s
truct snd_sb
* chip)
{
{
- s
nd_rawmidi_t
*rmidi;
+ s
truct snd_rawmidi
*rmidi;
int max = 64;
char byte;
int max = 64;
char byte;
@@
-63,10
+63,10
@@
irqreturn_t snd_sb8dsp_midi_interrupt(sb_t * chip)
*/
*/
-static int snd_sb8dsp_midi_input_open(s
nd_rawmidi_substream_t *
substream)
+static int snd_sb8dsp_midi_input_open(s
truct snd_rawmidi_substream *
substream)
{
unsigned long flags;
{
unsigned long flags;
- s
b_t
*chip;
+ s
truct snd_sb
*chip;
unsigned int valid_open_flags;
chip = substream->rmidi->private_data;
unsigned int valid_open_flags;
chip = substream->rmidi->private_data;
@@
-90,10
+90,10
@@
static int snd_sb8dsp_midi_input_open(snd_rawmidi_substream_t * substream)
return 0;
}
return 0;
}
-static int snd_sb8dsp_midi_output_open(s
nd_rawmidi_substream_t *
substream)
+static int snd_sb8dsp_midi_output_open(s
truct snd_rawmidi_substream *
substream)
{
unsigned long flags;
{
unsigned long flags;
- s
b_t
*chip;
+ s
truct snd_sb
*chip;
unsigned int valid_open_flags;
chip = substream->rmidi->private_data;
unsigned int valid_open_flags;
chip = substream->rmidi->private_data;
@@
-117,10
+117,10
@@
static int snd_sb8dsp_midi_output_open(snd_rawmidi_substream_t * substream)
return 0;
}
return 0;
}
-static int snd_sb8dsp_midi_input_close(s
nd_rawmidi_substream_t *
substream)
+static int snd_sb8dsp_midi_input_close(s
truct snd_rawmidi_substream *
substream)
{
unsigned long flags;
{
unsigned long flags;
- s
b_t
*chip;
+ s
truct snd_sb
*chip;
chip = substream->rmidi->private_data;
spin_lock_irqsave(&chip->open_lock, flags);
chip = substream->rmidi->private_data;
spin_lock_irqsave(&chip->open_lock, flags);
@@
-135,10
+135,10
@@
static int snd_sb8dsp_midi_input_close(snd_rawmidi_substream_t * substream)
return 0;
}
return 0;
}
-static int snd_sb8dsp_midi_output_close(s
nd_rawmidi_substream_t *
substream)
+static int snd_sb8dsp_midi_output_close(s
truct snd_rawmidi_substream *
substream)
{
unsigned long flags;
{
unsigned long flags;
- s
b_t
*chip;
+ s
truct snd_sb
*chip;
chip = substream->rmidi->private_data;
spin_lock_irqsave(&chip->open_lock, flags);
chip = substream->rmidi->private_data;
spin_lock_irqsave(&chip->open_lock, flags);
@@
-153,10
+153,10
@@
static int snd_sb8dsp_midi_output_close(snd_rawmidi_substream_t * substream)
return 0;
}
return 0;
}
-static void snd_sb8dsp_midi_input_trigger(s
nd_rawmidi_substream_t *
substream, int up)
+static void snd_sb8dsp_midi_input_trigger(s
truct snd_rawmidi_substream *
substream, int up)
{
unsigned long flags;
{
unsigned long flags;
- s
b_t
*chip;
+ s
truct snd_sb
*chip;
chip = substream->rmidi->private_data;
spin_lock_irqsave(&chip->open_lock, flags);
chip = substream->rmidi->private_data;
spin_lock_irqsave(&chip->open_lock, flags);
@@
-176,10
+176,10
@@
static void snd_sb8dsp_midi_input_trigger(snd_rawmidi_substream_t * substream, i
spin_unlock_irqrestore(&chip->open_lock, flags);
}
spin_unlock_irqrestore(&chip->open_lock, flags);
}
-static void snd_sb8dsp_midi_output_write(s
nd_rawmidi_substream_t *
substream)
+static void snd_sb8dsp_midi_output_write(s
truct snd_rawmidi_substream *
substream)
{
unsigned long flags;
{
unsigned long flags;
- s
b_t
*chip;
+ s
truct snd_sb
*chip;
char byte;
int max = 32;
char byte;
int max = 32;
@@
-214,8
+214,8
@@
static void snd_sb8dsp_midi_output_write(snd_rawmidi_substream_t * substream)
static void snd_sb8dsp_midi_output_timer(unsigned long data)
{
static void snd_sb8dsp_midi_output_timer(unsigned long data)
{
- s
nd_rawmidi_substream_t * substream = (snd_rawmidi_substream_t
*) data;
- s
b_t
* chip = substream->rmidi->private_data;
+ s
truct snd_rawmidi_substream *substream = (struct snd_rawmidi_substream
*) data;
+ s
truct snd_sb
* chip = substream->rmidi->private_data;
unsigned long flags;
spin_lock_irqsave(&chip->open_lock, flags);
unsigned long flags;
spin_lock_irqsave(&chip->open_lock, flags);
@@
-225,10
+225,10
@@
static void snd_sb8dsp_midi_output_timer(unsigned long data)
snd_sb8dsp_midi_output_write(substream);
}
snd_sb8dsp_midi_output_write(substream);
}
-static void snd_sb8dsp_midi_output_trigger(s
nd_rawmidi_substream_t *
substream, int up)
+static void snd_sb8dsp_midi_output_trigger(s
truct snd_rawmidi_substream *
substream, int up)
{
unsigned long flags;
{
unsigned long flags;
- s
b_t
*chip;
+ s
truct snd_sb
*chip;
chip = substream->rmidi->private_data;
spin_lock_irqsave(&chip->open_lock, flags);
chip = substream->rmidi->private_data;
spin_lock_irqsave(&chip->open_lock, flags);
@@
-256,23
+256,23
@@
static void snd_sb8dsp_midi_output_trigger(snd_rawmidi_substream_t * substream,
*/
*/
-static s
nd_rawmidi_ops_t
snd_sb8dsp_midi_output =
+static s
truct 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,
};
{
.open = snd_sb8dsp_midi_output_open,
.close = snd_sb8dsp_midi_output_close,
.trigger = snd_sb8dsp_midi_output_trigger,
};
-static s
nd_rawmidi_ops_t
snd_sb8dsp_midi_input =
+static s
truct 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,
};
{
.open = snd_sb8dsp_midi_input_open,
.close = snd_sb8dsp_midi_input_close,
.trigger = snd_sb8dsp_midi_input_trigger,
};
-int snd_sb8dsp_midi(s
b_t *chip, int device, snd_rawmidi_t
** rrawmidi)
+int snd_sb8dsp_midi(s
truct snd_sb *chip, int device, struct snd_rawmidi
** rrawmidi)
{
{
- s
nd_rawmidi_t
*rmidi;
+ s
truct snd_rawmidi
*rmidi;
int err;
if (rrawmidi)
int err;
if (rrawmidi)