diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2011-12-25 18:23:10 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2011-12-25 18:23:10 +0000 |
| commit | 1dcc834e5954cfd662e501565d265c3d0c8d9cae (patch) | |
| tree | e5792fc03016b10d610dc37b030459901c53cadb | |
| parent | e650992d204549ffa3f4b0507e81b5997bbaf889 (diff) | |
| download | rockbox-1dcc834e5954cfd662e501565d265c3d0c8d9cae.zip rockbox-1dcc834e5954cfd662e501565d265c3d0c8d9cae.tar.gz rockbox-1dcc834e5954cfd662e501565d265c3d0c8d9cae.tar.bz2 rockbox-1dcc834e5954cfd662e501565d265c3d0c8d9cae.tar.xz | |
ypr0: Remove last #ifdef in as3514.
It's now using completely the same driver as Sansa daps.
This also increases the volume range.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31428 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/audio/as3514.c | 15 | ||||
| -rw-r--r-- | firmware/export/as3514.h | 5 |
2 files changed, 0 insertions, 20 deletions
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c index a430afd..f07ee80 100644 --- a/firmware/drivers/audio/as3514.c +++ b/firmware/drivers/audio/as3514.c @@ -284,14 +284,9 @@ void audiohw_set_master_vol(int vol_l, int vol_r) #if CONFIG_CPU == AS3525v2 #define MIXER_MAX_VOLUME 0x1b #else /* lets leave the AS3514 alone until its better tested*/ -#ifdef SAMSUNG_YPR0 -#define MIXER_MAX_VOLUME 0x1a -#else #define MIXER_MAX_VOLUME 0x16 #endif -#endif -#ifndef SAMSUNG_YPR0 if (vol_r <= MIXER_MAX_VOLUME) { mix_r = vol_r; hph_r = 0; @@ -307,16 +302,6 @@ void audiohw_set_master_vol(int vol_l, int vol_r) mix_l = MIXER_MAX_VOLUME; hph_l = vol_l - MIXER_MAX_VOLUME; } -#else -/* Okay. This is shit coded indeed. It is just a test. - Some considerations: Samsung keeps DAC constantly to 0x1a volume. It modifies only the headphone amp volume -*/ - - mix_r = 0x1a; - mix_l = 0x1a; - hph_l = vol_l; - hph_r = vol_r; -#endif as3514_write_masked(AS3514_DAC_R, mix_r, AS3514_VOL_MASK); as3514_write_masked(AS3514_DAC_L, mix_l, AS3514_VOL_MASK); diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h index bcdb1a7..acf1344 100644 --- a/firmware/export/as3514.h +++ b/firmware/export/as3514.h @@ -131,14 +131,9 @@ extern void audiohw_set_sampr_dividers(int fsel); /* Headphone volume goes from -81.0 ... +6dB */ #define VOLUME_MIN -810 #else -#ifdef SAMSUNG_YPR0 -/* Headphone volume goes from -40.5 ... +6dB */ -#define VOLUME_MIN -405 -#else /* Headphone volume goes from -73.5 ... +6dB */ #define VOLUME_MIN -735 #endif -#endif #define VOLUME_MAX 60 /*** Audio Registers ***/ |