6 files changed, 18 insertions, 18 deletions

diff --git a/firmware/target/arm/crt0-pp.S b/firmware/target/arm/crt0-pp.S
index 892275e411..e0d1034f74 100644
--- a/firmware/target/arm/crt0-pp.S
+++ b/firmware/target/arm/crt0-pp.S
@@ -205,7 +205,7 @@ cop_init:
     orr    r1, r1, #0x6
     str    r1, [r0]
 
-    ldr    r0, =0x6000c000
+    ldr    r0, =CACHE_CTRL
 1:
     ldr    r1, [r0]
     tst    r1, #0x8000
diff --git a/firmware/target/arm/ipod/backlight-nano_video.c b/firmware/target/arm/ipod/backlight-nano_video.c
index 5559709333..a5ef334d61 100644
--- a/firmware/target/arm/ipod/backlight-nano_video.c
+++ b/firmware/target/arm/ipod/backlight-nano_video.c
@@ -37,7 +37,7 @@ inline void __backlight_on(void)
     outl(((0x100 | 1) << 3), 0x6000d824);
 
     /* set port L07 on */
-    outl(((0x100 | 1) << 7), 0x6000d12c);
+    GPIOL_OUTPUT_VAL = ((0x100 | 1) << 7);
 }
 
 inline void __backlight_off(void)
@@ -46,5 +46,5 @@ inline void __backlight_off(void)
     outl(((0x100 | 0) << 3), 0x6000d824);
 
     /* set port L07 off */
-    outl(((0x100 | 0) << 7), 0x6000d12c);
+    GPIOL_OUTPUT_VAL = ((0x100 | 0) << 7);
 }
diff --git a/firmware/target/arm/ipod/lcd-color_nano.c b/firmware/target/arm/ipod/lcd-color_nano.c
index 7da878ef14..6a29cbe680 100644
--- a/firmware/target/arm/ipod/lcd-color_nano.c
+++ b/firmware/target/arm/ipod/lcd-color_nano.c
@@ -115,9 +115,9 @@ void lcd_init_device(void)
         int gpio_a01, gpio_a04;
 
         /* A01 */
-        gpio_a01 = (inl(0x6000D030) & 0x2) >> 1;
+        gpio_a01 = (GPIOA_INPUT_VAL & 0x2) >> 1;
         /* A04 */
-        gpio_a04 = (inl(0x6000D030) & 0x10) >> 4;
+        gpio_a04 = (GPIOA_INPUT_VAL & 0x10) >> 4;
 
         if (((gpio_a01 << 1) | gpio_a04) == 0 || ((gpio_a01 << 1) | gpio_a04) == 2) {
             lcd_type = 0;
@@ -126,12 +126,12 @@ void lcd_init_device(void)
         }
     }
 
-    outl(inl(0x6000d004) | 0x4, 0x6000d004); /* B02 enable */
-    outl(inl(0x6000d004) | 0x8, 0x6000d004); /* B03 enable */
+    GPIOB_ENABLE |= 0x4; /* B02 enable */
+    GPIOB_ENABLE |= 0x8; /* B03 enable */
     outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */
     outl(inl(0x70000080) | 0x2000000, 0x70000080); /* D01 =1 */
 
-    outl(inl(0x6000600c) | 0x20000, 0x6000600c);    /* PWM enable */
+    DEV_EN |= 0x20000;   /* PWM enable */
 
 #elif CONFIG_LCD == LCD_IPODNANO
     /* iPodLinux doesn't appear have any LCD init code for the Nano */
diff --git a/firmware/target/arm/ipod/lcd-gray.c b/firmware/target/arm/ipod/lcd-gray.c
index 620c4355c3..1493751c3b 100644
--- a/firmware/target/arm/ipod/lcd-gray.c
+++ b/firmware/target/arm/ipod/lcd-gray.c
@@ -133,12 +133,12 @@ void lcd_init_device(void)
     lcd_cmd_and_data(R_ENTRY_MODE, 0x0000);
 
 #ifdef IPOD_4G
-    outl(inl(0x6000d004) | 0x4, 0x6000d004); /* B02 enable */
-    outl(inl(0x6000d004) | 0x8, 0x6000d004); /* B03 enable */
+    GPIOB_ENABLE |= 0x4; /* B02 enable */
+    GPIOB_ENABLE |= 0x8; /* B03 enable */
     outl(inl(0x70000084) | 0x2000000, 0x70000084); /* D01 enable */
     outl(inl(0x70000080) | 0x2000000, 0x70000080); /* D01 =1 */
 
-    outl(inl(0x6000600c) | 0x20000, 0x6000600c);    /* PWM enable */
+    DEV_EN |= 0x20000;   /* PWM enable */
 #endif
 }
 
diff --git a/firmware/target/arm/sandisk/sansa-e200/ata-e200.c b/firmware/target/arm/sandisk/sansa-e200/ata-e200.c
index 56f351c001..cf05397a78 100644
--- a/firmware/target/arm/sandisk/sansa-e200/ata-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/ata-e200.c
@@ -364,9 +364,9 @@ void sd_init_device(void)
     GPIOD_ENABLE |= (0x1f);
     GPIOD_OUTPUT_EN |= (0x1f);
     GPIOD_OUTPUT_VAL |= (0x1f);
-    outl(inl(0x6000600c) | (1 << 14), 0x6000600c);
-    outl(inl(0x60006004) | (1 << 14), 0x60006004);
-    outl(inl(0x60006004) & ~(1 << 14), 0x60006004); /* Reset Controller? */
+    DEV_EN |= (1 << 14); /* Enable controller */
+    DEV_RS |= (1 << 14); /* Reset controller */
+    DEV_RS &=~(1 << 14); /* Clear Reset */
     outl(0, 0x6000b000);
     outl(0, 0x6000a000); /* Init DMA controller? */
 
diff --git a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
index 25bb6f04aa..e34ebd7c5a 100644
--- a/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
+++ b/firmware/target/arm/sandisk/sansa-e200/lcd-e200.c
@@ -110,7 +110,7 @@ static inline void cache_flush(void)
 {
 #ifndef BOOTLOADER
     outl(inl(0xf000f044) | 0x2, 0xf000f044);
-    while ((inl(0x6000c000) & 0x8000) != 0)
+    while ((CACHE_CTL & 0x8000) != 0)
     {
     }
 #endif
@@ -141,12 +141,12 @@ inline void lcd_init_device(void)
     outl(((inl(0x70000010) & (0x03ffffff)) | (0x15 << 26)), 0x70000010);
     outl(((inl(0x70000014) & (0x0fffffff)) | (0x5 << 28)), 0x70000014);
     outl((inl(0x70000020) & ~(0x3 << 10)), 0x70000020);
-    outl((inl(0x6000600c) | (1 << 26)), 0x6000600c); /* Enable controller */
+    DEV_EN |= (1 << 26); /* Enable controller */
     outl(0x6, 0x600060d0);
-    outl((inl(0x60006004) | (1 << 26)), 0x60006004); /* Reset controller? */
+    DEV_RS |= (1 << 26); /* Reset controller */
     outl((inl(0x70000020) & ~(1 << 14)), 0x70000020);
     lcd_bus_idle();
-    outl((inl(0x60006004) & ~(1 << 26)), 0x60006004); /* Clear reset? */
+    DEV_RS &=~(1 << 26); /* Clear reset */
     udelay(1000);
 
     LCD_REG_0 = (LCD_REG_0 & (0x00ffffff)) | (0x22 << 24);