aboutsummaryrefslogtreecommitdiff
path: root/frontend/libretro.c
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/libretro.c')
-rw-r--r--frontend/libretro.c241
1 files changed, 136 insertions, 105 deletions
diff --git a/frontend/libretro.c b/frontend/libretro.c
index ec06527..bdce90e 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -54,10 +54,15 @@ extern char Mcd1Data[MCD_SIZE];
extern char McdDisable[2];
/* PCSX ReARMed core calls and stuff */
-int in_type1, in_type2;
-int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
-int in_a3[2] = { 127, 127 }, in_a4[2] = { 127, 127 };
-int in_keystate;
+int in_type[8] = { PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD,
+ PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD,
+ PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD,
+ PSE_PAD_TYPE_STANDARD, PSE_PAD_TYPE_STANDARD };
+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[8];
+int multitap1 = 0;
+int multitap2 = 0;
int in_enable_vibration = 1;
/* PSX max resolution is 640x512, but with enhancement it's 1024x512 */
@@ -250,7 +255,7 @@ void pl_3ds_munmap(void *ptr, size_t size, enum psxMapTag tag)
#endif
static void *pl_mmap(unsigned int size)
-{
+{
return psxMap(0, size, 0, MAP_TAG_VRAM);
}
@@ -330,6 +335,14 @@ void retro_set_environment(retro_environment_t cb)
{ "pcsx_rearmed_region", "Region; Auto|NTSC|PAL" },
{ "pcsx_rearmed_pad1type", "Pad 1 Type; standard|analog|negcon" },
{ "pcsx_rearmed_pad2type", "Pad 2 Type; standard|analog|negcon" },
+ { "pcsx_rearmed_pad3type", "Pad 3 Type; standard|analog|negcon" },
+ { "pcsx_rearmed_pad4type", "Pad 4 Type; standard|analog|negcon" },
+ { "pcsx_rearmed_pad5type", "Pad 5 Type; standard|analog|negcon" },
+ { "pcsx_rearmed_pad6type", "Pad 6 Type; standard|analog|negcon" },
+ { "pcsx_rearmed_pad7type", "Pad 7 Type; standard|analog|negcon" },
+ { "pcsx_rearmed_pad8type", "Pad 8 Type; standard|analog|negcon" },
+ { "pcsx_rearmed_multitap1", "Multitap 1; disabled|enabled" },
+ { "pcsx_rearmed_multitap2", "Multitap 2; disabled|enabled" },
#ifndef DRC_DISABLE
{ "pcsx_rearmed_drc", "Dynamic recompiler; enabled|disabled" },
#endif
@@ -364,6 +377,7 @@ unsigned retro_api_version(void)
void retro_set_controller_port_device(unsigned port, unsigned device)
{
+ SysPrintf("port %u device %u",port,device);
}
void retro_get_system_info(struct retro_system_info *info)
@@ -388,8 +402,8 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
}
/* savestates */
-size_t retro_serialize_size(void)
-{
+size_t retro_serialize_size(void)
+{
// it's currently 4380651-4397047 bytes,
// but have some reserved for future
return 0x440000;
@@ -475,7 +489,7 @@ static void save_close(void *file)
}
bool retro_serialize(void *data, size_t size)
-{
+{
int ret = SaveState(data);
return ret == 0 ? true : false;
}
@@ -843,7 +857,7 @@ bool retro_load_game(const struct retro_game_info *info)
{ 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "R2" },
{ 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "R3" },
{ 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
- { 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" },
+ { 5, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" },
{ 5, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X" },
{ 5, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y" },
{ 5, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X, "Right Analog X" },
@@ -864,7 +878,7 @@ bool retro_load_game(const struct retro_game_info *info)
{ 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "R2" },
{ 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "R3" },
{ 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
- { 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" },
+ { 6, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" },
{ 6, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X" },
{ 6, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y" },
{ 6, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X, "Right Analog X" },
@@ -885,7 +899,7 @@ bool retro_load_game(const struct retro_game_info *info)
{ 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R2, "R2" },
{ 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_R3, "R3" },
{ 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_SELECT, "Select" },
- { 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" },
+ { 7, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_START, "Start" },
{ 7, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X, "Left Analog X" },
{ 7, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y, "Left Analog Y" },
{ 7, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X, "Right Analog X" },
@@ -984,7 +998,7 @@ bool retro_load_game_special(unsigned game_type, const struct retro_game_info *i
return false;
}
-void retro_unload_game(void)
+void retro_unload_game(void)
{
}
@@ -1037,16 +1051,14 @@ static const unsigned short retro_psx_map[] = {
static void update_variables(bool in_flight)
{
struct retro_variable var;
-
+
var.value = NULL;
var.key = "pcsx_rearmed_frameskip";
-
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
pl_rearmed_cbs.frameskip = atoi(var.value);
var.value = NULL;
var.key = "pcsx_rearmed_region";
-
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
{
Config.PsxAuto = 0;
@@ -1060,27 +1072,108 @@ static void update_variables(bool in_flight)
var.value = NULL;
var.key = "pcsx_rearmed_pad1type";
-
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
{
- in_type1 = PSE_PAD_TYPE_STANDARD;
+ in_type[0] = PSE_PAD_TYPE_STANDARD;
if (strcmp(var.value, "analog") == 0)
- in_type1 = PSE_PAD_TYPE_ANALOGPAD;
- if (strcmp(var.value, "negcon") == 0)
- in_type1 = PSE_PAD_TYPE_NEGCON;
+ in_type[0] = PSE_PAD_TYPE_ANALOGPAD;
+ else if (strcmp(var.value, "negcon") == 0)
+ in_type[0] = PSE_PAD_TYPE_NEGCON;
}
var.value = NULL;
var.key = "pcsx_rearmed_pad2type";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ in_type[1] = PSE_PAD_TYPE_STANDARD;
+ if (strcmp(var.value, "analog") == 0)
+ in_type[1] = PSE_PAD_TYPE_ANALOGPAD;
+ else if (strcmp(var.value, "negcon") == 0)
+ in_type[1] = PSE_PAD_TYPE_NEGCON;
+ }
+ var.value = NULL;
+ var.key = "pcsx_rearmed_pad3type";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
{
- in_type2 = PSE_PAD_TYPE_STANDARD;
+ in_type[2] = PSE_PAD_TYPE_STANDARD;
if (strcmp(var.value, "analog") == 0)
- in_type2 = PSE_PAD_TYPE_ANALOGPAD;
- if (strcmp(var.value, "negcon") == 0)
- in_type2 = PSE_PAD_TYPE_NEGCON;
+ in_type[2] = PSE_PAD_TYPE_ANALOGPAD;
+ else if (strcmp(var.value, "negcon") == 0)
+ in_type[2] = PSE_PAD_TYPE_NEGCON;
+ }
+ var.value = NULL;
+ var.key = "pcsx_rearmed_pad4type";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ in_type[3] = PSE_PAD_TYPE_STANDARD;
+ if (strcmp(var.value, "analog") == 0)
+ in_type[3] = PSE_PAD_TYPE_ANALOGPAD;
+ else if (strcmp(var.value, "negcon") == 0)
+ in_type[3] = PSE_PAD_TYPE_NEGCON;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_pad5type";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ in_type[4] = PSE_PAD_TYPE_STANDARD;
+ if (strcmp(var.value, "analog") == 0)
+ in_type[4] = PSE_PAD_TYPE_ANALOGPAD;
+ else if (strcmp(var.value, "negcon") == 0)
+ in_type[4] = PSE_PAD_TYPE_NEGCON;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_pad6type";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ in_type[5] = PSE_PAD_TYPE_STANDARD;
+ if (strcmp(var.value, "analog") == 0)
+ in_type[5] = PSE_PAD_TYPE_ANALOGPAD;
+ else if (strcmp(var.value, "negcon") == 0)
+ in_type[5] = PSE_PAD_TYPE_NEGCON;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_pad7type";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ in_type[6] = PSE_PAD_TYPE_STANDARD;
+ if (strcmp(var.value, "analog") == 0)
+ in_type[6] = PSE_PAD_TYPE_ANALOGPAD;
+ else if (strcmp(var.value, "negcon") == 0)
+ in_type[6] = PSE_PAD_TYPE_NEGCON;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_pad8type";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ in_type[7] = PSE_PAD_TYPE_STANDARD;
+ if (strcmp(var.value, "analog") == 0)
+ in_type[7] = PSE_PAD_TYPE_ANALOGPAD;
+ else if (strcmp(var.value, "negcon") == 0)
+ in_type[7] = PSE_PAD_TYPE_NEGCON;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_multitap1";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ if (strcmp(var.value, "enabled") == 0)
+ multitap1 = 1;
+ else multitap1 = 0;
+ }
+
+ var.value = NULL;
+ var.key = "pcsx_rearmed_multitap2";
+ if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) || var.value)
+ {
+ if (strcmp(var.value, "enabled") == 0)
+ multitap2 = 1;
+ else multitap2 = 0;
}
#ifdef __ARM_NEON__
@@ -1192,7 +1285,7 @@ static void update_variables(bool in_flight)
else if (strcmp(var.value, "enabled") == 0)
Config.RCntFix = 1;
}
-
+
var.value = "NULL";
var.key = "pcsx_rearmed_inuyasha_fix";
@@ -1217,9 +1310,9 @@ static void update_variables(bool in_flight)
}
}
-void retro_run(void)
+void retro_run(void)
{
- int i, val;
+ int i;
input_poll_cb();
@@ -1227,86 +1320,24 @@ void retro_run(void)
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated)
update_variables(true);
- in_keystate = 0;
- for (i = 0; i < RETRO_PSX_MAP_LEN; i++)
- if (input_state_cb(1, RETRO_DEVICE_JOYPAD, 0, i))
- in_keystate |= retro_psx_map[i];
- in_keystate <<= 16;
- for (i = 0; i < RETRO_PSX_MAP_LEN; i++)
- if (input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, i))
- in_keystate |= retro_psx_map[i];
-
+ // reset all keystate, query libretro for keystate
+ int j;
+ for(i = 0; i < 8; i++) {
+ in_keystate[i] = 0;
+ // 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_type1 == PSE_PAD_TYPE_ANALOGPAD)
- {
- in_a1[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
- in_a1[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
- in_a2[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
- in_a2[1] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
- }
-
- if (in_type2 == PSE_PAD_TYPE_ANALOGPAD)
- {
- in_a3[0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
- in_a3[1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
- in_a4[0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
- in_a4[1] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+ if (in_type[i] == PSE_PAD_TYPE_ANALOGPAD)
+ {
+ in_analog_left[i][0] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+ in_analog_left[i][1] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_LEFT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+ in_analog_right[i][0] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
+ in_analog_right[i][1] = (input_state_cb(i, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 256) + 128;
+ }
}
-
- if (in_type1 == PSE_PAD_TYPE_NEGCON)
- {
- /* left brake */
- if(input_state_cb(0, RETRO_DEVICE_JOYPAD, 0, 12))
- in_a1[1] = 255;
- else
- in_a1[1] = 0;
-
- /* steer */
- in_a2[0] = (input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-
- /* thrust and fire */
- val = ((input_state_cb(0, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 127));
- if(val < -2) {
- in_a1[0] = 256 - val;
- }
- if (val > 2) {
- in_a2[1] = val;
- }
- if(val >= -2 && val <= 2)
- {
- in_a2[1] = 0;
- in_a1[0] = 0;
- }
- }
-
- if (in_type2 == PSE_PAD_TYPE_NEGCON)
- {
- /* left brake */
- if(input_state_cb(1, RETRO_DEVICE_JOYPAD, 0, 12))
- in_a3[1] = 255;
- else
- in_a3[1] = 0;
-
- /* steer */
- in_a4[0] = (input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_X) / 256) + 128;
-
- /* thrust and fire */
- val = ((input_state_cb(1, RETRO_DEVICE_ANALOG, RETRO_DEVICE_INDEX_ANALOG_RIGHT, RETRO_DEVICE_ID_ANALOG_Y) / 127));
- if(val < -2) {
- in_a3[0] = 256 - val;
- }
- if (val > 2) {
- in_a4[1] = val;
- }
- if(val >= -2 && val <= 2)
- {
- in_a4[1] = 0;
- in_a3[0] = 0;
- }
- }
-
-
stop = 0;
psxCpu->Execute();
@@ -1427,7 +1458,7 @@ void retro_init(void)
else
{
SysPrintf("no BIOS files found.\n");
- struct retro_message msg =
+ struct retro_message msg =
{
"no BIOS found, expect bugs!",
180
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-29 00:46:34 +0000