WebSVN – freemyipod – Diff – /apps/bootmenu-ipodnano2g/main.c

+//
+//
+//    Copyright 2011 TheSeven
+//
+//
+//    This file is part of emCORE.
+//
+//    emCORE is free software: you can redistribute it and/or
+//    modify it under the terms of the GNU General Public License as
+//    published by the Free Software Foundation, either version 2 of the
+//    License, or (at your option) any later version.
+//
+//    emCORE is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//    See the GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License along
+//    with emCORE.  If not, see <http://www.gnu.org/licenses/>.
+//
+//
 #include "emcoreapp.h"
 #include "libboot.h"
 #include "libpng.h"
 #include "libui.h"
+#include "libmkfat32.h"
+struct libpng_api* png;
+struct libboot_api* boot;
+struct libui_api* ui;
 void* framebuf;
+void* framebuf2;
+void* bg;
+void* icons;
+void* rbxlogo;
+void* crapple;
+static struct emcorelib_header* loadlib(uint32_t identifier, uint32_t version, char* filename)
+{
+    struct emcorelib_header* lib = get_library(identifier, version, LIBSOURCE_BOOTFLASH, filename);
+    if (!lib) panicf(PANIC_KILLTHREAD, "Could not load %s", filename);
+    return lib;
+}
+static void* loadpng(const char* filename, void* (*decoder)(struct png_info* handle))
+{
+    int size = bootflash_filesize(filename);
+    if (size == -1) panicf(PANIC_KILLTHREAD, "Could not load %s", filename);
+    void* buf = memalign(0x10, size);
+    if (!buf) panicf(PANIC_KILLTHREAD, "Could not allocate buffer for %s", filename);
+    bootflash_read(filename, buf, 0, size);
+    struct png_info* handle = png->png_open(buf, size);
+    if (!handle) panicf(PANIC_KILLTHREAD, "Could not parse %s", filename);
+    void* out = decoder(handle);
+    if (!out) panicf(PANIC_KILLTHREAD, "Could not decode %s", filename);
+    png->png_destroy(handle);
+    free(buf);
+    return out;
+}
+static void message(int x, const char* line1, const char* line2)
+{
+    rendertext(framebuf, x, 73, 176, 0xff3333ff, 0xa0000000, line1);
+    rendertext(framebuf, x, 81, 176, 0xff3333ff, 0xa0000000, line2);
+    displaylcd(0, 0, 176, 132, framebuf, 0, 0, 176);
+    sleep(5000000);
+}
+struct chooser_renderer_list_itemdata toolchooser_rparams_mainchooser =
+{
+    .size = LIBUI_POINT(160, 10),
+    .fill_box = LIBUI_BOX(LIBUI_POINT(0, 0), LIBUI_POINT(160, 10)),
+    .fill_color = 0xa0000000,
+    .fill_color_selected = 0x60ffffff,
+    .icon_pos = LIBUI_POINT(0, 0),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                          LIBUI_POINT(0, 0)),
+    .icon_opacity = 0,
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                                   LIBUI_POINT(0, 0)),
+    .icon_selected_opacity = 0,
+    .text = "Return to main menu",
+    .text_pos = LIBUI_POINT(1, 1),
+    .text_color = 0xffffffff,
+    .text_color_selected = 0xff7fffff
+};
+struct chooser_renderer_list_itemdata toolchooser_rparams_umsboot =
+{
+    .size = LIBUI_POINT(160, 10),
+    .fill_box = LIBUI_BOX(LIBUI_POINT(0, 0), LIBUI_POINT(160, 10)),
+    .fill_color = 0xa0000000,
+    .fill_color_selected = 0x60ffffff,
+    .icon_pos = LIBUI_POINT(0, 0),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                          LIBUI_POINT(0, 0)),
+    .icon_opacity = 0,
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                                   LIBUI_POINT(0, 0)),
+    .icon_selected_opacity = 0,
+    .text = "Run UMSboot",
+    .text_pos = LIBUI_POINT(1, 1),
+    .text_color = 0xffffffff,
+    .text_color_selected = 0xff7fffff
+};
+void run_umsboot(void** firmware, void** app, int* size)
+{
+    boot->load_from_flash(firmware, size, false, "umsboot ", 0x10000);
+    if (!*firmware)
+    {
+        memcpy(framebuf, bg, 176 * 132 * 3);
+        message(19, "Loading UMSboot failed!", "Returning to main menu.");
+    }
+}
+struct chooser_renderer_list_itemdata toolchooser_rparams_diagmode =
+{
+    .size = LIBUI_POINT(160, 10),
+    .fill_box = LIBUI_BOX(LIBUI_POINT(0, 0), LIBUI_POINT(160, 10)),
+    .fill_color = 0xa0000000,
+    .fill_color_selected = 0x60ffffff,
+    .icon_pos = LIBUI_POINT(0, 0),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                          LIBUI_POINT(0, 0)),
+    .icon_opacity = 0,
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                                   LIBUI_POINT(0, 0)),
+    .icon_selected_opacity = 0,
+    .text = "Run diagnostics mode",
+    .text_pos = LIBUI_POINT(1, 1),
+    .text_color = 0xffffffff,
+    .text_color_selected = 0xff7fffff
+};
+void run_diagmode(void** firmware, void** app, int* size)
+{
+    boot->load_from_flash(firmware, size, false, "diagmode", 0x100000);
+    if (!*firmware)
+    {
+        memcpy(framebuf, bg, 176 * 132 * 3);
+        message(16, "Loading diag mode failed!", " Returning to main menu. ");
+    }
+}
+struct chooser_renderer_list_itemdata toolchooser_rparams_rockbox_fallback =
+{
+    .size = LIBUI_POINT(160, 10),
+    .fill_box = LIBUI_BOX(LIBUI_POINT(0, 0), LIBUI_POINT(160, 10)),
+    .fill_color = 0xa0000000,
+    .fill_color_selected = 0x60ffffff,
+    .icon_pos = LIBUI_POINT(0, 0),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                          LIBUI_POINT(0, 0)),
+    .icon_opacity = 0,
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                                   LIBUI_POINT(0, 0)),
+    .icon_selected_opacity = 0,
+    .text = "Run Rockbox fallback image",
+    .text_pos = LIBUI_POINT(1, 1),
+    .text_color = 0xffffffff,
+    .text_color_selected = 0xff7fffff
+};
+void run_rockbox_fallback(void** firmware, void** app, int* size)
+{
+    boot->load_from_flash(firmware, size, true, "rockbox ", 0x100000);
+    if (!*firmware)
+    {
+        memcpy(framebuf, bg, 176 * 132 * 3);
+        message(19, "Loading Rockbox failed!", "Returning to main menu.");
+    }
+}
+struct chooser_renderer_list_itemdata toolchooser_rparams_clearcfg =
+{
+    .size = LIBUI_POINT(160, 10),
+    .fill_box = LIBUI_BOX(LIBUI_POINT(0, 0), LIBUI_POINT(160, 10)),
+    .fill_color = 0xa0000000,
+    .fill_color_selected = 0x60ffffff,
+    .icon_pos = LIBUI_POINT(0, 0),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                          LIBUI_POINT(0, 0)),
+    .icon_opacity = 0,
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                                   LIBUI_POINT(0, 0)),
+    .icon_selected_opacity = 0,
+    .text = "Clear Rockbox configuration",
+    .text_pos = LIBUI_POINT(1, 1),
+    .text_color = 0xffffffff,
+    .text_color_selected = 0xff7fffff
+};
+void run_clearcfg(void** firmware, void** app, int* size)
+{
+    remove("/.rockbox/config.cfg");
+    memcpy(framebuf, bg, 176 * 132 * 3);
+    message(25, "Rockbox configuration", "  has been cleared.  ");
+}
+struct chooser_renderer_list_itemdata toolchooser_rparams_cleardb =
+{
+    .size = LIBUI_POINT(160, 10),
+    .fill_box = LIBUI_BOX(LIBUI_POINT(0, 0), LIBUI_POINT(160, 10)),
+    .fill_color = 0xa0000000,
+    .fill_color_selected = 0x60ffffff,
+    .icon_pos = LIBUI_POINT(0, 0),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                          LIBUI_POINT(0, 0)),
+    .icon_opacity = 0,
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                                   LIBUI_POINT(0, 0)),
+    .icon_selected_opacity = 0,
+    .text = "Clear Rockbox database",
+    .text_pos = LIBUI_POINT(1, 1),
+    .text_color = 0xffffffff,
+    .text_color_selected = 0xff7fffff
+};
+void run_cleardb(void** firmware, void** app, int* size)
+{
+    remove("/.rockbox/database_0.tcd");
+    remove("/.rockbox/database_1.tcd");
+    remove("/.rockbox/database_2.tcd");
+    remove("/.rockbox/database_3.tcd");
+    remove("/.rockbox/database_4.tcd");
+    remove("/.rockbox/database_5.tcd");
+    remove("/.rockbox/database_6.tcd");
+    remove("/.rockbox/database_7.tcd");
+    remove("/.rockbox/database_8.tcd");
+    remove("/.rockbox/database_9.tcd");
+    remove("/.rockbox/database_idx.tcd");
+    remove("/.rockbox/database_tmp.tcd");
+    remove("/.rockbox/database_state.tcd");
+    remove("/.rockbox/database_changelog.txt");
+    memcpy(framebuf, bg, 176 * 132 * 3);
+    message(37, "Rockbox  database", "has been cleared.");
+}
+struct chooser_renderer_list_itemdata toolchooser_rparams_reformat =
+{
+    .size = LIBUI_POINT(160, 10),
+    .fill_box = LIBUI_BOX(LIBUI_POINT(0, 0), LIBUI_POINT(160, 10)),
+    .fill_color = 0xa0000000,
+    .fill_color_selected = 0x60ffffff,
+    .icon_pos = LIBUI_POINT(0, 0),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                          LIBUI_POINT(0, 0)),
+    .icon_opacity = 0,
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                                   LIBUI_POINT(0, 0)),
+    .icon_selected_opacity = 0,
+    .text = "Reformat data partition",
+    .text_pos = LIBUI_POINT(1, 1),
+    .text_color = 0xffffffff,
+    .text_color_selected = 0xff7fffff
+};
+void fat32_progressbar_init(void* user, int max)
+{
+    progressbar_init((struct progressbar_state*)user,
+, 165, 74, 83, 0x77ff, 0xe8, 0x125f, 0, max);
+}
+void fat32_progressbar_update(void* user, int current)
+{
+    progressbar_setpos((struct progressbar_state*)user, current, false);
+}
+void run_reformat(void** firmware, void** app, int* size)
+{
+    memcpy(framebuf, bg, 176 * 132 * 3);
+    rendertext(framebuf, 7, 65, 176, 0xff7fffff, 0, "Reformatting data partition");
+    displaylcd(0, 0, 176, 132, framebuf, 0, 0, 176);
+    struct emcorelib_header* libmkfat32 = loadlib(LIBMKFAT32_IDENTIFIER,
+                                                  LIBMKFAT32_API_VERSION, "libmkf32");
+    struct libmkfat32_api* mf32 = (struct libmkfat32_api*)libmkfat32->api;
+    struct storage_info storageinfo;
+    storage_get_info(0, &storageinfo);
+    struct progressbar_state progressbar;
+    int rc = mf32->mkfat32(0, 0, storageinfo.num_sectors, 2048, 1, "iPod Nano2G",
+                           &progressbar, fat32_progressbar_init, fat32_progressbar_update);
+    if (rc < 0) panicf(PANIC_KILLTHREAD, "Error formatting data partition: %08X", rc);
+    release_library(libmkfat32);
+    library_unload(libmkfat32);
+    memcpy(framebuf, bg, 176 * 132 * 3);
+    message(34, "Data partition has", "been  reformatted.");
+}
+struct chooser_renderer_list_itemdata toolchooser_rparams_uninstaller =
+{
+    .size = LIBUI_POINT(160, 10),
+    .fill_box = LIBUI_BOX(LIBUI_POINT(0, 0), LIBUI_POINT(160, 10)),
+    .fill_color = 0xa0000000,
+    .fill_color_selected = 0x60ffffff,
+    .icon_pos = LIBUI_POINT(0, 0),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                          LIBUI_POINT(0, 0)),
+    .icon_opacity = 0,
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                                   LIBUI_POINT(0, 0)),
+    .icon_selected_opacity = 0,
+    .text = "Uninstall emCORE",
+    .text_pos = LIBUI_POINT(1, 1),
+    .text_color = 0xffffffff,
+    .text_color_selected = 0xff7fffff
+};
+void run_uninstaller(void** firmware, void** app, int* size)
+{
+    boot->load_from_flash(app, size, false, "uninst  ", 0);
+    if (!*app)
+    {
+        memcpy(framebuf, bg, 176 * 132 * 3);
+        message(7, "Loading uninstaller failed!", "  Returning to main menu.  ");
+    }
+}
+struct chooser_renderer_list_params toolchooser_rparams =
+{
+    .version = CHOOSER_RENDERER_LIST_PARAMS_VERSION,
+    .copy_dest = LIBUI_LOCATION(LIBUI_BUFFER(NULL, 176), LIBUI_POINT(0, 0)),
+    .copy_src = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 176), LIBUI_POINT(0, 0)),
+                              LIBUI_POINT(176, 132)),
+    .bg_dest = LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+    .bg_src = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                            LIBUI_POINT(0, 0)),
+    .bg_opacity = 0,
+    .fill_dest = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
+                               LIBUI_POINT(0, 0)),
+    .fill_color = 0,
+    .viewport = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 176), LIBUI_POINT(7, 30)),
+                              LIBUI_POINT(162, 80)),
+    .blit_dest = LIBUI_POINT(0, 0),
+    .blit_src = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 176), LIBUI_POINT(0, 0)),
+                              LIBUI_POINT(176, 132)),
+    .preblit = NULL,
+    .postblit = NULL
+};
+struct chooser_action_handler_wheel_params toolchooser_aparams =
+{
+    .version = CHOOSER_ACTION_HANDLER_WHEEL_PARAMS_VERSION,
+    .stepsperitem = 128,
+    .eventfilter = NULL,
+    .timeout_initial = TIMEOUT_BLOCK,
+    .timeout_idle = TIMEOUT_BLOCK,
+    .timeout_item = 0,
+    .tick_force_redraw = false,
+    .buttoncount = 5,
+    .buttonmap =
+    {
+        CHOOSER_ACTION_HANDLER_WHEEL_ACTION_SELECT,
+        CHOOSER_ACTION_HANDLER_WHEEL_ACTION_NEXT,
+        CHOOSER_ACTION_HANDLER_WHEEL_ACTION_PREV,
+        CHOOSER_ACTION_HANDLER_WHEEL_ACTION_NEXT,
+        CHOOSER_ACTION_HANDLER_WHEEL_ACTION_PREV
+    }
+};
+struct chooser_info toolchooser =
+{
+    .version = CHOOSER_INFO_VERSION,
+    .actionhandler = NULL,
+    .actionhandlerparams = &toolchooser_aparams,
+    .renderer = NULL,
+    .rendererparams = &toolchooser_rparams,
+    .userparams = NULL,
+    .tickinterval = 10000000,
+    .itemcount = 8,
+    .defaultitem = 0,
+    .items =
+    {
+        {
+            .user = NULL,
+            .actionparams = NULL,
+            .renderparams = &toolchooser_rparams_mainchooser
+        },
+        {
+            .user = run_umsboot,
+            .actionparams = NULL,
+            .renderparams = &toolchooser_rparams_umsboot
+        },
+        {
+            .user = run_diagmode,
+            .actionparams = NULL,
+            .renderparams = &toolchooser_rparams_diagmode
+        },
+        {
+            .user = run_rockbox_fallback,
+            .actionparams = NULL,
+            .renderparams = &toolchooser_rparams_rockbox_fallback
+        },
+        {
+            .user = run_clearcfg,
+            .actionparams = NULL,
+            .renderparams = &toolchooser_rparams_clearcfg
+        },
+        {
+            .user = run_cleardb,
+            .actionparams = NULL,
+            .renderparams = &toolchooser_rparams_cleardb
+        },
+        {
+            .user = run_reformat,
+            .actionparams = NULL,
+            .renderparams = &toolchooser_rparams_reformat
+        },
+        {
+            .user = run_uninstaller,
+            .actionparams = NULL,
+            .renderparams = &toolchooser_rparams_uninstaller
+        }
+    }
+};
-bool mychooser_preblit(struct chooser_data* data)
+bool mainchooser_preblit(struct chooser_data* data)
+{
     char buf[4];
     struct chooser_action_handler_wheel_data* adata;
     adata = (struct chooser_action_handler_wheel_data*)(data->actionhandlerdata);
     snprintf(buf, sizeof(buf), "%3d", adata->timeout_remaining / 1000000);
     rendertext(framebuf, 158, 124, 176, 0xffffcccc, 0, buf);
     return false;
+}
-struct chooser_renderer_iconflow_itemdata mychooser_rparams_0 =
+struct chooser_renderer_iconflow_itemdata mainchooser_rparams_powerdown =
+{
     .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 31)),
