input: use enum for set/get _config

better visible in gdb

diff --git a/in_sdl.c b/in_sdl.c
index 9a8c9ba..3fdc01a 100644 (file)
--- a/in_sdl.c
+++ b/in_sdl.c
@@ -620,7 +620,7 @@ static int in_sdl_clean_binds(void *drv_data, int *binds, int *def_finds)
        return cnt;
 }
 
-static int in_sdl_get_config(void *drv_data, int what, int *val)
+static int in_sdl_get_config(void *drv_data, enum in_cfg_opt what, int *val)
 {
        struct in_sdl_state *state = drv_data;
 

diff --git a/input.c b/input.c
index 2fb1b10..92b47a2 100644 (file)
--- a/input.c
+++ b/input.c
@@ -564,7 +564,7 @@ const int *in_get_dev_kbd_def_binds(int dev_id)
        return dev->kbd_binds;
 }
 
-int in_get_config(int dev_id, int what, void *val)
+int in_get_config(int dev_id, enum in_cfg_opt what, void *val)
 {
        int *ival = val;
        in_dev_t *dev;
@@ -619,7 +619,7 @@ static int in_set_blocking(int is_blocking)
        return 0;
 }
 
-int in_set_config(int dev_id, int what, const void *val, int size)
+int in_set_config(int dev_id, enum in_cfg_opt what, const void *val, size_t size)
 {
        const char * const *names;
        const int *ival = val;
@@ -1063,8 +1063,8 @@ void in_debug_dump(void)
 
 static void in_def_free(void *drv_data) {}
 static int  in_def_clean_binds(void *drv_data, int *b, int *db) { return 1; }
-static int  in_def_get_config(void *drv_data, int what, int *val) { return -1; }
-static int  in_def_set_config(void *drv_data, int what, int val) { return -1; }
+static int  in_def_get_config(void *drv_data, enum in_cfg_opt what, int *val) { return -1; }
+static int  in_def_set_config(void *drv_data, enum in_cfg_opt what, int val) { return -1; }
 static int  in_def_update_analog(void *drv_data, int axis_id, int *result) { return -1; }
 static int  in_def_update_pointer(void *drv_data, int id, int *result) { return -1; }
 static int  in_def_update_keycode(void *drv_data, int *is_down) { return 0; }

diff --git a/input.h b/input.h
index ee1dfd4..4fcdbde 100644 (file)
--- a/input.h
+++ b/input.h
@@ -1,6 +1,8 @@
 #ifndef INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc
 #define INCLUDE_uXt8Z4R7EMpuEEtvSibXjNhKH3741VNc 1
 
+#include <stdlib.h>
+
 #define IN_MAX_DEVS 10
 #define IN_ABS_RANGE 1024      /* abs must be centered at 0, move upto +- this */
 
@@ -51,7 +53,7 @@
 
 #endif
 
-enum {
+enum in_cfg_opt {
        IN_CFG_BIND_COUNT = 0,
        IN_CFG_DOES_COMBOS,
        IN_CFG_BLOCKING,
@@ -84,8 +86,8 @@ struct InputDriver {
        const char * const *
             (*get_key_names)(const in_drv_t *drv, int *count);
        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  (*get_config)(void *drv_data, enum in_cfg_opt what, int *val);
+       int  (*set_config)(void *drv_data, enum in_cfg_opt what, int val);
        int  (*update)(void *drv_data, const int *binds, int *result);
        int  (*update_kbd)(void *drv_data, const int *binds, int *result);
        int  (*update_analog)(void *drv_data, int axis_id, int *result);
@@ -144,8 +146,8 @@ int  in_menu_wait(int interesting, char *charcode, int autorep_delay_ms);
 int  in_config_parse_dev(const char *dev_name);
 int  in_config_bind_key(int dev_id, const char *key, int binds, int bind_type);
 int  in_config_bind_kbd_key(int dev_id, const char *key, int kbd_key);
-int  in_get_config(int dev_id, int what, void *val);
-int  in_set_config(int dev_id, int what, const void *val, int size);
+int  in_get_config(int dev_id, enum in_cfg_opt what, void *val);
+int  in_set_config(int dev_id, enum in_cfg_opt what, const void *val, size_t size);
 int  in_get_key_code(int dev_id, const char *key_name);
 int  in_name_to_id(const char *dev_name);
 int  in_bind_key(int dev_id, int keycode, int mask, int bind_type, int force_unbind);

diff --git a/linux/in_evdev.c b/linux/in_evdev.c
index 21ae00b..49bfa37 100644 (file)
--- a/linux/in_evdev.c
+++ b/linux/in_evdev.c
@@ -429,7 +429,7 @@ static int in_evdev_set_blocking(in_evdev_t *dev, int y)
        return 0;
 }
 
-static int in_evdev_get_config(void *drv_data, int what, int *val)
+static int in_evdev_get_config(void *drv_data, enum in_cfg_opt what, int *val)
 {
        in_evdev_t *dev = drv_data;
 
@@ -444,7 +444,7 @@ static int in_evdev_get_config(void *drv_data, int what, int *val)
        return 0;
 }
 
-static int in_evdev_set_config(void *drv_data, int what, int val)
+static int in_evdev_set_config(void *drv_data, enum in_cfg_opt what, int val)
 {
        in_evdev_t *dev = drv_data;
        int tmp;