diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-01 12:53:42 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-01 12:55:52 -0400 |
commit | 6d47dc9a8860a17a9e630b8662f33df63011bad9 (patch) | |
tree | 53f3a7ad38fa0f739b366b4f98dd40eb90921f4d | |
parent | e43726df2cd1cb8275234d60b818d417cfe730b5 (diff) | |
download | rockbox-6d47dc9a8860a17a9e630b8662f33df63011bad9.tar.gz rockbox-6d47dc9a8860a17a9e630b8662f33df63011bad9.zip |
fix some of the red introduced in e43726d
Change-Id: Id1abb0dd11f8a8e79a80fc54e58a5a22706a03ad
-rw-r--r-- | apps/debug_menu.c | 2 | ||||
-rw-r--r-- | firmware/drivers/audio/nwzlinux-codec.c | 2 | ||||
-rw-r--r-- | firmware/export/config/agptekrocker.h | 3 | ||||
-rw-r--r-- | firmware/export/config/xduoox20.h | 6 | ||||
-rw-r--r-- | firmware/export/config/xduoox3ii.h | 3 | ||||
-rw-r--r-- | 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 { | |||
2525 | { "Screendump", dbg_screendump }, | 2525 | { "Screendump", dbg_screendump }, |
2526 | #endif | 2526 | #endif |
2527 | { "Skin Engine RAM usage", dbg_skin_engine }, | 2527 | { "Skin Engine RAM usage", dbg_skin_engine }, |
2528 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20) && !defined(SIMULATOR) | 2528 | #if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20)) && !defined(SIMULATOR) |
2529 | { "View HW info", dbg_hw_info }, | 2529 | { "View HW info", dbg_hw_info }, |
2530 | #endif | 2530 | #endif |
2531 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 2531 | #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) | |||
416 | printf(" set driver volume %d (%d dB)\n", drv_vol, curve->level[drv_vol] / 10); | 416 | printf(" set driver volume %d (%d dB)\n", drv_vol, curve->level[drv_vol] / 10); |
417 | nwz_set_driver_vol(drv_vol); | 417 | nwz_set_driver_vol(drv_vol); |
418 | printf(" set digital volume %d dB\n", vol / 10); | 418 | printf(" set digital volume %d dB\n", vol / 10); |
419 | pcm_alsa_set_digital_volume(vol / 10); | 419 | pcm_alsa_set_digital_volume(vol / 10, vol / 10); |
420 | } | 420 | } |
421 | 421 | ||
422 | void audiohw_close(void) | 422 | 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 @@ | |||
17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) | 17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | |||
21 | |||
22 | |||
23 | /* define this if you have a colour LCD */ | 20 | /* define this if you have a colour LCD */ |
24 | #define HAVE_LCD_COLOR | 21 | #define HAVE_LCD_COLOR |
25 | 22 | ||
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 @@ | |||
17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) | 17 | #define CONFIG_PLATFORM (PLATFORM_HOSTED) |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | |||
21 | |||
22 | |||
23 | /* define this if you have a colour LCD */ | 20 | /* define this if you have a colour LCD */ |
24 | #define HAVE_LCD_COLOR | 21 | #define HAVE_LCD_COLOR |
25 | 22 | ||
@@ -84,6 +81,7 @@ | |||
84 | /* We have usb power and can detect usb but it is handled by Linux */ | 81 | /* We have usb power and can detect usb but it is handled by Linux */ |
85 | #define HAVE_USB_POWER | 82 | #define HAVE_USB_POWER |
86 | 83 | ||
84 | #define AUDIOHW_HAVE_SET_OUTPUT | ||
87 | #endif | 85 | #endif |
88 | 86 | ||
89 | #define CONFIG_BATTERY_MEASURE PERCENTAGE_MEASURE | 87 | #define CONFIG_BATTERY_MEASURE PERCENTAGE_MEASURE |
@@ -119,8 +117,6 @@ | |||
119 | /* HW codec is flexible */ | 117 | /* HW codec is flexible */ |
120 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 | 118 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 |
121 | 119 | ||
122 | #define AUDIOHW_HAVE_SET_OUTPUT | ||
123 | |||
124 | /* Battery */ | 120 | /* Battery */ |
125 | #define BATTERY_CAPACITY_DEFAULT 2400 /* default battery capacity */ | 121 | #define BATTERY_CAPACITY_DEFAULT 2400 /* default battery capacity */ |
126 | #define BATTERY_CAPACITY_MIN 2400 /* min. capacity selectable */ | 122 | #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 @@ | |||
81 | /* We have usb power and can detect usb but it is handled by Linux */ | 81 | /* We have usb power and can detect usb but it is handled by Linux */ |
82 | #define HAVE_USB_POWER | 82 | #define HAVE_USB_POWER |
83 | 83 | ||
84 | #define AUDIOHW_HAVE_SET_OUTPUT | ||
84 | #endif | 85 | #endif |
85 | 86 | ||
86 | #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE | 87 | #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE |
@@ -116,8 +117,6 @@ | |||
116 | /* HW codec is flexible */ | 117 | /* HW codec is flexible */ |
117 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 | 118 | #define HW_SAMPR_CAPS SAMPR_CAP_ALL_192 |
118 | 119 | ||
119 | #define AUDIOHW_HAVE_SET_OUTPUT | ||
120 | |||
121 | /* Battery */ | 120 | /* Battery */ |
122 | #define BATTERY_CAPACITY_DEFAULT 2000 /* default battery capacity */ | 121 | #define BATTERY_CAPACITY_DEFAULT 2000 /* default battery capacity */ |
123 | #define BATTERY_CAPACITY_MIN 2000 /* min. capacity selectable */ | 122 | #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) | |||
369 | { | 369 | { |
370 | case VOL: | 370 | case VOL: |
371 | vol += inc ? 1 : -1; | 371 | vol += inc ? 1 : -1; |
372 | pcm_alsa_set_digital_volume(vol); | 372 | pcm_alsa_set_digital_volume(vol, vol); |
373 | break; | 373 | break; |
374 | case ACOUSTIC: | 374 | case ACOUSTIC: |
375 | audiohw_enable_acoustic(!audiohw_acoustic_enabled()); | 375 | audiohw_enable_acoustic(!audiohw_acoustic_enabled()); |