diff options
| author | netchild <netchild@FreeBSD.org> | 2006-07-15 19:19:54 +0000 |
|---|---|---|
| committer | netchild <netchild@FreeBSD.org> | 2006-07-15 19:19:54 +0000 |
| commit | b2700fb097ced2c90b08850b7decaa0362a31731 (patch) | |
| tree | eed66c380a83cae3cd01c0b94d95395d0e047d37 /sys/dev | |
| parent | 7e06df2bafc0b4106d8a9516d1ac5bc7c601fc58 (diff) | |
| download | FreeBSD-src-b2700fb097ced2c90b08850b7decaa0362a31731.zip FreeBSD-src-b2700fb097ced2c90b08850b7decaa0362a31731.tar.gz | |
- Update ALSA emu10k1.h (it was imported as emu10k1-alsa.h) header file to
latest version from Mercurial repository. It brings definition of some
additional Audigy 2 / Audigy 2 Value registers.
- Use new #defines from ALSA emu10k1.h
- Remove unused include files:
+ emu10k1-ac97.h was imported from ALSA and never used,
+ emu10k1.h was imported from Creative Linux emu10k1 driver, but only
AUDIGY_CODEBASE was used from it.
Submitted by: Yuriy Tsibizov <Yuriy.Tsibizov@gfk.ru>
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sound/pci/emu10k1.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index c9dfdcf..7b47a02 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -28,7 +28,6 @@ #include <dev/sound/pcm/sound.h> #include <dev/sound/pcm/ac97.h> -#include <gnu/dev/sound/pci/emu10k1.h> #include "emu10k1-alsa%diked.h" #include <dev/pci/pcireg.h> @@ -278,7 +277,7 @@ emu_wrptr(struct sc_info *sc, int chn, int reg, u_int32_t data) static void emu_wrefx(struct sc_info *sc, unsigned int pc, unsigned int data) { - pc += sc->audigy ? AUDIGY_CODEBASE : MICROCODEBASE; + pc += sc->audigy ? A_MICROCODEBASE : MICROCODEBASE; emu_wrptr(sc, 0, pc, data); } @@ -1628,10 +1627,10 @@ emu_initefx(struct sc_info *sc) emu_addefxop(sc, iACC3, EXTOUT(EXTOUT_ALFE), C_00000000, GPR(1), GPR(2), &pc); /* Digital Center = GPR[0] + GPR[2] */ - emu_addefxop(sc, iACC3, EXTOUT(EXTOUT_CENTER), C_00000000, + emu_addefxop(sc, iACC3, EXTOUT(EXTOUT_AC97_CENTER), C_00000000, GPR(0), GPR(2), &pc); /* Digital Sub = GPR[1] + GPR[2] */ - emu_addefxop(sc, iACC3, EXTOUT(EXTOUT_LFE), C_00000000, + emu_addefxop(sc, iACC3, EXTOUT(EXTOUT_AC97_LFE), C_00000000, GPR(1), GPR(2), &pc); /* Headphones[l/r] = GPR[0/1] */ |
