6 files changed, 20 insertions, 17 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 7a1c2a3df8..57554d8c6f 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -790,7 +790,7 @@ bool dbg_mas(void)
     return false;
 }
 
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
 bool dbg_mas_codec(void)
 {
     char buf[32];
@@ -1050,22 +1050,22 @@ bool dbg_mas_info(void)
                 snprintf(buf, 32, "6f: %05x   ", mas_readreg(0x6f) & 0xfffff);
                 break;
             case 8:
-                mas_readmem(MAS_BANK_D0, 0x300, &val, 1);
+                mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_FRAME_COUNT, &val, 1);
                 lcd_puts(0, 0, "Frame Count");
                 snprintf(buf, 32, "0/300: %04x", val & 0xffff);
                 break;
             case 9:
-                mas_readmem(MAS_BANK_D0, 0x301, &val, 1);
+                mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_1, &val, 1);
                 lcd_puts(0, 0, "Status1    ");
                 snprintf(buf, 32, "0/301: %04x", val & 0xffff);
                 break;
             case 10:
-                mas_readmem(MAS_BANK_D0, 0x302, &val, 1);
+                mas_readmem(MAS_BANK_D0, MAS_D0_MPEG_STATUS_2, &val, 1);
                 lcd_puts(0, 0, "Status2    ");
                 snprintf(buf, 32, "0/302: %04x", val & 0xffff);
                 break;
             case 11:
-                mas_readmem(MAS_BANK_D0, 0x303, &val, 1);
+                mas_readmem(MAS_BANK_D0, MAS_D0_CRC_ERROR_COUNT, &val, 1);
                 lcd_puts(0, 0, "CRC Count  ");
                 snprintf(buf, 32, "0/303: %04x", val & 0xffff);
                 break;
@@ -1539,7 +1539,7 @@ bool debug_menu(void)
         { "View MAS info", dbg_mas_info },
 #endif
         { "View MAS regs", dbg_mas },
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
         { "View MAS codec", dbg_mas_codec },
 #endif
 #ifdef HAVE_LCD_BITMAP
diff --git a/apps/plugin.c b/apps/plugin.c
index 51f7a610dd..24a9dd4da6 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -211,7 +211,7 @@ static const struct plugin_api rockbox_api = {
     mas_writemem,
     mas_readreg,
     mas_writereg,
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
     mas_codec_writereg,
     mas_codec_readreg,
 #endif
@@ -244,7 +244,7 @@ static const struct plugin_api rockbox_api = {
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
 
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
     mpeg_set_pitch,
 
     peak_meter_scale_value,
diff --git a/apps/plugin.h b/apps/plugin.h
index 445427ffd5..52a060d428 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -239,7 +239,7 @@ struct plugin_api {
     int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len);
     int (*mas_readreg)(int reg);
     int (*mas_writereg)(int reg, unsigned int val);
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
     int (*mas_codec_writereg)(int reg, unsigned int val);
     int (*mas_codec_readreg)(int reg);
 #endif
@@ -277,7 +277,7 @@ struct plugin_api {
     /* new stuff at the end, sort into place next time
        the API gets incompatible */
     
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
     void (*mpeg_set_pitch)(int pitch);        
 
     unsigned short (*peak_meter_scale_value)(unsigned short val,
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index b76a08cb80..24b2b6939f 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -230,7 +230,7 @@ static void update_icons(void)
         LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT,
         BMPWIDTH, BMPHEIGHT, true);
 
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
     /* The scale icon */
     rb->lcd_bitmap(SCALE_BMP[rb->peak_meter_get_use_dbfs()],
         2 *LCD_WIDTH/3 + LCD_WIDTH/3 / 2 - BMPWIDTH/2, LCD_HEIGHT - BMPHEIGHT,
@@ -849,7 +849,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
             {
                 /* read volume info */
                 unsigned short volume;
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
                 volume = rb->mas_codec_readreg(0x0c);
                 volume += rb->mas_codec_readreg(0x0d);
                 volume = volume / 2;
@@ -1003,7 +1003,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                 lastx = time_to_xpos(mp3->elapsed);
                 break;
 
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
             case BUTTON_ON | BUTTON_RIGHT:
                 rb->mpeg_set_pitch(1500);
                 splitedit_invalidate_osci();
@@ -1060,7 +1060,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                 break;
 
             case BUTTON_F3:
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
                 rb->peak_meter_set_use_dbfs(rb->peak_meter_get_use_dbfs() +1);
 #endif
                 splitedit_invalidate_osci();
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 98c2b27008..8bec6e81de 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -49,6 +49,8 @@
 #include "errno.h"
 #include "talk.h"
 
+#ifdef HAVE_RECORDING
+
 bool f2_rec_screen(void);
 bool f3_rec_screen(void);
 
@@ -539,7 +541,7 @@ bool recording_screen(void)
                     {
                         gain = MAX(global_settings.rec_left_gain,
                                    global_settings.rec_right_gain);
-                        
+
                         snprintf(buf, 32, "%s: %s", str(LANG_RECORDING_GAIN),
                                  fmt_gain(SOUND_LEFT_GAIN, gain,
                                           buf2, sizeof(buf2)));
@@ -819,3 +821,4 @@ bool f3_rec_screen(void)
     return false;
 }
 #endif
+#endif /* HAVE_RECORDING */
diff --git a/apps/settings.c b/apps/settings.c
index a13abecfc7..b3b9ef1db8 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -164,7 +164,7 @@ static const struct bit_entry rtc_bits[] =
     {8 | SIGNED, S_O(balance), 0, "balance", NULL }, /* -100...100 */
     {5 | SIGNED, S_O(bass), 0, "bass", NULL }, /* -15..+15 / -12..+12 */
     {5 | SIGNED, S_O(treble), 0, "treble", NULL }, /* -15..+15 / -12..+12 */
-#if CONFIG_HWCODEC == MAS3587F
+#if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F)
     {5, S_O(loudness), 0, "loudness", NULL }, /* 0...17 */
     {3, S_O(avc), 0, "auto volume", "off,20ms,2,4,8" },
     {1, S_O(superbass), false, "superbass", off_on },
@@ -710,7 +710,7 @@ void sound_settings_apply(void)
     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);
-#if CONFIG_HWCODEC == MAS3587F
+#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);