From 4187aa412369213e248ac91ec2ecc086d3901cdf Mon Sep 17 00:00:00 2001
From: Kyoken <kyoken@kyoken.ninja>
Date: Wed, 7 Dec 2022 23:32:03 +0300
Subject: [PATCH] asus: allow empty cells in bindings table and fix pugio
 button bindings

---
 data/devices/asus-rog-pugio.device | 2 +-
 src/driver-asus.c                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/devices/asus-rog-pugio.device b/data/devices/asus-rog-pugio.device
index e470b850..43a6fccc 100644
--- a/data/devices/asus-rog-pugio.device
+++ b/data/devices/asus-rog-pugio.device
@@ -9,4 +9,4 @@ Buttons=10
 Leds=3
 Dpis=2
 DpiRange=100:7200@100
-ButtonMapping=f0;f1;f2;e4;e5;e6;e8;e9;e1;e2
+ButtonMapping=f0;f1;f2;e4;e5;e6;;e8;e9;e1;e2
diff --git a/src/driver-asus.c b/src/driver-asus.c
index 95185c7a..7b569d6c 100644
--- a/src/driver-asus.c
+++ b/src/driver-asus.c
@@ -439,7 +439,7 @@ asus_driver_probe(struct ratbag_device *device)
 	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++) {
+	for (unsigned int i = 0; i < ASUS_MAX_NUM_BUTTON; i++) {
 		drv_data->button_mapping[i] = bm[i] != -1 ? bm[i] : ASUS_CONFIG_BUTTON_MAPPING[i];
 		drv_data->button_indices[i] = -1;
 	}
@@ -450,7 +450,7 @@ asus_driver_probe(struct ratbag_device *device)
 		struct asus_button *asus_button = &ASUS_BUTTON_MAPPING[i];
 
 		/* search for this button in the ButtonMapping by it's ASUS code */
-		for (unsigned int j = 0; j < button_count; j++) {
+		for (unsigned int j = 0; j < ASUS_MAX_NUM_BUTTON; j++) {
 			if (drv_data->button_mapping[j] == (int)asus_button->asus_code) {
 				/* add button to indices array */
 				drv_data->button_indices[button_index] = (int)j;