-                          LIBUI_POINT(44, 40)),
+                          LIBUI_POINT(44, 44)),
     .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 31)),
-                                   LIBUI_POINT(44, 40)),
+                                   LIBUI_POINT(44, 44)),
     .text = "Power off",
     .text_color = 0xffffcccc,
 };
-struct chooser_renderer_iconflow_itemdata mychooser_rparams_1 =
+void run_powerdown(void** firmware, void** app, int* size)
+{
+    shutdown(true);
+    power_off();
+}
+struct chooser_renderer_iconflow_itemdata mainchooser_rparams_crapple =
+{
-    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 177)),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 123)),
                           LIBUI_POINT(44, 43)),
-    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 177)),
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 123)),
                                    LIBUI_POINT(44, 43)),
     .text = "Original firmware",
     .text_color = 0xffffcccc,
 };
+void run_crapple(void** firmware, void** app, int* size)
+{
+    int i;
+    for (i = 23; i <= 115; i += 23)
+    {
+        if (i < 115)
+            ui->blend(176, 132, 50, framebuf, 0, 0, 176,
+                      framebuf, 0, 0, 176, bg, 0, 0, 176);
+        else memcpy(framebuf, bg, 176 * 132 * 3);
+        memcpy(framebuf2, framebuf, 176 * 132 * 3);
+        ui->blenda(111, i, 255, framebuf2, 32, 0, 176,
+                   framebuf2, 32, 0, 176, crapple, 0, 115 - i, 111);
+        displaylcd(0, 0, 176, 132, framebuf2, 0, 0, 176);
+    }
+    boot->load_from_file(firmware, size, false, "/.boot/appleos.ucl", 0x800000);
+    if (!*firmware) boot->load_from_file(firmware, size, false, "/.boot/appleos.bin", 0);
+    if (!*firmware) message(7, "Loading appleos.bin failed!", "  Returning to main menu.  ");
+}
-struct chooser_renderer_iconflow_itemdata mychooser_rparams_2 =
+struct chooser_renderer_iconflow_itemdata mainchooser_rparams_rockbox =
+{
     .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 0)),
                           LIBUI_POINT(44, 14)),
     .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 0)),
                                    LIBUI_POINT(44, 14)),
     .text = "Rockbox",
     .text_color = 0xffffcccc,
 };
