20 files changed, 144 insertions, 123 deletions

diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index 1e889a3339..4ba5829f56 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -33,7 +33,7 @@
 /* skip whole file for an MMC-based system, FIXME in makefile */
 #ifndef HAVE_MMC 
 
-#ifdef HAVE_SCF5249
+#if CONFIG_CPU == SCF5249
 
 /* don't use sh7034 assembler routines */
 #define PREFER_C_READING
@@ -43,7 +43,7 @@
 #define ATA_DATA        (*((volatile unsigned short*)ATA_IOBASE))
 #define ATA_CONTROL     (*((volatile unsigned short*)ATA_IOBASE + 0xe))
 
-#elif defined HAVE_SH7034
+#elif CONFIG_CPU == SH7034
 
 #define ATA_IOBASE      0x06100100
 #define ATA_DATA        (*((volatile unsigned short*)0x06104100))
@@ -879,7 +879,7 @@ int ata_hard_reset(void)
 {
     int ret;
 
-#ifdef HAVE_SH7034
+#if CONFIG_CPU == SH7034
     /* state HRR0 */
     and_b(~0x02, &PADRH); /* assert _RESET */
     sleep(1); /* > 25us */
@@ -979,7 +979,7 @@ static int master_slave_detect(void)
     return 0;
 }
 
