summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2002-06-27 08:28:51 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2002-06-27 08:28:51 +0000
commita8f141978d91a979932af7f14cfb09646da99caf (patch)
tree1df6fec5fd7fa2db82d15a97f649373a09ad9bb1
parente24a897de4a8f26c9425d66a7c5c5cec8decbd96 (diff)
downloadrockbox-a8f141978d91a979932af7f14cfb09646da99caf.zip
rockbox-a8f141978d91a979932af7f14cfb09646da99caf.tar.gz
rockbox-a8f141978d91a979932af7f14cfb09646da99caf.tar.bz2
rockbox-a8f141978d91a979932af7f14cfb09646da99caf.tar.xz
Added left/right/deemphasis functionality of dac_volume
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1227 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/dac.c13
-rw-r--r--firmware/drivers/dac.h2
2 files changed, 9 insertions, 6 deletions
diff --git a/firmware/drivers/dac.c b/firmware/drivers/dac.c
index 0c12a8d..9a40244 100644
--- a/firmware/drivers/dac.c
+++ b/firmware/drivers/dac.c
@@ -16,23 +16,26 @@
* KIND, either express or implied.
*
****************************************************************************/
+#include "stdbool.h"
#include "i2c.h"
#include "debug.h"
#include "dac.h"
-int dac_volume(unsigned int volume)
+int dac_volume(unsigned int left, unsigned int right, bool deemph)
{
int ret = 0;
unsigned char buf[3];
i2c_begin();
- if(volume > 0x38)
- volume = 0x38;
+ if (left > 0x38)
+ left = 0x38;
+ if (right > 0x38)
+ right = 0x38;
buf[0] = DAC_REG_WRITE | DAC_AVOL;
- buf[1] = (volume & 0x3f) | 0x40; /* Deemphasis ON */
- buf[2] = volume & 0x3f;
+ buf[1] = (left & 0x3f) | (deemph ? 0x40 : 0);
+ buf[2] = right & 0x3f;
/* send read command */
if (i2c_write(DAC_DEV_WRITE,buf,3))
diff --git a/firmware/drivers/dac.h b/firmware/drivers/dac.h
index c860538..9530677 100644
--- a/firmware/drivers/dac.h
+++ b/firmware/drivers/dac.h
@@ -32,7 +32,7 @@
#define DAC_AVOL 2
#define DAC_GCFG 3
-extern int dac_volume(unsigned int volume);
+extern int dac_volume(unsigned int left, unsigned int right, bool deemph);
extern int dac_config(int value);
#endif