+void run_rockbox(void** firmware, void** app, int* size)
+{
+    int i;
+    for (i = 2; i <= 52; i += 10)
+    {
+        if (i < 52)
+            ui->blend(176, 132, 50, framebuf, 0, 0, 176,
+                      framebuf, 0, 0, 176, bg, 0, 0, 176);
+        else memcpy(framebuf, bg, 176 * 132 * 3);
+        ui->blit(154, MIN(47, i), 3, framebuf, 11, MAX(0, i - 47), 176,
+                 rbxlogo, 0, MAX(0, 47 - i), 154);
+        displaylcd(0, 0, 176, 132, framebuf, 0, 0, 176);
+    }
+    boot->load_from_file(firmware, size, true, "/.rockbox/rockbox.ipod", 0);
+    if (!*firmware)
+    {
+        message(4, "Loading rockbox.ipod failed!", "  Trying fallback image...  ");
+        boot->load_from_flash(firmware, size, true, "rockbox ", 0x100000);
+    }
+    if (!*firmware)
+    {
+        memcpy(framebuf, bg, 176 * 132 * 3);
+        message(19, "Loading Rockbox failed!", "Returning to main menu.");
+    }
+}
-struct chooser_renderer_iconflow_itemdata mychooser_rparams_3 =
+struct chooser_renderer_iconflow_itemdata mainchooser_rparams_console =
+{
     .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 14)),
                           LIBUI_POINT(44, 17)),
     .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 14)),
                                    LIBUI_POINT(44, 17)),
     .text = "emCORE console",
     .text_color = 0xffffcccc,
 };
