diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/adc.h | 3 | ||||
-rw-r--r-- | firmware/export/button.h | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/firmware/export/adc.h b/firmware/export/adc.h index 027c7154f0..454c102403 100644 --- a/firmware/export/adc.h +++ b/firmware/export/adc.h | |||
@@ -92,7 +92,8 @@ | |||
92 | unsigned short adc_read(int channel); | 92 | unsigned short adc_read(int channel); |
93 | void adc_init(void); | 93 | void adc_init(void); |
94 | 94 | ||
95 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) | 95 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)\ |
96 | || defined(IAUDIO_X5) | ||
96 | unsigned char adc_scan(int channel); | 97 | unsigned char adc_scan(int channel); |
97 | #endif | 98 | #endif |
98 | 99 | ||
diff --git a/firmware/export/button.h b/firmware/export/button.h index 1d6acfa275..484698e492 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -23,7 +23,8 @@ | |||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | #include "config.h" | 24 | #include "config.h" |
25 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 25 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
26 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 26 | (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ |
27 | (CONFIG_KEYPAD == IAUDIO_X5_PAD) | ||
27 | #define HAS_BUTTON_HOLD | 28 | #define HAS_BUTTON_HOLD |
28 | #define HAS_REMOTE_BUTTON_HOLD | 29 | #define HAS_REMOTE_BUTTON_HOLD |
29 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) | 30 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) |
@@ -192,8 +193,7 @@ bool button_hold(void); | |||
192 | #define BUTTON_POWER 0x0004 | 193 | #define BUTTON_POWER 0x0004 |
193 | #define BUTTON_UP 0x0008 | 194 | #define BUTTON_UP 0x0008 |
194 | #define BUTTON_DOWN 0x0010 | 195 | #define BUTTON_DOWN 0x0010 |
195 | #define BUTTON_MENU 0x0020 | 196 | #define BUTTON_SELECT 0x0020 |
196 | #define BUTTON_OFF 0x0040 /* DOES NOT EXIST!!! */ | ||
197 | 197 | ||
198 | #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) | 198 | #define BUTTON_RC_REC (BUTTON_REMOTE | 0x00400000) |
199 | 199 | ||