Skip to content

L
linux
Commit a3aefd88 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files
Options

[ALSA] Remove xxx_t typedefs: PCI RME96 

Modules: RME96 driver

Remove xxx_t typedefs from the PCI RME96 driver.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 017ce802
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 160 deletions
sound/pci/rme96.c
View file @ a3aefd88
...@@ -201,7 +201,7 @@ MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard."); ...@@ -201,7 +201,7 @@ MODULE_PARM_DESC(enable, "Enable RME Digi96 soundcard.");
#define RME96_AD1855_VOL_BITS 10 #define RME96_AD1855_VOL_BITS 10
typedef struct snd_rme96 { struct rme96 {
spinlock_t lock; spinlock_t lock;
int irq; int irq;
unsigned long port; unsigned long port;
...@@ -216,8 +216,8 @@ typedef struct snd_rme96 { ...@@ -216,8 +216,8 @@ typedef struct snd_rme96 {
u8 rev; /* card revision number */ u8 rev; /* card revision number */
snd_pcm_substream_t *playback_substream; struct snd_pcm_substream *playback_substream;
snd_pcm_substream_t *capture_substream; struct snd_pcm_substream *capture_substream;
int playback_frlog; /* log2 of framesize */ int playback_frlog; /* log2 of framesize */
int capture_frlog; int capture_frlog;
...@@ -225,12 +225,12 @@ typedef struct snd_rme96 { ...@@ -225,12 +225,12 @@ typedef struct snd_rme96 {
size_t playback_periodsize; /* in bytes, zero if not used */ size_t playback_periodsize; /* in bytes, zero if not used */
size_t capture_periodsize; /* in bytes, zero if not used */ size_t capture_periodsize; /* in bytes, zero if not used */
snd_card_t *card; struct snd_card *card;
snd_pcm_t *spdif_pcm; struct snd_pcm *spdif_pcm;
snd_pcm_t *adat_pcm; struct snd_pcm *adat_pcm;
struct pci_dev *pci; struct pci_dev *pci;
snd_kcontrol_t *spdif_ctl; struct snd_kcontrol *spdif_ctl;
} rme96_t; };
static struct pci_device_id snd_rme96_ids[] = { static struct pci_device_id snd_rme96_ids[] = {
{ PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96, { PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96,
...@@ -257,44 +257,44 @@ MODULE_DEVICE_TABLE(pci, snd_rme96_ids); ...@@ -257,44 +257,44 @@ MODULE_DEVICE_TABLE(pci, snd_rme96_ids);
#define RME96_185X_MAX_OUT(rme96) ((1 << (RME96_DAC_IS_1852(rme96) ? RME96_AD1852_VOL_BITS : RME96_AD1855_VOL_BITS)) - 1) #define RME96_185X_MAX_OUT(rme96) ((1 << (RME96_DAC_IS_1852(rme96) ? RME96_AD1852_VOL_BITS : RME96_AD1855_VOL_BITS)) - 1)
static int static int
snd_rme96_playback_prepare(snd_pcm_substream_t *substream); snd_rme96_playback_prepare(struct snd_pcm_substream *substream);
static int static int
snd_rme96_capture_prepare(snd_pcm_substream_t *substream); snd_rme96_capture_prepare(struct snd_pcm_substream *substream);
static int static int
snd_rme96_playback_trigger(snd_pcm_substream_t *substream, snd_rme96_playback_trigger(struct snd_pcm_substream *substream,
int cmd); int cmd);
static int static int
snd_rme96_capture_trigger(snd_pcm_substream_t *substream, snd_rme96_capture_trigger(struct snd_pcm_substream *substream,
int cmd); int cmd);
static snd_pcm_uframes_t static snd_pcm_uframes_t
snd_rme96_playback_pointer(snd_pcm_substream_t *substream); snd_rme96_playback_pointer(struct snd_pcm_substream *substream);
static snd_pcm_uframes_t static snd_pcm_uframes_t
snd_rme96_capture_pointer(snd_pcm_substream_t *substream); snd_rme96_capture_pointer(struct snd_pcm_substream *substream);
static void __devinit static void __devinit
snd_rme96_proc_init(rme96_t *rme96); snd_rme96_proc_init(struct rme96 *rme96);
static int static int
snd_rme96_create_switches(snd_card_t *card, snd_rme96_create_switches(struct snd_card *card,
rme96_t *rme96); struct rme96 *rme96);
static int static int
snd_rme96_getinputtype(rme96_t *rme96); snd_rme96_getinputtype(struct rme96 *rme96);
static inline unsigned int static inline unsigned int
snd_rme96_playback_ptr(rme96_t *rme96) snd_rme96_playback_ptr(struct rme96 *rme96)
{ {
return (readl(rme96->iobase + RME96_IO_GET_PLAY_POS) return (readl(rme96->iobase + RME96_IO_GET_PLAY_POS)
& RME96_RCR_AUDIO_ADDR_MASK) >> rme96->playback_frlog; & RME96_RCR_AUDIO_ADDR_MASK) >> rme96->playback_frlog;
} }
static inline unsigned int static inline unsigned int
snd_rme96_capture_ptr(rme96_t *rme96) snd_rme96_capture_ptr(struct rme96 *rme96)
{ {
return (readl(rme96->iobase + RME96_IO_GET_REC_POS) return (readl(rme96->iobase + RME96_IO_GET_REC_POS)
& RME96_RCR_AUDIO_ADDR_MASK) >> rme96->capture_frlog; & RME96_RCR_AUDIO_ADDR_MASK) >> rme96->capture_frlog;
...@@ -315,12 +315,12 @@ snd_rme96_ratecode(int rate) ...@@ -315,12 +315,12 @@ snd_rme96_ratecode(int rate)
} }
static int static int
snd_rme96_playback_silence(snd_pcm_substream_t *substream, snd_rme96_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)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
count <<= rme96->playback_frlog; count <<= rme96->playback_frlog;
pos <<= rme96->playback_frlog; pos <<= rme96->playback_frlog;
memset_io(rme96->iobase + RME96_IO_PLAY_BUFFER + pos, memset_io(rme96->iobase + RME96_IO_PLAY_BUFFER + pos,
...@@ -329,13 +329,13 @@ snd_rme96_playback_silence(snd_pcm_substream_t *substream, ...@@ -329,13 +329,13 @@ snd_rme96_playback_silence(snd_pcm_substream_t *substream,
} }
static int static int
snd_rme96_playback_copy(snd_pcm_substream_t *substream, snd_rme96_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)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
count <<= rme96->playback_frlog; count <<= rme96->playback_frlog;
pos <<= rme96->playback_frlog; pos <<= rme96->playback_frlog;
copy_from_user_toio(rme96->iobase + RME96_IO_PLAY_BUFFER + pos, src, copy_from_user_toio(rme96->iobase + RME96_IO_PLAY_BUFFER + pos, src,
...@@ -344,13 +344,13 @@ snd_rme96_playback_copy(snd_pcm_substream_t *substream, ...@@ -344,13 +344,13 @@ snd_rme96_playback_copy(snd_pcm_substream_t *substream,
} }
static int static int
snd_rme96_capture_copy(snd_pcm_substream_t *substream, snd_rme96_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)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
count <<= rme96->capture_frlog; count <<= rme96->capture_frlog;
pos <<= rme96->capture_frlog; pos <<= rme96->capture_frlog;
copy_to_user_fromio(dst, rme96->iobase + RME96_IO_REC_BUFFER + pos, copy_to_user_fromio(dst, rme96->iobase + RME96_IO_REC_BUFFER + pos,
...@@ -361,7 +361,7 @@ snd_rme96_capture_copy(snd_pcm_substream_t *substream, ...@@ -361,7 +361,7 @@ snd_rme96_capture_copy(snd_pcm_substream_t *substream,
/* /*
* Digital output capabilites (S/PDIF) * Digital output capabilites (S/PDIF)
*/ */
static snd_pcm_hardware_t snd_rme96_playback_spdif_info = static struct snd_pcm_hardware snd_rme96_playback_spdif_info =
{ {
.info = (SNDRV_PCM_INFO_MMAP_IOMEM | .info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_MMAP_VALID |
...@@ -390,7 +390,7 @@ static snd_pcm_hardware_t snd_rme96_playback_spdif_info = ...@@ -390,7 +390,7 @@ static snd_pcm_hardware_t snd_rme96_playback_spdif_info =
/* /*
* Digital input capabilites (S/PDIF) * Digital input capabilites (S/PDIF)
*/ */
static snd_pcm_hardware_t snd_rme96_capture_spdif_info = static struct snd_pcm_hardware snd_rme96_capture_spdif_info =
{ {
.info = (SNDRV_PCM_INFO_MMAP_IOMEM | .info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_MMAP_VALID |
...@@ -419,7 +419,7 @@ static snd_pcm_hardware_t snd_rme96_capture_spdif_info = ...@@ -419,7 +419,7 @@ static snd_pcm_hardware_t snd_rme96_capture_spdif_info =
/* /*
* Digital output capabilites (ADAT) * Digital output capabilites (ADAT)
*/ */
static snd_pcm_hardware_t snd_rme96_playback_adat_info = static struct snd_pcm_hardware snd_rme96_playback_adat_info =
{ {
.info = (SNDRV_PCM_INFO_MMAP_IOMEM | .info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_MMAP_VALID |
...@@ -444,7 +444,7 @@ static snd_pcm_hardware_t snd_rme96_playback_adat_info = ...@@ -444,7 +444,7 @@ static snd_pcm_hardware_t snd_rme96_playback_adat_info =
/* /*
* Digital input capabilites (ADAT) * Digital input capabilites (ADAT)
*/ */
static snd_pcm_hardware_t snd_rme96_capture_adat_info = static struct snd_pcm_hardware snd_rme96_capture_adat_info =
{ {
.info = (SNDRV_PCM_INFO_MMAP_IOMEM | .info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_MMAP_VALID |
...@@ -479,7 +479,7 @@ static snd_pcm_hardware_t snd_rme96_capture_adat_info = ...@@ -479,7 +479,7 @@ static snd_pcm_hardware_t snd_rme96_capture_adat_info =
* the volume. * the volume.
*/ */
static void static void
snd_rme96_write_SPI(rme96_t *rme96, u16 val) snd_rme96_write_SPI(struct rme96 *rme96, u16 val)
{ {
int i; int i;
...@@ -506,7 +506,7 @@ snd_rme96_write_SPI(rme96_t *rme96, u16 val) ...@@ -506,7 +506,7 @@ snd_rme96_write_SPI(rme96_t *rme96, u16 val)
} }
static void static void
snd_rme96_apply_dac_volume(rme96_t *rme96) snd_rme96_apply_dac_volume(struct rme96 *rme96)
{ {
if (RME96_DAC_IS_1852(rme96)) { if (RME96_DAC_IS_1852(rme96)) {
snd_rme96_write_SPI(rme96, (rme96->vol[0] << 2) | 0x0); snd_rme96_write_SPI(rme96, (rme96->vol[0] << 2) | 0x0);
...@@ -518,7 +518,7 @@ snd_rme96_apply_dac_volume(rme96_t *rme96) ...@@ -518,7 +518,7 @@ snd_rme96_apply_dac_volume(rme96_t *rme96)
} }
static void static void
snd_rme96_reset_dac(rme96_t *rme96) snd_rme96_reset_dac(struct rme96 *rme96)
{ {
writel(rme96->wcreg | RME96_WCR_PD, writel(rme96->wcreg | RME96_WCR_PD,
rme96->iobase + RME96_IO_CONTROL_REGISTER); rme96->iobase + RME96_IO_CONTROL_REGISTER);
...@@ -526,14 +526,14 @@ snd_rme96_reset_dac(rme96_t *rme96) ...@@ -526,14 +526,14 @@ snd_rme96_reset_dac(rme96_t *rme96)
} }
static int static int
snd_rme96_getmontracks(rme96_t *rme96) snd_rme96_getmontracks(struct rme96 *rme96)
{ {
return ((rme96->wcreg >> RME96_WCR_BITPOS_MONITOR_0) & 1) + return ((rme96->wcreg >> RME96_WCR_BITPOS_MONITOR_0) & 1) +
(((rme96->wcreg >> RME96_WCR_BITPOS_MONITOR_1) & 1) << 1); (((rme96->wcreg >> RME96_WCR_BITPOS_MONITOR_1) & 1) << 1);
} }
static int static int
snd_rme96_setmontracks(rme96_t *rme96, snd_rme96_setmontracks(struct rme96 *rme96,
int montracks) int montracks)
{ {
if (montracks & 1) { if (montracks & 1) {
...@@ -551,14 +551,14 @@ snd_rme96_setmontracks(rme96_t *rme96, ...@@ -551,14 +551,14 @@ snd_rme96_setmontracks(rme96_t *rme96,
} }
static int static int
snd_rme96_getattenuation(rme96_t *rme96) snd_rme96_getattenuation(struct rme96 *rme96)
{ {
return ((rme96->wcreg >> RME96_WCR_BITPOS_GAIN_0) & 1) + return ((rme96->wcreg >> RME96_WCR_BITPOS_GAIN_0) & 1) +
(((rme96->wcreg >> RME96_WCR_BITPOS_GAIN_1) & 1) << 1); (((rme96->wcreg >> RME96_WCR_BITPOS_GAIN_1) & 1) << 1);
} }
static int static int
snd_rme96_setattenuation(rme96_t *rme96, snd_rme96_setattenuation(struct rme96 *rme96,
int attenuation) int attenuation)
{ {
switch (attenuation) { switch (attenuation) {
...@@ -586,7 +586,7 @@ snd_rme96_setattenuation(rme96_t *rme96, ...@@ -586,7 +586,7 @@ snd_rme96_setattenuation(rme96_t *rme96,
} }
static int static int
snd_rme96_capture_getrate(rme96_t *rme96, snd_rme96_capture_getrate(struct rme96 *rme96,
int *is_adat) int *is_adat)
{ {
int n, rate; int n, rate;
...@@ -649,7 +649,7 @@ snd_rme96_capture_getrate(rme96_t *rme96, ...@@ -649,7 +649,7 @@ snd_rme96_capture_getrate(rme96_t *rme96,
} }
static int static int
snd_rme96_playback_getrate(rme96_t *rme96) snd_rme96_playback_getrate(struct rme96 *rme96)
{ {
int rate, dummy; int rate, dummy;
...@@ -679,7 +679,7 @@ snd_rme96_playback_getrate(rme96_t *rme96) ...@@ -679,7 +679,7 @@ snd_rme96_playback_getrate(rme96_t *rme96)
} }
static int static int
snd_rme96_playback_setrate(rme96_t *rme96, snd_rme96_playback_setrate(struct rme96 *rme96,
int rate) int rate)
{ {
int ds; int ds;
...@@ -731,7 +731,7 @@ snd_rme96_playback_setrate(rme96_t *rme96, ...@@ -731,7 +731,7 @@ snd_rme96_playback_setrate(rme96_t *rme96,
} }
static int static int
snd_rme96_capture_analog_setrate(rme96_t *rme96, snd_rme96_capture_analog_setrate(struct rme96 *rme96,
int rate) int rate)
{ {
switch (rate) { switch (rate) {
...@@ -773,7 +773,7 @@ snd_rme96_capture_analog_setrate(rme96_t *rme96, ...@@ -773,7 +773,7 @@ snd_rme96_capture_analog_setrate(rme96_t *rme96,
} }
static int static int
snd_rme96_setclockmode(rme96_t *rme96, snd_rme96_setclockmode(struct rme96 *rme96,
int mode) int mode)
{ {
switch (mode) { switch (mode) {
...@@ -801,7 +801,7 @@ snd_rme96_setclockmode(rme96_t *rme96, ...@@ -801,7 +801,7 @@ snd_rme96_setclockmode(rme96_t *rme96,
} }
static int static int
snd_rme96_getclockmode(rme96_t *rme96) snd_rme96_getclockmode(struct rme96 *rme96)
{ {
if (rme96->areg & RME96_AR_WSEL) { if (rme96->areg & RME96_AR_WSEL) {
return RME96_CLOCKMODE_WORDCLOCK; return RME96_CLOCKMODE_WORDCLOCK;
...@@ -811,7 +811,7 @@ snd_rme96_getclockmode(rme96_t *rme96) ...@@ -811,7 +811,7 @@ snd_rme96_getclockmode(rme96_t *rme96)
} }
static int static int
snd_rme96_setinputtype(rme96_t *rme96, snd_rme96_setinputtype(struct rme96 *rme96,
int type) int type)
{ {
int n; int n;
...@@ -872,7 +872,7 @@ snd_rme96_setinputtype(rme96_t *rme96, ...@@ -872,7 +872,7 @@ snd_rme96_setinputtype(rme96_t *rme96,
} }
static int static int
snd_rme96_getinputtype(rme96_t *rme96) snd_rme96_getinputtype(struct rme96 *rme96)
{ {
if (rme96->areg & RME96_AR_ANALOG) { if (rme96->areg & RME96_AR_ANALOG) {
return RME96_INPUT_ANALOG; return RME96_INPUT_ANALOG;
...@@ -882,7 +882,7 @@ snd_rme96_getinputtype(rme96_t *rme96) ...@@ -882,7 +882,7 @@ snd_rme96_getinputtype(rme96_t *rme96)
} }
static void static void
snd_rme96_setframelog(rme96_t *rme96, snd_rme96_setframelog(struct rme96 *rme96,
int n_channels, int n_channels,
int is_playback) int is_playback)
{ {
...@@ -904,7 +904,7 @@ snd_rme96_setframelog(rme96_t *rme96, ...@@ -904,7 +904,7 @@ snd_rme96_setframelog(rme96_t *rme96,
} }
static int static int
snd_rme96_playback_setformat(rme96_t *rme96, snd_rme96_playback_setformat(struct rme96 *rme96,
int format) int format)
{ {
switch (format) { switch (format) {
...@@ -922,7 +922,7 @@ snd_rme96_playback_setformat(rme96_t *rme96, ...@@ -922,7 +922,7 @@ snd_rme96_playback_setformat(rme96_t *rme96,
} }
static int static int
snd_rme96_capture_setformat(rme96_t *rme96, snd_rme96_capture_setformat(struct rme96 *rme96,
int format) int format)
{ {
switch (format) { switch (format) {
...@@ -940,7 +940,7 @@ snd_rme96_capture_setformat(rme96_t *rme96, ...@@ -940,7 +940,7 @@ snd_rme96_capture_setformat(rme96_t *rme96,
} }
static void static void
snd_rme96_set_period_properties(rme96_t *rme96, snd_rme96_set_period_properties(struct rme96 *rme96,
size_t period_bytes) size_t period_bytes)
{ {
switch (period_bytes) { switch (period_bytes) {
...@@ -959,11 +959,11 @@ snd_rme96_set_period_properties(rme96_t *rme96, ...@@ -959,11 +959,11 @@ snd_rme96_set_period_properties(rme96_t *rme96,
} }
static int static int
snd_rme96_playback_hw_params(snd_pcm_substream_t *substream, snd_rme96_playback_hw_params(struct snd_pcm_substream *substream,
snd_pcm_hw_params_t *params) struct snd_pcm_hw_params *params)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
int err, rate, dummy; int err, rate, dummy;
runtime->dma_area = (void __force *)(rme96->iobase + runtime->dma_area = (void __force *)(rme96->iobase +
...@@ -1012,11 +1012,11 @@ snd_rme96_playback_hw_params(snd_pcm_substream_t *substream, ...@@ -1012,11 +1012,11 @@ snd_rme96_playback_hw_params(snd_pcm_substream_t *substream,
} }
static int static int
snd_rme96_capture_hw_params(snd_pcm_substream_t *substream, snd_rme96_capture_hw_params(struct snd_pcm_substream *substream,
snd_pcm_hw_params_t *params) struct snd_pcm_hw_params *params)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
int err, isadat, rate; int err, isadat, rate;
runtime->dma_area = (void __force *)(rme96->iobase + runtime->dma_area = (void __force *)(rme96->iobase +
...@@ -1066,7 +1066,7 @@ snd_rme96_capture_hw_params(snd_pcm_substream_t *substream, ...@@ -1066,7 +1066,7 @@ snd_rme96_capture_hw_params(snd_pcm_substream_t *substream,
} }
static void static void
snd_rme96_playback_start(rme96_t *rme96, snd_rme96_playback_start(struct rme96 *rme96,
int from_pause) int from_pause)
{ {
if (!from_pause) { if (!from_pause) {
...@@ -1078,7 +1078,7 @@ snd_rme96_playback_start(rme96_t *rme96, ...@@ -1078,7 +1078,7 @@ snd_rme96_playback_start(rme96_t *rme96,
} }
static void static void
snd_rme96_capture_start(rme96_t *rme96, snd_rme96_capture_start(struct rme96 *rme96,
int from_pause) int from_pause)
{ {
if (!from_pause) { if (!from_pause) {
...@@ -1090,7 +1090,7 @@ snd_rme96_capture_start(rme96_t *rme96, ...@@ -1090,7 +1090,7 @@ snd_rme96_capture_start(rme96_t *rme96,
} }
static void static void
snd_rme96_playback_stop(rme96_t *rme96) snd_rme96_playback_stop(struct rme96 *rme96)
{ {
/* /*
* Check if there is an unconfirmed IRQ, if so confirm it, or else * Check if there is an unconfirmed IRQ, if so confirm it, or else
...@@ -1105,7 +1105,7 @@ snd_rme96_playback_stop(rme96_t *rme96) ...@@ -1105,7 +1105,7 @@ snd_rme96_playback_stop(rme96_t *rme96)
} }
static void static void
snd_rme96_capture_stop(rme96_t *rme96) snd_rme96_capture_stop(struct rme96 *rme96)
{ {
rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER); rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER);
if (rme96->rcreg & RME96_RCR_IRQ_2) { if (rme96->rcreg & RME96_RCR_IRQ_2) {
...@@ -1120,7 +1120,7 @@ snd_rme96_interrupt(int irq, ...@@ -1120,7 +1120,7 @@ snd_rme96_interrupt(int irq,
void *dev_id, void *dev_id,
struct pt_regs *regs) struct pt_regs *regs)
{ {
rme96_t *rme96 = (rme96_t *)dev_id; struct rme96 *rme96 = (struct rme96 *)dev_id;
rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER); rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER);
/* fastpath out, to ease interrupt sharing */ /* fastpath out, to ease interrupt sharing */
...@@ -1145,18 +1145,18 @@ snd_rme96_interrupt(int irq, ...@@ -1145,18 +1145,18 @@ snd_rme96_interrupt(int irq,
static unsigned int period_bytes[] = { RME96_SMALL_BLOCK_SIZE, RME96_LARGE_BLOCK_SIZE }; static unsigned int period_bytes[] = { RME96_SMALL_BLOCK_SIZE, RME96_LARGE_BLOCK_SIZE };
static snd_pcm_hw_constraint_list_t hw_constraints_period_bytes = { static struct snd_pcm_hw_constraint_list hw_constraints_period_bytes = {
.count = ARRAY_SIZE(period_bytes), .count = ARRAY_SIZE(period_bytes),
.list = period_bytes, .list = period_bytes,
.mask = 0 .mask = 0
}; };
static int static int
snd_rme96_playback_spdif_open(snd_pcm_substream_t *substream) snd_rme96_playback_spdif_open(struct snd_pcm_substream *substream)
{ {
int rate, dummy; int rate, dummy;
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_set_sync(substream); snd_pcm_set_sync(substream);
...@@ -1191,11 +1191,11 @@ snd_rme96_playback_spdif_open(snd_pcm_substream_t *substream) ...@@ -1191,11 +1191,11 @@ snd_rme96_playback_spdif_open(snd_pcm_substream_t *substream)
} }
static int static int
snd_rme96_capture_spdif_open(snd_pcm_substream_t *substream) snd_rme96_capture_spdif_open(struct snd_pcm_substream *substream)
{ {
int isadat, rate; int isadat, rate;
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_set_sync(substream); snd_pcm_set_sync(substream);
...@@ -1226,11 +1226,11 @@ snd_rme96_capture_spdif_open(snd_pcm_substream_t *substream) ...@@ -1226,11 +1226,11 @@ snd_rme96_capture_spdif_open(snd_pcm_substream_t *substream)
} }
static int static int
snd_rme96_playback_adat_open(snd_pcm_substream_t *substream) snd_rme96_playback_adat_open(struct snd_pcm_substream *substream)
{ {
int rate, dummy; int rate, dummy;
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_set_sync(substream); snd_pcm_set_sync(substream);
...@@ -1260,11 +1260,11 @@ snd_rme96_playback_adat_open(snd_pcm_substream_t *substream) ...@@ -1260,11 +1260,11 @@ snd_rme96_playback_adat_open(snd_pcm_substream_t *substream)
} }
static int static int
snd_rme96_capture_adat_open(snd_pcm_substream_t *substream) snd_rme96_capture_adat_open(struct snd_pcm_substream *substream)
{ {
int isadat, rate; int isadat, rate;
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
snd_pcm_runtime_t *runtime = substream->runtime; struct snd_pcm_runtime *runtime = substream->runtime;
snd_pcm_set_sync(substream); snd_pcm_set_sync(substream);
...@@ -1297,9 +1297,9 @@ snd_rme96_capture_adat_open(snd_pcm_substream_t *substream) ...@@ -1297,9 +1297,9 @@ snd_rme96_capture_adat_open(snd_pcm_substream_t *substream)
} }
static int static int
snd_rme96_playback_close(snd_pcm_substream_t *substream) snd_rme96_playback_close(struct snd_pcm_substream *substream)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
int spdif = 0; int spdif = 0;
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
...@@ -1319,9 +1319,9 @@ snd_rme96_playback_close(snd_pcm_substream_t *substream) ...@@ -1319,9 +1319,9 @@ snd_rme96_playback_close(snd_pcm_substream_t *substream)
} }
static int static int
snd_rme96_capture_close(snd_pcm_substream_t *substream) snd_rme96_capture_close(struct snd_pcm_substream *substream)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
if (RME96_ISRECORDING(rme96)) { if (RME96_ISRECORDING(rme96)) {
...@@ -1334,9 +1334,9 @@ snd_rme96_capture_close(snd_pcm_substream_t *substream) ...@@ -1334,9 +1334,9 @@ snd_rme96_capture_close(snd_pcm_substream_t *substream)
} }
static int static int
snd_rme96_playback_prepare(snd_pcm_substream_t *substream) snd_rme96_playback_prepare(struct snd_pcm_substream *substream)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
if (RME96_ISPLAYING(rme96)) { if (RME96_ISPLAYING(rme96)) {
...@@ -1348,9 +1348,9 @@ snd_rme96_playback_prepare(snd_pcm_substream_t *substream) ...@@ -1348,9 +1348,9 @@ snd_rme96_playback_prepare(snd_pcm_substream_t *substream)
} }
static int static int
snd_rme96_capture_prepare(snd_pcm_substream_t *substream) snd_rme96_capture_prepare(struct snd_pcm_substream *substream)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
if (RME96_ISRECORDING(rme96)) { if (RME96_ISRECORDING(rme96)) {
...@@ -1362,10 +1362,10 @@ snd_rme96_capture_prepare(snd_pcm_substream_t *substream) ...@@ -1362,10 +1362,10 @@ snd_rme96_capture_prepare(snd_pcm_substream_t *substream)
} }
static int static int
snd_rme96_playback_trigger(snd_pcm_substream_t *substream, snd_rme96_playback_trigger(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
...@@ -1405,10 +1405,10 @@ snd_rme96_playback_trigger(snd_pcm_substream_t *substream, ...@@ -1405,10 +1405,10 @@ snd_rme96_playback_trigger(snd_pcm_substream_t *substream,
} }
static int static int
snd_rme96_capture_trigger(snd_pcm_substream_t *substream, snd_rme96_capture_trigger(struct snd_pcm_substream *substream,
int cmd) int cmd)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
switch (cmd) { switch (cmd) {
case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_START:
...@@ -1449,20 +1449,20 @@ snd_rme96_capture_trigger(snd_pcm_substream_t *substream, ...@@ -1449,20 +1449,20 @@ snd_rme96_capture_trigger(snd_pcm_substream_t *substream,
} }
static snd_pcm_uframes_t static snd_pcm_uframes_t
snd_rme96_playback_pointer(snd_pcm_substream_t *substream) snd_rme96_playback_pointer(struct snd_pcm_substream *substream)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
return snd_rme96_playback_ptr(rme96); return snd_rme96_playback_ptr(rme96);
} }
static snd_pcm_uframes_t static snd_pcm_uframes_t
snd_rme96_capture_pointer(snd_pcm_substream_t *substream) snd_rme96_capture_pointer(struct snd_pcm_substream *substream)
{ {
rme96_t *rme96 = snd_pcm_substream_chip(substream); struct rme96 *rme96 = snd_pcm_substream_chip(substream);
return snd_rme96_capture_ptr(rme96); return snd_rme96_capture_ptr(rme96);
} }
static snd_pcm_ops_t snd_rme96_playback_spdif_ops = { static struct snd_pcm_ops snd_rme96_playback_spdif_ops = {
.open = snd_rme96_playback_spdif_open, .open = snd_rme96_playback_spdif_open,
.close = snd_rme96_playback_close, .close = snd_rme96_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -1475,7 +1475,7 @@ static snd_pcm_ops_t snd_rme96_playback_spdif_ops = { ...@@ -1475,7 +1475,7 @@ static snd_pcm_ops_t snd_rme96_playback_spdif_ops = {
.mmap = snd_pcm_lib_mmap_iomem, .mmap = snd_pcm_lib_mmap_iomem,
}; };
static snd_pcm_ops_t snd_rme96_capture_spdif_ops = { static struct snd_pcm_ops snd_rme96_capture_spdif_ops = {
.open = snd_rme96_capture_spdif_open, .open = snd_rme96_capture_spdif_open,
.close = snd_rme96_capture_close, .close = snd_rme96_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -1487,7 +1487,7 @@ static snd_pcm_ops_t snd_rme96_capture_spdif_ops = { ...@@ -1487,7 +1487,7 @@ static snd_pcm_ops_t snd_rme96_capture_spdif_ops = {
.mmap = snd_pcm_lib_mmap_iomem, .mmap = snd_pcm_lib_mmap_iomem,
}; };
static snd_pcm_ops_t snd_rme96_playback_adat_ops = { static struct snd_pcm_ops snd_rme96_playback_adat_ops = {
.open = snd_rme96_playback_adat_open, .open = snd_rme96_playback_adat_open,
.close = snd_rme96_playback_close, .close = snd_rme96_playback_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -1500,7 +1500,7 @@ static snd_pcm_ops_t snd_rme96_playback_adat_ops = { ...@@ -1500,7 +1500,7 @@ static snd_pcm_ops_t snd_rme96_playback_adat_ops = {
.mmap = snd_pcm_lib_mmap_iomem, .mmap = snd_pcm_lib_mmap_iomem,
}; };
static snd_pcm_ops_t snd_rme96_capture_adat_ops = { static struct snd_pcm_ops snd_rme96_capture_adat_ops = {
.open = snd_rme96_capture_adat_open, .open = snd_rme96_capture_adat_open,
.close = snd_rme96_capture_close, .close = snd_rme96_capture_close,
.ioctl = snd_pcm_lib_ioctl, .ioctl = snd_pcm_lib_ioctl,
...@@ -1515,7 +1515,7 @@ static snd_pcm_ops_t snd_rme96_capture_adat_ops = { ...@@ -1515,7 +1515,7 @@ static snd_pcm_ops_t snd_rme96_capture_adat_ops = {
static void static void
snd_rme96_free(void *private_data) snd_rme96_free(void *private_data)
{ {
rme96_t *rme96 = (rme96_t *)private_data; struct rme96 *rme96 = (struct rme96 *)private_data;
if (rme96 == NULL) { if (rme96 == NULL) {
return; return;
...@@ -1540,21 +1540,21 @@ snd_rme96_free(void *private_data) ...@@ -1540,21 +1540,21 @@ snd_rme96_free(void *private_data)
} }
static void static void
snd_rme96_free_spdif_pcm(snd_pcm_t *pcm) snd_rme96_free_spdif_pcm(struct snd_pcm *pcm)
{ {
rme96_t *rme96 = (rme96_t *) pcm->private_data; struct rme96 *rme96 = (struct rme96 *) pcm->private_data;
rme96->spdif_pcm = NULL; rme96->spdif_pcm = NULL;
} }
static void static void
snd_rme96_free_adat_pcm(snd_pcm_t *pcm) snd_rme96_free_adat_pcm(struct snd_pcm *pcm)
{ {
rme96_t *rme96 = (rme96_t *) pcm->private_data; struct rme96 *rme96 = (struct rme96 *) pcm->private_data;
rme96->adat_pcm = NULL; rme96->adat_pcm = NULL;
} }
static int __devinit static int __devinit
snd_rme96_create(rme96_t *rme96) snd_rme96_create(struct rme96 *rme96)
{ {
struct pci_dev *pci = rme96->pci; struct pci_dev *pci = rme96->pci;
int err; int err;
...@@ -1671,10 +1671,10 @@ snd_rme96_create(rme96_t *rme96) ...@@ -1671,10 +1671,10 @@ snd_rme96_create(rme96_t *rme96)
*/ */
static void static void
snd_rme96_proc_read(snd_info_entry_t *entry, snd_info_buffer_t *buffer) snd_rme96_proc_read(struct snd_info_entry *entry, struct snd_info_buffer *buffer)
{ {
int n; int n;
rme96_t *rme96 = (rme96_t *)entry->private_data; struct rme96 *rme96 = (struct rme96 *)entry->private_data;
rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER); rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER);
...@@ -1800,9 +1800,9 @@ snd_rme96_proc_read(snd_info_entry_t *entry, snd_info_buffer_t *buffer) ...@@ -1800,9 +1800,9 @@ snd_rme96_proc_read(snd_info_entry_t *entry, snd_info_buffer_t *buffer)
} }
static void __devinit static void __devinit
snd_rme96_proc_init(rme96_t *rme96) snd_rme96_proc_init(struct rme96 *rme96)
{ {
snd_info_entry_t *entry; struct snd_info_entry *entry;
if (! snd_card_proc_new(rme96->card, "rme96", &entry)) if (! snd_card_proc_new(rme96->card, "rme96", &entry))
snd_info_set_text_ops(entry, rme96, 1024, snd_rme96_proc_read); snd_info_set_text_ops(entry, rme96, 1024, snd_rme96_proc_read);
...@@ -1813,7 +1813,7 @@ snd_rme96_proc_init(rme96_t *rme96) ...@@ -1813,7 +1813,7 @@ snd_rme96_proc_init(rme96_t *rme96)
*/ */
static int static int
snd_rme96_info_loopback_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) snd_rme96_info_loopback_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1; uinfo->count = 1;
...@@ -1822,9 +1822,9 @@ snd_rme96_info_loopback_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * ...@@ -1822,9 +1822,9 @@ snd_rme96_info_loopback_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
return 0; return 0;
} }
static int static int
snd_rme96_get_loopback_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_get_loopback_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
ucontrol->value.integer.value[0] = rme96->wcreg & RME96_WCR_SEL ? 0 : 1; ucontrol->value.integer.value[0] = rme96->wcreg & RME96_WCR_SEL ? 0 : 1;
...@@ -1832,9 +1832,9 @@ snd_rme96_get_loopback_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ...@@ -1832,9 +1832,9 @@ snd_rme96_get_loopback_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
return 0; return 0;
} }
static int static int
snd_rme96_put_loopback_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_put_loopback_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
unsigned int val; unsigned int val;
int change; int change;
...@@ -1849,10 +1849,10 @@ snd_rme96_put_loopback_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ...@@ -1849,10 +1849,10 @@ snd_rme96_put_loopback_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
} }
static int static int
snd_rme96_info_inputtype_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) snd_rme96_info_inputtype_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *_texts[5] = { "Optical", "Coaxial", "Internal", "XLR", "Analog" }; static char *_texts[5] = { "Optical", "Coaxial", "Internal", "XLR", "Analog" };
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
char *texts[5] = { _texts[0], _texts[1], _texts[2], _texts[3], _texts[4] }; char *texts[5] = { _texts[0], _texts[1], _texts[2], _texts[3], _texts[4] };
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
...@@ -1886,9 +1886,9 @@ snd_rme96_info_inputtype_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * ...@@ -1886,9 +1886,9 @@ snd_rme96_info_inputtype_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
return 0; return 0;
} }
static int static int
snd_rme96_get_inputtype_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_get_inputtype_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
unsigned int items = 3; unsigned int items = 3;
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
...@@ -1925,9 +1925,9 @@ snd_rme96_get_inputtype_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -1925,9 +1925,9 @@ snd_rme96_get_inputtype_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return 0; return 0;
} }
static int static int
snd_rme96_put_inputtype_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_put_inputtype_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
unsigned int val; unsigned int val;
int change, items = 3; int change, items = 3;
...@@ -1967,7 +1967,7 @@ snd_rme96_put_inputtype_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -1967,7 +1967,7 @@ snd_rme96_put_inputtype_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
} }
static int static int
snd_rme96_info_clockmode_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) snd_rme96_info_clockmode_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[3] = { "AutoSync", "Internal", "Word" }; static char *texts[3] = { "AutoSync", "Internal", "Word" };
...@@ -1981,9 +1981,9 @@ snd_rme96_info_clockmode_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * ...@@ -1981,9 +1981,9 @@ snd_rme96_info_clockmode_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
return 0; return 0;
} }
static int static int
snd_rme96_get_clockmode_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_get_clockmode_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
ucontrol->value.enumerated.item[0] = snd_rme96_getclockmode(rme96); ucontrol->value.enumerated.item[0] = snd_rme96_getclockmode(rme96);
...@@ -1991,9 +1991,9 @@ snd_rme96_get_clockmode_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -1991,9 +1991,9 @@ snd_rme96_get_clockmode_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return 0; return 0;
} }
static int static int
snd_rme96_put_clockmode_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_put_clockmode_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
unsigned int val; unsigned int val;
int change; int change;
...@@ -2006,7 +2006,7 @@ snd_rme96_put_clockmode_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -2006,7 +2006,7 @@ snd_rme96_put_clockmode_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
} }
static int static int
snd_rme96_info_attenuation_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) snd_rme96_info_attenuation_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[4] = { "0 dB", "-6 dB", "-12 dB", "-18 dB" }; static char *texts[4] = { "0 dB", "-6 dB", "-12 dB", "-18 dB" };
...@@ -2020,9 +2020,9 @@ snd_rme96_info_attenuation_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t ...@@ -2020,9 +2020,9 @@ snd_rme96_info_attenuation_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t
return 0; return 0;
} }
static int static int
snd_rme96_get_attenuation_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_get_attenuation_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
ucontrol->value.enumerated.item[0] = snd_rme96_getattenuation(rme96); ucontrol->value.enumerated.item[0] = snd_rme96_getattenuation(rme96);
...@@ -2030,9 +2030,9 @@ snd_rme96_get_attenuation_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_ ...@@ -2030,9 +2030,9 @@ snd_rme96_get_attenuation_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
return 0; return 0;
} }
static int static int
snd_rme96_put_attenuation_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_put_attenuation_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
unsigned int val; unsigned int val;
int change; int change;
...@@ -2046,7 +2046,7 @@ snd_rme96_put_attenuation_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_ ...@@ -2046,7 +2046,7 @@ snd_rme96_put_attenuation_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_
} }
static int static int
snd_rme96_info_montracks_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) snd_rme96_info_montracks_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
static char *texts[4] = { "1+2", "3+4", "5+6", "7+8" }; static char *texts[4] = { "1+2", "3+4", "5+6", "7+8" };
...@@ -2060,9 +2060,9 @@ snd_rme96_info_montracks_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * ...@@ -2060,9 +2060,9 @@ snd_rme96_info_montracks_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
return 0; return 0;
} }
static int static int
snd_rme96_get_montracks_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_get_montracks_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
ucontrol->value.enumerated.item[0] = snd_rme96_getmontracks(rme96); ucontrol->value.enumerated.item[0] = snd_rme96_getmontracks(rme96);
...@@ -2070,9 +2070,9 @@ snd_rme96_get_montracks_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -2070,9 +2070,9 @@ snd_rme96_get_montracks_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return 0; return 0;
} }
static int static int
snd_rme96_put_montracks_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) snd_rme96_put_montracks_control(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
unsigned int val; unsigned int val;
int change; int change;
...@@ -2084,7 +2084,7 @@ snd_rme96_put_montracks_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t ...@@ -2084,7 +2084,7 @@ snd_rme96_put_montracks_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return change; return change;
} }
static u32 snd_rme96_convert_from_aes(snd_aes_iec958_t *aes) static u32 snd_rme96_convert_from_aes(struct snd_aes_iec958 *aes)
{ {
u32 val = 0; u32 val = 0;
val |= (aes->status[0] & IEC958_AES0_PROFESSIONAL) ? RME96_WCR_PRO : 0; val |= (aes->status[0] & IEC958_AES0_PROFESSIONAL) ? RME96_WCR_PRO : 0;
...@@ -2096,7 +2096,7 @@ static u32 snd_rme96_convert_from_aes(snd_aes_iec958_t *aes) ...@@ -2096,7 +2096,7 @@ static u32 snd_rme96_convert_from_aes(snd_aes_iec958_t *aes)
return val; return val;
} }
static void snd_rme96_convert_to_aes(snd_aes_iec958_t *aes, u32 val) static void snd_rme96_convert_to_aes(struct snd_aes_iec958 *aes, u32 val)
{ {
aes->status[0] = ((val & RME96_WCR_PRO) ? IEC958_AES0_PROFESSIONAL : 0) | aes->status[0] = ((val & RME96_WCR_PRO) ? IEC958_AES0_PROFESSIONAL : 0) |
((val & RME96_WCR_DOLBY) ? IEC958_AES0_NONAUDIO : 0); ((val & RME96_WCR_DOLBY) ? IEC958_AES0_NONAUDIO : 0);
...@@ -2106,24 +2106,24 @@ static void snd_rme96_convert_to_aes(snd_aes_iec958_t *aes, u32 val) ...@@ -2106,24 +2106,24 @@ static void snd_rme96_convert_to_aes(snd_aes_iec958_t *aes, u32 val)
aes->status[0] |= (val & RME96_WCR_EMP) ? IEC958_AES0_CON_EMPHASIS_5015 : 0; aes->status[0] |= (val & RME96_WCR_EMP) ? IEC958_AES0_CON_EMPHASIS_5015 : 0;
} }
static int snd_rme96_control_spdif_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_rme96_control_spdif_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958; uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1; uinfo->count = 1;
return 0; return 0;
} }
static int snd_rme96_control_spdif_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_rme96_control_spdif_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
snd_rme96_convert_to_aes(&ucontrol->value.iec958, rme96->wcreg_spdif); snd_rme96_convert_to_aes(&ucontrol->value.iec958, rme96->wcreg_spdif);
return 0; return 0;
} }
static int snd_rme96_control_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_rme96_control_spdif_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
int change; int change;
u32 val; u32 val;
...@@ -2135,24 +2135,24 @@ static int snd_rme96_control_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_v ...@@ -2135,24 +2135,24 @@ static int snd_rme96_control_spdif_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_v
return change; return change;
} }
static int snd_rme96_control_spdif_stream_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_rme96_control_spdif_stream_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958; uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1; uinfo->count = 1;
return 0; return 0;
} }
static int snd_rme96_control_spdif_stream_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_rme96_control_spdif_stream_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
snd_rme96_convert_to_aes(&ucontrol->value.iec958, rme96->wcreg_spdif_stream); snd_rme96_convert_to_aes(&ucontrol->value.iec958, rme96->wcreg_spdif_stream);
return 0; return 0;
} }
static int snd_rme96_control_spdif_stream_put(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_rme96_control_spdif_stream_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
int change; int change;
u32 val; u32 val;
...@@ -2167,23 +2167,23 @@ static int snd_rme96_control_spdif_stream_put(snd_kcontrol_t * kcontrol, snd_ctl ...@@ -2167,23 +2167,23 @@ static int snd_rme96_control_spdif_stream_put(snd_kcontrol_t * kcontrol, snd_ctl
return change; return change;
} }
static int snd_rme96_control_spdif_mask_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) static int snd_rme96_control_spdif_mask_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958; uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1; uinfo->count = 1;
return 0; return 0;
} }
static int snd_rme96_control_spdif_mask_get(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol) static int snd_rme96_control_spdif_mask_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
{ {
ucontrol->value.iec958.status[0] = kcontrol->private_value; ucontrol->value.iec958.status[0] = kcontrol->private_value;
return 0; return 0;
} }
static int static int
snd_rme96_dac_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) snd_rme96_dac_volume_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 2; uinfo->count = 2;
...@@ -2193,9 +2193,9 @@ snd_rme96_dac_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo) ...@@ -2193,9 +2193,9 @@ snd_rme96_dac_volume_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
} }
static int static int
snd_rme96_dac_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u) snd_rme96_dac_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *u)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
spin_lock_irq(&rme96->lock); spin_lock_irq(&rme96->lock);
u->value.integer.value[0] = rme96->vol[0]; u->value.integer.value[0] = rme96->vol[0];
...@@ -2206,9 +2206,9 @@ snd_rme96_dac_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u) ...@@ -2206,9 +2206,9 @@ snd_rme96_dac_volume_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u)
} }
static int static int
snd_rme96_dac_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u) snd_rme96_dac_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *u)
{ {
rme96_t *rme96 = snd_kcontrol_chip(kcontrol); struct rme96 *rme96 = snd_kcontrol_chip(kcontrol);
int change = 0; int change = 0;
if (!RME96_HAS_ANALOG_OUT(rme96)) { if (!RME96_HAS_ANALOG_OUT(rme96)) {
...@@ -2231,7 +2231,7 @@ snd_rme96_dac_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u) ...@@ -2231,7 +2231,7 @@ snd_rme96_dac_volume_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u)
return change; return change;
} }
static snd_kcontrol_new_t snd_rme96_controls[] = { static struct snd_kcontrol_new snd_rme96_controls[] = {
{ {
.iface = SNDRV_CTL_ELEM_IFACE_PCM, .iface = SNDRV_CTL_ELEM_IFACE_PCM,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT), .name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
...@@ -2312,11 +2312,11 @@ static snd_kcontrol_new_t snd_rme96_controls[] = { ...@@ -2312,11 +2312,11 @@ static snd_kcontrol_new_t snd_rme96_controls[] = {
}; };
static int static int
snd_rme96_create_switches(snd_card_t *card, snd_rme96_create_switches(struct snd_card *card,
rme96_t *rme96) struct rme96 *rme96)
{ {
int idx, err; int idx, err;
snd_kcontrol_t *kctl; struct snd_kcontrol *kctl;
for (idx = 0; idx < 7; idx++) { for (idx = 0; idx < 7; idx++) {
if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_rme96_controls[idx], rme96))) < 0) if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_rme96_controls[idx], rme96))) < 0)
...@@ -2338,7 +2338,7 @@ snd_rme96_create_switches(snd_card_t *card, ...@@ -2338,7 +2338,7 @@ snd_rme96_create_switches(snd_card_t *card,
* Card initialisation * Card initialisation
*/ */
static void snd_rme96_card_free(snd_card_t *card) static void snd_rme96_card_free(struct snd_card *card)
{ {
snd_rme96_free(card->private_data); snd_rme96_free(card->private_data);
} }
...@@ -2348,8 +2348,8 @@ snd_rme96_probe(struct pci_dev *pci, ...@@ -2348,8 +2348,8 @@ snd_rme96_probe(struct pci_dev *pci,
const struct pci_device_id *pci_id) const struct pci_device_id *pci_id)
{ {
static int dev; static int dev;
rme96_t *rme96; struct rme96 *rme96;
snd_card_t *card; struct snd_card *card;
int err; int err;
u8 val; u8 val;
...@@ -2361,10 +2361,10 @@ snd_rme96_probe(struct pci_dev *pci, ...@@ -2361,10 +2361,10 @@ snd_rme96_probe(struct pci_dev *pci,
return -ENOENT; return -ENOENT;
} }
if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE, if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
sizeof(rme96_t))) == NULL) sizeof(struct rme96))) == NULL)
return -ENOMEM; return -ENOMEM;
card->private_free = snd_rme96_card_free; card->private_free = snd_rme96_card_free;
rme96 = (rme96_t *)card->private_data; rme96 = (struct rme96 *)card->private_data;
rme96->card = card; rme96->card = card;
rme96->pci = pci; rme96->pci = pci;
snd_card_set_dev(card, &pci->dev); snd_card_set_dev(card, &pci->dev);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7