pipe error messages through single function

[pcsx_rearmed.git] / frontend / libretro.c

diff --git a/frontend/libretro.c b/frontend/libretro.c
index b832a4e..0eef059 100644 (file)
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -11,10 +11,10 @@
 
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/psxcounters.h"
 
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/psxcounters.h"

+#include "../libpcsxcore/psxmem_map.h"

 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfsound/out.h"
 #include "../plugins/gpulib/cspace.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
 #include "../plugins/dfsound/out.h"
 #include "../plugins/gpulib/cspace.h"

-#include "linux/plat_mmap.h"

 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"
 #include "main.h"
 #include "plugin.h"
 #include "plugin_lib.h"


@@ -98,12 +98,12 @@ static void vout_close(void)
 
 static void *pl_mmap(unsigned int size)
 {
 
 static void *pl_mmap(unsigned int size)
 {

-       return plat_mmap(0, size, 0, 0);
+       return psxMap(0, size, 0, MAP_TAG_VRAM);

 }
 
 static void pl_munmap(void *ptr, unsigned int size)
 {
 }
 
 static void pl_munmap(void *ptr, unsigned int size)
 {

-       plat_munmap(ptr, size);
+       psxUnmap(ptr, size, MAP_TAG_VRAM);

 }
 
 struct rearmed_cbs pl_rearmed_cbs = {
 }
 
 struct rearmed_cbs pl_rearmed_cbs = {


@@ -236,7 +236,7 @@ bool retro_load_game(const struct retro_game_info *info)
        enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
        if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
                native_rgb565 = 1;
        enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565;
        if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) {
                native_rgb565 = 1;

-               fprintf(stderr, "RGB565 supported, using it\n");
+               SysPrintf("RGB565 supported, using it\n");

        }
 
        if (plugins_opened) {
        }
 
        if (plugins_opened) {


@@ -248,7 +248,7 @@ bool retro_load_game(const struct retro_game_info *info)
 
        /* have to reload after set_cd_image for correct cdr plugin */
        if (LoadPlugins() == -1) {
 
        /* have to reload after set_cd_image for correct cdr plugin */
        if (LoadPlugins() == -1) {

-               printf("faled to load plugins\n");
+               SysPrintf("failed to load plugins\n");

                return false;
        }
 
                return false;
        }
 


@@ -256,7 +256,7 @@ bool retro_load_game(const struct retro_game_info *info)
        NetOpened = 0;
 
        if (OpenPlugins() == -1) {
        NetOpened = 0;
 
        if (OpenPlugins() == -1) {

-               printf("faled to open plugins\n");
+               SysPrintf("failed to open plugins\n");

                return false;
        }
 
                return false;
        }
 


@@ -264,14 +264,14 @@ bool retro_load_game(const struct retro_game_info *info)
 
        Config.PsxAuto = 1;
        if (CheckCdrom() == -1) {
 
        Config.PsxAuto = 1;
        if (CheckCdrom() == -1) {

-               printf("unsupported/invalid CD image: %s\n", info->path);
+               SysPrintf("unsupported/invalid CD image: %s\n", info->path);

                return false;
        }
 
        SysReset();
 
        if (LoadCdrom() == -1) {
                return false;
        }
 
        SysReset();
 
        if (LoadCdrom() == -1) {

-               printf("could not load CD-ROM!\n");
+               SysPrintf("could not load CD-ROM!\n");

                return false;
        }
        emu_on_new_cd(0);
                return false;
        }
        emu_on_new_cd(0);


@@ -359,7 +359,7 @@ void retro_init(void)
        ret = emu_core_preinit();
        ret |= emu_core_init();
        if (ret != 0) {
        ret = emu_core_preinit();
        ret |= emu_core_init();
        if (ret != 0) {

-               printf("PCSX init failed, sorry\n");
+               SysPrintf("PCSX init failed.\n");

                exit(1);
        }
 
                exit(1);
        }
 


@@ -379,11 +379,11 @@ void retro_init(void)
                }
        }
        if (f != NULL) {
                }
        }
        if (f != NULL) {

-               printf("found BIOS file: %s\n", Config.Bios);
+               SysPrintf("found BIOS file: %s\n", Config.Bios);

                fclose(f);
        }
        else
                fclose(f);
        }
        else

-               printf("no BIOS files found.\n");
+               SysPrintf("no BIOS files found.\n");

 
        level = 1;
        environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);
 
        level = 1;
        environ_cb(RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL, &level);