summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2007-06-05 07:22:26 +0000
committerMichael Sevakis <jethead71@rockbox.org>2007-06-05 07:22:26 +0000
commit619d2226bd70738df43b539a7c469796f3fe929f (patch)
tree3417037c30d242faf38831fd4c55408ce0f52185 /firmware
parentbcb8a884ee256e31d45a46bdeb83423457ac48d2 (diff)
downloadrockbox-619d2226bd70738df43b539a7c469796f3fe929f.tar.gz
rockbox-619d2226bd70738df43b539a7c469796f3fe929f.zip
e200: Fix errors from recording addition and a warning that comes up when fixing the errors.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13558 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/sound.c22
1 files changed, 20 insertions, 2 deletions
diff --git a/firmware/sound.c b/firmware/sound.c
index 0ccf1df260..30b9b6a2d2 100644
--- a/firmware/sound.c
+++ b/firmware/sound.c
@@ -743,7 +743,7 @@ void sound_set(int setting, int value)
743 sound_set_val(value); 743 sound_set_val(value);
744} 744}
745 745
746#ifndef HAVE_AS3514 746#if !defined(HAVE_AS3514) || defined(SIMULATOR)
747int sound_val2phys(int setting, int value) 747int sound_val2phys(int setting, int value)
748{ 748{
749#if CONFIG_CODEC == MAS3587F 749#if CONFIG_CODEC == MAS3587F
@@ -800,12 +800,30 @@ int sound_val2phys(int setting, int value)
800 break; 800 break;
801 } 801 }
802 return result; 802 return result;
803#elif defined(HAVE_AS3514)
804 /* This is here for the sim only and the audio driver has its own */
805 int result;
806
807 switch(setting)
808 {
809 case SOUND_LEFT_GAIN:
810 case SOUND_RIGHT_GAIN:
811 case SOUND_MIC_GAIN:
812 result = (value - 23) * 15;
813 break;
814
815 default:
816 result = value;
817 break;
818 }
819
820 return result;
803#else 821#else
804 (void)setting; 822 (void)setting;
805 return value; 823 return value;
806#endif 824#endif
807} 825}
808#endif /* HAVE_AS3514 */ 826#endif /* !defined(HAVE_AS3514) || defined(SIMULATOR) */
809 827
810#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) 828#if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)
811#ifndef SIMULATOR 829#ifndef SIMULATOR