git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inotify: Fix build failure in inotify user support
[safe/jmp/linux-2.6]
/
include
/
sound
/
ak4xxx-adda.h
diff --git
a/include/sound/ak4xxx-adda.h
b/include/sound/ak4xxx-adda.h
index
d01d535
..
030b87c
100644
(file)
--- a/
include/sound/ak4xxx-adda.h
+++ b/
include/sound/ak4xxx-adda.h
@@
-5,7
+5,7
@@
* ALSA driver for AK4524 / AK4528 / AK4529 / AK4355 / AK4381
* AD and DA converters
*
* ALSA driver for AK4524 / AK4528 / AK4529 / AK4355 / AK4381
* AD and DA converters
*
- * Copyright (c) 2000 Jaroslav Kysela <perex@
suse
.cz>
+ * Copyright (c) 2000 Jaroslav Kysela <perex@
perex
.cz>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-43,6
+43,7
@@
struct snd_ak4xxx_ops {
struct snd_akm4xxx_dac_channel {
char *name; /* mixer volume name */
unsigned int num_channels;
struct snd_akm4xxx_dac_channel {
char *name; /* mixer volume name */
unsigned int num_channels;
+ char *switch_name; /* mixer switch*/
};
/* ADC labels and channels */
};
/* ADC labels and channels */
@@
-67,14
+68,17
@@
struct snd_akm4xxx {
enum {
SND_AK4524, SND_AK4528, SND_AK4529,
SND_AK4355, SND_AK4358, SND_AK4381,
enum {
SND_AK4524, SND_AK4528, SND_AK4529,
SND_AK4355, SND_AK4358, SND_AK4381,
- SND_AK5365
+ SND_AK5365
, SND_AK4620,
} type;
/* (array) information of combined codecs */
} type;
/* (array) information of combined codecs */
- struct snd_akm4xxx_dac_channel *dac_info;
- struct snd_akm4xxx_adc_channel *adc_info;
+
const
struct snd_akm4xxx_dac_channel *dac_info;
+
const
struct snd_akm4xxx_adc_channel *adc_info;
struct snd_ak4xxx_ops ops;
struct snd_ak4xxx_ops ops;
+ unsigned int num_chips;
+ unsigned int total_regs;
+ const char *name;
};
void snd_akm4xxx_write(struct snd_akm4xxx *ak, int chip, unsigned char reg,
};
void snd_akm4xxx_write(struct snd_akm4xxx *ak, int chip, unsigned char reg,