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

diff --git a/frontend/common/input.h b/frontend/common/input.h
index e82ecaae..1f904250 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)
@@ -58,7 +59,8 @@ enum {
 	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 {
@@ -77,16 +79,18 @@ typedef struct {
 	void (*free)(void *drv_data);
 	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);
 	int  (*get_key_code)(const char *key_name);
 	const char * (*get_key_name)(int keycode);
+
+	const struct in_default_bind *defbinds;
 } in_drv_t;
 
 struct in_default_bind {
@@ -96,7 +100,7 @@ struct in_default_bind {
 };
 
 /* to be called by drivers */
-int  in_register_driver(const in_drv_t *drv);
+int  in_register_driver(const in_drv_t *drv, const struct in_default_bind *defbinds);
 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);
@@ -105,6 +109,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);