giz port, restructuring

[picodrive.git] / platform / gizmondo / menu.c

diff --git a/platform/gizmondo/menu.c b/platform/gizmondo/menu.c
index 74bb6e1..5e4aa8f 100644 (file)
--- a/platform/gizmondo/menu.c
+++ b/platform/gizmondo/menu.c
@@ -19,6 +19,7 @@
 #include "menu.h"\r
 #include "../common/arm_utils.h"\r
 #include "../common/menu.h"\r
+#include "../common/emu.h"\r
 #include "../common/readpng.h"\r
 #include "version.h"\r
 #include "kgsdk/Framework.h"\r
@@ -28,22 +29,17 @@
 #include <Pico/Patch.h>\r
 #include <zlib/zlib.h>\r
 \r
-extern char romFileName[MAX_PATH];\r
-extern char *rom_data;\r
-extern int  state_slot;\r
-extern int  config_slot, config_slot_current;\r
 \r
 #define gizKeyUnkn "???"\r
 static const char * const gizKeyNames[] = {\r
        "LEFT",          "RIGHT",          "UP",       "DOWN",     "STOP",       "PLAY",   "FORWARD",  "REWIND",\r
        "LEFT_SHOULDER", "RIGHT_SHOULDER", "HOME",     "VOLUME",   "BRIGHTNESS", "ALARM",  "POWER",    gizKeyUnkn,\r
        gizKeyUnkn,      gizKeyUnkn,       gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn,\r
-       gizKeyUnkn,      gizKeyUnkn,       gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn,\r
+       gizKeyUnkn,      gizKeyUnkn,       gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn, gizKeyUnkn\r
 };\r
 \r
-static unsigned char bg_buffer[321*240*2];\r
-unsigned char menu_screen[321*240*2]; /* draw here and blit later, to avoid flicker */\r
-char menuErrorMsg[40] = {0, };\r
+static unsigned char *bg_buffer = gfx_buffer + 321*240*2;\r
+unsigned char *menu_screen = gfx_buffer; /* draw here and blit later, to avoid flicker */\r
 \r
 static void menu_darken_bg(void *dst, const void *src, int pixels, int darker);\r
 static void menu_prepare_bg(int use_game_bg);\r
@@ -502,7 +498,7 @@ static void state_check_slots(void)
 \r
        for (slot = 0; slot < 10; slot++)\r
        {\r
-               if (emu_check_save_file(slot))\r
+               if (emu_checkSaveFile(slot))\r
                {\r
                        state_slot_flags |= 1 << slot;\r
                }\r
@@ -530,10 +526,10 @@ static void draw_savestate_bg(int slot)
 \r
        if (strcmp(fname + strlen(fname) - 3, ".gz") == 0) {\r
                file = gzopen(fname, "rb");\r
-               emu_set_save_cbs(1);\r
+               emu_setSaveStateCbs(1);\r
        } else {\r
                file = fopen(fname, "rb");\r
-               emu_set_save_cbs(0);\r
+               emu_setSaveStateCbs(0);\r
        }\r
 \r
        if (file) {\r
@@ -551,7 +547,7 @@ static void draw_savestate_bg(int slot)
                areaClose(file);\r
        }\r
 \r
-       emu_forced_frame();\r
+       emu_forcedFrame();\r
        menu_prepare_bg(1);\r
 \r
        memcpy(Pico.vram, tmp_vram, sizeof(Pico.vram));\r
@@ -888,17 +884,17 @@ static void cd_menu_loop_options(void)
        menu_id selected_id;\r
        char *bios, *p;\r
 \r
-       if (find_bios(4, &bios)) { // US\r
+       if (emu_findBios(4, &bios)) { // US\r
                for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
                strncpy(bios_names.us, p, sizeof(bios_names.us)); bios_names.us[sizeof(bios_names.us)-1] = 0;\r
        } else  strcpy(bios_names.us, "NOT FOUND");\r
 \r
-       if (find_bios(8, &bios)) { // EU\r
+       if (emu_findBios(8, &bios)) { // EU\r
                for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
                strncpy(bios_names.eu, p, sizeof(bios_names.eu)); bios_names.eu[sizeof(bios_names.eu)-1] = 0;\r
        } else  strcpy(bios_names.eu, "NOT FOUND");\r
 \r
-       if (find_bios(1, &bios)) { // JP\r
+       if (emu_findBios(1, &bios)) { // JP\r
                for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;\r
                strncpy(bios_names.jp, p, sizeof(bios_names.jp)); bios_names.jp[sizeof(bios_names.jp)-1] = 0;\r
        } else  strcpy(bios_names.jp, "NOT FOUND");\r
@@ -930,21 +926,21 @@ static void cd_menu_loop_options(void)
                        }\r
                        switch (selected_id) { // BIOS testers\r
                                case MA_CDOPT_TESTBIOS_USA:\r
-                                       if (find_bios(4, &bios)) { // test US\r
+                                       if (emu_findBios(4, &bios)) { // test US\r
                                                strcpy(romFileName, bios);\r
                                                engineState = PGS_ReloadRom;\r
                                                return;\r
                                        }\r
                                        break;\r
                                case MA_CDOPT_TESTBIOS_EUR:\r
-                                       if (find_bios(8, &bios)) { // test EU\r
+                                       if (emu_findBios(8, &bios)) { // test EU\r
                                                strcpy(romFileName, bios);\r
                                                engineState = PGS_ReloadRom;\r
                                                return;\r
                                        }\r
                                        break;\r
                                case MA_CDOPT_TESTBIOS_JAP:\r
-                                       if (find_bios(1, &bios)) { // test JP\r
+                                       if (emu_findBios(1, &bios)) { // test JP\r
                                                strcpy(romFileName, bios);\r
                                                engineState = PGS_ReloadRom;\r
                                                return;\r
@@ -1188,7 +1184,6 @@ static void menu_options_save(void)
                // unbind XYZ MODE, just in case\r
                unbind_action(0xf00);\r
        }\r
-       scaling_update();\r
 }\r
 \r
 static int menu_loop_options(void)\r
@@ -1617,7 +1612,7 @@ int menu_loop_tray(void)
                                        selfname = romsel_loop(curr_path);\r
                                        if (selfname) {\r
                                                int ret = -1, cd_type;\r
-                                               cd_type = emu_cd_check(NULL);\r
+                                               cd_type = emu_cdCheck(NULL);\r
                                                if (cd_type > 0)\r
                                                        ret = Insert_CD(romFileName, cd_type == 2);\r
                                                if (ret != 0) {\r