Skip to content

Commit

Permalink
sound: swarm_cs4297: Provide definitions for AC97 registers
Browse files Browse the repository at this point in the history
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 <[email protected]>
Cc: Jaroslav Kysela <[email protected]>
Cc: Clemens Ladisch <[email protected]>
Signed-off-by: Ezequiel Garcia <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
ezequielgarcia authored and tiwai committed Jun 20, 2012
1 parent fdfbaf6 commit 24fe5dd
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion sound/oss/swarm_cs4297a.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 24fe5dd

Please sign in to comment.