diff options
author | Jens Arnold <amiconn@rockbox.org> | 2008-09-07 18:00:00 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2008-09-07 18:00:00 +0000 |
commit | b6058de5f94956c3df7ef5efa05337d5403a7ac9 (patch) | |
tree | 8ad3d1f70a62fe8c06a6c1d33734f12f7aec27d9 | |
parent | 23fc923bde033d2abffa29651f3dff921abcaed7 (diff) | |
download | rockbox-b6058de5f94956c3df7ef5efa05337d5403a7ac9.tar.gz rockbox-b6058de5f94956c3df7ef5efa05337d5403a7ac9.zip |
Remove leftover cruft.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18439 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/drivers/audio/wm8721.c | 13 | ||||
-rw-r--r-- | firmware/drivers/audio/wm8731.c | 13 | ||||
-rw-r--r-- | firmware/export/wm8721.h | 1 | ||||
-rw-r--r-- | firmware/export/wm8731.h | 1 |
4 files changed, 0 insertions, 28 deletions
diff --git a/firmware/drivers/audio/wm8721.c b/firmware/drivers/audio/wm8721.c index 60c4e66c76..141224a65b 100644 --- a/firmware/drivers/audio/wm8721.c +++ b/firmware/drivers/audio/wm8721.c | |||
@@ -66,19 +66,6 @@ int tenthdb2master(int db) | |||
66 | } | 66 | } |
67 | } | 67 | } |
68 | 68 | ||
69 | /* convert tenth of dB volume (-780..0) to mixer volume register value */ | ||
70 | int tenthdb2mixer(int db) | ||
71 | { | ||
72 | if (db < -660) /* 1.5 dB steps */ | ||
73 | return (2640 - db) / 15; | ||
74 | else if (db < -600) /* 0.75 dB steps */ | ||
75 | return (990 - db) * 2 / 15; | ||
76 | else if (db < -460) /* 0.5 dB steps */ | ||
77 | return (460 - db) / 5; | ||
78 | else /* 0.25 dB steps */ | ||
79 | return -db * 2 / 5; | ||
80 | } | ||
81 | |||
82 | void audiohw_mute(bool mute) | 69 | void audiohw_mute(bool mute) |
83 | { | 70 | { |
84 | if (mute) | 71 | if (mute) |
diff --git a/firmware/drivers/audio/wm8731.c b/firmware/drivers/audio/wm8731.c index 59fa4cffcf..a1149c3d2e 100644 --- a/firmware/drivers/audio/wm8731.c +++ b/firmware/drivers/audio/wm8731.c | |||
@@ -98,19 +98,6 @@ int tenthdb2master(int db) | |||
98 | } | 98 | } |
99 | } | 99 | } |
100 | 100 | ||
101 | /* convert tenth of dB volume (-780..0) to mixer volume register value */ | ||
102 | int tenthdb2mixer(int db) | ||
103 | { | ||
104 | if (db < -660) /* 1.5 dB steps */ | ||
105 | return (2640 - db) / 15; | ||
106 | else if (db < -600) /* 0.75 dB steps */ | ||
107 | return (990 - db) * 2 / 15; | ||
108 | else if (db < -460) /* 0.5 dB steps */ | ||
109 | return (460 - db) / 5; | ||
110 | else /* 0.25 dB steps */ | ||
111 | return -db * 2 / 5; | ||
112 | } | ||
113 | |||
114 | int sound_val2phys(int setting, int value) | 101 | int sound_val2phys(int setting, int value) |
115 | { | 102 | { |
116 | int result; | 103 | int result; |
diff --git a/firmware/export/wm8721.h b/firmware/export/wm8721.h index 9aab1b760a..3611e4d6ee 100644 --- a/firmware/export/wm8721.h +++ b/firmware/export/wm8721.h | |||
@@ -27,7 +27,6 @@ | |||
27 | #define VOLUME_MAX 60 | 27 | #define VOLUME_MAX 60 |
28 | 28 | ||
29 | extern int tenthdb2master(int db); | 29 | extern int tenthdb2master(int db); |
30 | extern int tenthdb2mixer(int db); | ||
31 | 30 | ||
32 | extern void audiohw_set_master_vol(int vol_l, int vol_r); | 31 | extern void audiohw_set_master_vol(int vol_l, int vol_r); |
33 | extern void audiohw_set_nsorder(int order); | 32 | extern void audiohw_set_nsorder(int order); |
diff --git a/firmware/export/wm8731.h b/firmware/export/wm8731.h index 27c11434bb..f55c3af002 100644 --- a/firmware/export/wm8731.h +++ b/firmware/export/wm8731.h | |||
@@ -27,7 +27,6 @@ | |||
27 | #define VOLUME_MAX 60 | 27 | #define VOLUME_MAX 60 |
28 | 28 | ||
29 | extern int tenthdb2master(int db); | 29 | extern int tenthdb2master(int db); |
30 | extern int tenthdb2mixer(int db); | ||
31 | 30 | ||
32 | extern void audiohw_set_master_vol(int vol_l, int vol_r); | 31 | extern void audiohw_set_master_vol(int vol_l, int vol_r); |
33 | extern void audiohw_set_nsorder(int order); | 32 | extern void audiohw_set_nsorder(int order); |