X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fsound%2Fvx_core.h;h=d3d90e1f25fd22eabbabd7deda2efdf4ecf624ba;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=bcc633a55885b2071721cce341b372846727ceb9;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/sound/vx_core.h b/include/sound/vx_core.h
index bcc633a55..d3d90e1f2 100644
--- 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;
+	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 */
@@ -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);
-	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);
-	return chip->ops->out32(chip, reg, val);
+	chip->ops->out32(chip, reg, val);
 }
 
 #define vx_inb(chip,reg)	snd_vx_inb(chip, VX_##reg)
@@ -364,6 +365,13 @@ enum {
 	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,