Read bootsplash from disk rather than hardcoding it

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12050 a1c6a512-1295-4272-9138-f99709370657

bootloader/gigabeat.c

@@ -18,7 +18,6 @@
 #include "power.h"
 #include "file.h"
 #include "button-target.h"
-#include "bootsplash-gigabeat.h"
 
 extern void map_memory(void);
 
@@ -143,26 +142,10 @@ int load_rockbox(const char* file_name, unsigned char* buf, int buffer_size)
     return len;
 }
 
-
-void * main(void)
-{
-    int i;
 char buf[256];
-    struct partinfo* pinfo;
-    unsigned short* identify_info;
-    unsigned char* loadbuffer;
-    int buffer_size;
-    bool load_original = false;
-    int rc;
-    int(*kernel_entry)(void);
 
-    lcd_init();
+void display_instructions(void)
-    bool show_bootsplash = true;
+{
-
-    if(GPGDAT & 2)
-        show_bootsplash = false;
-
-    if(!show_bootsplash) {
     lcd_setfont(FONT_SYSFIXED);
     lcd_puts(0, line++, "Hold MENU when booting for rescue mode.");
     lcd_puts(0, line++, "  \"VOL+\" button to restore original kernel");
@@ -171,16 +154,38 @@ void * main(void)
     snprintf(buf, sizeof(buf), "FRAME %x TTB %x", FRAME, TTB_BASE);
     lcd_puts(0, line++, buf);
     lcd_update();
+}
+
+void * main(void)
+{
+    int i;
+    struct partinfo* pinfo;
+    unsigned short* identify_info;
+    unsigned char* loadbuffer;
+    int buffer_size;
+    bool load_original = false;
+    int rc;
+    int(*kernel_entry)(void);
+
+    bool show_bootsplash = true;
+
+    if(GPGDAT & 2)
+        show_bootsplash = false;
+
+    if(!show_bootsplash) {
+        lcd_init();
+        display_instructions();
         sleep(2*HZ);
-    } else
+    }
-        memcpy(FRAME, bootsplash, LCD_WIDTH*LCD_HEIGHT*2);
     if(GPGDAT & 2) {
+        lcd_init();
         lcd_puts(0, line++, "Entering rescue mode..");
         lcd_update();
         go_usb_mode();
         while(1);
     }
     if(GPGDAT & 0x10) {
+        lcd_init();
         load_original = true;
         lcd_puts(0, line++, "Loading original firmware...");
         lcd_update();
@@ -192,6 +197,20 @@ void * main(void)
         snprintf(buf, sizeof(buf), "disk_mount_all: %d", i);
         lcd_puts(0, line++, buf);
     }
+    if(show_bootsplash) {
+        int fd = open("/bootsplash.raw", O_RDONLY);
+        if(fd < 0)  {
+            show_bootsplash = false;
+            lcd_init();
+            display_instructions();
+        }
+        else {
+            read(fd, lcd_framebuffer, LCD_WIDTH*LCD_HEIGHT*2);
+            close(fd);
+            lcd_update();
+            lcd_init();
+        }
+    } 
     /* hold VOL+ to enter rescue mode to copy old image */
     /* needs to be after ata_init and disk_mount_all    */
     if(GPGDAT & 4) {