diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-16 13:28:10 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-11-16 13:28:10 +0000 |
| commit | 91c4873253bd7350e3430c455a7f58df576553de (patch) | |
| tree | 595a5c3483c70780c8b21b86cb94ab0628253e39 /firmware/export | |
| parent | ffe0b23902ef8e92f60b7c15b53dfbb1f23fce8c (diff) | |
| download | rockbox-91c4873253bd7350e3430c455a7f58df576553de.zip rockbox-91c4873253bd7350e3430c455a7f58df576553de.tar.gz rockbox-91c4873253bd7350e3430c455a7f58df576553de.tar.bz2 rockbox-91c4873253bd7350e3430c455a7f58df576553de.tar.xz | |
H300: ADC driver
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7906 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/adc.h | 10 | ||||
| -rw-r--r-- | firmware/export/config-h300.h | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/firmware/export/adc.h b/firmware/export/adc.h index 7a90afd..a5ba583 100644 --- a/firmware/export/adc.h +++ b/firmware/export/adc.h @@ -21,7 +21,7 @@ #include "config.h" -#ifdef IRIVER_H100_SERIES +#if defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES) #define NUM_ADC_CHANNELS 4 #define ADC_BUTTONS 0 @@ -30,14 +30,6 @@ #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ #else -#ifdef IRIVER_H300 -/* TODO: we don't have enough info about the ADC for the H3x0 for now, so this - stuff is only added here for now to make things compile. */ -#define ADC_BUTTONS -2 -#define ADC_REMOTE -3 -unsigned char adc_scan(int channel); - -#endif #define NUM_ADC_CHANNELS 8 diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h index 5343b65..a3d07a6 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h @@ -57,7 +57,7 @@ /* Type of mobile power */ #define CONFIG_BATTERY BATT_LIPOL1300 -#define BATTERY_SCALE_FACTOR 16665 /* FIX: this value is picked at random */ +#define BATTERY_SCALE_FACTOR 23437 /* FIX: this value is picked at random */ /* Define this if the platform can charge batteries */ #define HAVE_CHARGING 1 |