X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=92bf1b9b9c3eaad527ed6ee7366980430fe63f88;hb=49c61096e871833d8e77397f1d3072b58b943887;hp=66175afa20b9f5f51ec6de000a6c086dfeb3cb19;hpb=af459ab3e764f03fc9788fd268730a2f9bab1811;p=pcsx_rearmed.git diff --git a/frontend/libretro.c b/frontend/libretro.c index 66175afa..92bf1b9b 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -39,12 +39,23 @@ #define PORTS_NUMBER 8 +#ifndef MIN +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif + +#define ISHEXDEC ((buf[cursor]>='0') && (buf[cursor]<='9')) || ((buf[cursor]>='a') && (buf[cursor]<='f')) || ((buf[cursor]>='A') && (buf[cursor]<='F')) + +//hack to prevent retroarch freezing when reseting in the menu but not while running with the hot key +static int rebootemu = 0; + static retro_video_refresh_t video_cb; static retro_input_poll_t input_poll_cb; static retro_input_state_t input_state_cb; static retro_environment_t environ_cb; static retro_audio_sample_batch_t audio_batch_cb; static struct retro_rumble_interface rumble; +static struct retro_log_callback logging; +static retro_log_printf_t log_cb; static void *vout_buf; static void * vout_buf_ptr; @@ -52,12 +63,14 @@ static int vout_width, vout_height; static int vout_doffs_old, vout_fb_dirty; static bool vout_can_dupe; static bool duping_enable; +static bool found_bios; static int plugins_opened; static int is_pal_mode; /* memory card data */ extern char Mcd1Data[MCD_SIZE]; +extern char Mcd2Data[MCD_SIZE]; extern char McdDisable[2]; /* PCSX ReARMed core calls and stuff */ @@ -76,6 +89,15 @@ int in_enable_vibration = 1; #define VOUT_MAX_WIDTH 1024 #define VOUT_MAX_HEIGHT 512 +//Dummy functions +bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info){return false;} +void retro_unload_game(void){} +static int vout_open(void){return 0;} +static void vout_close(void){} +static int snd_init(void){return 0;} +static void snd_finish(void){} +static int snd_busy(void){return 0;} + static void init_memcard(char *mcd_data) { unsigned off = 0; @@ -109,15 +131,26 @@ static void init_memcard(char *mcd_data) } } -static int vout_open(void) +static void set_vout_fb() { - return 0; + struct retro_framebuffer fb = {0}; + + fb.width = vout_width; + fb.height = vout_height; + fb.access_flags = RETRO_MEMORY_ACCESS_WRITE; + + if (environ_cb(RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER, &fb) && fb.format == RETRO_PIXEL_FORMAT_RGB565) + vout_buf_ptr = (uint16_t*)fb.data; + else + vout_buf_ptr = vout_buf; } static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp) { - vout_width = w; - vout_height = h; + vout_width = w; + vout_height = h; + + set_vout_fb(); } #ifndef FRONTEND_SUPPORTS_RGB565 @@ -178,10 +211,6 @@ out: pl_rearmed_cbs.flip_cnt++; } -static void vout_close(void) -{ -} - #ifdef _3DS typedef struct { @@ -378,8 +407,11 @@ void pl_timing_prepare(int is_pal) void plat_trigger_vibrate(int pad, int low, int high) { - rumble.set_rumble_state(pad, RETRO_RUMBLE_STRONG, high << 8); - rumble.set_rumble_state(pad, RETRO_RUMBLE_WEAK, low ? 0xffff : 0x0); + if(in_enable_vibration) + { + rumble.set_rumble_state(pad, RETRO_RUMBLE_STRONG, high << 8); + rumble.set_rumble_state(pad, RETRO_RUMBLE_WEAK, low ? 0xffff : 0x0); + } } void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in) @@ -387,20 +419,6 @@ void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in) } /* sound calls */ -static int snd_init(void) -{ - return 0; -} - -static void snd_finish(void) -{ -} - -static int snd_busy(void) -{ - return 0; -} - static void snd_feed(void *buf, int bytes) { if (audio_batch_cb != NULL) @@ -421,7 +439,7 @@ void retro_set_environment(retro_environment_t cb) { static const struct retro_variable vars[] = { { "pcsx_rearmed_frameskip", "Frameskip; 0|1|2|3" }, - { "pcsx_rearmed_region", "Region; Auto|NTSC|PAL" }, + { "pcsx_rearmed_region", "Region; auto|NTSC|PAL" }, { "pcsx_rearmed_pad1type", "Pad 1 Type; default|none|standard|analog|negcon" }, { "pcsx_rearmed_pad2type", "Pad 2 Type; default|none|standard|analog|negcon" }, { "pcsx_rearmed_pad3type", "Pad 3 Type; default|none|standard|analog|negcon" }, @@ -432,6 +450,8 @@ void retro_set_environment(retro_environment_t cb) { "pcsx_rearmed_pad8type", "Pad 8 Type; default|none|standard|analog|negcon" }, { "pcsx_rearmed_multitap1", "Multitap 1; auto|disabled|enabled" }, { "pcsx_rearmed_multitap2", "Multitap 2; auto|disabled|enabled" }, + { "pcsx_rearmed_vibration", "Enable Vibration; enabled|disabled" }, + { "pcsx_rearmed_dithering", "Enable Dithering; enabled|disabled" }, #ifndef DRC_DISABLE { "pcsx_rearmed_drc", "Dynamic recompiler; enabled|disabled" }, #endif @@ -440,14 +460,18 @@ void retro_set_environment(retro_environment_t cb) { "pcsx_rearmed_neon_enhancement_enable", "Enhanced resolution (slow); disabled|enabled" }, { "pcsx_rearmed_neon_enhancement_no_main", "Enhanced resolution speed hack; disabled|enabled" }, #endif - { "pcsx_rearmed_duping_enable", "Frame duping; on|off" }, - { "pcsx_rearmed_spu_reverb", "Sound: Reverb; on|off" }, + { "pcsx_rearmed_duping_enable", "Frame duping; enabled|disabled" }, + { "pcsx_rearmed_show_bios_bootlogo", "Show Bios Bootlogo(Breaks some games); disabled|enabled" }, + { "pcsx_rearmed_spu_reverb", "Sound: Reverb; enabled|disabled" }, { "pcsx_rearmed_spu_interpolation", "Sound: Interpolation; simple|gaussian|cubic|off" }, { "pcsx_rearmed_pe2_fix", "Parasite Eve 2/Vandal Hearts 1/2 Fix; disabled|enabled" }, { "pcsx_rearmed_inuyasha_fix", "InuYasha Sengoku Battle Fix; disabled|enabled" }, { NULL, NULL }, }; + if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging)) + log_cb = logging.log; + environ_cb = cb; cb(RETRO_ENVIRONMENT_SET_VARIABLES, (void*)vars); @@ -513,13 +537,13 @@ static void update_controller_port_variable(unsigned port) if (controller_port_variable(port, &var)) { if (strcmp(var.value, "standard") == 0) - in_type[0] = PSE_PAD_TYPE_STANDARD; + in_type[port] = PSE_PAD_TYPE_STANDARD; else if (strcmp(var.value, "analog") == 0) - in_type[0] = PSE_PAD_TYPE_ANALOGPAD; + in_type[port] = PSE_PAD_TYPE_ANALOGPAD; else if (strcmp(var.value, "negcon") == 0) - in_type[0] = PSE_PAD_TYPE_NEGCON; + in_type[port] = PSE_PAD_TYPE_NEGCON; else if (strcmp(var.value, "none") == 0) - in_type[0] = PSE_PAD_TYPE_NONE; + in_type[port] = PSE_PAD_TYPE_NONE; // else 'default' case, do nothing } } @@ -624,7 +648,10 @@ void retro_get_system_info(struct retro_system_info *info) { memset(info, 0, sizeof(*info)); info->library_name = "PCSX-ReARMed"; - info->library_version = "r22"; +#ifndef GIT_VERSION +#define GIT_VERSION "" +#endif + info->library_version = "r22" GIT_VERSION; info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u"; info->need_fullpath = true; } @@ -754,6 +781,21 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code) // cheat funcs are destructive, need a copy.. strncpy(buf, code, sizeof(buf)); buf[sizeof(buf) - 1] = 0; + + //Prepare buffered cheat for PCSX's AddCheat fucntion. + int cursor=0; + int nonhexdec=0; + while (buf[cursor]){ + if (!(ISHEXDEC)){ + if (++nonhexdec%2){ + buf[cursor]=' '; + } else { + buf[cursor]='\n'; + } + } + cursor++; + } + if (index < NumCheats) ret = EditCheat(index, "", buf); @@ -893,6 +935,10 @@ static struct retro_disk_control_callback disk_control = { #define SLASH '/' #endif +#ifndef PATH_MAX +#define PATH_MAX 4096 +#endif + static char base_dir[PATH_MAX]; static bool read_m3u(const char *file) @@ -1180,7 +1226,7 @@ bool retro_load_game(const struct retro_game_info *info) if (is_m3u) { if (!read_m3u(info->path)) { - SysPrintf("failed to read m3u file\n"); + log_cb(RETRO_LOG_INFO, "failed to read m3u file\n"); return false; } } else { @@ -1192,7 +1238,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) { - SysPrintf("failed to load plugins\n"); + log_cb(RETRO_LOG_INFO, "failed to load plugins\n"); return false; } @@ -1200,23 +1246,22 @@ bool retro_load_game(const struct retro_game_info *info) NetOpened = 0; if (OpenPlugins() == -1) { - SysPrintf("failed to open plugins\n"); + log_cb(RETRO_LOG_INFO, "failed to open plugins\n"); return false; } plugin_call_rearmed_cbs(); dfinput_activate(); - Config.PsxAuto = 1; if (CheckCdrom() == -1) { - SysPrintf("unsupported/invalid CD image: %s\n", info->path); + log_cb(RETRO_LOG_INFO, "unsupported/invalid CD image: %s\n", info->path); return false; } SysReset(); if (LoadCdrom() == -1) { - SysPrintf("could not load CD-ROM!\n"); + log_cb(RETRO_LOG_INFO, "could not load CD\n"); return false; } emu_on_new_cd(0); @@ -1233,15 +1278,6 @@ bool retro_load_game(const struct retro_game_info *info) return true; } -bool retro_load_game_special(unsigned game_type, const struct retro_game_info *info, size_t num_info) -{ - return false; -} - -void retro_unload_game(void) -{ -} - unsigned retro_get_region(void) { return is_pal_mode ? RETRO_REGION_PAL : RETRO_REGION_NTSC; @@ -1265,7 +1301,9 @@ size_t retro_get_memory_size(unsigned id) void retro_reset(void) { - SysReset(); + //hack to prevent retroarch freezing when reseting in the menu but not while running with the hot key + rebootemu = 1; + //SysReset(); } static const unsigned short retro_psx_map[] = { @@ -1303,7 +1341,7 @@ static void update_variables(bool in_flight) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) { Config.PsxAuto = 0; - if (strcmp(var.value, "Automatic") == 0) + if (strcmp(var.value, "auto") == 0) Config.PsxAuto = 1; else if (strcmp(var.value, "NTSC") == 0) Config.PsxType = 0; @@ -1316,6 +1354,38 @@ static void update_variables(bool in_flight) update_multitap(); + var.value = NULL; + var.key = "pcsx_rearmed_vibration"; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) + { + if (strcmp(var.value, "disabled") == 0) + in_enable_vibration = 0; + else if (strcmp(var.value, "enabled") == 0) + in_enable_vibration = 1; + } + + var.value = NULL; + var.key = "pcsx_rearmed_dithering"; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) + { + if (strcmp(var.value, "disabled") == 0) { + pl_rearmed_cbs.gpu_peops.iUseDither = 0; + pl_rearmed_cbs.gpu_peopsgl.bDrawDither = 0; +#ifdef __ARM_NEON__ + pl_rearmed_cbs.gpu_neon.allow_dithering = 0; +#endif + } + else if (strcmp(var.value, "enabled") == 0) { + pl_rearmed_cbs.gpu_peops.iUseDither = 1; + pl_rearmed_cbs.gpu_peopsgl.bDrawDither = 1; +#ifdef __ARM_NEON__ + pl_rearmed_cbs.gpu_neon.allow_dithering = 1; +#endif + } + } + #ifdef __ARM_NEON__ var.value = "NULL"; var.key = "pcsx_rearmed_neon_interlace_enable"; @@ -1356,9 +1426,9 @@ static void update_variables(bool in_flight) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) { - if (strcmp(var.value, "off") == 0) + if (strcmp(var.value, "disabled") == 0) duping_enable = false; - else if (strcmp(var.value, "on") == 0) + else if (strcmp(var.value, "enabled") == 0) duping_enable = true; } @@ -1394,9 +1464,9 @@ static void update_variables(bool in_flight) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) { - if (strcmp(var.value, "off") == 0) + if (strcmp(var.value, "disabled") == 0) spu_config.iUseReverb = false; - else if (strcmp(var.value, "on") == 0) + else if (strcmp(var.value, "enabled") == 0) spu_config.iUseReverb = true; } @@ -1448,11 +1518,30 @@ static void update_variables(bool in_flight) dfinput_activate(); } + else{ + //not yet running + + //bootlogo display hack + if (found_bios) { + var.value = "NULL"; + var.key = "pcsx_rearmed_show_bios_bootlogo"; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value) + { + if (strcmp(var.value, "enabled") == 0) + rebootemu = 1; + } + } + } } void retro_run(void) { int i; + //SysReset must be run while core is running,Not in menu (Locks up Retroarch) + if(rebootemu != 0){ + rebootemu = 0; + SysReset(); + } input_poll_cb(); @@ -1475,32 +1564,21 @@ void retro_run(void) if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD) { - in_analog_left[i][0] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128; - in_analog_left[i][1] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128; - in_analog_right[i][0] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128; - in_analog_right[i][1] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128; + in_analog_left[i][0] = MIN((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 255) + 128, 255); + in_analog_left[i][1] = MIN((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 255) + 128, 255); + in_analog_right[i][0] = MIN((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 255) + 128, 255); + in_analog_right[i][1] = MIN((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 255) + 128, 255); } } stop = 0; psxCpu->Execute(); - - struct retro_framebuffer fb = {0}; - - fb.width = vout_width; - fb.height = vout_height; - fb.access_flags = RETRO_MEMORY_ACCESS_WRITE; - - vout_buf_ptr = vout_buf; - - if (environ_cb(RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER, &fb) && fb.format == RETRO_PIXEL_FORMAT_RGB565) - { - vout_buf_ptr = (uint16_t*)fb.data; - } video_cb((vout_fb_dirty || !vout_can_dupe || !duping_enable) ? vout_buf_ptr : NULL, vout_width, vout_height, vout_width * 2); vout_fb_dirty = 0; + + set_vout_fb(); } static bool try_use_bios(const char *path) @@ -1545,7 +1623,7 @@ static bool find_any_bios(const char *dirpath, char *path, size_t path_size) if (strncasecmp(ent->d_name, "scph", 4) != 0) continue; - snprintf(path, path_size, "%s/%s", dirpath, ent->d_name); + snprintf(path, path_size, "%s%c%s", dirpath, SLASH, ent->d_name); ret = try_use_bios(path); if (ret) break; @@ -1565,11 +1643,15 @@ static void check_system_specs(void) void retro_init(void) { - const char *bios[] = { "scph1001", "scph5501", "scph7001" }; + const char *bios[] = { + "SCPH101", "SCPH7001", "SCPH5501", "SCPH1001", + "scph101", "scph7001", "scph5501", "scph1001" + }; const char *dir; char path[256]; int i, ret; - bool found_bios = false; + + found_bios = false; #ifdef __MACH__ // magic sauce to make the dynarec work on iOS @@ -1592,7 +1674,6 @@ void retro_init(void) if(!__ctr_svchax) Config.Cpu = CPU_INTERPRETER; #endif - Config.Cpu = CPU_INTERPRETER; ret |= emu_core_init(); if (ret != 0) { @@ -1615,7 +1696,7 @@ void retro_init(void) snprintf(Config.BiosDir, sizeof(Config.BiosDir), "%s", dir); for (i = 0; i < sizeof(bios) / sizeof(bios[0]); i++) { - snprintf(path, sizeof(path), "%s/%s.bin", dir, bios[i]); + snprintf(path, sizeof(path), "%s%c%s.bin", dir, SLASH, bios[i]); found_bios = try_use_bios(path); if (found_bios) break; @@ -1632,7 +1713,7 @@ void retro_init(void) SysPrintf("no BIOS files found.\n"); struct retro_message msg = { - "no BIOS found, expect bugs!", + "No PlayStation BIOS file found - add for better compatibility", 180 }; environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, (void*)&msg); @@ -1655,6 +1736,7 @@ void retro_init(void) McdDisable[0] = 0; McdDisable[1] = 1; init_memcard(Mcd1Data); + init_memcard(Mcd2Data); SaveFuncs.open = save_open; SaveFuncs.read = save_read;