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 | |
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')
-rw-r--r-- | firmware/drivers/button.c | 10 | ||||
-rw-r--r-- | firmware/drivers/lcd-ipod.c | 5 |
2 files changed, 7 insertions, 8 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); |
diff --git a/firmware/drivers/lcd-ipod.c b/firmware/drivers/lcd-ipod.c index 154158c6ad..9aa7d01adb 100644 --- a/firmware/drivers/lcd-ipod.c +++ b/firmware/drivers/lcd-ipod.c | |||
@@ -31,7 +31,6 @@ | |||
31 | 31 | ||
32 | /*** definitions ***/ | 32 | /*** definitions ***/ |
33 | #define IPOD_HW_REVISION (*((volatile unsigned long*)0x00002084)) | 33 | #define IPOD_HW_REVISION (*((volatile unsigned long*)0x00002084)) |
34 | #define IPOD_PP5020_RTC (*((volatile unsigned long*)0x60005010)) | ||
35 | 34 | ||
36 | #define IPOD_LCD_BASE 0x70008a0c | 35 | #define IPOD_LCD_BASE 0x70008a0c |
37 | #define IPOD_LCD_BUSY_MASK 0x80000000 | 36 | #define IPOD_LCD_BUSY_MASK 0x80000000 |
@@ -49,7 +48,7 @@ static int lcd_type = 1; /* 0 = "old" Color/Photo, 1 = "new" Color & Nano */ | |||
49 | /* check if number of useconds has past */ | 48 | /* check if number of useconds has past */ |
50 | static inline int timer_check(unsigned long clock_start, unsigned long usecs) | 49 | static inline int timer_check(unsigned long clock_start, unsigned long usecs) |
51 | { | 50 | { |
52 | if ( (IPOD_PP5020_RTC - clock_start) >= usecs ) { | 51 | if ( (USEC_TIMER - clock_start) >= usecs ) { |
53 | return 1; | 52 | return 1; |
54 | } else { | 53 | } else { |
55 | return 0; | 54 | return 0; |
@@ -59,7 +58,7 @@ static inline int timer_check(unsigned long clock_start, unsigned long usecs) | |||
59 | static void lcd_wait_write(void) | 58 | static void lcd_wait_write(void) |
60 | { | 59 | { |
61 | if ((inl(IPOD_LCD_BASE) & IPOD_LCD_BUSY_MASK) != 0) { | 60 | if ((inl(IPOD_LCD_BASE) & IPOD_LCD_BUSY_MASK) != 0) { |
62 | int start = IPOD_PP5020_RTC; | 61 | int start = USEC_TIMER; |
63 | 62 | ||
64 | do { | 63 | do { |
65 | if ((inl(IPOD_LCD_BASE) & IPOD_LCD_BUSY_MASK) == 0) break; | 64 | if ((inl(IPOD_LCD_BASE) & IPOD_LCD_BUSY_MASK) == 0) break; |