diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/audiohw.h | 4 | ||||
-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 | ||||
-rw-r--r-- | firmware/export/xduoolinux_codec.h | 5 |
5 files changed, 5 insertions, 11 deletions
diff --git a/firmware/export/audiohw.h b/firmware/export/audiohw.h index 34a253e893..31be0555f8 100644 --- a/firmware/export/audiohw.h +++ b/firmware/export/audiohw.h | |||
@@ -452,10 +452,6 @@ void audiohw_set_volume(int vol_l, int vol_r); | |||
452 | void audiohw_set_lineout_volume(int vol_l, int vol_r); | 452 | void audiohw_set_lineout_volume(int vol_l, int vol_r); |
453 | #endif | 453 | #endif |
454 | 454 | ||
455 | #ifdef AUDIOHW_HAVE_SET_OUTPUT | ||
456 | void audiohw_set_output(void); | ||
457 | #endif | ||
458 | |||
459 | #ifndef AUDIOHW_HAVE_CLIPPING | 455 | #ifndef AUDIOHW_HAVE_CLIPPING |
460 | #if defined(AUDIOHW_HAVE_BASS) || defined(AUDIOHW_HAVE_TREBLE) \ | 456 | #if defined(AUDIOHW_HAVE_BASS) || defined(AUDIOHW_HAVE_TREBLE) \ |
461 | || defined(AUDIOHW_HAVE_EQ) | 457 | || defined(AUDIOHW_HAVE_EQ) |
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 |
diff --git a/firmware/export/xduoolinux_codec.h b/firmware/export/xduoolinux_codec.h index ea0b2988f1..a46976d386 100644 --- a/firmware/export/xduoolinux_codec.h +++ b/firmware/export/xduoolinux_codec.h | |||
@@ -1,10 +1,11 @@ | |||
1 | #ifndef __XDUOOLINUX_CODEC__ | 1 | #ifndef __XDUOOLINUX_CODEC__ |
2 | #define __XDUOOLINUX_CODEC__ | 2 | #define __XDUOOLINUX_CODEC__ |
3 | 3 | ||
4 | #define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP) | 4 | #define AUDIOHW_CAPS (LINEOUT_CAP | FILTER_ROLL_OFF_CAP) |
5 | AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -127, 0, -30) | 5 | AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -127, 0, -30) |
6 | AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 4, 0) | 6 | AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 4, 0) |
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | void audiohw_mute(int mute); | 9 | void audiohw_mute(int mute); |
10 | void audiohw_set_output(void); | 10 | void xduoo_set_output(int ps); |
11 | int xduoo_get_outputs(void); | ||