diff options
Diffstat (limited to 'firmware/drivers')
-rw-r--r-- | firmware/drivers/audio/android.c | 24 | ||||
-rw-r--r-- | firmware/drivers/touchscreen.c | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/firmware/drivers/audio/android.c b/firmware/drivers/audio/android.c index 7a5f34ea48..f26087470b 100644 --- a/firmware/drivers/audio/android.c +++ b/firmware/drivers/audio/android.c | |||
@@ -22,12 +22,34 @@ | |||
22 | 22 | ||
23 | #include "config.h" | 23 | #include "config.h" |
24 | #include "audiohw.h" | 24 | #include "audiohw.h" |
25 | #if defined(DX50) || defined(DX90) | ||
26 | #include "system.h" | ||
27 | #include "pcm_sw_volume.h" | ||
28 | #endif | ||
25 | 29 | ||
30 | #if defined(DX50) || defined(DX90) | ||
31 | void audiohw_set_volume(int vol_l, int vol_r) | ||
32 | { | ||
33 | int hw_volume; | ||
34 | hw_volume = MAX(vol_l, vol_r); | ||
35 | |||
36 | #ifdef HAVE_SW_VOLUME_CONTROL | ||
37 | vol_l-=hw_volume; | ||
38 | vol_r-=hw_volume; | ||
39 | pcm_set_master_volume(vol_l, vol_r); | ||
40 | #endif | ||
41 | |||
42 | extern void pcm_set_mixer_volume(int); | ||
43 | pcm_set_mixer_volume(hw_volume); | ||
44 | |||
45 | } | ||
46 | #else | ||
26 | void audiohw_set_volume(int volume) | 47 | void audiohw_set_volume(int volume) |
27 | { | 48 | { |
28 | extern void pcm_set_mixer_volume(int); | 49 | extern void pcm_set_mixer_volume(int); |
29 | pcm_set_mixer_volume(volume); | 50 | pcm_set_mixer_volume(volume); |
30 | } | 51 | } |
52 | #endif | ||
31 | 53 | ||
32 | void audiohw_set_balance(int balance) | 54 | void audiohw_set_balance(int balance) |
33 | { | 55 | { |
@@ -36,6 +58,8 @@ void audiohw_set_balance(int balance) | |||
36 | 58 | ||
37 | void audiohw_close(void) | 59 | void audiohw_close(void) |
38 | { | 60 | { |
61 | #if !defined(DX50) && !defined(DX90) | ||
39 | extern void pcm_shutdown(void); | 62 | extern void pcm_shutdown(void); |
40 | pcm_shutdown(); | 63 | pcm_shutdown(); |
64 | #endif | ||
41 | } | 65 | } |
diff --git a/firmware/drivers/touchscreen.c b/firmware/drivers/touchscreen.c index 42ddf7ec47..572f05ab7f 100644 --- a/firmware/drivers/touchscreen.c +++ b/firmware/drivers/touchscreen.c | |||
@@ -188,7 +188,7 @@ bool touchscreen_is_enabled(void) | |||
188 | } | 188 | } |
189 | #endif | 189 | #endif |
190 | 190 | ||
191 | #if ((CONFIG_PLATFORM & PLATFORM_ANDROID) == 0) | 191 | #if ((CONFIG_PLATFORM & PLATFORM_ANDROID) == 0) || defined(DX50) || defined(DX90) |
192 | /* android has an API for this */ | 192 | /* android has an API for this */ |
193 | 193 | ||
194 | #define TOUCH_SLOP 16u | 194 | #define TOUCH_SLOP 16u |