From 6d47dc9a8860a17a9e630b8662f33df63011bad9 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 1 Oct 2020 12:53:42 -0400 Subject: fix some of the red introduced in e43726d Change-Id: Id1abb0dd11f8a8e79a80fc54e58a5a22706a03ad --- apps/debug_menu.c | 2 +- firmware/drivers/audio/nwzlinux-codec.c | 2 +- firmware/export/config/agptekrocker.h | 3 --- firmware/export/config/xduoox20.h | 6 +----- firmware/export/config/xduoox3ii.h | 3 +-- firmware/target/hosted/sonynwz/debug-nwz.c | 2 +- 6 files changed, 5 insertions(+), 13 deletions(-) diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 0d2e125185..59d7227f0b 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -2525,7 +2525,7 @@ static const struct { { "Screendump", dbg_screendump }, #endif { "Skin Engine RAM usage", dbg_skin_engine }, -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20) && !defined(SIMULATOR) +#if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20)) && !defined(SIMULATOR) { "View HW info", dbg_hw_info }, #endif #if (CONFIG_PLATFORM & PLATFORM_NATIVE) diff --git a/firmware/drivers/audio/nwzlinux-codec.c b/firmware/drivers/audio/nwzlinux-codec.c index 33059d2aec..ca5e274255 100644 --- a/firmware/drivers/audio/nwzlinux-codec.c +++ b/firmware/drivers/audio/nwzlinux-codec.c @@ -416,7 +416,7 @@ void audiohw_set_volume(int vol_l, int vol_r) printf(" set driver volume %d (%d dB)\n", drv_vol, curve->level[drv_vol] / 10); nwz_set_driver_vol(drv_vol); printf(" set digital volume %d dB\n", vol / 10); - pcm_alsa_set_digital_volume(vol / 10); + pcm_alsa_set_digital_volume(vol / 10, vol / 10); } void audiohw_close(void) diff --git a/firmware/export/config/agptekrocker.h b/firmware/export/config/agptekrocker.h index f14e65f7e9..90fd2267fe 100644 --- a/firmware/export/config/agptekrocker.h +++ b/firmware/export/config/agptekrocker.h @@ -17,9 +17,6 @@ #define CONFIG_PLATFORM (PLATFORM_HOSTED) #endif - - - /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR diff --git a/firmware/export/config/xduoox20.h b/firmware/export/config/xduoox20.h index 5da5ee00f3..28a19baaae 100644 --- a/firmware/export/config/xduoox20.h +++ b/firmware/export/config/xduoox20.h @@ -17,9 +17,6 @@ #define CONFIG_PLATFORM (PLATFORM_HOSTED) #endif - - - /* define this if you have a colour LCD */ #define HAVE_LCD_COLOR @@ -84,6 +81,7 @@ /* We have usb power and can detect usb but it is handled by Linux */ #define HAVE_USB_POWER +#define AUDIOHW_HAVE_SET_OUTPUT #endif #define CONFIG_BATTERY_MEASURE PERCENTAGE_MEASURE @@ -119,8 +117,6 @@ /* HW codec is flexible */ #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 -#define AUDIOHW_HAVE_SET_OUTPUT - /* Battery */ #define BATTERY_CAPACITY_DEFAULT 2400 /* default battery capacity */ #define BATTERY_CAPACITY_MIN 2400 /* min. capacity selectable */ diff --git a/firmware/export/config/xduoox3ii.h b/firmware/export/config/xduoox3ii.h index 678577f5f4..02e8a57909 100644 --- a/firmware/export/config/xduoox3ii.h +++ b/firmware/export/config/xduoox3ii.h @@ -81,6 +81,7 @@ /* We have usb power and can detect usb but it is handled by Linux */ #define HAVE_USB_POWER +#define AUDIOHW_HAVE_SET_OUTPUT #endif #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE @@ -116,8 +117,6 @@ /* HW codec is flexible */ #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 -#define AUDIOHW_HAVE_SET_OUTPUT - /* Battery */ #define BATTERY_CAPACITY_DEFAULT 2000 /* default battery capacity */ #define BATTERY_CAPACITY_MIN 2000 /* min. capacity selectable */ diff --git a/firmware/target/hosted/sonynwz/debug-nwz.c b/firmware/target/hosted/sonynwz/debug-nwz.c index 0c0b494330..c9a430e7c2 100644 --- a/firmware/target/hosted/sonynwz/debug-nwz.c +++ b/firmware/target/hosted/sonynwz/debug-nwz.c @@ -369,7 +369,7 @@ bool dbg_hw_info_audio(void) { case VOL: vol += inc ? 1 : -1; - pcm_alsa_set_digital_volume(vol); + pcm_alsa_set_digital_volume(vol, vol); break; case ACOUSTIC: audiohw_enable_acoustic(!audiohw_acoustic_enabled()); -- cgit