11 files changed, 47 insertions, 106 deletions

diff --git a/firmware/target/arm/as3525/ascodec-as3525.c b/firmware/target/arm/as3525/ascodec-as3525.c
index ddf6786409..be81178859 100644
--- a/firmware/target/arm/as3525/ascodec-as3525.c
+++ b/firmware/target/arm/as3525/ascodec-as3525.c
@@ -44,7 +44,7 @@
     interrupt bit 7 is raised and DACNT is not decremented after the transfer.
  */
 
-#include "ascodec-target.h"
+#include "ascodec.h"
 #include "clock-target.h"
 #include "kernel.h"
 #include "system.h"
@@ -534,6 +534,29 @@ bool ascodec_chg_status(void)
 {
     return ascodec_enrd0_shadow & CHG_STATUS;
 }
+
+void ascodec_monitor_endofch(void)
+{
+    /* already enabled */
+}
+
+void ascodec_write_charger(int value)
+{
+#if CONFIG_CPU == AS3525
+    ascodec_write(AS3514_CHARGER, value);
+#else
+    ascodec_write_pmu(AS3543_CHARGER, 1, value);
+#endif
+}
+
+int ascodec_read_charger(void)
+{
+#if CONFIG_CPU == AS3525
+    return ascodec_read(AS3514_CHARGER);
+#else
+    return ascodec_read_pmu(AS3543_CHARGER, 1);
+#endif
+}
 #endif /* CONFIG_CHARGING */
 
 /*
diff --git a/firmware/target/arm/as3525/ascodec-target.h b/firmware/target/arm/as3525/ascodec-target.h
deleted file mode 100644
index ece8c21dd0..0000000000
--- a/firmware/target/arm/as3525/ascodec-target.h
+++ /dev/null
@@ -1,96 +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
-
-#ifndef SIMULATOR
-
-#include "config.h"
-#include "as3514.h"
-#include "kernel.h"       /* for struct semaphore */
-#include "clock-target.h" /* for AS3525_I2C_PRESCALER */
-#include "system-arm.h"
-
-/*  Charge Pump and Power management Settings  */
-#define AS314_CP_DCDC3_SETTING    \
-               ((0<<7) |  /* CP_SW  Auto-Switch Margin 0=200/300 1=150/255 */  \
-                (0<<6) |  /* CP_on  0=Normal op 1=Chg Pump Always On  */       \
-                (0<<5) |  /* LREG_CPnot  Always write 0 */                     \
-                (0<<3) |  /* DCDC3p  BVDD setting 3.6/3.2/3.1/3.0  */          \
-                (1<<2) |  /* LREG_off 1=Auto mode switching 0=Length Reg only*/\
-                (0<<0) )  /* CVDDp  Core Voltage Setting 1.2/1.15/1.10/1.05*/
-
-#define CVDD_1_20          0
-#define CVDD_1_15          1
-#define CVDD_1_10          2
-#define CVDD_1_05          3
-
-void ascodec_init(void) INIT_ATTR;
-
-int ascodec_write(unsigned int index, unsigned int value);
-
-int ascodec_read(unsigned int index);
-
-int ascodec_readbytes(unsigned int index, unsigned int len, unsigned char *data);
-
-void ascodec_lock(void);
-
-void ascodec_unlock(void);
-
-void ascodec_wait_adc_finished(void);
-
-static inline void ascodec_monitor_endofch(void) {} /* already enabled */
-
-bool ascodec_endofch(void);
-
-bool ascodec_chg_status(void);
-
-#if CONFIG_CPU == AS3525v2
-void ascodec_write_pmu(unsigned int index, unsigned int subreg,
-                       unsigned int value);
-int ascodec_read_pmu(unsigned int index, unsigned int subreg);
-#endif /* CONFIG_CPU == AS3525v2 */
-
-static inline void ascodec_write_charger(int value)
-{
-#if CONFIG_CPU == AS3525
-    ascodec_write(AS3514_CHARGER, value);
-#else
-    ascodec_write_pmu(AS3543_CHARGER, 1, value);
-#endif
-}
-
-static inline int ascodec_read_charger(void)
-{
-#if CONFIG_CPU == AS3525
-    return ascodec_read(AS3514_CHARGER);
-#else
-    return ascodec_read_pmu(AS3543_CHARGER, 1);
-#endif
-}
-
-#endif /* !SIMULATOR */
-
-#endif /* !_ASCODEC_TARGET_H */
diff --git a/firmware/target/arm/as3525/backlight-e200v2-fuze.c b/firmware/target/arm/as3525/backlight-e200v2-fuze.c
index 61c2b1db79..91e1ef4d0c 100644
--- a/firmware/target/arm/as3525/backlight-e200v2-fuze.c
+++ b/firmware/target/arm/as3525/backlight-e200v2-fuze.c
@@ -23,7 +23,7 @@
 #include "system.h"
 #include "lcd.h"
 #include "backlight.h"
