diff --git a/openrtx/src/core/audio_path.cpp b/openrtx/src/core/audio_path.cpp index a46668f4..7c22a904 100644 --- a/openrtx/src/core/audio_path.cpp +++ b/openrtx/src/core/audio_path.cpp @@ -33,6 +33,13 @@ struct Path int8_t destination = -1; ///< Destination endpoint of the path. int8_t priority = -1; ///< Path priority level. + Path(enum AudioSource src, enum AudioSink sink, enum AudioPriority prio) + { + source = static_cast(src); + destination = static_cast(sink); + priority = static_cast(prio); + } + bool isValid() const { return (source != -1) && @@ -110,7 +117,7 @@ static int pathCounter = 1; // Counter for path ID generatio pathId audioPath_request(enum AudioSource source, enum AudioSink sink, enum AudioPriority prio) { - const Path path{source, sink, prio}; + const Path path(source, sink, prio); if (!path.isValid()) return -1; diff --git a/openrtx/src/core/graphics.c b/openrtx/src/core/graphics.c index e51dd077..6b8ab295 100644 --- a/openrtx/src/core/graphics.c +++ b/openrtx/src/core/graphics.c @@ -150,7 +150,11 @@ static bw_t _color2bw(color_t true_color) #error Please define a pixel format type into hwconfig.h or meson.build #endif +#if defined(PLATFORM_LINUX) +static PIXEL_T framebuffer[FB_SIZE]; +#else static PIXEL_T __attribute__((section(".bss.fb"))) framebuffer[FB_SIZE]; +#endif static char text[32]; diff --git a/openrtx/src/core/voicePromptData.S b/openrtx/src/core/voicePromptData.S index 80c351d1..fe20615e 100644 --- a/openrtx/src/core/voicePromptData.S +++ b/openrtx/src/core/voicePromptData.S @@ -1,3 +1,4 @@ +#ifndef VP_USE_FILESYSTEM .section .note.GNU-stack,"" .section .rodata @@ -8,3 +9,4 @@ _vpdata_start: .incbin "../voiceprompts.vpc" .set _vpdata_end, . +#endif