X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fpandora.c;h=b82c78a498ac2df4af63cb993f63259834c470ec;hp=cd50728efb2756ca8cd31e0420633bdc0f5e44d8;hb=056d67598872b0bac092878972633d6c10aa0ad6;hpb=43bca6fbee5f6b26ee02e8850bf7dace8d63336b

diff --git a/frontend/pandora.c b/frontend/pandora.c
index cd50728e..b82c78a4 100644
--- a/frontend/pandora.c
+++ b/frontend/pandora.c
@@ -17,6 +17,7 @@
 
 #include "common/input.h"
 #include "plugin_lib.h"
+#include "main.h"
 
 static int fdnub[2];
 static int analog_init_done;
@@ -43,7 +44,6 @@ struct in_default_bind in_evdev_defbinds[] = {
 	{ KEY_DOWN,	IN_BINDTYPE_PLAYER12, DKEY_DOWN },
 	{ KEY_LEFT,	IN_BINDTYPE_PLAYER12, DKEY_LEFT },
 	{ KEY_RIGHT,	IN_BINDTYPE_PLAYER12, DKEY_RIGHT },
-	{ KEY_SPACE,    IN_BINDTYPE_EMU, PEVB_MENU },
 	{ KEY_PAGEUP,	IN_BINDTYPE_PLAYER12, DKEY_TRIANGLE },
 	{ KEY_PAGEDOWN,	IN_BINDTYPE_PLAYER12, DKEY_CROSS },
 	{ KEY_END,	IN_BINDTYPE_PLAYER12, DKEY_CIRCLE },
@@ -54,6 +54,13 @@ struct in_default_bind in_evdev_defbinds[] = {
 	{ KEY_RIGHTCTRL, IN_BINDTYPE_PLAYER12, DKEY_R1 },
 	{ KEY_Q,	IN_BINDTYPE_PLAYER12, DKEY_L2 },
 	{ KEY_P,	IN_BINDTYPE_PLAYER12, DKEY_R2 },
+	{ KEY_SPACE,    IN_BINDTYPE_EMU, SACTION_ENTER_MENU },
+	{ KEY_1,        IN_BINDTYPE_EMU, SACTION_SAVE_STATE },
+	{ KEY_2,        IN_BINDTYPE_EMU, SACTION_LOAD_STATE },
+	{ KEY_3,        IN_BINDTYPE_EMU, SACTION_PREV_SSLOT },
+	{ KEY_4,        IN_BINDTYPE_EMU, SACTION_NEXT_SSLOT },
+	{ KEY_5,        IN_BINDTYPE_EMU, SACTION_TOGGLE_FSKIP },
+	{ KEY_6,        IN_BINDTYPE_EMU, SACTION_SCREENSHOT },
 	{ 0, 0, 0 }
 };
 
@@ -144,8 +151,9 @@ void in_update_analogs(void)
 	//printf("%4d %4d %4d %4d\n", in_a1[0], in_a1[1], in_a2[0], in_a2[1]);
 }
 
-int pandora_init(void)
+int pandora_rescan_inputs(void)
 {
+	in_probe();
 	in_set_config(in_name_to_id("evdev:gpio-keys"), IN_CFG_KEY_NAMES,
 		      pandora_gpio_keys, sizeof(pandora_gpio_keys));