1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
|
From d1acb3b0e44c3d519cb181d073ee1567c6fcf3ea Mon Sep 17 00:00:00 2001
From: "Luke D. Jones" <luke@ljones.dev>
Date: Sun, 6 Oct 2024 19:49:24 +1300
Subject: [PATCH 16/29] hid-asus-ally: add anti-deadzones
Signed-off-by: Luke D. Jones <luke@ljones.dev>
---
drivers/hid/hid-asus-ally.c | 110 ++++++++++++++++++++++++++++++++++++
drivers/hid/hid-asus-ally.h | 2 +
2 files changed, 112 insertions(+)
diff --git a/drivers/hid/hid-asus-ally.c b/drivers/hid/hid-asus-ally.c
index 4a3e7cea1c5e..ff1c2cf61e66 100644
--- a/drivers/hid/hid-asus-ally.c
+++ b/drivers/hid/hid-asus-ally.c
@@ -286,6 +286,9 @@ struct ally_gamepad_cfg {
struct deadzone rs_dz; // right stick
struct deadzone lt_dz; // left trigger
struct deadzone rt_dz; // right trigger
+ /* anti-deadzones */
+ u8 ls_adz; // left stick
+ u8 rs_adz; // right stick
};
/* The hatswitch outputs integers, we use them to index this X|Y pair */
@@ -608,7 +611,109 @@ ALLY_DEADZONES(axis_xy_right, rs_dz);
ALLY_DEADZONES(axis_z_left, lt_dz);
ALLY_DEADZONES(axis_z_right, rt_dz);
+/* ANTI-DEADZONES *********************************************************************************/
+static ssize_t _gamepad_apply_js_ADZ(struct hid_device *hdev,
+ struct ally_gamepad_cfg *ally_cfg)
+{
+ u8 *hidbuf;
+ int ret;
+
+ hidbuf = kzalloc(FEATURE_ROG_ALLY_REPORT_SIZE, GFP_KERNEL);
+ if (!hidbuf)
+ return -ENOMEM;
+
+ hidbuf[0] = FEATURE_ROG_ALLY_REPORT_ID;
+ hidbuf[1] = FEATURE_ROG_ALLY_CODE_PAGE;
+ hidbuf[2] = xpad_cmd_set_adz;
+ hidbuf[3] = xpad_cmd_len_adz;
+ hidbuf[4] = ally_cfg->ls_adz;
+ hidbuf[5] = ally_cfg->rs_adz;
+
+ ret = ally_gamepad_check_ready(hdev);
+ if (ret < 0)
+ goto report_fail;
+
+ ret = asus_dev_set_report(hdev, hidbuf, FEATURE_ROG_ALLY_REPORT_SIZE);
+ if (ret < 0)
+ goto report_fail;
+
+report_fail:
+ kfree(hidbuf);
+ return ret;
+}
+
+static void _gamepad_set_anti_deadzones_default(struct ally_gamepad_cfg *ally_cfg)
+{
+ ally_cfg->ls_adz = 0x00;
+ ally_cfg->rs_adz = 0x00;
+}
+
+static ssize_t _gamepad_js_ADZ_store(struct device *dev, const char *buf, u8 *adz)
+{
+ int ret, val;
+
+ ret = kstrtoint(buf, 0, &val);
+ if (ret)
+ return ret;
+
+ if (val < 0 || val > 32)
+ return -EINVAL;
+
+ *adz = val;
+
+ return ret;
+}
+
+static ssize_t axis_xy_left_anti_deadzone_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct ally_gamepad_cfg *ally_cfg = drvdata.gamepad_cfg;
+
+ return sysfs_emit(buf, "%d\n", ally_cfg->ls_adz);
+}
+
+static ssize_t axis_xy_left_anti_deadzone_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct ally_gamepad_cfg *ally_cfg = drvdata.gamepad_cfg;
+ int ret;
+
+ ret = _gamepad_js_ADZ_store(dev, buf, &ally_cfg->ls_adz);
+ if (ret)
+ return ret;
+
+ return count;
+}
+ALLY_DEVICE_ATTR_RW(axis_xy_left_anti_deadzone, anti_deadzone);
+
+static ssize_t axis_xy_right_anti_deadzone_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct ally_gamepad_cfg *ally_cfg = drvdata.gamepad_cfg;
+
+ return sysfs_emit(buf, "%d\n", ally_cfg->rs_adz);
+}
+
+static ssize_t axis_xy_right_anti_deadzone_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct ally_gamepad_cfg *ally_cfg = drvdata.gamepad_cfg;
+ int ret;
+
+ ret = _gamepad_js_ADZ_store(dev, buf, &ally_cfg->rs_adz);
+ if (ret)
+ return ret;
+
+ return count;
+}
+ALLY_DEVICE_ATTR_RW(axis_xy_right_anti_deadzone, anti_deadzone);
+
static struct attribute *axis_xy_left_attrs[] = {
+ &dev_attr_axis_xy_left_anti_deadzone.attr,
&dev_attr_axis_xy_left_deadzone.attr,
&dev_attr_axis_xyz_deadzone_index.attr,
NULL
@@ -619,6 +724,7 @@ static const struct attribute_group axis_xy_left_attr_group = {
};
static struct attribute *axis_xy_right_attrs[] = {
+ &dev_attr_axis_xy_right_anti_deadzone.attr,
&dev_attr_axis_xy_right_deadzone.attr,
&dev_attr_axis_xyz_deadzone_index.attr,
NULL
@@ -813,6 +919,9 @@ static ssize_t _gamepad_apply_all(struct hid_device *hdev, struct ally_gamepad_c
if (ret < 0)
return ret;
ret = _gamepad_apply_deadzones(hdev, ally_cfg);
+ if (ret < 0)
+ return ret;
+ ret = _gamepad_apply_js_ADZ(hdev, ally_cfg);
if (ret < 0)
return ret;
@@ -1059,6 +1168,7 @@ static struct ally_gamepad_cfg *ally_gamepad_cfg_create(struct hid_device *hdev)
ally_cfg->vibration_intensity[0] = 0x64;
ally_cfg->vibration_intensity[1] = 0x64;
_gamepad_set_deadzones_default(ally_cfg);
+ _gamepad_set_anti_deadzones_default(ally_cfg);
drvdata.gamepad_cfg = ally_cfg; // Must asign before attr group setup
if (sysfs_create_groups(&hdev->dev.kobj, gamepad_device_attr_groups)) {
diff --git a/drivers/hid/hid-asus-ally.h b/drivers/hid/hid-asus-ally.h
index 32ed5caa3759..69f59592dd50 100644
--- a/drivers/hid/hid-asus-ally.h
+++ b/drivers/hid/hid-asus-ally.h
@@ -28,6 +28,7 @@ enum xpad_cmd {
xpad_cmd_set_leds = 0x08,
xpad_cmd_check_ready = 0x0A,
xpad_cmd_set_turbo = 0x0F,
+ xpad_cmd_set_adz = 0x18,
};
/* the xpad_cmd determines which feature is set or queried */
@@ -38,6 +39,7 @@ enum xpad_cmd_len {
xpad_cmd_len_vibe_intensity = 0x02,
xpad_cmd_len_leds = 0x0C,
xpad_cmd_len_turbo = 0x20,
+ xpad_cmd_len_adz = 0x02,
};
/* Values correspond to the actual HID byte value required */
--
2.48.1
|