projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ALSA] Prevent ALSA trident driver from grabbing pcnet32 hardware
[powerpc.git]
/
sound
/
pci
/
rme96.c
diff --git
a/sound/pci/rme96.c
b/sound/pci/rme96.c
index
0eddeb1
..
0e694b0
100644
(file)
--- a/
sound/pci/rme96.c
+++ b/
sound/pci/rme96.c
@@
-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;
int irq;
unsigned long port;
spinlock_t lock;
int irq;
unsigned long port;
@@
-216,8
+216,8
@@
typedef struct snd_rme96 {
u8 rev; /* card revision number */
u8 rev; /* card revision number */
- s
nd_pcm_substream_t
*playback_substream;
- s
nd_pcm_substream_t
*capture_substream;
+ s
truct snd_pcm_substream
*playback_substream;
+ s
truct snd_pcm_substream
*capture_substream;
int playback_frlog; /* log2 of framesize */
int capture_frlog;
int playback_frlog; /* log2 of framesize */
int capture_frlog;
@@
-225,12
+225,12
@@
typedef struct snd_rme96 {
size_t playback_periodsize; /* in bytes, zero if not used */
size_t capture_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 */
- s
nd_card_t
*card;
- s
nd_pcm_t
*spdif_pcm;
- s
nd_pcm_t
*adat_pcm;
+ s
truct snd_card
*card;
+ s
truct snd_pcm
*spdif_pcm;
+ s
truct snd_pcm
*adat_pcm;
struct pci_dev *pci;
struct pci_dev *pci;
- s
nd_kcontrol_t
*spdif_ctl;
-}
rme96_t
;
+ s
truct snd_kcontrol
*spdif_ctl;
+};
static struct pci_device_id snd_rme96_ids[] = {
{ PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96,
static struct pci_device_id snd_rme96_ids[] = {
{ PCI_VENDOR_ID_XILINX, PCI_DEVICE_ID_RME_DIGI96,
@@
-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)
static int
#define RME96_185X_MAX_OUT(rme96) ((1 << (RME96_DAC_IS_1852(rme96) ? RME96_AD1852_VOL_BITS : RME96_AD1855_VOL_BITS)) - 1)
static int
-snd_rme96_playback_prepare(s
nd_pcm_substream_t
*substream);
+snd_rme96_playback_prepare(s
truct snd_pcm_substream
*substream);
static int
static int
-snd_rme96_capture_prepare(s
nd_pcm_substream_t
*substream);
+snd_rme96_capture_prepare(s
truct snd_pcm_substream
*substream);
static int
static int
-snd_rme96_playback_trigger(s
nd_pcm_substream_t
*substream,
+snd_rme96_playback_trigger(s
truct snd_pcm_substream
*substream,
int cmd);
static int
int cmd);
static int
-snd_rme96_capture_trigger(s
nd_pcm_substream_t
*substream,
+snd_rme96_capture_trigger(s
truct snd_pcm_substream
*substream,
int cmd);
static snd_pcm_uframes_t
int cmd);
static snd_pcm_uframes_t
-snd_rme96_playback_pointer(s
nd_pcm_substream_t
*substream);
+snd_rme96_playback_pointer(s
truct snd_pcm_substream
*substream);
static snd_pcm_uframes_t
static snd_pcm_uframes_t
-snd_rme96_capture_pointer(s
nd_pcm_substream_t
*substream);
+snd_rme96_capture_pointer(s
truct 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(s
nd_card_t
*card,
-
rme96_t
*rme96);
+snd_rme96_create_switches(s
truct snd_card
*card,
+
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)
& RME96_RCR_AUDIO_ADDR_MASK) >> rme96->playback_frlog;
}
static inline unsigned int
{
return (readl(rme96->iobase + RME96_IO_GET_PLAY_POS)
& RME96_RCR_AUDIO_ADDR_MASK) >> rme96->playback_frlog;
}
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)
& RME96_RCR_AUDIO_ADDR_MASK) >> rme96->capture_frlog;
{
return (readl(rme96->iobase + RME96_IO_GET_REC_POS)
& RME96_RCR_AUDIO_ADDR_MASK) >> rme96->capture_frlog;
@@
-315,12
+315,12
@@
snd_rme96_ratecode(int rate)
}
static int
}
static int
-snd_rme96_playback_silence(s
nd_pcm_substream_t
*substream,
+snd_rme96_playback_silence(s
truct snd_pcm_substream
*substream,
int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos,
snd_pcm_uframes_t count)
{
int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos,
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;
pos <<= rme96->playback_frlog;
memset_io(rme96->iobase + RME96_IO_PLAY_BUFFER + pos,
count <<= rme96->playback_frlog;
pos <<= rme96->playback_frlog;
memset_io(rme96->iobase + RME96_IO_PLAY_BUFFER + pos,
@@
-329,13
+329,13
@@
snd_rme96_playback_silence(snd_pcm_substream_t *substream,
}
static int
}
static int
-snd_rme96_playback_copy(s
nd_pcm_substream_t
*substream,
+snd_rme96_playback_copy(s
truct snd_pcm_substream
*substream,
int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos,
void __user *src,
snd_pcm_uframes_t count)
{
int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos,
void __user *src,
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;
pos <<= rme96->playback_frlog;
copy_from_user_toio(rme96->iobase + RME96_IO_PLAY_BUFFER + pos, src,
count <<= rme96->playback_frlog;
pos <<= rme96->playback_frlog;
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,
}
static int
}
static int
-snd_rme96_capture_copy(s
nd_pcm_substream_t
*substream,
+snd_rme96_capture_copy(s
truct snd_pcm_substream
*substream,
int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos,
void __user *dst,
snd_pcm_uframes_t count)
{
int channel, /* not used (interleaved data) */
snd_pcm_uframes_t pos,
void __user *dst,
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;
pos <<= rme96->capture_frlog;
copy_to_user_fromio(dst, rme96->iobase + RME96_IO_REC_BUFFER + pos,
count <<= rme96->capture_frlog;
pos <<= rme96->capture_frlog;
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,
/*
* Digital output capabilites (S/PDIF)
*/
/*
* Digital output capabilites (S/PDIF)
*/
-static s
nd_pcm_hardware_t
snd_rme96_playback_spdif_info =
+static s
truct snd_pcm_hardware
snd_rme96_playback_spdif_info =
{
.info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID |
{
.info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID |
@@
-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 s
nd_pcm_hardware_t
snd_rme96_capture_spdif_info =
+static s
truct snd_pcm_hardware
snd_rme96_capture_spdif_info =
{
.info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID |
{
.info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID |
@@
-419,7
+419,7
@@
static snd_pcm_hardware_t snd_rme96_capture_spdif_info =
/*
* Digital output capabilites (ADAT)
*/
/*
* Digital output capabilites (ADAT)
*/
-static s
nd_pcm_hardware_t
snd_rme96_playback_adat_info =
+static s
truct snd_pcm_hardware
snd_rme96_playback_adat_info =
{
.info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID |
{
.info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID |
@@
-444,7
+444,7
@@
static snd_pcm_hardware_t snd_rme96_playback_adat_info =
/*
* Digital input capabilites (ADAT)
*/
/*
* Digital input capabilites (ADAT)
*/
-static s
nd_pcm_hardware_t
snd_rme96_capture_adat_info =
+static s
truct snd_pcm_hardware
snd_rme96_capture_adat_info =
{
.info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID |
{
.info = (SNDRV_PCM_INFO_MMAP_IOMEM |
SNDRV_PCM_INFO_MMAP_VALID |
@@
-479,7
+479,7
@@
static snd_pcm_hardware_t snd_rme96_capture_adat_info =
* the volume.
*/
static void
* the volume.
*/
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)
}
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)) {
snd_rme96_write_SPI(rme96, (rme96->vol[0] << 2) | 0x0);
{
if (RME96_DAC_IS_1852(rme96)) {
snd_rme96_write_SPI(rme96, (rme96->vol[0] << 2) | 0x0);
@@
-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,
rme96->iobase + RME96_IO_CONTROL_REGISTER);
{
writel(rme96->wcreg | RME96_WCR_PD,
rme96->iobase + RME96_IO_CONTROL_REGISTER);
@@
-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) +
(((rme96->wcreg >> RME96_WCR_BITPOS_MONITOR_1) & 1) << 1);
}
static int
{
return ((rme96->wcreg >> RME96_WCR_BITPOS_MONITOR_0) & 1) +
(((rme96->wcreg >> RME96_WCR_BITPOS_MONITOR_1) & 1) << 1);
}
static int
-snd_rme96_setmontracks(
rme96_t
*rme96,
+snd_rme96_setmontracks(
struct rme96
*rme96,
int montracks)
{
if (montracks & 1) {
int montracks)
{
if (montracks & 1) {
@@
-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) +
(((rme96->wcreg >> RME96_WCR_BITPOS_GAIN_1) & 1) << 1);
}
static int
{
return ((rme96->wcreg >> RME96_WCR_BITPOS_GAIN_0) & 1) +
(((rme96->wcreg >> RME96_WCR_BITPOS_GAIN_1) & 1) << 1);
}
static int
-snd_rme96_setattenuation(
rme96_t
*rme96,
+snd_rme96_setattenuation(
struct rme96
*rme96,
int attenuation)
{
switch (attenuation) {
int attenuation)
{
switch (attenuation) {
@@
-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 n, rate;
int *is_adat)
{
int n, rate;
@@
-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)
}
static int
}
static int
-snd_rme96_playback_setrate(
rme96_t
*rme96,
+snd_rme96_playback_setrate(
struct rme96
*rme96,
int rate)
{
int ds;
int rate)
{
int ds;
@@
-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)
{
switch (rate) {
int rate)
{
switch (rate) {
@@
-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)
{
switch (mode) {
int mode)
{
switch (mode) {
@@
-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) {
return RME96_CLOCKMODE_WORDCLOCK;
{
if (rme96->areg & RME96_AR_WSEL) {
return RME96_CLOCKMODE_WORDCLOCK;
@@
-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 n;
int type)
{
int n;
@@
-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) {
return RME96_INPUT_ANALOG;
{
if (rme96->areg & RME96_AR_ANALOG) {
return RME96_INPUT_ANALOG;
@@
-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 is_playback)
{
int n_channels,
int is_playback)
{
@@
-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)
{
switch (format) {
int format)
{
switch (format) {
@@
-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)
{
switch (format) {
int format)
{
switch (format) {
@@
-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)
{
switch (period_bytes) {
size_t period_bytes)
{
switch (period_bytes) {
@@
-959,11
+959,11
@@
snd_rme96_set_period_properties(rme96_t *rme96,
}
static int
}
static int
-snd_rme96_playback_hw_params(s
nd_pcm_substream_t
*substream,
- s
nd_pcm_hw_params_t
*params)
+snd_rme96_playback_hw_params(s
truct snd_pcm_substream
*substream,
+ s
truct snd_pcm_hw_params
*params)
{
{
-
rme96_t
*rme96 = snd_pcm_substream_chip(substream);
- s
nd_pcm_runtime_t
*runtime = substream->runtime;
+
struct rme96
*rme96 = snd_pcm_substream_chip(substream);
+ s
truct snd_pcm_runtime
*runtime = substream->runtime;
int err, rate, dummy;
runtime->dma_area = (void __force *)(rme96->iobase +
int err, rate, dummy;
runtime->dma_area = (void __force *)(rme96->iobase +
@@
-1012,11
+1012,11
@@
snd_rme96_playback_hw_params(snd_pcm_substream_t *substream,
}
static int
}
static int
-snd_rme96_capture_hw_params(s
nd_pcm_substream_t
*substream,
- s
nd_pcm_hw_params_t
*params)
+snd_rme96_capture_hw_params(s
truct snd_pcm_substream
*substream,
+ s
truct snd_pcm_hw_params
*params)
{
{
-
rme96_t
*rme96 = snd_pcm_substream_chip(substream);
- s
nd_pcm_runtime_t
*runtime = substream->runtime;
+
struct rme96
*rme96 = snd_pcm_substream_chip(substream);
+ s
truct snd_pcm_runtime
*runtime = substream->runtime;
int err, isadat, rate;
runtime->dma_area = (void __force *)(rme96->iobase +
int err, isadat, rate;
runtime->dma_area = (void __force *)(rme96->iobase +
@@
-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)
{
if (!from_pause) {
int from_pause)
{
if (!from_pause) {
@@
-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)
{
if (!from_pause) {
int from_pause)
{
if (!from_pause) {
@@
-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)
}
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);
if (rme96->rcreg & RME96_RCR_IRQ_2) {
{
rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER);
if (rme96->rcreg & RME96_RCR_IRQ_2) {
@@
-1120,7
+1120,7
@@
snd_rme96_interrupt(int irq,
void *dev_id,
struct pt_regs *regs)
{
void *dev_id,
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);
/* fastpath out, to ease interrupt sharing */
rme96->rcreg = readl(rme96->iobase + RME96_IO_CONTROL_REGISTER);
/* fastpath out, to ease interrupt sharing */
@@
-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 s
nd_pcm_hw_constraint_list_
t hw_constraints_period_bytes = {
+static s
truct snd_pcm_hw_constraint_lis
t hw_constraints_period_bytes = {
.count = ARRAY_SIZE(period_bytes),
.list = period_bytes,
.mask = 0
};
static int
.count = ARRAY_SIZE(period_bytes),
.list = period_bytes,
.mask = 0
};
static int
-snd_rme96_playback_spdif_open(s
nd_pcm_substream_t
*substream)
+snd_rme96_playback_spdif_open(s
truct snd_pcm_substream
*substream)
{
int rate, dummy;
{
int rate, dummy;
-
rme96_t
*rme96 = snd_pcm_substream_chip(substream);
- s
nd_pcm_runtime_t
*runtime = substream->runtime;
+
struct rme96
*rme96 = snd_pcm_substream_chip(substream);
+ s
truct 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)
}
static int
}
static int
-snd_rme96_capture_spdif_open(s
nd_pcm_substream_t
*substream)
+snd_rme96_capture_spdif_open(s
truct snd_pcm_substream
*substream)
{
int isadat, rate;
{
int isadat, rate;
-
rme96_t
*rme96 = snd_pcm_substream_chip(substream);
- s
nd_pcm_runtime_t
*runtime = substream->runtime;
+
struct rme96
*rme96 = snd_pcm_substream_chip(substream);
+ s
truct 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)
}
static int
}
static int
-snd_rme96_playback_adat_open(s
nd_pcm_substream_t
*substream)
+snd_rme96_playback_adat_open(s
truct snd_pcm_substream
*substream)
{
int rate, dummy;
{
int rate, dummy;
-
rme96_t
*rme96 = snd_pcm_substream_chip(substream);
- s
nd_pcm_runtime_t
*runtime = substream->runtime;
+
struct rme96
*rme96 = snd_pcm_substream_chip(substream);
+ s
truct 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)
}
static int
}
static int
-snd_rme96_capture_adat_open(s
nd_pcm_substream_t
*substream)
+snd_rme96_capture_adat_open(s
truct snd_pcm_substream
*substream)
{
int isadat, rate;
{
int isadat, rate;
-
rme96_t
*rme96 = snd_pcm_substream_chip(substream);
- s
nd_pcm_runtime_t
*runtime = substream->runtime;
+
struct rme96
*rme96 = snd_pcm_substream_chip(substream);
+ s
truct 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)
}
static int
}
static int
-snd_rme96_playback_close(s
nd_pcm_substream_t
*substream)
+snd_rme96_playback_close(s
truct snd_pcm_substream
*substream)
{
{
-
rme96_t
*rme96 = snd_pcm_substream_chip(substream);
+
struct rme96
*rme96 = snd_pcm_substream_chip(substream);
int spdif = 0;
spin_lock_irq(&rme96->lock);
int spdif = 0;
spin_lock_irq(&rme96->lock);
@@
-1319,9
+1319,9
@@
snd_rme96_playback_close(snd_pcm_substream_t *substream)
}
static int
}
static int
-snd_rme96_capture_close(s
nd_pcm_substream_t
*substream)
+snd_rme96_capture_close(s
truct 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);
if (RME96_ISRECORDING(rme96)) {
spin_lock_irq(&rme96->lock);
if (RME96_ISRECORDING(rme96)) {
@@
-1334,9
+1334,9
@@
snd_rme96_capture_close(snd_pcm_substream_t *substream)
}
static int
}
static int
-snd_rme96_playback_prepare(s
nd_pcm_substream_t
*substream)
+snd_rme96_playback_prepare(s
truct 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);
if (RME96_ISPLAYING(rme96)) {
spin_lock_irq(&rme96->lock);
if (RME96_ISPLAYING(rme96)) {
@@
-1348,9
+1348,9
@@
snd_rme96_playback_prepare(snd_pcm_substream_t *substream)
}
static int
}
static int
-snd_rme96_capture_prepare(s
nd_pcm_substream_t
*substream)
+snd_rme96_capture_prepare(s
truct 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);
if (RME96_ISRECORDING(rme96)) {
spin_lock_irq(&rme96->lock);
if (RME96_ISRECORDING(rme96)) {
@@
-1362,10
+1362,10
@@
snd_rme96_capture_prepare(snd_pcm_substream_t *substream)
}
static int
}
static int
-snd_rme96_playback_trigger(s
nd_pcm_substream_t
*substream,
+snd_rme96_playback_trigger(s
truct 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) {
case SNDRV_PCM_TRIGGER_START:
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
@@
-1405,10
+1405,10
@@
snd_rme96_playback_trigger(snd_pcm_substream_t *substream,
}
static int
}
static int
-snd_rme96_capture_trigger(s
nd_pcm_substream_t
*substream,
+snd_rme96_capture_trigger(s
truct 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) {
case SNDRV_PCM_TRIGGER_START:
switch (cmd) {
case SNDRV_PCM_TRIGGER_START:
@@
-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(s
nd_pcm_substream_t
*substream)
+snd_rme96_playback_pointer(s
truct 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);
}
static snd_pcm_uframes_t
return snd_rme96_playback_ptr(rme96);
}
static snd_pcm_uframes_t
-snd_rme96_capture_pointer(s
nd_pcm_substream_t
*substream)
+snd_rme96_capture_pointer(s
truct 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 s
nd_pcm_ops_t
snd_rme96_playback_spdif_ops = {
+static s
truct snd_pcm_ops
snd_rme96_playback_spdif_ops = {
.open = snd_rme96_playback_spdif_open,
.close = snd_rme96_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.open = snd_rme96_playback_spdif_open,
.close = snd_rme96_playback_close,
.ioctl = snd_pcm_lib_ioctl,
@@
-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 s
nd_pcm_ops_t
snd_rme96_capture_spdif_ops = {
+static s
truct snd_pcm_ops
snd_rme96_capture_spdif_ops = {
.open = snd_rme96_capture_spdif_open,
.close = snd_rme96_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.open = snd_rme96_capture_spdif_open,
.close = snd_rme96_capture_close,
.ioctl = snd_pcm_lib_ioctl,
@@
-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 s
nd_pcm_ops_t
snd_rme96_playback_adat_ops = {
+static s
truct snd_pcm_ops
snd_rme96_playback_adat_ops = {
.open = snd_rme96_playback_adat_open,
.close = snd_rme96_playback_close,
.ioctl = snd_pcm_lib_ioctl,
.open = snd_rme96_playback_adat_open,
.close = snd_rme96_playback_close,
.ioctl = snd_pcm_lib_ioctl,
@@
-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 s
nd_pcm_ops_t
snd_rme96_capture_adat_ops = {
+static s
truct snd_pcm_ops
snd_rme96_capture_adat_ops = {
.open = snd_rme96_capture_adat_open,
.close = snd_rme96_capture_close,
.ioctl = snd_pcm_lib_ioctl,
.open = snd_rme96_capture_adat_open,
.close = snd_rme96_capture_close,
.ioctl = snd_pcm_lib_ioctl,
@@
-1515,7
+1515,7
@@
static snd_pcm_ops_t snd_rme96_capture_adat_ops = {
static void
snd_rme96_free(void *private_data)
{
static void
snd_rme96_free(void *private_data)
{
-
rme96_t *rme96 = (rme96_t
*)private_data;
+
struct rme96 *rme96 = (struct rme96
*)private_data;
if (rme96 == NULL) {
return;
if (rme96 == NULL) {
return;
@@
-1540,21
+1540,21
@@
snd_rme96_free(void *private_data)
}
static void
}
static void
-snd_rme96_free_spdif_pcm(s
nd_pcm_t
*pcm)
+snd_rme96_free_spdif_pcm(s
truct snd_pcm
*pcm)
{
{
-
rme96_t *rme96 = (rme96_t
*) pcm->private_data;
+
struct rme96 *rme96 = (struct rme96
*) pcm->private_data;
rme96->spdif_pcm = NULL;
}
static void
rme96->spdif_pcm = NULL;
}
static void
-snd_rme96_free_adat_pcm(s
nd_pcm_t
*pcm)
+snd_rme96_free_adat_pcm(s
truct snd_pcm
*pcm)
{
{
-
rme96_t *rme96 = (rme96_t
*) pcm->private_data;
+
struct rme96 *rme96 = (struct rme96
*) pcm->private_data;
rme96->adat_pcm = NULL;
}
static int __devinit
rme96->adat_pcm = NULL;
}
static int __devinit
-snd_rme96_create(
rme96_t
*rme96)
+snd_rme96_create(
struct rme96
*rme96)
{
struct pci_dev *pci = rme96->pci;
int err;
{
struct pci_dev *pci = rme96->pci;
int err;
@@
-1671,10
+1671,10
@@
snd_rme96_create(rme96_t *rme96)
*/
static void
*/
static void
-snd_rme96_proc_read(s
nd_info_entry_t *entry, snd_info_buffer_t
*buffer)
+snd_rme96_proc_read(s
truct 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)
}
static void __devinit
}
static void __devinit
-snd_rme96_proc_init(
rme96_t
*rme96)
+snd_rme96_proc_init(
struct rme96
*rme96)
{
{
- s
nd_info_entry_t
*entry;
+ s
truct snd_info_entry
*entry;
if (! snd_card_proc_new(rme96->card, "rme96", &entry))
snd_info_set_text_ops(entry, rme96, 1024, snd_rme96_proc_read);
if (! snd_card_proc_new(rme96->card, "rme96", &entry))
snd_info_set_text_ops(entry, rme96, 1024, snd_rme96_proc_read);
@@
-1813,7
+1813,7
@@
snd_rme96_proc_init(rme96_t *rme96)
*/
static int
*/
static int
-snd_rme96_info_loopback_control(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+snd_rme96_info_loopback_control(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *
uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1;
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
uinfo->count = 1;
@@
-1822,9
+1822,9
@@
snd_rme96_info_loopback_control(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
return 0;
}
static int
return 0;
}
static int
-snd_rme96_get_loopback_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_get_loopback_control(s
truct 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);
ucontrol->value.integer.value[0] = rme96->wcreg & RME96_WCR_SEL ? 0 : 1;
spin_lock_irq(&rme96->lock);
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 *
return 0;
}
static int
return 0;
}
static int
-snd_rme96_put_loopback_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_put_loopback_control(s
truct 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;
int change;
unsigned int val;
int change;
@@
-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(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+snd_rme96_info_inputtype_control(s
truct 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] };
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
char *texts[5] = { _texts[0], _texts[1], _texts[2], _texts[3], _texts[4] };
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 *
return 0;
}
static int
return 0;
}
static int
-snd_rme96_get_inputtype_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_get_inputtype_control(s
truct 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;
spin_lock_irq(&rme96->lock);
unsigned int items = 3;
spin_lock_irq(&rme96->lock);
@@
-1925,9
+1925,9
@@
snd_rme96_get_inputtype_control(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t
return 0;
}
static int
return 0;
}
static int
-snd_rme96_put_inputtype_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_put_inputtype_control(s
truct 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;
int change, items = 3;
unsigned int val;
int change, items = 3;
@@
-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(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+snd_rme96_info_clockmode_control(s
truct 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 *
return 0;
}
static int
return 0;
}
static int
-snd_rme96_get_clockmode_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_get_clockmode_control(s
truct 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);
ucontrol->value.enumerated.item[0] = snd_rme96_getclockmode(rme96);
spin_lock_irq(&rme96->lock);
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
return 0;
}
static int
return 0;
}
static int
-snd_rme96_put_clockmode_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_put_clockmode_control(s
truct 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;
int change;
unsigned int val;
int change;
@@
-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(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+snd_rme96_info_attenuation_control(s
truct 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
return 0;
}
static int
return 0;
}
static int
-snd_rme96_get_attenuation_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_get_attenuation_control(s
truct 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);
ucontrol->value.enumerated.item[0] = snd_rme96_getattenuation(rme96);
spin_lock_irq(&rme96->lock);
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_
return 0;
}
static int
return 0;
}
static int
-snd_rme96_put_attenuation_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_put_attenuation_control(s
truct 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;
int change;
unsigned int val;
int change;
@@
-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(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+snd_rme96_info_montracks_control(s
truct 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 *
return 0;
}
static int
return 0;
}
static int
-snd_rme96_get_montracks_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_get_montracks_control(s
truct 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);
ucontrol->value.enumerated.item[0] = snd_rme96_getmontracks(rme96);
spin_lock_irq(&rme96->lock);
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
return 0;
}
static int
return 0;
}
static int
-snd_rme96_put_montracks_control(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+snd_rme96_put_montracks_control(s
truct 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;
int change;
unsigned int val;
int change;
@@
-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(s
nd_aes_iec958_t
*aes)
+static u32 snd_rme96_convert_from_aes(s
truct snd_aes_iec958
*aes)
{
u32 val = 0;
val |= (aes->status[0] & IEC958_AES0_PROFESSIONAL) ? RME96_WCR_PRO : 0;
{
u32 val = 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)
return val;
}
return val;
}
-static void snd_rme96_convert_to_aes(s
nd_aes_iec958_t
*aes, u32 val)
+static void snd_rme96_convert_to_aes(s
truct snd_aes_iec958
*aes, u32 val)
{
aes->status[0] = ((val & RME96_WCR_PRO) ? IEC958_AES0_PROFESSIONAL : 0) |
((val & RME96_WCR_DOLBY) ? IEC958_AES0_NONAUDIO : 0);
{
aes->status[0] = ((val & RME96_WCR_PRO) ? IEC958_AES0_PROFESSIONAL : 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)
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(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+static int snd_rme96_control_spdif_info(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *
uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1;
return 0;
}
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1;
return 0;
}
-static int snd_rme96_control_spdif_get(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_rme96_control_spdif_get(s
truct 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);
return 0;
}
snd_rme96_convert_to_aes(&ucontrol->value.iec958, rme96->wcreg_spdif);
return 0;
}
-static int snd_rme96_control_spdif_put(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_rme96_control_spdif_put(s
truct 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;
u32 val;
int change;
u32 val;
@@
-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(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+static int snd_rme96_control_spdif_stream_info(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *
uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1;
return 0;
}
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1;
return 0;
}
-static int snd_rme96_control_spdif_stream_get(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_rme96_control_spdif_stream_get(s
truct 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);
return 0;
}
snd_rme96_convert_to_aes(&ucontrol->value.iec958, rme96->wcreg_spdif_stream);
return 0;
}
-static int snd_rme96_control_spdif_stream_put(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_rme96_control_spdif_stream_put(s
truct 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;
u32 val;
int change;
u32 val;
@@
-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(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+static int snd_rme96_control_spdif_mask_info(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *
uinfo)
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1;
return 0;
}
{
uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
uinfo->count = 1;
return 0;
}
-static int snd_rme96_control_spdif_mask_get(s
nd_kcontrol_t * kcontrol, snd_ctl_elem_value_t *
ucontrol)
+static int snd_rme96_control_spdif_mask_get(s
truct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *
ucontrol)
{
ucontrol->value.iec958.status[0] = kcontrol->private_value;
return 0;
}
static int
{
ucontrol->value.iec958.status[0] = kcontrol->private_value;
return 0;
}
static int
-snd_rme96_dac_volume_info(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *
uinfo)
+snd_rme96_dac_volume_info(s
truct 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->count = 2;
uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
uinfo->count = 2;
@@
-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(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
*u)
+snd_rme96_dac_volume_get(s
truct 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);
u->value.integer.value[0] = rme96->vol[0];
spin_lock_irq(&rme96->lock);
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)
}
static int
}
static int
-snd_rme96_dac_volume_put(s
nd_kcontrol_t *kcontrol, snd_ctl_elem_value_t
*u)
+snd_rme96_dac_volume_put(s
truct 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;
if (!RME96_HAS_ANALOG_OUT(rme96)) {
int change = 0;
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)
return change;
}
return change;
}
-static s
nd_kcontrol_new_t
snd_rme96_controls[] = {
+static s
truct snd_kcontrol_new
snd_rme96_controls[] = {
{
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
{
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
.name = SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT),
@@
-2312,11
+2312,11
@@
static snd_kcontrol_new_t snd_rme96_controls[] = {
};
static int
};
static int
-snd_rme96_create_switches(s
nd_card_t
*card,
-
rme96_t
*rme96)
+snd_rme96_create_switches(s
truct snd_card
*card,
+
struct rme96
*rme96)
{
int idx, err;
{
int idx, err;
- s
nd_kcontrol_t
*kctl;
+ s
truct snd_kcontrol
*kctl;
for (idx = 0; idx < 7; idx++) {
if ((err = snd_ctl_add(card, kctl = snd_ctl_new1(&snd_rme96_controls[idx], rme96))) < 0)
for (idx = 0; idx < 7; idx++) {
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,
* Card initialisation
*/
* Card initialisation
*/
-static void snd_rme96_card_free(s
nd_card_t
*card)
+static void snd_rme96_card_free(s
truct 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,
const struct pci_device_id *pci_id)
{
static int dev;
const struct pci_device_id *pci_id)
{
static int dev;
-
rme96_t
*rme96;
- s
nd_card_t
*card;
+
struct rme96
*rme96;
+ s
truct snd_card
*card;
int err;
u8 val;
int err;
u8 val;
@@
-2361,10
+2361,10
@@
snd_rme96_probe(struct pci_dev *pci,
return -ENOENT;
}
if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
return -ENOENT;
}
if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE,
- sizeof(
rme96_t
))) == NULL)
+ sizeof(
struct rme96
))) == NULL)
return -ENOMEM;
card->private_free = snd_rme96_card_free;
return -ENOMEM;
card->private_free = snd_rme96_card_free;
- rme96 = (
rme96_t *)card->private_data;
+ rme96 = (
struct rme96 *)card->private_data;
rme96->card = card;
rme96->pci = pci;
snd_card_set_dev(card, &pci->dev);
rme96->card = card;
rme96->pci = pci;
snd_card_set_dev(card, &pci->dev);
@@
-2413,7
+2413,6
@@
static void __devexit snd_rme96_remove(struct pci_dev *pci)
static struct pci_driver driver = {
.name = "RME Digi96",
static struct pci_driver driver = {
.name = "RME Digi96",
- .owner = THIS_MODULE,
.id_table = snd_rme96_ids,
.probe = snd_rme96_probe,
.remove = __devexit_p(snd_rme96_remove),
.id_table = snd_rme96_ids,
.probe = snd_rme96_probe,
.remove = __devexit_p(snd_rme96_remove),