further unification and refactoring

[libpicofe.git] / common / main.c

diff --git a/common/main.c b/common/main.c
index 00cbac7..67f15da 100644 (file)
--- a/common/main.c
+++ b/common/main.c
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 \r
        /* in_init() must go before config, config accesses in_ fwk */\r
        in_init();\r
-       emu_prepareDefaultConfig();\r
+       pemu_prep_defconfig();\r
        emu_ReadConfig(0, 0);\r
        config_readlrom(PicoConfigFile);\r
 \r
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
        in_probe();\r
        in_debug_dump();\r
 \r
-       emu_Init();\r
+       emu_init();\r
        menu_init();\r
 \r
        engineState = PGS_Menu;\r
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
                                engineState = PGS_Running;\r
 \r
                        case PGS_Running:\r
-                               emu_Loop();\r
+                               pemu_loop();\r
                                break;\r
 \r
                        case PGS_Quit:\r
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
 \r
        endloop:\r
 \r
-       emu_Deinit();\r
+       emu_finish();\r
        plat_finish();\r
 \r
        return 0;\r