-#ifdef HAVE_SH7034 /* special archos quirk */
+#if CONFIG_CPU == SH7034 /* special archos quirk */
 static int io_address_detect(void)
 {   /* now, use the HW mask instead of probing */
     if (read_hw_mask() & ATA_ADDRESS_200)
@@ -1001,7 +1001,7 @@ static int io_address_detect(void)
 
 void ata_enable(bool on)
 {
-#ifdef HAVE_SH7034
+#if CONFIG_CPU == SH7034
     if(on)
         and_b(~0x80, &PADRL); /* enable ATA */
     else
@@ -1129,7 +1129,7 @@ int ata_init(void)
 
     led(false);
 
-#ifdef HAVE_SH7034
+#if CONFIG_CPU == SH7034
     /* Port A setup */
     or_b(0x02, &PAIORH); /* output for ATA reset */
     or_b(0x02, &PADRH); /* release ATA reset */
@@ -1159,7 +1159,7 @@ int ata_init(void)
         if (rc)
             return -10 + rc;
 
-#ifdef HAVE_SH7034
+#if CONFIG_CPU == SH7034
         rc = io_address_detect();
         if (rc)
             return -20 + rc;
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index ebe3389454..d05f81bb45 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -36,7 +36,7 @@
 struct event_queue button_queue;
 
 static int lastbtn;   /* Last valid button status */
-#if defined(HAVE_RECORDER_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
+#if (CONFIG_KEYPAD == RECORDER_PAD) || (CONFIG_KEYPAD == ONDIO_PAD)
 static int last_read; /* Last button status, for debouncing/filtering */
 static bool flipped; /* bottons can be flipped to match the LCD flip */
 #endif
@@ -179,7 +179,7 @@ int button_get_w_tmo(int ticks)
     return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE;
 }
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
 
 /* AJBR buttons are connected to the CPU as follows:
  *
@@ -348,7 +348,7 @@ static int button_read(void)
     return retval;
 }
 
-#elif defined(HAVE_PLAYER_KEYPAD)
+#elif CONFIG_KEYPAD == PLAYER_PAD
 
 /* The player has two buttons on port pins:
 
@@ -397,7 +397,7 @@ static int button_read(void)
     return btn;
 }
 
-#elif defined HAVE_ONDIO_KEYPAD
+#elif CONFIG_KEYPAD == ONDIO_PAD
 
 /*
  * helper function to swap UP/DOWN, LEFT/RIGHT
diff --git a/firmware/drivers/fmradio.c b/firmware/drivers/fmradio.c
index 604005b884..a0394b2a57 100644
--- a/firmware/drivers/fmradio.c
+++ b/firmware/drivers/fmradio.c
@@ -23,7 +23,7 @@
 #include "debug.h"
 #include "system.h"
 
-#ifdef HAVE_FMRADIO
+#ifdef CONFIG_TUNER
 
 /* Signals:
    DI (Data In)     - PB0 (doubles as data pin for the LCD)
diff --git a/firmware/drivers/mas.c b/firmware/drivers/mas.c
index a6fd1d1a21..9f6e0943c7 100644
--- a/firmware/drivers/mas.c
+++ b/firmware/drivers/mas.c
@@ -132,7 +132,7 @@ int mas_writemem(int bank, int addr, const unsigned long* src, int len)
 
     j = 0;
     while(len--) {
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
         buf[i++] = 0;
         buf[i++] = ptr[j+1];
         buf[i++] = ptr[j+2];
@@ -232,7 +232,7 @@ static int mas_devread(unsigned long *dest, int len)
             if (i2c_getack()) {
                 for (i=0;len;i++) {
                     len--;
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
                     i2c_inb(0); /* Dummy read */
                     ptr[i*4+0] = 0;
                     ptr[i*4+1] = i2c_inb(0) & 0x0f;
@@ -266,7 +266,7 @@ static int mas_devread(unsigned long *dest, int len)
     return ret;
 }
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 void mas_reset(void)
 {
     or_b(0x01, &PAIORH);
diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c
index bf2b26b866..8a16cfb3b5 100644
--- a/firmware/drivers/serial.c
+++ b/firmware/drivers/serial.c
@@ -87,7 +87,7 @@ int remote_control_rx(void)
         }
         else
         {
-#ifndef HAVE_ONDIO_KEYPAD
+#if CONFIG_KEYPAD != ONDIO_PAD
             switch (btn)
             {
                 case STOP:
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 50a9b1d8fd..562344ea44 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -30,7 +30,7 @@ int button_get (bool block);
 int button_get_w_tmo(int ticks);
 int button_status(void);
 void button_clear_queue(void);
-#if defined(HAVE_RECORDER_KEYPAD) || defined(HAVE_ONDIO_KEYPAD)
+#if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ONDIO_PAD
 void button_set_flip(bool flip); /* turn 180 degrees */
 #endif
 
@@ -51,7 +51,7 @@ void button_set_flip(bool flip); /* turn 180 degrees */
 #define BUTTON_RC_LEFT          (BUTTON_LEFT | BUTTON_REMOTE)
 #define BUTTON_RC_RIGHT         (BUTTON_RIGHT| BUTTON_REMOTE)
 
-#ifdef HAVE_RECORDER_KEYPAD
+#if CONFIG_KEYPAD == RECORDER_PAD
 
 /* Recorder specific button codes */
 #define BUTTON_ON               0x0001
@@ -66,7 +66,7 @@ void button_set_flip(bool flip); /* turn 180 degrees */
 #define BUTTON_RC_PLAY          (BUTTON_PLAY | BUTTON_REMOTE)
 #define BUTTON_RC_STOP          (BUTTON_OFF | BUTTON_REMOTE)
 
-#elif defined(HAVE_PLAYER_KEYPAD)
+#elif CONFIG_KEYPAD == PLAYER_PAD
 
 /* Jukebox 6000 and Studio specific button codes */
 #define BUTTON_ON               0x0001
@@ -77,7 +77,7 @@ void button_set_flip(bool flip); /* turn 180 degrees */
 #define BUTTON_RC_PLAY          (BUTTON_PLAY | BUTTON_REMOTE)
 #define BUTTON_RC_STOP          (BUTTON_STOP | BUTTON_REMOTE)
 
-#elif defined HAVE_ONDIO_KEYPAD
+#elif CONFIG_KEYPAD == ONDIO_PAD
 
 /* Ondio specific button codes */
 #define BUTTON_OFF              0x0002
@@ -85,7 +85,7 @@ void button_set_flip(bool flip); /* turn 180 degrees */
 #define BUTTON_DOWN             0x0020
 #define BUTTON_MENU             0x0100
 
-#endif /* HAVE_RECORDER/PLAYER/ONDIO_KEYPAD */
+#endif /* RECORDER/PLAYER/ONDIO KEYPAD */
 
 #endif /* _BUTTON_H_ */
 
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 4f9decf74b..af7ca91315 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -9,7 +9,7 @@
 #define LCD_HEIGHT 64
 
 /* define this if you have a Recorder style 10-key keyboard */
-#define HAVE_RECORDER_KEYPAD 1
+#define CONFIG_KEYPAD RECORDER_PAD
 
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
@@ -17,10 +17,10 @@
 #ifndef SIMULATOR
 
 /* Define this if you have a MAS3587F */
-#define HAVE_MAS3587F
+#define CONFIG_HWCODEC MAS3587F
 
 /* Define this if you have a SH7034 */
-#define HAVE_SH7034
+#define CONFIG_CPU SH7034
 
 /* Define this if you have a FM Recorder key system */
 #define HAVE_FMADC 1
@@ -56,7 +56,7 @@
 #define HAVE_ALARM_MOD 1
 
 /* Define this if you have an FM Radio */
-#define HAVE_FMRADIO 1
+#define CONFIG_TUNER S1A0903X01
 
 /* How to detect USB */
 #define USB_FMRECORDERSTYLE 1
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index 9917b63e68..6343ebd9e2 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -9,7 +9,7 @@
 #define LCD_HEIGHT 128
 
 /* define this if you have the Recorder's 10-key keyboard */
-#define HAVE_RECORDER_KEYPAD 1
+#define CONFIG_KEYPAD RECORDER_PAD
 
 #ifndef SIMULATOR
 
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index 36fd095507..d27444840b 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -9,15 +9,15 @@
 #define LCD_HEIGHT 64
 
 /* define this if you have an Ondio style 6-key keyboard */
-#define HAVE_ONDIO_KEYPAD
+#define CONFIG_KEYPAD ONDIO_PAD
 
 #ifndef SIMULATOR
 
 /* Define this if you have a SH7034 */
-#define HAVE_SH7034
+#define CONFIG_CPU SH7034
 
 /* Define this if you have a MAS3587F */
-#define HAVE_MAS3587F
+#define CONFIG_HWCODEC MAS3587F
 
 /* Define this if you have a LiIon battery */
 /* #define HAVE_LIION */
@@ -50,7 +50,7 @@
 /* #define HAVE_ALARM_MOD 1 */
 
 /* Define this if you have an FM Radio */
-#define HAVE_FMRADIO 1
+#define CONFIG_TUNER TEA5767
 
 /* How to detect USB */
 #define USB_FMRECORDERSTYLE 1 /* like FM, on AN1 */
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 4b276db54f..0a270e8ae5 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -9,15 +9,15 @@
 #define LCD_HEIGHT 64
 
 /* define this if you have an Ondio style 6-key keyboard */
-#define HAVE_ONDIO_KEYPAD
+#define CONFIG_KEYPAD ONDIO_PAD
 
 #ifndef SIMULATOR
 
 /* Define this if you have a SH7034 */
-#define HAVE_SH7034
+#define CONFIG_CPU SH7034
 
-/* Define this if you have a MAS3587F */
-#define HAVE_MAS3587F
+/* Define this if you have a MAS3539F */
+#define CONFIG_HWCODEC MAS3587F /* will be MAS3539F once prepared */
 
 /* Define this if you have a LiIon battery */
 /* #define HAVE_LIION */
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index 99d5a61240..8bd63c42e6 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -6,15 +6,15 @@
 #define LCD_HEIGHT      (4*16+2*24) /* 4*char + 2*icons */
 
 /* define this if you have the Player's keyboard */
-#define HAVE_PLAYER_KEYPAD 1
+#define CONFIG_KEYPAD PLAYER_PAD
 
 #ifndef SIMULATOR
 
 /* Define this if you have a SH7034 */
-#define HAVE_SH7034
+#define CONFIG_CPU SH7034
 
 /* Define this if you have a MAS3507D */
-#define HAVE_MAS3507D
+#define CONFIG_HWCODEC MAS3507D
 
 /* Define this if you have a DAC3550A */
 #define HAVE_DAC3550A
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index 704e9e6d8d..89e19f32f6 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -9,7 +9,7 @@
 #define LCD_HEIGHT 64
 
 /* define this if you have the Recorder's 10-key keyboard */
-#define HAVE_RECORDER_KEYPAD 1
+#define CONFIG_KEYPAD RECORDER_PAD
 
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
@@ -17,10 +17,10 @@
 #ifndef SIMULATOR
 
 /* Define this if you have a MAS3587F */
-#define HAVE_MAS3587F
+#define CONFIG_HWCODEC MAS3587F
 
 /* Define this if you have a SH7034 */
-#define HAVE_SH7034
+#define CONFIG_CPU SH7034
 
 /* Define this if you have charging control */
 #define HAVE_CHARGE_CTRL
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index efec9c20d1..56967cfa10 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -9,7 +9,7 @@
 #define LCD_HEIGHT 64
 
 /* define this if you have a Recorder style 10-key keyboard */
-#define HAVE_RECORDER_KEYPAD 1
+#define CONFIG_KEYPAD RECORDER_PAD
 
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
@@ -17,10 +17,10 @@
 #ifndef SIMULATOR
 
 /* Define this if you have a SH7034 */
-#define HAVE_SH7034
+#define CONFIG_CPU SH7034
 
 /* Define this if you have a MAS3587F */
-#define HAVE_MAS3587F
+#define CONFIG_HWCODEC MAS3587F
 
 /* Define this if you have a FM Recorder key system */
 #define HAVE_FMADC 1
@@ -56,7 +56,7 @@
 #define HAVE_ALARM_MOD 1
 
 /* Define this if you have an FM Radio */
-#define HAVE_FMRADIO 1
+#define CONFIG_TUNER S1A0903X01
 
 /* How to detect USB */
 #define USB_FMRECORDERSTYLE 1
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 49306d4e81..524a2249d3 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -20,6 +20,27 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+/* symbolic names for multiple choice configurations: */
+
+/* CONFIG_TUNER */
+#define S1A0903X01 0 /* Samsung */
+#define TEA5767    1 /* Philips */
+
+/* CONFIG_HWCODEC */
+#define MAS3587F 3587
+#define MAS3507D 3507
+#define MAS3539F 3539
+
+/* CONFIG_CPU */
+#define SH7034  7034
+#define SCF5249 5249
+
+/* CONFIG_KEYPAD */
+#define PLAYER_PAD   0
+#define RECORDER_PAD 1
+#define ONDIO_PAD    2
+
+/* now go and pick yours */
 #if defined(ARCHOS_PLAYER)
 #include "config-player.h"
 #elif defined(ARCHOS_RECORDER)
diff --git a/firmware/export/mas.h b/firmware/export/mas.h
index 8a60389ade..dac946ea63 100644
--- a/firmware/export/mas.h
+++ b/firmware/export/mas.h
@@ -27,7 +27,7 @@
 /*
         MAS I2C defs
 */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 #define MAS_ADR         0x3c
 #define MAS_DEV_WRITE   (MAS_ADR | 0x00)
 #define MAS_DEV_READ    (MAS_ADR | 0x01)
@@ -38,7 +38,7 @@
 #endif
 
 /* registers..*/
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 #define MAS_DATA_WRITE  0x68
 #define MAS_DATA_READ   0x69
 #define MAS_CODEC_WRITE  0x6c
@@ -62,7 +62,7 @@
 #define MAS_REG_KPRESCALE       0xe7
 #define MAS_REG_KBASS           0x6b
 #define MAS_REG_KTREBLE         0x6f
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 #define MAS_REG_KMDB_SWITCH     0x21
 #define MAS_REG_KMDB_STR        0x22
 #define MAS_REG_KMDB_HAR        0x23
@@ -78,7 +78,7 @@
 /*
  * MAS commands
  */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 #define MAS_CMD_READ_ANCILLARY  0x50
 #define MAS_CMD_FAST_PRG_DL     0x60
 #define MAS_CMD_READ_IC_VER     0x70
diff --git a/firmware/export/mp3_playback.h b/firmware/export/mp3_playback.h
index 12ef734bfe..dd56940c37 100644
--- a/firmware/export/mp3_playback.h
+++ b/firmware/export/mp3_playback.h
@@ -39,13 +39,13 @@ 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 defined(HAVE_MAS3587F) || defined(SIMULATOR)
+#if CONFIG_HWCODEC == MAS3587F || defined(SIMULATOR)
 void mpeg_set_pitch(int percent);
 #endif
 
 
 /* exported just for mpeg.c, to keep the recording there */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 void demand_irq_enable(bool on);
 #endif
 
diff --git a/firmware/export/mpeg.h b/firmware/export/mpeg.h
index 3088dc5ffd..66e6ad950c 100644
--- a/firmware/export/mpeg.h
+++ b/firmware/export/mpeg.h
@@ -74,7 +74,7 @@ struct mp3entry* mpeg_current_track(void);
 struct mp3entry* mpeg_next_track(void);
 bool mpeg_has_changed_track(void);
 int mpeg_status(void);
-#if defined(HAVE_MAS3587F) || defined(SIMULATOR)
+#if (CONFIG_HWCODEC == MAS3587F) || defined(SIMULATOR)
 void mpeg_init_recording(void);
 void mpeg_init_playback(void);
 void mpeg_record(const char *filename);
diff --git a/firmware/mp3_playback.c b/firmware/mp3_playback.c
index 7f96ee075a..fae8377c4b 100644
--- a/firmware/mp3_playback.c
+++ b/firmware/mp3_playback.c
@@ -35,7 +35,7 @@
 #endif
 
 /* hacking into mpeg.c, recording is still there */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 enum
 {
     MPEG_DECODER,
@@ -44,7 +44,7 @@ enum
 
 extern unsigned long shadow_7f1;
 
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #ifdef MAS3587F */
 
 /**** globals ****/
 
@@ -124,7 +124,7 @@ static const int steps[] =
 static const int minval[] =
 {
     0,    /* Volume */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     -12,  /* Bass */
     -12,  /* Treble */
 #else
@@ -149,7 +149,7 @@ static const int minval[] =
 static const int maxval[] =
 {
     100,  /* Volume */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     12,   /* Bass */
     12,   /* Treble */
 #else
@@ -174,7 +174,7 @@ static const int maxval[] =
 static const int defaultval[] =
 {
     70,   /* Volume */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     6,    /* Bass */
     6,    /* Treble */
 #else
@@ -238,7 +238,7 @@ static bool mpeg_is_initialized = false;
 
 unsigned long mas_version_code;
 
-#ifdef HAVE_MAS3507D
+#if CONFIG_HWCODEC == MAS3507D
 
 static const unsigned int bass_table[] =
 {
@@ -333,7 +333,7 @@ static const unsigned int prescale_table[] =
 
 bool dma_on;  /* The DMA is active */
 
-#ifdef HAVE_MAS3507D
+#if CONFIG_HWCODEC == MAS3507D
 static void mas_poll_start(int interval_in_ms)
 {
     unsigned int count;
@@ -393,7 +393,7 @@ static void postpone_dma_tick(void)
 #endif
 
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 void demand_irq_enable(bool on)
 {
     int oldlevel = set_irq_level(HIGHEST_IRQ_LEVEL);
@@ -408,7 +408,7 @@ void demand_irq_enable(bool on)
 
     set_irq_level(oldlevel);
 }
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
 
 void play_tick(void)
@@ -455,10 +455,10 @@ void IMIA1(void) /* Timer 1 interrupt */
     if(playing)
         play_tick();
     TSR1 &= ~0x01;
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     /* Disable interrupt */
     IPRC &= ~0x000f;
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 }
 
 #pragma interrupt
@@ -467,7 +467,7 @@ void IRQ6(void) /* PB14: MAS stop demand IRQ */
     SCR0 &= ~0x80;
 }
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 #pragma interrupt
 void IRQ3(void) /* PA15: MAS demand IRQ */
 {
@@ -479,7 +479,7 @@ void IRQ3(void) /* PA15: MAS demand IRQ */
     else
         postpone_dma_tick();
 }
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
 static void setup_sci0(void)
 {
@@ -519,7 +519,7 @@ static void setup_sci0(void)
 }
 #endif /* SIMULATOR */
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 static void init_playback(void)
 {
     unsigned long val;
@@ -577,10 +577,10 @@ static void init_playback(void)
 
     DEBUGF("MAS Decoding application started\n");
 }
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
 #ifndef SIMULATOR
-#ifdef HAVE_MAS3507D
+#if CONFIG_HWCODEC == MAS3507D
 int current_left_volume = 0;  /* all values in tenth of dB */
 int current_right_volume = 0;  /* all values in tenth of dB */
 int current_treble = 0;
@@ -613,10 +613,10 @@ void set_prescaled_volume(void)
 
     dac_volume(tenthdb2reg(l), tenthdb2reg(r), false);
 }
-#endif /* HAVE_MAS3507D */
+#endif /* MAS3507D */
 #endif /* !SIMULATOR */
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 unsigned long mdb_shape_shadow = 0;
 unsigned long loudness_shadow = 0;
 #endif
@@ -626,7 +626,7 @@ void mpeg_sound_set(int setting, int value)
 #ifdef SIMULATOR
     setting = value;
 #else
-#ifdef HAVE_MAS3507D
+#if CONFIG_HWCODEC == MAS3507D
     int l, r;
 #else
     int tmp;
@@ -638,7 +638,7 @@ void mpeg_sound_set(int setting, int value)
     switch(setting)
     {
         case SOUND_VOLUME:
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
             tmp = 0x7f00 * value / 100;
             mas_codec_writereg(0x10, tmp & 0xff00);
 #else
@@ -671,7 +671,7 @@ void mpeg_sound_set(int setting, int value)
             break;
 
         case SOUND_BALANCE:
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
             tmp = ((value * 127 / 100) & 0xff) << 8;
             mas_codec_writereg(0x11, tmp & 0xff00);
 #else
@@ -680,7 +680,7 @@ void mpeg_sound_set(int setting, int value)
             break;
 
         case SOUND_BASS:
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
             tmp = ((value * 8) & 0xff) << 8;
             mas_codec_writereg(0x14, tmp & 0xff00);
 #else    
@@ -691,7 +691,7 @@ void mpeg_sound_set(int setting, int value)
             break;
 
         case SOUND_TREBLE:
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
             tmp = ((value * 8) & 0xff) << 8;
             mas_codec_writereg(0x15, tmp & 0xff00);
 #else    
@@ -701,7 +701,7 @@ void mpeg_sound_set(int setting, int value)
 #endif
             break;
             
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
         case SOUND_LOUDNESS:
             loudness_shadow = (loudness_shadow & 0x04) |
                 (MAX(MIN(value * 4, 0x44), 0) << 8);
@@ -771,7 +771,7 @@ void mpeg_sound_set(int setting, int value)
 
 int mpeg_val2phys(int setting, int value)
 {
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     int result = 0;
     
     switch(setting)
@@ -858,7 +858,7 @@ void mpeg_sound_channel_config(int configuration)
             break;
     }
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     mas_writemem(MAS_BANK_D0, 0x7fc, &val_ll, 1); /* LL */
     mas_writemem(MAS_BANK_D0, 0x7fd, &val_lr, 1); /* LR */
     mas_writemem(MAS_BANK_D0, 0x7fe, &val_rl, 1); /* RL */
@@ -872,7 +872,7 @@ void mpeg_sound_channel_config(int configuration)
 #endif
 }
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 /* 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.
@@ -918,7 +918,7 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
     (void)mdb_enable;
     (void)superbass;
 #else
-#ifdef HAVE_MAS3507D
+#if CONFIG_HWCODEC == MAS3507D
     unsigned long val;
     (void)loudness;
     (void)avc;
@@ -932,7 +932,7 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
 
     setup_sci0();
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     or_b(0x08, &PAIORH); /* output for /PR */
     init_playback();
     
@@ -946,7 +946,7 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
     dac_init();
 #endif
     
-#ifdef HAVE_MAS3507D
+#if CONFIG_HWCODEC == MAS3507D
     and_b(~0x20, &PBDRL);
     sleep(HZ/5);
     or_b(0x20, &PBDRL);
@@ -992,7 +992,7 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
     
 #endif
 
-#ifdef HAVE_MAS3507D
+#if CONFIG_HWCODEC == MAS3507D
     mas_poll_start(1);
 
     mas_writereg(MAS_REG_KPRESCALE, 0xe9400);
@@ -1001,7 +1001,7 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
     mpeg_sound_channel_config(channel_config);
 #endif
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     ICR &= ~0x0010; /* IRQ3 level sensitive */
     PACR1 = (PACR1 & 0x3fff) | 0x4000; /* PA15 is IRQ3 */
 #endif
@@ -1014,7 +1014,7 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
     mpeg_sound_set(SOUND_BALANCE, balance);
     mpeg_sound_set(SOUND_VOLUME, volume);
     
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     mpeg_sound_channel_config(channel_config);
     mpeg_sound_set(SOUND_LOUDNESS, loudness);
     mpeg_sound_set(SOUND_AVC, avc);
@@ -1034,12 +1034,12 @@ void mp3_init(int volume, int bass, int treble, int balance, int loudness,
 void mp3_shutdown(void)
 {
 #ifndef SIMULATOR
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     unsigned long val = 1;
     mas_writemem(MAS_BANK_D0, 0x7f9, &val, 1); /* Mute */
 #endif
 
-#ifdef HAVE_MAS3507D
+#if CONFIG_HWCODEC == MAS3507D
     dac_volume(0, 0, false);
 #endif
 
@@ -1052,7 +1052,7 @@ void mp3_shutdown(void)
 
 void mp3_play_init(void)
 {
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     init_playback();
 #endif
     playing = false;
@@ -1081,7 +1081,7 @@ void mp3_play_data(const unsigned char* start, int size,
 
     CHCR3 |= 0x0001; /* Enable DMA IRQ */
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     demand_irq_enable(true);
 #endif
 }
@@ -1107,7 +1107,7 @@ void mp3_play_stop(void)
     playing = false;
     mp3_play_pause(false);
     CHCR3 &= ~0x0001; /* Disable the DMA interrupt */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     demand_irq_enable(false);
 #endif
 }
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index e6d59176f7..df9e77a305 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -44,7 +44,7 @@
 
 #include "bitswap.h"
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 static void init_recording(void);
 static void start_prerecording(void);
 static void start_recording(void);
@@ -52,7 +52,7 @@ static void stop_recording(void);
 static int get_unsaved_space(void);
 static void pause_recording(void);
 static void resume_recording(void);
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
 #ifndef SIMULATOR
 static int get_unplayed_space(void);
@@ -79,13 +79,13 @@ static int get_unswapped_space(void);
 #define MPEG_SAVE_DATA    102
 #define MPEG_STOP_DONE    103
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 extern enum /* from mp3_playback.c */
 {
     MPEG_DECODER,
     MPEG_ENCODER
 } mpeg_mode;
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
 extern char* playlist_peek(int steps);
 extern bool playlist_check(int steps);
@@ -326,7 +326,7 @@ unsigned long mpeg_get_last_header(void)
 
     /* Read the frame data from the MAS and reconstruct it with the
        frame sync and all */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     mas_readmem(MAS_BANK_D0, 0xfd1, tmp, 2);
 #else
     mas_readmem(MAS_BANK_D0, 0x301, tmp, 2);
@@ -368,7 +368,7 @@ static int low_watermark; /* Dynamic low watermark level */
 static int low_watermark_margin; /* Extra time in seconds for watermark */
 static int lowest_watermark_level; /* Debug value to observe the buffer
                                       usage */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 static bool is_recording; /* We are recording */
 static bool stop_pending;
 unsigned long record_start_time; /* Value of current_tick when recording
@@ -399,15 +399,15 @@ unsigned long shadow_7f1 = 0;
 unsigned long shadow_7f6 = 0;
 unsigned long shadow_7f9 = 0;
 
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
 static int mpeg_file;
 
 /* Synchronization variables */
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 static bool init_recording_done;
 static bool init_playback_done;
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 static bool mpeg_stop_done;
 
 static void recalculate_watermark(int bitrate)
@@ -533,7 +533,7 @@ static int get_unswapped_space(void)
     return space;
 }
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 static int get_unsaved_space(void)
 {
     int space = mp3buf_write - mp3buf_read;
@@ -541,9 +541,9 @@ static int get_unsaved_space(void)
         space += mp3buflen;
     return space;
 }
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 #ifdef DEBUG
 static long timing_info_index = 0;
 static long timing_info[1024];
@@ -584,12 +584,12 @@ static void drain_dma_buffer(void)
     );
 }
 
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
 void rec_tick (void) __attribute__ ((section (".icode")));
 void rec_tick(void)
 {
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     int i;
     int num_bytes;
     if(is_recording && (PBDR & 0x4000))
@@ -694,7 +694,7 @@ void rec_tick(void)
             }
         }
     }
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 }
 
 void playback_tick(void)
@@ -927,10 +927,10 @@ static void track_change(void)
 {
     DEBUGF("Track change\n");
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     /* Reset the AVC */
     mpeg_sound_set(SOUND_AVC, -1);
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
     remove_current_tag();
 
     update_playlist();
@@ -1049,7 +1049,7 @@ static void mpeg_thread(void)
     int amount_to_read;
     int t1, t2;
     int start_offset;
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     int amount_to_save;
     int writelen;
     int framelen;
@@ -1058,7 +1058,7 @@ static void mpeg_thread(void)
     int rc;
     int offset;
     int countdown;
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
     
     is_playing = false;
     play_pending = false;
@@ -1067,10 +1067,10 @@ static void mpeg_thread(void)
 
     while(1)
     {
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
         if(mpeg_mode == MPEG_DECODER)
         {
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
         yield();
 
         /* Swap if necessary, and don't block on the queue_wait() */
@@ -1092,11 +1092,11 @@ static void mpeg_thread(void)
             case MPEG_PLAY:
                 DEBUGF("MPEG_PLAY\n");
 
-#ifdef HAVE_FMRADIO
+#ifdef CONFIG_TUNER
                 /* Silence the A/D input, it may be on because the radio
                    may be playing */
                 mas_codec_writereg(6, 0x0000);
-#endif /* #ifdef HAVE_FMRADIO */
+#endif /* #ifdef CONFIG_TUNER */
 
                 /* Stop the current stream */
                 play_pending = false;
@@ -1589,14 +1589,14 @@ static void mpeg_thread(void)
                 break;
 #endif /* #ifndef USB_NONE */
                 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
             case MPEG_INIT_RECORDING:
                 init_recording();
                 init_recording_done = true;
                 break;
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
             }
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
         }
         else
         {
@@ -1996,7 +1996,7 @@ static void mpeg_thread(void)
                     break;
             }
         }
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
     }
 }
 #endif /* SIMULATOR */
