From 4ef3e821cbb57903c0236241490f1ee28c7c28f4 Mon Sep 17 00:00:00 2001 From: Barry Wardell Date: Mon, 5 Nov 2007 16:12:13 +0000 Subject: Fix red. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15476 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/ipod/lcd-color_nano.c | 2 +- firmware/target/arm/ipod/lcd-gray.c | 2 +- firmware/target/arm/sandisk/ata-c200_e200.c | 10 +++++----- firmware/target/arm/sandisk/sansa-e200/lcd-e200.c | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/firmware/target/arm/ipod/lcd-color_nano.c b/firmware/target/arm/ipod/lcd-color_nano.c index 501c20d5c8..5306925ded 100644 --- a/firmware/target/arm/ipod/lcd-color_nano.c +++ b/firmware/target/arm/ipod/lcd-color_nano.c @@ -106,7 +106,7 @@ void lcd_init_device(void) GPIOB_ENABLE |= 0x4; /* B02 enable */ GPIOB_ENABLE |= 0x8; /* B03 enable */ outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ - GPO32 |= 0x2000000; /* D01 =1 */ + GPO32_VAL |= 0x2000000; /* D01 =1 */ DEV_EN |= 0x20000; /* PWM enable */ diff --git a/firmware/target/arm/ipod/lcd-gray.c b/firmware/target/arm/ipod/lcd-gray.c index 55f10270b7..b9b5619c20 100644 --- a/firmware/target/arm/ipod/lcd-gray.c +++ b/firmware/target/arm/ipod/lcd-gray.c @@ -171,7 +171,7 @@ void lcd_init_device(void) GPIOB_ENABLE |= 0x4; /* B02 enable */ GPIOB_ENABLE |= 0x8; /* B03 enable */ outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */ - GPO32 |= 0x2000000; /* D01 =1 */ + GPO32_VAL |= 0x2000000; /* D01 =1 */ DEV_EN |= 0x20000; /* PWM enable */ #endif diff --git a/firmware/target/arm/sandisk/ata-c200_e200.c b/firmware/target/arm/sandisk/ata-c200_e200.c index c9f97c0d48..91ff1d9365 100644 --- a/firmware/target/arm/sandisk/ata-c200_e200.c +++ b/firmware/target/arm/sandisk/ata-c200_e200.c @@ -25,7 +25,7 @@ #include "thread.h" #include "led.h" #include "disk.h" -#include "pp5024.h" +#include "cpu.h" #include "panic.h" #include "usb.h" @@ -529,7 +529,7 @@ static void sd_card_mux(int card_no) #ifdef SANSA_E200 if (card_no == 0) { - GPO32 |= 0x4; + GPO32_VAL |= 0x4; GPIOA_ENABLE &= ~0x7a; GPIOA_OUTPUT_EN &= ~0x7a; @@ -541,7 +541,7 @@ static void sd_card_mux(int card_no) } else { - GPO32 &= ~0x4; + GPO32_VAL &= ~0x4; GPIOD_ENABLE &= ~0x1f; GPIOD_OUTPUT_EN &= ~0x1f; @@ -554,7 +554,7 @@ static void sd_card_mux(int card_no) #else /* SANSA_C200 */ if (card_no == 0) { - GPO32 |= 0x4; + GPO32_VAL |= 0x4; GPIOD_ENABLE &= ~0x1f; GPIOD_OUTPUT_EN &= ~0x1f; @@ -566,7 +566,7 @@ static void sd_card_mux(int card_no) } else { - GPO32 &= ~0x4; + GPO32_VAL &= ~0x4; GPIOA_ENABLE &= ~0x7a; GPIOA_OUTPUT_EN &= ~0x7a; diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c index 5bd14c2ece..3a26c47376 100644 --- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c +++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c @@ -24,7 +24,7 @@ #include "system.h" #include #include "backlight-target.h" -#include "pp5024.h" +#include "cpu.h" /* Power and display status */ static bool power_on = false; /* Is the power turned on? */ @@ -371,7 +371,7 @@ void lcd_init_device(void) lcd_init_gpio(); /* Controller init */ outl((inl(0x70000084) | (1 << 28)), 0x70000084); - GPO32 &= ~(1 << 28); + GPO32_VAL &= ~(1 << 28); DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) ); outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014); outl((inl(0x70000020) & ~(0x3 << 10)), 0x70000020); @@ -419,9 +419,9 @@ void lcd_init_device(void) /* LCD init */ /* Pull RESET low, then high to reset driver IC */ - GPO32 &= ~(1 << 28); + GPO32_VAL &= ~(1 << 28); udelay(10000); - GPO32 |= (1 << 28); + GPO32_VAL |= (1 << 28); udelay(10000); lcd_display_on(); -- cgit v1.2.3