X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=8434de0d6ac002ea7dd68500cde8488b711bff4e;hb=a901d51993abd8cbef621385b4298399455bff99;hp=3201a73f6f69cd1bd75bc0c5763ef621b89d7359;hpb=ce239f4ad583c516417027067629064cc67de7df;p=pcsx_rearmed.git diff --git a/frontend/libretro.c b/frontend/libretro.c index 3201a73f..8434de0d 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -41,6 +41,10 @@ #include #include "libretro_core_options.h" +#ifdef USE_LIBRETRO_VFS +#include +#endif + #ifdef _3DS #include "3ds/3ds_utils.h" #endif @@ -55,22 +59,10 @@ #define MAX(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')) +#define ISHEXDEC ((buf[cursor] >= '0') && (buf[cursor] <= '9')) || ((buf[cursor] >= 'a') && (buf[cursor] <= 'f')) || ((buf[cursor] >= 'A') && (buf[cursor] <= 'F')) #define INTERNAL_FPS_SAMPLE_PERIOD 64 -#ifdef DRC_DISABLE -int stop; -u32 next_interupt; -u32 event_cycles[PSXINT_COUNT]; -int cycle_multiplier; -int new_dynarec_hacks; - -void new_dyna_before_save(void) { } -void new_dyna_after_save(void) { } -void new_dyna_freeze(void *f, int i) { } -#endif - //hack to prevent retroarch freezing when reseting in the menu but not while running with the hot key static int rebootemu = 0; @@ -83,8 +75,10 @@ static retro_set_rumble_state_t rumble_cb; static struct retro_log_callback logging; static retro_log_printf_t log_cb; +static unsigned msg_interface_version = 0; + static void *vout_buf; -static void * vout_buf_ptr; +static void *vout_buf_ptr; static int vout_width, vout_height; static int vout_doffs_old, vout_fb_dirty; static bool vout_can_dupe; @@ -93,13 +87,35 @@ static bool found_bios; static bool display_internal_fps = false; static unsigned frame_count = 0; static bool libretro_supports_bitmasks = false; +static bool libretro_supports_option_categories = false; +static bool show_input_settings = true; #ifdef GPU_PEOPS -static int show_advanced_gpu_peops_settings = -1; +static bool show_advanced_gpu_peops_settings = true; #endif #ifdef GPU_UNAI -static int show_advanced_gpu_unai_settings = -1; +static bool show_advanced_gpu_unai_settings = true; #endif -static int show_other_input_settings = -1; +static float mouse_sensitivity = 1.0f; + +typedef enum +{ + FRAMESKIP_NONE = 0, + FRAMESKIP_AUTO, + FRAMESKIP_AUTO_THRESHOLD, + FRAMESKIP_FIXED_INTERVAL +} frameskip_type_t; + +static unsigned frameskip_type = FRAMESKIP_NONE; +static unsigned frameskip_threshold = 0; +static unsigned frameskip_interval = 0; +static unsigned frameskip_counter = 0; + +static int retro_audio_buff_active = false; +static unsigned retro_audio_buff_occupancy = 0; +static int retro_audio_buff_underrun = false; + +static unsigned retro_audio_latency = 0; +static int update_audio_latency = false; static unsigned previous_width = 0; static unsigned previous_height = 0; @@ -113,15 +129,16 @@ extern char Mcd2Data[MCD_SIZE]; extern char McdDisable[2]; /* PCSX ReARMed core calls and stuff */ -int in_type[8] = { +int in_type[8] = { PSE_PAD_TYPE_NONE, PSE_PAD_TYPE_NONE, PSE_PAD_TYPE_NONE, PSE_PAD_TYPE_NONE, PSE_PAD_TYPE_NONE, PSE_PAD_TYPE_NONE, PSE_PAD_TYPE_NONE, PSE_PAD_TYPE_NONE }; -int in_analog_left[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }}; -int in_analog_right[8][2] = {{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 },{ 127, 127 }}; +int in_analog_left[8][2] = { { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 } }; +int in_analog_right[8][2] = { { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 }, { 127, 127 } }; unsigned short in_keystate[PORTS_NUMBER]; +int in_mouse[8][2]; int multitap1 = 0; int multitap2 = 0; int in_enable_vibration = 1; @@ -148,17 +165,17 @@ static int negcon_linearity = 1; static bool axis_bounds_modifier; /* PSX max resolution is 640x512, but with enhancement it's 1024x512 */ -#define VOUT_MAX_WIDTH 1024 +#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;} +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; } #define GPU_PEOPS_ODD_EVEN_BIT (1 << 0) #define GPU_PEOPS_EXPAND_SCREEN_WIDTH (1 << 1) @@ -182,7 +199,8 @@ static void init_memcard(char *mcd_data) off += 0x7d; mcd_data[off++] = 0x0e; - for (i = 0; i < 15; i++) { + for (i = 0; i < 15; i++) + { mcd_data[off++] = 0xa0; off += 0x07; mcd_data[off++] = 0xff; @@ -191,7 +209,8 @@ static void init_memcard(char *mcd_data) mcd_data[off++] = 0xa0; } - for (i = 0; i < 20; i++) { + for (i = 0; i < 20; i++) + { mcd_data[off++] = 0xff; mcd_data[off++] = 0xff; mcd_data[off++] = 0xff; @@ -205,14 +224,14 @@ static void init_memcard(char *mcd_data) static void set_vout_fb() { - struct retro_framebuffer fb = {0}; + struct retro_framebuffer fb = { 0 }; - fb.width = vout_width; - fb.height = vout_height; - fb.access_flags = RETRO_MEMORY_ACCESS_WRITE; + 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; + vout_buf_ptr = (uint16_t *)fb.data; else vout_buf_ptr = vout_buf; } @@ -240,7 +259,8 @@ static void convert(void *buf, size_t bytes) { unsigned int i, v, *p = buf; - for (i = 0; i < bytes / 4; i++) { + for (i = 0; i < bytes / 4; i++) + { v = p[i]; p[i] = (v & 0x001f001f) | ((v >> 1) & 0x7fe07fe0); } @@ -254,7 +274,8 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h) int dstride = vout_width, h1 = h; int doffs; - if (vram == NULL) { + if (vram == NULL) + { // blanking memset(vout_buf_ptr, 0, dstride * h * 2); goto out; @@ -262,7 +283,8 @@ static void vout_flip(const void *vram, int stride, int bgr24, int w, int h) doffs = (vout_height - h) * dstride; doffs += (dstride - w) / 2 & ~1; - if (doffs != vout_doffs_old) { + if (doffs != vout_doffs_old) + { // clear borders memset(vout_buf_ptr, 0, dstride * h * 2); vout_doffs_old = doffs; @@ -296,29 +318,29 @@ out: #ifdef _3DS typedef struct { - void* buffer; + void *buffer; uint32_t target_map; size_t size; enum psxMapTag tag; -}psx_map_t; +} psx_map_t; psx_map_t custom_psx_maps[] = { - {NULL, 0x13000000, 0x210000, MAP_TAG_RAM}, // 0x80000000 - {NULL, 0x12800000, 0x010000, MAP_TAG_OTHER}, // 0x1f800000 - {NULL, 0x12c00000, 0x080000, MAP_TAG_OTHER}, // 0x1fc00000 - {NULL, 0x11000000, 0x800000, MAP_TAG_LUTS}, // 0x08000000 - {NULL, 0x12000000, 0x200000, MAP_TAG_VRAM}, // 0x00000000 + { NULL, 0x13000000, 0x210000, MAP_TAG_RAM }, // 0x80000000 + { NULL, 0x12800000, 0x010000, MAP_TAG_OTHER }, // 0x1f800000 + { NULL, 0x12c00000, 0x080000, MAP_TAG_OTHER }, // 0x1fc00000 + { NULL, 0x11000000, 0x800000, MAP_TAG_LUTS }, // 0x08000000 + { NULL, 0x12000000, 0x200000, MAP_TAG_VRAM }, // 0x00000000 }; -void* pl_3ds_mmap(unsigned long addr, size_t size, int is_fixed, - enum psxMapTag tag) +void *pl_3ds_mmap(unsigned long addr, size_t size, int is_fixed, + enum psxMapTag tag) { (void)is_fixed; (void)addr; if (__ctr_svchax) { - psx_map_t* custom_map = custom_psx_maps; + psx_map_t *custom_map = custom_psx_maps; for (; custom_map->size; custom_map++) { @@ -329,13 +351,13 @@ void* pl_3ds_mmap(unsigned long addr, size_t size, int is_fixed, custom_map->buffer = malloc(size + 0x1000); ptr_aligned = (((u32)custom_map->buffer) + 0xFFF) & ~0xFFF; - if(svcControlMemory(&tmp, (void*)custom_map->target_map, (void*)ptr_aligned, size, MEMOP_MAP, 0x3) < 0) + if (svcControlMemory(&tmp, (void *)custom_map->target_map, (void *)ptr_aligned, size, MEMOP_MAP, 0x3) < 0) { SysPrintf("could not map memory @0x%08X\n", custom_map->target_map); exit(1); } - return (void*)custom_map->target_map; + return (void *)custom_map->target_map; } } } @@ -349,7 +371,7 @@ void pl_3ds_munmap(void *ptr, size_t size, enum psxMapTag tag) if (__ctr_svchax) { - psx_map_t* custom_map = custom_psx_maps; + psx_map_t *custom_map = custom_psx_maps; for (; custom_map->size; custom_map++) { @@ -359,7 +381,7 @@ void pl_3ds_munmap(void *ptr, size_t size, enum psxMapTag tag) ptr_aligned = (((u32)custom_map->buffer) + 0xFFF) & ~0xFFF; - svcControlMemory(&tmp, (void*)custom_map->target_map, (void*)ptr_aligned, size, MEMOP_UNMAP, 0x3); + svcControlMemory(&tmp, (void *)custom_map->target_map, (void *)ptr_aligned, size, MEMOP_UNMAP, 0x3); free(custom_map->buffer); custom_map->buffer = NULL; @@ -375,34 +397,35 @@ void pl_3ds_munmap(void *ptr, size_t size, enum psxMapTag tag) #ifdef VITA typedef struct { - void* buffer; + void *buffer; uint32_t target_map; size_t size; enum psxMapTag tag; -}psx_map_t; +} psx_map_t; -void* addr = NULL; +void *addr = NULL; psx_map_t custom_psx_maps[] = { - {NULL, NULL, 0x210000, MAP_TAG_RAM}, // 0x80000000 - {NULL, NULL, 0x010000, MAP_TAG_OTHER}, // 0x1f800000 - {NULL, NULL, 0x080000, MAP_TAG_OTHER}, // 0x1fc00000 - {NULL, NULL, 0x800000, MAP_TAG_LUTS}, // 0x08000000 - {NULL, NULL, 0x200000, MAP_TAG_VRAM}, // 0x00000000 + { NULL, NULL, 0x210000, MAP_TAG_RAM }, // 0x80000000 + { NULL, NULL, 0x010000, MAP_TAG_OTHER }, // 0x1f800000 + { NULL, NULL, 0x080000, MAP_TAG_OTHER }, // 0x1fc00000 + { NULL, NULL, 0x800000, MAP_TAG_LUTS }, // 0x08000000 + { NULL, NULL, 0x200000, MAP_TAG_VRAM }, // 0x00000000 }; -int init_vita_mmap(){ +int init_vita_mmap() +{ int n; - void * tmpaddr; - addr = malloc(64*1024*1024); - if(addr==NULL) + void *tmpaddr; + addr = malloc(64 * 1024 * 1024); + if (addr == NULL) return -1; - tmpaddr = ((u32)(addr+0xFFFFFF))&~0xFFFFFF; - custom_psx_maps[0].buffer=tmpaddr+0x2000000; - custom_psx_maps[1].buffer=tmpaddr+0x1800000; - custom_psx_maps[2].buffer=tmpaddr+0x1c00000; - custom_psx_maps[3].buffer=tmpaddr+0x0000000; - custom_psx_maps[4].buffer=tmpaddr+0x1000000; + tmpaddr = ((u32)(addr + 0xFFFFFF)) & ~0xFFFFFF; + custom_psx_maps[0].buffer = tmpaddr + 0x2000000; + custom_psx_maps[1].buffer = tmpaddr + 0x1800000; + custom_psx_maps[2].buffer = tmpaddr + 0x1c00000; + custom_psx_maps[3].buffer = tmpaddr + 0x0000000; + custom_psx_maps[4].buffer = tmpaddr + 0x1000000; #if 0 for(n = 0; n < 5; n++){ sceClibPrintf("addr reserved %x\n",custom_psx_maps[n].buffer); @@ -411,18 +434,18 @@ int init_vita_mmap(){ return 0; } -void deinit_vita_mmap(){ +void deinit_vita_mmap() +{ free(addr); } -void* pl_vita_mmap(unsigned long addr, size_t size, int is_fixed, - enum psxMapTag tag) +void *pl_vita_mmap(unsigned long addr, size_t size, int is_fixed, + enum psxMapTag tag) { (void)is_fixed; (void)addr; - - psx_map_t* custom_map = custom_psx_maps; + psx_map_t *custom_map = custom_psx_maps; for (; custom_map->size; custom_map++) { @@ -439,7 +462,7 @@ void pl_vita_munmap(void *ptr, size_t size, enum psxMapTag tag) { (void)tag; - psx_map_t* custom_map = custom_psx_maps; + psx_map_t *custom_map = custom_psx_maps; for (; custom_map->size; custom_map++) { @@ -464,15 +487,15 @@ static void pl_munmap(void *ptr, unsigned int size) } struct rearmed_cbs pl_rearmed_cbs = { - .pl_vout_open = vout_open, + .pl_vout_open = vout_open, .pl_vout_set_mode = vout_set_mode, - .pl_vout_flip = vout_flip, - .pl_vout_close = vout_close, - .mmap = pl_mmap, - .munmap = pl_munmap, + .pl_vout_flip = vout_flip, + .pl_vout_close = vout_close, + .mmap = pl_mmap, + .munmap = pl_munmap, /* from psxcounters */ - .gpu_hcnt = &hSyncCount, - .gpu_frame_count = &frame_counter, + .gpu_hcnt = &hSyncCount, + .gpu_frame_count = &frame_counter, }; void pl_frame_limit(void) @@ -511,22 +534,263 @@ static void snd_feed(void *buf, int bytes) void out_register_libretro(struct out_driver *drv) { - drv->name = "libretro"; - drv->init = snd_init; + drv->name = "libretro"; + drv->init = snd_init; drv->finish = snd_finish; - drv->busy = snd_busy; - drv->feed = snd_feed; + drv->busy = snd_busy; + drv->feed = snd_feed; } +#define RETRO_DEVICE_PSE_STANDARD RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_JOYPAD, 0) +#define RETRO_DEVICE_PSE_ANALOG RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_ANALOG, 0) +#define RETRO_DEVICE_PSE_DUALSHOCK RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_ANALOG, 1) +#define RETRO_DEVICE_PSE_NEGCON RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_ANALOG, 2) +#define RETRO_DEVICE_PSE_GUNCON RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_LIGHTGUN, 0) +#define RETRO_DEVICE_PSE_MOUSE RETRO_DEVICE_SUBCLASS(RETRO_DEVICE_MOUSE, 0) + +static char *get_pse_pad_label[] = { + "none", "mouse", "negcon", "konami gun", "standard", "analog", "guncon", "dualshock" +}; + +static const struct retro_controller_description pads[7] = +{ + { "standard", RETRO_DEVICE_JOYPAD }, + { "analog", RETRO_DEVICE_PSE_ANALOG }, + { "dualshock", RETRO_DEVICE_PSE_DUALSHOCK }, + { "negcon", RETRO_DEVICE_PSE_NEGCON }, + { "guncon", RETRO_DEVICE_PSE_GUNCON }, + { "mouse", RETRO_DEVICE_PSE_MOUSE }, + { NULL, 0 }, +}; + +static const struct retro_controller_info ports[9] = +{ + { pads, 7 }, + { pads, 7 }, + { pads, 7 }, + { pads, 7 }, + { pads, 7 }, + { pads, 7 }, + { pads, 7 }, + { pads, 7 }, + { NULL, 0 }, +}; + /* libretro */ + +static bool update_option_visibility(void) +{ + struct retro_variable var = {0}; + struct retro_core_option_display option_display = {0}; + bool updated = false; + unsigned i; + + /* If frontend supports core option categories + * then show/hide core option entries are ignored + * and no options should be hidden */ + if (libretro_supports_option_categories) + return false; + + var.key = "pcsx_rearmed_show_input_settings"; + var.value = NULL; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + bool show_input_settings_prev = + show_input_settings; + + show_input_settings = true; + if (strcmp(var.value, "disabled") == 0) + show_input_settings = false; + + if (show_input_settings != + show_input_settings_prev) + { + char input_option[][50] = { + "pcsx_rearmed_analog_axis_modifier", + "pcsx_rearmed_vibration", + "pcsx_rearmed_multitap", + "pcsx_rearmed_negcon_deadzone", + "pcsx_rearmed_negcon_response", + "pcsx_rearmed_input_sensitivity", + "pcsx_rearmed_gunconadjustx", + "pcsx_rearmed_gunconadjusty", + "pcsx_rearmed_gunconadjustratiox", + "pcsx_rearmed_gunconadjustratioy" + }; + + option_display.visible = show_input_settings; + + for (i = 0; + i < (sizeof(input_option) / + sizeof(input_option[0])); + i++) + { + option_display.key = input_option[i]; + environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, + &option_display); + } + + updated = true; + } + } +#ifdef GPU_PEOPS + var.key = "pcsx_rearmed_show_gpu_peops_settings"; + var.value = NULL; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + bool show_advanced_gpu_peops_settings_prev = + show_advanced_gpu_peops_settings; + + show_advanced_gpu_peops_settings = true; + if (strcmp(var.value, "disabled") == 0) + show_advanced_gpu_peops_settings = false; + + if (show_advanced_gpu_peops_settings != + show_advanced_gpu_peops_settings_prev) + { + unsigned i; + struct retro_core_option_display option_display; + char gpu_peops_option[][45] = { + "pcsx_rearmed_gpu_peops_odd_even_bit", + "pcsx_rearmed_gpu_peops_expand_screen_width", + "pcsx_rearmed_gpu_peops_ignore_brightness", + "pcsx_rearmed_gpu_peops_disable_coord_check", + "pcsx_rearmed_gpu_peops_lazy_screen_update", + "pcsx_rearmed_gpu_peops_repeated_triangles", + "pcsx_rearmed_gpu_peops_quads_with_triangles", + "pcsx_rearmed_gpu_peops_fake_busy_state" + }; + + option_display.visible = show_advanced_gpu_peops_settings; + + for (i = 0; + i < (sizeof(gpu_peops_option) / + sizeof(gpu_peops_option[0])); + i++) + { + option_display.key = gpu_peops_option[i]; + environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, + &option_display); + } + + updated = true; + } + } +#endif +#ifdef GPU_UNAI + var.key = "pcsx_rearmed_show_gpu_unai_settings"; + var.value = NULL; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + bool show_advanced_gpu_unai_settings_prev = + show_advanced_gpu_unai_settings; + + show_advanced_gpu_unai_settings = true; + if (strcmp(var.value, "disabled") == 0) + show_advanced_gpu_unai_settings = false; + + if (show_advanced_gpu_unai_settings != + show_advanced_gpu_unai_settings_prev) + { + unsigned i; + struct retro_core_option_display option_display; + char gpu_unai_option[][40] = { + "pcsx_rearmed_gpu_unai_blending", + "pcsx_rearmed_gpu_unai_lighting", + "pcsx_rearmed_gpu_unai_fast_lighting", + "pcsx_rearmed_gpu_unai_scale_hires", + }; + + option_display.visible = show_advanced_gpu_unai_settings; + + for (i = 0; + i < (sizeof(gpu_unai_option) / + sizeof(gpu_unai_option[0])); + i++) + { + option_display.key = gpu_unai_option[i]; + environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, + &option_display); + } + + updated = true; + } + } +#endif + return updated; +} + void retro_set_environment(retro_environment_t cb) { + bool option_categories = false; +#ifdef USE_LIBRETRO_VFS + struct retro_vfs_interface_info vfs_iface_info; +#endif + environ_cb = cb; if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging)) log_cb = logging.log; - libretro_set_core_options(environ_cb); + environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); + + /* Set core options + * An annoyance: retro_set_environment() can be called + * multiple times, and depending upon the current frontend + * state various environment callbacks may be disabled. + * This means the reported 'categories_supported' status + * may change on subsequent iterations. We therefore have + * to record whether 'categories_supported' is true on any + * iteration, and latch the result */ + libretro_set_core_options(environ_cb, &option_categories); + libretro_supports_option_categories |= option_categories; + + /* If frontend supports core option categories, + * any show/hide core option entries are unused + * and should be hidden */ + if (libretro_supports_option_categories) + { + struct retro_core_option_display option_display; + option_display.visible = false; + + option_display.key = "pcsx_rearmed_show_input_settings"; + environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, + &option_display); + +#ifdef GPU_PEOPS + option_display.key = "pcsx_rearmed_show_gpu_peops_settings"; + environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, + &option_display); +#endif +#ifdef GPU_UNAI + option_display.key = "pcsx_rearmed_show_gpu_unai_settings"; + environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, + &option_display); +#endif + } + /* If frontend does not support core option + * categories, core options may be shown/hidden + * at runtime. In this case, register 'update + * display' callback, so frontend can update + * core options menu without calling retro_run() */ + else + { + struct retro_core_options_update_display_callback update_display_cb; + update_display_cb.callback = update_option_visibility; + + environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_UPDATE_DISPLAY_CALLBACK, + &update_display_cb); + } + +#ifdef USE_LIBRETRO_VFS + vfs_iface_info.required_interface_version = 1; + vfs_iface_info.iface = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VFS_INTERFACE, &vfs_iface_info)) + filestream_vfs_init(&vfs_iface_info); +#endif } void retro_set_video_refresh(retro_video_refresh_t cb) { video_cb = cb; } @@ -540,164 +804,62 @@ unsigned retro_api_version(void) return RETRO_API_VERSION; } -static int controller_port_variable(unsigned port, struct retro_variable *var) -{ - if (port >= PORTS_NUMBER) - return 0; - - if (!environ_cb) - return 0; - - var->value = NULL; - switch (port) { - case 0: - var->key = "pcsx_rearmed_pad1type"; - break; - case 1: - var->key = "pcsx_rearmed_pad2type"; - break; - case 2: - var->key = "pcsx_rearmed_pad3type"; - break; - case 3: - var->key = "pcsx_rearmed_pad4type"; - break; - case 4: - var->key = "pcsx_rearmed_pad5type"; - break; - case 5: - var->key = "pcsx_rearmed_pad6type"; - break; - case 6: - var->key = "pcsx_rearmed_pad7type"; - break; - case 7: - var->key = "pcsx_rearmed_pad8type"; - break; - } - - return environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, var) && var->value; -} - -static void update_controller_port_variable(unsigned port) +static void update_multitap(void) { - if (port >= PORTS_NUMBER) - return; + struct retro_variable var = { 0 }; - struct retro_variable var; + multitap1 = 0; + multitap2 = 0; - if (controller_port_variable(port, &var)) + var.value = NULL; + var.key = "pcsx_rearmed_multitap"; + if (environ_cb && (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)) { - if (strcmp(var.value, "standard") == 0) - in_type[port] = PSE_PAD_TYPE_STANDARD; - else if (strcmp(var.value, "analog") == 0) - in_type[port] = PSE_PAD_TYPE_ANALOGJOY; - else if (strcmp(var.value, "dualshock") == 0) - in_type[port] = PSE_PAD_TYPE_ANALOGPAD; - else if (strcmp(var.value, "negcon") == 0) - in_type[port] = PSE_PAD_TYPE_NEGCON; - else if (strcmp(var.value, "guncon") == 0) - in_type[port] = PSE_PAD_TYPE_GUNCON; - else if (strcmp(var.value, "none") == 0) - in_type[port] = PSE_PAD_TYPE_NONE; - // else 'default' case, do nothing + if (strcmp(var.value, "port 1") == 0) + multitap1 = 1; + else if (strcmp(var.value, "port 2") == 0) + multitap2 = 1; + else if (strcmp(var.value, "ports 1 and 2") == 0) + { + multitap1 = 1; + multitap2 = 1; + } } } -static void update_controller_port_device(unsigned port, unsigned device) +void retro_set_controller_port_device(unsigned port, unsigned device) { if (port >= PORTS_NUMBER) return; - struct retro_variable var; - - if (!controller_port_variable(port, &var)) - return; - - if (strcmp(var.value, "default") != 0) - return; - switch (device) { case RETRO_DEVICE_JOYPAD: + case RETRO_DEVICE_PSE_STANDARD: in_type[port] = PSE_PAD_TYPE_STANDARD; break; - case RETRO_DEVICE_ANALOG: + case RETRO_DEVICE_PSE_ANALOG: + in_type[port] = PSE_PAD_TYPE_ANALOGJOY; + break; + case RETRO_DEVICE_PSE_DUALSHOCK: in_type[port] = PSE_PAD_TYPE_ANALOGPAD; break; - case RETRO_DEVICE_MOUSE: + case RETRO_DEVICE_PSE_MOUSE: in_type[port] = PSE_PAD_TYPE_MOUSE; break; - case RETRO_DEVICE_LIGHTGUN: - in_type[port] = PSE_PAD_TYPE_GUN; + case RETRO_DEVICE_PSE_NEGCON: + in_type[port] = PSE_PAD_TYPE_NEGCON; + break; + case RETRO_DEVICE_PSE_GUNCON: + in_type[port] = PSE_PAD_TYPE_GUNCON; break; case RETRO_DEVICE_NONE: default: in_type[port] = PSE_PAD_TYPE_NONE; + break; } -} - -static void update_multitap() -{ - struct retro_variable var; - int auto_case, port; - - var.value = NULL; - var.key = "pcsx_rearmed_multitap1"; - auto_case = 0; - if (environ_cb && (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)) - { - if (strcmp(var.value, "enabled") == 0) - multitap1 = 1; - else if (strcmp(var.value, "disabled") == 0) - multitap1 = 0; - else // 'auto' case - auto_case = 1; - } - else - auto_case = 1; - - if (auto_case) - { - // If a gamepad is plugged after port 2, we need a first multitap. - multitap1 = 0; - for (port = 2; port < PORTS_NUMBER; port++) - multitap1 |= in_type[port] != PSE_PAD_TYPE_NONE; - } - - var.value = NULL; - var.key = "pcsx_rearmed_multitap2"; - auto_case = 0; - if (environ_cb && (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)) - { - if (strcmp(var.value, "enabled") == 0) - multitap2 = 1; - else if (strcmp(var.value, "disabled") == 0) - multitap2 = 0; - else // 'auto' case - auto_case = 1; - } - else - auto_case = 1; - - if (auto_case) - { - // If a gamepad is plugged after port 4, we need a second multitap. - multitap2 = 0; - for (port = 4; port < PORTS_NUMBER; port++) - multitap2 |= in_type[port] != PSE_PAD_TYPE_NONE; - } -} - -void retro_set_controller_port_device(unsigned port, unsigned device) -{ - SysPrintf("port %u device %u",port,device); - - if (port >= PORTS_NUMBER) - return; - update_controller_port_device(port, device); - update_multitap(); + SysPrintf("port: %u device: %s\n", port + 1, get_pse_pad_label[in_type[port]]); } void retro_get_system_info(struct retro_system_info *info) @@ -706,25 +868,25 @@ void retro_get_system_info(struct retro_system_info *info) #define GIT_VERSION "" #endif memset(info, 0, sizeof(*info)); - info->library_name = "PCSX-ReARMed"; - info->library_version = "r22" GIT_VERSION; + info->library_name = "PCSX-ReARMed"; + info->library_version = "r23l" GIT_VERSION; info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|chd"; - info->need_fullpath = true; + info->need_fullpath = true; } void retro_get_system_av_info(struct retro_system_av_info *info) { - unsigned geom_height = vout_height > 0 ? vout_height : 240; - unsigned geom_width = vout_width > 0 ? vout_width : 320; + unsigned geom_height = vout_height > 0 ? vout_height : 240; + unsigned geom_width = vout_width > 0 ? vout_width : 320; memset(info, 0, sizeof(*info)); - info->timing.fps = is_pal_mode ? 50 : 60; - info->timing.sample_rate = 44100; - info->geometry.base_width = geom_width; - info->geometry.base_height = geom_height; - info->geometry.max_width = VOUT_MAX_WIDTH; - info->geometry.max_height = VOUT_MAX_HEIGHT; - info->geometry.aspect_ratio = 4.0 / 3.0; + info->timing.fps = is_pal_mode ? 50.0 : 60.0; + info->timing.sample_rate = 44100.0; + info->geometry.base_width = geom_width; + info->geometry.base_height = geom_height; + info->geometry.max_width = VOUT_MAX_WIDTH; + info->geometry.max_height = VOUT_MAX_HEIGHT; + info->geometry.aspect_ratio = 4.0 / 3.0; } /* savestates */ @@ -735,7 +897,8 @@ size_t retro_serialize_size(void) return 0x440000; } -struct save_fp { +struct save_fp +{ char *buf; size_t pos; int is_write; @@ -787,7 +950,8 @@ static long save_seek(void *file, long offs, int whence) if (fp == NULL) return -1; - switch (whence) { + switch (whence) + { case SEEK_CUR: fp->pos += offs; return fp->pos; @@ -842,14 +1006,19 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code) 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'; + int cursor = 0; + int nonhexdec = 0; + while (buf[cursor]) + { + if (!(ISHEXDEC)) + { + if (++nonhexdec % 2) + { + buf[cursor] = ' '; + } + else + { + buf[cursor] = '\n'; } } cursor++; @@ -874,7 +1043,7 @@ void retro_cheat_set(unsigned index, bool enabled, const char *code) #endif #ifndef PATH_MAX -#define PATH_MAX 4096 +#define PATH_MAX 4096 #endif /* multidisk support */ @@ -883,7 +1052,8 @@ static char disk_initial_path[PATH_MAX]; static bool disk_ejected; static unsigned int disk_current_index; static unsigned int disk_count; -static struct disks_state { +static struct disks_state +{ char *fname; char *flabel; int internal_index; // for multidisk eboots @@ -919,12 +1089,15 @@ static void disk_init(void) disk_current_index = 0; disk_count = 0; - for (i = 0; i < sizeof(disks) / sizeof(disks[0]); i++) { - if (disks[i].fname != NULL) { + for (i = 0; i < sizeof(disks) / sizeof(disks[0]); i++) + { + if (disks[i].fname != NULL) + { free(disks[i].fname); disks[i].fname = NULL; } - if (disks[i].flabel != NULL) { + if (disks[i].flabel != NULL) + { free(disks[i].flabel); disks[i].flabel = NULL; } @@ -961,7 +1134,8 @@ static bool disk_set_image_index(unsigned int index) CdromId[0] = '\0'; CdromLabel[0] = '\0'; - if (disks[index].fname == NULL) { + if (disks[index].fname == NULL) + { SysPrintf("missing disk #%u\n", index); CDR_shutdown(); @@ -972,20 +1146,23 @@ static bool disk_set_image_index(unsigned int index) } SysPrintf("switching to disk %u: \"%s\" #%d\n", index, - disks[index].fname, disks[index].internal_index); + disks[index].fname, disks[index].internal_index); cdrIsoMultidiskSelect = disks[index].internal_index; set_cd_image(disks[index].fname); - if (ReloadCdromPlugin() < 0) { + if (ReloadCdromPlugin() < 0) + { SysPrintf("failed to load cdr plugin\n"); return false; } - if (CDR_open() < 0) { + if (CDR_open() < 0) + { SysPrintf("failed to open cdr plugin\n"); return false; } - if (!disk_ejected) { + if (!disk_ejected) + { SetCdOpenCaseTime(time(NULL) + 2); LidInterrupt(); } @@ -1000,7 +1177,7 @@ static unsigned int disk_get_num_images(void) } static bool disk_replace_image_index(unsigned index, - const struct retro_game_info *info) + const struct retro_game_info *info) { char *old_fname = NULL; char *old_flabel = NULL; @@ -1016,7 +1193,8 @@ static bool disk_replace_image_index(unsigned index, disks[index].flabel = NULL; disks[index].internal_index = 0; - if (info != NULL) { + if (info != NULL) + { char disk_label[PATH_MAX]; disk_label[0] = '\0'; @@ -1106,26 +1284,26 @@ static bool disk_get_image_label(unsigned index, char *label, size_t len) } static struct retro_disk_control_callback disk_control = { - .set_eject_state = disk_set_eject_state, - .get_eject_state = disk_get_eject_state, - .get_image_index = disk_get_image_index, - .set_image_index = disk_set_image_index, - .get_num_images = disk_get_num_images, + .set_eject_state = disk_set_eject_state, + .get_eject_state = disk_get_eject_state, + .get_image_index = disk_get_image_index, + .set_image_index = disk_set_image_index, + .get_num_images = disk_get_num_images, .replace_image_index = disk_replace_image_index, - .add_image_index = disk_add_image_index, + .add_image_index = disk_add_image_index, }; static struct retro_disk_control_ext_callback disk_control_ext = { - .set_eject_state = disk_set_eject_state, - .get_eject_state = disk_get_eject_state, - .get_image_index = disk_get_image_index, - .set_image_index = disk_set_image_index, - .get_num_images = disk_get_num_images, + .set_eject_state = disk_set_eject_state, + .get_eject_state = disk_get_eject_state, + .get_image_index = disk_get_image_index, + .set_image_index = disk_set_image_index, + .get_num_images = disk_get_num_images, .replace_image_index = disk_replace_image_index, - .add_image_index = disk_add_image_index, - .set_initial_image = disk_set_initial_image, - .get_image_path = disk_get_image_path, - .get_image_label = disk_get_image_label, + .add_image_index = disk_add_image_index, + .set_initial_image = disk_set_initial_image, + .get_image_path = disk_get_image_path, + .get_image_label = disk_get_image_label, }; static char base_dir[1024]; @@ -1134,11 +1312,12 @@ static bool read_m3u(const char *file) { char line[1024]; char name[PATH_MAX]; - FILE *f = fopen(file, "r"); - if (!f) + FILE *fp = fopen(file, "r"); + if (!fp) return false; - while (fgets(line, sizeof(line), f) && disk_count < sizeof(disks) / sizeof(disks[0])) { + while (fgets(line, sizeof(line), fp) && disk_count < sizeof(disks) / sizeof(disks[0])) + { if (line[0] == '#') continue; char *carrige_return = strchr(line, '\r'); @@ -1163,7 +1342,7 @@ static bool read_m3u(const char *file) } } - fclose(f); + fclose(fp); return (disk_count != 0); } @@ -1193,16 +1372,19 @@ static void extract_directory(char *buf, const char *path, size_t size) * Find the first occurrence of find in s, ignore case. */ char * -strcasestr(const char *s, const char*find) +strcasestr(const char *s, const char *find) { char c, sc; size_t len; - if ((c = *find++) != 0) { + if ((c = *find++) != 0) + { c = tolower((unsigned char)c); len = strlen(find); - do { - do { + do + { + do + { if ((sc = *s++) == 0) return (NULL); } while ((char)tolower((unsigned char)sc) != c); @@ -1215,9 +1397,9 @@ strcasestr(const char *s, const char*find) static void set_retro_memmap(void) { +#ifndef NDEBUG struct retro_memory_map retromap = { 0 }; - struct retro_memory_descriptor mmap = - { + struct retro_memory_descriptor mmap = { 0, psxM, 0, 0, 0, 0, 0x200000 }; @@ -1225,6 +1407,62 @@ static void set_retro_memmap(void) retromap.num_descriptors = 1; environ_cb(RETRO_ENVIRONMENT_SET_MEMORY_MAPS, &retromap); +#endif +} + +static void retro_audio_buff_status_cb( + bool active, unsigned occupancy, bool underrun_likely) +{ + retro_audio_buff_active = active; + retro_audio_buff_occupancy = occupancy; + retro_audio_buff_underrun = underrun_likely; +} + +static void retro_set_audio_buff_status_cb(void) +{ + if (frameskip_type == FRAMESKIP_NONE) + { + environ_cb(RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK, NULL); + retro_audio_latency = 0; + } + else + { + bool calculate_audio_latency = true; + + if (frameskip_type == FRAMESKIP_FIXED_INTERVAL) + environ_cb(RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK, NULL); + else + { + struct retro_audio_buffer_status_callback buf_status_cb; + buf_status_cb.callback = retro_audio_buff_status_cb; + if (!environ_cb(RETRO_ENVIRONMENT_SET_AUDIO_BUFFER_STATUS_CALLBACK, + &buf_status_cb)) + { + retro_audio_buff_active = false; + retro_audio_buff_occupancy = 0; + retro_audio_buff_underrun = false; + retro_audio_latency = 0; + calculate_audio_latency = false; + } + } + + if (calculate_audio_latency) + { + /* Frameskip is enabled - increase frontend + * audio latency to minimise potential + * buffer underruns */ + uint32_t frame_time_usec = 1000000.0 / (is_pal_mode ? 50.0 : 60.0); + + /* Set latency to 6x current frame time... */ + retro_audio_latency = (unsigned)(6 * frame_time_usec / 1000); + + /* ...then round up to nearest multiple of 32 */ + retro_audio_latency = (retro_audio_latency + 0x1F) & ~0x1F; + } + } + + update_audio_latency = true; + frameskip_counter = 0; } static void update_variables(bool in_flight); @@ -1235,28 +1473,32 @@ bool retro_load_game(const struct retro_game_info *info) bool is_m3u = (strcasestr(info->path, ".m3u") != NULL); struct retro_input_descriptor desc[] = { -#define JOYP(port) \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "Cross" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "Circle" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "Triangle" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "Square" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "L1" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2, "L2" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3, "L3" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R1" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "R2" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "R3" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, \ - { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, \ - { port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X" }, \ - { port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y" }, \ +#define JOYP(port) \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT, "D-Pad Left" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP, "D-Pad Up" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN, "D-Pad Down" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT, "D-Pad Right" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_B, "Cross" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A, "Circle" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X, "Triangle" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_Y, "Square" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L, "L1" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L2, "L2" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_L3, "L3" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R, "R1" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "R2" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "R3" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" }, \ + { port, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" }, \ + { port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X" }, \ + { port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y" }, \ { port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X, "Right Analog X" }, \ - { port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y, "Right Analog Y" }, - + { port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y, "Right Analog Y" }, \ + { port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_TRIGGER, "Gun Trigger" }, \ + { port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_RELOAD, "Gun Reload" }, \ + { port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_AUX_A, "Gun Aux A" }, \ + { port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_AUX_B, "Gun Aux B" }, + JOYP(0) JOYP(1) JOYP(2) @@ -1275,19 +1517,22 @@ bool retro_load_game(const struct retro_game_info *info) #ifdef FRONTEND_SUPPORTS_RGB565 enum retro_pixel_format fmt = RETRO_PIXEL_FORMAT_RGB565; - if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) { + if (environ_cb(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &fmt)) + { SysPrintf("RGB565 supported, using it\n"); } #endif - if (info == NULL || info->path == NULL) { + if (info == NULL || info->path == NULL) + { SysPrintf("info->path required\n"); return false; } update_variables(false); - if (plugins_opened) { + if (plugins_opened) + { ClosePlugins(); plugins_opened = 0; } @@ -1296,12 +1541,16 @@ bool retro_load_game(const struct retro_game_info *info) extract_directory(base_dir, info->path, sizeof(base_dir)); - if (is_m3u) { - if (!read_m3u(info->path)) { + if (is_m3u) + { + if (!read_m3u(info->path)) + { log_cb(RETRO_LOG_INFO, "failed to read m3u file\n"); return false; } - } else { + } + else + { char disk_label[PATH_MAX]; disk_label[0] = '\0'; @@ -1314,9 +1563,8 @@ bool retro_load_game(const struct retro_game_info *info) /* If this is an M3U file, attempt to set the * initial disk image */ - if (is_m3u && - (disk_initial_index > 0) && - (disk_initial_index < disk_count)) { + if (is_m3u && (disk_initial_index > 0) && (disk_initial_index < disk_count)) + { const char *fname = disks[disk_initial_index].fname; if (fname && (*fname != '\0')) @@ -1328,7 +1576,8 @@ bool retro_load_game(const struct retro_game_info *info) disk_current_index = cd_index; /* have to reload after set_cd_image for correct cdr plugin */ - if (LoadPlugins() == -1) { + if (LoadPlugins() == -1) + { log_cb(RETRO_LOG_INFO, "failed to load plugins\n"); return false; } @@ -1336,7 +1585,8 @@ bool retro_load_game(const struct retro_game_info *info) plugins_opened = 1; NetOpened = 0; - if (OpenPlugins() == -1) { + if (OpenPlugins() == -1) + { log_cb(RETRO_LOG_INFO, "failed to open plugins\n"); return false; } @@ -1345,7 +1595,8 @@ bool retro_load_game(const struct retro_game_info *info) * > Cannot do this until after OpenPlugins() is * called (since this sets the value of * cdrIsoMultidiskCount) */ - if (!is_m3u && (cdrIsoMultidiskCount > 1)) { + if (!is_m3u && (cdrIsoMultidiskCount > 1)) + { disk_count = cdrIsoMultidiskCount < 8 ? cdrIsoMultidiskCount : 8; /* Small annoyance: We need to change the label @@ -1358,15 +1609,14 @@ bool retro_load_game(const struct retro_game_info *info) free(disks[0].flabel); disks[0].flabel = NULL; - for (i = 0; i < sizeof(disks) / sizeof(disks[0]) && i < cdrIsoMultidiskCount; i++) { - char disk_name[PATH_MAX]; - char disk_label[PATH_MAX]; - disk_name[0] = '\0'; - disk_label[0] = '\0'; + for (i = 0; i < sizeof(disks) / sizeof(disks[0]) && i < cdrIsoMultidiskCount; i++) + { + char disk_name[PATH_MAX - 16] = { 0 }; + char disk_label[PATH_MAX] = { 0 }; disks[i].fname = strdup(info->path); - get_disk_label(disk_name, info->path, PATH_MAX); + get_disk_label(disk_name, info->path, sizeof(disk_name)); snprintf(disk_label, sizeof(disk_label), "%s #%u", disk_name, (unsigned)i + 1); disks[i].flabel = strdup(disk_label); @@ -1376,8 +1626,8 @@ bool retro_load_game(const struct retro_game_info *info) /* This is not an M3U file, so initial disk * image has not yet been set - attempt to * do so now */ - if ((disk_initial_index > 0) && - (disk_initial_index < disk_count)) { + if ((disk_initial_index > 0) && (disk_initial_index < disk_count)) + { const char *fname = disks[disk_initial_index].fname; if (fname && (*fname != '\0')) @@ -1385,42 +1635,52 @@ bool retro_load_game(const struct retro_game_info *info) cd_index = disk_initial_index; } - if (cd_index > 0) { - CdromId[0] = '\0'; + if (cd_index > 0) + { + CdromId[0] = '\0'; CdromLabel[0] = '\0'; cdrIsoMultidiskSelect = disks[cd_index].internal_index; - disk_current_index = cd_index; + disk_current_index = cd_index; set_cd_image(disks[cd_index].fname); - if (ReloadCdromPlugin() < 0) { + if (ReloadCdromPlugin() < 0) + { log_cb(RETRO_LOG_INFO, "failed to reload cdr plugins\n"); return false; } - if (CDR_open() < 0) { + if (CDR_open() < 0) + { log_cb(RETRO_LOG_INFO, "failed to open cdr plugin\n"); return false; } } } + /* set ports to use "standard controller" initially */ + for (i = 0; i < 8; ++i) + in_type[i] = PSE_PAD_TYPE_STANDARD; + plugin_call_rearmed_cbs(); - dfinput_activate(); + /* dfinput_activate(); */ - if (CheckCdrom() == -1) { + if (CheckCdrom() == -1) + { log_cb(RETRO_LOG_INFO, "unsupported/invalid CD image: %s\n", info->path); return false; } SysReset(); - if (LoadCdrom() == -1) { + if (LoadCdrom() == -1) + { log_cb(RETRO_LOG_INFO, "could not load CD\n"); return false; } emu_on_new_cd(0); set_retro_memmap(); + retro_set_audio_buff_status_cb(); return true; } @@ -1458,22 +1718,22 @@ void retro_reset(void) } static const unsigned short retro_psx_map[] = { - [RETRO_DEVICE_ID_JOYPAD_B] = 1 << DKEY_CROSS, - [RETRO_DEVICE_ID_JOYPAD_Y] = 1 << DKEY_SQUARE, - [RETRO_DEVICE_ID_JOYPAD_SELECT] = 1 << DKEY_SELECT, - [RETRO_DEVICE_ID_JOYPAD_START] = 1 << DKEY_START, - [RETRO_DEVICE_ID_JOYPAD_UP] = 1 << DKEY_UP, - [RETRO_DEVICE_ID_JOYPAD_DOWN] = 1 << DKEY_DOWN, - [RETRO_DEVICE_ID_JOYPAD_LEFT] = 1 << DKEY_LEFT, - [RETRO_DEVICE_ID_JOYPAD_RIGHT] = 1 << DKEY_RIGHT, - [RETRO_DEVICE_ID_JOYPAD_A] = 1 << DKEY_CIRCLE, - [RETRO_DEVICE_ID_JOYPAD_X] = 1 << DKEY_TRIANGLE, - [RETRO_DEVICE_ID_JOYPAD_L] = 1 << DKEY_L1, - [RETRO_DEVICE_ID_JOYPAD_R] = 1 << DKEY_R1, - [RETRO_DEVICE_ID_JOYPAD_L2] = 1 << DKEY_L2, - [RETRO_DEVICE_ID_JOYPAD_R2] = 1 << DKEY_R2, - [RETRO_DEVICE_ID_JOYPAD_L3] = 1 << DKEY_L3, - [RETRO_DEVICE_ID_JOYPAD_R3] = 1 << DKEY_R3, + [RETRO_DEVICE_ID_JOYPAD_B] = 1 << DKEY_CROSS, + [RETRO_DEVICE_ID_JOYPAD_Y] = 1 << DKEY_SQUARE, + [RETRO_DEVICE_ID_JOYPAD_SELECT] = 1 << DKEY_SELECT, + [RETRO_DEVICE_ID_JOYPAD_START] = 1 << DKEY_START, + [RETRO_DEVICE_ID_JOYPAD_UP] = 1 << DKEY_UP, + [RETRO_DEVICE_ID_JOYPAD_DOWN] = 1 << DKEY_DOWN, + [RETRO_DEVICE_ID_JOYPAD_LEFT] = 1 << DKEY_LEFT, + [RETRO_DEVICE_ID_JOYPAD_RIGHT] = 1 << DKEY_RIGHT, + [RETRO_DEVICE_ID_JOYPAD_A] = 1 << DKEY_CIRCLE, + [RETRO_DEVICE_ID_JOYPAD_X] = 1 << DKEY_TRIANGLE, + [RETRO_DEVICE_ID_JOYPAD_L] = 1 << DKEY_L1, + [RETRO_DEVICE_ID_JOYPAD_R] = 1 << DKEY_R1, + [RETRO_DEVICE_ID_JOYPAD_L2] = 1 << DKEY_L2, + [RETRO_DEVICE_ID_JOYPAD_R2] = 1 << DKEY_R2, + [RETRO_DEVICE_ID_JOYPAD_L3] = 1 << DKEY_L3, + [RETRO_DEVICE_ID_JOYPAD_R3] = 1 << DKEY_R3, }; #define RETRO_PSX_MAP_LEN (sizeof(retro_psx_map) / sizeof(retro_psx_map[0])) @@ -1488,15 +1748,47 @@ static float GunconAdjustRatioY = 1; static void update_variables(bool in_flight) { struct retro_variable var; - int i; #ifdef GPU_PEOPS - int gpu_peops_fix = 0; + // Always enable GPU_PEOPS_OLD_FRAME_SKIP flag + // (this is set in standalone, with no option + // to change it) + int gpu_peops_fix = GPU_PEOPS_OLD_FRAME_SKIP; #endif + frameskip_type_t prev_frameskip_type; + + var.value = NULL; + var.key = "pcsx_rearmed_frameskip_type"; + + prev_frameskip_type = frameskip_type; + frameskip_type = FRAMESKIP_NONE; + pl_rearmed_cbs.frameskip = 0; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "auto") == 0) + frameskip_type = FRAMESKIP_AUTO; + if (strcmp(var.value, "auto_threshold") == 0) + frameskip_type = FRAMESKIP_AUTO_THRESHOLD; + if (strcmp(var.value, "fixed_interval") == 0) + frameskip_type = FRAMESKIP_FIXED_INTERVAL; + } + + if (frameskip_type != 0) + pl_rearmed_cbs.frameskip = -1; + + var.value = NULL; + var.key = "pcsx_rearmed_frameskip_threshold"; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + frameskip_threshold = strtol(var.value, NULL, 10); + } var.value = NULL; - var.key = "pcsx_rearmed_frameskip"; + var.key = "pcsx_rearmed_frameskip_interval"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - pl_rearmed_cbs.frameskip = atoi(var.value); + { + frameskip_interval = strtol(var.value, NULL, 10); + } var.value = NULL; var.key = "pcsx_rearmed_region"; @@ -1511,9 +1803,6 @@ static void update_variables(bool in_flight) Config.PsxType = 1; } - for (i = 0; i < PORTS_NUMBER; i++) - update_controller_port_variable(i); - update_multitap(); var.value = NULL; @@ -1529,9 +1818,12 @@ static void update_variables(bool in_flight) negcon_linearity = 1; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - if (strcmp(var.value, "quadratic") == 0) { + if (strcmp(var.value, "quadratic") == 0) + { negcon_linearity = 2; - } else if (strcmp(var.value, "cubic") == 0) { + } + else if (strcmp(var.value, "cubic") == 0) + { negcon_linearity = 3; } } @@ -1541,9 +1833,12 @@ static void update_variables(bool in_flight) axis_bounds_modifier = true; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - if (strcmp(var.value, "square") == 0) { + if (strcmp(var.value, "square") == 0) + { axis_bounds_modifier = true; - } else if (strcmp(var.value, "circle") == 0) { + } + else if (strcmp(var.value, "circle") == 0) + { axis_bounds_modifier = false; } } @@ -1564,19 +1859,21 @@ static void update_variables(bool in_flight) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - if (strcmp(var.value, "disabled") == 0) { + if (strcmp(var.value, "disabled") == 0) + { pl_rearmed_cbs.gpu_peops.iUseDither = 0; pl_rearmed_cbs.gpu_peopsgl.bDrawDither = 0; pl_rearmed_cbs.gpu_unai.dithering = 0; -#ifdef __ARM_NEON__ +#ifdef GPU_NEON pl_rearmed_cbs.gpu_neon.allow_dithering = 0; #endif } - else if (strcmp(var.value, "enabled") == 0) { - pl_rearmed_cbs.gpu_peops.iUseDither = 1; + else if (strcmp(var.value, "enabled") == 0) + { + pl_rearmed_cbs.gpu_peops.iUseDither = 1; pl_rearmed_cbs.gpu_peopsgl.bDrawDither = 1; pl_rearmed_cbs.gpu_unai.dithering = 1; -#ifdef __ARM_NEON__ +#ifdef GPU_NEON pl_rearmed_cbs.gpu_neon.allow_dithering = 1; #endif } @@ -1639,11 +1936,15 @@ static void update_variables(bool in_flight) display_internal_fps = true; } -#if defined(LIGHTREC) || defined(NEW_DYNAREC) + // + // CPU emulation related config +#ifndef DRC_DISABLE var.value = NULL; var.key = "pcsx_rearmed_drc"; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + if (!environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var)) + var.value = "enabled"; + { R3000Acpu *prev_cpu = psxCpu; #if defined(LIGHTREC) @@ -1653,7 +1954,7 @@ static void update_variables(bool in_flight) #endif #ifdef _3DS - if(!__ctr_svchax) + if (!__ctr_svchax) Config.Cpu = CPU_INTERPRETER; else #endif @@ -1663,71 +1964,114 @@ static void update_variables(bool in_flight) Config.Cpu = CPU_DYNAREC; psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec; - if (psxCpu != prev_cpu) { + if (psxCpu != prev_cpu) + { prev_cpu->Shutdown(); psxCpu->Init(); psxCpu->Reset(); // not really a reset.. } } -#endif /* LIGHTREC || NEW_DYNAREC */ +#endif /* !DRC_DISABLE */ var.value = NULL; - var.key = "pcsx_rearmed_spu_reverb"; + var.key = "pcsx_rearmed_psxclock"; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + int psxclock = atoi(var.value); + Config.cycle_multiplier = 10000 / psxclock; + } +#if !defined(DRC_DISABLE) && !defined(LIGHTREC) + var.value = NULL; + var.key = "pcsx_rearmed_nosmccheck"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - if (strcmp(var.value, "disabled") == 0) - spu_config.iUseReverb = false; - else if (strcmp(var.value, "enabled") == 0) - spu_config.iUseReverb = true; + if (strcmp(var.value, "enabled") == 0) + new_dynarec_hacks |= NDHACK_NO_SMC_CHECK; + else + new_dynarec_hacks &= ~NDHACK_NO_SMC_CHECK; } var.value = NULL; - var.key = "pcsx_rearmed_spu_interpolation"; + var.key = "pcsx_rearmed_gteregsunneeded"; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "enabled") == 0) + new_dynarec_hacks |= NDHACK_GTE_UNNEEDED; + else + new_dynarec_hacks &= ~NDHACK_GTE_UNNEEDED; + } + var.value = NULL; + var.key = "pcsx_rearmed_nogteflags"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - if (strcmp(var.value, "simple") == 0) - spu_config.iUseInterpolation = 1; - else if (strcmp(var.value, "gaussian") == 0) - spu_config.iUseInterpolation = 2; - else if (strcmp(var.value, "cubic") == 0) - spu_config.iUseInterpolation = 3; - else if (strcmp(var.value, "off") == 0) - spu_config.iUseInterpolation = 0; + if (strcmp(var.value, "enabled") == 0) + new_dynarec_hacks |= NDHACK_GTE_NO_FLAGS; + else + new_dynarec_hacks &= ~NDHACK_GTE_NO_FLAGS; } var.value = NULL; - var.key = "pcsx_rearmed_pe2_fix"; + var.key = "pcsx_rearmed_nocompathacks"; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "enabled") == 0) + new_dynarec_hacks |= NDHACK_NO_COMPAT_HACKS; + else + new_dynarec_hacks &= ~NDHACK_NO_COMPAT_HACKS; + } +#endif /* !DRC_DISABLE && !LIGHTREC */ + var.value = NULL; + var.key = "pcsx_rearmed_nostalls"; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "enabled") == 0) + Config.DisableStalls = 1; + else + Config.DisableStalls = 0; + } + + var.value = NULL; + var.key = "pcsx_rearmed_icache_emulation"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "disabled") == 0) - Config.RCntFix = 0; + Config.icache_emulation = 0; else if (strcmp(var.value, "enabled") == 0) - Config.RCntFix = 1; + Config.icache_emulation = 1; } + psxCpu->ApplyConfig(); + + // end of CPU emu config + // + var.value = NULL; - var.key = "pcsx_rearmed_idiablofix"; + var.key = "pcsx_rearmed_spu_reverb"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "disabled") == 0) - spu_config.idiablofix = 0; + spu_config.iUseReverb = false; else if (strcmp(var.value, "enabled") == 0) - spu_config.idiablofix = 1; + spu_config.iUseReverb = true; } var.value = NULL; - var.key = "pcsx_rearmed_inuyasha_fix"; + var.key = "pcsx_rearmed_spu_interpolation"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - if (strcmp(var.value, "disabled") == 0) - Config.VSyncWA = 0; - else if (strcmp(var.value, "enabled") == 0) - Config.VSyncWA = 1; + if (strcmp(var.value, "simple") == 0) + spu_config.iUseInterpolation = 1; + else if (strcmp(var.value, "gaussian") == 0) + spu_config.iUseInterpolation = 2; + else if (strcmp(var.value, "cubic") == 0) + spu_config.iUseInterpolation = 3; + else if (strcmp(var.value, "off") == 0) + spu_config.iUseInterpolation = 0; } #ifndef _WIN32 @@ -1736,9 +2080,20 @@ static void update_variables(bool in_flight) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "async") == 0) + { Config.AsyncCD = 1; - else + Config.CHD_Precache = 0; + } + else if (strcmp(var.value, "sync") == 0) + { + Config.AsyncCD = 0; + Config.CHD_Precache = 0; + } + else if (strcmp(var.value, "precache") == 0) + { Config.AsyncCD = 0; + Config.CHD_Precache = 1; + } } #endif @@ -1763,14 +2118,31 @@ static void update_variables(bool in_flight) } var.value = NULL; - var.key = "pcsx_rearmed_spuirq"; + var.key = "pcsx_rearmed_gpu_slow_llists"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "disabled") == 0) - Config.SpuIrq = 0; - else - Config.SpuIrq = 1; + Config.GpuListWalking = 0; + else if (strcmp(var.value, "enabled") == 0) + Config.GpuListWalking = 1; + else // auto + Config.GpuListWalking = -1; + } + +#ifdef THREAD_RENDERING + var.key = "pcsx_rearmed_gpu_thread_rendering"; + var.value = NULL; + + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "disabled") == 0) + pl_rearmed_cbs.thread_rendering = THREAD_RENDERING_OFF; + else if (strcmp(var.value, "sync") == 0) + pl_rearmed_cbs.thread_rendering = THREAD_RENDERING_SYNC; + else if (strcmp(var.value, "async") == 0) + pl_rearmed_cbs.thread_rendering = THREAD_RENDERING_ASYNC; } +#endif #ifdef GPU_PEOPS var.value = NULL; @@ -1818,15 +2190,6 @@ static void update_variables(bool in_flight) gpu_peops_fix |= GPU_PEOPS_LAZY_SCREEN_UPDATE; } - var.value = NULL; - var.key = "pcsx_rearmed_gpu_peops_old_frame_skip"; - - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - { - if (strcmp(var.value, "enabled") == 0) - gpu_peops_fix |= GPU_PEOPS_OLD_FRAME_SKIP; - } - var.value = NULL; var.key = "pcsx_rearmed_gpu_peops_repeated_triangles"; @@ -1856,69 +2219,18 @@ static void update_variables(bool in_flight) if (pl_rearmed_cbs.gpu_peops.dwActFixes != gpu_peops_fix) pl_rearmed_cbs.gpu_peops.dwActFixes = gpu_peops_fix; - - /* Show/hide core options */ - - var.key = "pcsx_rearmed_show_gpu_peops_settings"; - var.value = NULL; - - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - { - int show_advanced_gpu_peops_settings_prev = show_advanced_gpu_peops_settings; - - show_advanced_gpu_peops_settings = 1; - if (strcmp(var.value, "disabled") == 0) - show_advanced_gpu_peops_settings = 0; - - if (show_advanced_gpu_peops_settings != show_advanced_gpu_peops_settings_prev) - { - unsigned i; - struct retro_core_option_display option_display; - char gpu_peops_option[9][45] = { - "pcsx_rearmed_gpu_peops_odd_even_bit", - "pcsx_rearmed_gpu_peops_expand_screen_width", - "pcsx_rearmed_gpu_peops_ignore_brightness", - "pcsx_rearmed_gpu_peops_disable_coord_check", - "pcsx_rearmed_gpu_peops_lazy_screen_update", - "pcsx_rearmed_gpu_peops_old_frame_skip", - "pcsx_rearmed_gpu_peops_repeated_triangles", - "pcsx_rearmed_gpu_peops_quads_with_triangles", - "pcsx_rearmed_gpu_peops_fake_busy_state" - }; - - option_display.visible = show_advanced_gpu_peops_settings; - - for (i = 0; i < 9; i++) - { - option_display.key = gpu_peops_option[i]; - environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display); - } - } - } #endif #ifdef GPU_UNAI - var.key = "pcsx_rearmed_gpu_unai_ilace_force"; - var.value = NULL; - - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - { - if (strcmp(var.value, "disabled") == 0) - pl_rearmed_cbs.gpu_unai.ilace_force = 0; - else if (strcmp(var.value, "enabled") == 0) - pl_rearmed_cbs.gpu_unai.ilace_force = 1; - } - - var.key = "pcsx_rearmed_gpu_unai_pixel_skip"; - var.value = NULL; - - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - { - if (strcmp(var.value, "disabled") == 0) - pl_rearmed_cbs.gpu_unai.pixel_skip = 0; - else if (strcmp(var.value, "enabled") == 0) - pl_rearmed_cbs.gpu_unai.pixel_skip = 1; - } + /* Note: This used to be an option, but it only works + * (correctly) when running high resolution games + * (480i, 512i) and has been obsoleted by + * pcsx_rearmed_gpu_unai_scale_hires */ + pl_rearmed_cbs.gpu_unai.ilace_force = 0; + /* Note: This used to be an option, but it has no + * discernable effect and has been obsoleted by + * pcsx_rearmed_gpu_unai_scale_hires */ + pl_rearmed_cbs.gpu_unai.pixel_skip = 0; var.key = "pcsx_rearmed_gpu_unai_lighting"; var.value = NULL; @@ -1953,37 +2265,15 @@ static void update_variables(bool in_flight) pl_rearmed_cbs.gpu_unai.blending = 1; } - var.key = "pcsx_rearmed_show_gpu_unai_settings"; + var.key = "pcsx_rearmed_gpu_unai_scale_hires"; var.value = NULL; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - int show_advanced_gpu_unai_settings_prev = show_advanced_gpu_unai_settings; - - show_advanced_gpu_unai_settings = 1; if (strcmp(var.value, "disabled") == 0) - show_advanced_gpu_unai_settings = 0; - - if (show_advanced_gpu_unai_settings != show_advanced_gpu_unai_settings_prev) - { - unsigned i; - struct retro_core_option_display option_display; - char gpu_unai_option[5][40] = { - "pcsx_rearmed_gpu_unai_blending", - "pcsx_rearmed_gpu_unai_lighting", - "pcsx_rearmed_gpu_unai_fast_lighting", - "pcsx_rearmed_gpu_unai_ilace_force", - "pcsx_rearmed_gpu_unai_pixel_skip" - }; - - option_display.visible = show_advanced_gpu_unai_settings; - - for (i = 0; i < 5; i++) - { - option_display.key = gpu_unai_option[i]; - environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display); - } - } + pl_rearmed_cbs.gpu_unai.scale_hires = 0; + else if (strcmp(var.value, "enabled") == 0) + pl_rearmed_cbs.gpu_unai.scale_hires = 1; } #endif // GPU_UNAI @@ -2022,108 +2312,37 @@ static void update_variables(bool in_flight) GunconAdjustRatioY = atof(var.value); } -#ifdef NEW_DYNAREC - var.value = NULL; - var.key = "pcsx_rearmed_nosmccheck"; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - { - if (strcmp(var.value, "enabled") == 0) - new_dynarec_hacks |= NDHACK_NO_SMC_CHECK; - else - new_dynarec_hacks &= ~NDHACK_NO_SMC_CHECK; - } - - var.value = NULL; - var.key = "pcsx_rearmed_gteregsunneeded"; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - { - if (strcmp(var.value, "enabled") == 0) - new_dynarec_hacks |= NDHACK_GTE_UNNEEDED; - else - new_dynarec_hacks &= ~NDHACK_GTE_UNNEEDED; - } - - var.value = NULL; - var.key = "pcsx_rearmed_nogteflags"; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) - { - if (strcmp(var.value, "enabled") == 0) - new_dynarec_hacks |= NDHACK_GTE_NO_FLAGS; - else - new_dynarec_hacks &= ~NDHACK_GTE_NO_FLAGS; - } - - /* this probably is safe to change in real-time */ var.value = NULL; - var.key = "pcsx_rearmed_psxclock"; + var.key = "pcsx_rearmed_input_sensitivity"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { - int psxclock = atoi(var.value); - cycle_multiplier = 10000 / psxclock; + mouse_sensitivity = atof(var.value); } -#endif /* NEW_DYNAREC */ - - var.key = "pcsx_rearmed_show_other_input_settings"; - var.value = NULL; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + if (in_flight) { - int previous_settings = show_other_input_settings; - - show_other_input_settings = 1; - if (strcmp(var.value, "disabled") == 0) - show_other_input_settings = 0; - - if (show_other_input_settings != previous_settings) - { - unsigned i; - struct retro_core_option_display option_display; - char gpu_peops_option[][50] = { - "pcsx_rearmed_multitap1", - "pcsx_rearmed_multitap2", - "pcsx_rearmed_pad3type", - "pcsx_rearmed_pad4type", - "pcsx_rearmed_pad5type", - "pcsx_rearmed_pad6type", - "pcsx_rearmed_pad7type", - "pcsx_rearmed_pad8type", - "pcsx_rearmed_negcon_deadzone", - "pcsx_rearmed_negcon_response", - "pcsx_rearmed_analog_axis_modifier", - "pcsx_rearmed_gunconadjustx", - "pcsx_rearmed_gunconadjusty", - "pcsx_rearmed_gunconadjustratiox", - "pcsx_rearmed_gunconadjustratioy" - }; - #define INPUT_LIST (sizeof(gpu_peops_option) / sizeof(gpu_peops_option[0])) - - option_display.visible = show_other_input_settings; - - for (i = 0; i < INPUT_LIST; i++) - { - option_display.key = gpu_peops_option[i]; - environ_cb(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_DISPLAY, &option_display); - } - } - } - - if (in_flight) { - // inform core things about possible config changes + // inform core things about possible config changes plugin_call_rearmed_cbs(); - if (GPU_open != NULL && GPU_close != NULL) { + if (GPU_open != NULL && GPU_close != NULL) + { GPU_close(); GPU_open(&gpuDisp, "PCSX", NULL); } - dfinput_activate(); + /* Reinitialise frameskipping, if required */ + if (((frameskip_type != prev_frameskip_type))) + retro_set_audio_buff_status_cb(); + + /* dfinput_activate(); */ } else { //not yet running //bootlogo display hack - if (found_bios) { + if (found_bios) + { var.value = NULL; var.key = "pcsx_rearmed_show_bios_bootlogo"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) @@ -2138,6 +2357,8 @@ static void update_variables(bool in_flight) } } } + + update_option_visibility(); } // Taken from beetle-psx-libretro @@ -2148,9 +2369,9 @@ static uint16_t get_analog_button(int16_t ret, retro_input_state_t input_state_c // First, try and get an analog value using the new libretro API constant uint16_t button = input_state_cb(player_index, - RETRO_DEVICE_ANALOG, - RETRO_DEVICE_INDEX_ANALOG_BUTTON, - id); + RETRO_DEVICE_ANALOG, + RETRO_DEVICE_INDEX_ANALOG_BUTTON, + id); button = MIN(button / 128, 255); if (button == 0) @@ -2167,265 +2388,386 @@ static uint16_t get_analog_button(int16_t ret, retro_input_state_t input_state_c return button; } -unsigned char axis_range_modifier(int16_t axis_value, bool is_square) { +unsigned char axis_range_modifier(int16_t axis_value, bool is_square) +{ float modifier_axis_range = 0; - if(is_square) { + if (is_square) + { modifier_axis_range = round((axis_value >> 8) / 0.785) + 128; - if(modifier_axis_range < 0) { + if (modifier_axis_range < 0) + { modifier_axis_range = 0; - } else if(modifier_axis_range > 255) { + } + else if (modifier_axis_range > 255) + { modifier_axis_range = 255; } - } else { + } + else + { modifier_axis_range = MIN(((axis_value >> 8) + 128), 255); } return modifier_axis_range; } -void retro_run(void) +static void update_input_guncon(int port, int ret) { - int i; - //SysReset must be run while core is running,Not in menu (Locks up Retroarch) - if (rebootemu != 0) { - rebootemu = 0; - SysReset(); - if (!Config.HLE && !Config.SlowBoot) { - // skip BIOS logos - psxRegs.pc = psxRegs.GPR.n.ra; - } - } + //ToDo: + //Core option for cursors for both players + //Separate pointer and lightgun control types - if (display_internal_fps) { - frame_count++; + //Mouse range is -32767 -> 32767 + //1% is about 655 + //Use the left analog stick field to store the absolute coordinates - if (frame_count % INTERNAL_FPS_SAMPLE_PERIOD == 0) { - unsigned internal_fps = pl_rearmed_cbs.flip_cnt * (is_pal_mode ? 50 : 60) / INTERNAL_FPS_SAMPLE_PERIOD; - char str[64]; - const char *strc = (const char*)str; - struct retro_message msg = - { - strc, - 180 - }; + int gunx = input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X); + int guny = input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y); - str[0] = '\0'; + //Have the Libretro API let /libpcsxcore/plugins.c know when the lightgun is pointed offscreen + //Offscreen value is chosen to be well out of range of any possible scaling done via core options + if (input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_IS_OFFSCREEN) || input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_RELOAD)) + { + in_analog_left[port][0] = (65536 - 512) * 64; + in_analog_left[port][1] = (65536 - 512) * 64; + } + else + { + in_analog_left[port][0] = (gunx * GunconAdjustRatioX) + (GunconAdjustX * 655); + in_analog_left[port][1] = (guny * GunconAdjustRatioY) + (GunconAdjustY * 655); + } + + //GUNCON has 3 controls, Trigger,A,B which equal Circle,Start,Cross - snprintf(str, sizeof(str), "Internal FPS: %2d", internal_fps); + // Trigger + if (input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_TRIGGER) || input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_RELOAD)) + in_keystate[port] |= (1 << DKEY_CIRCLE); - pl_rearmed_cbs.flip_cnt = 0; + // A + if (input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_AUX_A)) + in_keystate[port] |= (1 << DKEY_START); - environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, &msg); - } + // B + if (input_state_cb(port, RETRO_DEVICE_LIGHTGUN, 0, RETRO_DEVICE_ID_LIGHTGUN_AUX_B)) + in_keystate[port] |= (1 << DKEY_CROSS); + +} + +static void update_input_negcon(int port, int ret) +{ + int lsx; + int rsy; + int negcon_i_rs; + int negcon_ii_rs; + float negcon_twist_amplitude; + + // Query digital inputs + // + // > Pad-Up + if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) + in_keystate[port] |= (1 << DKEY_UP); + // > Pad-Right + if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) + in_keystate[port] |= (1 << DKEY_RIGHT); + // > Pad-Down + if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) + in_keystate[port] |= (1 << DKEY_DOWN); + // > Pad-Left + if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) + in_keystate[port] |= (1 << DKEY_LEFT); + // > Start + if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_START)) + in_keystate[port] |= (1 << DKEY_START); + // > neGcon A + if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_A)) + in_keystate[port] |= (1 << DKEY_CIRCLE); + // > neGcon B + if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_X)) + in_keystate[port] |= (1 << DKEY_TRIANGLE); + // > neGcon R shoulder (digital) + if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_R)) + in_keystate[port] |= (1 << DKEY_R1); + // Query analog inputs + // + // From studying 'libpcsxcore/plugins.c' and 'frontend/plugin.c': + // >> pad->leftJoyX == in_analog_left[port][0] == NeGcon II + // >> pad->leftJoyY == in_analog_left[port][1] == NeGcon L + // >> pad->rightJoyX == in_analog_right[port][0] == NeGcon twist + // >> pad->rightJoyY == in_analog_right[port][1] == NeGcon I + // So we just have to map in_analog_left/right to more + // appropriate inputs... + // + // > NeGcon twist + // >> Get raw analog stick value and account for deadzone + lsx = input_state_cb(port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X); + if (lsx > negcon_deadzone) + lsx = lsx - negcon_deadzone; + else if (lsx < -negcon_deadzone) + lsx = lsx + negcon_deadzone; + else + lsx = 0; + // >> Convert to an 'amplitude' [-1.0,1.0] and adjust response + negcon_twist_amplitude = (float)lsx / (float)(NEGCON_RANGE - negcon_deadzone); + if (negcon_linearity == 2) + { + if (negcon_twist_amplitude < 0.0) + negcon_twist_amplitude = -(negcon_twist_amplitude * negcon_twist_amplitude); + else + negcon_twist_amplitude = negcon_twist_amplitude * negcon_twist_amplitude; + } + else if (negcon_linearity == 3) + negcon_twist_amplitude = negcon_twist_amplitude * negcon_twist_amplitude * negcon_twist_amplitude; + // >> Convert to final 'in_analog' integer value [0,255] + in_analog_right[port][0] = MAX(MIN((int)(negcon_twist_amplitude * 128.0f) + 128, 255), 0); + // > NeGcon I + II + // >> Handle right analog stick vertical axis mapping... + // - Up (-Y) == accelerate == neGcon I + // - Down (+Y) == brake == neGcon II + negcon_i_rs = 0; + negcon_ii_rs = 0; + rsy = input_state_cb(port, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y); + if (rsy >= 0) + { + // Account for deadzone + // (Note: have never encountered a gamepad with significant differences + // in deadzone between left/right analog sticks, so use the regular 'twist' + // deadzone here) + if (rsy > negcon_deadzone) + rsy = rsy - negcon_deadzone; + else + rsy = 0; + // Convert to 'in_analog' integer value [0,255] + negcon_ii_rs = MIN((int)(((float)rsy / (float)(NEGCON_RANGE - negcon_deadzone)) * 255.0f), 255); } else - frame_count = 0; + { + if (rsy < -negcon_deadzone) + rsy = -1 * (rsy + negcon_deadzone); + else + rsy = 0; + negcon_i_rs = MIN((int)(((float)rsy / (float)(NEGCON_RANGE - negcon_deadzone)) * 255.0f), 255); + } + // >> NeGcon I + in_analog_right[port][1] = MAX( + MAX( + get_analog_button(ret, input_state_cb, port, RETRO_DEVICE_ID_JOYPAD_R2), + get_analog_button(ret, input_state_cb, port, RETRO_DEVICE_ID_JOYPAD_B)), + negcon_i_rs); + // >> NeGcon II + in_analog_left[port][0] = MAX( + MAX( + get_analog_button(ret, input_state_cb, port, RETRO_DEVICE_ID_JOYPAD_L2), + get_analog_button(ret, input_state_cb, port, RETRO_DEVICE_ID_JOYPAD_Y)), + negcon_ii_rs); + // > NeGcon L + in_analog_left[port][1] = get_analog_button(ret, input_state_cb, port, RETRO_DEVICE_ID_JOYPAD_L); +} - input_poll_cb(); +static void update_input_mouse(int port, int ret) +{ + float raw_x = input_state_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_X); + float raw_y = input_state_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_Y); - bool updated = false; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) - update_variables(true); + int x = (int)roundf(raw_x * mouse_sensitivity); + int y = (int)roundf(raw_y * mouse_sensitivity); + + if (x > 127) x = 127; + else if (x < -128) x = -128; + + if (y > 127) y = 127; + else if (y < -128) y = -128; + in_mouse[port][0] = x; /* -128..+128 left/right movement, 0 = no movement */ + in_mouse[port][1] = y; /* -128..+128 down/up movement, 0 = no movement */ + + /* left mouse button state */ + if (input_state_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_LEFT)) + in_keystate[port] |= 1 << 11; + + /* right mouse button state */ + if (input_state_cb(port, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_RIGHT)) + in_keystate[port] |= 1 << 10; +} + +static void update_input(void) +{ // reset all keystate, query libretro for keystate + int i; int j; - int lsx; - int rsy; - float negcon_twist_amplitude; - int negcon_i_rs; - int negcon_ii_rs; - for(i = 0; i < PORTS_NUMBER; i++) + for (i = 0; i < PORTS_NUMBER; i++) { - int16_t ret = 0; + int16_t ret = 0; + int type = in_type[i]; + in_keystate[i] = 0; - if (in_type[i] == PSE_PAD_TYPE_NONE) + if (type == PSE_PAD_TYPE_NONE) continue; if (libretro_supports_bitmasks) ret = input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_MASK); else { - unsigned j; - for (j = 0; j < (RETRO_DEVICE_ID_JOYPAD_R3+1); j++) + for (j = 0; j < (RETRO_DEVICE_ID_JOYPAD_R3 + 1); j++) { if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, j)) - ret |= (1 << j); + ret |= (1 << j); } } - if (in_type[i] == PSE_PAD_TYPE_GUNCON) + switch (type) { - //ToDo move across to: - //RETRO_DEVICE_ID_LIGHTGUN_SCREEN_X - //RETRO_DEVICE_ID_LIGHTGUN_SCREEN_Y - //RETRO_DEVICE_ID_LIGHTGUN_TRIGGER - //RETRO_DEVICE_ID_LIGHTGUN_RELOAD - //RETRO_DEVICE_ID_LIGHTGUN_AUX_A - //RETRO_DEVICE_ID_LIGHTGUN_AUX_B - //Though not sure these are hooked up properly on the Pi - - //ToDo - //Put the controller index back to i instead of hardcoding to 1 when the libretro overlay crash bug is fixed - //This is required for 2 player - - //GUNCON has 3 controls, Trigger,A,B which equal Circle,Start,Cross - - // Trigger - //The 1 is hardcoded instead of i to prevent the overlay mouse button libretro crash bug - if (input_state_cb(1, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_LEFT)){ - in_keystate[i] |= (1 << DKEY_CIRCLE); - } - - // A - if (input_state_cb(1, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_RIGHT)){ - in_keystate[i] |= (1 << DKEY_START); - } + case PSE_PAD_TYPE_GUNCON: + update_input_guncon(i, ret); + break; + case PSE_PAD_TYPE_NEGCON: + update_input_negcon(i, ret); + break; + case PSE_PAD_TYPE_MOUSE: + update_input_mouse(i, ret); + break; + default: + // Query digital inputs + for (j = 0; j < RETRO_PSX_MAP_LEN; j++) + if (ret & (1 << j)) + in_keystate[i] |= retro_psx_map[j]; - // B - if (input_state_cb(1, RETRO_DEVICE_MOUSE, 0, RETRO_DEVICE_ID_MOUSE_MIDDLE)){ - in_keystate[i] |= (1 << DKEY_CROSS); + // Query analog inputs + if (type == PSE_PAD_TYPE_ANALOGJOY || type == PSE_PAD_TYPE_ANALOGPAD) + { + in_analog_left[i][0] = axis_range_modifier(input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X), axis_bounds_modifier); + in_analog_left[i][1] = axis_range_modifier(input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y), axis_bounds_modifier); + in_analog_right[i][0] = axis_range_modifier(input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X), axis_bounds_modifier); + in_analog_right[i][1] = axis_range_modifier(input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y), axis_bounds_modifier); } + } + } +} - //The 1 is hardcoded instead of i to prevent the overlay mouse button libretro crash bug - int gunx = input_state_cb(1, RETRO_DEVICE_POINTER, 0, RETRO_DEVICE_ID_POINTER_X); - int guny = input_state_cb(1, RETRO_DEVICE_POINTER, 0, RETRO_DEVICE_ID_POINTER_Y); +static void print_internal_fps(void) +{ + if (display_internal_fps) + { + frame_count++; - //Mouse range is -32767 -> 32767 - //1% is about 655 - //Use the left analog stick field to store the absolute coordinates - in_analog_left[0][0] = (gunx*GunconAdjustRatioX) + (GunconAdjustX * 655); - in_analog_left[0][1] = (guny*GunconAdjustRatioY) + (GunconAdjustY * 655); - } - if (in_type[i] == PSE_PAD_TYPE_NEGCON) + if (frame_count % INTERNAL_FPS_SAMPLE_PERIOD == 0) { - // Query digital inputs - // - // > Pad-Up - if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_UP)) - in_keystate[i] |= (1 << DKEY_UP); - // > Pad-Right - if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_RIGHT)) - in_keystate[i] |= (1 << DKEY_RIGHT); - // > Pad-Down - if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_DOWN)) - in_keystate[i] |= (1 << DKEY_DOWN); - // > Pad-Left - if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_LEFT)) - in_keystate[i] |= (1 << DKEY_LEFT); - // > Start - if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_START)) - in_keystate[i] |= (1 << DKEY_START); - // > neGcon A - if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_A)) - in_keystate[i] |= (1 << DKEY_CIRCLE); - // > neGcon B - if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_X)) - in_keystate[i] |= (1 << DKEY_TRIANGLE); - // > neGcon R shoulder (digital) - if (ret & (1 << RETRO_DEVICE_ID_JOYPAD_R)) - in_keystate[i] |= (1 << DKEY_R1); - // Query analog inputs - // - // From studying 'libpcsxcore/plugins.c' and 'frontend/plugin.c': - // >> pad->leftJoyX == in_analog_left[i][0] == NeGcon II - // >> pad->leftJoyY == in_analog_left[i][1] == NeGcon L - // >> pad->rightJoyX == in_analog_right[i][0] == NeGcon twist - // >> pad->rightJoyY == in_analog_right[i][1] == NeGcon I - // So we just have to map in_analog_left/right to more - // appropriate inputs... - // - // > NeGcon twist - // >> Get raw analog stick value and account for deadzone - lsx = input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X); - if (lsx > negcon_deadzone) - lsx = lsx - negcon_deadzone; - else if (lsx < -negcon_deadzone) - lsx = lsx + negcon_deadzone; - else - lsx = 0; - // >> Convert to an 'amplitude' [-1.0,1.0] and adjust response - negcon_twist_amplitude = (float)lsx / (float)(NEGCON_RANGE - negcon_deadzone); - if (negcon_linearity == 2) + unsigned internal_fps = pl_rearmed_cbs.flip_cnt * (is_pal_mode ? 50 : 60) / INTERNAL_FPS_SAMPLE_PERIOD; + char str[64]; + const char *strc = (const char *)str; + + str[0] = '\0'; + + snprintf(str, sizeof(str), "Internal FPS: %2d", internal_fps); + + pl_rearmed_cbs.flip_cnt = 0; + + if (msg_interface_version >= 1) { - if (negcon_twist_amplitude < 0.0) - negcon_twist_amplitude = -(negcon_twist_amplitude * negcon_twist_amplitude); - else - negcon_twist_amplitude = negcon_twist_amplitude * negcon_twist_amplitude; + struct retro_message_ext msg = { + strc, + 3000, + 1, + RETRO_LOG_INFO, + RETRO_MESSAGE_TARGET_OSD, + RETRO_MESSAGE_TYPE_STATUS, + -1 + }; + environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &msg); } - else if (negcon_linearity == 3) - negcon_twist_amplitude = negcon_twist_amplitude * negcon_twist_amplitude * negcon_twist_amplitude; - // >> Convert to final 'in_analog' integer value [0,255] - in_analog_right[i][0] = MAX(MIN((int)(negcon_twist_amplitude * 128.0f) + 128, 255), 0); - // > NeGcon I + II - // >> Handle right analog stick vertical axis mapping... - // - Up (-Y) == accelerate == neGcon I - // - Down (+Y) == brake == neGcon II - negcon_i_rs = 0; - negcon_ii_rs = 0; - rsy = input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y); - if (rsy >= 0) { - // Account for deadzone - // (Note: have never encountered a gamepad with significant differences - // in deadzone between left/right analog sticks, so use the regular 'twist' - // deadzone here) - if (rsy > negcon_deadzone) - rsy = rsy - negcon_deadzone; - else - rsy = 0; - // Convert to 'in_analog' integer value [0,255] - negcon_ii_rs = MIN((int)(((float)rsy / (float)(NEGCON_RANGE - negcon_deadzone)) * 255.0f), 255); - } else { - if (rsy < -negcon_deadzone) - rsy = -1 * (rsy + negcon_deadzone); - else - rsy = 0; - negcon_i_rs = MIN((int)(((float)rsy / (float)(NEGCON_RANGE - negcon_deadzone)) * 255.0f), 255); + else + { + struct retro_message msg = { + strc, + 180 + }; + environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, &msg); } - // >> NeGcon I - in_analog_right[i][1] = MAX( - MAX( - get_analog_button(ret, input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_R2), - get_analog_button(ret, input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_B) - ), - negcon_i_rs - ); - // >> NeGcon II - in_analog_left[i][0] = MAX( - MAX( - get_analog_button(ret, input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_L2), - get_analog_button(ret, input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_Y) - ), - negcon_ii_rs - ); - // > NeGcon L - in_analog_left[i][1] = get_analog_button(ret, input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_L); } - if (in_type[i] != PSE_PAD_TYPE_NEGCON && in_type[i] != PSE_PAD_TYPE_GUNCON) + } + else + frame_count = 0; +} + +void retro_run(void) +{ + //SysReset must be run while core is running,Not in menu (Locks up Retroarch) + if (rebootemu != 0) + { + rebootemu = 0; + SysReset(); + if (!Config.HLE && !Config.SlowBoot) { - // Query digital inputs - for (j = 0; j < RETRO_PSX_MAP_LEN; j++) - if (ret & (1 << j)) - in_keystate[i] |= retro_psx_map[j]; + // skip BIOS logos + psxRegs.pc = psxRegs.GPR.n.ra; + } + return; + } - // Query analog inputs - if (in_type[i] == PSE_PAD_TYPE_ANALOGJOY || in_type[i] == PSE_PAD_TYPE_ANALOGPAD) - { - in_analog_left[i][0] = axis_range_modifier(input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X), axis_bounds_modifier); - in_analog_left[i][1] = axis_range_modifier(input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y), axis_bounds_modifier); - in_analog_right[i][0] = axis_range_modifier(input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X), axis_bounds_modifier); - in_analog_right[i][1] = axis_range_modifier(input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y), axis_bounds_modifier); - } + print_internal_fps(); + + /* Check whether current frame should + * be skipped */ + pl_rearmed_cbs.fskip_force = 0; + pl_rearmed_cbs.fskip_dirty = 0; + + if (frameskip_type != FRAMESKIP_NONE) + { + bool skip_frame = false; + + switch (frameskip_type) + { + case FRAMESKIP_AUTO: + skip_frame = retro_audio_buff_active && retro_audio_buff_underrun; + break; + case FRAMESKIP_AUTO_THRESHOLD: + skip_frame = retro_audio_buff_active && (retro_audio_buff_occupancy < frameskip_threshold); + break; + case FRAMESKIP_FIXED_INTERVAL: + skip_frame = true; + break; + default: + break; } + + if (skip_frame && frameskip_counter < frameskip_interval) + pl_rearmed_cbs.fskip_force = 1; } + /* If frameskip/timing settings have changed, + * update frontend audio latency + * > Can do this before or after the frameskip + * check, but doing it after means we at least + * retain the current frame's audio output */ + if (update_audio_latency) + { + environ_cb(RETRO_ENVIRONMENT_SET_MINIMUM_AUDIO_LATENCY, + &retro_audio_latency); + update_audio_latency = false; + } + + input_poll_cb(); + + update_input(); + + bool updated = false; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) + update_variables(true); + stop = 0; psxCpu->Execute(); + if (pl_rearmed_cbs.fskip_dirty == 1) { + if (frameskip_counter < frameskip_interval) + frameskip_counter++; + else if (frameskip_counter >= frameskip_interval || !pl_rearmed_cbs.fskip_force) + frameskip_counter = 0; + } + video_cb((vout_fb_dirty || !vout_can_dupe || !duping_enable) ? vout_buf_ptr : NULL, - vout_width, vout_height, vout_width * 2); + vout_width, vout_height, vout_width * 2); vout_fb_dirty = 0; set_vout_fb(); @@ -2433,17 +2775,15 @@ void retro_run(void) static bool try_use_bios(const char *path) { - FILE *f; long size; const char *name; - - f = fopen(path, "rb"); - if (f == NULL) + FILE *fp = fopen(path, "rb"); + if (fp == NULL) return false; - fseek(f, 0, SEEK_END); - size = ftell(f); - fclose(f); + fseek(fp, 0, SEEK_END); + size = ftell(fp); + fclose(fp); if (size != 512 * 1024) return false; @@ -2469,7 +2809,8 @@ static bool find_any_bios(const char *dirpath, char *path, size_t path_size) if (dir == NULL) return false; - while ((ent = readdir(dir))) { + while ((ent = readdir(dir))) + { if ((strncasecmp(ent->d_name, "scph", 4) != 0) && (strncasecmp(ent->d_name, "psx", 3) != 0)) continue; @@ -2495,7 +2836,7 @@ static int init_memcards(void) { int ret = 0; const char *dir; - struct retro_variable var = { .key="pcsx_rearmed_memcard2", .value=NULL }; + struct retro_variable var = { .key = "pcsx_rearmed_memcard2", .value = NULL }; static const char CARD2_FILE[] = "pcsx-card2.mcd"; // Memcard2 will be handled and is re-enabled if needed using core @@ -2508,19 +2849,27 @@ static int init_memcards(void) // Memcard 2 is managed by the emulator on the filesystem, // There is no need to initialize Mcd2Data like Mcd1Data. - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { SysPrintf("Memcard 2: %s\n", var.value); - if (memcmp(var.value, "enabled", 7) == 0) { - if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) { - if (strlen(dir) + strlen(CARD2_FILE) + 2 > sizeof(Config.Mcd2)) { + if (memcmp(var.value, "enabled", 7) == 0) + { + if (environ_cb(RETRO_ENVIRONMENT_GET_SAVE_DIRECTORY, &dir) && dir) + { + if (strlen(dir) + strlen(CARD2_FILE) + 2 > sizeof(Config.Mcd2)) + { SysPrintf("Path '%s' is too long. Cannot use memcard 2. Use a shorter path.\n", dir); ret = -1; - } else { + } + else + { McdDisable[1] = 0; snprintf(Config.Mcd2, sizeof(Config.Mcd2), "%s/%s", dir, CARD2_FILE); SysPrintf("Use memcard 2: %s\n", Config.Mcd2); } - } else { + } + else + { SysPrintf("Could not get save directory! Could not create memcard 2."); ret = -1; } @@ -2550,7 +2899,8 @@ static void loadPSXBios(void) found_bios = 0; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { if (!strcmp(var.value, "HLE")) useHLE = 1; } @@ -2562,7 +2912,8 @@ static void loadPSXBios(void) unsigned i; snprintf(Config.BiosDir, sizeof(Config.BiosDir), "%s", dir); - for (i = 0; i < sizeof(bios) / sizeof(bios[0]); i++) { + for (i = 0; i < sizeof(bios) / sizeof(bios[0]); i++) + { snprintf(path, sizeof(path), "%s%c%s.bin", dir, SLASH, bios[i]); found_bios = try_use_bios(path); if (found_bios) @@ -2572,20 +2923,47 @@ static void loadPSXBios(void) if (!found_bios) found_bios = find_any_bios(dir, path, sizeof(path)); } - if (found_bios) { + if (found_bios) + { SysPrintf("found BIOS file: %s\n", Config.Bios); } } - if (useHLE || !found_bios) + if (!found_bios) { - SysPrintf("no BIOS files found.\n"); - struct retro_message msg = + const char *msg_str; + if (useHLE) { - "No PlayStation BIOS file found - add for better compatibility", - 180 - }; - environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, (void*)&msg); + msg_str = "BIOS set to \'hle\' in core options - real BIOS will be ignored"; + SysPrintf("Using HLE BIOS.\n"); + } + else + { + msg_str = "No PlayStation BIOS file found - add for better compatibility"; + SysPrintf("No BIOS files found.\n"); + } + + if (msg_interface_version >= 1) + { + struct retro_message_ext msg = { + msg_str, + 3000, + 3, + RETRO_LOG_WARN, + RETRO_MESSAGE_TARGET_ALL, + RETRO_MESSAGE_TYPE_NOTIFICATION, + -1 + }; + environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE_EXT, &msg); + } + else + { + struct retro_message msg = { + msg_str, + 180 + }; + environ_cb(RETRO_ENVIRONMENT_SET_MESSAGE, &msg); + } } } @@ -2595,7 +2973,10 @@ void retro_init(void) struct retro_rumble_interface rumble; int ret; -#ifdef __MACH__ + msg_interface_version = 0; + environ_cb(RETRO_ENVIRONMENT_GET_MESSAGE_INTERFACE_VERSION, &msg_interface_version); + +#if defined(__MACH__) && !defined(TVOS) // magic sauce to make the dynarec work on iOS syscall(SYS_ptrace, 0 /*PTRACE_TRACEME*/, 0, 0, 0); #endif @@ -2605,7 +2986,7 @@ void retro_init(void) psxUnmapHook = pl_3ds_munmap; #endif #ifdef VITA - if(init_vita_mmap()<0) + if (init_vita_mmap() < 0) abort(); psxMapHook = pl_vita_mmap; psxUnmapHook = pl_vita_munmap; @@ -2613,13 +2994,14 @@ void retro_init(void) ret = emu_core_preinit(); #ifdef _3DS /* emu_core_preinit sets the cpu to dynarec */ - if(!__ctr_svchax) + if (!__ctr_svchax) Config.Cpu = CPU_INTERPRETER; #endif ret |= init_memcards(); ret |= emu_core_init(); - if (ret != 0) { + if (ret != 0) + { SysPrintf("PCSX init failed.\n"); exit(1); } @@ -2627,7 +3009,8 @@ void retro_init(void) #ifdef _3DS vout_buf = linearMemAlign(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2, 0x80); #elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && !defined(VITA) && !defined(__SWITCH__) - posix_memalign(&vout_buf, 16, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2); + if (posix_memalign(&vout_buf, 16, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2) != 0) + vout_buf = (void *) 0; #else vout_buf = malloc(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2); #endif @@ -2638,7 +3021,7 @@ void retro_init(void) environ_cb(RETRO_ENVIRONMENT_GET_CAN_DUPE, &vout_can_dupe); - disk_initial_index = 0; + disk_initial_index = 0; disk_initial_path[0] = '\0'; if (environ_cb(RETRO_ENVIRONMENT_GET_DISK_CONTROL_INTERFACE_VERSION, &dci_version) && (dci_version >= 1)) environ_cb(RETRO_ENVIRONMENT_SET_DISK_CONTROL_EXT_INTERFACE, &disk_control_ext); @@ -2652,9 +3035,9 @@ void retro_init(void) /* Set how much slower PSX CPU runs * 100 (so that 200 is 2 times) * we have to do this because cache misses and some IO penalties * are not emulated. Warning: changing this may break compatibility. */ - cycle_multiplier = 175; -#ifdef HAVE_PRE_ARMV7 - cycle_multiplier = 200; + Config.cycle_multiplier = CYCLE_MULT_DEFAULT; +#if defined(HAVE_PRE_ARMV7) && !defined(_3DS) + Config.cycle_multiplier = 200; #endif pl_rearmed_cbs.gpu_peops.iUseDither = 1; pl_rearmed_cbs.gpu_peops.dwActFixes = GPU_PEOPS_OLD_FRAME_SKIP; @@ -2674,7 +3057,8 @@ void retro_init(void) void retro_deinit(void) { - if (plugins_opened) { + if (plugins_opened) + { ClosePlugins(); plugins_opened = 0; } @@ -2690,21 +3074,40 @@ void retro_deinit(void) deinit_vita_mmap(); #endif libretro_supports_bitmasks = false; + libretro_supports_option_categories = false; + + show_input_settings = true; +#ifdef GPU_PEOPS + show_advanced_gpu_peops_settings = true; +#endif +#ifdef GPU_UNAI + show_advanced_gpu_unai_settings = true; +#endif /* Have to reset disks struct, otherwise * fnames/flabels will leak memory */ disk_init(); + frameskip_type = FRAMESKIP_NONE; + frameskip_threshold = 0; + frameskip_interval = 0; + frameskip_counter = 0; + retro_audio_buff_active = false; + retro_audio_buff_occupancy = 0; + retro_audio_buff_underrun = false; + retro_audio_latency = 0; + update_audio_latency = false; } #ifdef VITA #include -int usleep (unsigned long us) +int usleep(unsigned long us) { sceKernelDelayThread(us); } #endif -void SysPrintf(const char *fmt, ...) { +void SysPrintf(const char *fmt, ...) +{ va_list list; char msg[512]; @@ -2715,3 +3118,17 @@ void SysPrintf(const char *fmt, ...) { if (log_cb) log_cb(RETRO_LOG_INFO, "%s", msg); } + +/* Prints debug-level logs */ +void SysDLog(const char *fmt, ...) +{ + va_list list; + char msg[512]; + + va_start(list, fmt); + vsprintf(msg, fmt, list); + va_end(list); + + if (log_cb) + log_cb(RETRO_LOG_DEBUG, "%s", msg); +}