diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 14:40:05 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 14:40:05 +0000 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /sound/pcmcia/pdaudiocf/pdaudiocf.h | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf.h')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h index c7a9628256e..2744f189a61 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.h +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h @@ -83,8 +83,8 @@ #define PDAUDIOCF_STAT_IS_CONFIGURED (1<<1) #define PDAUDIOCF_STAT_IS_SUSPENDED (1<<2) -typedef struct { - snd_card_t *card; +struct snd_pdacf { + struct snd_card *card; int index; unsigned long port; @@ -96,12 +96,12 @@ typedef struct { struct tasklet_struct tq; spinlock_t ak4117_lock; - ak4117_t *ak4117; + struct ak4117 *ak4117; unsigned int chip_status; - snd_pcm_t *pcm; - snd_pcm_substream_t *pcm_substream; + struct snd_pcm *pcm; + struct snd_pcm_substream *pcm_substream; unsigned int pcm_running: 1; unsigned int pcm_channels; unsigned int pcm_swab; @@ -118,28 +118,28 @@ typedef struct { /* pcmcia stuff */ dev_link_t link; dev_node_t node; -} pdacf_t; +}; -static inline void pdacf_reg_write(pdacf_t *chip, unsigned char reg, unsigned short val) +static inline void pdacf_reg_write(struct snd_pdacf *chip, unsigned char reg, unsigned short val) { outw(chip->regmap[reg>>1] = val, chip->port + reg); } -static inline unsigned short pdacf_reg_read(pdacf_t *chip, unsigned char reg) +static inline unsigned short pdacf_reg_read(struct snd_pdacf *chip, unsigned char reg) { return inw(chip->port + reg); } -pdacf_t *snd_pdacf_create(snd_card_t *card); -int snd_pdacf_ak4117_create(pdacf_t *pdacf); -void snd_pdacf_powerdown(pdacf_t *chip); +struct snd_pdacf *snd_pdacf_create(struct snd_card *card); +int snd_pdacf_ak4117_create(struct snd_pdacf *pdacf); +void snd_pdacf_powerdown(struct snd_pdacf *chip); #ifdef CONFIG_PM -int snd_pdacf_suspend(snd_card_t *card, pm_message_t state); -int snd_pdacf_resume(snd_card_t *card); +int snd_pdacf_suspend(struct snd_pdacf *chip, pm_message_t state); +int snd_pdacf_resume(struct snd_pdacf *chip); #endif -int snd_pdacf_pcm_new(pdacf_t *chip); +int snd_pdacf_pcm_new(struct snd_pdacf *chip); irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs); void pdacf_tasklet(unsigned long private_data); -void pdacf_reinit(pdacf_t *chip, int resume); +void pdacf_reinit(struct snd_pdacf *chip, int resume); #endif /* __PDAUDIOCF_H */ |