start new makefile, migrate to libpicofe

[picodrive.git] / platform / common / emu.c

diff --git a/platform/common/emu.c b/platform/common/emu.c
index 7d680b8..a417926 100644 (file)
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -10,14 +10,15 @@
 #include <unistd.h>\r
 #endif\r
 \r
+#include "../libpicofe/posix.h"\r
+#include "../libpicofe/input.h"\r
+#include "../libpicofe/fonts.h"\r
+#include "../libpicofe/lprintf.h"\r
+#include "../libpicofe/plat.h"\r
 #include "emu.h"\r
-#include "menu.h"\r
-#include "fonts.h"\r
-#include "lprintf.h"\r
+#include "input_pico.h"\r
+#include "menu_pico.h"\r
 #include "config.h"\r
-#include "plat.h"\r
-#include "input.h"\r
-#include "posix.h"\r
 \r
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
@@ -184,7 +185,7 @@ static int find_bios(int region, char **bios_file)
        } else {\r
                sprintf(static_buff, "no %s BIOS files found, read docs",\r
                        region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");\r
-               me_update_msg(static_buff);\r
+               menu_update_msg(static_buff);\r
                return 0;\r
        }\r
 }\r
@@ -510,32 +511,32 @@ int emu_reload_rom(char *rom_fname)
                int dummy;\r
                FILE *movie_file = fopen(rom_fname, "rb");\r
                if (!movie_file) {\r
-                       me_update_msg("Failed to open movie.");\r
+                       menu_update_msg("Failed to open movie.");\r
                        return 0;\r
                }\r
                fseek(movie_file, 0, SEEK_END);\r
                movie_size = ftell(movie_file);\r
                fseek(movie_file, 0, SEEK_SET);\r
                if (movie_size < 64+3) {\r
-                       me_update_msg("Invalid GMV file.");\r
+                       menu_update_msg("Invalid GMV file.");\r
                        fclose(movie_file);\r
                        return 0;\r
                }\r
                movie_data = malloc(movie_size);\r
                if (movie_data == NULL) {\r
-                       me_update_msg("low memory.");\r
+                       menu_update_msg("low memory.");\r
                        fclose(movie_file);\r
                        return 0;\r
                }\r
                dummy = fread(movie_data, 1, movie_size, movie_file);\r
                fclose(movie_file);\r
                if (strncmp((char *)movie_data, "Gens Movie TEST", 15) != 0) {\r
-                       me_update_msg("Invalid GMV file.");\r
+                       menu_update_msg("Invalid GMV file.");\r
                        return 0;\r
                }\r
                dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);\r
                if (!dummy) {\r
-                       me_update_msg("Could't find a ROM for movie.");\r
+                       menu_update_msg("Could't find a ROM for movie.");\r
                        return 0;\r
                }\r
                get_ext(rom_fname, ext);\r
@@ -547,7 +548,7 @@ int emu_reload_rom(char *rom_fname)
                PicoPatchLoad(rom_fname);\r
                dummy = try_rfn_cut(rom_fname) || try_rfn_cut(rom_fname);\r
                if (!dummy) {\r
-                       me_update_msg("Could't find a ROM to patch.");\r
+                       menu_update_msg("Could't find a ROM to patch.");\r
                        return 0;\r
                }\r
                get_ext(rom_fname, ext);\r
@@ -555,7 +556,7 @@ int emu_reload_rom(char *rom_fname)
 \r
        media_type = detect_media(rom_fname);\r
        if (media_type == PM_BAD) {\r
-               me_update_msg("Not a ROM/CD img selected.");\r
+               menu_update_msg("Not a ROM/CD img selected.");\r
                return 0;\r
        }\r
 \r
@@ -590,7 +591,7 @@ int emu_reload_rom(char *rom_fname)
                        PicoAHW |= PAHW_MCD;\r
                }\r
                else {\r
-                       me_update_msg("Invalid CD image");\r
+                       menu_update_msg("Invalid CD image");\r
                        return 0;\r
                }\r
        }\r
@@ -601,7 +602,7 @@ int emu_reload_rom(char *rom_fname)
 \r
        rom = pm_open(used_rom_name);\r
        if (rom == NULL) {\r
-               me_update_msg("Failed to open ROM");\r
+               menu_update_msg("Failed to open ROM");\r
                return 0;\r
        }\r
 \r
@@ -611,9 +612,9 @@ int emu_reload_rom(char *rom_fname)
        ret = PicoCartLoad(rom, &rom_data, &rom_size, (PicoAHW & PAHW_SMS) ? 1 : 0);\r
        pm_close(rom);\r
        if (ret != 0) {\r
-               if      (ret == 2) me_update_msg("Out of memory");\r
-               else if (ret == 3) me_update_msg("Read failed");\r
-               else               me_update_msg("PicoCartLoad() failed.");\r
+               if      (ret == 2) menu_update_msg("Out of memory");\r
+               else if (ret == 3) menu_update_msg("Read failed");\r
+               else               menu_update_msg("PicoCartLoad() failed.");\r
                goto fail;\r
        }\r
 \r
@@ -629,7 +630,7 @@ int emu_reload_rom(char *rom_fname)
        }\r
 \r
        if (bad_rom) {\r
-               me_update_msg("Bad ROM detected.");\r
+               menu_update_msg("Bad ROM detected.");\r
                goto fail;\r
        }\r
 \r
@@ -643,7 +644,7 @@ int emu_reload_rom(char *rom_fname)
 \r
        emu_make_path(static_buff, "carthw.cfg", sizeof(static_buff));\r
        if (PicoCartInsert(rom_data, rom_size, static_buff)) {\r
-               me_update_msg("Failed to load ROM.");\r
+               menu_update_msg("Failed to load ROM.");\r
                goto fail;\r
        }\r
 \r
@@ -653,7 +654,7 @@ int emu_reload_rom(char *rom_fname)
                if (ret != 0) {\r
                        PicoCartUnload();\r
                        rom_data = NULL; // freed by unload\r
-                       me_update_msg("Insert_CD() failed, invalid CD image?");\r
+                       menu_update_msg("Insert_CD() failed, invalid CD image?");\r
                        goto fail;\r
                }\r
        }\r
@@ -716,7 +717,7 @@ int emu_swap_cd(const char *fname)
        if (cd_type != CIT_NOT_CD)\r
                ret = Insert_CD(fname, cd_type);\r
        if (ret != 0) {\r
-               me_update_msg("Load failed, invalid CD image?");\r
+               menu_update_msg("Load failed, invalid CD image?");\r
                return 0;\r
        }\r
 \r