Get rid of some more inl/outl and use the new GPO32 define instead.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15474 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Barry Wardell 2007-11-05 15:48:59 +00:00
parent 560515fba1
commit 2d95fd524d
4 changed files with 9 additions and 9 deletions

View file

@ -106,7 +106,7 @@ void lcd_init_device(void)
GPIOB_ENABLE |= 0x4; /* B02 enable */ GPIOB_ENABLE |= 0x4; /* B02 enable */
GPIOB_ENABLE |= 0x8; /* B03 enable */ GPIOB_ENABLE |= 0x8; /* B03 enable */
outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */
outl(inl(0x70000080) | 0x2000000, 0x70000080); /* D01 =1 */ GPO32 |= 0x2000000; /* D01 =1 */
DEV_EN |= 0x20000; /* PWM enable */ DEV_EN |= 0x20000; /* PWM enable */

View file

@ -171,7 +171,7 @@ void lcd_init_device(void)
GPIOB_ENABLE |= 0x4; /* B02 enable */ GPIOB_ENABLE |= 0x4; /* B02 enable */
GPIOB_ENABLE |= 0x8; /* B03 enable */ GPIOB_ENABLE |= 0x8; /* B03 enable */
outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */
outl(inl(0x70000080) | 0x2000000, 0x70000080); /* D01 =1 */ GPO32 |= 0x2000000; /* D01 =1 */
DEV_EN |= 0x20000; /* PWM enable */ DEV_EN |= 0x20000; /* PWM enable */
#endif #endif

View file

@ -529,7 +529,7 @@ static void sd_card_mux(int card_no)
#ifdef SANSA_E200 #ifdef SANSA_E200
if (card_no == 0) if (card_no == 0)
{ {
outl(inl(0x70000080) | 0x4, 0x70000080); GPO32 |= 0x4;
GPIOA_ENABLE &= ~0x7a; GPIOA_ENABLE &= ~0x7a;
GPIOA_OUTPUT_EN &= ~0x7a; GPIOA_OUTPUT_EN &= ~0x7a;
@ -541,7 +541,7 @@ static void sd_card_mux(int card_no)
} }
else else
{ {
outl(inl(0x70000080) & ~0x4, 0x70000080); GPO32 &= ~0x4;
GPIOD_ENABLE &= ~0x1f; GPIOD_ENABLE &= ~0x1f;
GPIOD_OUTPUT_EN &= ~0x1f; GPIOD_OUTPUT_EN &= ~0x1f;
@ -554,7 +554,7 @@ static void sd_card_mux(int card_no)
#else /* SANSA_C200 */ #else /* SANSA_C200 */
if (card_no == 0) if (card_no == 0)
{ {
outl(inl(0x70000080) | 0x4, 0x70000080); GPO32 |= 0x4;
GPIOD_ENABLE &= ~0x1f; GPIOD_ENABLE &= ~0x1f;
GPIOD_OUTPUT_EN &= ~0x1f; GPIOD_OUTPUT_EN &= ~0x1f;
@ -566,7 +566,7 @@ static void sd_card_mux(int card_no)
} }
else else
{ {
outl(inl(0x70000080) & ~0x4, 0x70000080); GPO32 &= ~0x4;
GPIOA_ENABLE &= ~0x7a; GPIOA_ENABLE &= ~0x7a;
GPIOA_OUTPUT_EN &= ~0x7a; GPIOA_OUTPUT_EN &= ~0x7a;

View file

@ -371,7 +371,7 @@ void lcd_init_device(void)
lcd_init_gpio(); lcd_init_gpio();
/* Controller init */ /* Controller init */
outl((inl(0x70000084) | (1 << 28)), 0x70000084); outl((inl(0x70000084) | (1 << 28)), 0x70000084);
outl((inl(0x70000080) & ~(1 << 28)), 0x70000080); GPO32 &= ~(1 << 28);
DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) ); DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) );
outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014); outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014);
outl((inl(0x70000020) & ~(0x3 << 10)), 0x70000020); outl((inl(0x70000020) & ~(0x3 << 10)), 0x70000020);
@ -419,9 +419,9 @@ void lcd_init_device(void)
/* LCD init */ /* LCD init */
/* Pull RESET low, then high to reset driver IC */ /* Pull RESET low, then high to reset driver IC */
outl((inl(0x70000080) & ~(1 << 28)), 0x70000080); GPO32 &= ~(1 << 28);
udelay(10000); udelay(10000);
outl((inl(0x70000080) | (1 << 28)), 0x70000080); GPO32 |= (1 << 28);
udelay(10000); udelay(10000);
lcd_display_on(); lcd_display_on();