diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/audiohw.h | 6 | ||||
-rw-r--r-- | firmware/export/config/sim.h | 4 | ||||
-rw-r--r-- | firmware/export/system.h | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index d7ee551e40..b8214e67b9 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h | |||
@@ -66,6 +66,10 @@ | |||
66 | #elif defined(HAVE_AK4537) | 66 | #elif defined(HAVE_AK4537) |
67 | #include "ak4537.h" | 67 | #include "ak4537.h" |
68 | #endif | 68 | #endif |
69 | #if defined(HAVE_SDL_AUDIO) | ||
70 | /* #include <SDL_audio.h> gives errors in other code areas, | ||
71 | * we don't really need it here, so don't. but it should maybe be fixed */ | ||
72 | #endif | ||
69 | 73 | ||
70 | 74 | ||
71 | 75 | ||
@@ -369,7 +373,7 @@ void audiohw_postinit(void); | |||
369 | */ | 373 | */ |
370 | void audiohw_close(void); | 374 | void audiohw_close(void); |
371 | 375 | ||
372 | #ifdef AUDIOHW_HAVE_CLIPPING | 376 | #if defined(AUDIOHW_HAVE_CLIPPING) || defined(HAVE_SDL_AUDIO) |
373 | /** | 377 | /** |
374 | * Set new volume value | 378 | * Set new volume value |
375 | * @param val to set. | 379 | * @param val to set. |
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h index 6d2e6d24ea..d65b0fbbf8 100644 --- a/firmware/export/config/sim.h +++ b/firmware/export/config/sim.h | |||
@@ -80,6 +80,8 @@ | |||
80 | 80 | ||
81 | #undef HAVE_SPEAKER | 81 | #undef HAVE_SPEAKER |
82 | 82 | ||
83 | #undef BUTTON_DRIVER_CLOSE | ||
84 | |||
83 | #if CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG | 85 | #if CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG |
84 | #undef CONFIG_BACKLIGHT_FADING | 86 | #undef CONFIG_BACKLIGHT_FADING |
85 | /* simulate SW_SETTING, as we handle sdl very similary */ | 87 | /* simulate SW_SETTING, as we handle sdl very similary */ |
@@ -97,4 +99,6 @@ | |||
97 | #define DEFAULT_BRIGHTNESS_SETTING MAX_BRIGHTNESS_SETTING | 99 | #define DEFAULT_BRIGHTNESS_SETTING MAX_BRIGHTNESS_SETTING |
98 | #endif | 100 | #endif |
99 | 101 | ||
102 | #define HAVE_SDL | ||
103 | #define HAVE_SDL_AUDIO | ||
100 | #define _ISOC99_SOURCE 1 | 104 | #define _ISOC99_SOURCE 1 |
diff --git a/firmware/export/system.h b/firmware/export/system.h index bd31c03028..fc582aac03 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h | |||
@@ -235,6 +235,7 @@ enum { | |||
235 | #if !defined(SIMULATOR) && !defined(__PCTOOL__) | 235 | #if !defined(SIMULATOR) && !defined(__PCTOOL__) |
236 | #include "system-target.h" | 236 | #include "system-target.h" |
237 | #else /* SIMULATOR */ | 237 | #else /* SIMULATOR */ |
238 | #include "system-sdl.h" | ||
238 | static inline uint16_t swap16(uint16_t value) | 239 | static inline uint16_t swap16(uint16_t value) |
239 | /* | 240 | /* |
240 | result[15..8] = value[ 7..0]; | 241 | result[15..8] = value[ 7..0]; |