notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #86 from andrewlxer/master
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
f9be756
..
08ef052
100644
(file)
--- a/
frontend/libretro.c
+++ b/
frontend/libretro.c
@@
-527,13
+527,13
@@
static void update_controller_port_variable(unsigned port)
if (controller_port_variable(port, &var))
{
if (strcmp(var.value, "standard") == 0)
if (controller_port_variable(port, &var))
{
if (strcmp(var.value, "standard") == 0)
- in_type[
0
] = PSE_PAD_TYPE_STANDARD;
+ in_type[
port
] = PSE_PAD_TYPE_STANDARD;
else if (strcmp(var.value, "analog") == 0)
else if (strcmp(var.value, "analog") == 0)
- in_type[
0
] = PSE_PAD_TYPE_ANALOGPAD;
+ in_type[
port
] = PSE_PAD_TYPE_ANALOGPAD;
else if (strcmp(var.value, "negcon") == 0)
else if (strcmp(var.value, "negcon") == 0)
- in_type[
0
] = PSE_PAD_TYPE_NEGCON;
+ in_type[
port
] = PSE_PAD_TYPE_NEGCON;
else if (strcmp(var.value, "none") == 0)
else if (strcmp(var.value, "none") == 0)
- in_type[
0
] = PSE_PAD_TYPE_NONE;
+ in_type[
port
] = PSE_PAD_TYPE_NONE;
// else 'default' case, do nothing
}
}
// else 'default' case, do nothing
}
}
@@
-638,7
+638,10
@@
void retro_get_system_info(struct retro_system_info *info)
{
memset(info, 0, sizeof(*info));
info->library_name = "PCSX-ReARMed";
{
memset(info, 0, sizeof(*info));
info->library_name = "PCSX-ReARMed";
- info->library_version = "r22";
+#ifndef GIT_VERSION
+#define GIT_VERSION ""
+#endif
+ info->library_version = "r22" GIT_VERSION;
info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u";
info->need_fullpath = true;
}
info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u";
info->need_fullpath = true;
}
@@
-1598,7
+1601,6
@@
void retro_init(void)
if(!__ctr_svchax)
Config.Cpu = CPU_INTERPRETER;
#endif
if(!__ctr_svchax)
Config.Cpu = CPU_INTERPRETER;
#endif
- Config.Cpu = CPU_INTERPRETER;
ret |= emu_core_init();
if (ret != 0) {
ret |= emu_core_init();
if (ret != 0) {