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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
sound
/
isa
/
gus
/
gus_dma.c
diff --git
a/sound/isa/gus/gus_dma.c
b/sound/isa/gus/gus_dma.c
index
de4b56d
..
44ee5d3
100644
(file)
--- a/
sound/isa/gus/gus_dma.c
+++ b/
sound/isa/gus/gus_dma.c
@@
-25,7
+25,7
@@
#include <sound/core.h>
#include <sound/gus.h>
#include <sound/core.h>
#include <sound/gus.h>
-static void snd_gf1_dma_ack(s
nd_gus_card_t
* gus)
+static void snd_gf1_dma_ack(s
truct snd_gus_card
* gus)
{
unsigned long flags;
{
unsigned long flags;
@@
-35,7
+35,7
@@
static void snd_gf1_dma_ack(snd_gus_card_t * gus)
spin_unlock_irqrestore(&gus->reg_lock, flags);
}
spin_unlock_irqrestore(&gus->reg_lock, flags);
}
-static void snd_gf1_dma_program(s
nd_gus_card_t
* gus,
+static void snd_gf1_dma_program(s
truct snd_gus_card
* gus,
unsigned int addr,
unsigned long buf_addr,
unsigned int count,
unsigned int addr,
unsigned long buf_addr,
unsigned int count,
@@
-91,9
+91,9
@@
static void snd_gf1_dma_program(snd_gus_card_t * gus,
spin_unlock_irqrestore(&gus->reg_lock, flags);
}
spin_unlock_irqrestore(&gus->reg_lock, flags);
}
-static s
nd_gf1_dma_block_t *snd_gf1_dma_next_block(snd_gus_card_t
* gus)
+static s
truct snd_gf1_dma_block *snd_gf1_dma_next_block(struct snd_gus_card
* gus)
{
{
- s
nd_gf1_dma_block_t
*block;
+ s
truct snd_gf1_dma_block
*block;
/* PCM block have bigger priority than synthesizer one */
if (gus->gf1.dma_data_pcm) {
/* PCM block have bigger priority than synthesizer one */
if (gus->gf1.dma_data_pcm) {
@@
-123,9
+123,9
@@
static snd_gf1_dma_block_t *snd_gf1_dma_next_block(snd_gus_card_t * gus)
}
}
-static void snd_gf1_dma_interrupt(s
nd_gus_card_t
* gus)
+static void snd_gf1_dma_interrupt(s
truct snd_gus_card
* gus)
{
{
- s
nd_gf1_dma_block_t
*block;
+ s
truct snd_gf1_dma_block
*block;
snd_gf1_dma_ack(gus);
if (gus->gf1.dma_ack)
snd_gf1_dma_ack(gus);
if (gus->gf1.dma_ack)
@@
-147,12
+147,12
@@
static void snd_gf1_dma_interrupt(snd_gus_card_t * gus)
#endif
}
#endif
}
-int snd_gf1_dma_init(s
nd_gus_card_t
* gus)
+int snd_gf1_dma_init(s
truct snd_gus_card
* gus)
{
{
-
down
(&gus->dma_mutex);
+
mutex_lock
(&gus->dma_mutex);
gus->gf1.dma_shared++;
if (gus->gf1.dma_shared > 1) {
gus->gf1.dma_shared++;
if (gus->gf1.dma_shared > 1) {
-
up
(&gus->dma_mutex);
+
mutex_unlock
(&gus->dma_mutex);
return 0;
}
gus->gf1.interrupt_handler_dma_write = snd_gf1_dma_interrupt;
return 0;
}
gus->gf1.interrupt_handler_dma_write = snd_gf1_dma_interrupt;
@@
-160,15
+160,15
@@
int snd_gf1_dma_init(snd_gus_card_t * gus)
gus->gf1.dma_data_pcm_last =
gus->gf1.dma_data_synth =
gus->gf1.dma_data_synth_last = NULL;
gus->gf1.dma_data_pcm_last =
gus->gf1.dma_data_synth =
gus->gf1.dma_data_synth_last = NULL;
-
up
(&gus->dma_mutex);
+
mutex_unlock
(&gus->dma_mutex);
return 0;
}
return 0;
}
-int snd_gf1_dma_done(s
nd_gus_card_t
* gus)
+int snd_gf1_dma_done(s
truct snd_gus_card
* gus)
{
{
- s
nd_gf1_dma_block_t
*block;
+ s
truct snd_gf1_dma_block
*block;
-
down
(&gus->dma_mutex);
+
mutex_lock
(&gus->dma_mutex);
gus->gf1.dma_shared--;
if (!gus->gf1.dma_shared) {
snd_dma_disable(gus->gf1.dma1);
gus->gf1.dma_shared--;
if (!gus->gf1.dma_shared) {
snd_dma_disable(gus->gf1.dma1);
@@
-185,21
+185,21
@@
int snd_gf1_dma_done(snd_gus_card_t * gus)
gus->gf1.dma_data_pcm_last =
gus->gf1.dma_data_synth_last = NULL;
}
gus->gf1.dma_data_pcm_last =
gus->gf1.dma_data_synth_last = NULL;
}
-
up
(&gus->dma_mutex);
+
mutex_unlock
(&gus->dma_mutex);
return 0;
}
return 0;
}
-int snd_gf1_dma_transfer_block(s
nd_gus_card_t
* gus,
- s
nd_gf1_dma_block_t
* __block,
+int snd_gf1_dma_transfer_block(s
truct snd_gus_card
* gus,
+ s
truct snd_gf1_dma_block
* __block,
int atomic,
int synth)
{
unsigned long flags;
int atomic,
int synth)
{
unsigned long flags;
- s
nd_gf1_dma_block_t
*block;
+ s
truct snd_gf1_dma_block
*block;
block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);
if (block == NULL) {
block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);
if (block == NULL) {
- snd_printk("gf1: DMA transfer failure; not enough memory\n");
+ snd_printk(
KERN_ERR
"gf1: DMA transfer failure; not enough memory\n");
return -ENOMEM;
}
*block = *__block;
return -ENOMEM;
}
*block = *__block;