-struct chooser_renderer_iconflow_itemdata mychooser_rparams_4 =
+struct chooser_renderer_iconflow_itemdata mainchooser_rparams_diskmode =
+{
-    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 71)),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 166)),
                           LIBUI_POINT(44, 31)),
-    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 71)),
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 166)),
                                    LIBUI_POINT(44, 31)),
-    .text = "UMSboot",
+    .text = "Disk mode",
     .text_color = 0xffffcccc,
 };
-struct chooser_renderer_iconflow_itemdata mychooser_rparams_5 =
+void run_diskmode(void** firmware, void** app, int* size)
+{
-    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 133)),
+    boot->load_from_flash(firmware, size, false, "diskmode", 0x100000);
-                          LIBUI_POINT(44, 44)),
+    if (!*firmware)
-    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 133)),
+    {
-                                   LIBUI_POINT(44, 44)),
+        memcpy(framebuf, bg, 176 * 132 * 3);
-    .text = "Diagnostics mode",
+        message(13, "Loading disk mode failed!", " Returning to main menu. ");
-    .text_color = 0xffffcccc,
+    }
-};
+}
-struct chooser_renderer_iconflow_itemdata mychooser_rparams_6 =
+struct chooser_renderer_iconflow_itemdata mainchooser_rparams_toolchooser =
+{
-    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 102)),
+    .icon = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 75)),
-                          LIBUI_POINT(44, 31)),
+                          LIBUI_POINT(44, 48)),
-    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 102)),
+    .icon_selected = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 44), LIBUI_POINT(0, 75)),
-                                   LIBUI_POINT(44, 31)),
+                                   LIBUI_POINT(44, 48)),
-    .text = "Disk mode",
+    .text = "Tools",
     .text_color = 0xffffcccc,
 };
