diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-02-17 22:38:38 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-02-17 22:38:38 +0000 |
commit | 00811840c9198833e6b234939b1509d52a51c880 (patch) | |
tree | 21659dbffbd8f1714d4c72eddfefa2f938291628 /firmware/export | |
parent | 5519d82137062f49f264332af329e711299ce6f0 (diff) | |
download | rockbox-00811840c9198833e6b234939b1509d52a51c880.tar.gz rockbox-00811840c9198833e6b234939b1509d52a51c880.zip |
Remote type autodetection on iriver, remote_type() returns REMOTETYPE_H100_LCD, REMOTETYPE_H300_LCD or REMOTETYPE_H300_NONLCD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8721 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/adc.h | 1 | ||||
-rw-r--r-- | firmware/export/config-h100.h | 5 | ||||
-rw-r--r-- | firmware/export/config-h120.h | 4 | ||||
-rw-r--r-- | firmware/export/config-h300.h | 5 | ||||
-rw-r--r-- | firmware/export/lcd-remote.h | 8 |
5 files changed, 23 insertions, 0 deletions
diff --git a/firmware/export/adc.h b/firmware/export/adc.h index 8364cdb012..4082e4b39b 100644 --- a/firmware/export/adc.h +++ b/firmware/export/adc.h | |||
@@ -27,6 +27,7 @@ | |||
27 | #define ADC_BUTTONS 0 | 27 | #define ADC_BUTTONS 0 |
28 | #define ADC_REMOTE 1 | 28 | #define ADC_REMOTE 1 |
29 | #define ADC_BATTERY 2 | 29 | #define ADC_BATTERY 2 |
30 | #define ADC_REMOTEDETECT 3 | ||
30 | #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ | 31 | #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ |
31 | 32 | ||
32 | #elif defined(IRIVER_IFP7XX) | 33 | #elif defined(IRIVER_IFP7XX) |
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h index b9677b5fb2..87598c208e 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h | |||
@@ -114,3 +114,8 @@ | |||
114 | /* Define this if you can control the S/PDIF power */ | 114 | /* Define this if you can control the S/PDIF power */ |
115 | #define HAVE_SPDIF_POWER | 115 | #define HAVE_SPDIF_POWER |
116 | #define SPDIF_POWER_INVERTED | 116 | #define SPDIF_POWER_INVERTED |
117 | |||
118 | /* ADC values for different remote control types */ | ||
119 | #define ADCVAL_H100_LCD_REMOTE 0x6a | ||
120 | #define ADCVAL_H300_LCD_REMOTE 0x50 | ||
121 | #define ADCVAL_H300_NONLCD_REMOTE 0xfc | ||
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h index 252d3c1af8..fd62243d8a 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h | |||
@@ -109,3 +109,7 @@ | |||
109 | /* Define this if you can control the S/PDIF power */ | 109 | /* Define this if you can control the S/PDIF power */ |
110 | #define HAVE_SPDIF_POWER | 110 | #define HAVE_SPDIF_POWER |
111 | 111 | ||
112 | /* ADC values for different remote control types */ | ||
113 | #define ADCVAL_H100_LCD_REMOTE 0x6a | ||
114 | #define ADCVAL_H300_LCD_REMOTE 0x50 | ||
115 | #define ADCVAL_H300_NONLCD_REMOTE 0xfc | ||
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 88feb9d649..45d3265010 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h | |||
@@ -113,4 +113,9 @@ | |||
113 | /* define this if the unit can be powered or charged via USB */ | 113 | /* define this if the unit can be powered or charged via USB */ |
114 | #define HAVE_USB_POWER | 114 | #define HAVE_USB_POWER |
115 | 115 | ||
116 | /* ADC values for different remote control types */ | ||
117 | #define ADCVAL_H100_LCD_REMOTE 0x3c | ||
118 | #define ADCVAL_H300_LCD_REMOTE 0x2b | ||
119 | #define ADCVAL_H300_NONLCD_REMOTE 0x8e | ||
120 | |||
116 | #endif | 121 | #endif |
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 8e5fa950b1..c27a0d4e73 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h | |||
@@ -23,12 +23,20 @@ | |||
23 | #include <stdbool.h> | 23 | #include <stdbool.h> |
24 | #include "cpu.h" | 24 | #include "cpu.h" |
25 | #include "config.h" | 25 | #include "config.h" |
26 | #include "adc.h" | ||
26 | 27 | ||
27 | #ifdef HAVE_REMOTE_LCD | 28 | #ifdef HAVE_REMOTE_LCD |
28 | 29 | ||
29 | #define STYLE_DEFAULT 0 | 30 | #define STYLE_DEFAULT 0 |
30 | #define STYLE_INVERT 1 | 31 | #define STYLE_INVERT 1 |
31 | 32 | ||
33 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) | ||
34 | #define REMOTETYPE_H100_LCD 1 | ||
35 | #define REMOTETYPE_H300_LCD 2 | ||
36 | #define REMOTETYPE_H300_NONLCD 3 | ||
37 | extern int remote_type(void); | ||
38 | #endif | ||
39 | |||
32 | extern void lcd_remote_init(void); | 40 | extern void lcd_remote_init(void); |
33 | extern int lcd_remote_default_contrast(void); | 41 | extern int lcd_remote_default_contrast(void); |
34 | extern void lcd_remote_set_contrast(int val); | 42 | extern void lcd_remote_set_contrast(int val); |