Skip to contentSkip to conversation

Input: adc-joystick: Handle inverted axes

PATCH Superseded Chris Morgan 2 participants 4 messages Jan 15, 2024 – Jun 7, 2024

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 Input: adc-joystick: Handle inverted axes

From: Chris Morgan <[email protected]>

When one or more axes are inverted, (where min > max), normalize the data so that min < max and invert the values reported to the input stack.

This ensures we can continue defining the device correctly in the device tree while not breaking downstream assumptions that min is always less than max.

---
Changes since V2:
- Explicitly set bool value to "true" instead of "1".
- Split adc_joystick_invert() function definition to 2 lines.
- Corrected changes message location.
Changes since V1:
- Moved proposed helper for inversion from input stack to adc-joystick driver.

 drivers/input/joystick/adc-joystick.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/input/joystick/adc-joystick.c +21 -1
index c0deff5d4282..6b155e614b5a 100644
@@ -18,6 +18,7 @@ struct adc_joystick_axis {
 	s32 range[2];
 	s32 fuzz;
 	s32 flat;
+	bool inverted;
 };
 
 struct adc_joystick {
@@ -29,6 +30,15 @@ struct adc_joystick {
 	bool polled;
 };
 
+static int adc_joystick_invert(struct input_dev *dev,
+			       unsigned int axis, int val)
+{
+	int min = dev->absinfo[axis].minimum;
+	int max = dev->absinfo[axis].maximum;
+
+	return (max + min) - val;
+}
+
 static void adc_joystick_poll(struct input_dev *input)
 {
 	struct adc_joystick *joy = input_get_drvdata(input);
@@ -38,6 +48,8 @@ static void adc_joystick_poll(struct input_dev *input)
 		ret = iio_read_channel_raw(&joy->chans[i], &val);
 		if (ret < 0)
 			return;
+		if (joy->axes[i].inverted)
+			val = adc_joystick_invert(input, i, val);
 		input_report_abs(input, joy->axes[i].code, val);
 	}
 	input_sync(input);
@@ -86,6 +98,8 @@ static int adc_joystick_handle(const void *data, void *private)
 			val = sign_extend32(val, msb);
 		else
 			val &= GENMASK(msb, 0);
+		if (joy->axes[i].inverted)
+			val = adc_joystick_invert(joy->input, i, val);
 		input_report_abs(joy->input, joy->axes[i].code, val);
 	}
 
@@ -168,11 +182,17 @@ static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy)
 			goto err_fwnode_put;
 		}
 
+		if (axes[i].range[0] > axes[i].range[1]) {
+			dev_dbg(dev, "abs-axis %d inverted\n", i);
+			axes[i].inverted = true;
+		}
+
 		fwnode_property_read_u32(child, "abs-fuzz", &axes[i].fuzz);
 		fwnode_property_read_u32(child, "abs-flat", &axes[i].flat);
 
 		input_set_abs_params(joy->input, axes[i].code,
-				     axes[i].range[0], axes[i].range[1],
+				     min_array(axes[i].range, 2),
+				     max_array(axes[i].range, 2),
 				     axes[i].fuzz, axes[i].flat);
 		input_set_capability(joy->input, EV_ABS, axes[i].code);
 	}
Signature · 1 line
2.34.1
maintainer
#1 lore raw

Hi Chris,

drivers/input/joystick/adc-joystick.c struct adc_joystick { · line 37

Quoted 6 lines · Chris Morgan
drivers/input/joystick/adc-joystick.c +5 -0
+static int adc_joystick_invert(struct input_dev *dev,
+			       unsigned int axis, int val)
+{
+	int min = dev->absinfo[axis].minimum;
+	int max = dev->absinfo[axis].maximum;

I changed this to input_abs_get_[min|max](dev, axis) to avoid peeking into absinfo and applied.

Thanks.

Signature · 1 line
Dmitry
maintainer
#2 lore raw
Quoted 4 lines · Dmitry Torokhov

Hi Chris,

Quoted 1 line · Chris Morgan
Quoted 8 lines

Review

Quoted 5 lines
(quoted diff) +5 -0
+static int adc_joystick_invert(struct input_dev *dev,
+			       unsigned int axis, int val)
+{
+	int min = dev->absinfo[axis].minimum;
+	int max = dev->absinfo[axis].maximum;

I changed this to input_abs_get_[min|max](dev, axis) to avoid peeking into absinfo and applied.

Apparently min_array() and max_array() are a bit too new. Also I am not sure if they are actually needed. Can we do it like this:

drivers/input/joystick/adc-joystick.c +2 -2
index 10ee13465cfe..916e78e4dc9f 100644
@@ -185,14 +185,14 @@ static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy)
 		if (axes[i].range[0] > axes[i].range[1]) {
 			dev_dbg(dev, "abs-axis %d inverted\n", i);
 			axes[i].inverted = true;
+			swap(axes[i].range[0], axes[i].range[1]);
 		}
 
 		fwnode_property_read_u32(child, "abs-fuzz", &axes[i].fuzz);
 		fwnode_property_read_u32(child, "abs-flat", &axes[i].flat);
 
 		input_set_abs_params(joy->input, axes[i].code,
-				     min_array(axes[i].range, 2),
-				     max_array(axes[i].range, 2),
+				     axes[i].range[0], axes[i].range[1],
 				     axes[i].fuzz, axes[i].flat);
 		input_set_capability(joy->input, EV_ABS, axes[i].code);
 	}

Thanks.

Signature · 1 line
Dmitry
maintainer
#3 lore raw
Quoted 28 lines · Dmitry Torokhov
Quoted 4 lines · Dmitry Torokhov

Hi Chris,

Quoted 1 line · Chris Morgan
Quoted 8 lines

Review

Quoted 5 lines
(quoted diff) +5 -0
+static int adc_joystick_invert(struct input_dev *dev,
+			       unsigned int axis, int val)
+{
+	int min = dev->absinfo[axis].minimum;
+	int max = dev->absinfo[axis].maximum;

I changed this to input_abs_get_[min|max](dev, axis) to avoid peeking into absinfo and applied.

Apparently min_array() and max_array() are a bit too new. Also I am not sure if they are actually needed. Can we do it like this:

drivers/input/joystick/adc-joystick.c +1 -0
index 10ee13465cfe..916e78e4dc9f 100644
@@ -185,14 +185,14 @@ static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy)
 		if (axes[i].range[0] > axes[i].range[1]) {
 			dev_dbg(dev, "abs-axis %d inverted\n", i);
 			axes[i].inverted = true;
+			swap(axes[i].range[0], axes[i].range[1]);
 		}
 

drivers/input/joystick/adc-joystick.c static int adc_joystick_set_axes(struct device *dev, struct adc_joystick *joy) · line 198

Quoted 10 lines
drivers/input/joystick/adc-joystick.c +1 -2
 		fwnode_property_read_u32(child, "abs-fuzz", &axes[i].fuzz);
 		fwnode_property_read_u32(child, "abs-flat", &axes[i].flat);
 
 		input_set_abs_params(joy->input, axes[i].code,
-				     min_array(axes[i].range, 2),
-				     max_array(axes[i].range, 2),
+				     axes[i].range[0], axes[i].range[1],
 				     axes[i].fuzz, axes[i].flat);
 		input_set_capability(joy->input, EV_ABS, axes[i].code);
 	}

OK, I went ahead and folded this into the original patch and applied.

Thanks.

Signature · 1 line
Dmitry