Avoid timers cross-referencing

NeroReflex · Jan 15, 2024 · 288a1bc · 288a1bc
1 parent 75c19ea
commit 288a1bc
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/rog_ally.c b/rog_ally.c
@@ -1166,8 +1166,11 @@ static void rc71l_timer_xbox360(
     uint64_t expired,
     void* user_data
 ) {
-	rc71l_xbox360_user_data_t *const xbox360_data = (rc71l_xbox360_user_data_t*)user_data;
-
+	if (strcmp(timer_name, "RC71L_timer") != 0) {
+		return;
+	}
+
+	rc71l_xbox360_user_data_t *const xbox360_data = (rc71l_xbox360_user_data_t*)user_data;	
 
 	if (conf->rumble_on_mode_switch) {
 		if (xbox360_data->accounted_mode_switches != xbox360_data->mode_switched) {
@@ -1336,7 +1339,10 @@ static void rc71l_hidraw_timer(
     uint64_t expired,
     void* user_data
 ) {
-	// one tick is 60ms
+	// one tick is 60ms, avoid all other timers
+	if (strcmp(timer_name, "RC71L_timer") != 0) {
+		return;
+	}
 
 	rc71l_asus_hidraw_user_data_t *const hidraw_data = (rc71l_asus_hidraw_user_data_t*)user_data;
 	if (hidraw_data == NULL) {
@@ -2016,6 +2022,7 @@ input_dev_t timer_dev = {
 		.timer = {
 			.name = "RC71L_timer",
 			.ticktime_ms = 60,
+			.ticktime_ns = 0,
 		}
 	},
 	.user_data = &timer_user_data,