From a0458dac2b14d4ec50dc2d65d26005a58b6a5581 Mon Sep 17 00:00:00 2001 From: Maurus Cuelenaere Date: Tue, 26 May 2009 22:57:49 +0000 Subject: Fix audio on Onda VX747 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21097 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-ondavx747.h | 6 +++--- firmware/export/jz4740-codec.h | 4 ---- firmware/export/jz4740.h | 2 -- 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h index 176a35f4e9..b603e02c2b 100644 --- a/firmware/export/config-ondavx747.h +++ b/firmware/export/config-ondavx747.h @@ -122,6 +122,9 @@ /* Define this if you have the Jz4740 internal codec */ #define HAVE_JZ4740_CODEC +/* has no tone controls, so we use the software ones */ +#define HAVE_SW_TONE_CONTROLS + /* define the bitmask of hardware sample rates */ #define HW_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ @@ -131,9 +134,6 @@ #define NEED_ADC_CLOSE 1 -/* has no tone controls, so we use the software ones */ -//#define HAVE_SW_TONE_CONTROLS - #define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */ #define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ #define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ diff --git a/firmware/export/jz4740-codec.h b/firmware/export/jz4740-codec.h index e8751b5141..c98bfba602 100644 --- a/firmware/export/jz4740-codec.h +++ b/firmware/export/jz4740-codec.h @@ -21,11 +21,7 @@ #ifndef __JZ4740_CODEC_H_ #define __JZ4740_CODEC_H_ -/* TODO */ #define VOLUME_MIN -730 #define VOLUME_MAX 60 -int tenthdb2master(int db); -void audiohw_set_headphone_vol(int vol_l, int vol_r); - #endif /* __JZ4740_CODEC_H_ */ diff --git a/firmware/export/jz4740.h b/firmware/export/jz4740.h index 7ddec364a6..3bf34bd342 100644 --- a/firmware/export/jz4740.h +++ b/firmware/export/jz4740.h @@ -1310,8 +1310,6 @@ #define ICDC_CDCCR2_MICBG(n) ((n & 0x3) << 4) #define ICDC_CDCCR2_HPVOL(n) ((n & 0x3) << 0) -#define ICDC_CDCCR2_AINVOL_DB(n) ((n+34.5)/1.5) - #define ICDC_CDCCR2_SMPR_8 (0) #define ICDC_CDCCR2_SMPR_11 (1) #define ICDC_CDCCR2_SMPR_12 (2) -- cgit v1.2.3