diff options
Diffstat (limited to 'firmware/target/arm/sandisk')
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/adc-e200.c | 24 | ||||
-rw-r--r-- | firmware/target/arm/sandisk/sansa-e200/adc-target.h | 22 |
2 files changed, 32 insertions, 14 deletions
diff --git a/firmware/target/arm/sandisk/sansa-e200/adc-e200.c b/firmware/target/arm/sandisk/sansa-e200/adc-e200.c index b3206d68d1..5e57e4bec5 100644 --- a/firmware/target/arm/sandisk/sansa-e200/adc-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/adc-e200.c | |||
@@ -18,23 +18,25 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include "adc.h" | 19 | #include "adc.h" |
20 | #include "i2c-pp.h" | 20 | #include "i2c-pp.h" |
21 | #include "logf.h" | 21 | #include "as3514.h" |
22 | 22 | ||
23 | /* Read 10-bit channel data */ | 23 | /* Read 10-bit channel data */ |
24 | unsigned short adc_read(int channel) | 24 | unsigned short adc_read(int channel) |
25 | { | 25 | { |
26 | unsigned char bat[2]; | 26 | unsigned char buf[2]; |
27 | unsigned short data = 0; | 27 | unsigned short data = 0; |
28 | 28 | ||
29 | switch( channel) | 29 | /* Select channel */ |
30 | { | 30 | pp_i2c_send( AS3514_I2C_ADDR, ADC_0, (channel << 4)); |
31 | case ADC_UNREG_POWER: | 31 | |
32 | pp_i2c_send( 0x46, 0x2e, 0x0); | 32 | /* Wait for conversion to be complete */ |
33 | pp_i2c_send( 0x46, 0x27, 0x1); | 33 | pp_i2c_send( AS3514_I2C_ADDR, IRQ_ENRD2, 0x1); |
34 | i2c_readbytes( 0x46, 0x2e, 2, bat); | 34 | while( (i2c_readbyte( AS3514_I2C_ADDR, IRQ_ENRD2) & 0x1) == 0); |
35 | data = ((bat[0]<<8) | bat[1]); | 35 | |
36 | break; | 36 | /* Read data */ |
37 | } | 37 | i2c_readbytes( AS3514_I2C_ADDR, ADC_0, 2, buf); |
38 | data = (((buf[0] & 0x3) << 8) | buf[1]); | ||
39 | |||
38 | return data; | 40 | return data; |
39 | } | 41 | } |
40 | 42 | ||
diff --git a/firmware/target/arm/sandisk/sansa-e200/adc-target.h b/firmware/target/arm/sandisk/sansa-e200/adc-target.h index e9bff42a52..56efdf7574 100644 --- a/firmware/target/arm/sandisk/sansa-e200/adc-target.h +++ b/firmware/target/arm/sandisk/sansa-e200/adc-target.h | |||
@@ -19,9 +19,25 @@ | |||
19 | #ifndef _ADC_TARGET_H_ | 19 | #ifndef _ADC_TARGET_H_ |
20 | #define _ADC_TARGET_H_ | 20 | #define _ADC_TARGET_H_ |
21 | 21 | ||
22 | #define NUM_ADC_CHANNELS 1 | 22 | /* ADC channels */ |
23 | #define NUM_ADC_CHANNELS 13 | ||
23 | 24 | ||
24 | #define ADC_BATTERY 0 | 25 | #define ADC_BVDD 0 /* Battery voltage of 4V LiIo accumulator */ |
25 | #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ | 26 | #define ADC_RTCSUP 1 /* RTC backup battery voltage */ |
27 | #define ADC_UVDD 2 /* USB host voltage */ | ||
28 | #define ADC_CHG_IN 3 /* Charger input voltage */ | ||
29 | #define ADC_CVDD 4 /* Charger pump output voltage */ | ||
30 | #define ADC_BATTEMP 5 /* Battery charging temperature */ | ||
31 | #define ADC_MICSUP1 6 /* Voltage on MicSup1 for remote control | ||
32 | or external voltage measurement */ | ||
33 | #define ADC_MICSUP2 7 /* Voltage on MicSup1 for remote control | ||
34 | or external voltage measurement */ | ||
35 | #define ADC_VBE1 8 /* Measuring junction temperature @ 2uA */ | ||
36 | #define ADC_VBE2 9 /* Measuring junction temperature @ 1uA */ | ||
37 | #define ADC_I_MICSUP1 10 /* Current of MicSup1 for remote control detection */ | ||
38 | #define ADC_I_MICSUP2 11 /* Current of MicSup2 for remote control detection */ | ||
39 | #define ADC_VBAT 12 /* Single cell battery voltage */ | ||
40 | |||
41 | #define ADC_UNREG_POWER ADC_BVDD /* For compatibility */ | ||
26 | 42 | ||
27 | #endif | 43 | #endif |