3 files changed, 64 insertions, 113 deletions

diff --git a/firmware/target/arm/pp/ascodec-pp.c b/firmware/target/arm/pp/ascodec-pp.c
index 49a69d1a11..eb8093c841 100644
--- a/firmware/target/arm/pp/ascodec-pp.c
+++ b/firmware/target/arm/pp/ascodec-pp.c
@@ -26,7 +26,8 @@
 
 #include "audiohw.h"
 #include "i2s.h"
-#include "ascodec-target.h"
+#include "i2c-pp.h"
+#include "ascodec.h"
 
 /*
  * Initialise the PP I2C and I2S.
@@ -65,18 +66,64 @@ void audiohw_init(void)
     audiohw_preinit();
 }
 
-void ascodec_suppressor_on(bool on)
+int ascodec_write(unsigned int reg, unsigned int value)
 {
-    /* CHECK: Good for c200 too? */
-#ifdef SANSA_E200
-    if (on) {
-        /* Set pop prevention */
-        GPIO_SET_BITWISE(GPIOG_OUTPUT_VAL, 0x08);
-    } else {
-        /* Release pop prevention */
-        GPIO_CLEAR_BITWISE(GPIOG_OUTPUT_VAL, 0x08);
-    }
-#else
-    (void)on;
-#endif
-} 
+    return pp_i2c_send(AS3514_I2C_ADDR, reg, value);
+}
+
+int ascodec_read(unsigned int reg)
+{
+    return i2c_readbyte(AS3514_I2C_ADDR, reg);
+}
+
+int ascodec_readbytes(unsigned int addr, unsigned int len, unsigned char *data)
+{
+    return i2c_readbytes(AS3514_I2C_ADDR, addr, len, data);
+}
+
+void ascodec_lock(void)
+{
+    i2c_lock();
+}
+
+void ascodec_unlock(void) 
+{
+    i2c_unlock();
+}
+
+bool ascodec_chg_status(void)
+{
+    return ascodec_read(AS3514_IRQ_ENRD0) & CHG_STATUS;
+}
+
+bool ascodec_endofch(void)
+{
+    return ascodec_read(AS3514_IRQ_ENRD0) & CHG_ENDOFCH;
+}
+
+void ascodec_monitor_endofch(void)
+{
+    ascodec_write(AS3514_IRQ_ENRD0, IRQ_ENDOFCH);
+}
+
+void ascodec_write_charger(int value)
+{
+    ascodec_write(AS3514_CHARGER, value);
+}
+
+int ascodec_read_charger(void)
+{
+    return ascodec_read(AS3514_CHARGER);
+}
+
+void ascodec_wait_adc_finished(void)
+{
+    /*
+     * FIXME: not implemented
+     *
+     * If irqs are not available on the target platform,
+     * this should be most likely implemented by polling
+     * AS3514_IRQ_ENRD2 in the same way powermgmt-ascodec.c
+     * is polling IRQ_ENDOFCH.
+     */
+}
diff --git a/firmware/target/arm/pp/ascodec-target.h b/firmware/target/arm/pp/ascodec-target.h
deleted file mode 100644
index e7fd1b3b35..0000000000
--- a/firmware/target/arm/pp/ascodec-target.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/***************************************************************************
- *             __________               __   ___.
- *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
- *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
- *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
- *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
- *                     \/            \/     \/    \/            \/
- * $Id$
- *
- * Driver for AS3514 audio codec
- *
- * Copyright (c) 2007 Daniel Ankers
- * Copyright (c) 2007 Christian Gmeiner
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
- * KIND, either express or implied.
- *
- ****************************************************************************/
-
-#ifndef _ASCODEC_TARGET_H
-#define _ASCODEC_TARGET_H
-
-#include "config.h"
-
-#include "as3514.h"
-#include "i2c-pp.h"
-
-static inline int ascodec_write(unsigned int reg, unsigned int value)
-{
-    return pp_i2c_send(AS3514_I2C_ADDR, reg, value);
-}
-
-static inline int ascodec_read(unsigned int reg)
-{
-    return i2c_readbyte(AS3514_I2C_ADDR, reg);
-}
-
-static inline int ascodec_readbytes(int addr, int len, unsigned char *data)
-{
-    return i2c_readbytes(AS3514_I2C_ADDR, addr, len, data);
-}
-
-static inline void ascodec_lock(void)
-{
-    i2c_lock();
-}
-
-static inline void ascodec_unlock(void)
-{
-    i2c_unlock();
-}
-
-static inline bool ascodec_chg_status(void)
-{
-    return ascodec_read(AS3514_IRQ_ENRD0) & CHG_STATUS;
-}
-
-static inline bool ascodec_endofch(void)
-{
-    return ascodec_read(AS3514_IRQ_ENRD0) & CHG_ENDOFCH;
-}
-
-static inline void ascodec_monitor_endofch(void)
-{
-    ascodec_write(AS3514_IRQ_ENRD0, IRQ_ENDOFCH);
-}
-
-static inline void ascodec_wait_adc_finished(void)
-{
-    /*
-     * FIXME: not implemented
-     *
-     * If irqs are not available on the target platform,
-     * this should be most likely implemented by polling
-     * AS3514_IRQ_ENRD2 in the same way powermgmt-ascodec.c
-     * is polling IRQ_ENDOFCH.
-     */
-}
-
-static inline void ascodec_write_charger(int value)
-{
-    ascodec_write(AS3514_CHARGER, value);
-}
-
-static inline int ascodec_read_charger(void)
-{
-    return ascodec_read(AS3514_CHARGER);
-}
-
-extern void ascodec_suppressor_on(bool on);
-
-#endif /* !_ASCODEC_TARGET_H */
diff --git a/firmware/target/arm/pp/i2c-pp.c b/firmware/target/arm/pp/i2c-pp.c
index 58740b5c66..192af0e304 100644
--- a/firmware/target/arm/pp/i2c-pp.c
+++ b/firmware/target/arm/pp/i2c-pp.c
@@ -33,8 +33,9 @@
 #include "system.h"
 #include "i2c.h"
 #include "i2c-pp.h"
+#ifdef HAVE_AS3514
 #include "ascodec.h"
-#include "as3514.h"
+#endif
 
 #define I2C_CTRL    (*(volatile unsigned char*)(I2C_BASE+0x00))
 #define I2C_ADDR    (*(volatile unsigned char*)(I2C_BASE+0x04))