Skip to content

Commit

Permalink
[ALSA] Remove xxx_t typedefs: ISA GUS
Browse files Browse the repository at this point in the history 
Remove xxx_t typedefs from the ISA GUS drivers.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jan 3, 2006
1 parent 029d64b commit 5e2da20
Show file tree
Hide file tree
Showing 22 changed files with 658 additions and 647 deletions.
317 changes: 158 additions & 159 deletions include/sound/gus.h
View file

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions sound/isa/gus/gus_dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <sound/core.h>
#include <sound/gus.h>

static void snd_gf1_dma_ack(snd_gus_card_t * gus)
static void snd_gf1_dma_ack(struct snd_gus_card * gus)
{
unsigned long flags;

Expand All @@ -35,7 +35,7 @@ static void snd_gf1_dma_ack(snd_gus_card_t * gus)
spin_unlock_irqrestore(&gus->reg_lock, flags);
}

static void snd_gf1_dma_program(snd_gus_card_t * gus,
static void snd_gf1_dma_program(struct snd_gus_card * gus,
unsigned int addr,
unsigned long buf_addr,
unsigned int count,
Expand Down Expand Up @@ -91,9 +91,9 @@ static void snd_gf1_dma_program(snd_gus_card_t * gus,
spin_unlock_irqrestore(&gus->reg_lock, flags);
}

static snd_gf1_dma_block_t *snd_gf1_dma_next_block(snd_gus_card_t * gus)
static struct snd_gf1_dma_block *snd_gf1_dma_next_block(struct snd_gus_card * gus)
{
snd_gf1_dma_block_t *block;
struct snd_gf1_dma_block *block;

/* PCM block have bigger priority than synthesizer one */
if (gus->gf1.dma_data_pcm) {
Expand Down Expand Up @@ -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(snd_gus_card_t * gus)
static void snd_gf1_dma_interrupt(struct snd_gus_card * gus)
{
snd_gf1_dma_block_t *block;
struct snd_gf1_dma_block *block;

snd_gf1_dma_ack(gus);
if (gus->gf1.dma_ack)
Expand All @@ -147,7 +147,7 @@ static void snd_gf1_dma_interrupt(snd_gus_card_t * gus)
#endif
}

int snd_gf1_dma_init(snd_gus_card_t * gus)
int snd_gf1_dma_init(struct snd_gus_card * gus)
{
down(&gus->dma_mutex);
gus->gf1.dma_shared++;
Expand All @@ -164,9 +164,9 @@ int snd_gf1_dma_init(snd_gus_card_t * gus)
return 0;
}

int snd_gf1_dma_done(snd_gus_card_t * gus)
int snd_gf1_dma_done(struct snd_gus_card * gus)
{
snd_gf1_dma_block_t *block;
struct snd_gf1_dma_block *block;

down(&gus->dma_mutex);
gus->gf1.dma_shared--;
Expand All @@ -189,13 +189,13 @@ int snd_gf1_dma_done(snd_gus_card_t * gus)
return 0;
}

int snd_gf1_dma_transfer_block(snd_gus_card_t * gus,
snd_gf1_dma_block_t * __block,
int snd_gf1_dma_transfer_block(struct snd_gus_card * gus,
struct snd_gf1_dma_block * __block,
int atomic,
int synth)
{
unsigned long flags;
snd_gf1_dma_block_t *block;
struct snd_gf1_dma_block *block;

block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);
if (block == NULL) {
Expand Down
8 changes: 4 additions & 4 deletions sound/isa/gus/gus_dram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include <sound/info.h>


static int snd_gus_dram_poke(snd_gus_card_t *gus, char __user *_buffer,
static int snd_gus_dram_poke(struct snd_gus_card *gus, char __user *_buffer,
unsigned int address, unsigned int size)
{
unsigned long flags;
Expand Down Expand Up @@ -57,13 +57,13 @@ static int snd_gus_dram_poke(snd_gus_card_t *gus, char __user *_buffer,
}


int snd_gus_dram_write(snd_gus_card_t *gus, char __user *buffer,
int snd_gus_dram_write(struct snd_gus_card *gus, char __user *buffer,
unsigned int address, unsigned int size)
{
return snd_gus_dram_poke(gus, buffer, address, size);
}

static int snd_gus_dram_peek(snd_gus_card_t *gus, char __user *_buffer,
static int snd_gus_dram_peek(struct snd_gus_card *gus, char __user *_buffer,
unsigned int address, unsigned int size,
int rom)
{
Expand Down Expand Up @@ -95,7 +95,7 @@ static int snd_gus_dram_peek(snd_gus_card_t *gus, char __user *_buffer,
return 0;
}

int snd_gus_dram_read(snd_gus_card_t *gus, char __user *buffer,
int snd_gus_dram_read(struct snd_gus_card *gus, char __user *buffer,
unsigned int address, unsigned int size,
int rom)
{
Expand Down
42 changes: 21 additions & 21 deletions sound/isa/gus/gus_instr.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
*
*/

int snd_gus_iwffff_put_sample(void *private_data, iwffff_wave_t *wave,
int snd_gus_iwffff_put_sample(void *private_data, struct iwffff_wave *wave,
char __user *data, long len, int atomic)
{
snd_gus_card_t *gus = private_data;
snd_gf1_mem_block_t *block;
struct snd_gus_card *gus = private_data;
struct snd_gf1_mem_block *block;
int err;

if (wave->format & IWFFFF_WAVE_ROM)
Expand All @@ -58,19 +58,19 @@ int snd_gus_iwffff_put_sample(void *private_data, iwffff_wave_t *wave,
return 0;
}

int snd_gus_iwffff_get_sample(void *private_data, iwffff_wave_t *wave,
int snd_gus_iwffff_get_sample(void *private_data, struct iwffff_wave *wave,
char __user *data, long len, int atomic)
{
snd_gus_card_t *gus = private_data;
struct snd_gus_card *gus = private_data;

return snd_gus_dram_read(gus, data, wave->address.memory, wave->size,
wave->format & IWFFFF_WAVE_ROM ? 1 : 0);
}

int snd_gus_iwffff_remove_sample(void *private_data, iwffff_wave_t *wave,
int snd_gus_iwffff_remove_sample(void *private_data, struct iwffff_wave *wave,
int atomic)
{
snd_gus_card_t *gus = private_data;
struct snd_gus_card *gus = private_data;

if (wave->format & IWFFFF_WAVE_ROM)
return 0; /* it's probably ok - verify the address? */
Expand All @@ -81,11 +81,11 @@ int snd_gus_iwffff_remove_sample(void *private_data, iwffff_wave_t *wave,
*
*/

int snd_gus_gf1_put_sample(void *private_data, gf1_wave_t *wave,
int snd_gus_gf1_put_sample(void *private_data, struct gf1_wave *wave,
char __user *data, long len, int atomic)
{
snd_gus_card_t *gus = private_data;
snd_gf1_mem_block_t *block;
struct snd_gus_card *gus = private_data;
struct snd_gf1_mem_block *block;
int err;

if (wave->format & GF1_WAVE_STEREO)
Expand All @@ -109,18 +109,18 @@ int snd_gus_gf1_put_sample(void *private_data, gf1_wave_t *wave,
return 0;
}

int snd_gus_gf1_get_sample(void *private_data, gf1_wave_t *wave,
int snd_gus_gf1_get_sample(void *private_data, struct gf1_wave *wave,
char __user *data, long len, int atomic)
{
snd_gus_card_t *gus = private_data;
struct snd_gus_card *gus = private_data;

return snd_gus_dram_read(gus, data, wave->address.memory, wave->size, 0);
}

int snd_gus_gf1_remove_sample(void *private_data, gf1_wave_t *wave,
int snd_gus_gf1_remove_sample(void *private_data, struct gf1_wave *wave,
int atomic)
{
snd_gus_card_t *gus = private_data;
struct snd_gus_card *gus = private_data;

return snd_gf1_mem_free(&gus->gf1.mem_alloc, wave->address.memory);
}
Expand All @@ -129,11 +129,11 @@ int snd_gus_gf1_remove_sample(void *private_data, gf1_wave_t *wave,
*
*/

int snd_gus_simple_put_sample(void *private_data, simple_instrument_t *instr,
int snd_gus_simple_put_sample(void *private_data, struct simple_instrument *instr,
char __user *data, long len, int atomic)
{
snd_gus_card_t *gus = private_data;
snd_gf1_mem_block_t *block;
struct snd_gus_card *gus = private_data;
struct snd_gf1_mem_block *block;
int err;

if (instr->format & SIMPLE_WAVE_STEREO)
Expand All @@ -156,18 +156,18 @@ int snd_gus_simple_put_sample(void *private_data, simple_instrument_t *instr,
return 0;
}

int snd_gus_simple_get_sample(void *private_data, simple_instrument_t *instr,
int snd_gus_simple_get_sample(void *private_data, struct simple_instrument *instr,
char __user *data, long len, int atomic)
{
snd_gus_card_t *gus = private_data;
struct snd_gus_card *gus = private_data;

return snd_gus_dram_read(gus, data, instr->address.memory, instr->size, 0);
}

int snd_gus_simple_remove_sample(void *private_data, simple_instrument_t *instr,
int snd_gus_simple_remove_sample(void *private_data, struct simple_instrument *instr,
int atomic)
{
snd_gus_card_t *gus = private_data;
struct snd_gus_card *gus = private_data;

return snd_gf1_mem_free(&gus->gf1.mem_alloc, instr->address.memory);
}
Loading

0 comments on commit 5e2da20

Please sign in to comment.