@@ -1867,6 +1890,396 @@ static struct device_attribute dev_attr_right_trigger_range_upper_limit =
static struct device_attribute dev_attr_right_trigger_range_upper_limit_range =
__ATTR(range_upper_limit_range, 0444, right_trigger_range_upper_limit_range_show, NULL);
+enum ally_joystick_side {
+ JOYSTICK_LEFT = 0,
+ JOYSTICK_RIGHT,
+};
+
+/**
+ * ally_set_joystick_resp_curve() - Set joystick response curve parameters
+ * @ally: ally handheld structure
+ * @hdev: HID device
+ * @side: which joystick side (0=left, 1=right)
+ * @curve: response curve parameter structure
+ *
+ * Return: 0 on success, negative errno on failure
+ */
+static int ally_set_joystick_resp_curve(struct ally_handheld *ally,
+ struct hid_device *hdev, enum ally_joystick_side side,
+ struct ally_joystick_resp_curve *curve)
+{
+ const u8 payload[] = { side,
+ curve->entry_1.move, curve->entry_1.resp,
+ curve->entry_2.move, curve->entry_2.resp,
+ curve->entry_3.move, curve->entry_3.resp,
+ curve->entry_4.move, curve->entry_4.resp
+ };
+ int ret;
+
+ u8 *buf __free(kfree) = ally_alloc_cmd(CMD_SET_RESP_CURVE, payload, sizeof(payload));
+ if (!buf)
+ return -ENOMEM;
+
+ ret = ally_gamepad_send_packet(ally, hdev, buf, ROG_ALLY_REPORT_SIZE);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
+static int response_curve_apply(struct ally_handheld *ally,
+ struct hid_device *hdev,
+ struct ally_config *cfg, bool is_left)
+{
+ struct ally_joystick_resp_curve curve;
+ int ret;
+
+ guard(mutex)(&cfg->config_mutex);
+
+ if (!cfg->resp_curve_support)
+ return -EOPNOTSUPP;
+
+ curve = is_left ? cfg->left_curve : cfg->right_curve;
+
+ if (!(curve.entry_1.move < curve.entry_2.move &&
+ curve.entry_2.move < curve.entry_3.move &&
+ curve.entry_3.move < curve.entry_4.move))
+ return -EINVAL;
+
+ ret = ally_set_joystick_resp_curve(ally, hdev,
+ is_left ? JOYSTICK_LEFT : JOYSTICK_RIGHT,
+ &curve);
+ if (ret) {
+ hid_err(hdev, "Failed to set joystick response curve: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static ssize_t left_response_curve_apply_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct hid_device *hdev = to_hid_device(dev);
+ struct asus_drvdata *drvdata = hid_get_drvdata(hdev);
+ struct ally_handheld *const ally = drvdata->rog_ally;
+ struct ally_config *cfg;
+ bool apply;
+ int ret;
+
+ if (!ally)
+ return -ENODEV;
+
+ cfg = ally_get_config(ally);
+ if (!cfg)
+ return -ENODEV;
+
+ ret = kstrtobool(buf, &apply);
+ if (ret)
+ return ret;
+
+ if (!apply)
+ return count;
+
+ ret = response_curve_apply(ally, hdev, cfg, true);
+ if (ret < 0)
+ return ret;
+
+ return count;
+}
+
+static ssize_t right_response_curve_apply_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ struct hid_device *hdev = to_hid_device(dev);
+ struct asus_drvdata *drvdata = hid_get_drvdata(hdev);
+ struct ally_handheld *const ally = drvdata->rog_ally;
+ struct ally_config *cfg;
+ bool apply;
+ int ret;
+
+ if (!ally)
+ return -ENODEV;
+
+ cfg = ally_get_config(ally);
+ if (!cfg)
+ return -ENODEV;
+
+ ret = kstrtobool(buf, &apply);
+ if (ret)
+ return ret;
+
+ if (!apply)
+ return count;
+
+ ret = response_curve_apply(ally, hdev, cfg, false);
+ if (ret < 0)
+ return ret;
+
+ return count;
+}
+
+static ALLY_DEVICE_ATTR_WO(left_response_curve_apply, response_curve_apply);
+static ALLY_DEVICE_ATTR_WO(right_response_curve_apply, response_curve_apply);
+
+static ssize_t response_curve_pct_show(struct device *dev,
+ char *buf,
+ struct ally_config *cfg, bool is_left,
+ unsigned int idx)
+{
+ struct ally_joystick_resp_curve *curve;
+ int ret = -EINVAL;
+
+ guard(mutex)(&cfg->config_mutex);
+
+ if (!cfg->resp_curve_support)
+ return -EOPNOTSUPP;
+
+ curve = is_left ? &cfg->left_curve : &cfg->right_curve;
+
+ switch (idx) {
+ case 1:
+ ret = sysfs_emit(buf, "%u\n", curve->entry_1.resp);
+ break;
+ case 2:
+ ret = sysfs_emit(buf, "%u\n", curve->entry_2.resp);
+ break;
+ case 3:
+ ret = sysfs_emit(buf, "%u\n", curve->entry_3.resp);
+ break;
+ case 4:
+ ret = sysfs_emit(buf, "%u\n", curve->entry_4.resp);
+ break;
+ }
+
+ return ret;
+}
+
+static ssize_t response_curve_move_show(struct device *dev,
+ char *buf,
+ struct ally_config *cfg, bool is_left,
+ unsigned int idx)
+{
+ struct ally_joystick_resp_curve *curve;
+ int ret = -EINVAL;
+
+ guard(mutex)(&cfg->config_mutex);
+
+ if (!cfg->resp_curve_support)
+ return -EOPNOTSUPP;
+
+ curve = is_left ? &cfg->left_curve : &cfg->right_curve;
+
+ switch (idx) {
+ case 1:
+ ret = sysfs_emit(buf, "%u\n", curve->entry_1.move);
+ break;
+ case 2:
+ ret = sysfs_emit(buf, "%u\n", curve->entry_2.move);
+ break;
+ case 3:
+ ret = sysfs_emit(buf, "%u\n", curve->entry_3.move);
+ break;
+ case 4:
+ ret = sysfs_emit(buf, "%u\n", curve->entry_4.move);
+ break;
+ }
+
+ return ret;
+}
+
+static ssize_t response_curve_pct_store(struct device *dev,
+ const char *buf, size_t count,
+ struct ally_config *cfg, bool is_left,
+ unsigned int idx)
+{
+ struct ally_joystick_resp_curve *curve;
+ u8 value;
+ int ret;
+
+ ret = kstrtou8(buf, 10, &value);
+ if (ret)
+ return ret;
+
+ if (value > 100)
+ return -EINVAL;
+
+ guard(mutex)(&cfg->config_mutex);
+
+ if (!cfg->resp_curve_support)
+ return -EOPNOTSUPP;
+
+ curve = is_left ? &cfg->left_curve : &cfg->right_curve;
+
+ switch (idx) {
+ case 1:
+ curve->entry_1.resp = value;
+ break;
+ case 2:
+ curve->entry_2.resp = value;
+ break;
+ case 3:
+ curve->entry_3.resp = value;
+ break;
+ case 4:
+ curve->entry_4.resp = value;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return count;
+}
+
+static ssize_t response_curve_move_store(struct device *dev,
+ const char *buf, size_t count,
+ struct ally_config *cfg, bool is_left,
+ unsigned int idx)
+{
+ struct ally_joystick_resp_curve *curve;
+ u8 value;
+ int ret;
+
+ ret = kstrtou8(buf, 10, &value);
+ if (ret)
+ return ret;
+
+ if (value > 100)
+ return -EINVAL;
+
+ guard(mutex)(&cfg->config_mutex);
+
+ if (!cfg->resp_curve_support)
+ return -EOPNOTSUPP;
+
+ curve = is_left ? &cfg->left_curve : &cfg->right_curve;
+
+ switch (idx) {
+ case 1:
+ curve->entry_1.move = value;
+ break;
+ case 2:
+ curve->entry_2.move = value;
+ break;
+ case 3:
+ curve->entry_3.move = value;
+ break;
+ case 4:
+ curve->entry_4.move = value;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return count;
+}
+
+#define DEFINE_JS_CURVE_PCT_FOPS(region, side) \
+ static ssize_t side##_response_curve_pct_##region##_show( \
+ struct device *dev, struct device_attribute *attr, \
+ char *buf) \
+ { \
+ struct hid_device *hdev = to_hid_device(dev); \
+ struct asus_drvdata *drvdata = hid_get_drvdata(hdev); \
+ struct ally_handheld *ally = drvdata->rog_ally; \
+ struct ally_config *cfg; \
+ \
+ if (!ally) \
+ return -ENODEV; \
+ \
+ cfg = ally_get_config(ally); \
+ if (!cfg) \
+ return -ENODEV; \
+ \
+ return response_curve_pct_show(dev, buf, cfg, \
+ side##_is_left, region);\
+ } \
+ \
+ static ssize_t side##_response_curve_pct_##region##_store( \
+ struct device *dev, struct device_attribute *attr, \
+ const char *buf, size_t count) \
+ { \
+ struct hid_device *hdev = to_hid_device(dev); \
+ struct asus_drvdata *drvdata = hid_get_drvdata(hdev); \
+ struct ally_handheld *ally = drvdata->rog_ally; \
+ struct ally_config *cfg; \
+ \
+ if (!ally) \
+ return -ENODEV; \
+ \
+ cfg = ally_get_config(ally); \
+ if (!cfg) \
+ return -ENODEV; \
+ \
+ return response_curve_pct_store(dev, buf, count, cfg, \
+ side##_is_left, region);\
+ }
+
+#define DEFINE_JS_CURVE_MOVE_FOPS(region, side) \
+ static ssize_t side##_response_curve_move_##region##_show( \
+ struct device *dev, struct device_attribute *attr, \
+ char *buf) \
+ { \
+ struct hid_device *hdev = to_hid_device(dev); \
+ struct asus_drvdata *drvdata = hid_get_drvdata(hdev); \
+ struct ally_handheld *ally = drvdata->rog_ally; \
+ struct ally_config *cfg; \
+ \
+ if (!ally) \
+ return -ENODEV; \
+ \
+ cfg = ally_get_config(ally); \
+ if (!cfg) \
+ return -ENODEV; \
+ \
+ return response_curve_move_show(dev, buf, cfg, \
+ side##_is_left, region);\
+ } \
+ \
+ static ssize_t side##_response_curve_move_##region##_store( \
+ struct device *dev, struct device_attribute *attr, \
+ const char *buf, size_t count) \
+ { \
+ struct hid_device *hdev = to_hid_device(dev); \
+ struct asus_drvdata *drvdata = hid_get_drvdata(hdev); \
+ struct ally_handheld *ally = drvdata->rog_ally; \
+ struct ally_config *cfg; \
+ \
+ if (!ally) \
+ return -ENODEV; \
+ \
+ cfg = ally_get_config(ally); \
+ if (!cfg) \
+ return -ENODEV; \
+ \
+ return response_curve_move_store(dev, buf, count, cfg, \
+ side##_is_left, region);\
+ }
+
+#define DEFINE_JS_CURVE_ATTRS(region, side) \
+ DEFINE_JS_CURVE_PCT_FOPS(region, side) \
+ DEFINE_JS_CURVE_MOVE_FOPS(region, side) \
+ static ALLY_DEVICE_ATTR_RW(side##_response_curve_pct_##region, \
+ response_curve_pct_##region); \
+ static ALLY_DEVICE_ATTR_RW(side##_response_curve_move_##region, \
+ response_curve_move_##region)
+
+/* Helper defines for "is_left" parameter in DEFINE_JS_CURVE_ATTRS macros */
+#define left_is_left true
+#define right_is_left false
+
+DEFINE_JS_CURVE_ATTRS(1, left);
+DEFINE_JS_CURVE_ATTRS(2, left);
+DEFINE_JS_CURVE_ATTRS(3, left);
+DEFINE_JS_CURVE_ATTRS(4, left);
+
+DEFINE_JS_CURVE_ATTRS(1, right);
+DEFINE_JS_CURVE_ATTRS(2, right);
+DEFINE_JS_CURVE_ATTRS(3, right);
+DEFINE_JS_CURVE_ATTRS(4, right);
+
static struct attribute *ally_config_attrs[] = {
&dev_attr_xbox_controller.attr,
NULL