Skip to content

Commit

Permalink
[ALSA] Remove xxx_t typedefs: ISA ES1688
Browse files Browse the repository at this point in the history
Modules: ES1688 driver

Remove xxx_t typedefs from the ISA ES1688 driver.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai authored and Jaroslav Kysela committed Jan 3, 2006
1 parent ba2375a commit d3a7e47
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 92 deletions.
22 changes: 10 additions & 12 deletions include/sound/es1688.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#define ES1688_HW_688 0x0001
#define ES1688_HW_1688 0x0002

struct _snd_es1688 {
struct snd_es1688 {
unsigned long port; /* port of ESS chip */
struct resource *res_port;
unsigned long mpu_port; /* MPU-401 port of ESS chip */
Expand All @@ -44,17 +44,15 @@ struct _snd_es1688 {
unsigned char pad;
unsigned int dma_size;

snd_card_t *card;
snd_pcm_t *pcm;
snd_pcm_substream_t *playback_substream;
snd_pcm_substream_t *capture_substream;
struct snd_card *card;
struct snd_pcm *pcm;
struct snd_pcm_substream *playback_substream;
struct snd_pcm_substream *capture_substream;

spinlock_t reg_lock;
spinlock_t mixer_lock;
};

typedef struct _snd_es1688 es1688_t;

/* I/O ports */

#define ES1688P(codec, x) ((codec)->port + e_s_s_ESS1688##x)
Expand Down Expand Up @@ -107,17 +105,17 @@ typedef struct _snd_es1688 es1688_t;
*/

void snd_es1688_mixer_write(es1688_t *chip, unsigned char reg, unsigned char data);
void snd_es1688_mixer_write(struct snd_es1688 *chip, unsigned char reg, unsigned char data);

int snd_es1688_create(snd_card_t * card,
int snd_es1688_create(struct snd_card *card,
unsigned long port,
unsigned long mpu_port,
int irq,
int mpu_irq,
int dma8,
unsigned short hardware,
es1688_t ** rchip);
int snd_es1688_pcm(es1688_t *chip, int device, snd_pcm_t ** rpcm);
int snd_es1688_mixer(es1688_t *chip);
struct snd_es1688 ** rchip);
int snd_es1688_pcm(struct snd_es1688 *chip, int device, struct snd_pcm ** rpcm);
int snd_es1688_mixer(struct snd_es1688 *chip);

#endif /* __SOUND_ES1688_H */
10 changes: 5 additions & 5 deletions sound/isa/es1688/es1688.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for ESx688 driver.");
module_param_array(dma8, int, NULL, 0444);
MODULE_PARM_DESC(dma8, "8-bit DMA # for ESx688 driver.");

static snd_card_t *snd_audiodrive_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;
static struct snd_card *snd_audiodrive_cards[SNDRV_CARDS] = SNDRV_DEFAULT_PTR;

#define PFX "es1688: "

Expand All @@ -77,10 +77,10 @@ static int __init snd_audiodrive_probe(int dev)
static int possible_irqs[] = {5, 9, 10, 7, -1};
static int possible_dmas[] = {1, 3, 0, -1};
int xirq, xdma, xmpu_irq;
snd_card_t *card;
es1688_t *chip;
opl3_t *opl3;
snd_pcm_t *pcm;
struct snd_card *card;
struct snd_es1688 *chip;
struct snd_opl3 *opl3;
struct snd_pcm *pcm;
int err;

card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
Expand Down
Loading

0 comments on commit d3a7e47

Please sign in to comment.