X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=59bb4f0ddf1a9d1e9dee8bc04f68e49b85ebc28d;hb=8741f7a2c86f4ab6e655e45927f16d94dde4cc30;hp=9d99413ae6966576ec57ca7654cfa1a7fc188984;hpb=b2aef32156f90092d1c4ef2611c64ba778e4484f;p=pcsx_rearmed.git diff --git a/frontend/libretro.c b/frontend/libretro.c index 9d99413a..59bb4f0d 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -43,6 +43,10 @@ #define MIN(a, b) ((a) < (b) ? (a) : (b)) #endif +#ifndef MAX +#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')) //hack to prevent retroarch freezing when reseting in the menu but not while running with the hot key @@ -131,24 +135,26 @@ static void init_memcard(char *mcd_data) } } -static void vout_set_mode(int w, int h, int raw_w, int raw_h, int bpp) +static void set_vout_fb() { - vout_width = w; - vout_height = h; - 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; - } + 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; + + set_vout_fb(); } #ifndef FRONTEND_SUPPORTS_RGB565 @@ -437,7 +443,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" }, @@ -1251,7 +1257,6 @@ bool retro_load_game(const struct retro_game_info *info) plugin_call_rearmed_cbs(); dfinput_activate(); - Config.PsxAuto = 1; if (CheckCdrom() == -1) { log_cb(RETRO_LOG_INFO, "unsupported/invalid CD image: %s\n", info->path); return false; @@ -1340,7 +1345,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; @@ -1533,6 +1538,38 @@ static void update_variables(bool in_flight) } } +// Taken from beetle-psx-libretro +static uint16_t get_analog_button(retro_input_state_t input_state_cb, int player_index, int id) +{ + uint16_t button; + + // NOTE: Analog buttons were added Nov 2017. Not all front-ends support this + // feature (or pre-date it) so we need to handle this in a graceful way. + + // First, try and get an analog value using the new libretro API constant + button = input_state_cb(player_index, + RETRO_DEVICE_ANALOG, + RETRO_DEVICE_INDEX_ANALOG_BUTTON, + id); + button = MIN(button / 128, 255); + + if (button == 0) + { + // If we got exactly zero, we're either not pressing the button, or the front-end + // is not reporting analog values. We need to do a second check using the classic + // digital API method, to at least get some response - better than nothing. + + // NOTE: If we're really just not holding the button, we're still going to get zero. + + button = input_state_cb(player_index, + RETRO_DEVICE_JOYPAD, + 0, + id) ? 255 : 0; + } + + return button; +} + void retro_run(void) { int i; @@ -1556,17 +1593,83 @@ void retro_run(void) if (in_type[i] == PSE_PAD_TYPE_NONE) continue; - // query libretro for keystate - for (j = 0; j < RETRO_PSX_MAP_LEN; j++) - if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, j)) - in_keystate[i] |= retro_psx_map[j]; - - if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD) + if (in_type[i] == PSE_PAD_TYPE_NEGCON) + { + // Query digital inputs + // + // > Pad-Up + if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_UP)){ + in_keystate[i] |= (1 << DKEY_UP); + } + // > Pad-Right + if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_RIGHT)){ + in_keystate[i] |= (1 << DKEY_RIGHT); + } + // > Pad-Down + if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_DOWN)){ + in_keystate[i] |= (1 << DKEY_DOWN); + } + // > Pad-Left + if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_LEFT)){ + in_keystate[i] |= (1 << DKEY_LEFT); + } + // > Start + if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START)){ + in_keystate[i] |= (1 << DKEY_START); + } + // > neGcon A + if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_A)){ + in_keystate[i] |= (1 << DKEY_CIRCLE); + } + // > neGcon B + if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_X)){ + in_keystate[i] |= (1 << DKEY_TRIANGLE); + } + // > neGcon R shoulder (digital) + if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, 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 + in_analog_right[i][0] = MIN((input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 255) + 128, 255); + // > NeGcon I + in_analog_right[i][1] = MAX( + get_analog_button(input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_R2), + get_analog_button(input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_B) + ); + // > NeGcon II + in_analog_left[i][0] = MAX( + get_analog_button(input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_L2), + get_analog_button(input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_Y) + ); + // > NeGcon L + in_analog_left[i][1] = get_analog_button(input_state_cb, i, RETRO_DEVICE_ID_JOYPAD_L); + } + else { - 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); + // Query digital inputs + for (j = 0; j < RETRO_PSX_MAP_LEN; j++){ + if (input_state_cb(i, RETRO_DEVICE_JOYPAD, 0, j)){ + in_keystate[i] |= retro_psx_map[j]; + } + } + // Query analog inputs + if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD) + { + 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); + } } } @@ -1576,6 +1679,8 @@ void retro_run(void) 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) @@ -1620,7 +1725,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; @@ -1640,7 +1745,10 @@ static void check_system_specs(void) void retro_init(void) { - const char *bios[] = { "SCPH101", "SCPH7001", "SCPH5501", "SCPH1001" }; + const char *bios[] = { + "SCPH101", "SCPH7001", "SCPH5501", "SCPH1001", + "scph101", "scph7001", "scph5501", "scph1001" + }; const char *dir; char path[256]; int i, ret; @@ -1690,7 +1798,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;