@@ -2044,7 +2044,7 @@ bool mpeg_has_changed_track(void)
     return false;
 }
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
 void mpeg_init_playback(void)
 {
     init_playback_done = false;
@@ -2617,13 +2617,13 @@ int mpeg_status(void)
     if(paused)
         ret |= MPEG_STATUS_PAUSE;
     
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     if(is_recording && !is_prerecording)
         ret |= MPEG_STATUS_RECORD;
 
     if(is_prerecording)
         ret |= MPEG_STATUS_PRERECORD;
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
     if(mpeg_errno)
         ret |= MPEG_STATUS_ERROR;
@@ -2677,12 +2677,12 @@ void mpeg_init(void)
     memset(id3tags, sizeof(id3tags), 0);
     memset(_id3tags, sizeof(id3tags), 0);
 
-#ifdef HAVE_MAS3587F
+#if CONFIG_HWCODEC == MAS3587F
     if(read_hw_mask() & PR_ACTIVE_HIGH)
         and_b(~0x08, &PADRH);
     else
         or_b(0x08, &PADRH);
-#endif /* #ifdef HAVE_MAS3587F */
+#endif /* #if CONFIG_HWCODEC == MAS3587F */
 
 #ifdef DEBUG
     dbg_timer_start();
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 6a72a2c613..155d11e609 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -34,7 +34,7 @@
 #include "usb.h"
 #include "powermgmt.h"
 #include "backlight.h"
-#ifdef HAVE_FMRADIO
+#ifdef CONFIG_TUNER
 #include "fmradio.h"
 #endif
 
@@ -315,7 +315,7 @@ static void handle_auto_poweroff(void)
     charger_was_inserted = charger_is_inserted;
     
     if(timeout &&
-#ifdef HAVE_FMRADIO
+#ifdef CONFIG_TUNER
        !fmradio_get_status() &&
 #endif
        !usb_inserted() &&