X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fcommon%2Finput.h;h=524366f2e7b18336859a8739bb4796c3eac48b19;hp=6ea14bd1498db095b514a945be90bfff129b64c9;hb=1b0c513996d57548fc5df8726e21a68e5ace4f99;hpb=605e6809b6e7f33153dedb3d6dfa7f7a9aa7c6a8

diff --git a/frontend/common/input.h b/frontend/common/input.h
index 6ea14bd1..524366f2 100644
--- a/frontend/common/input.h
+++ b/frontend/common/input.h
@@ -2,6 +2,7 @@
 #define INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc 1
 
 #define IN_MAX_DEVS 10
+#define IN_ABS_RANGE 1024	/* abs must be centered at 0, move upto +- this */
 
 /* unified menu keys */
 #define PBTN_UP    (1 <<  0)
@@ -19,6 +20,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,21 +52,15 @@
 
 #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,
 	IN_CFG_DOES_COMBOS,
 	IN_CFG_BLOCKING,
 	IN_CFG_KEY_NAMES,
-	IN_CFG_ABS_DEAD_ZONE, /* dead zone for analog-digital mapping */
+	IN_CFG_ABS_DEAD_ZONE,	/* dead zone for analog-digital mapping */
+	IN_CFG_ABS_AXIS_COUNT,	/* number of abs axes (ro) */
 };
 
 enum {
@@ -79,13 +77,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);
+	int  (*update_analog)(void *drv_data, int axis_id, 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);
@@ -100,7 +99,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);
@@ -108,6 +108,7 @@ int  in_combos_do(int keys, const int *binds, int last_key, int combo_keys, int
 void in_init(void);
 void in_probe(void);
 int  in_update(int *result);
+int  in_update_analog(int dev_id, int axis_id, int *value);
 int  in_update_keycode(int *dev_id, int *is_down, int timeout_ms);
 int  in_menu_wait_any(int timeout_ms);
 int  in_menu_wait(int interesting, int autorep_delay_ms);