diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-01 14:06:48 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-01 15:41:30 -0400 |
commit | b030bf5885dc5e018dd38eacbb294f1321f2b400 (patch) | |
tree | 4d9f06c7928fa44d225477b5551c69c29617a98a /firmware/export/config | |
parent | 6d47dc9a8860a17a9e630b8662f33df63011bad9 (diff) | |
download | rockbox-b030bf5885dc5e018dd38eacbb294f1321f2b400.tar.gz rockbox-b030bf5885dc5e018dd38eacbb294f1321f2b400.zip |
xduoox3ii/x20: Proper lineout detection and volume mangling.
hotplugging hp and lineout works, without blowing out eardrums.
Change-Id: I2df5c7a618bb2d1d77d416548d45dff9cfc619db
Diffstat (limited to 'firmware/export/config')
-rw-r--r-- | firmware/export/config/xduoox20.h | 2 | ||||
-rw-r--r-- | firmware/export/config/xduoox3.h | 3 | ||||
-rw-r--r-- | firmware/export/config/xduoox3ii.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/firmware/export/config/xduoox20.h b/firmware/export/config/xduoox20.h index 28a19baaae..b90ebceb04 100644 --- a/firmware/export/config/xduoox20.h +++ b/firmware/export/config/xduoox20.h | |||
@@ -67,6 +67,7 @@ | |||
67 | #define PLUGIN_BUFFER_SIZE 0x100000 | 67 | #define PLUGIN_BUFFER_SIZE 0x100000 |
68 | 68 | ||
69 | #define HAVE_HEADPHONE_DETECTION | 69 | #define HAVE_HEADPHONE_DETECTION |
70 | #define HAVE_LINEOUT_DETECTION | ||
70 | 71 | ||
71 | /* KeyPad configuration for plugins */ | 72 | /* KeyPad configuration for plugins */ |
72 | #define CONFIG_KEYPAD XDUOO_X20_PAD | 73 | #define CONFIG_KEYPAD XDUOO_X20_PAD |
@@ -81,7 +82,6 @@ | |||
81 | /* We have usb power and can detect usb but it is handled by Linux */ | 82 | /* We have usb power and can detect usb but it is handled by Linux */ |
82 | #define HAVE_USB_POWER | 83 | #define HAVE_USB_POWER |
83 | 84 | ||
84 | #define AUDIOHW_HAVE_SET_OUTPUT | ||
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | #define CONFIG_BATTERY_MEASURE PERCENTAGE_MEASURE | 87 | #define CONFIG_BATTERY_MEASURE PERCENTAGE_MEASURE |
diff --git a/firmware/export/config/xduoox3.h b/firmware/export/config/xduoox3.h index 4c2cc47fc9..484e52d151 100644 --- a/firmware/export/config/xduoox3.h +++ b/firmware/export/config/xduoox3.h | |||
@@ -85,9 +85,6 @@ | |||
85 | /* Define this if a programmable hotkey is mapped */ | 85 | /* Define this if a programmable hotkey is mapped */ |
86 | #define HAVE_HOTKEY | 86 | #define HAVE_HOTKEY |
87 | 87 | ||
88 | |||
89 | |||
90 | |||
91 | #ifndef BOOTLOADER | 88 | #ifndef BOOTLOADER |
92 | /* define this if you have a real-time clock */ | 89 | /* define this if you have a real-time clock */ |
93 | #define CONFIG_RTC RTC_JZ4760 | 90 | #define CONFIG_RTC RTC_JZ4760 |
diff --git a/firmware/export/config/xduoox3ii.h b/firmware/export/config/xduoox3ii.h index 02e8a57909..9ad7b5884b 100644 --- a/firmware/export/config/xduoox3ii.h +++ b/firmware/export/config/xduoox3ii.h | |||
@@ -67,6 +67,7 @@ | |||
67 | #define PLUGIN_BUFFER_SIZE 0x100000 | 67 | #define PLUGIN_BUFFER_SIZE 0x100000 |
68 | 68 | ||
69 | #define HAVE_HEADPHONE_DETECTION | 69 | #define HAVE_HEADPHONE_DETECTION |
70 | #define HAVE_LINEOUT_DETECTION | ||
70 | 71 | ||
71 | /* KeyPad configuration for plugins */ | 72 | /* KeyPad configuration for plugins */ |
72 | #define CONFIG_KEYPAD XDUOO_X3II_PAD | 73 | #define CONFIG_KEYPAD XDUOO_X3II_PAD |
@@ -81,7 +82,6 @@ | |||
81 | /* We have usb power and can detect usb but it is handled by Linux */ | 82 | /* We have usb power and can detect usb but it is handled by Linux */ |
82 | #define HAVE_USB_POWER | 83 | #define HAVE_USB_POWER |
83 | 84 | ||
84 | #define AUDIOHW_HAVE_SET_OUTPUT | ||
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE | 87 | #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE |