5 files changed, 21 insertions, 2 deletions

diff --git a/firmware/config-player.h b/firmware/config-player.h
index 7726069f50..a1c5db9f9f 100644
--- a/firmware/config-player.h
+++ b/firmware/config-player.h
@@ -9,3 +9,6 @@
 
 /* Define this if you have a MAS3507D */
 #define HAVE_MAS3507D
+
+/* Define this if you have a DAC3550A */
+#define HAVE_DAC3550A
diff --git a/firmware/config-playerold.h b/firmware/config-playerold.h
index 5fd936f698..2068c94db4 100644
--- a/firmware/config-playerold.h
+++ b/firmware/config-playerold.h
@@ -6,3 +6,6 @@
 
 /* Define this if you have a MAS3507D */
 #define HAVE_MAS3507D
+
+/* Define this if you have a DAC3550A */
+#define HAVE_DAC3550A
diff --git a/firmware/drivers/dac.c b/firmware/drivers/dac.c
index 72d4c40cf7..c8a5414611 100644
--- a/firmware/drivers/dac.c
+++ b/firmware/drivers/dac.c
@@ -16,11 +16,14 @@
  * KIND, either express or implied.
  *
  ****************************************************************************/
+#include "config.h"
 #include "stdbool.h"
 #include "i2c.h"
 #include "debug.h"
 #include "dac.h"
 
+#ifdef HAVE_DAC3550A
+
 int dac_volume(unsigned int left, unsigned int right, bool deemph)
 {
     int ret = 0;
@@ -89,3 +92,5 @@ void dac_init(void)
     i2c_write(DAC_DEV_WRITE,buf,2);
     i2c_end();
 }
+
+#endif
diff --git a/firmware/drivers/dac.h b/firmware/drivers/dac.h
index c0b2873fda..ef5e4e992d 100644
--- a/firmware/drivers/dac.h
+++ b/firmware/drivers/dac.h
@@ -19,6 +19,10 @@
 #ifndef _DAC_H_
 #define _DAC_H_
 
+#include "config.h"
+
+#ifdef HAVE_DAC3550A
+
 /*
         DAC I2C defs
 */
@@ -37,3 +41,5 @@ extern int dac_config(int value);
 extern void dac_init(void);
 
 #endif
+
+#endif
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 92ef55983b..a8442f2e85 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -1512,8 +1512,6 @@ void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int
 
     setup_sci0();
 
-    dac_init();
-
 #ifdef HAVE_MAS3587F
     mas_reset();
     
@@ -1549,6 +1547,10 @@ void mpeg_init(int volume, int bass, int treble, int balance, int loudness, int
     val = 0x0c;
     mas_writemem(MAS_BANK_D0,0x7f6,&val,1);    
 #endif
+
+#ifdef HAVE_DAC3550A
+    dac_init();
+#endif
     
 #ifdef HAVE_MAS3507D
     PBDR &= ~0x20;