-struct chooser_renderer_iconflow_params mychooser_rparams =
+static void run_toolchooser(void** firmware, void** app, int* size)
+{
+    const struct chooser_item* result = ui->chooser_run(&toolchooser);
+    if (!result->user) return;
+    void (*selected_function)(void** firmware, void** app, int* size);
+    selected_function = (void(*)(void** firmware, void** app, int* size))(result->user);
+    selected_function(firmware, app, size);
+}
+struct chooser_renderer_iconflow_params mainchooser_rparams =
+{
-    .version = CHOOSER_RENDERER_LIST_PARAMS_VERSION,
+    .version = CHOOSER_RENDERER_ICONFLOW_PARAMS_VERSION,
     .copy_dest = LIBUI_LOCATION(LIBUI_BUFFER(NULL, 176), LIBUI_POINT(0, 0)),
     .copy_src = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 176), LIBUI_POINT(0, 0)),
                               LIBUI_POINT(176, 132)),
     .bg_dest = LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
     .bg_src = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 0), LIBUI_POINT(0, 0)),
     .blit_src = LIBUI_SURFACE(LIBUI_LOCATION(LIBUI_BUFFER(NULL, 176), LIBUI_POINT(0, 0)),
                               LIBUI_POINT(176, 132)),
     .smoothness = 500000,
     .startposition = -3,
     .iconsinview = 4,
-    .preblit = mychooser_preblit,
+    .preblit = mainchooser_preblit,
     .postblit = NULL
 };
-struct chooser_action_handler_wheel_params mychooser_aparams =
+struct chooser_action_handler_wheel_params mainchooser_aparams =
+{
     .version = CHOOSER_ACTION_HANDLER_WHEEL_PARAMS_VERSION,
     .stepsperitem = 512,
     .eventfilter = NULL,
     .timeout_initial = 30500000,
         CHOOSER_ACTION_HANDLER_WHEEL_ACTION_NEXT,
         CHOOSER_ACTION_HANDLER_WHEEL_ACTION_PREV
+    }
 };
-struct chooser_info mychooser =
+struct chooser_info mainchooser =
+{
     .version = CHOOSER_INFO_VERSION,
     .actionhandler = NULL,
-    .actionhandlerparams = &mychooser_aparams,
+    .actionhandlerparams = &mainchooser_aparams,
     .renderer = NULL,
-    .rendererparams = &mychooser_rparams,
+    .rendererparams = &mainchooser_rparams,
     .userparams = NULL,
     .tickinterval = 990000,
-    .itemcount = 7,
+    .itemcount = 6,
     .defaultitem = 2,
     .items =
+    {
+        {
-            .user = (void*)0,
+            .user = run_powerdown,
             .actionparams = NULL,
-            .renderparams = &mychooser_rparams_0
+            .renderparams = &mainchooser_rparams_powerdown
         },
+        {
-            .user = (void*)1,
+            .user = run_crapple,
             .actionparams = NULL,
-            .renderparams = &mychooser_rparams_1
+            .renderparams = &mainchooser_rparams_crapple
         },
+        {
-            .user = (void*)2,
+            .user = run_rockbox,
             .actionparams = NULL,
-            .renderparams = &mychooser_rparams_2
+            .renderparams = &mainchooser_rparams_rockbox
         },
+        {
-            .user = (void*)3,
+            .user = NULL,
             .actionparams = NULL,
-            .renderparams = &mychooser_rparams_3
+            .renderparams = &mainchooser_rparams_console
         },
+        {
-            .user = (void*)4,
+            .user = run_diskmode,
             .actionparams = NULL,
-            .renderparams = &mychooser_rparams_4
+            .renderparams = &mainchooser_rparams_diskmode
         },
+        {
-            .user = (void*)5,
+            .user = run_toolchooser,
             .actionparams = NULL,
-            .renderparams = &mychooser_rparams_5
+            .renderparams = &mainchooser_rparams_toolchooser
-        },
-        {
-            .user = (void*)6,
-            .actionparams = NULL,
-            .renderparams = &mychooser_rparams_6
+        }
+    }
 };
+static void run_mainchooser(void** firmware, void** app, int* size)
+{
+    while (!*firmware && !*app)
+    {
+        const struct chooser_item* result = ui->chooser_run(&mainchooser);
+        if (!result->user) return;
+        void (*selected_function)(void** firmware, void** app, int* size);
+        selected_function = (void(*)(void** firmware, void** app, int* size))(result->user);
+        selected_function(firmware, app, size);
+    }
+}
 static void main()
