X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fcommon%2Finput.h;h=e82ecaae9df2ac52022f34954d514fb612a9fa5c;hp=bcafaa51b68af3842824aebad425f4475b38146c;hb=90f1c767f07b95fe39a344eaa96f629cd7efe1ba;hpb=0079b7b467ff6ba790f4db035be1f9c0178f5748

diff --git a/frontend/common/input.h b/frontend/common/input.h
index bcafaa51..e82ecaae 100644
--- a/frontend/common/input.h
+++ b/frontend/common/input.h
@@ -19,6 +19,9 @@
 
 #define PBTN_MENU  (1 << 10)
 
+// TODO: move to pico
+#if 0
+
 /* ui events */
 #define PEVB_VOL_DOWN   30
 #define PEVB_VOL_UP     29
@@ -48,14 +51,7 @@
 
 #define PEV_MASK 0x7ff80000
 
-
-enum {
-	IN_DRVID_UNKNOWN = 0,
-	IN_DRVID_GP2X,
-	IN_DRVID_EVDEV,
-	IN_DRVID_VK,
-	IN_DRVID_COUNT,
-};
+#endif
 
 enum {
 	IN_CFG_BIND_COUNT = 0,
@@ -79,11 +75,14 @@ typedef struct {
 	const char *prefix;
 	void (*probe)(void);
 	void (*free)(void *drv_data);
-	int  (*get_bind_count)(void);
+	const char * const *
+	     (*get_key_names)(int *count);
 	void (*get_def_binds)(int *binds);
 	int  (*clean_binds)(void *drv_data, int *binds, int *def_finds);
 	int  (*get_config)(void *drv_data, int what, int *val);
 	int  (*set_config)(void *drv_data, int what, int val);
+	int  (*update)(void *drv_data, const int *binds, int *result);
+	/* return -1 on no event, -2 on error */
 	int  (*update_keycode)(void *drv_data, int *is_down);
 	int  (*menu_translate)(void *drv_data, int keycode);
 	int  (*get_key_code)(const char *key_name);
@@ -97,7 +96,8 @@ struct in_default_bind {
 };
 
 /* to be called by drivers */
-void in_register(const char *nname, int drv_id, int drv_fd_hnd, void *drv_data,
+int  in_register_driver(const in_drv_t *drv);
+void in_register(const char *nname, int drv_fd_hnd, void *drv_data,
 		int key_count, const char * const *key_names, int combos);
 void in_combos_find(const int *binds, int last_key, int *combo_keys, int *combo_acts);
 int  in_combos_do(int keys, const int *binds, int last_key, int combo_keys, int combo_acts);