3 files changed, 5 insertions, 131 deletions

diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
index e09f628809..ac8dc380e2 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/lcd-meg-fx.c
@@ -244,7 +244,7 @@ static void LCD_SPI_init(void)
 /* LCD init */
 void lcd_init_device(void)
 {
-#if 0//def BOOTLOADER
+#ifdef BOOTLOADER
     int i;
     /* When the Rockbox bootloader starts, we are changing framebuffer address,
        but we don't want what's shown on the LCD to change until we do an
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
index d625c07cc8..544869ab6c 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/power-meg-fx.c
@@ -70,11 +70,6 @@ void power_off(void)
     _backlight_off();
     _buttonlight_off();
     sleep(HZ);
-    
-    /* Do this to allow the drive to properly reset when player restarts 
-     * immediately without running OF shutdown.
-     */
-    GPGCON&=~0x00300000; 
 
     /* Rockbox never properly shutdown the player.  When the sleep bit is set
      * the player actually wakes up in some type of "zombie" state 
@@ -86,122 +81,6 @@ void power_off(void)
     CLKCON |=(1<<3);
 
     reboot_point();
-
-#if 0
-    
-    GPBCON=0x00015450;
-    GPBDAT=0x403;
-    GPBUP=0x3FD;
-
-    GPCCON  =0xAAA054A8;
-    GPCDAT  =0x0000038C;
-    GPCUP   =0xFFFF;
-    
-    
-    GPDCON  =0xAAA0AAA5;
-    GPDDAT  =0x00000300;
-    GPDUP   =0xFCFF;
-
-    
-    GPECON  =0xAA8002AA;
-    GPEDAT  =0x0000FFED;
-    GPEUP   =0x3817;
-
-    GPFCON  =0x00000a00; 
-    GPFDAT  =0x000000F1;
-    GPFUP   =0x000000FF;
-
-    GPGCON  =0x01401002;
-    GPGDAT  =0x00000180;
-    GPGUP   =0x0000FF7F;
-
-    GPHCON  =0x001540A5;
-    GPHDAT  =0x000006FD;
-    GPHUP   =0x00000187;
-
-// mine
-    INTMSK  =0xFFFFFFFF;
-    EINTMASK=0x0FFFFEF0;
-    EXTINT0 =0xFFFFFECF;
-    EXTINT1 =0x07;
-//
-
-//    INTMSK=0xFFFFFFFF;
-//    EINTMASK=0x00200000;
-
-//    GPHDAT=0x00000004;
-
-//    EXTINT0=~0x00000130;
-//    INTMSK=(~0x00000130)+0x00000100;
-//    GPGUP=0xFFFFFFFF;
-
-//mine
-    INTMSK  =0xFFFFFFDE;
-//
-
-    SRCPND=0xFFFFFFFF;
-    INTPND=0xFFFFFFFF;
-    GSTATUS1=0x00000600;
-
-    ADCCON=0x00000004;
-
-//    MISCCR=MISCCR&(~0x703000)|0x603000;
-    LCDCON1=0x00000000;
-    LOCKTIME=0xFFFFFFFF;
-//    REFRESH=REFRESH|0x00400000;
-
-//    MISCCR=MISCCR|0x000E0000;
-
-//    CLKCON=CLKCON|0x00004018;
-
-    /* 
-     * This next piece of code was taken from the linux 2.6.17 sources:
-     * linux/arch/arm/mach-s3c2410/sleep.S
-     *
-     * Copyright (c) 2004 Simtec Electronics
-     *      Ben Dooks <ben@simtec.co.uk>
-     * 
-     * Based on PXA/SA1100 sleep code by:
-     *      Nicolas Pitre, (c) 2002 Monta Vista Software Inc
-     *      Cliff Brake, (c) 2001
-     */
-
-    asm volatile 
-    (
-        /* get REFRESH, MISCCR, and CLKCON (and ensure in TLB) */
-        "ldr   r4, =0x48000024      \n"
-        "ldr   r5, =0x56000080      \n"
-        "ldr   r6, =0x4C00000C      \n"
-        "ldr   r7, [ r4 ]           \n"
-        "ldr   r8, [ r5 ]           \n" 
-        "ldr   r9, [ r6 ]           \n" 
-
-        /* Setup register writes */
-        "ldr   r2, =0x006E3000      \n"
-        "ldr   r3, =0x00004018      \n"
-        "orr   r7, r7, #0x00400000  \n" /* SDRAM sleep command */
-        "orr   r8, r8, r2           \n" /* SDRAM power-down signals */
-        "orr   r9, r9, r3           \n" /* power down command */
-
-        /* first as a trial-run to load cache */
-        "teq   pc, #0               \n"         
-        "bl    s3c2410_do_sleep     \n"
-
-        /* now do it for real */
-        "teq   r0, r0               \n" 
-        "b     s3c2410_do_sleep     \n"
-
-        /* align next bit of code to cache line */
-        ".align  8                  \n"
-        "s3c2410_do_sleep:          \n"
-        "streq r7, [ r4 ]           \n" /* SDRAM sleep command */
-        "streq r8, [ r5 ]           \n" /* SDRAM power-down config */
-        "streq r3, [ r6 ]           \n" /* CPU sleep */
-        "1:                         \n"
-        "beq   1b                   \n"
-        "bx lr                      \n"
-    );
-#endif
 }
 
 #else /* SIMULATOR */
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
index 96afa9b238..8065926e28 100644
--- a/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
+++ b/firmware/target/arm/s3c2440/gigabeat-fx/system-meg-fx.c
@@ -113,14 +113,9 @@ void system_reboot(void)
 
 static void set_page_tables(void)
 {
-    /* map every memory region to itself */
-    map_section(0, 0, 0x1000, CACHE_NONE); 
-    
-    /* map RAM to 0 and enable caching for it */
-    map_section(0x30000000, 0, 32, CACHE_ALL); 
-    
-    /* enable buffered writing for the framebuffer */
-    map_section((int)FRAME, (int)FRAME, 1, BUFFERED); 
+    map_section(0, 0, 0x1000, CACHE_NONE); /* map every memory region to itself */
+    map_section(0x30000000, 0, 32, CACHE_ALL); /* map RAM to 0 and enable caching for it */
+    map_section((int)FRAME, (int)FRAME, 1, BUFFERED); /* enable buffered writing for the framebuffer */
 }
 
 void memory_init(void) {
@@ -150,7 +145,7 @@ void s3c_regclr(volatile int *reg, unsigned int mask)
 void system_init(void)
 {
     INTMSK = 0xFFFFFFFF;
-    INTMOD = 0;
+     INTMOD =  0;
     SRCPND = 0xFFFFFFFF;
     INTPND = 0xFFFFFFFF;
     INTSUBMSK = 0xFFFFFFFF;