summaryrefslogtreecommitdiffstats
path: root/firmware/target
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2008-04-15 21:33:32 +0000
committerBertrik Sikken <bertrik@sikken.nl>2008-04-15 21:33:32 +0000
commita24f4b7a8053c2c6efb6f4c0669dc33181f130b3 (patch)
tree6c08260275d07ac0eca94a2e4b73c6a9e3b72c1f /firmware/target
parenta987b7ef2dab83758667a8267be9c755989d5f64 (diff)
downloadrockbox-a24f4b7a8053c2c6efb6f4c0669dc33181f130b3.tar.gz
rockbox-a24f4b7a8053c2c6efb6f4c0669dc33181f130b3.zip
FS#8898 - Prefix AS3514 registers with AS3514_
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17130 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
-rw-r--r--firmware/target/arm/i2c-pp.c2
-rw-r--r--firmware/target/arm/sandisk/adc-c200_e200.c4
-rw-r--r--firmware/target/arm/sandisk/backlight-c200_e200.c4
-rw-r--r--firmware/target/arm/sandisk/power-c200_e200.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/firmware/target/arm/i2c-pp.c b/firmware/target/arm/i2c-pp.c
index 40eb80cfe1..5799d7c37f 100644
--- a/firmware/target/arm/i2c-pp.c
+++ b/firmware/target/arm/i2c-pp.c
@@ -228,7 +228,7 @@ void i2c_init(void)
outl(0, 0x600060a4);
outl(0x1e, 0x600060a4);
- pp_i2c_send(AS3514_I2C_ADDR, SUPERVISOR, 5);
+ pp_i2c_send(AS3514_I2C_ADDR, AS3514_SUPERVISOR, 5);
#endif
#endif
diff --git a/firmware/target/arm/sandisk/adc-c200_e200.c b/firmware/target/arm/sandisk/adc-c200_e200.c
index fd07812cfb..dcf6cba26e 100644
--- a/firmware/target/arm/sandisk/adc-c200_e200.c
+++ b/firmware/target/arm/sandisk/adc-c200_e200.c
@@ -31,12 +31,12 @@ unsigned short adc_read(int channel)
i2c_lock();
/* Select channel */
- if (pp_i2c_send( AS3514_I2C_ADDR, ADC_0, (channel << 4)) >= 0)
+ if (pp_i2c_send( AS3514_I2C_ADDR, AS3514_ADC_0, (channel << 4)) >= 0)
{
unsigned char buf[2];
/* Read data */
- if (i2c_readbytes( AS3514_I2C_ADDR, ADC_0, 2, buf) >= 0)
+ if (i2c_readbytes( AS3514_I2C_ADDR, AS3514_ADC_0, 2, buf) >= 0)
{
data = (((buf[0] & 0x3) << 8) | buf[1]);
}
diff --git a/firmware/target/arm/sandisk/backlight-c200_e200.c b/firmware/target/arm/sandisk/backlight-c200_e200.c
index 9eeb05072e..016751121e 100644
--- a/firmware/target/arm/sandisk/backlight-c200_e200.c
+++ b/firmware/target/arm/sandisk/backlight-c200_e200.c
@@ -44,12 +44,12 @@ void _backlight_on(void)
#if defined(HAVE_LCD_SLEEP) && !defined(BOOTLOADER)
_lcd_sleep_timer = 0; /* LCD should be awake already */
#endif
- pp_i2c_send(AS3514_I2C_ADDR, DCDC15, backlight_brightness);
+ pp_i2c_send(AS3514_I2C_ADDR, AS3514_DCDC15, backlight_brightness);
}
void _backlight_off(void)
{
- pp_i2c_send(AS3514_I2C_ADDR, DCDC15, 0x0);
+ pp_i2c_send(AS3514_I2C_ADDR, AS3514_DCDC15, 0x0);
#ifdef HAVE_LCD_ENABLE
lcd_enable(false); /* power off lcd */
#endif
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index ade3a0c63b..a7ec6cdead 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -33,9 +33,9 @@ void power_off(void)
char byte;
/* Send shutdown command to PMU */
- byte = i2c_readbyte(AS3514_I2C_ADDR, SYSTEM);
+ byte = i2c_readbyte(AS3514_I2C_ADDR, AS3514_SYSTEM);
byte &= ~0x1;
- pp_i2c_send(AS3514_I2C_ADDR, SYSTEM, byte);
+ pp_i2c_send(AS3514_I2C_ADDR, AS3514_SYSTEM, byte);
/* Stop interrupts on both cores */
disable_interrupt(IRQ_FIQ_STATUS);