2 files changed, 16 insertions, 22 deletions

diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index e809afa6c9..072d6027fc 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -41,7 +41,7 @@
 #define PLUGIN_BUFFER_SIZE 0x80000
 
 /* Define this if you have the WM8731L audio codec */
-#define HAVE_WM8731L
+#define HAVE_WM8731
 
 /* Define this for LCD backlight available */
 #define CONFIG_BACKLIGHT BL_IPOD3G /* port controlled */
diff --git a/firmware/export/wm8731l.h b/firmware/export/wm8731l.h
index 6ed845c714..d384976226 100644
--- a/firmware/export/wm8731l.h
+++ b/firmware/export/wm8731l.h
@@ -20,31 +20,25 @@
 #ifndef _WM8731L_H
 #define _WM8731L_H
 
-extern void wm8731l_reset(void);
-extern int wm8731l_init(void);
-extern void wm8731l_enable_output(bool enable);
-extern int wm8731l_set_master_vol(int vol_l, int vol_r);
-extern int wm8731l_set_mixer_vol(int channel1, int channel2);
-extern void wm8731l_set_bass(int value);
-extern void wm8731l_set_treble(int value);
-extern int wm8731l_mute(int mute);
-extern void wm8731l_close(void);
-extern void wm8731l_set_nsorder(int order);
-extern void wm8731l_set_sample_rate(int sampling_control);
+extern void wmcodec_reset(void);
+extern int wmcodec_init(void);
+extern void wmcodec_enable_output(bool enable);
+extern int wmcodec_set_master_vol(int vol_l, int vol_r);
+extern int wmcodec_set_mixer_vol(int channel1, int channel2);
+extern void wmcodec_set_bass(int value);
+extern void wmcodec_set_treble(int value);
+extern int wmcodec_mute(int mute);
+extern void wmcodec_close(void);
+extern void wmcodec_set_nsorder(int order);
+extern void wmcodec_set_sample_rate(int sampling_control);
 
-extern void wm8731l_enable_recording(bool source_mic);
-extern void wm8731l_disable_recording(void);
-extern void wm8731l_set_recvol(int left, int right, int type);
-extern void wm8731l_set_monitor(int enable);
+extern void wmcodec_enable_recording(bool source_mic);
+extern void wmcodec_disable_recording(void);
+extern void wmcodec_set_recvol(int left, int right, int type);
+extern void wmcodec_set_monitor(int enable);
 
 /* Register settings for the supported samplerates: */
 #define WM8731L_8000HZ      0x4d
-/*
- IpodLinux don't seem to support those sampling rate with the wm8731L chip 
-#define WM8975_16000HZ     0x55
-#define WM8975_22050HZ     0x77
-#define WM8975_24000HZ     0x79
-*/
 #define WM8731L_32000HZ     0x59
 #define WM8731L_44100HZ     0x63
 #define WM8731L_48000HZ     0x41