diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-10-02 08:15:47 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-10-02 08:15:47 +0000 |
commit | c9f699432d0c2b0b743a9b1df197c30692a94bda (patch) | |
tree | 6eb28b6e48079e0bb38608277f6efc7719a6c0c8 | |
parent | c90c18ea67b4f1f01befe871dd82f8a6b623a4d8 (diff) | |
download | rockbox-c9f699432d0c2b0b743a9b1df197c30692a94bda.tar.gz rockbox-c9f699432d0c2b0b743a9b1df197c30692a94bda.zip |
Fix red. Finish adding the remaining file.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14950 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/export/wm8721.h | 108 | ||||
-rw-r--r-- | firmware/sound.c | 2 |
2 files changed, 109 insertions, 1 deletions
diff --git a/firmware/export/wm8721.h b/firmware/export/wm8721.h new file mode 100644 index 0000000000..fb9cc535ab --- /dev/null +++ b/firmware/export/wm8721.h | |||
@@ -0,0 +1,108 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (C) 2005 by Dave Chapman | ||
11 | * | ||
12 | * All files in this archive are subject to the GNU General Public License. | ||
13 | * See the file COPYING in the source tree root for full license agreement. | ||
14 | * | ||
15 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
16 | * KIND, either express or implied. | ||
17 | * | ||
18 | ****************************************************************************/ | ||
19 | |||
20 | #ifndef _WM8721_H | ||
21 | #define _WM8721_H | ||
22 | |||
23 | /* volume/balance/treble/bass interdependency */ | ||
24 | #define VOLUME_MIN -730 | ||
25 | #define VOLUME_MAX 60 | ||
26 | |||
27 | extern int tenthdb2master(int db); | ||
28 | extern int tenthdb2mixer(int db); | ||
29 | |||
30 | extern void audiohw_reset(void); | ||
31 | extern void audiohw_enable_output(bool enable); | ||
32 | extern int audiohw_set_master_vol(int vol_l, int vol_r); | ||
33 | extern void audiohw_set_nsorder(int order); | ||
34 | extern void audiohw_set_sample_rate(int sampling_control); | ||
35 | |||
36 | /* Register addresses and bits */ | ||
37 | #define LOUTVOL 0x02 | ||
38 | #define LOUTVOL_LHPVOL_MASK 0x7f | ||
39 | #define LOUTVOL_LZCEN (1 << 7) | ||
40 | #define LOUTVOL_LRHPBOTH (1 << 8) | ||
41 | |||
42 | #define ROUTVOL 0x03 | ||
43 | #define ROUTVOL_RHPVOL_MASK 0x7f | ||
44 | #define ROUTVOL_RZCEN (1 << 7) | ||
45 | #define ROUTVOL_RLHPBOTH (1 << 8) | ||
46 | |||
47 | #define AAPCTRL 0x04 /* Analog audio path control */ | ||
48 | #define AAPCTRL_DACSEL (1 << 4) | ||
49 | |||
50 | #define DAPCTRL 0x05 /* Digital audio path control */ | ||
51 | #define DAPCTRL_DEEMP_DISABLE (0 << 2) | ||
52 | #define DAPCTRL_DEEMP_32KHz (1 << 2) | ||
53 | #define DAPCTRL_DEEMP_44KHz (2 << 2) | ||
54 | #define DAPCTRL_DEEMP_48KHz (3 << 2) | ||
55 | #define DAPCTRL_DEEMP_MASK (3 << 2) | ||
56 | #define DAPCTRL_DACMU (1 << 3) | ||
57 | |||
58 | #define PDCTRL 0x06 | ||
59 | #define PDCTRL_DACPD (1 << 3) | ||
60 | #define PDCTRL_OUTPD (1 << 4) | ||
61 | #define PDCTRL_POWEROFF (1 << 7) | ||
62 | |||
63 | #define AINTFCE 0x07 | ||
64 | #define AINTFCE_FORMAT_MSB_RJUST(0 << 0) | ||
65 | #define AINTFCE_FORMAT_MSB_LJUST(1 << 0) | ||
66 | #define AINTFCE_FORMAT_I2S (2 << 0) | ||
67 | #define AINTFCE_FORMAT_DSP (3 << 0) | ||
68 | #define AINTFCE_FORMAT_MASK (3 << 0) | ||
69 | #define AINTFCE_IWL_16BIT (0 << 2) | ||
70 | #define AINTFCE_IWL_20BIT (1 << 2) | ||
71 | #define AINTFCE_IWL_24BIT (2 << 2) | ||
72 | #define AINTFCE_IWL_32BIT (3 << 2) | ||
73 | #define AINTFCE_IWL_MASK (3 << 2) | ||
74 | #define AINTFCE_LRP_I2S_RLO (0 << 4) | ||
75 | #define AINTFCE_LRP_I2S_RHI (1 << 4) | ||
76 | #define AINTFCE_DSP_MODE_A (0 << 4) | ||
77 | #define AINTFCE_DSP_MODE_B (1 << 4) | ||
78 | #define AINTFCE_LRSWAP (1 << 5) | ||
79 | #define AINTFCE_MS (1 << 6) | ||
80 | #define AINTFCE_BCLKINV (1 << 7) | ||
81 | |||
82 | #define SAMPCTRL 0x08 | ||
83 | #define SAMPCTRL_USB (1 << 0) | ||
84 | #define SAMPCTRL_BOSR_NOR_256fs (0 << 1) | ||
85 | #define SAMPCTRL_BOSR_NOR_384fs (1 << 1) | ||
86 | #define SAMPCTRL_BOSR_USB_250fs (0 << 1) | ||
87 | #define SAMPCTRL_BOSR_USB_272fs (1 << 1) | ||
88 | /* Bits 2-5: | ||
89 | * Sample rate setting are device-specific. See WM8731(L) datasheet | ||
90 | * for proper settings for the device's clocking */ | ||
91 | #define SAMPCTRL_SR_MASK (0xf << 2) | ||
92 | #define SAMPCTRL_CLKIDIV2 (1 << 6) | ||
93 | |||
94 | #define ACTIVECTRL 0x09 | ||
95 | #define ACTIVECTRL_ACTIVE (1 << 0) | ||
96 | |||
97 | #define RESET 0x0f | ||
98 | #define RESET_RESET 0x0 | ||
99 | |||
100 | /* SAMPCTRL values for the supported samplerates (24MHz MCLK/USB): */ | ||
101 | #define WM8721_USB24_8000HZ 0x4d | ||
102 | #define WM8721_USB24_32000HZ 0x59 | ||
103 | #define WM8721_USB24_44100HZ 0x63 | ||
104 | #define WM8721_USB24_48000HZ 0x41 | ||
105 | #define WM8721_USB24_88200HZ 0x7f | ||
106 | #define WM8721_USB24_96000HZ 0x5d | ||
107 | |||
108 | #endif /* _WM8721_H */ | ||
diff --git a/firmware/sound.c b/firmware/sound.c index 335aa1a640..67890f2731 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -782,7 +782,7 @@ int sound_val2phys(int setting, int value) | |||
782 | break; | 782 | break; |
783 | } | 783 | } |
784 | return result; | 784 | return result; |
785 | #elif defined(HAVE_TLV320) || defined(HAVE_WM8751) | 785 | #elif defined(HAVE_TLV320) || defined(HAVE_WM8731) |
786 | int result = 0; | 786 | int result = 0; |
787 | 787 | ||
788 | switch(setting) | 788 | switch(setting) |