aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pcmcia/pdaudiocf/pdaudiocf.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf.h')
-rw-r--r--sound/pcmcia/pdaudiocf/pdaudiocf.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.h b/sound/pcmcia/pdaudiocf/pdaudiocf.h
index c7a9628256ee..ad8f32eedce5 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.h
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.h
@@ -83,8 +83,8 @@
83#define PDAUDIOCF_STAT_IS_CONFIGURED (1<<1) 83#define PDAUDIOCF_STAT_IS_CONFIGURED (1<<1)
84#define PDAUDIOCF_STAT_IS_SUSPENDED (1<<2) 84#define PDAUDIOCF_STAT_IS_SUSPENDED (1<<2)
85 85
86typedef struct { 86struct snd_pdacf {
87 snd_card_t *card; 87 struct snd_card *card;
88 int index; 88 int index;
89 89
90 unsigned long port; 90 unsigned long port;
@@ -96,12 +96,12 @@ typedef struct {
96 struct tasklet_struct tq; 96 struct tasklet_struct tq;
97 97
98 spinlock_t ak4117_lock; 98 spinlock_t ak4117_lock;
99 ak4117_t *ak4117; 99 struct ak4117 *ak4117;
100 100
101 unsigned int chip_status; 101 unsigned int chip_status;
102 102
103 snd_pcm_t *pcm; 103 struct snd_pcm *pcm;
104 snd_pcm_substream_t *pcm_substream; 104 struct snd_pcm_substream *pcm_substream;
105 unsigned int pcm_running: 1; 105 unsigned int pcm_running: 1;
106 unsigned int pcm_channels; 106 unsigned int pcm_channels;
107 unsigned int pcm_swab; 107 unsigned int pcm_swab;
@@ -118,28 +118,28 @@ typedef struct {
118 /* pcmcia stuff */ 118 /* pcmcia stuff */
119 dev_link_t link; 119 dev_link_t link;
120 dev_node_t node; 120 dev_node_t node;
121} pdacf_t; 121};
122 122
123static inline void pdacf_reg_write(pdacf_t *chip, unsigned char reg, unsigned short val) 123static inline void pdacf_reg_write(struct snd_pdacf *chip, unsigned char reg, unsigned short val)
124{ 124{
125 outw(chip->regmap[reg>>1] = val, chip->port + reg); 125 outw(chip->regmap[reg>>1] = val, chip->port + reg);
126} 126}
127 127
128static inline unsigned short pdacf_reg_read(pdacf_t *chip, unsigned char reg) 128static inline unsigned short pdacf_reg_read(struct snd_pdacf *chip, unsigned char reg)
129{ 129{
130 return inw(chip->port + reg); 130 return inw(chip->port + reg);
131} 131}
132 132
133pdacf_t *snd_pdacf_create(snd_card_t *card); 133struct snd_pdacf *snd_pdacf_create(struct snd_card *card);
134int snd_pdacf_ak4117_create(pdacf_t *pdacf); 134int snd_pdacf_ak4117_create(struct snd_pdacf *pdacf);
135void snd_pdacf_powerdown(pdacf_t *chip); 135void snd_pdacf_powerdown(struct snd_pdacf *chip);
136#ifdef CONFIG_PM 136#ifdef CONFIG_PM
137int snd_pdacf_suspend(snd_card_t *card, pm_message_t state); 137int snd_pdacf_suspend(struct snd_card *card, pm_message_t state);
138int snd_pdacf_resume(snd_card_t *card); 138int snd_pdacf_resume(struct snd_card *card);
139#endif 139#endif
140int snd_pdacf_pcm_new(pdacf_t *chip); 140int snd_pdacf_pcm_new(struct snd_pdacf *chip);
141irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs); 141irqreturn_t pdacf_interrupt(int irq, void *dev, struct pt_regs *regs);
142void pdacf_tasklet(unsigned long private_data); 142void pdacf_tasklet(unsigned long private_data);
143void pdacf_reinit(pdacf_t *chip, int resume); 143void pdacf_reinit(struct snd_pdacf *chip, int resume);
144 144
145#endif /* __PDAUDIOCF_H */ 145#endif /* __PDAUDIOCF_H */