summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2007-11-05 17:19:00 +0000
committerBarry Wardell <rockbox@barrywardell.net>2007-11-05 17:19:00 +0000
commit03dd35db0e22c971b09fc94fa24cce6f531ab7ce (patch)
treeadab75c69584eeb8f24a621e008892161584df7c
parent4ef3e821cbb57903c0236241490f1ee28c7c28f4 (diff)
downloadrockbox-03dd35db0e22c971b09fc94fa24cce6f531ab7ce.tar.gz
rockbox-03dd35db0e22c971b09fc94fa24cce6f531ab7ce.zip
Get rid of some more inl/outl. 0x70000084 seems to be GPO32_ENABLE.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15477 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/pp5020.h1
-rw-r--r--firmware/target/arm/ipod/backlight-4g_color.c2
-rw-r--r--firmware/target/arm/ipod/lcd-color_nano.c2
-rw-r--r--firmware/target/arm/ipod/lcd-gray.c2
-rw-r--r--firmware/target/arm/sandisk/ata-c200_e200.c2
-rw-r--r--firmware/target/arm/sandisk/power-c200_e200.c4
-rw-r--r--firmware/target/arm/sandisk/sansa-e200/lcd-e200.c2
-rw-r--r--firmware/target/arm/usb-fw-pp502x.c2
8 files changed, 9 insertions, 8 deletions
diff --git a/firmware/export/pp5020.h b/firmware/export/pp5020.h
index 22a53e7ad7..47f73b9f4c 100644
--- a/firmware/export/pp5020.h
+++ b/firmware/export/pp5020.h
@@ -334,6 +334,7 @@
/* 32 bit GPO port */
#define GPO32_VAL (*(volatile unsigned long *)(0x70000080))
+#define GPO32_ENABLE (*(volatile unsigned long *)(0x70000084))
/* IIS */
#define IISDIV (*(volatile unsigned long*)(0x60006080))
diff --git a/firmware/target/arm/ipod/backlight-4g_color.c b/firmware/target/arm/ipod/backlight-4g_color.c
index be1dff7c0b..3097d8690b 100644
--- a/firmware/target/arm/ipod/backlight-4g_color.c
+++ b/firmware/target/arm/ipod/backlight-4g_color.c
@@ -43,6 +43,6 @@ inline void __backlight_on(void)
inline void __backlight_off(void)
{
/* fades backlight off on 4g */
- outl(inl(0x70000084) & ~0x2000000, 0x70000084);
+ GPO32_ENABLE &= ~0x2000000;
outl(0x80000000, 0x7000a010);
}
diff --git a/firmware/target/arm/ipod/lcd-color_nano.c b/firmware/target/arm/ipod/lcd-color_nano.c
index 5306925ded..fd65290872 100644
--- a/firmware/target/arm/ipod/lcd-color_nano.c
+++ b/firmware/target/arm/ipod/lcd-color_nano.c
@@ -105,7 +105,7 @@ void lcd_init_device(void)
GPIOB_ENABLE |= 0x4; /* B02 enable */
GPIOB_ENABLE |= 0x8; /* B03 enable */
- outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */
+ GPO32_ENABLE |= 0x2000000; /* D01 enable */
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 b9b5619c20..9f732265b4 100644
--- a/firmware/target/arm/ipod/lcd-gray.c
+++ b/firmware/target/arm/ipod/lcd-gray.c
@@ -170,7 +170,7 @@ void lcd_init_device(void)
#ifdef IPOD_4G
GPIOB_ENABLE |= 0x4; /* B02 enable */
GPIOB_ENABLE |= 0x8; /* B03 enable */
- outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */
+ GPO32_ENABLE |= 0x2000000; /* D01 enable */
GPO32_VAL |= 0x2000000; /* D01 =1 */
DEV_EN |= 0x20000; /* PWM enable */
diff --git a/firmware/target/arm/sandisk/ata-c200_e200.c b/firmware/target/arm/sandisk/ata-c200_e200.c
index 91ff1d9365..f9c9f6fb3a 100644
--- a/firmware/target/arm/sandisk/ata-c200_e200.c
+++ b/firmware/target/arm/sandisk/ata-c200_e200.c
@@ -1163,7 +1163,7 @@ int ata_init(void)
/* init controller */
outl(inl(0x70000088) & ~(0x4), 0x70000088);
outl(inl(0x7000008c) & ~(0x4), 0x7000008c);
- outl(inl(0x70000084) | 0x4, 0x70000084);
+ GPO32_ENABLE |= 0x4;
GPIOG_ENABLE |= (0x3 << 5);
GPIOG_OUTPUT_EN |= (0x3 << 5);
diff --git a/firmware/target/arm/sandisk/power-c200_e200.c b/firmware/target/arm/sandisk/power-c200_e200.c
index 40aa792dce..f3f78de05c 100644
--- a/firmware/target/arm/sandisk/power-c200_e200.c
+++ b/firmware/target/arm/sandisk/power-c200_e200.c
@@ -86,7 +86,7 @@ bool tuner_power(bool status)
{
/* init mystery amplification device */
#if defined(SANSA_E200)
- outl(inl(0x70000084) | 0x1, 0x70000084);
+ GPO32_ENABLE |= 0x1;
#else /* SANSA_C200 */
DEV_INIT2 &= ~0x800;
#endif
@@ -121,7 +121,7 @@ bool tuner_power(bool status)
/* turn off mystery amplification device */
#if defined (SANSA_E200)
- outl(inl(0x70000084) & ~0x1, 0x70000084);
+ GPO32_ENABLE &= ~0x1;
#else
DEV_INIT2 |= 0x800;
#endif
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
index 3a26c47376..aa969d2bff 100644
--- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
@@ -370,7 +370,7 @@ void lcd_init_device(void)
/* Init GPIO ports */
lcd_init_gpio();
/* Controller init */
- outl((inl(0x70000084) | (1 << 28)), 0x70000084);
+ GPO32_ENABLE |= (1 << 28);
GPO32_VAL &= ~(1 << 28);
DEV_INIT1 = ( (DEV_INIT1 & 0x03ffffff) | (0x15 << 26) );
outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014);
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index 7d197f03b8..d8eb0c6352 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -36,7 +36,7 @@
void usb_init_device(void)
{
int r0;
- outl(inl(0x70000084) | 0x200, 0x70000084);
+ GPO32_ENABLE |= 0x200;
outl(inl(0x7000002C) | 0x3000000, 0x7000002C);
DEV_EN |= DEV_USB;