Moved the mpeg_sound_xxx() functions to sound.c and renamed them to sound_xxx()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6240 a1c6a512-1295-4272-9138-f99709370657
diff --git a/apps/plugin.c b/apps/plugin.c
index 35f0370..2031f0d 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -44,6 +44,7 @@
#include "mp3data.h"
#include "powermgmt.h"
#include "system.h"
+#include "sound.h"
#if (CONFIG_HWCODEC == MASNONE)
#include "pcm_playback.h"
#endif
@@ -188,7 +189,7 @@
memcmp,
/* sound */
- mpeg_sound_set,
+ sound_set,
#ifndef SIMULATOR
mp3_play_data,
mp3_play_pause,
@@ -214,7 +215,7 @@
mpeg_get_file_pos,
mpeg_get_last_header,
#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- mpeg_set_pitch,
+ sound_set_pitch,
#endif
#if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE)
diff --git a/apps/plugin.h b/apps/plugin.h
index 0707393..45f0355 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -50,6 +50,7 @@
#ifdef HAVE_LCD_BITMAP
#include "widgets.h"
#endif
+#include "sound.h"
#ifdef PLUGIN
#if defined(DEBUG) || defined(SIMULATOR)
@@ -228,7 +229,7 @@
int (*memcmp)(const void *s1, const void *s2, size_t n);
/* sound */
- void (*mpeg_sound_set)(int setting, int value);
+ void (*sound_set)(int setting, int value);
#ifndef SIMULATOR
void (*mp3_play_data)(const unsigned char* start, int size, void (*get_more)(unsigned char** start, int* size));
void (*mp3_play_pause)(bool play);
@@ -254,7 +255,7 @@
int (*mpeg_get_file_pos)(void);
unsigned long (*mpeg_get_last_header)(void);
#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- void (*mpeg_set_pitch)(int pitch);
+ void (*sound_set_pitch)(int pitch);
#endif
/* MAS communication */
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c
index 742e0bc..d944810 100644
--- a/apps/plugins/alpine_cdc.c
+++ b/apps/plugins/alpine_cdc.c
@@ -1042,25 +1042,25 @@
/* set to everything flat and 0 dB volume */
void sound_neutral(void)
{ /* neutral sound settings */
- rb->mpeg_sound_set(SOUND_BASS, 0);
- rb->mpeg_sound_set(SOUND_TREBLE, 0);
- rb->mpeg_sound_set(SOUND_BALANCE, 0);
- rb->mpeg_sound_set(SOUND_VOLUME, 92); /* 0 dB */
- rb->mpeg_sound_set(SOUND_LOUDNESS, 0);
- rb->mpeg_sound_set(SOUND_SUPERBASS, 0);
- rb->mpeg_sound_set(SOUND_AVC, 0);
+ rb->sound_set(SOUND_BASS, 0);
+ rb->sound_set(SOUND_TREBLE, 0);
+ rb->sound_set(SOUND_BALANCE, 0);
+ rb->sound_set(SOUND_VOLUME, 92); /* 0 dB */
+ rb->sound_set(SOUND_LOUDNESS, 0);
+ rb->sound_set(SOUND_SUPERBASS, 0);
+ rb->sound_set(SOUND_AVC, 0);
}
/* return to user settings */
void sound_normal(void)
{ /* restore sound settings */
- rb->mpeg_sound_set(SOUND_BASS, rb->global_settings->bass);
- rb->mpeg_sound_set(SOUND_TREBLE, rb->global_settings->treble);
- rb->mpeg_sound_set(SOUND_BALANCE, rb->global_settings->balance);
- rb->mpeg_sound_set(SOUND_VOLUME, rb->global_settings->volume);
- rb->mpeg_sound_set(SOUND_LOUDNESS, rb->global_settings->loudness);
- rb->mpeg_sound_set(SOUND_SUPERBASS, rb->global_settings->superbass);
- rb->mpeg_sound_set(SOUND_AVC, rb->global_settings->avc);
+ rb->sound_set(SOUND_BASS, rb->global_settings->bass);
+ rb->sound_set(SOUND_TREBLE, rb->global_settings->treble);
+ rb->sound_set(SOUND_BALANCE, rb->global_settings->balance);
+ rb->sound_set(SOUND_VOLUME, rb->global_settings->volume);
+ rb->sound_set(SOUND_LOUDNESS, rb->global_settings->loudness);
+ rb->sound_set(SOUND_SUPERBASS, rb->global_settings->superbass);
+ rb->sound_set(SOUND_AVC, rb->global_settings->avc);
}
/* the thread running it all */
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c
index 98b516f..3793fd9 100644
--- a/apps/plugins/metronome.c
+++ b/apps/plugins/metronome.c
@@ -201,7 +201,7 @@
if (vol > 100) vol = 100;
else if (vol < 0) vol = 0;
if (vol != rb->global_settings->volume) {
- rb->mpeg_sound_set(SOUND_VOLUME, vol);
+ rb->sound_set(SOUND_VOLUME, vol);
rb->global_settings->volume = vol;
rb->snprintf(buffer, sizeof(buffer), "Vol: %d ", vol);
#ifdef HAVE_LCD_BITMAP
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index caa09a0..868a205 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -242,7 +242,7 @@
if (vol < 100)
{
vol++;
- rb->mpeg_sound_set(SOUND_VOLUME, vol);
+ rb->sound_set(SOUND_VOLUME, vol);
rb->global_settings->volume = vol;
}
break;
@@ -253,7 +253,7 @@
if (vol > 0)
{
vol--;
- rb->mpeg_sound_set(SOUND_VOLUME, vol);
+ rb->sound_set(SOUND_VOLUME, vol);
rb->global_settings->volume = vol;
}
break;
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index d3145b4..c2cdc8d 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -1055,17 +1055,17 @@
#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
#if defined(SPLITEDIT_SPEED150) && defined(SPLITEDIT_SPEED100) && defined(SPLITEDIT_SPEED50)
case SPLITEDIT_SPEED150:
- rb->mpeg_set_pitch(1500);
+ rb->sound_set_pitch(1500);
splitedit_invalidate_osci();
break;
case SPLITEDIT_SPEED100:
- rb->mpeg_set_pitch(1000);
+ rb->sound_set_pitch(1000);
splitedit_invalidate_osci();
break;
case SPLITEDIT_SPEED50:
- rb->mpeg_set_pitch(500);
+ rb->sound_set_pitch(500);
splitedit_invalidate_osci();
break;
#endif
diff --git a/apps/plugins/video.c b/apps/plugins/video.c
index 73968d3..0257ad2 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -278,7 +278,7 @@
else if (vol < 0) vol = 0;
if (vol != rb->global_settings->volume)
{
- rb->mpeg_sound_set(SOUND_VOLUME, vol);
+ rb->sound_set(SOUND_VOLUME, vol);
rb->global_settings->volume = vol;
rb->snprintf(gPrint, sizeof(gPrint), "Vol: %d", vol);
rb->lcd_puts(0, 7, gPrint);
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 22fc521..afeaa83 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -139,7 +139,7 @@
if (vol>100) vol = 100;
else if (vol < 0) vol = 0;
if (vol != rb->global_settings->volume) {
- rb->mpeg_sound_set(SOUND_VOLUME, vol);
+ rb->sound_set(SOUND_VOLUME, vol);
rb->global_settings->volume = vol;
rb->snprintf(curr_vol, sizeof(curr_vol), "%d", vol);
rb->lcd_putsxy(0,0, curr_vol);
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c
index 9acca53..fae01a7 100644
--- a/apps/recorder/radio.c
+++ b/apps/recorder/radio.c
@@ -220,8 +220,8 @@
global_settings.rec_prerecord_time);
- mpeg_set_recording_gain(mpeg_sound_default(SOUND_LEFT_GAIN),
- mpeg_sound_default(SOUND_RIGHT_GAIN), false);
+ mpeg_set_recording_gain(sound_default(SOUND_LEFT_GAIN),
+ sound_default(SOUND_RIGHT_GAIN), false);
#endif
curr_freq = global_settings.last_frequency * FREQ_STEP + MIN_FREQ;
@@ -356,9 +356,9 @@
case BUTTON_UP:
case BUTTON_UP | BUTTON_REPEAT:
global_settings.volume++;
- if(global_settings.volume > mpeg_sound_max(SOUND_VOLUME))
- global_settings.volume = mpeg_sound_max(SOUND_VOLUME);
- mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
+ if(global_settings.volume > sound_max(SOUND_VOLUME))
+ global_settings.volume = sound_max(SOUND_VOLUME);
+ sound_set(SOUND_VOLUME, global_settings.volume);
update_screen = true;
settings_save();
break;
@@ -366,9 +366,9 @@
case BUTTON_DOWN:
case BUTTON_DOWN | BUTTON_REPEAT:
global_settings.volume--;
- if(global_settings.volume < mpeg_sound_min(SOUND_VOLUME))
- global_settings.volume = mpeg_sound_min(SOUND_VOLUME);
- mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
+ if(global_settings.volume < sound_min(SOUND_VOLUME))
+ global_settings.volume = sound_min(SOUND_VOLUME);
+ sound_set(SOUND_VOLUME, global_settings.volume);
update_screen = true;
settings_save();
break;
@@ -548,8 +548,8 @@
if(keep_playing)
{
/* Enable the Left and right A/D Converter */
- mpeg_set_recording_gain(mpeg_sound_default(SOUND_LEFT_GAIN),
- mpeg_sound_default(SOUND_RIGHT_GAIN), false);
+ mpeg_set_recording_gain(sound_default(SOUND_LEFT_GAIN),
+ sound_default(SOUND_RIGHT_GAIN), false);
mas_codec_writereg(6, 0x4000);
radio_set_status(FMRADIO_POWERED); /* leave it powered */
}
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index d9b75d0..7aa6aba 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -49,6 +49,7 @@
#include "errno.h"
#include "talk.h"
#include "atoi.h"
+#include "sound.h"
#ifdef HAVE_RECORDING
@@ -124,9 +125,9 @@
int tmp, i, d, numdec;
const char *unit;
- tmp = mpeg_val2phys(snd, val);
- numdec = mpeg_sound_numdecimals(snd);
- unit = mpeg_sound_unit(snd);
+ tmp = sound_val2phys(snd, val);
+ numdec = sound_numdecimals(snd);
+ unit = sound_unit(snd);
i = tmp / (10*numdec);
d = abs(tmp % (10*numdec));
@@ -268,7 +269,7 @@
cursor = 0;
mpeg_init_recording();
- mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
+ sound_set(SOUND_VOLUME, global_settings.volume);
/* Yes, we use the D/A for monitoring */
peak_meter_playback(true);
@@ -395,16 +396,16 @@
{
global_settings.rec_mic_gain++;
if(global_settings.rec_mic_gain >
- mpeg_sound_max(SOUND_MIC_GAIN))
+ sound_max(SOUND_MIC_GAIN))
global_settings.rec_mic_gain =
- mpeg_sound_max(SOUND_MIC_GAIN);
+ sound_max(SOUND_MIC_GAIN);
}
else
{
gain = MAX(global_settings.rec_left_gain,
global_settings.rec_right_gain) + 1;
- if(gain > mpeg_sound_max(SOUND_MIC_GAIN))
- gain = mpeg_sound_max(SOUND_MIC_GAIN);
+ if(gain > sound_max(SOUND_MIC_GAIN))
+ gain = sound_max(SOUND_MIC_GAIN);
global_settings.rec_left_gain = gain;
global_settings.rec_right_gain = gain;
}
@@ -412,16 +413,16 @@
case 1:
global_settings.rec_left_gain++;
if(global_settings.rec_left_gain >
- mpeg_sound_max(SOUND_LEFT_GAIN))
+ sound_max(SOUND_LEFT_GAIN))
global_settings.rec_left_gain =
- mpeg_sound_max(SOUND_LEFT_GAIN);
+ sound_max(SOUND_LEFT_GAIN);
break;
case 2:
global_settings.rec_right_gain++;
if(global_settings.rec_right_gain >
- mpeg_sound_max(SOUND_RIGHT_GAIN))
+ sound_max(SOUND_RIGHT_GAIN))
global_settings.rec_right_gain =
- mpeg_sound_max(SOUND_RIGHT_GAIN);
+ sound_max(SOUND_RIGHT_GAIN);
break;
}
set_gain();
@@ -437,16 +438,16 @@
{
global_settings.rec_mic_gain--;
if(global_settings.rec_mic_gain <
- mpeg_sound_min(SOUND_MIC_GAIN))
+ sound_min(SOUND_MIC_GAIN))
global_settings.rec_mic_gain =
- mpeg_sound_min(SOUND_MIC_GAIN);
+ sound_min(SOUND_MIC_GAIN);
}
else
{
gain = MAX(global_settings.rec_left_gain,
global_settings.rec_right_gain) - 1;
- if(gain < mpeg_sound_min(SOUND_LEFT_GAIN))
- gain = mpeg_sound_min(SOUND_LEFT_GAIN);
+ if(gain < sound_min(SOUND_LEFT_GAIN))
+ gain = sound_min(SOUND_LEFT_GAIN);
global_settings.rec_left_gain = gain;
global_settings.rec_right_gain = gain;
}
@@ -454,16 +455,16 @@
case 1:
global_settings.rec_left_gain--;
if(global_settings.rec_left_gain <
- mpeg_sound_min(SOUND_LEFT_GAIN))
+ sound_min(SOUND_LEFT_GAIN))
global_settings.rec_left_gain =
- mpeg_sound_min(SOUND_LEFT_GAIN);
+ sound_min(SOUND_LEFT_GAIN);
break;
case 2:
global_settings.rec_right_gain--;
if(global_settings.rec_right_gain <
- mpeg_sound_min(SOUND_MIC_GAIN))
+ sound_min(SOUND_MIC_GAIN))
global_settings.rec_right_gain =
- mpeg_sound_min(SOUND_MIC_GAIN);
+ sound_min(SOUND_MIC_GAIN);
break;
}
set_gain();
diff --git a/apps/screens.c b/apps/screens.c
index 0efb30a..f56c28a 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -44,6 +44,7 @@
#include "screens.h"
#include "debug.h"
#include "led.h"
+#include "sound.h"
#ifdef HAVE_MMC
#include "ata_mmc.h"
#endif
@@ -437,7 +438,7 @@
pitch++;
if ( pitch > 2000 )
pitch = 2000;
- mpeg_set_pitch(pitch);
+ sound_set_pitch(pitch);
break;
case BUTTON_DOWN:
@@ -447,7 +448,7 @@
pitch--;
if ( pitch < 500 )
pitch = 500;
- mpeg_set_pitch(pitch);
+ sound_set_pitch(pitch);
break;
case BUTTON_ON | BUTTON_PLAY:
@@ -468,28 +469,28 @@
case BUTTON_ON | BUTTON_RIGHT:
if ( pitch < 2000 ) {
pitch += 20;
- mpeg_set_pitch(pitch);
+ sound_set_pitch(pitch);
}
break;
case BUTTON_RIGHT | BUTTON_REL:
if ( pitch > 500 ) {
pitch -= 20;
- mpeg_set_pitch(pitch);
+ sound_set_pitch(pitch);
}
break;
case BUTTON_ON | BUTTON_LEFT:
if ( pitch > 500 ) {
pitch -= 20;
- mpeg_set_pitch(pitch);
+ sound_set_pitch(pitch);
}
break;
case BUTTON_LEFT | BUTTON_REL:
if ( pitch < 2000 ) {
pitch += 20;
- mpeg_set_pitch(pitch);
+ sound_set_pitch(pitch);
}
break;
diff --git a/apps/settings.c b/apps/settings.c
index 8ff9c7b..df03bdc 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -64,6 +64,7 @@
#include "keyboard.h"
#include "version.h"
#include "rtc.h"
+#include "sound.h"
#if CONFIG_HWCODEC == MAS3507D
void dac_line_in(bool enable);
#endif
@@ -719,21 +720,21 @@
void sound_settings_apply(void)
{
- mpeg_sound_set(SOUND_BASS, global_settings.bass);
- mpeg_sound_set(SOUND_TREBLE, global_settings.treble);
- mpeg_sound_set(SOUND_BALANCE, global_settings.balance);
- mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
- mpeg_sound_set(SOUND_CHANNELS, global_settings.channel_config);
- mpeg_sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width);
+ sound_set(SOUND_BASS, global_settings.bass);
+ sound_set(SOUND_TREBLE, global_settings.treble);
+ sound_set(SOUND_BALANCE, global_settings.balance);
+ sound_set(SOUND_VOLUME, global_settings.volume);
+ sound_set(SOUND_CHANNELS, global_settings.channel_config);
+ sound_set(SOUND_STEREO_WIDTH, global_settings.stereo_width);
#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- mpeg_sound_set(SOUND_LOUDNESS, global_settings.loudness);
- mpeg_sound_set(SOUND_AVC, global_settings.avc);
- mpeg_sound_set(SOUND_MDB_STRENGTH, global_settings.mdb_strength);
- mpeg_sound_set(SOUND_MDB_HARMONICS, global_settings.mdb_harmonics);
- mpeg_sound_set(SOUND_MDB_CENTER, global_settings.mdb_center);
- mpeg_sound_set(SOUND_MDB_SHAPE, global_settings.mdb_shape);
- mpeg_sound_set(SOUND_MDB_ENABLE, global_settings.mdb_enable);
- mpeg_sound_set(SOUND_SUPERBASS, global_settings.superbass);
+ sound_set(SOUND_LOUDNESS, global_settings.loudness);
+ sound_set(SOUND_AVC, global_settings.avc);
+ sound_set(SOUND_MDB_STRENGTH, global_settings.mdb_strength);
+ sound_set(SOUND_MDB_HARMONICS, global_settings.mdb_harmonics);
+ sound_set(SOUND_MDB_CENTER, global_settings.mdb_center);
+ sound_set(SOUND_MDB_SHAPE, global_settings.mdb_shape);
+ sound_set(SOUND_MDB_ENABLE, global_settings.mdb_enable);
+ sound_set(SOUND_SUPERBASS, global_settings.superbass);
#endif
}
@@ -1261,20 +1262,20 @@
default_table(hd_bits, sizeof(hd_bits)/sizeof(hd_bits[0]));
/* do some special cases not covered by table */
- global_settings.volume = mpeg_sound_default(SOUND_VOLUME);
- global_settings.balance = mpeg_sound_default(SOUND_BALANCE);
- global_settings.bass = mpeg_sound_default(SOUND_BASS);
- global_settings.treble = mpeg_sound_default(SOUND_TREBLE);
- global_settings.loudness = mpeg_sound_default(SOUND_LOUDNESS);
- global_settings.avc = mpeg_sound_default(SOUND_AVC);
- global_settings.channel_config = mpeg_sound_default(SOUND_CHANNELS);
- global_settings.stereo_width = mpeg_sound_default(SOUND_STEREO_WIDTH);
- global_settings.mdb_strength = mpeg_sound_default(SOUND_MDB_STRENGTH);
- global_settings.mdb_harmonics = mpeg_sound_default(SOUND_MDB_HARMONICS);
- global_settings.mdb_center = mpeg_sound_default(SOUND_MDB_CENTER);
- global_settings.mdb_shape = mpeg_sound_default(SOUND_MDB_SHAPE);
- global_settings.mdb_enable = mpeg_sound_default(SOUND_MDB_ENABLE);
- global_settings.superbass = mpeg_sound_default(SOUND_SUPERBASS);
+ global_settings.volume = sound_default(SOUND_VOLUME);
+ global_settings.balance = sound_default(SOUND_BALANCE);
+ global_settings.bass = sound_default(SOUND_BASS);
+ global_settings.treble = sound_default(SOUND_TREBLE);
+ global_settings.loudness = sound_default(SOUND_LOUDNESS);
+ global_settings.avc = sound_default(SOUND_AVC);
+ global_settings.channel_config = sound_default(SOUND_CHANNELS);
+ global_settings.stereo_width = sound_default(SOUND_STEREO_WIDTH);
+ global_settings.mdb_strength = sound_default(SOUND_MDB_STRENGTH);
+ global_settings.mdb_harmonics = sound_default(SOUND_MDB_HARMONICS);
+ global_settings.mdb_center = sound_default(SOUND_MDB_CENTER);
+ global_settings.mdb_shape = sound_default(SOUND_MDB_SHAPE);
+ global_settings.mdb_enable = sound_default(SOUND_MDB_ENABLE);
+ global_settings.superbass = sound_default(SOUND_SUPERBASS);
global_settings.contrast = lcd_default_contrast();
global_settings.wps_file[0] = '\0';
global_settings.font_file[0] = '\0';
diff --git a/apps/sound_menu.c b/apps/sound_menu.c
index f08ee35..560163c 100644
--- a/apps/sound_menu.c
+++ b/apps/sound_menu.c
@@ -34,6 +34,7 @@
#include "sprintf.h"
#include "talk.h"
#include "misc.h"
+#include "sound.h"
static const char* const fmt[] =
{
@@ -59,11 +60,11 @@
int steps;
int button;
- unit = mpeg_sound_unit(setting);
- numdec = mpeg_sound_numdecimals(setting);
- steps = mpeg_sound_steps(setting);
- min = mpeg_sound_min(setting);
- max = mpeg_sound_max(setting);
+ unit = sound_unit(setting);
+ numdec = sound_numdecimals(setting);
+ steps = sound_steps(setting);
+ min = sound_min(setting);
+ max = sound_max(setting);
if (*unit == 'd') /* crude reconstruction */
talkunit = UNIT_DB;
else if (*unit == '%')
@@ -82,7 +83,7 @@
while (!done) {
if (changed) {
- val = mpeg_val2phys(setting, *variable);
+ val = sound_val2phys(setting, *variable);
if(numdec)
{
integer = val / (10 * numdec);
@@ -136,7 +137,7 @@
break;
}
if (changed)
- mpeg_sound_set(setting, *variable);
+ sound_set(setting, *variable);
}
lcd_stop_scroll();
return false;
@@ -196,7 +197,7 @@
static void set_mdb_enable(bool value)
{
- mpeg_sound_set(SOUND_MDB_ENABLE, (int)value);
+ sound_set(SOUND_MDB_ENABLE, (int)value);
}
static bool mdb_enable(void)
@@ -210,7 +211,7 @@
static void set_superbass(bool value)
{
- mpeg_sound_set(SOUND_SUPERBASS, (int)value);
+ sound_set(SOUND_SUPERBASS, (int)value);
}
static bool superbass(void)
@@ -224,7 +225,7 @@
static void set_avc(int val)
{
- mpeg_sound_set(SOUND_AVC, val);
+ sound_set(SOUND_AVC, val);
}
static bool avc(void)
@@ -379,7 +380,7 @@
static void set_chanconf(int val)
{
- mpeg_sound_set(SOUND_CHANNELS, val);
+ sound_set(SOUND_CHANNELS, val);
}
static bool chanconf(void)
diff --git a/apps/status.c b/apps/status.c
index 562cd50..d4736f3 100644
--- a/apps/status.c
+++ b/apps/status.c
@@ -36,6 +36,7 @@
#endif
#include "powermgmt.h"
#include "led.h"
+#include "sound.h"
static enum playmode ff_mode;
@@ -146,7 +147,7 @@
(void)force_redraw; /* players always "redraw" */
#endif
- info.volume = mpeg_val2phys(SOUND_VOLUME, global_settings.volume);
+ info.volume = sound_val2phys(SOUND_VOLUME, global_settings.volume);
info.inserted = charger_inserted();
info.battlevel = battery_level();
info.battery_safe = battery_level_safe();
diff --git a/apps/wps.c b/apps/wps.c
index 91969df..d5f921c 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -49,6 +49,7 @@
#include "lang.h"
#include "bookmark.h"
#include "misc.h"
+#include "sound.h"
#define FF_REWIND_MAX_PERCENT 3 /* cap ff/rewind step size at max % of file */
/* 3% of 30min file == 54s step size */
@@ -172,17 +173,17 @@
*/
static bool setvol(void)
{
- if (global_settings.volume < mpeg_sound_min(SOUND_VOLUME))
- global_settings.volume = mpeg_sound_min(SOUND_VOLUME);
- if (global_settings.volume > mpeg_sound_max(SOUND_VOLUME))
- global_settings.volume = mpeg_sound_max(SOUND_VOLUME);
- mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
+ if (global_settings.volume < sound_min(SOUND_VOLUME))
+ global_settings.volume = sound_min(SOUND_VOLUME);
+ if (global_settings.volume > sound_max(SOUND_VOLUME))
+ global_settings.volume = sound_max(SOUND_VOLUME);
+ sound_set(SOUND_VOLUME, global_settings.volume);
status_draw(false);
wps_refresh(id3, nid3, 0, WPS_REFRESH_NON_STATIC);
settings_save();
#ifdef HAVE_LCD_CHARCELLS
splash(0, false, "Vol: %d %% ",
- mpeg_val2phys(SOUND_VOLUME, global_settings.volume));
+ sound_val2phys(SOUND_VOLUME, global_settings.volume));
return true;
#endif
return false;
@@ -388,7 +389,7 @@
int current_volume = 20;
/* zero out the sound */
- mpeg_sound_set(SOUND_VOLUME, current_volume);
+ sound_set(SOUND_VOLUME, current_volume);
sleep(HZ/10); /* let mpeg thread run */
mpeg_resume();
@@ -396,9 +397,9 @@
while (current_volume < global_settings.volume) {
current_volume += 2;
sleep(1);
- mpeg_sound_set(SOUND_VOLUME, current_volume);
+ sound_set(SOUND_VOLUME, current_volume);
}
- mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
+ sound_set(SOUND_VOLUME, global_settings.volume);
}
else {
/* fade out */
@@ -407,13 +408,13 @@
while (current_volume > 20) {
current_volume -= 2;
sleep(1);
- mpeg_sound_set(SOUND_VOLUME, current_volume);
+ sound_set(SOUND_VOLUME, current_volume);
}
mpeg_pause();
sleep(HZ/5); /* let mpeg thread run */
/* reset volume to what it was before the fade */
- mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
+ sound_set(SOUND_VOLUME, global_settings.volume);
}
}
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 870026f..8279f81 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -111,7 +111,10 @@
descramble.S
#endif
drivers/lcd.S
-#if defined(IRIVER_H100) && !defined(SIMULATOR)
+#ifdef IRIVER_H100
+#ifndef SIMULATOR
drivers/uda1380.c
pcm_playback.c
#endif
+#endif
+sound.c
diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h
index aced6dd..4da1ffc 100644
--- a/firmware/export/mp3_playback.h
+++ b/firmware/export/mp3_playback.h
@@ -30,19 +30,6 @@
int mdb_strength, int mdb_harmonics,
int mdb_center, int mdb_shape, bool mdb_enable,
bool superbass);
-void mpeg_sound_set(int setting, int value);
-int mpeg_sound_min(int setting);
-int mpeg_sound_max(int setting);
-int mpeg_sound_default(int setting);
-void mpeg_sound_channel_config(int configuration);
-int mpeg_val2phys(int setting, int value);
-const char *mpeg_sound_unit(int setting);
-int mpeg_sound_numdecimals(int setting);
-int mpeg_sound_steps(int setting);
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) || defined(SIMULATOR)
-void mpeg_set_pitch(int percent);
-#endif
-
/* exported just for mpeg.c, to keep the recording there */
#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
@@ -62,31 +49,4 @@
unsigned char* mp3_get_pos(void);
void mp3_shutdown(void);
-
-#define SOUND_VOLUME 0
-#define SOUND_BASS 1
-#define SOUND_TREBLE 2
-#define SOUND_BALANCE 3
-#define SOUND_LOUDNESS 4
-#define SOUND_AVC 5
-#define SOUND_CHANNELS 6
-#define SOUND_STEREO_WIDTH 7
-#define SOUND_LEFT_GAIN 8
-#define SOUND_RIGHT_GAIN 9
-#define SOUND_MIC_GAIN 10
-#define SOUND_MDB_STRENGTH 11
-#define SOUND_MDB_HARMONICS 12
-#define SOUND_MDB_CENTER 13
-#define SOUND_MDB_SHAPE 14
-#define SOUND_MDB_ENABLE 15
-#define SOUND_SUPERBASS 16
-#define SOUND_NUMSETTINGS 17
-
-#define MPEG_SOUND_STEREO 0
-#define MPEG_SOUND_MONO 1
-#define MPEG_SOUND_CUSTOM 2
-#define MPEG_SOUND_MONO_LEFT 3
-#define MPEG_SOUND_MONO_RIGHT 4
-#define MPEG_SOUND_KARAOKE 5
-
#endif /* #ifndef _MP3_PLAYBACK_H_ */
diff --git a/firmware/export/sound.h b/firmware/export/sound.h
new file mode 100644
index 0000000..2fa00d8
--- /dev/null
+++ b/firmware/export/sound.h
@@ -0,0 +1,61 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2005 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef SOUND_H
+#define SOUND_H
+
+#define SOUND_VOLUME 0
+#define SOUND_BASS 1
+#define SOUND_TREBLE 2
+#define SOUND_BALANCE 3
+#define SOUND_LOUDNESS 4
+#define SOUND_AVC 5
+#define SOUND_CHANNELS 6
+#define SOUND_STEREO_WIDTH 7
+#define SOUND_LEFT_GAIN 8
+#define SOUND_RIGHT_GAIN 9
+#define SOUND_MIC_GAIN 10
+#define SOUND_MDB_STRENGTH 11
+#define SOUND_MDB_HARMONICS 12
+#define SOUND_MDB_CENTER 13
+#define SOUND_MDB_SHAPE 14
+#define SOUND_MDB_ENABLE 15
+#define SOUND_SUPERBASS 16
+#define SOUND_NUMSETTINGS 17
+
+#define SOUND_CHAN_STEREO 0
+#define SOUND_CHAN_MONO 1
+#define SOUND_CHAN_CUSTOM 2
+#define SOUND_CHAN_MONO_LEFT 3
+#define SOUND_CHAN_MONO_RIGHT 4
+#define SOUND_CHAN_KARAOKE 5
+
+void sound_set(int setting, int value);
+int sound_min(int setting);
+int sound_max(int setting);
+int sound_default(int setting);
+void sound_channel_config(int configuration);
+int sound_val2phys(int setting, int value);
+const char *sound_unit(int setting);
+int sound_numdecimals(int setting);
+int sound_steps(int setting);
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) || defined(SIMULATOR)
+void sound_set_pitch(int percent);
+#endif
+
+#endif
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c
index 16fe544..14e0aa7 100644
--- a/firmware/mp3_playback.c
+++ b/firmware/mp3_playback.c
@@ -26,6 +26,7 @@
#include <kernel.h>
#include "mpeg.h" /* ToDo: remove crosslinks */
#include "mp3_playback.h"
+#include "sound.h"
#ifndef SIMULATOR
#include "i2c.h"
#include "mas.h"
@@ -63,183 +64,12 @@
static void (*callback_for_more)(unsigned char**, int*);
#endif /* #ifndef SIMULATOR */
-static const char* const units[] =
-{
- "%", /* Volume */
- "dB", /* Bass */
- "dB", /* Treble */
- "%", /* Balance */
- "dB", /* Loudness */
- "", /* AVC */
- "", /* Channels */
- "%", /* Stereo width */
- "dB", /* Left gain */
- "dB", /* Right gain */
- "dB", /* Mic gain */
- "dB", /* MDB Strength */
- "%", /* MDB Harmonics */
- "Hz", /* MDB Center */
- "Hz", /* MDB Shape */
- "", /* MDB Enable */
- "", /* Super bass */
-};
-
-static const int numdecimals[] =
-{
- 0, /* Volume */
- 0, /* Bass */
- 0, /* Treble */
- 0, /* Balance */
- 0, /* Loudness */
- 0, /* AVC */
- 0, /* Channels */
- 0, /* Stereo width */
- 1, /* Left gain */
- 1, /* Right gain */
- 1, /* Mic gain */
- 0, /* MDB Strength */
- 0, /* MDB Harmonics */
- 0, /* MDB Center */
- 0, /* MDB Shape */
- 0, /* MDB Enable */
- 0, /* Super bass */
-};
-
-static const int steps[] =
-{
- 1, /* Volume */
- 1, /* Bass */
- 1, /* Treble */
- 1, /* Balance */
- 1, /* Loudness */
- 1, /* AVC */
- 1, /* Channels */
- 1, /* Stereo width */
- 1, /* Left gain */
- 1, /* Right gain */
- 1, /* Mic gain */
- 1, /* MDB Strength */
- 1, /* MDB Harmonics */
- 10, /* MDB Center */
- 10, /* MDB Shape */
- 1, /* MDB Enable */
- 1, /* Super bass */
-};
-
-static const int minval[] =
-{
- 0, /* Volume */
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- -12, /* Bass */
- -12, /* Treble */
-#else
- -15, /* Bass */
- -15, /* Treble */
-#endif
- -100, /* Balance */
- 0, /* Loudness */
- -1, /* AVC */
- 0, /* Channels */
- 0, /* Stereo width */
- 0, /* Left gain */
- 0, /* Right gain */
- 0, /* Mic gain */
- 0, /* MDB Strength */
- 0, /* MDB Harmonics */
- 20, /* MDB Center */
- 50, /* MDB Shape */
- 0, /* MDB Enable */
- 0, /* Super bass */
-};
-
-static const int maxval[] =
-{
- 100, /* Volume */
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- 12, /* Bass */
- 12, /* Treble */
-#else
- 15, /* Bass */
- 15, /* Treble */
-#endif
- 100, /* Balance */
- 17, /* Loudness */
- 4, /* AVC */
- 5, /* Channels */
- 255, /* Stereo width */
- 15, /* Left gain */
- 15, /* Right gain */
- 15, /* Mic gain */
- 127, /* MDB Strength */
- 100, /* MDB Harmonics */
- 300, /* MDB Center */
- 300, /* MDB Shape */
- 1, /* MDB Enable */
- 1, /* Super bass */
-};
-
-static const int defaultval[] =
-{
- 70, /* Volume */
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- 6, /* Bass */
- 6, /* Treble */
-#else
- 7, /* Bass */
- 7, /* Treble */
-#endif
- 0, /* Balance */
- 0, /* Loudness */
- 0, /* AVC */
- 0, /* Channels */
- 100, /* Stereo width */
- 8, /* Left gain */
- 8, /* Right gain */
- 2, /* Mic gain */
- 50, /* MDB Strength */
- 48, /* MDB Harmonics */
- 60, /* MDB Center */
- 90, /* MDB Shape */
- 0, /* MDB Enable */
- 0, /* Super bass */
-};
-
-const char *mpeg_sound_unit(int setting)
-{
- return units[setting];
-}
-
-int mpeg_sound_numdecimals(int setting)
-{
- return numdecimals[setting];
-}
-
-int mpeg_sound_steps(int setting)
-{
- return steps[setting];
-}
-
-int mpeg_sound_min(int setting)
-{
- return minval[setting];
-}
-
-int mpeg_sound_max(int setting)
-{
- return maxval[setting];
-}
-
-int mpeg_sound_default(int setting)
-{
- return defaultval[setting];
-}
-
/* list of tracks in memory */
#define MAX_ID3_TAGS (1<<4) /* Must be power of 2 */
#define MAX_ID3_TAGS_MASK (MAX_ID3_TAGS - 1)
#ifndef SIMULATOR
-static bool mpeg_is_initialized = false;
+bool audio_is_initialized = false;
#endif
#if CONFIG_HWCODEC != MASNONE
@@ -249,99 +79,6 @@
unsigned long mas_version_code;
-#if CONFIG_HWCODEC == MAS3507D
-
-static const unsigned int bass_table[] =
-{
- 0x9e400, /* -15dB */
- 0xa2800, /* -14dB */
- 0xa7400, /* -13dB */
- 0xac400, /* -12dB */
- 0xb1800, /* -11dB */
- 0xb7400, /* -10dB */
- 0xbd400, /* -9dB */
- 0xc3c00, /* -8dB */
- 0xca400, /* -7dB */
- 0xd1800, /* -6dB */
- 0xd8c00, /* -5dB */
- 0xe0400, /* -4dB */
- 0xe8000, /* -3dB */
- 0xefc00, /* -2dB */
- 0xf7c00, /* -1dB */
- 0,
- 0x800, /* 1dB */
- 0x10000, /* 2dB */
- 0x17c00, /* 3dB */
- 0x1f800, /* 4dB */
- 0x27000, /* 5dB */
- 0x2e400, /* 6dB */
- 0x35800, /* 7dB */
- 0x3c000, /* 8dB */
- 0x42800, /* 9dB */
- 0x48800, /* 10dB */
- 0x4e400, /* 11dB */
- 0x53800, /* 12dB */
- 0x58800, /* 13dB */
- 0x5d400, /* 14dB */
- 0x61800 /* 15dB */
-};
-
-static const unsigned int treble_table[] =
-{
- 0xb2c00, /* -15dB */
- 0xbb400, /* -14dB */
- 0xc1800, /* -13dB */
- 0xc6c00, /* -12dB */
- 0xcbc00, /* -11dB */
- 0xd0400, /* -10dB */
- 0xd5000, /* -9dB */
- 0xd9800, /* -8dB */
- 0xde000, /* -7dB */
- 0xe2800, /* -6dB */
- 0xe7e00, /* -5dB */
- 0xec000, /* -4dB */
- 0xf0c00, /* -3dB */
- 0xf5c00, /* -2dB */
- 0xfac00, /* -1dB */
- 0,
- 0x5400, /* 1dB */
- 0xac00, /* 2dB */
- 0x10400, /* 3dB */
- 0x16000, /* 4dB */
- 0x1c000, /* 5dB */
- 0x22400, /* 6dB */
- 0x28400, /* 7dB */
- 0x2ec00, /* 8dB */
- 0x35400, /* 9dB */
- 0x3c000, /* 10dB */
- 0x42c00, /* 11dB */
- 0x49c00, /* 12dB */
- 0x51800, /* 13dB */
- 0x58400, /* 14dB */
- 0x5f800 /* 15dB */
-};
-
-static const unsigned int prescale_table[] =
-{
- 0x80000, /* 0db */
- 0x8e000, /* 1dB */
- 0x9a400, /* 2dB */
- 0xa5800, /* 3dB */
- 0xaf400, /* 4dB */
- 0xb8000, /* 5dB */
- 0xbfc00, /* 6dB */
- 0xc6c00, /* 7dB */
- 0xcd000, /* 8dB */
- 0xd25c0, /* 9dB */
- 0xd7800, /* 10dB */
- 0xdc000, /* 11dB */
- 0xdfc00, /* 12dB */
- 0xe3400, /* 13dB */
- 0xe6800, /* 14dB */
- 0xe9400 /* 15dB */
-};
-#endif
-
bool dma_on; /* The DMA is active */
#if CONFIG_HWCODEC == MAS3507D
@@ -589,329 +326,6 @@
}
#endif /* #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) */
-#ifndef SIMULATOR
-#if CONFIG_HWCODEC == MAS3507D
-/* all values in tenth of dB */
-int current_volume = 0; /* -780..+180 */
-int current_balance = 0; /* -960..+960 */
-int current_treble = 0; /* -150..+150 */
-int current_bass = 0; /* -150..+150 */
-
-/* convert tenth of dB volume to register value */
-static int tenthdb2reg(int db) {
- if (db < -540)
- return (db + 780) / 30;
- else
- return (db + 660) / 15;
-}
-
-void set_prescaled_volume(void)
-{
- int prescale;
- int l, r;
-
- prescale = MAX(current_bass, current_treble);
- if (prescale < 0)
- prescale = 0; /* no need to prescale if we don't boost
- bass or treble */
-
- mas_writereg(MAS_REG_KPRESCALE, prescale_table[prescale/10]);
-
- /* gain up the analog volume to compensate the prescale reduction gain,
- * but limit to +18 dB (the maximum the DAC can do */
- if (current_volume + prescale > 180)
- prescale = 180 - current_volume;
- l = r = current_volume + prescale;
-
- if (current_balance > 0)
- {
- l -= current_balance;
- if (l < -780)
- l = -780;
- }
- if (current_balance < 0)
- {
- r += current_balance;
- if (r < -780)
- r = -780;
- }
-
- dac_volume(tenthdb2reg(l), tenthdb2reg(r), false);
-}
-#endif /* MAS3507D */
-#endif /* !SIMULATOR */
-
-int channel_configuration = MPEG_SOUND_STEREO;
-int stereo_width = 100;
-
-#ifndef SIMULATOR
-static void set_channel_config(void)
-{
- /* default values: stereo */
- unsigned long val_ll = 0x80000;
- unsigned long val_lr = 0;
- unsigned long val_rl = 0;
- unsigned long val_rr = 0x80000;
-
- switch(channel_configuration)
- {
- /* case MPEG_SOUND_STEREO unnecessary */
-
- case MPEG_SOUND_MONO:
- val_ll = 0xc0000;
- val_lr = 0xc0000;
- val_rl = 0xc0000;
- val_rr = 0xc0000;
- break;
-
- case MPEG_SOUND_CUSTOM:
- {
- /* fixed point variables (matching MAS internal format)
- integer part: upper 13 bits (inlcuding sign)
- fractional part: lower 19 bits */
- long fp_width, fp_straight, fp_cross;
-
- fp_width = (stereo_width << 19) / 100;
- if (stereo_width <= 100)
- {
- fp_straight = - ((1<<19) + fp_width) / 2;
- fp_cross = fp_straight + fp_width;
- }
- else
- {
- fp_straight = - (1<<19);
- fp_cross = ((2 * fp_width / (((1<<19) + fp_width) >> 10))
- << 9) - (1<<19);
- }
- val_ll = val_rr = fp_straight & 0xFFFFF;
- val_lr = val_rl = fp_cross & 0xFFFFF;
- }
- break;
-
- case MPEG_SOUND_MONO_LEFT:
- val_ll = 0x80000;
- val_lr = 0x80000;
- val_rl = 0;
- val_rr = 0;
- break;
-
- case MPEG_SOUND_MONO_RIGHT:
- val_ll = 0;
- val_lr = 0;
- val_rl = 0x80000;
- val_rr = 0x80000;
- break;
-
- case MPEG_SOUND_KARAOKE:
- val_ll = 0x80001;
- val_lr = 0x7ffff;
- val_rl = 0x7ffff;
- val_rr = 0x80001;
- break;
- }
-
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- mas_writemem(MAS_BANK_D0, MAS_D0_OUT_LL, &val_ll, 1); /* LL */
- mas_writemem(MAS_BANK_D0, MAS_D0_OUT_LR, &val_lr, 1); /* LR */
- mas_writemem(MAS_BANK_D0, MAS_D0_OUT_RL, &val_rl, 1); /* RL */
- mas_writemem(MAS_BANK_D0, MAS_D0_OUT_RR, &val_rr, 1); /* RR */
-#elif CONFIG_HWCODEC == MAS3507D
- mas_writemem(MAS_BANK_D1, 0x7f8, &val_ll, 1); /* LL */
- mas_writemem(MAS_BANK_D1, 0x7f9, &val_lr, 1); /* LR */
- mas_writemem(MAS_BANK_D1, 0x7fa, &val_rl, 1); /* RL */
- mas_writemem(MAS_BANK_D1, 0x7fb, &val_rr, 1); /* RR */
-#endif
-}
-#endif /* !SIMULATOR */
-
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
-unsigned long mdb_shape_shadow = 0;
-unsigned long loudness_shadow = 0;
-#endif
-
-void mpeg_sound_set(int setting, int value)
-{
-#ifdef SIMULATOR
- setting = value;
-#else
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- int tmp;
-#endif
-
- if(!mpeg_is_initialized)
- return;
-
- switch(setting)
- {
- case SOUND_VOLUME:
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- tmp = 0x7f00 * value / 100;
- mas_codec_writereg(0x10, tmp & 0xff00);
-#else
- current_volume = -780 + (value * 960 / 100); /* tenth of dB */
- set_prescaled_volume();
-#endif
- break;
-
- case SOUND_BALANCE:
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- tmp = ((value * 127 / 100) & 0xff) << 8;
- mas_codec_writereg(0x11, tmp & 0xff00);
-#else
- current_balance = value * 960 / 100; /* tenth of dB */
- set_prescaled_volume();
-#endif
- break;
-
- case SOUND_BASS:
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- tmp = ((value * 8) & 0xff) << 8;
- mas_codec_writereg(0x14, tmp & 0xff00);
-#else
- mas_writereg(MAS_REG_KBASS, bass_table[value+15]);
- current_bass = value * 10;
- set_prescaled_volume();
-#endif
- break;
-
- case SOUND_TREBLE:
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- tmp = ((value * 8) & 0xff) << 8;
- mas_codec_writereg(0x15, tmp & 0xff00);
-#else
- mas_writereg(MAS_REG_KTREBLE, treble_table[value+15]);
- current_treble = value * 10;
- set_prescaled_volume();
-#endif
- break;
-
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- case SOUND_LOUDNESS:
- loudness_shadow = (loudness_shadow & 0x04) |
- (MAX(MIN(value * 4, 0x44), 0) << 8);
- mas_codec_writereg(MAS_REG_KLOUDNESS, loudness_shadow);
- break;
-
- case SOUND_AVC:
- switch (value) {
- case 1: /* 20ms */
- tmp = (0x1 << 8) | (0x8 << 12);
- break;
- case 2: /* 2s */
- tmp = (0x2 << 8) | (0x8 << 12);
- break;
- case 3: /* 4s */
- tmp = (0x4 << 8) | (0x8 << 12);
- break;
- case 4: /* 8s */
- tmp = (0x8 << 8) | (0x8 << 12);
- break;
- case -1: /* turn off and then turn on again to decay quickly */
- tmp = mas_codec_readreg(MAS_REG_KAVC);
- mas_codec_writereg(MAS_REG_KAVC, 0);
- break;
- default: /* off */
- tmp = 0;
- break;
- }
- mas_codec_writereg(MAS_REG_KAVC, tmp);
- break;
-
- case SOUND_MDB_STRENGTH:
- mas_codec_writereg(MAS_REG_KMDB_STR, (value & 0x7f) << 8);
- break;
-
- case SOUND_MDB_HARMONICS:
- tmp = value * 127 / 100;
- mas_codec_writereg(MAS_REG_KMDB_HAR, (tmp & 0x7f) << 8);
- break;
-
- case SOUND_MDB_CENTER:
- mas_codec_writereg(MAS_REG_KMDB_FC, (value/10) << 8);
- break;
-
- case SOUND_MDB_SHAPE:
- mdb_shape_shadow = (mdb_shape_shadow & 0x02) | ((value/10) << 8);
- mas_codec_writereg(MAS_REG_KMDB_SWITCH, mdb_shape_shadow);
- break;
-
- case SOUND_MDB_ENABLE:
- mdb_shape_shadow = (mdb_shape_shadow & ~0x02) | (value?2:0);
- mas_codec_writereg(MAS_REG_KMDB_SWITCH, mdb_shape_shadow);
- break;
-
- case SOUND_SUPERBASS:
- loudness_shadow = (loudness_shadow & ~0x04) |
- (value?4:0);
- mas_codec_writereg(MAS_REG_KLOUDNESS, loudness_shadow);
- break;
-#endif
- case SOUND_CHANNELS:
- channel_configuration = value;
- set_channel_config();
- break;
-
- case SOUND_STEREO_WIDTH:
- stereo_width = value;
- if (channel_configuration == MPEG_SOUND_CUSTOM)
- set_channel_config();
- break;
- }
-#endif /* SIMULATOR */
-}
-
-int mpeg_val2phys(int setting, int value)
-{
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- int result = 0;
-
- switch(setting)
- {
- case SOUND_LEFT_GAIN:
- case SOUND_RIGHT_GAIN:
- result = (value - 2) * 15;
- break;
-
- case SOUND_MIC_GAIN:
- result = value * 15 + 210;
- break;
-
- default:
- result = value;
- break;
- }
- return result;
-#else
- (void)setting;
- return value;
-#endif
-}
-
-#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
-/* This function works by telling the decoder that we have another
- crystal frequency than we actually have. It will adjust its internal
- parameters and the result is that the audio is played at another pitch.
-
- The pitch value is in tenths of percent.
-*/
-void mpeg_set_pitch(int pitch)
-{
- unsigned long val;
-
- /* invert pitch value */
- pitch = 1000000/pitch;
-
- /* Calculate the new (bogus) frequency */
- val = 18432*pitch/1000;
-
- mas_writemem(MAS_BANK_D0, MAS_D0_OFREQ_CONTROL, &val, 1);
-
- /* We must tell the MAS that the frequency has changed.
- This will unfortunately cause a short silence. */
- mas_writemem(MAS_BANK_D0, MAS_D0_IO_CONTROL_MAIN, &shadow_io_control_main, 1);
-}
-#endif
-
void mp3_init(int volume, int bass, int treble, int balance, int loudness,
int avc, int channel_config, int stereo_width,
int mdb_strength, int mdb_harmonics,
@@ -1035,25 +449,25 @@
PACR1 = (PACR1 & 0x3fff) | 0x4000; /* PA15 is IRQ3 */
#endif
- /* Must be done before calling mpeg_sound_set() */
- mpeg_is_initialized = true;
+ /* Must be done before calling sound_set() */
+ audio_is_initialized = true;
- mpeg_sound_set(SOUND_BASS, bass);
- mpeg_sound_set(SOUND_TREBLE, treble);
- mpeg_sound_set(SOUND_BALANCE, balance);
- mpeg_sound_set(SOUND_VOLUME, volume);
- mpeg_sound_set(SOUND_CHANNELS, channel_config);
- mpeg_sound_set(SOUND_STEREO_WIDTH, stereo_width);
+ sound_set(SOUND_BASS, bass);
+ sound_set(SOUND_TREBLE, treble);
+ sound_set(SOUND_BALANCE, balance);
+ sound_set(SOUND_VOLUME, volume);
+ sound_set(SOUND_CHANNELS, channel_config);
+ sound_set(SOUND_STEREO_WIDTH, stereo_width);
#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
- mpeg_sound_set(SOUND_LOUDNESS, loudness);
- mpeg_sound_set(SOUND_AVC, avc);
- mpeg_sound_set(SOUND_MDB_STRENGTH, mdb_strength);
- mpeg_sound_set(SOUND_MDB_HARMONICS, mdb_harmonics);
- mpeg_sound_set(SOUND_MDB_CENTER, mdb_center);
- mpeg_sound_set(SOUND_MDB_SHAPE, mdb_shape);
- mpeg_sound_set(SOUND_MDB_ENABLE, mdb_enable);
- mpeg_sound_set(SOUND_SUPERBASS, superbass);
+ sound_set(SOUND_LOUDNESS, loudness);
+ sound_set(SOUND_AVC, avc);
+ sound_set(SOUND_MDB_STRENGTH, mdb_strength);
+ sound_set(SOUND_MDB_HARMONICS, mdb_harmonics);
+ sound_set(SOUND_MDB_CENTER, mdb_center);
+ sound_set(SOUND_MDB_SHAPE, mdb_shape);
+ sound_set(SOUND_MDB_ENABLE, mdb_enable);
+ sound_set(SOUND_SUPERBASS, superbass);
#endif
#endif /* !SIMULATOR */
@@ -1201,7 +615,7 @@
playstart_tick = 0;
cumulative_ticks = 0;
callback_for_more = 0;
- mpeg_is_initialized = false;
+ audio_is_initialized = false;
#endif
}
void mp3_shutdown(void)
@@ -1228,24 +642,6 @@
(void)play;
}
-void mpeg_sound_set(int setting, int value)
-{
- /* a dummy */
- (void)setting;
- (void)value;
-}
-bool mp3_is_playing(void)
-{
- /* a dummy */
- return false;
-}
-
-int mpeg_val2phys(int setting, int value)
-{
- (void) setting;
- (void) value;
- return value; /* FIX dummy */
-}
unsigned char* mp3_get_pos(void)
{
/* a dummy */
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 250547e..d8de1a3 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -31,6 +31,7 @@
#include "mp3data.h"
#include "buffer.h"
#include "mp3_playback.h"
+#include "sound.h"
#ifndef SIMULATOR
#include "i2c.h"
#include "mas.h"
@@ -901,7 +902,7 @@
#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
/* Reset the AVC */
- mpeg_sound_set(SOUND_AVC, -1);
+ sound_set(SOUND_AVC, -1);
#endif /* #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) */
remove_current_tag();
diff --git a/firmware/sound.c b/firmware/sound.c
new file mode 100644
index 0000000..ab0ab1e
--- /dev/null
+++ b/firmware/sound.c
@@ -0,0 +1,634 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2005 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#include <stdbool.h>
+#include "config.h"
+#include "sound.h"
+#ifndef SIMULATOR
+#include "i2c.h"
+#include "mas.h"
+#include "dac.h"
+#include "system.h"
+#include "hwcompat.h"
+#endif
+
+#ifndef SIMULATOR
+extern bool audio_is_initialized;
+#endif
+
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+extern unsigned long shadow_io_control_main;
+extern unsigned shadow_codec_reg0;
+#endif
+
+static const char* const units[] =
+{
+ "%", /* Volume */
+ "dB", /* Bass */
+ "dB", /* Treble */
+ "%", /* Balance */
+ "dB", /* Loudness */
+ "", /* AVC */
+ "", /* Channels */
+ "%", /* Stereo width */
+ "dB", /* Left gain */
+ "dB", /* Right gain */
+ "dB", /* Mic gain */
+ "dB", /* MDB Strength */
+ "%", /* MDB Harmonics */
+ "Hz", /* MDB Center */
+ "Hz", /* MDB Shape */
+ "", /* MDB Enable */
+ "", /* Super bass */
+};
+
+static const int numdecimals[] =
+{
+ 0, /* Volume */
+ 0, /* Bass */
+ 0, /* Treble */
+ 0, /* Balance */
+ 0, /* Loudness */
+ 0, /* AVC */
+ 0, /* Channels */
+ 0, /* Stereo width */
+ 1, /* Left gain */
+ 1, /* Right gain */
+ 1, /* Mic gain */
+ 0, /* MDB Strength */
+ 0, /* MDB Harmonics */
+ 0, /* MDB Center */
+ 0, /* MDB Shape */
+ 0, /* MDB Enable */
+ 0, /* Super bass */
+};
+
+static const int steps[] =
+{
+ 1, /* Volume */
+ 1, /* Bass */
+ 1, /* Treble */
+ 1, /* Balance */
+ 1, /* Loudness */
+ 1, /* AVC */
+ 1, /* Channels */
+ 1, /* Stereo width */
+ 1, /* Left gain */
+ 1, /* Right gain */
+ 1, /* Mic gain */
+ 1, /* MDB Strength */
+ 1, /* MDB Harmonics */
+ 10, /* MDB Center */
+ 10, /* MDB Shape */
+ 1, /* MDB Enable */
+ 1, /* Super bass */
+};
+
+static const int minval[] =
+{
+ 0, /* Volume */
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ -12, /* Bass */
+ -12, /* Treble */
+#else
+ -15, /* Bass */
+ -15, /* Treble */
+#endif
+ -100, /* Balance */
+ 0, /* Loudness */
+ -1, /* AVC */
+ 0, /* Channels */
+ 0, /* Stereo width */
+ 0, /* Left gain */
+ 0, /* Right gain */
+ 0, /* Mic gain */
+ 0, /* MDB Strength */
+ 0, /* MDB Harmonics */
+ 20, /* MDB Center */
+ 50, /* MDB Shape */
+ 0, /* MDB Enable */
+ 0, /* Super bass */
+};
+
+static const int maxval[] =
+{
+ 100, /* Volume */
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ 12, /* Bass */
+ 12, /* Treble */
+#else
+ 15, /* Bass */
+ 15, /* Treble */
+#endif
+ 100, /* Balance */
+ 17, /* Loudness */
+ 4, /* AVC */
+ 5, /* Channels */
+ 255, /* Stereo width */
+ 15, /* Left gain */
+ 15, /* Right gain */
+ 15, /* Mic gain */
+ 127, /* MDB Strength */
+ 100, /* MDB Harmonics */
+ 300, /* MDB Center */
+ 300, /* MDB Shape */
+ 1, /* MDB Enable */
+ 1, /* Super bass */
+};
+
+static const int defaultval[] =
+{
+ 70, /* Volume */
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ 6, /* Bass */
+ 6, /* Treble */
+#else
+ 7, /* Bass */
+ 7, /* Treble */
+#endif
+ 0, /* Balance */
+ 0, /* Loudness */
+ 0, /* AVC */
+ 0, /* Channels */
+ 100, /* Stereo width */
+ 8, /* Left gain */
+ 8, /* Right gain */
+ 2, /* Mic gain */
+ 50, /* MDB Strength */
+ 48, /* MDB Harmonics */
+ 60, /* MDB Center */
+ 90, /* MDB Shape */
+ 0, /* MDB Enable */
+ 0, /* Super bass */
+};
+
+const char *sound_unit(int setting)
+{
+ return units[setting];
+}
+
+int sound_numdecimals(int setting)
+{
+ return numdecimals[setting];
+}
+
+int sound_steps(int setting)
+{
+ return steps[setting];
+}
+
+int sound_min(int setting)
+{
+ return minval[setting];
+}
+
+int sound_max(int setting)
+{
+ return maxval[setting];
+}
+
+int sound_default(int setting)
+{
+ return defaultval[setting];
+}
+
+#ifndef SIMULATOR
+#if CONFIG_HWCODEC == MAS3507D
+static const unsigned int bass_table[] =
+{
+ 0x9e400, /* -15dB */
+ 0xa2800, /* -14dB */
+ 0xa7400, /* -13dB */
+ 0xac400, /* -12dB */
+ 0xb1800, /* -11dB */
+ 0xb7400, /* -10dB */
+ 0xbd400, /* -9dB */
+ 0xc3c00, /* -8dB */
+ 0xca400, /* -7dB */
+ 0xd1800, /* -6dB */
+ 0xd8c00, /* -5dB */
+ 0xe0400, /* -4dB */
+ 0xe8000, /* -3dB */
+ 0xefc00, /* -2dB */
+ 0xf7c00, /* -1dB */
+ 0,
+ 0x800, /* 1dB */
+ 0x10000, /* 2dB */
+ 0x17c00, /* 3dB */
+ 0x1f800, /* 4dB */
+ 0x27000, /* 5dB */
+ 0x2e400, /* 6dB */
+ 0x35800, /* 7dB */
+ 0x3c000, /* 8dB */
+ 0x42800, /* 9dB */
+ 0x48800, /* 10dB */
+ 0x4e400, /* 11dB */
+ 0x53800, /* 12dB */
+ 0x58800, /* 13dB */
+ 0x5d400, /* 14dB */
+ 0x61800 /* 15dB */
+};
+
+static const unsigned int treble_table[] =
+{
+ 0xb2c00, /* -15dB */
+ 0xbb400, /* -14dB */
+ 0xc1800, /* -13dB */
+ 0xc6c00, /* -12dB */
+ 0xcbc00, /* -11dB */
+ 0xd0400, /* -10dB */
+ 0xd5000, /* -9dB */
+ 0xd9800, /* -8dB */
+ 0xde000, /* -7dB */
+ 0xe2800, /* -6dB */
+ 0xe7e00, /* -5dB */
+ 0xec000, /* -4dB */
+ 0xf0c00, /* -3dB */
+ 0xf5c00, /* -2dB */
+ 0xfac00, /* -1dB */
+ 0,
+ 0x5400, /* 1dB */
+ 0xac00, /* 2dB */
+ 0x10400, /* 3dB */
+ 0x16000, /* 4dB */
+ 0x1c000, /* 5dB */
+ 0x22400, /* 6dB */
+ 0x28400, /* 7dB */
+ 0x2ec00, /* 8dB */
+ 0x35400, /* 9dB */
+ 0x3c000, /* 10dB */
+ 0x42c00, /* 11dB */
+ 0x49c00, /* 12dB */
+ 0x51800, /* 13dB */
+ 0x58400, /* 14dB */
+ 0x5f800 /* 15dB */
+};
+
+static const unsigned int prescale_table[] =
+{
+ 0x80000, /* 0db */
+ 0x8e000, /* 1dB */
+ 0x9a400, /* 2dB */
+ 0xa5800, /* 3dB */
+ 0xaf400, /* 4dB */
+ 0xb8000, /* 5dB */
+ 0xbfc00, /* 6dB */
+ 0xc6c00, /* 7dB */
+ 0xcd000, /* 8dB */
+ 0xd25c0, /* 9dB */
+ 0xd7800, /* 10dB */
+ 0xdc000, /* 11dB */
+ 0xdfc00, /* 12dB */
+ 0xe3400, /* 13dB */
+ 0xe6800, /* 14dB */
+ 0xe9400 /* 15dB */
+};
+
+/* all values in tenth of dB */
+int current_volume = 0; /* -780..+180 */
+int current_balance = 0; /* -960..+960 */
+int current_treble = 0; /* -150..+150 */
+int current_bass = 0; /* -150..+150 */
+
+/* convert tenth of dB volume to register value */
+static int tenthdb2reg(int db) {
+ if (db < -540)
+ return (db + 780) / 30;
+ else
+ return (db + 660) / 15;
+}
+
+void set_prescaled_volume(void)
+{
+ int prescale;
+ int l, r;
+
+ prescale = MAX(current_bass, current_treble);
+ if (prescale < 0)
+ prescale = 0; /* no need to prescale if we don't boost
+ bass or treble */
+
+ mas_writereg(MAS_REG_KPRESCALE, prescale_table[prescale/10]);
+
+ /* gain up the analog volume to compensate the prescale reduction gain,
+ * but limit to +18 dB (the maximum the DAC can do */
+ if (current_volume + prescale > 180)
+ prescale = 180 - current_volume;
+ l = r = current_volume + prescale;
+
+ if (current_balance > 0)
+ {
+ l -= current_balance;
+ if (l < -780)
+ l = -780;
+ }
+ if (current_balance < 0)
+ {
+ r += current_balance;
+ if (r < -780)
+ r = -780;
+ }
+
+ dac_volume(tenthdb2reg(l), tenthdb2reg(r), false);
+}
+#endif /* MAS3507D */
+#endif /* !SIMULATOR */
+
+int channel_configuration = SOUND_CHAN_STEREO;
+int stereo_width = 100;
+
+#ifndef SIMULATOR
+static void set_channel_config(void)
+{
+ /* default values: stereo */
+ unsigned long val_ll = 0x80000;
+ unsigned long val_lr = 0;
+ unsigned long val_rl = 0;
+ unsigned long val_rr = 0x80000;
+
+ switch(channel_configuration)
+ {
+ /* case SOUND_CHAN_STEREO unnecessary */
+
+ case SOUND_CHAN_MONO:
+ val_ll = 0xc0000;
+ val_lr = 0xc0000;
+ val_rl = 0xc0000;
+ val_rr = 0xc0000;
+ break;
+
+ case SOUND_CHAN_CUSTOM:
+ {
+ /* fixed point variables (matching MAS internal format)
+ integer part: upper 13 bits (inlcuding sign)
+ fractional part: lower 19 bits */
+ long fp_width, fp_straight, fp_cross;
+
+ fp_width = (stereo_width << 19) / 100;
+ if (stereo_width <= 100)
+ {
+ fp_straight = - ((1<<19) + fp_width) / 2;
+ fp_cross = fp_straight + fp_width;
+ }
+ else
+ {
+ fp_straight = - (1<<19);
+ fp_cross = ((2 * fp_width / (((1<<19) + fp_width) >> 10))
+ << 9) - (1<<19);
+ }
+ val_ll = val_rr = fp_straight & 0xFFFFF;
+ val_lr = val_rl = fp_cross & 0xFFFFF;
+ }
+ break;
+
+ case SOUND_CHAN_MONO_LEFT:
+ val_ll = 0x80000;
+ val_lr = 0x80000;
+ val_rl = 0;
+ val_rr = 0;
+ break;
+
+ case SOUND_CHAN_MONO_RIGHT:
+ val_ll = 0;
+ val_lr = 0;
+ val_rl = 0x80000;
+ val_rr = 0x80000;
+ break;
+
+ case SOUND_CHAN_KARAOKE:
+ val_ll = 0x80001;
+ val_lr = 0x7ffff;
+ val_rl = 0x7ffff;
+ val_rr = 0x80001;
+ break;
+ }
+
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ mas_writemem(MAS_BANK_D0, MAS_D0_OUT_LL, &val_ll, 1); /* LL */
+ mas_writemem(MAS_BANK_D0, MAS_D0_OUT_LR, &val_lr, 1); /* LR */
+ mas_writemem(MAS_BANK_D0, MAS_D0_OUT_RL, &val_rl, 1); /* RL */
+ mas_writemem(MAS_BANK_D0, MAS_D0_OUT_RR, &val_rr, 1); /* RR */
+#elif CONFIG_HWCODEC == MAS3507D
+ mas_writemem(MAS_BANK_D1, 0x7f8, &val_ll, 1); /* LL */
+ mas_writemem(MAS_BANK_D1, 0x7f9, &val_lr, 1); /* LR */
+ mas_writemem(MAS_BANK_D1, 0x7fa, &val_rl, 1); /* RL */
+ mas_writemem(MAS_BANK_D1, 0x7fb, &val_rr, 1); /* RR */
+#endif
+}
+#endif /* !SIMULATOR */
+
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+unsigned long mdb_shape_shadow = 0;
+unsigned long loudness_shadow = 0;
+#endif
+
+void sound_set(int setting, int value)
+{
+#ifdef SIMULATOR
+ setting = value;
+#else
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ int tmp;
+#endif
+
+ if(!audio_is_initialized)
+ return;
+
+ switch(setting)
+ {
+ case SOUND_VOLUME:
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ tmp = 0x7f00 * value / 100;
+ mas_codec_writereg(0x10, tmp & 0xff00);
+#elif CONFIG_HWCODEC == MAS3507D
+ current_volume = -780 + (value * 960 / 100); /* tenth of dB */
+ set_prescaled_volume();
+#endif
+ break;
+
+ case SOUND_BALANCE:
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ tmp = ((value * 127 / 100) & 0xff) << 8;
+ mas_codec_writereg(0x11, tmp & 0xff00);
+#elif CONFIG_HWCODEC == MAS3507D
+ current_balance = value * 960 / 100; /* tenth of dB */
+ set_prescaled_volume();
+#endif
+ break;
+
+ case SOUND_BASS:
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ tmp = ((value * 8) & 0xff) << 8;
+ mas_codec_writereg(0x14, tmp & 0xff00);
+#elif CONFIG_HWCODEC == MAS3507D
+ mas_writereg(MAS_REG_KBASS, bass_table[value+15]);
+ current_bass = value * 10;
+ set_prescaled_volume();
+#endif
+ break;
+
+ case SOUND_TREBLE:
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ tmp = ((value * 8) & 0xff) << 8;
+ mas_codec_writereg(0x15, tmp & 0xff00);
+#elif CONFIG_HWCODEC == MAS3507D
+ mas_writereg(MAS_REG_KTREBLE, treble_table[value+15]);
+ current_treble = value * 10;
+ set_prescaled_volume();
+#endif
+ break;
+
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ case SOUND_LOUDNESS:
+ loudness_shadow = (loudness_shadow & 0x04) |
+ (MAX(MIN(value * 4, 0x44), 0) << 8);
+ mas_codec_writereg(MAS_REG_KLOUDNESS, loudness_shadow);
+ break;
+
+ case SOUND_AVC:
+ switch (value) {
+ case 1: /* 20ms */
+ tmp = (0x1 << 8) | (0x8 << 12);
+ break;
+ case 2: /* 2s */
+ tmp = (0x2 << 8) | (0x8 << 12);
+ break;
+ case 3: /* 4s */
+ tmp = (0x4 << 8) | (0x8 << 12);
+ break;
+ case 4: /* 8s */
+ tmp = (0x8 << 8) | (0x8 << 12);
+ break;
+ case -1: /* turn off and then turn on again to decay quickly */
+ tmp = mas_codec_readreg(MAS_REG_KAVC);
+ mas_codec_writereg(MAS_REG_KAVC, 0);
+ break;
+ default: /* off */
+ tmp = 0;
+ break;
+ }
+ mas_codec_writereg(MAS_REG_KAVC, tmp);
+ break;
+
+ case SOUND_MDB_STRENGTH:
+ mas_codec_writereg(MAS_REG_KMDB_STR, (value & 0x7f) << 8);
+ break;
+
+ case SOUND_MDB_HARMONICS:
+ tmp = value * 127 / 100;
+ mas_codec_writereg(MAS_REG_KMDB_HAR, (tmp & 0x7f) << 8);
+ break;
+
+ case SOUND_MDB_CENTER:
+ mas_codec_writereg(MAS_REG_KMDB_FC, (value/10) << 8);
+ break;
+
+ case SOUND_MDB_SHAPE:
+ mdb_shape_shadow = (mdb_shape_shadow & 0x02) | ((value/10) << 8);
+ mas_codec_writereg(MAS_REG_KMDB_SWITCH, mdb_shape_shadow);
+ break;
+
+ case SOUND_MDB_ENABLE:
+ mdb_shape_shadow = (mdb_shape_shadow & ~0x02) | (value?2:0);
+ mas_codec_writereg(MAS_REG_KMDB_SWITCH, mdb_shape_shadow);
+ break;
+
+ case SOUND_SUPERBASS:
+ loudness_shadow = (loudness_shadow & ~0x04) |
+ (value?4:0);
+ mas_codec_writereg(MAS_REG_KLOUDNESS, loudness_shadow);
+ break;
+#endif
+ case SOUND_CHANNELS:
+ channel_configuration = value;
+ set_channel_config();
+ break;
+
+ case SOUND_STEREO_WIDTH:
+ stereo_width = value;
+ if (channel_configuration == SOUND_CHAN_CUSTOM)
+ set_channel_config();
+ break;
+ }
+#endif /* SIMULATOR */
+}
+
+int sound_val2phys(int setting, int value)
+{
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+ int result = 0;
+
+ switch(setting)
+ {
+ case SOUND_LEFT_GAIN:
+ case SOUND_RIGHT_GAIN:
+ result = (value - 2) * 15;
+ break;
+
+ case SOUND_MIC_GAIN:
+ result = value * 15 + 210;
+ break;
+
+ default:
+ result = value;
+ break;
+ }
+ return result;
+#else
+ (void)setting;
+ return value;
+#endif
+}
+
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
+/* This function works by telling the decoder that we have another
+ crystal frequency than we actually have. It will adjust its internal
+ parameters and the result is that the audio is played at another pitch.
+
+ The pitch value is in tenths of percent.
+*/
+void sound_set_pitch(int pitch)
+{
+ unsigned long val;
+
+ /* invert pitch value */
+ pitch = 1000000/pitch;
+
+ /* Calculate the new (bogus) frequency */
+ val = 18432*pitch/1000;
+
+ mas_writemem(MAS_BANK_D0, MAS_D0_OFREQ_CONTROL, &val, 1);
+
+ /* We must tell the MAS that the frequency has changed.
+ This will unfortunately cause a short silence. */
+ mas_writemem(MAS_BANK_D0, MAS_D0_IO_CONTROL_MAIN, &shadow_io_control_main, 1);
+}
+#elif defined SIMULATOR
+void sound_set_pitch(int pitch)
+{
+ (void)pitch;
+}
+#endif
+
+#if CONFIG_HWCODEC == MASNONE
+bool mp3_is_playing(void)
+{
+ /* a dummy */
+ return false;
+}
+#endif