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
/
gus
/
gus_uart.c
diff --git
a/sound/isa/gus/gus_uart.c
b/sound/isa/gus/gus_uart.c
index
8b09be2
..
654290a
100644
(file)
--- a/
sound/isa/gus/gus_uart.c
+++ b/
sound/isa/gus/gus_uart.c
@@
-26,7
+26,7
@@
#include <sound/core.h>
#include <sound/gus.h>
#include <sound/core.h>
#include <sound/gus.h>
-static void snd_gf1_interrupt_midi_in(s
nd_gus_card_t
* gus)
+static void snd_gf1_interrupt_midi_in(s
truct snd_gus_card
* gus)
{
int count;
unsigned char stat, data, byte;
{
int count;
unsigned char stat, data, byte;
@@
-61,7
+61,7
@@
static void snd_gf1_interrupt_midi_in(snd_gus_card_t * gus)
}
}
}
}
-static void snd_gf1_interrupt_midi_out(s
nd_gus_card_t
* gus)
+static void snd_gf1_interrupt_midi_out(s
truct snd_gus_card
* gus)
{
char byte;
unsigned long flags;
{
char byte;
unsigned long flags;
@@
-81,7
+81,7
@@
static void snd_gf1_interrupt_midi_out(snd_gus_card_t * gus)
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
}
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
}
-static void snd_gf1_uart_reset(s
nd_gus_card_t
* gus, int close)
+static void snd_gf1_uart_reset(s
truct snd_gus_card
* gus, int close)
{
snd_gf1_uart_cmd(gus, 0x03); /* reset */
if (!close && gus->uart_enable) {
{
snd_gf1_uart_cmd(gus, 0x03); /* reset */
if (!close && gus->uart_enable) {
@@
-90,12
+90,12
@@
static void snd_gf1_uart_reset(snd_gus_card_t * gus, int close)
}
}
}
}
-static int snd_gf1_uart_output_open(s
nd_rawmidi_substream_t *
substream)
+static int snd_gf1_uart_output_open(s
truct snd_rawmidi_substream *
substream)
{
unsigned long flags;
{
unsigned long flags;
- s
nd_gus_card_t
*gus;
+ s
truct snd_gus_card
*gus;
- gus = s
nd_magic_cast(snd_gus_card_t, substream->rmidi->private_data, return -ENXIO)
;
+ gus = s
ubstream->rmidi->private_data
;
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (!(gus->gf1.uart_cmd & 0x80)) { /* input active? */
snd_gf1_uart_reset(gus, 0);
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (!(gus->gf1.uart_cmd & 0x80)) { /* input active? */
snd_gf1_uart_reset(gus, 0);
@@
-104,18
+104,18
@@
static int snd_gf1_uart_output_open(snd_rawmidi_substream_t * substream)
gus->midi_substream_output = substream;
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
#if 0
gus->midi_substream_output = substream;
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
#if 0
- snd_printk("write init - cmd = 0x%x, stat = 0x%x\n", gus->gf1.uart_cmd, snd_gf1_uart_stat(gus));
+ snd_printk(
KERN_DEBUG
"write init - cmd = 0x%x, stat = 0x%x\n", gus->gf1.uart_cmd, snd_gf1_uart_stat(gus));
#endif
return 0;
}
#endif
return 0;
}
-static int snd_gf1_uart_input_open(s
nd_rawmidi_substream_t *
substream)
+static int snd_gf1_uart_input_open(s
truct snd_rawmidi_substream *
substream)
{
unsigned long flags;
{
unsigned long flags;
- s
nd_gus_card_t
*gus;
+ s
truct snd_gus_card
*gus;
int i;
int i;
- gus = s
nd_magic_cast(snd_gus_card_t, substream->rmidi->private_data, return -ENXIO)
;
+ gus = s
ubstream->rmidi->private_data
;
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (gus->gf1.interrupt_handler_midi_out != snd_gf1_interrupt_midi_out) {
snd_gf1_uart_reset(gus, 0);
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (gus->gf1.interrupt_handler_midi_out != snd_gf1_interrupt_midi_out) {
snd_gf1_uart_reset(gus, 0);
@@
-126,7
+126,7
@@
static int snd_gf1_uart_input_open(snd_rawmidi_substream_t * substream)
for (i = 0; i < 1000 && (snd_gf1_uart_stat(gus) & 0x01); i++)
snd_gf1_uart_get(gus); /* clean Rx */
if (i >= 1000)
for (i = 0; i < 1000 && (snd_gf1_uart_stat(gus) & 0x01); i++)
snd_gf1_uart_get(gus); /* clean Rx */
if (i >= 1000)
- snd_printk("gus midi uart init read - cleanup error\n");
+ snd_printk(
KERN_ERR
"gus midi uart init read - cleanup error\n");
}
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
#if 0
}
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
#if 0
@@
-136,12
+136,12
@@
static int snd_gf1_uart_input_open(snd_rawmidi_substream_t * substream)
return 0;
}
return 0;
}
-static int snd_gf1_uart_output_close(s
nd_rawmidi_substream_t *
substream)
+static int snd_gf1_uart_output_close(s
truct snd_rawmidi_substream *
substream)
{
unsigned long flags;
{
unsigned long flags;
- s
nd_gus_card_t
*gus;
+ s
truct snd_gus_card
*gus;
- gus = s
nd_magic_cast(snd_gus_card_t, substream->rmidi->private_data, return -ENXIO)
;
+ gus = s
ubstream->rmidi->private_data
;
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (gus->gf1.interrupt_handler_midi_in != snd_gf1_interrupt_midi_in)
snd_gf1_uart_reset(gus, 1);
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (gus->gf1.interrupt_handler_midi_in != snd_gf1_interrupt_midi_in)
snd_gf1_uart_reset(gus, 1);
@@
-151,12
+151,12
@@
static int snd_gf1_uart_output_close(snd_rawmidi_substream_t * substream)
return 0;
}
return 0;
}
-static int snd_gf1_uart_input_close(s
nd_rawmidi_substream_t *
substream)
+static int snd_gf1_uart_input_close(s
truct snd_rawmidi_substream *
substream)
{
unsigned long flags;
{
unsigned long flags;
- s
nd_gus_card_t
*gus;
+ s
truct snd_gus_card
*gus;
- gus = s
nd_magic_cast(snd_gus_card_t, substream->rmidi->private_data, return -ENXIO)
;
+ gus = s
ubstream->rmidi->private_data
;
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (gus->gf1.interrupt_handler_midi_out != snd_gf1_interrupt_midi_out)
snd_gf1_uart_reset(gus, 1);
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (gus->gf1.interrupt_handler_midi_out != snd_gf1_interrupt_midi_out)
snd_gf1_uart_reset(gus, 1);
@@
-166,12
+166,12
@@
static int snd_gf1_uart_input_close(snd_rawmidi_substream_t * substream)
return 0;
}
return 0;
}
-static void snd_gf1_uart_input_trigger(s
nd_rawmidi_substream_t *
substream, int up)
+static void snd_gf1_uart_input_trigger(s
truct snd_rawmidi_substream *
substream, int up)
{
{
- s
nd_gus_card_t
*gus;
+ s
truct snd_gus_card
*gus;
unsigned long flags;
unsigned long flags;
- gus = s
nd_magic_cast(snd_gus_card_t, substream->rmidi->private_data, return)
;
+ gus = s
ubstream->rmidi->private_data
;
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (up) {
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (up) {
@@
-184,14
+184,14
@@
static void snd_gf1_uart_input_trigger(snd_rawmidi_substream_t * substream, int
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
}
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
}
-static void snd_gf1_uart_output_trigger(s
nd_rawmidi_substream_t *
substream, int up)
+static void snd_gf1_uart_output_trigger(s
truct snd_rawmidi_substream *
substream, int up)
{
unsigned long flags;
{
unsigned long flags;
- s
nd_gus_card_t
*gus;
+ s
truct snd_gus_card
*gus;
char byte;
int timeout;
char byte;
int timeout;
- gus = s
nd_magic_cast(snd_gus_card_t, substream->rmidi->private_data, return)
;
+ gus = s
ubstream->rmidi->private_data
;
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (up) {
spin_lock_irqsave(&gus->uart_cmd_lock, flags);
if (up) {
@@
-222,23
+222,23
@@
static void snd_gf1_uart_output_trigger(snd_rawmidi_substream_t * substream, int
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
}
spin_unlock_irqrestore(&gus->uart_cmd_lock, flags);
}
-static s
nd_rawmidi_ops_t
snd_gf1_uart_output =
+static s
truct snd_rawmidi_ops
snd_gf1_uart_output =
{
.open = snd_gf1_uart_output_open,
.close = snd_gf1_uart_output_close,
.trigger = snd_gf1_uart_output_trigger,
};
{
.open = snd_gf1_uart_output_open,
.close = snd_gf1_uart_output_close,
.trigger = snd_gf1_uart_output_trigger,
};
-static s
nd_rawmidi_ops_t
snd_gf1_uart_input =
+static s
truct snd_rawmidi_ops
snd_gf1_uart_input =
{
.open = snd_gf1_uart_input_open,
.close = snd_gf1_uart_input_close,
.trigger = snd_gf1_uart_input_trigger,
};
{
.open = snd_gf1_uart_input_open,
.close = snd_gf1_uart_input_close,
.trigger = snd_gf1_uart_input_trigger,
};
-int snd_gf1_rawmidi_new(s
nd_gus_card_t * gus, int device, snd_rawmidi_t
** rrawmidi)
+int snd_gf1_rawmidi_new(s
truct snd_gus_card * gus, int device, struct snd_rawmidi
** rrawmidi)
{
{
- s
nd_rawmidi_t
*rmidi;
+ s
truct snd_rawmidi
*rmidi;
int err;
if (rrawmidi)
int err;
if (rrawmidi)