Merge target/arm/as3525/as3525-codec.h into target/arm/ascodec-target.h

The AMS Sansa use the same AS3514 registers (except USB_UTIL which was added)
Use the register defines in AMS Sansa code instead of hardcoded values

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19073 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 11 insertions, 8 deletions

diff --git a/firmware/target/arm/ascodec-target.h b/firmware/target/arm/ascodec-target.h
index 19b1644541..afd19fff63 100644
--- a/firmware/target/arm/ascodec-target.h
+++ b/firmware/target/arm/ascodec-target.h
@@ -27,18 +27,16 @@
 
 #include "config.h"
 
-#ifdef CPU_PP
-/* TODO: This header is actually portalplayer specific, and should be
- * moved into an appropriate subdir  */
-
-#include "i2c-pp.h"
-
-#if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200)
+#if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200) || \
+    CONFIG_CPU==AS3525
 #define AS3514_I2C_ADDR 0x46
 #else
 #error Unknown target!
 #endif
 
+#ifdef CPU_PP
+#include "i2c-pp.h"
+
 static inline int ascodec_write(unsigned int reg, unsigned int value)
 {
     return pp_i2c_send(AS3514_I2C_ADDR, reg, value);
@@ -63,7 +61,12 @@ static inline void ascodec_unlock(void)
 {
     i2c_unlock();
 }
+#elif CONFIG_CPU==AS3525
+void ascodec_init(void);
 
-#endif /* CPU_PP */
+int ascodec_write(int index, int value);
+
+int ascodec_read(int index);
+#endif
 
 #endif /* !_ASCODEC_TARGET_H */