+{
-    struct emcorelib_header* libboot = get_library(LIBBOOT_IDENTIFIER, LIBBOOT_API_VERSION, LIBSOURCE_BOOTFLASH, "libboot ");
-    if (!libboot) panicf(PANIC_KILLTHREAD, "Could not load booting library!");
-    struct libboot_api* boot = (struct libboot_api*)libboot->api;
-    struct emcorelib_header* libpng = get_library(LIBPNG_IDENTIFIER, LIBPNG_API_VERSION, LIBSOURCE_BOOTFLASH, "libpng  ");
+    struct emcorelib_header* libpng = loadlib(LIBPNG_IDENTIFIER, LIBPNG_API_VERSION, "libpng  ");
-    if (!libpng) panicf(PANIC_KILLTHREAD, "Could not load PNG decoder library!");
-    struct libpng_api* png = (struct libpng_api*)libpng->api;
+    png = (struct libpng_api*)libpng->api;
-    struct emcorelib_header* libui = get_library(LIBUI_IDENTIFIER, LIBUI_API_VERSION, LIBSOURCE_BOOTFLASH, "libui   ");
-    if (!libui) panicf(PANIC_KILLTHREAD, "Could not load user interface library!");
+    bg = loadpng("backgrnd", (void* (*)(struct png_info*))(png->png_decode_rgb));
-    struct libui_api* ui = (struct libui_api*)libui->api;
-    int size = bootflash_filesize("backgrnd");
-    if (size == -1) panicf(PANIC_KILLTHREAD, "Could not find background image!");
+    icons = loadpng("iconset ", (void* (*)(struct png_info*))(png->png_decode_rgba));
-    void* buf = memalign(0x10, size);
-    if (!buf) panicf(PANIC_KILLTHREAD, "Could not allocate buffer for background image!");
+    rbxlogo = loadpng("rbxlogo ", (void* (*)(struct png_info*))(png->png_decode_rgb));
-    bootflash_read("backgrnd", buf, 0, size);
-    struct png_info* handle = png->png_open(buf, size);
-    if (!handle) panicf(PANIC_KILLTHREAD, "Could not parse background image!");
-    struct png_rgb* bg = png->png_decode_rgb(handle);
+    crapple = loadpng("crapple ", (void* (*)(struct png_info*))(png->png_decode_rgba));
-    if (!bg) panicf(PANIC_KILLTHREAD, "Could not decode background image!");
-    png->png_destroy(handle);
+    release_library(libpng);
-    free(buf);
-    size = bootflash_filesize("iconset ");
-    if (size == -1) panicf(PANIC_KILLTHREAD, "Could not find icon set!");
-    buf = memalign(0x10, size);
+    library_unload(libpng);
-    if (!buf) panicf(PANIC_KILLTHREAD, "Could not allocate buffer for icon set!");
-    bootflash_read("iconset ", buf, 0, size);
-    handle = png->png_open(buf, size);
-    if (!handle) panicf(PANIC_KILLTHREAD, "Could not parse icon set!");
-    struct png_rgba* icons = png->png_decode_rgba(handle);
+    struct emcorelib_header* libboot = loadlib(LIBBOOT_IDENTIFIER,
-    if (!icons) panicf(PANIC_KILLTHREAD, "Could not decode icon set!");
-    png->png_destroy(handle);
-    free(buf);
-    size = bootflash_filesize("rbxlogo ");
-    if (size == -1) panicf(PANIC_KILLTHREAD, "Could not find Rockbox logo!");
+                                               LIBBOOT_API_VERSION, "libboot ");
-    buf = memalign(0x10, size);
-    if (!buf) panicf(PANIC_KILLTHREAD, "Could not allocate buffer for Rockbox logo!");
-    bootflash_read("rbxlogo ", buf, 0, size);
+    boot = (struct libboot_api*)libboot->api;
-    handle = png->png_open(buf, size);
-    if (!handle) panicf(PANIC_KILLTHREAD, "Could not parse Rockbox logo!");
-    struct png_rgb* rbxlogo = png->png_decode_rgb(handle);
-    if (!rbxlogo) panicf(PANIC_KILLTHREAD, "Could not decode Rockbox logo!");
+    struct emcorelib_header* libui = loadlib(LIBUI_IDENTIFIER, LIBUI_API_VERSION, "libui   ");
-    png->png_destroy(handle);
-    free(buf);
-    size = bootflash_filesize("crapple ");
+    ui = (struct libui_api*)libui->api;
-    if (size == -1) panicf(PANIC_KILLTHREAD, "Could not find OF logo!");
-    buf = memalign(0x10, size);
-    if (!buf) panicf(PANIC_KILLTHREAD, "Could not allocate buffer for OF logo!");
-    bootflash_read("crapple ", buf, 0, size);
-    handle = png->png_open(buf, size);
-    if (!handle) panicf(PANIC_KILLTHREAD, "Could not parse OF logo!");
-    struct png_rgba* crapple = png->png_decode_rgba(handle);
-    if (!rbxlogo) panicf(PANIC_KILLTHREAD, "Could not decode OF logo!");
-    png->png_destroy(handle);
-    free(buf);
     framebuf = malloc(176 * 132 * 3);
     if (!framebuf) panicf(PANIC_KILLTHREAD, "Could not allocate framebuffer!");
-    void* framebuf2 = malloc(176 * 132 * 3);
+    framebuf2 = malloc(176 * 132 * 3);
     if (!framebuf2) panicf(PANIC_KILLTHREAD, "Could not allocate framebuffer 2!");
-    mychooser.actionhandler = ui->chooser_action_handler_wheel;
+    mainchooser.actionhandler = ui->chooser_action_handler_wheel;
-    mychooser.renderer = ui->chooser_renderer_iconflow;
+    mainchooser.renderer = ui->chooser_renderer_iconflow;
-    mychooser_rparams.copy_dest.buf.addr = framebuf;
+    mainchooser_rparams.copy_dest.buf.addr = framebuf;
-    mychooser_rparams.copy_src.loc.buf.addr = bg;
+    mainchooser_rparams.copy_src.loc.buf.addr = bg;
-    mychooser_rparams.viewport.loc.buf.addr = framebuf;
+    mainchooser_rparams.viewport.loc.buf.addr = framebuf;
-    mychooser_rparams.blit_src.loc.buf.addr = framebuf;
+    mainchooser_rparams.blit_src.loc.buf.addr = framebuf;
-    mychooser_rparams_0.icon.loc.buf.addr = icons;
+    mainchooser_rparams_powerdown.icon.loc.buf.addr = icons;
-    mychooser_rparams_0.icon_selected.loc.buf.addr = icons;
+    mainchooser_rparams_powerdown.icon_selected.loc.buf.addr = icons;
-    mychooser_rparams_1.icon.loc.buf.addr = icons;
+    mainchooser_rparams_crapple.icon.loc.buf.addr = icons;
-    mychooser_rparams_1.icon_selected.loc.buf.addr = icons;
+    mainchooser_rparams_crapple.icon_selected.loc.buf.addr = icons;
-    mychooser_rparams_2.icon.loc.buf.addr = icons;
+    mainchooser_rparams_rockbox.icon.loc.buf.addr = icons;
-    mychooser_rparams_2.icon_selected.loc.buf.addr = icons;
+    mainchooser_rparams_rockbox.icon_selected.loc.buf.addr = icons;
-    mychooser_rparams_3.icon.loc.buf.addr = icons;
+    mainchooser_rparams_console.icon.loc.buf.addr = icons;
-    mychooser_rparams_3.icon_selected.loc.buf.addr = icons;
+    mainchooser_rparams_console.icon_selected.loc.buf.addr = icons;
-    mychooser_rparams_4.icon.loc.buf.addr = icons;
+    mainchooser_rparams_diskmode.icon.loc.buf.addr = icons;
-    mychooser_rparams_4.icon_selected.loc.buf.addr = icons;
+    mainchooser_rparams_diskmode.icon_selected.loc.buf.addr = icons;
-    mychooser_rparams_5.icon.loc.buf.addr = icons;
+    mainchooser_rparams_toolchooser.icon.loc.buf.addr = icons;
-    mychooser_rparams_5.icon_selected.loc.buf.addr = icons;
+    mainchooser_rparams_toolchooser.icon_selected.loc.buf.addr = icons;
+    toolchooser.actionhandler = ui->chooser_action_handler_wheel;
+    toolchooser.renderer = ui->chooser_renderer_list;
+    toolchooser_rparams.copy_dest.buf.addr = framebuf;
-    mychooser_rparams_6.icon.loc.buf.addr = icons;
+    toolchooser_rparams.copy_src.loc.buf.addr = bg;
+    toolchooser_rparams.viewport.loc.buf.addr = framebuf;
-    mychooser_rparams_6.icon_selected.loc.buf.addr = icons;
+    toolchooser_rparams.blit_src.loc.buf.addr = framebuf;
     backlight_set_brightness(177);
     void* firmware = NULL;
-    while (!firmware)
-    {
-        const struct chooser_item* result = ui->chooser_run(&mychooser);
-        switch ((int)(result->user))
-        {
-        case 0:
-            shutdown(true);
-            power_off();
-            break;
-        case 1:
-        {
-            int i;
-            for (i = 23; i <= 115; i += 23)
-            {
-                if (i < 115)
-                    ui->blend(176, 132, 50, framebuf, 0, 0, 176,
-                              framebuf, 0, 0, 176, bg, 0, 0, 176);
-                else memcpy(framebuf, bg, 176 * 132 * 3);
-                memcpy(framebuf2, framebuf, 176 * 132 * 3);
-                ui->blenda(111, i, 255, framebuf2, 32, 0, 176,
-                           framebuf2, 32, 0, 176, crapple, 0, 115 - i, 111);
-                displaylcd(0, 0, 176, 132, framebuf2, 0, 0, 176);
-            }
-            int fd = file_open("/.boot/appleos.bin", O_RDONLY);
-            if (fd > 0)
-            {
-                size = filesize(fd);
-                if (size > 0)
-                {
-                    void* buf = memalign(0x10, size);
-                    if (buf)
-                    {
-                        if (read(fd, buf, size) == size) firmware = buf;
-                        else free(buf);
-                    }
-                }
-                close(fd);
-            }
-            if (!firmware)
-            {
-                rendertext(framebuf2, 7, 73, 176, 0xff3333ff, 0xa0000000, "Loading appleos.bin failed!");
-                rendertext(framebuf2, 7, 81, 176, 0xff3333ff, 0xa0000000, "  Returning to main menu.  ");
-                displaylcd(0, 0, 176, 132, framebuf2, 0, 0, 176);
-                sleep(5000000);
-            }
-            break;
-        }
-        case 2:
-        {
-            int i;
-            for (i = 2; i <= 52; i += 10)
-            {
-                if (i < 52)
-                    ui->blend(176, 132, 50, framebuf, 0, 0, 176,
-                              framebuf, 0, 0, 176, bg, 0, 0, 176);
-                else memcpy(framebuf, bg, 176 * 132 * 3);
-                ui->blit(154, MIN(47, i), 3, framebuf, 11, MAX(0, i - 47), 176,
-                         rbxlogo, 0, MAX(0, 47 - i), 154);
-                displaylcd(0, 0, 176, 132, framebuf, 0, 0, 176);
-            }
-            int fd = file_open("/.rockbox/rockbox.ipod", O_RDONLY);
-            if (fd > 0)
-            {
-                size = filesize(fd);
-                if (size > 0)
-                {
-                    void* buf = memalign(0x10, size);
-                    if (buf)
-                    {
-                        if (read(fd, buf, size) == size)
-                            if (!boot->verify_rockbox_checksum(buf, size))
-                                firmware = buf;
-                        if (!firmware) free(buf);
-                    }
-                }
-                close(fd);
-            }
-            if (!firmware)
-            {
-                rendertext(framebuf, 4, 73, 176, 0xff3333ff, 0xa0000000, "Loading rockbox.ipod failed!");
-                rendertext(framebuf, 4, 81, 176, 0xff3333ff, 0xa0000000, "  Trying fallback image...  ");
-                displaylcd(0, 0, 176, 132, framebuf, 0, 0, 132);
-                sleep(5000000);
-                size = bootflash_filesize("rockbox ");
-                if (size > 0)
-                {
-                    void* buf = memalign(0x10, size);
-                    if (buf)
-                    {
-                        bootflash_read("rockbox ", buf, 0, size);
-                        if (bootflash_attributes("rockbox ") & 0x800)
-                        {
-                            void* buf2 = malloc(0x100000);
-                            if (buf2)
-                            {
-                                if (!ucl_decompress(buf, size, buf2, (uint32_t*)&size))
-                                {
-                                    free(buf);
-                                    buf = realloc(buf2, size);
-                                    if (!buf) buf = buf2;
-                                    if (!boot->verify_rockbox_checksum(buf, size))
-                                        firmware = buf;
-                                    else free(buf);
-                                }
-                                else
-                                {
-                                    free(buf2);
-                                    free(buf);
-                                }
-                            }
-                            else free(buf);
-                        }
-                        else
-                        {
-                            if (!boot->verify_rockbox_checksum(buf, size)) firmware = buf;
-                            else free(buf);
-                        }
-                    }
+    void* app = NULL;
-                }
-            }
-            if (!firmware)
-            {
-                memcpy(framebuf, bg, 176 * 132 * 3);
-                rendertext(framebuf, 19, 73, 176, 0xff3333ff, 0xa0000000, "Loading Rockbox failed!");
-                rendertext(framebuf, 19, 81, 176, 0xff3333ff, 0xa0000000, "Returning to main menu.");
-                displaylcd(0, 0, 176, 132, framebuf, 0, 0, 176);
-                sleep(5000000);
-            }
-            break;
-        }
-        case 3:
-            goto leave;
-        case 4:
-            size = bootflash_filesize("umsboot ");
-            if (size > 0)
-            {
+    int size;
-                void* buf = memalign(0x10, size);
+    run_mainchooser(&firmware, &app, &size);
-                if (buf)
-                {
-                    bootflash_read("umsboot ", buf, 0, size);
-                    if (bootflash_attributes("umsboot ") & 0x800)
-                    {
-                        void* buf2 = malloc(0x10000);
-                        if (buf2)
-                        {
-                            if (!ucl_decompress(buf, size, buf2, (uint32_t*)&size))
-                            {
-                                free(buf);
-                                buf = realloc(buf2, size);
-                                if (!buf) buf = buf2;
-                                firmware = buf;
-                            }
-                            else
-                            {
-                                free(buf2);
-                                free(buf);
-                            }
-                        }
-                        else free(buf);
-                    }
-                    else firmware = buf;
-                }
-            }
-            if (!firmware)
-            {
-                memcpy(framebuf, bg, 176 * 132 * 3);
-                rendertext(framebuf, 19, 73, 176, 0xff3333ff, 0xa0000000, "Loading UMSboot failed!");
-                rendertext(framebuf, 19, 81, 176, 0xff3333ff, 0xa0000000, "Returning to main menu.");
-                displaylcd(0, 0, 176, 132, framebuf, 0, 0, 132);
-                sleep(5000000);
-            }
-            break;
-        case 5:
-            size = bootflash_filesize("diagmode");
-            if (size > 0)
-            {
-                void* buf = memalign(0x10, size);
-                if (buf)
-                {
-                    bootflash_read("diagmode", buf, 0, size);
-                    if (bootflash_attributes("diagmode") & 0x800)
-                    {
-                        void* buf2 = malloc(0x80000);
-                        if (buf2)
-                        {
-                            if (!ucl_decompress(buf, size, buf2, (uint32_t*)&size))
-                            {
-                                free(buf);
-                                buf = realloc(buf2, size);
-                                if (!buf) buf = buf2;
-                                firmware = buf;
-                            }
-                            else
-                            {
-                                free(buf2);
-                                free(buf);
-                            }
-                        }
-                        else free(buf);
-                    }
-                    else firmware = buf;
-                }
-            }
-            if (!firmware)
-            {
-                memcpy(framebuf, bg, 176 * 132 * 3);
-                rendertext(framebuf, 13, 73, 176, 0xff3333ff, 0xa0000000, "Loading diag mode failed!");
-                rendertext(framebuf, 13, 81, 176, 0xff3333ff, 0xa0000000, " Returning to main menu. ");
-                displaylcd(0, 0, 176, 132, framebuf, 0, 0, 176);
-                sleep(5000000);
-            }
-            break;
-        case 6:
-            size = bootflash_filesize("diskmode");
-            if (size > 0)
-            {
-                void* buf = memalign(0x10, size);
-                if (buf)
-                {
-                    bootflash_read("diskmode", buf, 0, size);
-                    if (bootflash_attributes("diskmode") & 0x800)
-                    {
-                        void* buf2 = malloc(0x80000);
-                        if (buf2)
-                        {
-                            if (!ucl_decompress(buf, size, buf2, (uint32_t*)&size))
-                            {
-                                free(buf);
-                                buf = realloc(buf2, size);
-                                if (!buf) buf = buf2;
-                                firmware = buf;
-                            }
-                            else
-                            {
-                                free(buf2);
-                                free(buf);
-                            }
-                        }
-                        else free(buf);
-                    }
-                    else firmware = buf;
-                }
-            }
-            if (!firmware)
-            {
-                memcpy(framebuf, bg, 176 * 132 * 3);
-                rendertext(framebuf, 13, 73, 176, 0xff3333ff, 0xa0000000, "Loading disk mode failed!");
-                rendertext(framebuf, 13, 81, 176, 0xff3333ff, 0xa0000000, " Returning to main menu. ");
-                displaylcd(0, 0, 176, 132, framebuf, 0, 0, 176);
-                sleep(5000000);
-            }
-            break;
-        }
-    }
-leave:
     free(framebuf2);
     free(framebuf);
     free(crapple);
     free(rbxlogo);
     free(icons);
     free(bg);
     release_library(libui);
-    release_library(libpng);
     release_library(libboot);
     library_unload(libui);
-    library_unload(libpng);
     library_unload(libboot);
     if (firmware)
+    {
         shutdown(false);
         execfirmware((void*)0x08000000, firmware, size);
+    }
+    else if (app) execimage(app, false);
     else cputs(3, "Dropped into emCORE console.\n");
+}
 EMCORE_APP_HEADER("Boot menu", main, 127)

Subversion Repositories freemyipod

(root)/apps/bootmenu-ipodnano2g/main.c – Rev 651 → 671