Skip to content

cloud-kernel
cloud-kernel

openanolis / cloud-kernel
1 年多 前同步成功

通知 160
Star 36
Fork 7
cloud-kernel
cloud-kernel
提交 10754f53 编写于 作者: T Takashi Iwai 提交者： Jaroslav Kysela
浏览文件
操作

[ALSA] Remove xxx_t typedefs: PCI NM256 

Modules: NM256 driver

Remove xxx_t typedefs from the PCI NM256 driver.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 67b48b88
隐藏空白更改
内联 并排
Showing with 127 addition and 123 deletion
sound/pci/nm256/nm256.c
浏览文件 @ 10754f53
...@@ -183,17 +183,10 @@ module_param(enable, bool, 0444); ...@@ -183,17 +183,10 @@ module_param(enable, bool, 0444);
#define NM_PBUFFER_WMARK (NM_PLAYBACK_REG_OFFSET + 0xc) #define NM_PBUFFER_WMARK (NM_PLAYBACK_REG_OFFSET + 0xc)
#define NM_PBUFFER_CURRP (NM_PLAYBACK_REG_OFFSET + 0x8) #define NM_PBUFFER_CURRP (NM_PLAYBACK_REG_OFFSET + 0x8)
/* struct nm256_stream {
* type definitions
*/
typedef struct snd_nm256 nm256_t;
typedef struct snd_nm256_stream nm256_stream_t;
struct snd_nm256_stream {
nm256_t *chip; struct nm256 *chip;
snd_pcm_substream_t *substream; struct snd_pcm_substream *substream;
int running; int running;
int suspended; int suspended;
...@@ -210,9 +203,9 @@ struct snd_nm256_stream { ...@@ -210,9 +203,9 @@ struct snd_nm256_stream {
}; };
struct snd_nm256 { struct nm256 {
snd_card_t *card; struct snd_card *card;
void __iomem *cport; /* control port */ void __iomem *cport; /* control port */
struct resource *res_cport; /* its resource */ struct resource *res_cport; /* its resource */
...@@ -244,11 +237,11 @@ struct snd_nm256 { ...@@ -244,11 +237,11 @@ struct snd_nm256 {
int badintrcount; /* counter to check bogus interrupts */ int badintrcount; /* counter to check bogus interrupts */
struct semaphore irq_mutex; struct semaphore irq_mutex;
nm256_stream_t streams[2]; struct nm256_stream streams[2];
ac97_t *ac97; struct snd_ac97 *ac97;
snd_pcm_t *pcm; struct snd_pcm *pcm;
struct pci_dev *pci; struct pci_dev *pci;
...@@ -281,48 +274,49 @@ MODULE_DEVICE_TABLE(pci, snd_nm256_ids); ...@@ -281,48 +274,49 @@ MODULE_DEVICE_TABLE(pci, snd_nm256_ids);
*/ */
static inline u8 static inline u8
snd_nm256_readb(nm256_t *chip, int offset) snd_nm256_readb(struct nm256 *chip, int offset)
{ {
return readb(chip->cport + offset); return readb(chip->cport + offset);
} }
static inline u16 static inline u16
snd_nm256_readw(nm256_t *chip, int offset) snd_nm256_readw(struct nm256 *chip, int offset)
{ {
return readw(chip->cport + offset); return readw(chip->cport + offset);
} }
static inline u32 static inline u32
snd_nm256_readl(nm256_t *chip, int offset) snd_nm256_readl(struct nm256 *chip, int offset)
{ {
return readl(chip->cport + offset); return readl(chip->cport + offset);
} }
static inline void static inline void
snd_nm256_writeb(nm256_t *chip, int offset, u8 val) snd_nm256_writeb(struct nm256 *chip, int offset, u8 val)
{ {
writeb(val, chip->cport + offset); writeb(val, chip->cport + offset);
} }
static inline void static inline void
snd_nm256_writew(nm256_t *chip, int offset, u16 val) snd_nm256_writew(struct nm256 *chip, int offset, u16 val)
{ {
writew(val, chip->cport + offset); writew(val, chip->cport + offset);
} }
static inline void static inline void
snd_nm256_writel(nm256_t *chip, int offset, u32 val) snd_nm256_writel(struct nm256 *chip, int offset, u32 val)
{ {
writel(val, chip->cport + offset); writel(val, chip->cport + offset);
} }
static inline void static inline void
snd_nm256_write_buffer(nm256_t *chip, void *src, int offset, int size) snd_nm256_write_buffer(struct nm256 *chip, void *src, int offset, int size)
{ {
offset -= chip->buffer_start; offset -= chip->buffer_start;
#ifdef CONFIG_SND_DEBUG #ifdef CONFIG_SND_DEBUG
if (offset < 0 || offset >= chip->buffer_size) { if (offset < 0 || offset >= chip->buffer_size) {
snd_printk(KERN_ERR "write_buffer invalid offset = %d size = %d\n", offset, size); snd_printk(KERN_ERR "write_buffer invalid offset = %d size = %d\n",
offset, size);
return; return;
} }
#endif #endif
...@@ -343,7 +337,7 @@ snd_nm256_get_start_offset(int which) ...@@ -343,7 +337,7 @@ snd_nm256_get_start_offset(int which)
} }
static void static void
snd_nm256_load_one_coefficient(nm256_t *chip, int stream, u32 port, int which) snd_nm256_load_one_coefficient(struct nm256 *chip, int stream, u32 port, int which)
{ {
u32 coeff_buf = chip->coeff_buf[stream]; u32 coeff_buf = chip->coeff_buf[stream];
u16 offset = snd_nm256_get_start_offset(which); u16 offset = snd_nm256_get_start_offset(which);
...@@ -358,13 +352,15 @@ snd_nm256_load_one_coefficient(nm256_t *chip, int stream, u32 port, int which) ...@@ -358,13 +352,15 @@ snd_nm256_load_one_coefficient(nm256_t *chip, int stream, u32 port, int which)
} }
static void static void
snd_nm256_load_coefficient(nm256_t *chip, int stream, int number) snd_nm256_load_coefficient(struct nm256 *chip, int stream, int number)
{ {
/* The enable register for the specified engine. */ /* The enable register for the specified engine. */
u32 poffset = (stream == SNDRV_PCM_STREAM_CAPTURE ? NM_RECORD_ENABLE_REG : NM_PLAYBACK_ENABLE_REG); u32 poffset = (stream == SNDRV_PCM_STREAM_CAPTURE ?
NM_RECORD_ENABLE_REG : NM_PLAYBACK_ENABLE_REG);
u32 addr = NM_COEFF_START_OFFSET; u32 addr = NM_COEFF_START_OFFSET;
addr += (stream == SNDRV_PCM_STREAM_CAPTURE ? NM_RECORD_REG_OFFSET : NM_PLAYBACK_REG_OFFSET); addr += (stream == SNDRV_PCM_STREAM_CAPTURE ?
NM_RECORD_REG_OFFSET : NM_PLAYBACK_REG_OFFSET);
if (snd_nm256_readb(chip, poffset) & 1) { if (snd_nm256_readb(chip, poffset) & 1) {
snd_printd("NM256: Engine was enabled while loading coefficients!\n"); snd_printd("NM256: Engine was enabled while loading coefficients!\n");
...@@ -400,7 +396,7 @@ snd_nm256_load_coefficient(nm256_t *chip, int stream, int number) ...@@ -400,7 +396,7 @@ snd_nm256_load_coefficient(nm256_t *chip, int stream, int number)
static unsigned int samplerates[8] = { static unsigned int samplerates[8] = {
8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000, 8000, 11025, 16000, 22050, 24000, 32000, 44100, 48000,
}; };
static snd_pcm_hw_constraint_list_t constraints_rates = { static struct snd_pcm_hw_constraint_list constraints_rates = {
.count = ARRAY_SIZE(samplerates), .count = ARRAY_SIZE(samplerates),
.list = samplerates, .list = samplerates,
.mask = 0, .mask = 0,
...@@ -425,9 +421,10 @@ snd_nm256_fixed_rate(unsigned int rate) ...@@ -425,9 +421,10 @@ snd_nm256_fixed_rate(unsigned int rate)
* set sample rate and format * set sample rate and format
*/ */
static void static void
snd_nm256_set_format(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *substream) snd_nm256_set_format(struct nm256 *chip, struct nm256_stream *s,
struct snd_pcm_substream *substream)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
int rate_index = snd_nm256_fixed_rate(runtime->rate); int rate_index = snd_nm256_fixed_rate(runtime->rate);
unsigned char ratebits = (rate_index << 4) & NM_RATE_MASK; unsigned char ratebits = (rate_index << 4) & NM_RATE_MASK;
...@@ -460,12 +457,12 @@ snd_nm256_set_format(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *subs ...@@ -460,12 +457,12 @@ snd_nm256_set_format(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *subs
} }
/* acquire interrupt */ /* acquire interrupt */
static int snd_nm256_acquire_irq(nm256_t *chip) static int snd_nm256_acquire_irq(struct nm256 *chip)
{ {
down(&chip->irq_mutex); down(&chip->irq_mutex);
if (chip->irq < 0) { if (chip->irq < 0) {
if (request_irq(chip->pci->irq, chip->interrupt, SA_INTERRUPT|SA_SHIRQ, if (request_irq(chip->pci->irq, chip->interrupt, SA_INTERRUPT|SA_SHIRQ,
chip->card->driver, (void*)chip)) { chip->card->driver, chip)) {
snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq); snd_printk(KERN_ERR "unable to grab IRQ %d\n", chip->pci->irq);
up(&chip->irq_mutex); up(&chip->irq_mutex);
return -EBUSY; return -EBUSY;
...@@ -478,13 +475,13 @@ static int snd_nm256_acquire_irq(nm256_t *chip) ...@@ -478,13 +475,13 @@ static int snd_nm256_acquire_irq(nm256_t *chip)
} }
/* release interrupt */ /* release interrupt */
static void snd_nm256_release_irq(nm256_t *chip) static void snd_nm256_release_irq(struct nm256 *chip)
{ {
down(&chip->irq_mutex); down(&chip->irq_mutex);
if (chip->irq_acks > 0) if (chip->irq_acks > 0)
chip->irq_acks--; chip->irq_acks--;
if (chip->irq_acks == 0 && chip->irq >= 0) { if (chip->irq_acks == 0 && chip->irq >= 0) {
free_irq(chip->irq, (void*)chip); free_irq(chip->irq, chip);
chip->irq = -1; chip->irq = -1;
} }
up(&chip->irq_mutex); up(&chip->irq_mutex);
...@@ -495,7 +492,7 @@ static void snd_nm256_release_irq(nm256_t *chip) ...@@ -495,7 +492,7 @@ static void snd_nm256_release_irq(nm256_t *chip)
*/ */
/* update the watermark (current period) */ /* update the watermark (current period) */
static void snd_nm256_pcm_mark(nm256_t *chip, nm256_stream_t *s, int reg) static void snd_nm256_pcm_mark(struct nm256 *chip, struct nm256_stream *s, int reg)
{ {
s->cur_period++; s->cur_period++;
s->cur_period %= s->periods; s->cur_period %= s->periods;
...@@ -506,7 +503,8 @@ static void snd_nm256_pcm_mark(nm256_t *chip, nm256_stream_t *s, int reg) ...@@ -506,7 +503,8 @@ static void snd_nm256_pcm_mark(nm256_t *chip, nm256_stream_t *s, int reg)
#define snd_nm256_capture_mark(chip, s) snd_nm256_pcm_mark(chip, s, NM_RBUFFER_WMARK) #define snd_nm256_capture_mark(chip, s) snd_nm256_pcm_mark(chip, s, NM_RBUFFER_WMARK)
static void static void
snd_nm256_playback_start(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *substream) snd_nm256_playback_start(struct nm256 *chip, struct nm256_stream *s,
struct snd_pcm_substream *substream)
{ {
/* program buffer pointers */ /* program buffer pointers */
snd_nm256_writel(chip, NM_PBUFFER_START, s->buf); snd_nm256_writel(chip, NM_PBUFFER_START, s->buf);
...@@ -522,7 +520,8 @@ snd_nm256_playback_start(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t * ...@@ -522,7 +520,8 @@ snd_nm256_playback_start(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *
} }
static void static void
snd_nm256_capture_start(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *substream) snd_nm256_capture_start(struct nm256 *chip, struct nm256_stream *s,
struct snd_pcm_substream *substream)
{ {
/* program buffer pointers */ /* program buffer pointers */
snd_nm256_writel(chip, NM_RBUFFER_START, s->buf); snd_nm256_writel(chip, NM_RBUFFER_START, s->buf);
...@@ -537,7 +536,7 @@ snd_nm256_capture_start(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *s ...@@ -537,7 +536,7 @@ snd_nm256_capture_start(nm256_t *chip, nm256_stream_t *s, snd_pcm_substream_t *s
/* Stop the play engine. */ /* Stop the play engine. */
static void static void
snd_nm256_playback_stop(nm256_t *chip) snd_nm256_playback_stop(struct nm256 *chip)
{ {
/* Shut off sound from both channels. */ /* Shut off sound from both channels. */
snd_nm256_writew(chip, NM_AUDIO_MUTE_REG, snd_nm256_writew(chip, NM_AUDIO_MUTE_REG,
...@@ -547,17 +546,17 @@ snd_nm256_playback_stop(nm256_t *chip) ...@@ -547,17 +546,17 @@ snd_nm256_playback_stop(nm256_t *chip)
} }
static void static void
snd_nm256_capture_stop(nm256_t *chip) snd_nm256_capture_stop(struct nm256 *chip)
{ {
/* Disable recording engine. */ /* Disable recording engine. */
snd_nm256_writeb(chip, NM_RECORD_ENABLE_REG, 0); snd_nm256_writeb(chip, NM_RECORD_ENABLE_REG, 0);
} }
static int static int
snd_nm256_playback_trigger(snd_pcm_substream_t *substream, int cmd) snd_nm256_playback_trigger(struct snd_pcm_substream *substream, int cmd)
{ {
nm256_t *chip = snd_pcm_substream_chip(substream); struct nm256 *chip = snd_pcm_substream_chip(substream);
nm256_stream_t *s = (nm256_stream_t*)substream->runtime->private_data; struct nm256_stream *s = substream->runtime->private_data;
int err = 0; int err = 0;
snd_assert(s != NULL, return -ENXIO); snd_assert(s != NULL, return -ENXIO);
...@@ -591,10 +590,10 @@ snd_nm256_playback_trigger(snd_pcm_substream_t *substream, int cmd) ...@@ -591,10 +590,10 @@ snd_nm256_playback_trigger(snd_pcm_substream_t *substream, int cmd)
} }
static int static int
snd_nm256_capture_trigger(snd_pcm_substream_t *substream, int cmd) snd_nm256_capture_trigger(struct snd_pcm_substream *substream, int cmd)
{ {
nm256_t *chip = snd_pcm_substream_chip(substream); struct nm256 *chip = snd_pcm_substream_chip(substream);
nm256_stream_t *s = (nm256_stream_t*)substream->runtime->private_data; struct nm256_stream *s = substream->runtime->private_data;
int err = 0; int err = 0;
snd_assert(s != NULL, return -ENXIO); snd_assert(s != NULL, return -ENXIO);
...@@ -627,11 +626,11 @@ snd_nm256_capture_trigger(snd_pcm_substream_t *substream, int cmd) ...@@ -627,11 +626,11 @@ snd_nm256_capture_trigger(snd_pcm_substream_t *substream, int cmd)
/* /*
* prepare playback/capture channel * prepare playback/capture channel
*/ */
static int snd_nm256_pcm_prepare(snd_pcm_substream_t *substream) static int snd_nm256_pcm_prepare(struct snd_pcm_substream *substream)
{ {
nm256_t *chip = snd_pcm_substream_chip(substream); struct nm256 *chip = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
nm256_stream_t *s = (nm256_stream_t*)runtime->private_data; struct nm256_stream *s = runtime->private_data;
snd_assert(s, return -ENXIO); snd_assert(s, return -ENXIO);
s->dma_size = frames_to_bytes(runtime, substream->runtime->buffer_size); s->dma_size = frames_to_bytes(runtime, substream->runtime->buffer_size);
...@@ -652,10 +651,10 @@ static int snd_nm256_pcm_prepare(snd_pcm_substream_t *substream) ...@@ -652,10 +651,10 @@ static int snd_nm256_pcm_prepare(snd_pcm_substream_t *substream)
* get the current pointer * get the current pointer
*/ */
static snd_pcm_uframes_t static snd_pcm_uframes_t
snd_nm256_playback_pointer(snd_pcm_substream_t * substream) snd_nm256_playback_pointer(struct snd_pcm_substream *substream)
{ {
nm256_t *chip = snd_pcm_substream_chip(substream); struct nm256 *chip = snd_pcm_substream_chip(substream);
nm256_stream_t *s = (nm256_stream_t*)substream->runtime->private_data; struct nm256_stream *s = substream->runtime->private_data;
unsigned long curp; unsigned long curp;
snd_assert(s, return 0); snd_assert(s, return 0);
...@@ -665,10 +664,10 @@ snd_nm256_playback_pointer(snd_pcm_substream_t * substream) ...@@ -665,10 +664,10 @@ snd_nm256_playback_pointer(snd_pcm_substream_t * substream)
} }
static snd_pcm_uframes_t static snd_pcm_uframes_t
snd_nm256_capture_pointer(snd_pcm_substream_t * substream) snd_nm256_capture_pointer(struct snd_pcm_substream *substream)
{ {
nm256_t *chip = snd_pcm_substream_chip(substream); struct nm256 *chip = snd_pcm_substream_chip(substream);
nm256_stream_t *s = (nm256_stream_t*)substream->runtime->private_data; struct nm256_stream *s = substream->runtime->private_data;
unsigned long curp; unsigned long curp;
snd_assert(s != NULL, return 0); snd_assert(s != NULL, return 0);
...@@ -684,13 +683,13 @@ snd_nm256_capture_pointer(snd_pcm_substream_t * substream) ...@@ -684,13 +683,13 @@ snd_nm256_capture_pointer(snd_pcm_substream_t * substream)
* silence / copy for playback * silence / copy for playback
*/ */
static int static int
snd_nm256_playback_silence(snd_pcm_substream_t *substream, snd_nm256_playback_silence(struct snd_pcm_substream *substream,
int channel, /* not used (interleaved data) */ int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos, snd_pcm_uframes_t pos,
snd_pcm_uframes_t count) snd_pcm_uframes_t count)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
nm256_stream_t *s = (nm256_stream_t*)runtime->private_data; struct nm256_stream *s = runtime->private_data;
count = frames_to_bytes(runtime, count); count = frames_to_bytes(runtime, count);
pos = frames_to_bytes(runtime, pos); pos = frames_to_bytes(runtime, pos);
memset_io(s->bufptr + pos, 0, count); memset_io(s->bufptr + pos, 0, count);
...@@ -698,14 +697,14 @@ snd_nm256_playback_silence(snd_pcm_substream_t *substream, ...@@ -698,14 +697,14 @@ snd_nm256_playback_silence(snd_pcm_substream_t *substream,
} }
static int static int
snd_nm256_playback_copy(snd_pcm_substream_t *substream, snd_nm256_playback_copy(struct snd_pcm_substream *substream,
int channel, /* not used (interleaved data) */ int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos, snd_pcm_uframes_t pos,
void __user *src, void __user *src,
snd_pcm_uframes_t count) snd_pcm_uframes_t count)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
nm256_stream_t *s = (nm256_stream_t*)runtime->private_data; struct nm256_stream *s = runtime->private_data;
count = frames_to_bytes(runtime, count); count = frames_to_bytes(runtime, count);
pos = frames_to_bytes(runtime, pos); pos = frames_to_bytes(runtime, pos);
if (copy_from_user_toio(s->bufptr + pos, src, count)) if (copy_from_user_toio(s->bufptr + pos, src, count))
...@@ -717,14 +716,14 @@ snd_nm256_playback_copy(snd_pcm_substream_t *substream, ...@@ -717,14 +716,14 @@ snd_nm256_playback_copy(snd_pcm_substream_t *substream,
* copy to user * copy to user
*/ */
static int static int
snd_nm256_capture_copy(snd_pcm_substream_t *substream, snd_nm256_capture_copy(struct snd_pcm_substream *substream,
int channel, /* not used (interleaved data) */ int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos, snd_pcm_uframes_t pos,
void __user *dst, void __user *dst,
snd_pcm_uframes_t count) snd_pcm_uframes_t count)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
nm256_stream_t *s = (nm256_stream_t*)runtime->private_data; struct nm256_stream *s = runtime->private_data;
count = frames_to_bytes(runtime, count); count = frames_to_bytes(runtime, count);
pos = frames_to_bytes(runtime, pos); pos = frames_to_bytes(runtime, pos);
if (copy_to_user_fromio(dst, s->bufptr + pos, count)) if (copy_to_user_fromio(dst, s->bufptr + pos, count))
...@@ -741,9 +740,9 @@ snd_nm256_capture_copy(snd_pcm_substream_t *substream, ...@@ -741,9 +740,9 @@ snd_nm256_capture_copy(snd_pcm_substream_t *substream,
/* spinlock held! */ /* spinlock held! */
static void static void
snd_nm256_playback_update(nm256_t *chip) snd_nm256_playback_update(struct nm256 *chip)
{ {
nm256_stream_t *s; struct nm256_stream *s;
s = &chip->streams[SNDRV_PCM_STREAM_PLAYBACK]; s = &chip->streams[SNDRV_PCM_STREAM_PLAYBACK];
if (s->running && s->substream) { if (s->running && s->substream) {
...@@ -756,9 +755,9 @@ snd_nm256_playback_update(nm256_t *chip) ...@@ -756,9 +755,9 @@ snd_nm256_playback_update(nm256_t *chip)
/* spinlock held! */ /* spinlock held! */
static void static void
snd_nm256_capture_update(nm256_t *chip) snd_nm256_capture_update(struct nm256 *chip)
{ {
nm256_stream_t *s; struct nm256_stream *s;
s = &chip->streams[SNDRV_PCM_STREAM_CAPTURE]; s = &chip->streams[SNDRV_PCM_STREAM_CAPTURE];
if (s->running && s->substream) { if (s->running && s->substream) {
...@@ -772,7 +771,7 @@ snd_nm256_capture_update(nm256_t *chip) ...@@ -772,7 +771,7 @@ snd_nm256_capture_update(nm256_t *chip)
/* /*
* hardware info * hardware info
*/ */
static snd_pcm_hardware_t snd_nm256_playback = static struct snd_pcm_hardware snd_nm256_playback =
{ {
.info = SNDRV_PCM_INFO_MMAP_IOMEM |SNDRV_PCM_INFO_MMAP_VALID | .info = SNDRV_PCM_INFO_MMAP_IOMEM |SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_INTERLEAVED |
...@@ -791,7 +790,7 @@ static snd_pcm_hardware_t snd_nm256_playback = ...@@ -791,7 +790,7 @@ static snd_pcm_hardware_t snd_nm256_playback =
.period_bytes_max = 128 * 1024, .period_bytes_max = 128 * 1024,
}; };
static snd_pcm_hardware_t snd_nm256_capture = static struct snd_pcm_hardware snd_nm256_capture =
{ {
.info = SNDRV_PCM_INFO_MMAP_IOMEM | SNDRV_PCM_INFO_MMAP_VALID | .info = SNDRV_PCM_INFO_MMAP_IOMEM | SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_INTERLEAVED |
...@@ -812,7 +811,8 @@ static snd_pcm_hardware_t snd_nm256_capture = ...@@ -812,7 +811,8 @@ static snd_pcm_hardware_t snd_nm256_capture =
/* set dma transfer size */ /* set dma transfer size */
static int snd_nm256_pcm_hw_params(snd_pcm_substream_t *substream, snd_pcm_hw_params_t *hw_params) static int snd_nm256_pcm_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *hw_params)
{ {
/* area and addr are already set and unchanged */ /* area and addr are already set and unchanged */
substream->runtime->dma_bytes = params_buffer_bytes(hw_params); substream->runtime->dma_bytes = params_buffer_bytes(hw_params);
...@@ -822,11 +822,11 @@ static int snd_nm256_pcm_hw_params(snd_pcm_substream_t *substream, snd_pcm_hw_pa ...@@ -822,11 +822,11 @@ static int snd_nm256_pcm_hw_params(snd_pcm_substream_t *substream, snd_pcm_hw_pa
/* /*
* open * open
*/ */
static void snd_nm256_setup_stream(nm256_t *chip, nm256_stream_t *s, static void snd_nm256_setup_stream(struct nm256 *chip, struct nm256_stream *s,
snd_pcm_substream_t *substream, struct snd_pcm_substream *substream,
snd_pcm_hardware_t *hw_ptr) struct snd_pcm_hardware *hw_ptr)
{ {
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
s->running = 0; s->running = 0;
runtime->hw = *hw_ptr; runtime->hw = *hw_ptr;
...@@ -844,9 +844,9 @@ static void snd_nm256_setup_stream(nm256_t *chip, nm256_stream_t *s, ...@@ -844,9 +844,9 @@ static void snd_nm256_setup_stream(nm256_t *chip, nm256_stream_t *s,
} }
static int static int
snd_nm256_playback_open(snd_pcm_substream_t *substream) snd_nm256_playback_open(struct snd_pcm_substream *substream)
{ {
nm256_t *chip = snd_pcm_substream_chip(substream); struct nm256 *chip = snd_pcm_substream_chip(substream);
if (snd_nm256_acquire_irq(chip) < 0) if (snd_nm256_acquire_irq(chip) < 0)
return -EBUSY; return -EBUSY;
...@@ -856,9 +856,9 @@ snd_nm256_playback_open(snd_pcm_substream_t *substream) ...@@ -856,9 +856,9 @@ snd_nm256_playback_open(snd_pcm_substream_t *substream)
} }
static int static int
snd_nm256_capture_open(snd_pcm_substream_t *substream) snd_nm256_capture_open(struct snd_pcm_substream *substream)
{ {
nm256_t *chip = snd_pcm_substream_chip(substream); struct nm256 *chip = snd_pcm_substream_chip(substream);
if (snd_nm256_acquire_irq(chip) < 0) if (snd_nm256_acquire_irq(chip) < 0)
return -EBUSY; return -EBUSY;
...@@ -871,9 +871,9 @@ snd_nm256_capture_open(snd_pcm_substream_t *substream) ...@@ -871,9 +871,9 @@ snd_nm256_capture_open(snd_pcm_substream_t *substream)
* close - we don't have to do special.. * close - we don't have to do special..
*/ */
static int static int
snd_nm256_playback_close(snd_pcm_substream_t *substream) snd_nm256_playback_close(struct snd_pcm_substream *substream)
{ {
nm256_t *chip = snd_pcm_substream_chip(substream); struct nm256 *chip = snd_pcm_substream_chip(substream);
snd_nm256_release_irq(chip); snd_nm256_release_irq(chip);
return 0; return 0;
...@@ -881,9 +881,9 @@ snd_nm256_playback_close(snd_pcm_substream_t *substream) ...@@ -881,9 +881,9 @@ snd_nm256_playback_close(snd_pcm_substream_t *substream)
static int static int
snd_nm256_capture_close(snd_pcm_substream_t *substream) snd_nm256_capture_close(struct snd_pcm_substream *substream)
{ {
nm256_t *chip = snd_pcm_substream_chip(substream); struct nm256 *chip = snd_pcm_substream_chip(substream);
snd_nm256_release_irq(chip); snd_nm256_release_irq(chip);
return 0; return 0;
...@@ -892,7 +892,7 @@ snd_nm256_capture_close(snd_pcm_substream_t *substream) ...@@ -892,7 +892,7 @@ snd_nm256_capture_close(snd_pcm_substream_t *substream)
/* /*
* create a pcm instance * create a pcm instance
*/ */
static snd_pcm_ops_t snd_nm256_playback_ops = { static struct snd_pcm_ops snd_nm256_playback_ops = {
.open = snd_nm256_playback_open, .open = snd_nm256_playback_open,
.close = snd_nm256_playback_close, .close = snd_nm256_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -907,7 +907,7 @@ static snd_pcm_ops_t snd_nm256_playback_ops = { ...@@ -907,7 +907,7 @@ static snd_pcm_ops_t snd_nm256_playback_ops = {
.mmap = snd_pcm_lib_mmap_iomem, .mmap = snd_pcm_lib_mmap_iomem,
}; };
static snd_pcm_ops_t snd_nm256_capture_ops = { static struct snd_pcm_ops snd_nm256_capture_ops = {
.open = snd_nm256_capture_open, .open = snd_nm256_capture_open,
.close = snd_nm256_capture_close, .close = snd_nm256_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -922,13 +922,13 @@ static snd_pcm_ops_t snd_nm256_capture_ops = { ...@@ -922,13 +922,13 @@ static snd_pcm_ops_t snd_nm256_capture_ops = {
}; };
static int __devinit static int __devinit
snd_nm256_pcm(nm256_t *chip, int device) snd_nm256_pcm(struct nm256 *chip, int device)
{ {
snd_pcm_t *pcm; struct snd_pcm *pcm;
int i, err; int i, err;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
nm256_stream_t *s = &chip->streams[i]; struct nm256_stream *s = &chip->streams[i];
s->bufptr = chip->buffer + (s->buf - chip->buffer_start); s->bufptr = chip->buffer + (s->buf - chip->buffer_start);
s->bufptr_addr = chip->buffer_addr + (s->buf - chip->buffer_start); s->bufptr_addr = chip->buffer_addr + (s->buf - chip->buffer_start);
} }
...@@ -953,7 +953,7 @@ snd_nm256_pcm(nm256_t *chip, int device) ...@@ -953,7 +953,7 @@ snd_nm256_pcm(nm256_t *chip, int device)
* Initialize the hardware. * Initialize the hardware.
*/ */
static void static void
snd_nm256_init_chip(nm256_t *chip) snd_nm256_init_chip(struct nm256 *chip)
{ {
/* Reset everything. */ /* Reset everything. */
snd_nm256_writeb(chip, 0x0, 0x11); snd_nm256_writeb(chip, 0x0, 0x11);
...@@ -965,7 +965,7 @@ snd_nm256_init_chip(nm256_t *chip) ...@@ -965,7 +965,7 @@ snd_nm256_init_chip(nm256_t *chip)
static irqreturn_t static irqreturn_t
snd_nm256_intr_check(nm256_t *chip) snd_nm256_intr_check(struct nm256 *chip)
{ {
if (chip->badintrcount++ > 1000) { if (chip->badintrcount++ > 1000) {
/* /*
...@@ -1002,7 +1002,7 @@ snd_nm256_intr_check(nm256_t *chip) ...@@ -1002,7 +1002,7 @@ snd_nm256_intr_check(nm256_t *chip)
static irqreturn_t static irqreturn_t
snd_nm256_interrupt(int irq, void *dev_id, struct pt_regs *dummy) snd_nm256_interrupt(int irq, void *dev_id, struct pt_regs *dummy)
{ {
nm256_t *chip = dev_id; struct nm256 *chip = dev_id;
u16 status; u16 status;
u8 cbyte; u8 cbyte;
...@@ -1067,7 +1067,7 @@ snd_nm256_interrupt(int irq, void *dev_id, struct pt_regs *dummy) ...@@ -1067,7 +1067,7 @@ snd_nm256_interrupt(int irq, void *dev_id, struct pt_regs *dummy)
static irqreturn_t static irqreturn_t
snd_nm256_interrupt_zx(int irq, void *dev_id, struct pt_regs *dummy) snd_nm256_interrupt_zx(int irq, void *dev_id, struct pt_regs *dummy)
{ {
nm256_t *chip = dev_id; struct nm256 *chip = dev_id;
u32 status; u32 status;
u8 cbyte; u8 cbyte;
...@@ -1131,7 +1131,7 @@ snd_nm256_interrupt_zx(int irq, void *dev_id, struct pt_regs *dummy) ...@@ -1131,7 +1131,7 @@ snd_nm256_interrupt_zx(int irq, void *dev_id, struct pt_regs *dummy)
* if it timed out. * if it timed out.
*/ */
static int static int
snd_nm256_ac97_ready(nm256_t *chip) snd_nm256_ac97_ready(struct nm256 *chip)
{ {
int timeout = 10; int timeout = 10;
u32 testaddr; u32 testaddr;
...@@ -1154,9 +1154,9 @@ snd_nm256_ac97_ready(nm256_t *chip) ...@@ -1154,9 +1154,9 @@ snd_nm256_ac97_ready(nm256_t *chip)
/* /*
*/ */
static unsigned short static unsigned short
snd_nm256_ac97_read(ac97_t *ac97, unsigned short reg) snd_nm256_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
{ {
nm256_t *chip = ac97->private_data; struct nm256 *chip = ac97->private_data;
int res; int res;
if (reg >= 128) if (reg >= 128)
...@@ -1173,10 +1173,10 @@ snd_nm256_ac97_read(ac97_t *ac97, unsigned short reg) ...@@ -1173,10 +1173,10 @@ snd_nm256_ac97_read(ac97_t *ac97, unsigned short reg)
/* /*
*/ */
static void static void
snd_nm256_ac97_write(ac97_t *ac97, snd_nm256_ac97_write(struct snd_ac97 *ac97,
unsigned short reg, unsigned short val) unsigned short reg, unsigned short val)
{ {
nm256_t *chip = ac97->private_data; struct nm256 *chip = ac97->private_data;
int tries = 2; int tries = 2;
u32 base; u32 base;
...@@ -1196,9 +1196,9 @@ snd_nm256_ac97_write(ac97_t *ac97, ...@@ -1196,9 +1196,9 @@ snd_nm256_ac97_write(ac97_t *ac97,
/* initialize the ac97 into a known state */ /* initialize the ac97 into a known state */
static void static void
snd_nm256_ac97_reset(ac97_t *ac97) snd_nm256_ac97_reset(struct snd_ac97 *ac97)
{ {
nm256_t *chip = ac97->private_data; struct nm256 *chip = ac97->private_data;
/* Reset the mixer. 'Tis magic! */ /* Reset the mixer. 'Tis magic! */
snd_nm256_writeb(chip, 0x6c0, 1); snd_nm256_writeb(chip, 0x6c0, 1);
...@@ -1215,12 +1215,12 @@ snd_nm256_ac97_reset(ac97_t *ac97) ...@@ -1215,12 +1215,12 @@ snd_nm256_ac97_reset(ac97_t *ac97)
/* create an ac97 mixer interface */ /* create an ac97 mixer interface */
static int __devinit static int __devinit
snd_nm256_mixer(nm256_t *chip) snd_nm256_mixer(struct nm256 *chip)
{ {
ac97_bus_t *pbus; struct snd_ac97_bus *pbus;
ac97_template_t ac97; struct snd_ac97_template ac97;
int i, err; int i, err;
static ac97_bus_ops_t ops = { static struct snd_ac97_bus_ops ops = {
.reset = snd_nm256_ac97_reset, .reset = snd_nm256_ac97_reset,
.write = snd_nm256_ac97_write, .write = snd_nm256_ac97_write,
.read = snd_nm256_ac97_read, .read = snd_nm256_ac97_read,
...@@ -1263,7 +1263,7 @@ snd_nm256_mixer(nm256_t *chip) ...@@ -1263,7 +1263,7 @@ snd_nm256_mixer(nm256_t *chip)
*/ */
static int __devinit static int __devinit
snd_nm256_peek_for_sig(nm256_t *chip) snd_nm256_peek_for_sig(struct nm256 *chip)
{ {
/* The signature is located 1K below the end of video RAM. */ /* The signature is located 1K below the end of video RAM. */
void __iomem *temp; void __iomem *temp;
...@@ -1292,7 +1292,8 @@ snd_nm256_peek_for_sig(nm256_t *chip) ...@@ -1292,7 +1292,8 @@ snd_nm256_peek_for_sig(nm256_t *chip)
return -ENODEV; return -ENODEV;
} else { } else {
pointer_found = pointer; pointer_found = pointer;
printk(KERN_INFO "nm256: found card signature in video RAM: 0x%x\n", pointer); printk(KERN_INFO "nm256: found card signature in video RAM: 0x%x\n",
pointer);
} }
} }
...@@ -1307,9 +1308,9 @@ snd_nm256_peek_for_sig(nm256_t *chip) ...@@ -1307,9 +1308,9 @@ snd_nm256_peek_for_sig(nm256_t *chip)
* APM event handler, so the card is properly reinitialized after a power * APM event handler, so the card is properly reinitialized after a power
* event. * event.
*/ */
static int nm256_suspend(snd_card_t *card, pm_message_t state) static int nm256_suspend(struct snd_card *card, pm_message_t state)
{ {
nm256_t *chip = card->pm_private_data; struct nm256 *chip = card->pm_private_data;
snd_pcm_suspend_all(chip->pcm); snd_pcm_suspend_all(chip->pcm);
snd_ac97_suspend(chip->ac97); snd_ac97_suspend(chip->ac97);
...@@ -1318,9 +1319,9 @@ static int nm256_suspend(snd_card_t *card, pm_message_t state) ...@@ -1318,9 +1319,9 @@ static int nm256_suspend(snd_card_t *card, pm_message_t state)
return 0; return 0;
} }
static int nm256_resume(snd_card_t *card) static int nm256_resume(struct snd_card *card)
{ {
nm256_t *chip = card->pm_private_data; struct nm256 *chip = card->pm_private_data;
int i; int i;
/* Perform a full reset on the hardware */ /* Perform a full reset on the hardware */
...@@ -1331,7 +1332,7 @@ static int nm256_resume(snd_card_t *card) ...@@ -1331,7 +1332,7 @@ static int nm256_resume(snd_card_t *card)
snd_ac97_resume(chip->ac97); snd_ac97_resume(chip->ac97);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
nm256_stream_t *s = &chip->streams[i]; struct nm256_stream *s = &chip->streams[i];
if (s->substream && s->suspended) { if (s->substream && s->suspended) {
spin_lock_irq(&chip->reg_lock); spin_lock_irq(&chip->reg_lock);
snd_nm256_set_format(chip, s, s->substream); snd_nm256_set_format(chip, s, s->substream);
...@@ -1343,7 +1344,7 @@ static int nm256_resume(snd_card_t *card) ...@@ -1343,7 +1344,7 @@ static int nm256_resume(snd_card_t *card)
} }
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static int snd_nm256_free(nm256_t *chip) static int snd_nm256_free(struct nm256 *chip)
{ {
if (chip->streams[SNDRV_PCM_STREAM_PLAYBACK].running) if (chip->streams[SNDRV_PCM_STREAM_PLAYBACK].running)
snd_nm256_playback_stop(chip); snd_nm256_playback_stop(chip);
...@@ -1360,26 +1361,26 @@ static int snd_nm256_free(nm256_t *chip) ...@@ -1360,26 +1361,26 @@ static int snd_nm256_free(nm256_t *chip)
release_and_free_resource(chip->res_cport); release_and_free_resource(chip->res_cport);
release_and_free_resource(chip->res_buffer); release_and_free_resource(chip->res_buffer);
if (chip->irq >= 0) if (chip->irq >= 0)
free_irq(chip->irq, (void*)chip); free_irq(chip->irq, chip);
pci_disable_device(chip->pci); pci_disable_device(chip->pci);
kfree(chip); kfree(chip);
return 0; return 0;
} }
static int snd_nm256_dev_free(snd_device_t *device) static int snd_nm256_dev_free(struct snd_device *device)
{ {
nm256_t *chip = device->device_data; struct nm256 *chip = device->device_data;
return snd_nm256_free(chip); return snd_nm256_free(chip);
} }
static int __devinit static int __devinit
snd_nm256_create(snd_card_t *card, struct pci_dev *pci, snd_nm256_create(struct snd_card *card, struct pci_dev *pci,
nm256_t **chip_ret) struct nm256 **chip_ret)
{ {
nm256_t *chip; struct nm256 *chip;
int err, pval; int err, pval;
static snd_device_ops_t ops = { static struct snd_device_ops ops = {
.dev_free = snd_nm256_dev_free, .dev_free = snd_nm256_dev_free,
}; };
u32 addr; u32 addr;
...@@ -1439,7 +1440,8 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci, ...@@ -1439,7 +1440,8 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
if ((pval & NM_PRESENCE_MASK) != NM_PRESENCE_VALUE) { if ((pval & NM_PRESENCE_MASK) != NM_PRESENCE_VALUE) {
if (! force_ac97) { if (! force_ac97) {
printk(KERN_ERR "nm256: no ac97 is found!\n"); printk(KERN_ERR "nm256: no ac97 is found!\n");
printk(KERN_ERR " force the driver to load by passing in the module parameter\n"); printk(KERN_ERR " force the driver to load by "
"passing in the module parameter\n");
printk(KERN_ERR " force_ac97=1\n"); printk(KERN_ERR " force_ac97=1\n");
printk(KERN_ERR " or try sb16 or cs423x drivers instead.\n"); printk(KERN_ERR " or try sb16 or cs423x drivers instead.\n");
err = -ENXIO; err = -ENXIO;
...@@ -1462,7 +1464,8 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci, ...@@ -1462,7 +1464,8 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
chip->mixer_status_mask = NM2_MIXER_READY_MASK; chip->mixer_status_mask = NM2_MIXER_READY_MASK;
} }
chip->buffer_size = chip->streams[SNDRV_PCM_STREAM_PLAYBACK].bufsize + chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize; chip->buffer_size = chip->streams[SNDRV_PCM_STREAM_PLAYBACK].bufsize +
chip->streams[SNDRV_PCM_STREAM_CAPTURE].bufsize;
if (chip->use_cache) if (chip->use_cache)
chip->buffer_size += NM_TOTAL_COEFF_COUNT * 4; chip->buffer_size += NM_TOTAL_COEFF_COUNT * 4;
else else
...@@ -1561,8 +1564,8 @@ static struct nm256_quirk nm256_quirks[] __devinitdata = { ...@@ -1561,8 +1564,8 @@ static struct nm256_quirk nm256_quirks[] __devinitdata = {
static int __devinit snd_nm256_probe(struct pci_dev *pci, static int __devinit snd_nm256_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
snd_card_t *card; struct snd_card *card;
nm256_t *chip; struct nm256 *chip;
int err; int err;
struct nm256_quirk *q; struct nm256_quirk *q;
u16 subsystem_vendor, subsystem_device; u16 subsystem_vendor, subsystem_device;
...@@ -1574,7 +1577,8 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci, ...@@ -1574,7 +1577,8 @@ static int __devinit snd_nm256_probe(struct pci_dev *pci,
if (q->vendor == subsystem_vendor && q->device == subsystem_device) { if (q->vendor == subsystem_vendor && q->device == subsystem_device) {
switch (q->type) { switch (q->type) {
case NM_BLACKLISTED: case NM_BLACKLISTED:
printk(KERN_INFO "nm256: The device is blacklisted. Loading stopped\n"); printk(KERN_INFO "nm256: The device is blacklisted. "
"Loading stopped\n");
return -ENODEV; return -ENODEV;
case NM_RESET_WORKAROUND_2: case NM_RESET_WORKAROUND_2:
reset_workaround_2 = 1; reset_workaround_2 = 1;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或