aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorEzequiel Garcia <elezegarcia@gmail.com>2012-06-19 16:20:23 -0300
committerTakashi Iwai <tiwai@suse.de>2012-06-20 08:38:27 +0200
commit24fe5ddc5f189606bde68136ac808da37e4dfe04 (patch)
tree26f42752394eacad4f043824b95714ec0c4e1b8f /sound/oss
parentfdfbaf69e0b9d6843c0da6501caf4ecacec0f775 (diff)
downloadkernel_goldelico_gta04-24fe5ddc5f189606bde68136ac808da37e4dfe04.zip
kernel_goldelico_gta04-24fe5ddc5f189606bde68136ac808da37e4dfe04.tar.gz
kernel_goldelico_gta04-24fe5ddc5f189606bde68136ac808da37e4dfe04.tar.bz2
sound: swarm_cs4297: Provide definitions for AC97 registers
This patch removes the last usage of linux/ac97_codec.h by re-defining used AC97 registers. We can't use sound/ac97_codec.h here, since it is an OSS driver. Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Jaroslav Kysela <perex@perex.cz> Cc: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/swarm_cs4297a.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/sound/oss/swarm_cs4297a.c b/sound/oss/swarm_cs4297a.c
index 09d4648..7d8803a 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 {