Merge branch 'clean' into main

Author: dqh-au

vice/src/arch/gtk3/joystickdrv/joystick_linux_evdev.c

@@ -336,8 +336,6 @@ static void scan_axes(joystick_device_t *joydev, struct libevdev *evdev)
                 if (info != NULL) {
                     axis->minimum = info->minimum;
                     axis->maximum = info->maximum;
-                    /* FIXME: Workaround for bug #2161 (should be fixed one layer above) */
-                    axis->digital = (info->minimum == -1) && (info->maximum == 1);
                 }
                 /* joydev takes ownership of axis */
                 joystick_device_add_axis(joydev, axis);

vice/src/joyport/joystick.c

@@ -4041,13 +4041,17 @@ void joystick_device_add_axis(joystick_device_t *joydev,
                                    sizeof *joydev->axes * (size_t)joydev->max_axes);
     }
 
+    /* Digital axis detection */
+    axis->digital = (axis->minimum == -1 && axis->maximum == 1);
+
     /* set default calibration */
     joystick_calibration_default_for_axis(axis);
 #if 0
-    printf("AXIS %d: min: %d, N-threshold: %d, P-threshold: %d, max: %d\n",
+    printf("AXIS %d: min: %d, N-threshold: %d, P-threshold: %d, max: %d, digital: %d\n",
            joydev->num_axes,
            axis->minimum, axis->calibration.threshold.negative,
-           axis->calibration.threshold.positive, axis->maximum);
+           axis->calibration.threshold.positive, axis->maximum,
+           axis->digital);
 #endif
     /* store parent device */
     axis->device = joydev;