diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-07-18 15:53:29 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-07-18 15:53:29 +0400 |
| commit | f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de (patch) | |
| tree | d6ea8cc44a9d55d29d38605165a09cf69ff9a536 /sound/oss/swarm_cs4297a.c | |
| parent | 61eab000f3536f080eab43fd5eed3fd817ded76e (diff) | |
| parent | 59b1f084abd8690ffe68c67758ad08bbcb7d1af0 (diff) | |
| download | linux-f0913cd16e8a6608cf9558ccbe8fdf4d428ca3de.tar.xz | |
Merge branch 'topic/misc' into for-next
Generic updates for sound 3.6
Diffstat (limited to 'sound/oss/swarm_cs4297a.c')
| -rw-r--r-- | sound/oss/swarm_cs4297a.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c index 09d46484bc1a..7d8803a00b79 100644 --- a/sound/oss/swarm_cs4297a.c +++ b/sound/oss/swarm_cs4297a.c @@ -69,7 +69,6 @@ #include <linux/sound.h> #include <linux/slab.h> #include <linux/soundcard.h> -#include <linux/ac97_codec.h> #include <linux/pci.h> #include <linux/bitops.h> #include <linux/interrupt.h> @@ -199,6 +198,22 @@ static const char invalid_magic[] = } \ }) +/* AC97 registers */ +#define AC97_MASTER_VOL_STEREO 0x0002 /* Line Out */ +#define AC97_PCBEEP_VOL 0x000a /* none */ +#define AC97_PHONE_VOL 0x000c /* TAD Input (mono) */ +#define AC97_MIC_VOL 0x000e /* MIC Input (mono) */ +#define AC97_LINEIN_VOL 0x0010 /* Line Input (stereo) */ +#define AC97_CD_VOL 0x0012 /* CD Input (stereo) */ +#define AC97_AUX_VOL 0x0016 /* Aux Input (stereo) */ +#define AC97_PCMOUT_VOL 0x0018 /* Wave Output (stereo) */ +#define AC97_RECORD_SELECT 0x001a /* */ +#define AC97_RECORD_GAIN 0x001c +#define AC97_GENERAL_PURPOSE 0x0020 +#define AC97_3D_CONTROL 0x0022 +#define AC97_POWER_CONTROL 0x0026 +#define AC97_VENDOR_ID1 0x007c + struct list_head cs4297a_devs = { &cs4297a_devs, &cs4297a_devs }; typedef struct serdma_descr_s { |