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_irq.c
diff --git
a/sound/isa/gus/gus_irq.c
b/sound/isa/gus/gus_irq.c
index
1e2a15e
..
c19ba29
100644
(file)
--- a/
sound/isa/gus/gus_irq.c
+++ b/
sound/isa/gus/gus_irq.c
@@
-32,7
+32,7
@@
irqreturn_t snd_gus_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
irqreturn_t snd_gus_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{
- s
nd_gus_card_t
* gus = dev_id;
+ s
truct snd_gus_card
* gus = dev_id;
unsigned char status;
int loop = 100;
int handled = 0;
unsigned char status;
int loop = 100;
int handled = 0;
@@
-54,7
+54,7
@@
__again:
if (status & (0x20 | 0x40)) {
unsigned int already, _current_;
unsigned char voice_status, voice;
if (status & (0x20 | 0x40)) {
unsigned int already, _current_;
unsigned char voice_status, voice;
- s
nd_gus_voice_t
*pvoice;
+ s
truct snd_gus_voice
*pvoice;
already = 0;
while (((voice_status = snd_gf1_i_read8(gus, SNDRV_GF1_GB_VOICES_IRQ)) & 0xc0) != 0xc0) {
already = 0;
while (((voice_status = snd_gf1_i_read8(gus, SNDRV_GF1_GB_VOICES_IRQ)) & 0xc0) != 0xc0) {
@@
-107,11
+107,11
@@
__again:
}
#ifdef CONFIG_SND_DEBUG
}
#ifdef CONFIG_SND_DEBUG
-static void snd_gus_irq_info_read(s
nd_info_entry_t
*entry,
- s
nd_info_buffer_t *
buffer)
+static void snd_gus_irq_info_read(s
truct snd_info_entry
*entry,
+ s
truct snd_info_buffer *
buffer)
{
{
- s
nd_gus_card_t
*gus;
- s
nd_gus_voice_t
*pvoice;
+ s
truct snd_gus_card
*gus;
+ s
truct snd_gus_voice
*pvoice;
int idx;
gus = entry->private_data;
int idx;
gus = entry->private_data;
@@
-131,9
+131,9
@@
static void snd_gus_irq_info_read(snd_info_entry_t *entry,
}
}
}
}
-void snd_gus_irq_profile_init(s
nd_gus_card_t
*gus)
+void snd_gus_irq_profile_init(s
truct snd_gus_card
*gus)
{
{
- s
nd_info_entry_t
*entry;
+ s
truct snd_info_entry
*entry;
if (! snd_card_proc_new(gus->card, "gusirq", &entry))
snd_info_set_text_ops(entry, gus, 1024, snd_gus_irq_info_read);
if (! snd_card_proc_new(gus->card, "gusirq", &entry))
snd_info_set_text_ops(entry, gus, 1024, snd_gus_irq_info_read);