10 files changed, 54 insertions, 8 deletions

diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h
index 7ea3c2dae6..0b17920736 100644
--- a/firmware/export/config-h10.h
+++ b/firmware/export/config-h10.h
@@ -8,7 +8,13 @@
 #define MODEL_NUMBER 13
 
 /* define this if you have recording possibility */
-/*#define HAVE_RECORDING 1*/ /* TODO: add support for this */
+#define HAVE_RECORDING 1
+
+/* define the bitmask of hardware sample rates */
+#define HW_SAMPR_CAPS   (SAMPR_CAP_44)
+
+/* define the bitmask of recording sample rates */
+#define REC_SAMPR_CAPS  (SAMPR_CAP_44)
 
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
diff --git a/firmware/export/config-h10_5gb.h b/firmware/export/config-h10_5gb.h
index 34b1d14d77..534c4a455f 100644
--- a/firmware/export/config-h10_5gb.h
+++ b/firmware/export/config-h10_5gb.h
@@ -8,7 +8,13 @@
 #define MODEL_NUMBER 14
 
 /* define this if you have recording possibility */
-/*#define HAVE_RECORDING 1*/ /* TODO: add support for this */
+#define HAVE_RECORDING 1
+
+/* define the bitmask of hardware sample rates */
+#define HW_SAMPR_CAPS   (SAMPR_CAP_44)
+
+/* define the bitmask of recording sample rates */
+#define REC_SAMPR_CAPS  (SAMPR_CAP_44)
 
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index bf8d5359f8..142a2ebabb 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -9,7 +9,13 @@
 #define MODEL_NUMBER 8
 
 /* define this if you have recording possibility */
-/*#define HAVE_RECORDING 1*/
+#define HAVE_RECORDING 1
+
+/* define the bitmask of hardware sample rates */
+#define HW_SAMPR_CAPS   (SAMPR_CAP_44)
+
+/* define the bitmask of recording sample rates */
+#define REC_SAMPR_CAPS  (SAMPR_CAP_44)
 
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index de06b223e5..af2a89cf6f 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -9,7 +9,13 @@
 #define MODEL_NUMBER 3
 
 /* define this if you have recording possibility */
-/*#define HAVE_RECORDING 1*/
+#define HAVE_RECORDING 1
+
+/* define the bitmask of hardware sample rates */
+#define HW_SAMPR_CAPS   (SAMPR_CAP_44)
+
+/* define the bitmask of recording sample rates */
+#define REC_SAMPR_CAPS  (SAMPR_CAP_44)
 
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index 3dd0575b1b..f72603a2da 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -9,7 +9,13 @@
 #define MODEL_NUMBER 4
 
 /* define this if you have recording possibility */
-/*#define HAVE_RECORDING 1*/
+#define HAVE_RECORDING 1
+
+/* define the bitmask of hardware sample rates */
+#define HW_SAMPR_CAPS   (SAMPR_CAP_44)
+
+/* define the bitmask of recording sample rates */
+#define REC_SAMPR_CAPS  (SAMPR_CAP_44)
 
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index b2b56158f3..fa78c5c7ee 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -9,7 +9,13 @@
 #define MODEL_NUMBER 5
 
 /* define this if you have recording possibility */
-/*#define HAVE_RECORDING 1*/
+#define HAVE_RECORDING 1
+
+/* define the bitmask of hardware sample rates */
+#define HW_SAMPR_CAPS   (SAMPR_CAP_44)
+
+/* define the bitmask of recording sample rates */
+#define REC_SAMPR_CAPS  (SAMPR_CAP_44)
 
 /* define this if you have a bitmap LCD display */
 #define HAVE_LCD_BITMAP 1
diff --git a/firmware/export/sound.h b/firmware/export/sound.h
index 2cf2ad3136..3ad74c4859 100644
--- a/firmware/export/sound.h
+++ b/firmware/export/sound.h
@@ -48,7 +48,8 @@ enum {
     SOUND_MDB_ENABLE,
     SOUND_SUPERBASS,
 #endif
-#if CONFIG_CODEC == MAS3587F || defined(HAVE_UDA1380) || defined(HAVE_TLV320)
+#if CONFIG_CODEC == MAS3587F || defined(HAVE_UDA1380) || defined(HAVE_TLV320)\
+    || defined(HAVE_WM8975) || defined(HAVE_WM8758) || defined(HAVE_WM8731)
     SOUND_LEFT_GAIN,
     SOUND_RIGHT_GAIN,
     SOUND_MIC_GAIN,
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 2523a72fb3..3db38c9c7b 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -314,8 +314,11 @@ static inline int set_irq_level(int level)
     return (cpsr >> 7) & 1;
 }
 
-static inline void enable_fiq(void)
+static inline void enable_fiq(void(*fiq_handler)(void))
 {
+    /* Install the FIQ handler */
+    *((unsigned int*)(15*4)) = (unsigned int)fiq_handler;
+
     /* Clear FIQ disable bit */
     asm volatile (
         "mrs     r0, cpsr         \n"\
diff --git a/firmware/export/wm8731l.h b/firmware/export/wm8731l.h
index b6fa13f6cb..5ef6d694e5 100644
--- a/firmware/export/wm8731l.h
+++ b/firmware/export/wm8731l.h
@@ -49,6 +49,7 @@ extern void audiohw_set_monitor(int enable);
 #define RINVOL        0x01
 #define LOUTVOL       0x02
 #define ROUTVOL       0x03
+#define AAPCTRL       0x04  /* Analog audio path control */
 #define DACCTRL       0x05
 #define PWRMGMT       0x06
 #define AINTFCE       0x07
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h
index 20b26dc11f..5715f100da 100644
--- a/firmware/export/wm8758.h
+++ b/firmware/export/wm8758.h
@@ -55,6 +55,11 @@ extern void audiohw_set_equalizer_band(int band, int freq, int bw, int gain);
 #define CLKCTRL    0x06
 #define SRATECTRL  0x07
 #define DACCTRL    0x0a
+#define INCTRL     0x2c
+#define LINPGAVOL  0x2d
+#define RINPGAVOL  0x2e
+#define LADCBOOST  0x2f
+#define RADCBOOST  0x30
 #define OUTCTRL    0x31
 #define LOUTMIX    0x32
 #define ROUTMIX    0x33