diff options
-rw-r--r-- | firmware/export/as3514.h | 1 | ||||
-rw-r--r-- | firmware/export/audiohw.h | 18 | ||||
-rw-r--r-- | firmware/export/mas35xx.h | 2 | ||||
-rw-r--r-- | firmware/export/sound.h | 21 | ||||
-rw-r--r-- | firmware/export/tlv320.h | 2 | ||||
-rw-r--r-- | firmware/export/uda1380.h | 2 | ||||
-rw-r--r-- | firmware/export/wm8731l.h | 2 | ||||
-rw-r--r-- | firmware/export/wm8751.h | 2 | ||||
-rw-r--r-- | firmware/export/wm8758.h | 2 | ||||
-rw-r--r-- | firmware/export/wm8975.h | 2 |
10 files changed, 19 insertions, 35 deletions
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h index 406857f491..5f37fd7fcf 100644 --- a/firmware/export/as3514.h +++ b/firmware/export/as3514.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #define _AS3514_H | 21 | #define _AS3514_H |
22 | 22 | ||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | #include "audiohw.h" | ||
25 | 24 | ||
26 | extern int tenthdb2master(int db); | 25 | extern int tenthdb2master(int db); |
27 | 26 | ||
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index 38e68138c9..3838b007d0 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h | |||
@@ -22,6 +22,24 @@ | |||
22 | 22 | ||
23 | #include "config.h" | 23 | #include "config.h" |
24 | 24 | ||
25 | #ifdef HAVE_UDA1380 | ||
26 | #include "uda1380.h" | ||
27 | #elif defined(HAVE_WM8751) | ||
28 | #include "wm8751.h" | ||
29 | #elif defined(HAVE_WM8975) | ||
30 | #include "wm8975.h" | ||
31 | #elif defined(HAVE_WM8758) | ||
32 | #include "wm8758.h" | ||
33 | #elif defined(HAVE_WM8731) || defined(HAVE_WM8721) | ||
34 | #include "wm8731l.h" | ||
35 | #elif defined(HAVE_TLV320) | ||
36 | #include "tlv320.h" | ||
37 | #elif defined(HAVE_AS3514) | ||
38 | #include "as3514.h" | ||
39 | #elif defined(HAVE_MAS35XX) | ||
40 | #include "mas35xx.h" | ||
41 | #endif | ||
42 | |||
25 | enum { | 43 | enum { |
26 | SOUND_VOLUME = 0, | 44 | SOUND_VOLUME = 0, |
27 | SOUND_BASS, | 45 | SOUND_BASS, |
diff --git a/firmware/export/mas35xx.h b/firmware/export/mas35xx.h index 1239454a3f..faf11d035d 100644 --- a/firmware/export/mas35xx.h +++ b/firmware/export/mas35xx.h | |||
@@ -22,6 +22,4 @@ | |||
22 | #ifndef _MAS35XX_H | 22 | #ifndef _MAS35XX_H |
23 | #define _MAS35XX_H | 23 | #define _MAS35XX_H |
24 | 24 | ||
25 | #include "audiohw.h" | ||
26 | |||
27 | #endif /* _MAS35XX_H */ | 25 | #endif /* _MAS35XX_H */ |
diff --git a/firmware/export/sound.h b/firmware/export/sound.h index 59e8853e82..929b83b9e6 100644 --- a/firmware/export/sound.h +++ b/firmware/export/sound.h | |||
@@ -20,26 +20,7 @@ | |||
20 | #define SOUND_H | 20 | #define SOUND_H |
21 | 21 | ||
22 | #include <inttypes.h> | 22 | #include <inttypes.h> |
23 | #ifdef HAVE_UDA1380 | 23 | #include <audiohw.h> |
24 | #include "uda1380.h" | ||
25 | #elif defined(HAVE_WM8751) | ||
26 | #include "wm8751.h" | ||
27 | #elif defined(HAVE_WM8975) | ||
28 | #include "wm8975.h" | ||
29 | #elif defined(HAVE_WM8758) | ||
30 | #include "wm8758.h" | ||
31 | #elif defined(HAVE_WM8731) || defined(HAVE_WM8721) | ||
32 | #include "wm8731l.h" | ||
33 | #elif defined(HAVE_TLV320) | ||
34 | #include "tlv320.h" | ||
35 | #elif defined(HAVE_AS3514) | ||
36 | #include "as3514.h" | ||
37 | #elif defined(HAVE_MAS35XX) | ||
38 | #include "mas35xx.h" | ||
39 | #else | ||
40 | /* For targets without audio */ | ||
41 | #include "audiohw.h" | ||
42 | #endif | ||
43 | 24 | ||
44 | extern void audiohw_postinit(void); | 25 | extern void audiohw_postinit(void); |
45 | 26 | ||
diff --git a/firmware/export/tlv320.h b/firmware/export/tlv320.h index 73cf297a3e..ebb126ddf5 100644 --- a/firmware/export/tlv320.h +++ b/firmware/export/tlv320.h | |||
@@ -23,8 +23,6 @@ | |||
23 | #define VOLUME_MIN -730 | 23 | #define VOLUME_MIN -730 |
24 | #define VOLUME_MAX 60 | 24 | #define VOLUME_MAX 60 |
25 | 25 | ||
26 | #include "audiohw.h" | ||
27 | |||
28 | extern int tenthdb2master(int db); | 26 | extern int tenthdb2master(int db); |
29 | 27 | ||
30 | /*** definitions ***/ | 28 | /*** definitions ***/ |
diff --git a/firmware/export/uda1380.h b/firmware/export/uda1380.h index a92e2a3212..c1fb6421ff 100644 --- a/firmware/export/uda1380.h +++ b/firmware/export/uda1380.h | |||
@@ -20,8 +20,6 @@ | |||
20 | #ifndef _UDA1380_H | 20 | #ifndef _UDA1380_H |
21 | #define _UDA1380_H | 21 | #define _UDA1380_H |
22 | 22 | ||
23 | #include "audiohw.h" | ||
24 | |||
25 | /* volume/balance/treble/bass interdependency */ | 23 | /* volume/balance/treble/bass interdependency */ |
26 | #define VOLUME_MIN -840 | 24 | #define VOLUME_MIN -840 |
27 | #define VOLUME_MAX 0 | 25 | #define VOLUME_MAX 0 |
diff --git a/firmware/export/wm8731l.h b/firmware/export/wm8731l.h index 76b2a9c960..5ef6d694e5 100644 --- a/firmware/export/wm8731l.h +++ b/firmware/export/wm8731l.h | |||
@@ -24,8 +24,6 @@ | |||
24 | #define VOLUME_MIN -730 | 24 | #define VOLUME_MIN -730 |
25 | #define VOLUME_MAX 60 | 25 | #define VOLUME_MAX 60 |
26 | 26 | ||
27 | #include "audiohw.h" | ||
28 | |||
29 | extern int tenthdb2master(int db); | 27 | extern int tenthdb2master(int db); |
30 | extern int tenthdb2mixer(int db); | 28 | extern int tenthdb2mixer(int db); |
31 | 29 | ||
diff --git a/firmware/export/wm8751.h b/firmware/export/wm8751.h index 85d206cae4..efeaa3609d 100644 --- a/firmware/export/wm8751.h +++ b/firmware/export/wm8751.h | |||
@@ -23,8 +23,6 @@ | |||
23 | #define VOLUME_MIN -730 | 23 | #define VOLUME_MIN -730 |
24 | #define VOLUME_MAX 60 | 24 | #define VOLUME_MAX 60 |
25 | 25 | ||
26 | #include "audiohw.h" | ||
27 | |||
28 | extern int tenthdb2master(int db); | 26 | extern int tenthdb2master(int db); |
29 | extern int tenthdb2mixer(int db); | 27 | extern int tenthdb2mixer(int db); |
30 | 28 | ||
diff --git a/firmware/export/wm8758.h b/firmware/export/wm8758.h index 7fa2181679..5715f100da 100644 --- a/firmware/export/wm8758.h +++ b/firmware/export/wm8758.h | |||
@@ -24,8 +24,6 @@ | |||
24 | #define VOLUME_MIN -570 | 24 | #define VOLUME_MIN -570 |
25 | #define VOLUME_MAX 60 | 25 | #define VOLUME_MAX 60 |
26 | 26 | ||
27 | #include "audiohw.h" | ||
28 | |||
29 | extern int tenthdb2master(int db); | 27 | extern int tenthdb2master(int db); |
30 | extern int tenthdb2mixer(int db); | 28 | extern int tenthdb2mixer(int db); |
31 | 29 | ||
diff --git a/firmware/export/wm8975.h b/firmware/export/wm8975.h index bbaa8d3554..c00303a6a8 100644 --- a/firmware/export/wm8975.h +++ b/firmware/export/wm8975.h | |||
@@ -24,8 +24,6 @@ | |||
24 | #define VOLUME_MIN -730 | 24 | #define VOLUME_MIN -730 |
25 | #define VOLUME_MAX 60 | 25 | #define VOLUME_MAX 60 |
26 | 26 | ||
27 | #include "audiohw.h" | ||
28 | |||
29 | extern int tenthdb2master(int db); | 27 | extern int tenthdb2master(int db); |
30 | extern int tenthdb2mixer(int db); | 28 | extern int tenthdb2mixer(int db); |
31 | 29 | ||