-#include "ascodec-target.h"
+#include "ascodec.h"
 #include "as3514.h"
 
 int buttonlight_is_on = 0;
diff --git a/firmware/target/arm/as3525/debug-as3525.c b/firmware/target/arm/as3525/debug-as3525.c
index 783f3f68a4..3e546bb5e3 100644
--- a/firmware/target/arm/as3525/debug-as3525.c
+++ b/firmware/target/arm/as3525/debug-as3525.c
@@ -26,7 +26,7 @@
 #include "system.h"
 #include "cpu.h"
 #include "pl180.h"
-#include "ascodec-target.h"
+#include "ascodec.h"
 #include "adc.h"
 #include "storage.h"
 
diff --git a/firmware/target/arm/as3525/power-as3525.c b/firmware/target/arm/as3525/power-as3525.c
index 21ce98bd75..e6f1cfd24d 100644
--- a/firmware/target/arm/as3525/power-as3525.c
+++ b/firmware/target/arm/as3525/power-as3525.c
@@ -20,7 +20,7 @@
  ****************************************************************************/
 #include <stdbool.h>
 #include "config.h"
-#include "ascodec-target.h"
+#include "ascodec.h"
 #include "as3514.h"
 #include "power.h"
 
diff --git a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
index 0f4dd4dbbb..1da57de93a 100644
--- a/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
+++ b/firmware/target/arm/as3525/sansa-c200v2/backlight-c200v2.c
@@ -23,7 +23,7 @@
 #include "system.h"
 #include "lcd.h"
 #include "backlight.h"
-#include "ascodec-target.h"
+#include "ascodec.h"
 #include "as3514.h"
 
 int buttonlight_is_on = 0;
diff --git a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
index ef727608b5..e3b518b3f8 100644
--- a/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
+++ b/firmware/target/arm/as3525/sansa-clipplus/backlight-clip.c
@@ -22,7 +22,7 @@
 #include "backlight-target.h"
 #include "lcd.h"
 #include "as3525v2.h"
-#include "ascodec-target.h"
+#include "ascodec.h"
 
 void _backlight_on(void)
 {
diff --git a/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
index bf28bd6108..f4927ba5bf 100644
--- a/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
+++ b/firmware/target/arm/as3525/sansa-clipv2/backlight-clipv2.c
@@ -22,7 +22,7 @@
 #include "backlight-target.h"
 #include "lcd.h"
 #include "as3525v2.h"
-#include "ascodec-target.h"
+#include "ascodec.h"
 
 void _backlight_on(void)
 {
diff --git a/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c
index 589f80436e..fd44d76cac 100644
--- a/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c
+++ b/firmware/target/arm/as3525/sansa-clipzip/backlight-clipzip.c
@@ -24,7 +24,7 @@
 #include "backlight-target.h"
 #include "lcd.h"
 #include "as3525v2.h"
-#include "ascodec-target.h"
+#include "ascodec.h"
 #include "lcd-target.h"
 
 bool _backlight_init()
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
index 68c626d829..a01b168b71 100644
--- a/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
+++ b/firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
@@ -23,7 +23,7 @@
 #include "system.h"
 #include "lcd.h"
 #include "backlight.h"
-#include "ascodec-target.h"
+#include "ascodec.h"
 #include "as3514.h"
 
 void _backlight_set_brightness(int brightness)
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c
index 89a07939b6..01aaeaccbe 100644
--- a/firmware/target/arm/as3525/system-as3525.c
+++ b/firmware/target/arm/as3525/system-as3525.c
@@ -24,7 +24,7 @@
 #include "kernel.h"
 #include "system.h"
 #include "panic.h"
-#include "ascodec-target.h"
+#include "ascodec.h"
 #include "adc.h"
 #include "dma-target.h"
 #include "clock-target.h"
@@ -33,6 +33,20 @@
 #include "backlight-target.h"
 #include "lcd.h"
 
+/*  Charge Pump and Power management Settings  */
+#define AS314_CP_DCDC3_SETTING    \
+               ((0<<7) |  /* CP_SW  Auto-Switch Margin 0=200/300 1=150/255 */  \
+                (0<<6) |  /* CP_on  0=Normal op 1=Chg Pump Always On  */       \
+                (0<<5) |  /* LREG_CPnot  Always write 0 */                     \
+                (0<<3) |  /* DCDC3p  BVDD setting 3.6/3.2/3.1/3.0  */          \
+                (1<<2) |  /* LREG_off 1=Auto mode switching 0=Length Reg only*/\
+                (0<<0) )  /* CVDDp  Core Voltage Setting 1.2/1.15/1.10/1.05*/
+
+#define CVDD_1_20          0
+#define CVDD_1_15          1
+#define CVDD_1_10          2
+#define CVDD_1_05          3
+
 #define default_interrupt(name) \
   extern __attribute__((weak,alias("UIRQ"))) void name (void)