aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2006-12-06 10:58:02 -0500
committerJaroslav Kysela <perex@suse.cz>2007-02-09 03:02:17 -0500
commit184c1e2c4c4221c2b8d1e16c33314595373fa73f (patch)
treef041f147ba8c92e5587163d0b76863fdf4f0318b /include/sound
parent9ed1261e3e617d99b0eb74041d0337ff664e4f5b (diff)
[ALSA] emu10k1: Add Audio capture support for Audigy 2 ZS Notebook.
Implement functionallity in order to fixe ALSA bug#2058. Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/emu10k1.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index 8b28304f2c42..32ce4bd31b46 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1427,6 +1427,8 @@ struct snd_emu10k1 {
1427 spinlock_t memblk_lock; 1427 spinlock_t memblk_lock;
1428 1428
1429 unsigned int spdif_bits[3]; /* s/pdif out setup */ 1429 unsigned int spdif_bits[3]; /* s/pdif out setup */
1430 unsigned int i2c_capture_source;
1431 u8 i2c_capture_volume[4][2];
1430 1432
1431 struct snd_emu10k1_fx8010 fx8010; /* FX8010 info */ 1433 struct snd_emu10k1_fx8010 fx8010; /* FX8010 info */
1432 int gpr_base; 1434 int gpr_base;
@@ -1532,6 +1534,7 @@ void snd_emu10k1_ptr_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned i
1532unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, unsigned int reg, unsigned int chn); 1534unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, unsigned int reg, unsigned int chn);
1533void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data); 1535void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, unsigned int reg, unsigned int chn, unsigned int data);
1534int snd_emu10k1_spi_write(struct snd_emu10k1 * emu, unsigned int data); 1536int snd_emu10k1_spi_write(struct snd_emu10k1 * emu, unsigned int data);
1537int snd_emu10k1_i2c_write(struct snd_emu10k1 *emu, u32 reg, u32 value);
1535int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value); 1538int snd_emu1010_fpga_write(struct snd_emu10k1 * emu, int reg, int value);
1536int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value); 1539int snd_emu1010_fpga_read(struct snd_emu10k1 * emu, int reg, int *value);
1537int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, int dst, int src); 1540int snd_emu1010_fpga_link_dst_src_write(struct snd_emu10k1 * emu, int dst, int src);