From e17337c9aab231875234e0485f7175a5a613fb4c Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 8 Apr 2021 21:56:23 -0400 Subject: ErosQ: fix panic on startup caused by ad55da5f It turns out #include "settings.h" pulls in rbpaths.h which ends up remapping open() to the path-mangling rockbox open(). By defining RB_FILESYSTEM_OS we prevent the remap. My mistake for not testing this before committing! Change-Id: I2978eb7b413693c4cb887b7ac7b2457780db7d25 --- firmware/drivers/audio/erosqlinux_codec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/firmware/drivers/audio/erosqlinux_codec.c b/firmware/drivers/audio/erosqlinux_codec.c index 2812960cb4..b1c5aa0c4f 100644 --- a/firmware/drivers/audio/erosqlinux_codec.c +++ b/firmware/drivers/audio/erosqlinux_codec.c @@ -20,6 +20,8 @@ * KIND, either express or implied. * ****************************************************************************/ +#define RB_FILESYSTEM_OS // VERY important this is before settings.h + // because that pulls in rbpaths.h which breaks open() //#define LOGF_ENABLE @@ -204,8 +206,7 @@ void audiohw_set_lineout_volume(int vol_l, int vol_r) (void)vol_r; if (lineout_inserted()) { - l = -180; - r = -180; + l = r = global_settings.volume_limit; } else { l = vol_l_hw; r = vol_r_hw; -- cgit v1.2.3