summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2007-04-15 23:35:56 +0000
committerJens Arnold <amiconn@rockbox.org>2007-04-15 23:35:56 +0000
commit7a5d4011f56334c05b55bb511c2f1f6a4639c8c1 (patch)
tree402f35138b44ac7bb3b7005fbf58c785cc02c9e5 /firmware
parent36ba4b02bd69dc5fec4cdb6bc4684d77a888bbbe (diff)
downloadrockbox-7a5d4011f56334c05b55bb511c2f1f6a4639c8c1.tar.gz
rockbox-7a5d4011f56334c05b55bb511c2f1f6a4639c8c1.tar.bz2
rockbox-7a5d4011f56334c05b55bb511c2f1f6a4639c8c1.zip
Moved SH1 ADC to target tree.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13174 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/SOURCES4
-rw-r--r--firmware/export/adc.h44
-rw-r--r--firmware/target/sh/adc-sh.c (renamed from firmware/drivers/adc.c)4
-rw-r--r--firmware/target/sh/archos/fm_v2/adc-target.h39
-rw-r--r--firmware/target/sh/archos/ondio/adc-target.h35
-rw-r--r--firmware/target/sh/archos/player/adc-target.h33
-rw-r--r--firmware/target/sh/archos/player/button-player.c8
-rw-r--r--firmware/target/sh/archos/recorder/adc-target.h39
8 files changed, 152 insertions, 54 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 43519ffb3c..86438d43be 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -93,7 +93,6 @@ drivers/lcd-remote-2bit-vi.c
/* Misc. */
drivers/led.c
#ifndef TARGET_TREE
-drivers/adc.c
drivers/power.c
#endif /* TARGET_TREE */
#ifndef SIMULATOR
@@ -232,6 +231,7 @@ drivers/arcotg_udc.c
bitswap.S
descramble.S
drivers/i2c.c
+target/sh/adc-sh.c
target/sh/crt0.S
target/sh/memcpy-sh.S
target/sh/memmove-sh.S
@@ -328,7 +328,7 @@ target/sh/archos/player/usb-player.c
target/sh/archos/ata-archos.c
target/sh/archos/ata-as-archos.S
target/sh/archos/lcd-archos-bitmap.c
-target/sh/archos/lcd-as-archos-bitmap.S
+target/sh/archos/lcd-as-archos-bitmap.S
target/sh/archos/recorder/button-recorder.c
target/sh/archos/recorder/usb-recorder.c
#endif /* SIMULATOR */
diff --git a/firmware/export/adc.h b/firmware/export/adc.h
index d8e3b7078f..e10cce0d27 100644
--- a/firmware/export/adc.h
+++ b/firmware/export/adc.h
@@ -20,52 +20,8 @@
#define _ADC_H_
#include "config.h"
-
-#ifdef TARGET_TREE
#include "adc-target.h"
-#else
-
-#define NUM_ADC_CHANNELS 8
-
-#ifdef HAVE_ONDIO_ADC
-
-#define ADC_MMC_SWITCH 0 /* low values if MMC inserted */
-#define ADC_USB_POWER 1 /* USB, reads 0x000 when USB is inserted */
-#define ADC_BUTTON_OPTION 2 /* the option button, low value if pressed */
-#define ADC_BUTTON_ONOFF 3 /* the on/off button, high value if pressed */
-#define ADC_BUTTON_ROW1 4 /* Used for scanning the keys, different
- voltages for different keys */
-#define ADC_USB_ACTIVE 5 /* USB bridge activity */
-#define ADC_UNREG_POWER 7 /* Battery voltage */
-
-#else
-/* normal JBR channel assignment */
-#define ADC_BATTERY 0 /* Battery voltage always reads 0x3FF due to
- silly scaling */
-#ifdef HAVE_FMADC
-#define ADC_CHARGE_REGULATOR 0 /* Uh, we read the battery voltage? */
-#define ADC_USB_POWER 1 /* USB, reads 0x000 when USB is inserted */
-#define ADC_BUTTON_OFF 2 /* the off button, high value if pressed */
-#define ADC_BUTTON_ON 3 /* the on button, low value if pressed */
-#else
-#define ADC_CHARGE_REGULATOR 1 /* Regulator reference voltage, should read
- about 0x1c0 when charging, else 0x3FF */
-#define ADC_USB_POWER 2 /* USB, reads 0x3FF when USB is inserted */
-#endif
-
-#define ADC_BUTTON_ROW1 4 /* Used for scanning the keys, different
- voltages for different keys */
-#define ADC_BUTTON_ROW2 5 /* Used for scanning the keys, different
- voltages for different keys */
-#define ADC_UNREG_POWER 6 /* Battery voltage with a better scaling */
-#define ADC_EXT_POWER 7 /* The external power voltage, 0v or 2.7v */
-
-#endif
-
-#define EXT_SCALE_FACTOR 14800
-#endif
-
unsigned short adc_read(int channel);
void adc_init(void);
diff --git a/firmware/drivers/adc.c b/firmware/target/sh/adc-sh.c
index f002be96b4..d36624f913 100644
--- a/firmware/drivers/adc.c
+++ b/firmware/target/sh/adc-sh.c
@@ -23,9 +23,7 @@
#include "thread.h"
#include "string.h"
#include "adc.h"
-#include "pcf50606.h"
-#if CONFIG_CPU == SH7034
/**************************************************************************
** The A/D conversion is done every tick, in three steps:
**
@@ -108,5 +106,3 @@ void adc_init(void)
sleep(2); /* Ensure valid readings when adc_init returns */
}
-
-#endif
diff --git a/firmware/target/sh/archos/fm_v2/adc-target.h b/firmware/target/sh/archos/fm_v2/adc-target.h
new file mode 100644
index 0000000000..e4f24c88ce
--- /dev/null
+++ b/firmware/target/sh/archos/fm_v2/adc-target.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef _ADC_TARGET_H_
+#define _ADC_TARGET_H_
+
+#define NUM_ADC_CHANNELS 8
+
+#define ADC_BATTERY 0 /* Battery voltage always reads 0x3FF due to
+ silly scaling */
+#define ADC_CHARGE_REGULATOR 0 /* Uh, we read the battery voltage? */
+#define ADC_USB_POWER 1 /* USB, reads 0x000 when USB is inserted */
+#define ADC_BUTTON_OFF 2 /* the off button, high value if pressed */
+#define ADC_BUTTON_ON 3 /* the on button, low value if pressed */
+#define ADC_BUTTON_ROW1 4 /* Used for scanning the keys, different
+ voltages for different keys */
+#define ADC_BUTTON_ROW2 5 /* Used for scanning the keys, different
+ voltages for different keys */
+#define ADC_UNREG_POWER 6 /* Battery voltage with a better scaling */
+#define ADC_EXT_POWER 7 /* The external power voltage, 0v or 2.7v */
+
+#define EXT_SCALE_FACTOR 14800
+
+#endif /* _ADC_TARGET_H_ */
diff --git a/firmware/target/sh/archos/ondio/adc-target.h b/firmware/target/sh/archos/ondio/adc-target.h
new file mode 100644
index 0000000000..ee9ca4a7c8
--- /dev/null
+++ b/firmware/target/sh/archos/ondio/adc-target.h
@@ -0,0 +1,35 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef _ADC_TARGET_H_
+#define _ADC_TARGET_H_
+
+#define NUM_ADC_CHANNELS 8
+
+#define ADC_MMC_SWITCH 0 /* low values if MMC inserted */
+#define ADC_USB_POWER 1 /* USB, reads 0x000 when USB is inserted */
+#define ADC_BUTTON_OPTION 2 /* the option button, low value if pressed */
+#define ADC_BUTTON_ONOFF 3 /* the on/off button, high value if pressed */
+#define ADC_BUTTON_ROW1 4 /* Used for scanning the keys, different
+ voltages for different keys */
+#define ADC_USB_ACTIVE 5 /* USB bridge activity */
+#define ADC_UNREG_POWER 7 /* Battery voltage */
+
+#define EXT_SCALE_FACTOR 14800
+
+#endif /* _ADC_TARGET_H_ */
diff --git a/firmware/target/sh/archos/player/adc-target.h b/firmware/target/sh/archos/player/adc-target.h
new file mode 100644
index 0000000000..21969dbec7
--- /dev/null
+++ b/firmware/target/sh/archos/player/adc-target.h
@@ -0,0 +1,33 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef _ADC_TARGET_H_
+#define _ADC_TARGET_H_
+
+#define NUM_ADC_CHANNELS 8
+
+#define ADC_BUTTON_LEFT 0
+#define ADC_BUTTON_MENU 1
+#define ADC_BUTTON_RIGHT 2
+#define ADC_BUTTON_PLAY 3
+#define ADC_UNREG_POWER 6 /* Battery voltage with a better scaling */
+#define ADC_EXT_POWER 7 /* The external power voltage, 0v or 2.7v */
+
+#define EXT_SCALE_FACTOR 14800
+
+#endif /* _ADC_TARGET_H_ */
diff --git a/firmware/target/sh/archos/player/button-player.c b/firmware/target/sh/archos/player/button-player.c
index fbc940f7de..f979e76575 100644
--- a/firmware/target/sh/archos/player/button-player.c
+++ b/firmware/target/sh/archos/player/button-player.c
@@ -54,13 +54,13 @@ int button_read_device(void)
int data;
/* buttons are active low */
- if (adc_read(0) < 0x180)
+ if (adc_read(ADC_BUTTON_LEFT) < 0x180)
btn = BUTTON_LEFT;
- if (adc_read(1) < 0x180)
+ if (adc_read(ADC_BUTTON_MENU) < 0x180)
btn |= BUTTON_MENU;
- if (adc_read(2) < 0x180)
+ if (adc_read(ADC_BUTTON_RIGHT) < 0x180)
btn |= BUTTON_RIGHT;
- if (adc_read(3) < 0x180)
+ if (adc_read(ADC_BUTTON_PLAY) < 0x180)
btn |= BUTTON_PLAY;
/* check port A pins for ON and STOP */
diff --git a/firmware/target/sh/archos/recorder/adc-target.h b/firmware/target/sh/archos/recorder/adc-target.h
new file mode 100644
index 0000000000..9d7230d2cb
--- /dev/null
+++ b/firmware/target/sh/archos/recorder/adc-target.h
@@ -0,0 +1,39 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * Copyright (C) 2002 by Linus Nielsen Feltzing
+ *
+ * All files in this archive are subject to the GNU General Public License.
+ * See the file COPYING in the source tree root for full license agreement.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+#ifndef _ADC_TARGET_H_
+#define _ADC_TARGET_H_
+
+#define NUM_ADC_CHANNELS 8
+
+/* normal JBR channel assignment */
+#define ADC_BATTERY 0 /* Battery voltage always reads 0x3FF due to
+ silly scaling */
+#define ADC_CHARGE_REGULATOR 1 /* Regulator reference voltage, should read
+ about 0x1c0 when charging, else 0x3FF */
+#define ADC_USB_POWER 2 /* USB, reads 0x3FF when USB is inserted */
+#define ADC_BUTTON_ROW1 4 /* Used for scanning the keys, different
+ voltages for different keys */
+#define ADC_BUTTON_ROW2 5 /* Used for scanning the keys, different
+ voltages for different keys */
+#define ADC_UNREG_POWER 6 /* Battery voltage with a better scaling */
+#define ADC_EXT_POWER 7 /* The external power voltage, 0v or 2.7v */
+
+#define EXT_SCALE_FACTOR 14800
+
+#endif /* _ADC_TARGET_H_ */