git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
include
/
sound
/
vx_core.h
diff --git
a/include/sound/vx_core.h
b/include/sound/vx_core.h
index
bcc633a
..
d3d90e1
100644
(file)
--- a/
include/sound/vx_core.h
+++ b/
include/sound/vx_core.h
@@
-182,6
+182,7
@@
struct snd_vx_core {
/* clock and audio sources */
unsigned int audio_source; /* current audio input source */
unsigned int audio_source_target;
/* clock and audio sources */
unsigned int audio_source; /* current audio input source */
unsigned int audio_source_target;
+ unsigned int clock_mode; /* clock mode (VX_CLOCK_MODE_XXX) */
unsigned int clock_source; /* current clock source (INTERNAL_QUARTZ or UER_SYNC) */
unsigned int freq; /* current frequency */
unsigned int freq_detected; /* detected frequency from digital in */
unsigned int clock_source; /* current clock source (INTERNAL_QUARTZ or UER_SYNC) */
unsigned int freq; /* current frequency */
unsigned int freq_detected; /* detected frequency from digital in */
@@
-254,13
+255,13
@@
inline static unsigned int snd_vx_inl(vx_core_t *chip, int reg)
inline static void snd_vx_outb(vx_core_t *chip, int reg, unsigned char val)
{
snd_assert(chip->ops->out8, return);
inline static void snd_vx_outb(vx_core_t *chip, int reg, unsigned char val)
{
snd_assert(chip->ops->out8, return);
-
return
chip->ops->out8(chip, reg, val);
+ chip->ops->out8(chip, reg, val);
}
inline static void snd_vx_outl(vx_core_t *chip, int reg, unsigned int val)
{
snd_assert(chip->ops->out32, return);
}
inline static void snd_vx_outl(vx_core_t *chip, int reg, unsigned int val)
{
snd_assert(chip->ops->out32, return);
-
return
chip->ops->out32(chip, reg, val);
+ chip->ops->out32(chip, reg, val);
}
#define vx_inb(chip,reg) snd_vx_inb(chip, VX_##reg)
}
#define vx_inb(chip,reg) snd_vx_inb(chip, VX_##reg)
@@
-364,6
+365,13
@@
enum {
UER_SYNC
};
UER_SYNC
};
+/* clock mode */
+enum {
+ VX_CLOCK_MODE_AUTO, /* depending on the current audio source */
+ VX_CLOCK_MODE_INTERNAL, /* fixed to internal quartz */
+ VX_CLOCK_MODE_EXTERNAL /* fixed to UER sync */
+};
+
/* SPDIF/UER type */
enum {
VX_UER_MODE_CONSUMER,
/* SPDIF/UER type */
enum {
VX_UER_MODE_CONSUMER,