len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix some of the red introduced in e43726d

Browse source 
Change-Id: Id1abb0dd11f8a8e79a80fc54e58a5a22706a03ad
This commit is contained in:
Solomon Peachy 2020-10-01 12:53:42 -04:00
parent e43726df2c
commit 6d47dc9a88
6 changed files with 5 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/debug_menu.c
View file

@ -2525,7 +2525,7 @@ static const struct {
{ "Screendump", dbg_screendump }, { "Screendump", dbg_screendump },
#endif #endif
{ "Skin Engine RAM usage", dbg_skin_engine }, { "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 }, { "View HW info", dbg_hw_info },
#endif #endif
#if (CONFIG_PLATFORM & PLATFORM_NATIVE) #if (CONFIG_PLATFORM & PLATFORM_NATIVE)

2
firmware/drivers/audio/nwzlinux-codec.c
View file

@ -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); printf(" set driver volume %d (%d dB)\n", drv_vol, curve->level[drv_vol] / 10);
nwz_set_driver_vol(drv_vol); nwz_set_driver_vol(drv_vol);
printf(" set digital volume %d dB\n", vol / 10); 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) void audiohw_close(void)

3
firmware/export/config/agptekrocker.h
View file

@ -17,9 +17,6 @@
#define CONFIG_PLATFORM (PLATFORM_HOSTED) #define CONFIG_PLATFORM (PLATFORM_HOSTED)
#endif #endif
/* define this if you have a colour LCD */ /* define this if you have a colour LCD */
#define HAVE_LCD_COLOR #define HAVE_LCD_COLOR

6
firmware/export/config/xduoox20.h
View file

@ -17,9 +17,6 @@
#define CONFIG_PLATFORM (PLATFORM_HOSTED) #define CONFIG_PLATFORM (PLATFORM_HOSTED)
#endif #endif
/* define this if you have a colour LCD */ /* define this if you have a colour LCD */
#define HAVE_LCD_COLOR #define HAVE_LCD_COLOR
@ -84,6 +81,7 @@
/* We have usb power and can detect usb but it is handled by Linux */ /* We have usb power and can detect usb but it is handled by Linux */
#define HAVE_USB_POWER #define HAVE_USB_POWER
#define AUDIOHW_HAVE_SET_OUTPUT
#endif #endif
#define CONFIG_BATTERY_MEASURE PERCENTAGE_MEASURE #define CONFIG_BATTERY_MEASURE PERCENTAGE_MEASURE
@ -119,8 +117,6 @@
/* HW codec is flexible */ /* HW codec is flexible */
#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192
#define AUDIOHW_HAVE_SET_OUTPUT
/* Battery */ /* Battery */
#define BATTERY_CAPACITY_DEFAULT 2400 /* default battery capacity */ #define BATTERY_CAPACITY_DEFAULT 2400 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 2400 /* min. capacity selectable */ #define BATTERY_CAPACITY_MIN 2400 /* min. capacity selectable */

3
firmware/export/config/xduoox3ii.h
View file

@ -81,6 +81,7 @@
/* We have usb power and can detect usb but it is handled by Linux */ /* We have usb power and can detect usb but it is handled by Linux */
#define HAVE_USB_POWER #define HAVE_USB_POWER
#define AUDIOHW_HAVE_SET_OUTPUT
#endif #endif
#define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE
@ -116,8 +117,6 @@
/* HW codec is flexible */ /* HW codec is flexible */
#define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192
#define AUDIOHW_HAVE_SET_OUTPUT
/* Battery */ /* Battery */
#define BATTERY_CAPACITY_DEFAULT 2000 /* default battery capacity */ #define BATTERY_CAPACITY_DEFAULT 2000 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 2000 /* min. capacity selectable */ #define BATTERY_CAPACITY_MIN 2000 /* min. capacity selectable */

2
firmware/target/hosted/sonynwz/debug-nwz.c
View file

@ -369,7 +369,7 @@ bool dbg_hw_info_audio(void)
{ {
case VOL: case VOL:
vol += inc ? 1 : -1; vol += inc ? 1 : -1;
pcm_alsa_set_digital_volume(vol); pcm_alsa_set_digital_volume(vol, vol);
break; break;
case ACOUSTIC: case ACOUSTIC:
audiohw_enable_acoustic(!audiohw_acoustic_enabled()); audiohw_enable_acoustic(!audiohw_acoustic_enabled());