From f9286536f82cf3eef3eb5f90d19ce9f76745c13b Mon Sep 17 00:00:00 2001
From: Kyoken <kyoken@kyoken.ninja>
Date: Fri, 25 Nov 2022 23:56:41 +0300
Subject: [PATCH] asus: fix button mapping type

---
 src/driver-asus.c    | 8 ++++----
 src/libratbag-data.c | 6 +++---
 src/libratbag-data.h | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/driver-asus.c b/src/driver-asus.c
index e71ed76c..95185c7a 100644
--- a/src/driver-asus.c
+++ b/src/driver-asus.c
@@ -38,7 +38,7 @@
 #include "asus.h"
 
 /* ButtonMapping configuration property defaults */
-static int8_t ASUS_CONFIG_BUTTON_MAPPING[] = {
+static int ASUS_CONFIG_BUTTON_MAPPING[] = {
 	0xf0,  /* left */
 	0xf1,  /* right (button 3 in xev) */
 	0xf2,  /* middle (button 2 in xev) */
@@ -70,7 +70,7 @@ static unsigned int ASUS_LED_MODE[] = {
 
 struct asus_data {
 	uint8_t is_ready;
-	int8_t button_mapping[ASUS_MAX_NUM_BUTTON];
+	int button_mapping[ASUS_MAX_NUM_BUTTON];
 	int button_indices[ASUS_MAX_NUM_BUTTON];
 };
 
@@ -436,7 +436,7 @@ asus_driver_probe(struct ratbag_device *device)
 	dpi_count = ratbag_device_data_asus_get_dpi_count(device->data);
 	button_count = ratbag_device_data_asus_get_button_count(device->data);
 	led_count = ratbag_device_data_asus_get_led_count(device->data);
-	const int8_t *bm = ratbag_device_data_asus_get_button_mapping(device->data);
+	const int *bm = ratbag_device_data_asus_get_button_mapping(device->data);
 
 	/* merge ButtonMapping configuration property with defaults */
 	for (unsigned int i = 0; i < button_count; i++) {
@@ -451,7 +451,7 @@ asus_driver_probe(struct ratbag_device *device)
 
 		/* search for this button in the ButtonMapping by it's ASUS code */
 		for (unsigned int j = 0; j < button_count; j++) {
-			if (drv_data->button_mapping[j] == (int8_t) asus_button->asus_code) {
+			if (drv_data->button_mapping[j] == (int)asus_button->asus_code) {
 				/* add button to indices array */
 				drv_data->button_indices[button_index] = (int)j;
 				log_debug(device->ratbag, "Button %d is mapped to 0x%02x\n",
diff --git a/src/libratbag-data.c b/src/libratbag-data.c
index d7b26616..cbf941f6 100644
--- a/src/libratbag-data.c
+++ b/src/libratbag-data.c
@@ -99,7 +99,7 @@ struct data_steelseries {
 struct data_asus {
 	int profile_count;
 	int button_count;
-	int8_t button_mapping[ASUS_MAX_NUM_BUTTON];
+	int button_mapping[ASUS_MAX_NUM_BUTTON];
 	int led_count;
 	int dpi_count;
 	int is_wireless;
@@ -373,7 +373,7 @@ init_data_asus(struct ratbag *ratbag,
 	_cleanup_(g_strfreevp) char **button_mapping = g_key_file_get_string_list(keyfile, group, "ButtonMapping", &button_mapping_count, &error);
 	if (!error && button_mapping) {
 		for (unsigned int i = 0; i < button_mapping_count; i++) {
-			data->asus.button_mapping[i] = (int8_t) strtoul(button_mapping[i], NULL, 16);
+			data->asus.button_mapping[i] = strtoul(button_mapping[i], NULL, 16);
 		}
 	}
 	g_clear_error(&error);
@@ -897,7 +897,7 @@ ratbag_device_data_asus_get_button_count(const struct ratbag_device_data *data)
 	return data->asus.button_count;
 }
 
-const int8_t *
+const int *
 ratbag_device_data_asus_get_button_mapping(const struct ratbag_device_data *data)
 {
 	assert(data->drivertype == ASUS);
diff --git a/src/libratbag-data.h b/src/libratbag-data.h
index 93d83f32..bd9af51d 100644
--- a/src/libratbag-data.h
+++ b/src/libratbag-data.h
@@ -156,7 +156,7 @@ ratbag_device_data_asus_get_button_count(const struct ratbag_device_data *data);
 /**
  * @return Array of button indices, which are used for reading and writing button actions
  */
-const int8_t *
+const int *
 ratbag_device_data_asus_get_button_mapping(const struct ratbag_device_data *data);
 
 /**