diff options
author | Thom Johansen <thomj@rockbox.org> | 2006-01-24 22:31:57 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2006-01-24 22:31:57 +0000 |
commit | 22e6c02f8e5eb1cc2af0b41291fa615936fa59db (patch) | |
tree | 9de0f0a81cfdd1d5c6b69041bd16e2bccabbfe6f /firmware/drivers/button.c | |
parent | 289ec0164b77b4c6b35b818efc881c6d8b479e9f (diff) | |
download | rockbox-22e6c02f8e5eb1cc2af0b41291fa615936fa59db.tar.gz rockbox-22e6c02f8e5eb1cc2af0b41291fa615936fa59db.zip |
Removed PP5020_ prefix from register defines and added/renamed some
defines.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8438 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/button.c')
-rw-r--r-- | firmware/drivers/button.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 143d4570e4..fc9cc7ac25 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -203,7 +203,7 @@ static int ipod_4g_button_read(void) | |||
203 | 203 | ||
204 | void ipod_4g_button_int(void) | 204 | void ipod_4g_button_int(void) |
205 | { | 205 | { |
206 | PP5020_CPU_HI_INT_CLR = PP5020_I2C_MASK; | 206 | CPU_HI_INT_CLR = I2C_MASK; |
207 | udelay(250); | 207 | udelay(250); |
208 | outl(0x0, 0x7000c140); | 208 | outl(0x0, 0x7000c140); |
209 | int_btn = ipod_4g_button_read(); | 209 | int_btn = ipod_4g_button_read(); |
@@ -211,8 +211,8 @@ void ipod_4g_button_int(void) | |||
211 | outl(0x400a1f00, 0x7000c100); | 211 | outl(0x400a1f00, 0x7000c100); |
212 | 212 | ||
213 | GPIOB_OUTPUT_VAL |= 0x10; | 213 | GPIOB_OUTPUT_VAL |= 0x10; |
214 | PP5020_CPU_INT_EN = 0x40000000; | 214 | CPU_INT_EN = 0x40000000; |
215 | PP5020_CPU_HI_INT_EN = PP5020_I2C_MASK; | 215 | CPU_HI_INT_EN = I2C_MASK; |
216 | } | 216 | } |
217 | #endif | 217 | #endif |
218 | 218 | ||
@@ -397,8 +397,8 @@ void button_init(void) | |||
397 | GPIOA_INT_CLR = GPIOA_INT_STAT & 0x20; | 397 | GPIOA_INT_CLR = GPIOA_INT_STAT & 0x20; |
398 | /* enable interrupts */ | 398 | /* enable interrupts */ |
399 | GPIOA_INT_EN = 0x20; | 399 | GPIOA_INT_EN = 0x20; |
400 | PP5020_CPU_INT_EN = 0x40000000; | 400 | CPU_INT_EN = 0x40000000; |
401 | PP5020_CPU_HI_INT_EN = PP5020_I2C_MASK; | 401 | CPU_HI_INT_EN = I2C_MASK; |
402 | #endif /* CONFIG_KEYPAD */ | 402 | #endif /* CONFIG_KEYPAD */ |
403 | 403 | ||
404 | queue_init(&button_queue); | 404 | queue_init(&button_queue); |