diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/adc.h | 8 | ||||
-rw-r--r-- | firmware/export/config-ipodvideo.h | 4 | ||||
-rw-r--r-- | firmware/export/pcf50605.h | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/firmware/export/adc.h b/firmware/export/adc.h index 454c102403..b0a83d9bd0 100644 --- a/firmware/export/adc.h +++ b/firmware/export/adc.h | |||
@@ -29,6 +29,12 @@ | |||
29 | #define ADC_BATTERY 2 | 29 | #define ADC_BATTERY 2 |
30 | #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ | 30 | #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ |
31 | 31 | ||
32 | #elif defined(IPOD_ARCH) | ||
33 | #define NUM_ADC_CHANNELS 1 | ||
34 | |||
35 | #define ADC_BATTERY 0 | ||
36 | #define ADC_UNREG_POWER ADC_BATTERY | ||
37 | |||
32 | #elif defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) | 38 | #elif defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) |
33 | #define NUM_ADC_CHANNELS 4 | 39 | #define NUM_ADC_CHANNELS 4 |
34 | 40 | ||
@@ -94,7 +100,7 @@ void adc_init(void); | |||
94 | 100 | ||
95 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)\ | 101 | #if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)\ |
96 | || defined(IAUDIO_X5) | 102 | || defined(IAUDIO_X5) |
97 | unsigned char adc_scan(int channel); | 103 | unsigned short adc_scan(int channel); |
98 | #endif | 104 | #endif |
99 | 105 | ||
100 | #endif | 106 | #endif |
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index 2bf0396a21..1fa778dbc4 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h | |||
@@ -59,9 +59,9 @@ | |||
59 | #define CONFIG_I2C I2C_PP5020 | 59 | #define CONFIG_I2C I2C_PP5020 |
60 | 60 | ||
61 | /* Type of mobile power */ | 61 | /* Type of mobile power */ |
62 | //#define CONFIG_BATTERY BATT_LIPOL1300 | 62 | #define CONFIG_BATTERY BATT_LIPOL1300 |
63 | 63 | ||
64 | #define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ | 64 | #define BATTERY_SCALE_FACTOR 586 /* FIX: this value is picked at random */ |
65 | 65 | ||
66 | /* Define this if the platform can charge batteries */ | 66 | /* Define this if the platform can charge batteries */ |
67 | //#define HAVE_CHARGING 1 | 67 | //#define HAVE_CHARGING 1 |
diff --git a/firmware/export/pcf50605.h b/firmware/export/pcf50605.h index 95fcaff8fb..4ea1379e4a 100644 --- a/firmware/export/pcf50605.h +++ b/firmware/export/pcf50605.h | |||
@@ -22,10 +22,11 @@ | |||
22 | 22 | ||
23 | #ifdef IPOD_ARCH | 23 | #ifdef IPOD_ARCH |
24 | int pcf50605_read(int address); | 24 | int pcf50605_read(int address); |
25 | void pcf50605_read_multiple(int address, unsigned char* buf, int count); | 25 | int pcf50605_read_multiple(int address, unsigned char* buf, int count); |
26 | int pcf50605_write(int address, unsigned char val); | 26 | int pcf50605_write(int address, unsigned char val); |
27 | int pcf50605_write_multiple(int address, const unsigned char* buf, int count); | 27 | int pcf50605_write_multiple(int address, const unsigned char* buf, int count); |
28 | int pcf50605_battery_read(void); | 28 | int pcf50605_a2d_read(int channel); |
29 | bool pcf50605_charger_inserted(void); | ||
29 | void pcf50605_standby_mode(void); | 30 | void pcf50605_standby_mode(void); |
30 | #endif | 31 | #endif |
31 | 32 | ||