From nobody Tue Apr 7 13:02:01 2026 Received: from mail-dl1-f43.google.com (mail-dl1-f43.google.com [74.125.82.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E847A374187 for ; Tue, 7 Apr 2026 04:13:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535240; cv=none; b=BXCFPbeZlR5t427GELHI6dizHay8jiMq1dONHifAGvpNUXwGnDItOPVsb2u864h75I5jrHxiB9zTFYg66JKaRHltvu6m/eN11sNFqVDVura4NpSJwZm56KhkzixlnP+cyFIec80qB5nHJtRdszvPRl/1qpBhRNbeD90XNqou4KM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535240; c=relaxed/simple; bh=VNmm68um5E7L9cqU8euL5RXfyKEX2LSFMsdm18SqoEE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=URPM7xKU2hv2w81QX+ksezARRt8qYWpVrMO5qsjzrxl28YLzV5I+dgJf/Z75M9VRTj6wk0zwwFerXEEEEXxBQpodIN0U6M7A8zCVa1ZxA46WpnX61YYgM0lkWiRbERe68tCzQR3FZ5XeryUANS9WXXksVT2fZ5ONdIItuEYZNdI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hlhrS79i; arc=none smtp.client-ip=74.125.82.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hlhrS79i" Received: by mail-dl1-f43.google.com with SMTP id a92af1059eb24-1271195d2a7so10027571c88.0 for ; Mon, 06 Apr 2026 21:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775535238; x=1776140038; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8x59B/kzq/4f/8zT8VdT9atN7wRB60adY4f1oIhSU0E=; b=hlhrS79i+q/OKTOsAzFRg27YhJegTLaOQOp+uR8Jtc/O4TD1BDLu5gehvWgFsM3Qvn GiYTV3270rZq9EyLtNqVnBStaRmcN0MLX1Ely3o1x3dWKV6iXaVFW6D0Sy6DZ8JYBQMD 3FwzOk4aqHKdOAW8xjsUdRNI1KgHKamlmmyorOnh4YVvGjvyH3EliQpzQPWsoYTF2V+w 4psT8UoQjKyVLU/lyjQSv+V8bgo/sA9uTp6MvUBPuzzIygeqKFwPCA5K7OarlZGA2ZBA J470RW3LFd/Qy7X+UVa2BZAxGunX5TiRAVGXefY7eeqWjz7vX/U38cVQ9RUJqUyDpAJL HvWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775535238; x=1776140038; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=8x59B/kzq/4f/8zT8VdT9atN7wRB60adY4f1oIhSU0E=; b=Fl4tgdSJ/HdX5aoDI/XGWKMmYOZwno0Id0leCu2CLCriaTyXmtgEbgTocmogIvJY02 v4atUhMeRo+nMzQT8AsmRD821sWSvSgdxY4YhzkkLnrMPCtyBtnJh+NhT23kLI81H9EQ ASxViIaPuZ6W9/O1L3NyIKOrMBwHGylPrmQkUToPjl8QkitRQWKpIL0Uq1hH8DS3zrFp qNxP502+l9pCGHYG9U6RZLusMgVcwSMHAFYiqhdecaFgRN5aEh+svYGJrcNKDZ9N8SWn TmKZtwWsjS9zDZ635Yo1TuxrC0MSSgQh9RTna09niAj2ORMSd447inihYVJ3PX3vvOh1 3+Zw== X-Forwarded-Encrypted: i=1; AJvYcCV6k+s5KIrrT4VUu/YfO8ud1JtkdTn2nUAEWGeML/vhoS7F3I7j7BmJik2gEqEe3F8HbyTSjppbLS4vQ8U=@vger.kernel.org X-Gm-Message-State: AOJu0YwVBp2iXvb24XjxbnBnlbjVXI8Jb9cvHX9dU/36O9ZTkBb4uFJV YlrWAx0nQiOY9GqcHBKvbltnx7t4qZ4H8yHhRte9274gm0knGEa0XtdP X-Gm-Gg: AeBDievM18uaJIZvHbBLrP5gfOSQanKH/HH09vzEBcsrDaWvRxuXqt1DvI+gvBO+1DF t17Vln4mK9BUpzV+MZNm/HUg+AUIDy45uk1pIPuV9WwYJFbJ5SoDltMPWeEccMHywaOaNMIXiKd guqYp3o0fimShC5fmfQuZzZ6V5zOe/baSCKi3Cd3HRKCQ260QzNcxcluA33RW4BAAkoWKajSfSn dE6zY2zUOj59AY9aYk9WYDNXA8t7sV3O5AwwCG9AJYQR6ruccPTHv3oFthC9Nn7EZXTOG4bkMv5 BTjtiLemb09FVv5XQlP+O7JVn6izp6/3N2WTkgWaOh1OPSQrsinCQmdRlfF8Yo3QTVTXnP62hbV GrY1gzzJZTiELBFWeJ+4Wea3kAoSlqWthASnzH4Ri++zgovV70VyAZL4Ky0pmTBpyyoNKzvzWkU ObhzwVWS0IEdlO0wKPHVxmNVPd8CV+EnQ+wBc+aRRU8D3hpa8fTmhNUmCfmOfNz5tOFWXIW2564 P2ds2WoEEnBiVc= X-Received: by 2002:a05:7022:45a6:b0:128:dbbf:fd35 with SMTP id a92af1059eb24-12bfb76607fmr7309229c88.28.1775535237987; Mon, 06 Apr 2026 21:13:57 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm18523808c88.0.2026.04.06.21.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 21:13:57 -0700 (PDT) From: "Derek J. Clark" To: Jiri Kosina , Benjamin Tissoires Cc: "Pierre-Loup A . Griffais" , Lambert Fan , "Derek J . Clark" , linux-input@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] HID: hid-oxp: Add OneXPlayer configuration driver Date: Tue, 7 Apr 2026 04:13:50 +0000 Message-ID: <20260407041354.2283201-2-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260407041354.2283201-1-derekjohn.clark@gmail.com> References: <20260407041354.2283201-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adds OneXPlayer HID configuration driver. In this initial driver patch, add the RGB interface for the first generation of HID based RGB control. This interface provides the following attributes: - brightness: provided by the LED core, this works in a fairly unique way on this device. The hardware accepts 5 brightness values (0-4), which affects the brightness of the multicolor and animated effects built into the MCU firmware. For monocolor settings, the device expects the hardware brightness value to be pushed to maximum, then we apply brightness adjustments mathematically based on % (0-100). This leads to some odd conversion as we need the brightness slider to reach the full range, but it has no affect when incrementing between the division points for other effects. - multi-intensity: provided by the LED core for red, green, and blue. - effect: Allows the MCU to set 19 individual effects. - effect_index: Lists the 19 valid effect names for the interface. - enabled: Allows the MCU to toggle the RGB interface on/off. - enabled_index: Lists the valid states for enabled. - speed: Allows the MCU to set the animation rate for the various effects. - speed_range: Lists the valid range of speed (0-9). The MCU also has a few odd quirks that make sending multiple synchronous events challenging. It will essentially freeze if it receives another message before it has finished processing the last command. It also will not reply if you wait on it using a completion. To get around this, we do a 200ms sleep inside a work queue thread and debounce all but the most recent message using a 50ms mod_delayed_work. This will cache the last write, queue the work, then return so userspace can release its write thread. The work queue is only used for brightness/multi-intensity as that is the path likely to receive rapid successive writes. Signed-off-by: Derek J. Clark --- MAINTAINERS | 6 + drivers/hid/Kconfig | 12 + drivers/hid/Makefile | 1 + drivers/hid/hid-ids.h | 3 + drivers/hid/hid-oxp.c | 651 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 673 insertions(+) create mode 100644 drivers/hid/hid-oxp.c diff --git a/MAINTAINERS b/MAINTAINERS index 6f6517bf4f97..dae814192fa4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19707,6 +19707,12 @@ S: Maintained F: drivers/mtd/nand/onenand/ F: include/linux/mtd/onenand*.h =20 +ONEXPLAYER HID DRIVER +M: Derek J. Clark +L: linux-input@vger.kernel.org +S: Maintained +F: drivers/hid/hid-oxp.c + ONEXPLAYER PLATFORM EC DRIVER M: Antheas Kapenekakis M: Derek John Clark diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 3c034cd32fa8..2deaec9f467d 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -919,6 +919,18 @@ config HID_ORTEK - Ortek WKB-2000 - Skycable wireless presenter =20 +config HID_OXP + tristate "OneXPlayer handheld controller configuration support" + depends on USB_HID + depends on LEDS_CLASS + depends on LEDS_CLASS_MULTICOLOR + help + Say Y here if you would like to enable support for OneXPlayer handheld + devices that come with RGB LED rings around the joysticks and macro but= tons. + + To compile this driver as a module, choose M here: the module will + be called hid-oxp. + config HID_PANTHERLORD tristate "Pantherlord/GreenAsia game controller" help diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 03ef72ec4499..bda8a24c9257 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -99,6 +99,7 @@ obj-$(CONFIG_HID_NTI) +=3D hid-nti.o obj-$(CONFIG_HID_NTRIG) +=3D hid-ntrig.o obj-$(CONFIG_HID_NVIDIA_SHIELD) +=3D hid-nvidia-shield.o obj-$(CONFIG_HID_ORTEK) +=3D hid-ortek.o +obj-$(CONFIG_HID_OXP) +=3D hid-oxp.o obj-$(CONFIG_HID_PRODIKEYS) +=3D hid-prodikeys.o obj-$(CONFIG_HID_PANTHERLORD) +=3D hid-pl.o obj-$(CONFIG_HID_PENMOUNT) +=3D hid-penmount.o diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 5bad81222c6e..dcc5a3a70eaf 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -1131,6 +1131,9 @@ #define USB_VENDOR_ID_NVIDIA 0x0955 #define USB_DEVICE_ID_NVIDIA_THUNDERSTRIKE_CONTROLLER 0x7214 =20 +#define USB_VENDOR_ID_CRSC 0x1a2c +#define USB_DEVICE_ID_ONEXPLAYER_GEN1 0xb001 + #define USB_VENDOR_ID_ONTRAK 0x0a07 #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 =20 diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c new file mode 100644 index 000000000000..c4219ecd8d71 --- /dev/null +++ b/drivers/hid/hid-oxp.c @@ -0,0 +1,651 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * HID driver for OneXPlayer gamepad configuration devices. + * + * Copyright (c) 2026 Valve Corporation + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "hid-ids.h" + +#define OXP_PACKET_SIZE 64 + +#define GEN1_MESSAGE_ID 0xff + +#define GEN1_USAGE_PAGE 0xff01 + +enum oxp_function_index { + OXP_FID_GEN1_RGB_SET =3D 0x07, + OXP_FID_GEN1_RGB_REPLY =3D 0x0f, +}; + +static struct oxp_hid_cfg { + struct led_classdev_mc *led_mc; + struct hid_device *hdev; + struct mutex cfg_mutex; /*ensure single synchronous output report*/ + u8 rgb_brightness; + u8 rgb_effect; + u8 rgb_speed; + u8 rgb_en; +} drvdata; + +enum oxp_feature_en_index { + OXP_FEAT_DISABLED, + OXP_FEAT_ENABLED, +}; + +static const char *const oxp_feature_en_text[] =3D { + [OXP_FEAT_DISABLED] =3D "false", + [OXP_FEAT_ENABLED] =3D "true", +}; + +enum oxp_rgb_effect_index { + OXP_UNKNOWN, + OXP_EFFECT_AURORA, + OXP_EFFECT_BIRTHDAY, + OXP_EFFECT_FLOWING, + OXP_EFFECT_CHROMA_1, + OXP_EFFECT_NEON, + OXP_EFFECT_CHROMA_2, + OXP_EFFECT_DREAMY, + OXP_EFFECT_WARM, + OXP_EFFECT_CYBERPUNK, + OXP_EFFECT_SEA, + OXP_EFFECT_SUNSET, + OXP_EFFECT_COLORFUL, + OXP_EFFECT_MONSTER, + OXP_EFFECT_GREEN, + OXP_EFFECT_BLUE, + OXP_EFFECT_YELLOW, + OXP_EFFECT_TEAL, + OXP_EFFECT_PURPLE, + OXP_EFFECT_FOGGY, + OXP_EFFECT_MONO_LIST, /* placeholder for effect_index_show */ +}; + +/* These belong to rgb_effect_index, but we want to hide them from + * rgb_effect_text + */ + +#define OXP_GET_PROPERTY 0xfc +#define OXP_SET_PROPERTY 0xfd +#define OXP_EFFECT_MONO_TRUE 0xfe /* actual index for monocolor */ + +static const char *const oxp_rgb_effect_text[] =3D { + [OXP_UNKNOWN] =3D "unknown", + [OXP_EFFECT_AURORA] =3D "aurora", + [OXP_EFFECT_BIRTHDAY] =3D "birthday_cake", + [OXP_EFFECT_FLOWING] =3D "flowing_light", + [OXP_EFFECT_CHROMA_1] =3D "chroma_popping", + [OXP_EFFECT_NEON] =3D "neon", + [OXP_EFFECT_CHROMA_2] =3D "chroma_breathing", + [OXP_EFFECT_DREAMY] =3D "dreamy", + [OXP_EFFECT_WARM] =3D "warm_sun", + [OXP_EFFECT_CYBERPUNK] =3D "cyberpunk", + [OXP_EFFECT_SEA] =3D "sea_foam", + [OXP_EFFECT_SUNSET] =3D "sunset_afterglow", + [OXP_EFFECT_COLORFUL] =3D "colorful", + [OXP_EFFECT_MONSTER] =3D "monster_woke", + [OXP_EFFECT_GREEN] =3D "green_breathing", + [OXP_EFFECT_BLUE] =3D "blue_breathing", + [OXP_EFFECT_YELLOW] =3D "yellow_breathing", + [OXP_EFFECT_TEAL] =3D "teal_breathing", + [OXP_EFFECT_PURPLE] =3D "purple_breathing", + [OXP_EFFECT_FOGGY] =3D "foggy_haze", + [OXP_EFFECT_MONO_LIST] =3D "monocolor", +}; + +struct oxp_gen_1_rgb_report { + u8 report_id; + u8 message_id; + u8 padding_2[2]; + u8 effect; + u8 enabled; + u8 speed; + u8 brightness; + u8 red; + u8 green; + u8 blue; +} __packed; + +static u16 get_usage_page(struct hid_device *hdev) +{ + return hdev->collection[0].usage >> 16; +} + +static int oxp_hid_raw_event_gen_1(struct hid_device *hdev, + struct hid_report *report, u8 *data, + int size) +{ + struct led_classdev_mc *led_mc =3D drvdata.led_mc; + struct oxp_gen_1_rgb_report *rgb_rep; + + if (data[1] !=3D OXP_FID_GEN1_RGB_REPLY) + return 0; + + rgb_rep =3D (struct oxp_gen_1_rgb_report *)data; + /* Ensure we save monocolor as the list value */ + drvdata.rgb_effect =3D rgb_rep->effect =3D=3D OXP_EFFECT_MONO_TRUE ? + OXP_EFFECT_MONO_LIST : + rgb_rep->effect; + drvdata.rgb_speed =3D rgb_rep->speed; + drvdata.rgb_en =3D rgb_rep->enabled =3D=3D 0 ? OXP_FEAT_DISABLED : + OXP_FEAT_ENABLED; + drvdata.rgb_brightness =3D rgb_rep->brightness; + led_mc->led_cdev.brightness =3D rgb_rep->brightness / 4 * + led_mc->led_cdev.max_brightness; + /* If monocolor had less than 100% brightness on the previous boot, + * there will be no reliable way to determine the real intensity. + * Since intensity scaling is used with a hardware brightness set at max, + * our brightness will always look like 100%. Use the last set value to + * prevent successive boots from lowering the brightness further. + * Brightness will be "wrong" but the effect will remain the same visuall= y. + */ + led_mc->subled_info[0].intensity =3D rgb_rep->red; + led_mc->subled_info[1].intensity =3D rgb_rep->green; + led_mc->subled_info[2].intensity =3D rgb_rep->blue; + + return 0; +} + +static int oxp_hid_raw_event(struct hid_device *hdev, struct hid_report *r= eport, + u8 *data, int size) +{ + u16 up =3D get_usage_page(hdev); + + dev_dbg(&hdev->dev, "raw event data: [%*ph]\n", OXP_PACKET_SIZE, data); + + switch (up) { + case GEN1_USAGE_PAGE: + return oxp_hid_raw_event_gen_1(hdev, report, data, size); + default: + break; + } + + return 0; +} + +static int mcu_property_out(u8 *header, size_t header_size, u8 *data, + size_t data_size, u8 *footer, size_t footer_size) +{ + unsigned char *dmabuf __free(kfree) =3D kzalloc(OXP_PACKET_SIZE, GFP_KERN= EL); + int ret; + + if (!dmabuf) + return -ENOMEM; + + if (header_size + data_size + footer_size > OXP_PACKET_SIZE) + return -EINVAL; + + guard(mutex)(&drvdata.cfg_mutex); + memcpy(dmabuf, header, header_size); + memcpy(dmabuf + header_size, data, data_size); + if (footer_size) + memcpy(dmabuf + OXP_PACKET_SIZE - footer_size, footer, footer_size); + + dev_dbg(&drvdata.hdev->dev, "raw data: [%*ph]\n", OXP_PACKET_SIZE, dmabuf= ); + + ret =3D hid_hw_output_report(drvdata.hdev, dmabuf, OXP_PACKET_SIZE); + if (ret < 0) + return ret; + + /* MCU takes 200ms to be ready for another command. */ + msleep(200); + return ret =3D=3D OXP_PACKET_SIZE ? 0 : -EIO; +} + +static int oxp_gen_1_property_out(enum oxp_function_index fid, u8 *data, + u8 data_size) +{ + u8 header[] =3D { fid, GEN1_MESSAGE_ID }; + size_t header_size =3D ARRAY_SIZE(header); + + return mcu_property_out(header, header_size, data, data_size, NULL, 0); +} + +static int oxp_rgb_status_store(u8 enabled, u8 speed, u8 brightness) +{ + u16 up =3D get_usage_page(drvdata.hdev); + u8 *data; + + /* Always default to max brightness and use intensity scaling when in + * monocolor mode. + */ + switch (up) { + case GEN1_USAGE_PAGE: + data =3D (u8[4]) { OXP_SET_PROPERTY, enabled, speed, brightness }; + if (drvdata.rgb_effect =3D=3D OXP_EFFECT_MONO_LIST) + data[3] =3D 0x04; + return oxp_gen_1_property_out(OXP_FID_GEN1_RGB_SET, data, 4); + default: + return -ENODEV; + } +} + +static ssize_t oxp_rgb_status_show(void) +{ + u16 up =3D get_usage_page(drvdata.hdev); + u8 *data; + + switch (up) { + case GEN1_USAGE_PAGE: + data =3D (u8[1]) { OXP_GET_PROPERTY }; + return oxp_gen_1_property_out(OXP_FID_GEN1_RGB_SET, data, 1); + default: + return -ENODEV; + } +} + +static int oxp_rgb_color_set(void) +{ + u8 max_br =3D drvdata.led_mc->led_cdev.max_brightness; + u8 br =3D drvdata.led_mc->led_cdev.brightness; + u16 up =3D get_usage_page(drvdata.hdev); + u8 green, red, blue; + size_t size; + u8 *data; + int i; + + red =3D br * drvdata.led_mc->subled_info[0].intensity / max_br; + green =3D br * drvdata.led_mc->subled_info[1].intensity / max_br; + blue =3D br * drvdata.led_mc->subled_info[2].intensity / max_br; + + switch (up) { + case GEN1_USAGE_PAGE: + size =3D 55; + data =3D (u8[55]) { OXP_EFFECT_MONO_TRUE }; + + for (i =3D 0; i < (size - 1) / 3; i++) { + data[3 * i + 1] =3D red; + data[3 * i + 2] =3D green; + data[3 * i + 3] =3D blue; + } + return oxp_gen_1_property_out(OXP_FID_GEN1_RGB_SET, data, size); + default: + return -ENODEV; + } +} + +static int oxp_rgb_effect_set(u8 effect) +{ + u16 up =3D get_usage_page(drvdata.hdev); + u8 *data; + int ret; + + switch (effect) { + case OXP_EFFECT_AURORA: + case OXP_EFFECT_BIRTHDAY: + case OXP_EFFECT_FLOWING: + case OXP_EFFECT_CHROMA_1: + case OXP_EFFECT_NEON: + case OXP_EFFECT_CHROMA_2: + case OXP_EFFECT_DREAMY: + case OXP_EFFECT_WARM: + case OXP_EFFECT_CYBERPUNK: + case OXP_EFFECT_SEA: + case OXP_EFFECT_SUNSET: + case OXP_EFFECT_COLORFUL: + case OXP_EFFECT_MONSTER: + case OXP_EFFECT_GREEN: + case OXP_EFFECT_BLUE: + case OXP_EFFECT_YELLOW: + case OXP_EFFECT_TEAL: + case OXP_EFFECT_PURPLE: + case OXP_EFFECT_FOGGY: + switch (up) { + case GEN1_USAGE_PAGE: + data =3D (u8[1]) { effect }; + ret =3D oxp_gen_1_property_out(OXP_FID_GEN1_RGB_SET, data, 1); + break; + default: + ret =3D -ENODEV; + } + break; + case OXP_EFFECT_MONO_LIST: + ret =3D oxp_rgb_color_set(); + break; + default: + return -EINVAL; + } + + if (ret) + return ret; + + drvdata.rgb_effect =3D effect; + + return 0; +} + +static ssize_t enabled_store(struct device *dev, struct device_attribute *= attr, + const char *buf, size_t count) +{ + int ret; + u8 val; + + ret =3D sysfs_match_string(oxp_feature_en_text, buf); + if (ret < 0) + return ret; + val =3D ret; + + ret =3D oxp_rgb_status_store(val, drvdata.rgb_speed, + drvdata.rgb_brightness); + if (ret) + return ret; + + drvdata.rgb_en =3D val; + return count; +} + +static ssize_t enabled_show(struct device *dev, struct device_attribute *a= ttr, + char *buf) +{ + int ret; + + ret =3D oxp_rgb_status_show(); + if (ret) + return ret; + + if (drvdata.rgb_en >=3D ARRAY_SIZE(oxp_feature_en_text)) + return -EINVAL; + + return sysfs_emit(buf, "%s\n", oxp_feature_en_text[drvdata.rgb_en]); +} +static DEVICE_ATTR_RW(enabled); + +static ssize_t enabled_index_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + size_t count =3D 0; + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(oxp_feature_en_text); i++) + count +=3D sysfs_emit_at(buf, count, "%s ", oxp_feature_en_text[i]); + + if (count) + buf[count - 1] =3D '\n'; + + return count; +} +static DEVICE_ATTR_RO(enabled_index); + +static ssize_t effect_store(struct device *dev, struct device_attribute *a= ttr, + const char *buf, size_t count) +{ + int ret; + u8 val; + + ret =3D sysfs_match_string(oxp_rgb_effect_text, buf); + if (ret < 0) + return ret; + + val =3D ret; + + ret =3D oxp_rgb_status_store(drvdata.rgb_en, drvdata.rgb_speed, + drvdata.rgb_brightness); + if (ret) + return ret; + + ret =3D oxp_rgb_effect_set(val); + if (ret) + return ret; + + return count; +} + +static ssize_t effect_show(struct device *dev, struct device_attribute *at= tr, + char *buf) +{ + int ret; + + ret =3D oxp_rgb_status_show(); + if (ret) + return ret; + + if (drvdata.rgb_effect >=3D ARRAY_SIZE(oxp_rgb_effect_text)) + return -EINVAL; + + return sysfs_emit(buf, "%s\n", oxp_rgb_effect_text[drvdata.rgb_effect]); +} + +static DEVICE_ATTR_RW(effect); + +static ssize_t effect_index_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + size_t count =3D 0; + unsigned int i; + + for (i =3D 1; i < ARRAY_SIZE(oxp_rgb_effect_text); i++) + count +=3D sysfs_emit_at(buf, count, "%s ", oxp_rgb_effect_text[i]); + + if (count) + buf[count - 1] =3D '\n'; + + return count; +} +static DEVICE_ATTR_RO(effect_index); + +static ssize_t speed_store(struct device *dev, struct device_attribute *at= tr, + const char *buf, size_t count) +{ + int ret; + u8 val; + + ret =3D kstrtou8(buf, 10, &val); + if (ret) + return ret; + + if (val > 9) + return -EINVAL; + + ret =3D oxp_rgb_status_store(drvdata.rgb_en, val, drvdata.rgb_brightness); + if (ret) + return ret; + + drvdata.rgb_speed =3D val; + return count; +} + +static ssize_t speed_show(struct device *dev, struct device_attribute *att= r, + char *buf) +{ + int ret; + + ret =3D oxp_rgb_status_show(); + if (ret) + return ret; + + if (drvdata.rgb_speed > 9) + return -EINVAL; + + return sysfs_emit(buf, "%hhu\n", drvdata.rgb_speed); +} +static DEVICE_ATTR_RW(speed); + +static ssize_t speed_range_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "0-9\n"); +} +static DEVICE_ATTR_RO(speed_range); + +static void oxp_rgb_queue_fn(struct work_struct *work) +{ + unsigned int max_brightness =3D drvdata.led_mc->led_cdev.max_brightness; + unsigned int brightness =3D drvdata.led_mc->led_cdev.brightness; + u8 val =3D 4 * brightness / max_brightness; + int ret; + + if (drvdata.rgb_brightness !=3D val) { + ret =3D oxp_rgb_status_store(drvdata.rgb_en, drvdata.rgb_speed, val); + if (ret) + dev_err(drvdata.led_mc->led_cdev.dev, + "Error: Failed to write RGB Status: %i\n", ret); + + drvdata.rgb_brightness =3D val; + } + + if (drvdata.rgb_effect !=3D OXP_EFFECT_MONO_LIST) + return; + + ret =3D oxp_rgb_effect_set(drvdata.rgb_effect); + if (ret) + dev_err(drvdata.led_mc->led_cdev.dev, "Error: Failed to write RGB color:= %i\n", + ret); +} + +static DECLARE_DELAYED_WORK(oxp_rgb_queue, oxp_rgb_queue_fn); + +static void oxp_rgb_brightness_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + led_cdev->brightness =3D brightness; + mod_delayed_work(system_wq, &oxp_rgb_queue, msecs_to_jiffies(50)); +} + +static struct attribute *oxp_rgb_attrs[] =3D { + &dev_attr_effect.attr, + &dev_attr_effect_index.attr, + &dev_attr_enabled.attr, + &dev_attr_enabled_index.attr, + &dev_attr_speed.attr, + &dev_attr_speed_range.attr, + NULL, +}; + +static const struct attribute_group oxp_rgb_attr_group =3D { + .attrs =3D oxp_rgb_attrs, +}; + +static struct mc_subled oxp_rgb_subled_info[] =3D { + { + .color_index =3D LED_COLOR_ID_RED, + .intensity =3D 0x24, + .channel =3D 0x1, + }, + { + .color_index =3D LED_COLOR_ID_GREEN, + .intensity =3D 0x22, + .channel =3D 0x2, + }, + { + .color_index =3D LED_COLOR_ID_BLUE, + .intensity =3D 0x99, + .channel =3D 0x3, + }, +}; + +static struct led_classdev_mc oxp_cdev_rgb =3D { + .led_cdev =3D { + .name =3D "oxp:rgb:joystick_rings", + .color =3D LED_COLOR_ID_RGB, + .brightness =3D 0x64, + .max_brightness =3D 0x64, + .brightness_set =3D oxp_rgb_brightness_set, + }, + .num_colors =3D ARRAY_SIZE(oxp_rgb_subled_info), + .subled_info =3D oxp_rgb_subled_info, +}; + +static int oxp_cfg_probe(struct hid_device *hdev, u16 up) +{ + int ret; + + hid_set_drvdata(hdev, &drvdata); + mutex_init(&drvdata.cfg_mutex); + drvdata.hdev =3D hdev; + drvdata.led_mc =3D &oxp_cdev_rgb; + + ret =3D devm_led_classdev_multicolor_register(&hdev->dev, &oxp_cdev_rgb); + if (ret) + return dev_err_probe(&hdev->dev, ret, + "Failed to create RGB device\n"); + + ret =3D devm_device_add_group(drvdata.led_mc->led_cdev.dev, + &oxp_rgb_attr_group); + if (ret) + return dev_err_probe(drvdata.led_mc->led_cdev.dev, ret, + "Failed to create RGB configuration attributes\n"); + + ret =3D oxp_rgb_status_show(); + if (ret) + dev_warn(drvdata.led_mc->led_cdev.dev, + "Failed to query RGB initial state: %i\n", ret); + + return 0; +} + +static int oxp_hid_probe(struct hid_device *hdev, + const struct hid_device_id *id) +{ + int ret; + u16 up; + + ret =3D hid_parse(hdev); + if (ret) + return dev_err_probe(&hdev->dev, ret, "Failed to parse HID device\n"); + + ret =3D hid_hw_start(hdev, HID_CONNECT_DEFAULT); + if (ret) + return dev_err_probe(&hdev->dev, ret, "Failed to start HID device\n"); + + ret =3D hid_hw_open(hdev); + if (ret) { + hid_hw_stop(hdev); + return dev_err_probe(&hdev->dev, ret, "Failed to open HID device\n"); + } + + up =3D get_usage_page(hdev); + dev_dbg(&hdev->dev, "Got usage page %04x\n", up); + + switch (up) { + case GEN1_USAGE_PAGE: + ret =3D oxp_cfg_probe(hdev, up); + if (ret) { + hid_hw_close(hdev); + hid_hw_stop(hdev); + } + + return ret; + default: + return 0; + } +} + +static void oxp_hid_remove(struct hid_device *hdev) +{ + hid_hw_close(hdev); + hid_hw_stop(hdev); +} + +static const struct hid_device_id oxp_devices[] =3D { + { HID_USB_DEVICE(USB_VENDOR_ID_CRSC, USB_DEVICE_ID_ONEXPLAYER_GEN1) }, + {} +}; + +MODULE_DEVICE_TABLE(hid, oxp_devices); +static struct hid_driver hid_oxp =3D { + .name =3D "hid-oxp", + .id_table =3D oxp_devices, + .probe =3D oxp_hid_probe, + .remove =3D oxp_hid_remove, + .raw_event =3D oxp_hid_raw_event, +}; +module_hid_driver(hid_oxp); + +MODULE_AUTHOR("Derek J. Clark "); +MODULE_DESCRIPTION("Driver for OneXPlayer HID Interfaces"); +MODULE_LICENSE("GPL"); --=20 2.53.0 From nobody Tue Apr 7 13:02:01 2026 Received: from mail-dl1-f47.google.com (mail-dl1-f47.google.com [74.125.82.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 956A7377EC7 for ; Tue, 7 Apr 2026 04:13:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535241; cv=none; b=k5VCy/Aa6ed5I26gULsIiQsyeUBWc1sWhNeX/e3K1RgRMcxsrf7+mf769retE5PxgH/LAQeOGgsEUwRHmHpTiPZZwVjWiB40hzPa4JtWr89eJTVf7E7yeMQU2qdKM61nD8hRuffiv0Z0csHarKsEWwjIOaN37icDhsOkQtMikdg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535241; c=relaxed/simple; bh=usmYDq97Sg76UklSs3ptf29YaZhkgp2uHecyG8pdypk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cMWZo8rew/8sUmhCQ6FKZTjYiE8hAv6AHkdJZSWfVKx12ukhKr5X+cJmnG0cjZnJGXJdehnhj0NaZti8khLq6rgI9vtPv9ld/X/RmCcz/fNsljZMXXE9bew76Gr1s2OLI5F1rz1DKRVUUiTmvnM9KmU9dSMtRqWh3s8/pBpyVew= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XdW3elJF; arc=none smtp.client-ip=74.125.82.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XdW3elJF" Received: by mail-dl1-f47.google.com with SMTP id a92af1059eb24-128b9b7e3edso2689739c88.0 for ; Mon, 06 Apr 2026 21:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775535239; x=1776140039; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+BUPfatehd4OwQWVH3wip0eKYYTenln556l3fMYEsrA=; b=XdW3elJF1M3ShVzMu80KD6Ff9fOYK7e/qVN1DPniXSk4VAgZZism0wQtu06lZHZ4qj mMN+6k+s0mrzQ7IVGMmtv/g0aIn8idrbgwIU093DLtxilzwT3wik3dl93IgorItyLK1h eT/TWY6/Laeplvto9BsdIb4fNX0kmvIRws3ESvoTeXkO7NsFPIn2iJdaftfqxJz2LnZ8 M60wm9xZ8SZtbR0akdcr2B2fEnfXdHaRUw8vcpl/WgO7QomnREkko0gQndRQLe7IK1G1 SMJZgkLHH7R4cLwCQ7I+iyxv/MpeKgdluRuXO/Df5vdxM6XGdxpuMO2GvZagk/iGnbO3 ZZ6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775535239; x=1776140039; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+BUPfatehd4OwQWVH3wip0eKYYTenln556l3fMYEsrA=; b=eIp3jaCvktz+X2ggzM8Ywdnxck+mwHlyXEywhWyaVXI72CyjGFt//KrIpc977Vkcjj VhzAIzxgJB2h06jyHNjy0ZdcLiA2XMYulO+6Jljb0kY9fto1vjceKNIExGtM3XjyvjuK ezAX6doMtT44jxbdVK085ULBFJqNdLMiKExIOEL2pVvkADIc1BQvXMsTZbz1x35D3bxl 38qirO/qo40Jj74d9ynpW5O8ERGThLzYuy7Y01VlmRm/+xw8s7tRk1uTB7+HSiS+HoFH 7a+ha+UgnN5Zobscna/GgI0XSpmkl/TjOxRqrYKOZbwFnow4/IsvMtgw32xfpFC6ZiCs bt1g== X-Forwarded-Encrypted: i=1; AJvYcCVGm5F2/hIeTXK3zK4E9yiWGQuwIxgkG3CE5jFYzpE28YNpot0Ju+zzycUrMMTjfWJb9cNTqqiKSSU1QaU=@vger.kernel.org X-Gm-Message-State: AOJu0Yyq98QlLMrtwo9kYhCNz8YRQ6yBL87ZGmu7e2qaRzJD7GpqJx4V 4BzuHLpWxLKXBr0v1Mghleb5mLEFuA3H8y+of/bfJDhSn/wRsNQaGfoi X-Gm-Gg: AeBDiev2yVMVfk6Z9/QlTDD0nBea2BQka3N7OZInYaHPAxVilbQxu1Glag2Vb64rI9z 2Kjm2u9kb8YUVlfWfVwwHNV1dffIQTSHt8xsocAW0zQ630F1KRDTmuB2XL9n2uTdMG7fIMl8wJt 8EmbSSZnAV/Fj8o3yfYKqyDvxScUk6UxVHE5jcjg9RA9ZrkzMqW3JHjEa/+mRzsYafdYdzgFxZB qOV3ICG4MxqbqRfu/+ypnc0lIoDIgQJCOIn3XLLYHxoMdzbdFXFakPHjx1txSf785wNg1O0DsdM fE1yZOajCiYgtTD+G5+aBZFvXXxy8GdPo3ItzedEoY1KHm9Oyuustq+jAteKHLH+n+Wj4DdTF19 ZZXqiBOEfgE9qLOzIJp7GtpGQVhKY6bFEYHPne9LIyg8P0W0YaEjE/2gHsxslE5cGBDH3zVjxvE IItq4ijteDyj8I0+iqUD5rCVuDxq3wCNJvlDIHiENNWpYPZNa+pbzQcxGL2puxoURZjFZvARPAZ YVuqqPjex5UcGA= X-Received: by 2002:a05:7022:388a:b0:123:348d:8576 with SMTP id a92af1059eb24-12bfb6ec50bmr8556077c88.6.1775535238604; Mon, 06 Apr 2026 21:13:58 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm18523808c88.0.2026.04.06.21.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 21:13:58 -0700 (PDT) From: "Derek J. Clark" To: Jiri Kosina , Benjamin Tissoires Cc: "Pierre-Loup A . Griffais" , Lambert Fan , "Derek J . Clark" , linux-input@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] HID: hid-oxp: Add Second Generation RGB Control Date: Tue, 7 Apr 2026 04:13:51 +0000 Message-ID: <20260407041354.2283201-3-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260407041354.2283201-1-derekjohn.clark@gmail.com> References: <20260407041354.2283201-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adds support for the second generation of RGB Control for OneXPlayer devices. The interface mirrors the first generation, with some differences to how messages are formatted. Some devices have both a GEN1 MCU for RGB control and a GEN2 MCU for button mapping. To avoid conflicts, quirk these devices to skip RGB setup for the GEN2_USAGE_PAGE. Signed-off-by: Derek J. Clark --- v2: - Add DMI quirks table. --- drivers/hid/Kconfig | 1 + drivers/hid/hid-ids.h | 3 + drivers/hid/hid-oxp.c | 151 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 2deaec9f467d..b779088b80b6 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -924,6 +924,7 @@ config HID_OXP depends on USB_HID depends on LEDS_CLASS depends on LEDS_CLASS_MULTICOLOR + depends on DMI help Say Y here if you would like to enable support for OneXPlayer handheld devices that come with RGB LED rings around the joysticks and macro but= tons. diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index dcc5a3a70eaf..0d1ff879e959 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -1134,6 +1134,9 @@ #define USB_VENDOR_ID_CRSC 0x1a2c #define USB_DEVICE_ID_ONEXPLAYER_GEN1 0xb001 =20 +#define USB_VENDOR_ID_WCH 0x1a86 +#define USB_DEVICE_ID_ONEXPLAYER_GEN2 0xfe00 + #define USB_VENDOR_ID_ONTRAK 0x0a07 #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 =20 diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c index c4219ecd8d71..25214356163e 100644 --- a/drivers/hid/hid-oxp.c +++ b/drivers/hid/hid-oxp.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -24,12 +25,15 @@ #define OXP_PACKET_SIZE 64 =20 #define GEN1_MESSAGE_ID 0xff +#define GEN2_MESSAGE_ID 0x3f =20 #define GEN1_USAGE_PAGE 0xff01 +#define GEN2_USAGE_PAGE 0xff00 =20 enum oxp_function_index { OXP_FID_GEN1_RGB_SET =3D 0x07, OXP_FID_GEN1_RGB_REPLY =3D 0x0f, + OXP_FID_GEN2_STATUS_EVENT =3D 0xb8, }; =20 static struct oxp_hid_cfg { @@ -121,6 +125,22 @@ struct oxp_gen_1_rgb_report { u8 blue; } __packed; =20 +struct oxp_gen_2_rgb_report { + u8 report_id; + u8 header_id; + u8 padding_2; + u8 message_id; + u8 padding_4[2]; + u8 enabled; + u8 speed; + u8 brightness; + u8 red; + u8 green; + u8 blue; + u8 padding_12[3]; + u8 effect; +} __packed; + static u16 get_usage_page(struct hid_device *hdev) { return hdev->collection[0].usage >> 16; @@ -161,6 +181,44 @@ static int oxp_hid_raw_event_gen_1(struct hid_device *= hdev, return 0; } =20 +static int oxp_hid_raw_event_gen_2(struct hid_device *hdev, + struct hid_report *report, u8 *data, + int size) +{ + struct led_classdev_mc *led_mc =3D drvdata.led_mc; + struct oxp_gen_2_rgb_report *rgb_rep; + + if (data[0] !=3D OXP_FID_GEN2_STATUS_EVENT) + return 0; + + if (data[3] !=3D OXP_GET_PROPERTY) + return 0; + + rgb_rep =3D (struct oxp_gen_2_rgb_report *)data; + /* Ensure we save monocolor as the list value */ + drvdata.rgb_effect =3D rgb_rep->effect =3D=3D OXP_EFFECT_MONO_TRUE ? + OXP_EFFECT_MONO_LIST : + rgb_rep->effect; + drvdata.rgb_speed =3D rgb_rep->speed; + drvdata.rgb_en =3D rgb_rep->enabled =3D=3D 0 ? OXP_FEAT_DISABLED : + OXP_FEAT_ENABLED; + drvdata.rgb_brightness =3D rgb_rep->brightness; + led_mc->led_cdev.brightness =3D rgb_rep->brightness / 4 * + led_mc->led_cdev.max_brightness; + /* If monocolor had less than 100% brightness on the previous boot, + * there will be no reliable way to determine the real intensity. + * Since intensity scaling is used with a hardware brightness set at max, + * our brightness will always look like 100%. Use the last set value to + * prevent successive boots from lowering the brightness further. + * Brightness will be "wrong" but the effect will remain the same visuall= y. + */ + led_mc->subled_info[0].intensity =3D rgb_rep->red; + led_mc->subled_info[1].intensity =3D rgb_rep->green; + led_mc->subled_info[2].intensity =3D rgb_rep->blue; + + return 0; +} + static int oxp_hid_raw_event(struct hid_device *hdev, struct hid_report *r= eport, u8 *data, int size) { @@ -171,6 +229,8 @@ static int oxp_hid_raw_event(struct hid_device *hdev, s= truct hid_report *report, switch (up) { case GEN1_USAGE_PAGE: return oxp_hid_raw_event_gen_1(hdev, report, data, size); + case GEN2_USAGE_PAGE: + return oxp_hid_raw_event_gen_2(hdev, report, data, size); default: break; } @@ -216,6 +276,18 @@ static int oxp_gen_1_property_out(enum oxp_function_in= dex fid, u8 *data, return mcu_property_out(header, header_size, data, data_size, NULL, 0); } =20 +static int oxp_gen_2_property_out(enum oxp_function_index fid, u8 *data, + u8 data_size) +{ + u8 header[] =3D { fid, GEN2_MESSAGE_ID, 0x01 }; + u8 footer[] =3D { GEN2_MESSAGE_ID, fid }; + size_t header_size =3D ARRAY_SIZE(header); + size_t footer_size =3D ARRAY_SIZE(footer); + + return mcu_property_out(header, header_size, data, data_size, footer, + footer_size); +} + static int oxp_rgb_status_store(u8 enabled, u8 speed, u8 brightness) { u16 up =3D get_usage_page(drvdata.hdev); @@ -230,6 +302,11 @@ static int oxp_rgb_status_store(u8 enabled, u8 speed, = u8 brightness) if (drvdata.rgb_effect =3D=3D OXP_EFFECT_MONO_LIST) data[3] =3D 0x04; return oxp_gen_1_property_out(OXP_FID_GEN1_RGB_SET, data, 4); + case GEN2_USAGE_PAGE: + data =3D (u8[6]) { OXP_SET_PROPERTY, 0x00, 0x02, enabled, speed, brightn= ess }; + if (drvdata.rgb_effect =3D=3D OXP_EFFECT_MONO_LIST) + data[5] =3D 0x04; + return oxp_gen_2_property_out(OXP_FID_GEN2_STATUS_EVENT, data, 6); default: return -ENODEV; } @@ -244,6 +321,9 @@ static ssize_t oxp_rgb_status_show(void) case GEN1_USAGE_PAGE: data =3D (u8[1]) { OXP_GET_PROPERTY }; return oxp_gen_1_property_out(OXP_FID_GEN1_RGB_SET, data, 1); + case GEN2_USAGE_PAGE: + data =3D (u8[3]) { OXP_GET_PROPERTY, 0x00, 0x02 }; + return oxp_gen_2_property_out(OXP_FID_GEN2_STATUS_EVENT, data, 3); default: return -ENODEV; } @@ -274,6 +354,16 @@ static int oxp_rgb_color_set(void) data[3 * i + 3] =3D blue; } return oxp_gen_1_property_out(OXP_FID_GEN1_RGB_SET, data, size); + case GEN2_USAGE_PAGE: + size =3D 57; + data =3D (u8[57]) { OXP_EFFECT_MONO_TRUE, 0x00, 0x02 }; + + for (i =3D 1; i < size / 3; i++) { + data[3 * i] =3D red; + data[3 * i + 1] =3D green; + data[3 * i + 2] =3D blue; + } + return oxp_gen_2_property_out(OXP_FID_GEN2_STATUS_EVENT, data, size); default: return -ENODEV; } @@ -310,6 +400,10 @@ static int oxp_rgb_effect_set(u8 effect) data =3D (u8[1]) { effect }; ret =3D oxp_gen_1_property_out(OXP_FID_GEN1_RGB_SET, data, 1); break; + case GEN2_USAGE_PAGE: + data =3D (u8[3]) { effect, 0x00, 0x02 }; + ret =3D oxp_gen_2_property_out(OXP_FID_GEN2_STATUS_EVENT, data, 3); + break; default: ret =3D -ENODEV; } @@ -560,6 +654,56 @@ static struct led_classdev_mc oxp_cdev_rgb =3D { .subled_info =3D oxp_rgb_subled_info, }; =20 +struct quirk_entry { + bool hybrid_mcu; +}; + +static struct quirk_entry quirk_hybrid_mcu =3D { + .hybrid_mcu =3D true, +}; + +static const struct dmi_system_id oxp_hybrid_mcu_list[] =3D { + { + .ident =3D "OneXPlayer Apex", + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "ONE-NETBOOK"), + DMI_MATCH(DMI_PRODUCT_NAME, "ONEXPLAYER APEX"), + }, + .driver_data =3D &quirk_hybrid_mcu, + }, + { + .ident =3D "OneXPlayer G1 AMD", + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "ONE-NETBOOK"), + DMI_MATCH(DMI_PRODUCT_NAME, "ONEXPLAYER G1 A"), + }, + .driver_data =3D &quirk_hybrid_mcu, + }, + { + .ident =3D "OneXPlayer G1 Intel", + .matches =3D { + DMI_MATCH(DMI_SYS_VENDOR, "ONE-NETBOOK"), + DMI_MATCH(DMI_PRODUCT_NAME, "ONEXPLAYER G1 i"), + }, + .driver_data =3D &quirk_hybrid_mcu, + }, + {}, +}; + +static bool oxp_hybrid_mcu_device(void) +{ + const struct dmi_system_id *dmi_id; + struct quirk_entry *quirks; + + dmi_id =3D dmi_first_match(oxp_hybrid_mcu_list); + if (!dmi_id) + return false; + + quirks =3D dmi_id->driver_data; + + return quirks->hybrid_mcu; +} + static int oxp_cfg_probe(struct hid_device *hdev, u16 up) { int ret; @@ -567,6 +711,10 @@ static int oxp_cfg_probe(struct hid_device *hdev, u16 = up) hid_set_drvdata(hdev, &drvdata); mutex_init(&drvdata.cfg_mutex); drvdata.hdev =3D hdev; + + if (up =3D=3D GEN2_USAGE_PAGE && oxp_hybrid_mcu_device()) + goto skip_rgb; + drvdata.led_mc =3D &oxp_cdev_rgb; =20 ret =3D devm_led_classdev_multicolor_register(&hdev->dev, &oxp_cdev_rgb); @@ -585,6 +733,7 @@ static int oxp_cfg_probe(struct hid_device *hdev, u16 u= p) dev_warn(drvdata.led_mc->led_cdev.dev, "Failed to query RGB initial state: %i\n", ret); =20 +skip_rgb: return 0; } =20 @@ -613,6 +762,7 @@ static int oxp_hid_probe(struct hid_device *hdev, =20 switch (up) { case GEN1_USAGE_PAGE: + case GEN2_USAGE_PAGE: ret =3D oxp_cfg_probe(hdev, up); if (ret) { hid_hw_close(hdev); @@ -633,6 +783,7 @@ static void oxp_hid_remove(struct hid_device *hdev) =20 static const struct hid_device_id oxp_devices[] =3D { { HID_USB_DEVICE(USB_VENDOR_ID_CRSC, USB_DEVICE_ID_ONEXPLAYER_GEN1) }, + { HID_USB_DEVICE(USB_VENDOR_ID_WCH, USB_DEVICE_ID_ONEXPLAYER_GEN2) }, {} }; =20 --=20 2.53.0 From nobody Tue Apr 7 13:02:01 2026 Received: from mail-dl1-f50.google.com (mail-dl1-f50.google.com [74.125.82.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29A853783C9 for ; Tue, 7 Apr 2026 04:14:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535242; cv=none; b=jzBdkexjjyzVLnihLnFkRJtP2+F9ocPWzsjLoadqHAT/hh/u+WA/IMSZbX3g+4zKZtjtjnvJrCzfw0v2puzYWiTLdJ+B8hW0GH3UYGmK2EoH3kdDHzHp2s6pussF8uk13o/7LpWG3KpuP79o/DVHBMnMosk/MbAH4B3dRbUE6fU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535242; c=relaxed/simple; bh=pH1X0aQzXpB3SyOTJrmNhcXASyFLtui/zFbVD/xGlF0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BAsQgAlDvFCoAuk7LifClwHtuW5n1tZpiGozIswy5KVByUZaFidyF/QZtENwdAVRMo8Q0iNGyN/7eFND2HbchaelTdwju7cFPSpnoJn/JZN+NC8TB0CO397MOn1owSWyiWTnoRVHIuhWm0XjpjCC+Oliw1NTYfAuOJjDEvpUKSc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Of/NfMa8; arc=none smtp.client-ip=74.125.82.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Of/NfMa8" Received: by mail-dl1-f50.google.com with SMTP id a92af1059eb24-1279eced0b9so5286421c88.0 for ; Mon, 06 Apr 2026 21:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775535239; x=1776140039; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ejgiW/r7pVVUy8vt9xK36NMd3PA7PnFF5ux4KM88uHM=; b=Of/NfMa8lSvWoS/flPyC6WLzjsNffRU/gbzsWCQxto3BO1PdeyqP0+mUu73QyeAaFM uao/gDLxEls/zgDEZBqdC70YAxwtdMkU+MKehADsn8MqyJTqzA7+LDOG/rTRzrzTHkbf NtqC6t2zZN/8JtoE3l2DuWt/q9hih5O0JPUYCDEHrTBjW7FI5BCQL8vtyPWimeq0x1Nn JwPCMK57yrBWIUUasvKCDkMvzwWJVBqGTY1+d1HQsJG/Lyjb2xEA07m71P9kzxtUdx8f W3NJWL/KBo4OMGILFbrI5ELEmDKf9TbgWBfTAxyWvphsBblcUiyc6jzYhukhqdJ7RM5/ cagg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775535239; x=1776140039; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ejgiW/r7pVVUy8vt9xK36NMd3PA7PnFF5ux4KM88uHM=; b=J4z/+NwCmsVgPJMYC4YO9aki1Az4caOsN9eqrS8D1sdS9IOuj83fVjUjDQToX2c94A orJSE2TlesSuKjzd/7EZmTy7eP7vvoomSG78fc13gzlPi9TnKP8uHPUkrK0R1kZeDRRL sDjKtj4VDmu3tEFEz2jPSvutZtsLmEUpdigqKLleNPQgxtPyOxrz8ikX2u0FS8xkNYi3 X3qqCAFFoKIpUY7YR0wWRL7/5W7YP8NqWLWZt6P8G2XqpL2j+Y2aWH907HfT0DDPU3Ab Czb/aHKOWJqV5T07xdFb+Gwm9VeZnv59uNAuCiy9FiXMRYsyOLd1r+vg4HOCXMmmyzjz dL8Q== X-Forwarded-Encrypted: i=1; AJvYcCXQyzVmKKpT7YLHwVCanpmRMIZKgVxTpXzgECRY109ll4TCDJrBgfFSL4tkNYlmqNk2xBD7MkiD1AguAZc=@vger.kernel.org X-Gm-Message-State: AOJu0YzI9kHfL+wOpiYiwWqmUWzaXBVZcA3Pv3amYjmJTJI+X0SVVWQ1 goUcqofqOrfsZvMFei2Y8YUH7Bctz8nHW2FcFX7zeVXBJ38DxQ6OGI8G X-Gm-Gg: AeBDievh/NiR37igJq/JN/78rXNseaXFn7loEhscBnavnfqVNnHos6KPLkGs/LiCXZH XJM/omaFsNA4oZ4bdvuku7alvn9dlCazoI8z22q2dfl59BoQTeAT7w5IRp0aka0r6N+uIynZldj 0XwrdPjZmqJGmgIU1Bki6lSh6A3Fbrkwu/RY1djombdV4UMLEwDv4DMnXofgYZfJZzMX71iZHrZ iI+xCc3g4yPmgOkUycQHO74soMeeNEI2CxrLnjAFI4guOgmH5e7DWboILRCjfNvL1A2iMUe2D2O 9iEyOu3Wnm45IZ+duaq80IhFuuFcAmMSqaamYHdRFP0kn1FztgBWy57VSHzpox/7jv3J/0QIAEZ 73ebLHq44zgU2ne9wFK4IsXKML90V6YHN6fn3TXCGC6NBgpejSyp6dtt1fV5lefC9W0Pzd+t9vb 50+niz0r0b4ZQSmUPb0TWxagIimvqLscDR/zh9OcZz49D3GEj5Uen9Eyjy/TPsVX1rvDoxskVf7 ak3 X-Received: by 2002:a05:7022:e09:b0:11a:342e:8a98 with SMTP id a92af1059eb24-12bfb63267fmr7475760c88.0.1775535239212; Mon, 06 Apr 2026 21:13:59 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm18523808c88.0.2026.04.06.21.13.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 21:13:58 -0700 (PDT) From: "Derek J. Clark" To: Jiri Kosina , Benjamin Tissoires Cc: "Pierre-Loup A . Griffais" , Lambert Fan , "Derek J . Clark" , linux-input@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] HID: hid-oxp: Add Second Generation Gamepad Mode Switch Date: Tue, 7 Apr 2026 04:13:52 +0000 Message-ID: <20260407041354.2283201-4-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260407041354.2283201-1-derekjohn.clark@gmail.com> References: <20260407041354.2283201-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adds "gamepad_mode" attribute to second generation OneXPlayer configuration HID devices. This attribute initiates a mode shift in the device MCU that puts it into a state where all events are routed to an hidraw interface instead of the xpad evdev interface. This allows for debugging the hardware input mapping added in the next patch. Signed-off-by: Derek J. Clark --- v2: - Rename to gamepad_mode & show relevant gamepad modes instead of using a debug enable/disable paradigm, to match other drivers. --- drivers/hid/hid-oxp.c | 130 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c index 25214356163e..c62952537d98 100644 --- a/drivers/hid/hid-oxp.c +++ b/drivers/hid/hid-oxp.c @@ -33,6 +33,7 @@ enum oxp_function_index { OXP_FID_GEN1_RGB_SET =3D 0x07, OXP_FID_GEN1_RGB_REPLY =3D 0x0f, + OXP_FID_GEN2_TOGGLE_MODE =3D 0xb2, OXP_FID_GEN2_STATUS_EVENT =3D 0xb8, }; =20 @@ -41,11 +42,22 @@ static struct oxp_hid_cfg { struct hid_device *hdev; struct mutex cfg_mutex; /*ensure single synchronous output report*/ u8 rgb_brightness; + u8 gamepad_mode; u8 rgb_effect; u8 rgb_speed; u8 rgb_en; } drvdata; =20 +enum oxp_gamepad_mode_index { + OXP_GP_MODE_XINPUT =3D 0x00, + OXP_GP_MODE_DEBUG =3D 0x03, +}; + +static const char *const oxp_gamepad_mode_text[] =3D { + [OXP_GP_MODE_XINPUT] =3D "xinput", + [OXP_GP_MODE_DEBUG] =3D "debug", +}; + enum oxp_feature_en_index { OXP_FEAT_DISABLED, OXP_FEAT_ENABLED, @@ -181,6 +193,32 @@ static int oxp_hid_raw_event_gen_1(struct hid_device *= hdev, return 0; } =20 +static int oxp_gen_2_property_out(enum oxp_function_index fid, u8 *data, u= 8 data_size); + +static void oxp_mcu_init_fn(struct work_struct *work) +{ + u8 gp_mode_data[3] =3D { OXP_GP_MODE_DEBUG, 0x01, 0x02 }; + int ret; + + /* Cycle the gamepad mode */ + ret =3D oxp_gen_2_property_out(OXP_FID_GEN2_TOGGLE_MODE, gp_mode_data, 3); + if (ret) + dev_err(&drvdata.hdev->dev, + "Error: Failed to set gamepad mode: %i\n", ret); + + /* Remainder only applies for xinput mode */ + if (drvdata.gamepad_mode =3D=3D OXP_GP_MODE_DEBUG) + return; + + gp_mode_data[0] =3D OXP_GP_MODE_XINPUT; + ret =3D oxp_gen_2_property_out(OXP_FID_GEN2_TOGGLE_MODE, gp_mode_data, 3); + if (ret) + dev_err(&drvdata.hdev->dev, + "Error: Failed to set gamepad mode: %i\n", ret); +} + +static DECLARE_DELAYED_WORK(oxp_mcu_init, oxp_mcu_init_fn); + static int oxp_hid_raw_event_gen_2(struct hid_device *hdev, struct hid_report *report, u8 *data, int size) @@ -191,6 +229,14 @@ static int oxp_hid_raw_event_gen_2(struct hid_device *= hdev, if (data[0] !=3D OXP_FID_GEN2_STATUS_EVENT) return 0; =20 + /* Sent ~6s after resume event, indicating the MCU has fully reset. + * Re-apply our settings after this has been received. + */ + if (data[3] =3D=3D OXP_EFFECT_MONO_TRUE) { + mod_delayed_work(system_wq, &oxp_mcu_init, msecs_to_jiffies(50)); + return 0; + } + if (data[3] !=3D OXP_GET_PROPERTY) return 0; =20 @@ -288,6 +334,77 @@ static int oxp_gen_2_property_out(enum oxp_function_in= dex fid, u8 *data, footer_size); } =20 +static ssize_t gamepad_mode_store(struct device *dev, + struct device_attribute *attr, const char *buf, + size_t count) +{ + u16 up =3D get_usage_page(drvdata.hdev); + u8 data[3] =3D { 0x00, 0x01, 0x02 }; + int ret =3D -EINVAL; + int i; + + if (up !=3D GEN2_USAGE_PAGE) + return ret; + + for (i =3D 0; i < ARRAY_SIZE(oxp_gamepad_mode_text); i++) { + if (oxp_gamepad_mode_text[i] && sysfs_streq(buf, oxp_gamepad_mode_text[i= ])) { + ret =3D i; + break; + } + } + if (ret < 0) + return ret; + + data[0] =3D ret; + + ret =3D oxp_gen_2_property_out(OXP_FID_GEN2_TOGGLE_MODE, data, 3); + if (ret) + return ret; + + drvdata.gamepad_mode =3D data[0]; + + return count; +} + +static ssize_t gamepad_mode_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%s\n", oxp_gamepad_mode_text[drvdata.gamepad_mode= ]); +} +static DEVICE_ATTR_RW(gamepad_mode); + +static ssize_t gamepad_mode_index_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + ssize_t count =3D 0; + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(oxp_gamepad_mode_text); i++) { + if (!oxp_gamepad_mode_text[i] || + oxp_gamepad_mode_text[i][0] =3D=3D '\0') + continue; + + count +=3D sysfs_emit_at(buf, count, "%s ", oxp_gamepad_mode_text[i]); + } + + if (count) + buf[count - 1] =3D '\n'; + + return count; +} +static DEVICE_ATTR_RO(gamepad_mode_index); + +static struct attribute *oxp_cfg_attrs[] =3D { + &dev_attr_gamepad_mode.attr, + &dev_attr_gamepad_mode_index.attr, + NULL, +}; + +static const struct attribute_group oxp_cfg_attrs_group =3D { + .attrs =3D oxp_cfg_attrs, +}; + static int oxp_rgb_status_store(u8 enabled, u8 speed, u8 brightness) { u16 up =3D get_usage_page(drvdata.hdev); @@ -733,7 +850,20 @@ static int oxp_cfg_probe(struct hid_device *hdev, u16 = up) dev_warn(drvdata.led_mc->led_cdev.dev, "Failed to query RGB initial state: %i\n", ret); =20 + /* Below features are only implemented in gen 2 */ + if (up !=3D GEN2_USAGE_PAGE) + return 0; + skip_rgb: + mod_delayed_work(system_wq, &oxp_mcu_init, msecs_to_jiffies(50)); + + drvdata.gamepad_mode =3D OXP_GP_MODE_XINPUT; + + ret =3D devm_device_add_group(&hdev->dev, &oxp_cfg_attrs_group); + if (ret) + return dev_err_probe(&hdev->dev, ret, + "Failed to attach configuration attributes\n"); + return 0; } =20 --=20 2.53.0 From nobody Tue Apr 7 13:02:01 2026 Received: from mail-dl1-f45.google.com (mail-dl1-f45.google.com [74.125.82.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D106837880E for ; Tue, 7 Apr 2026 04:14:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535243; cv=none; b=F3gH7UhcqYasSbY38PgB9qIbQzoU8GHjnNePV74m6y8+g9kG2kchGvzKAe9EBW+5hld/gdbKWiOPfw1zqL2uCXyxAgpGqUTT46MSCQSYgIxpcXDMvw7F7W7luLvD6Vi8SINWG6xwunXt7Hj28AuaM3eTFJBhqB3et8vAMYdJKY8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535243; c=relaxed/simple; bh=cNezbtGntAwz2oSl5uAn0H5MfOye3Ojk8+u5RCwjlj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lm/7Uca9Ue7dPlqTWGNYJNoXdcDlUmggrSxPHciD1+1x+T1b/ubseBNhGDWLA7g/0u6yabf02T52STBP7Pb5wkifnwIZ0OCgZB3p8xksawP/oS1azsfSxNvwUTwkFj53UmTMxJj/cHnC53Nhx+zNdoyeCCKAFJLF+F3LKOJ+9hg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HO7VVXBV; arc=none smtp.client-ip=74.125.82.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HO7VVXBV" Received: by mail-dl1-f45.google.com with SMTP id a92af1059eb24-126ea4e9694so122360c88.1 for ; Mon, 06 Apr 2026 21:14:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775535240; x=1776140040; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xb6BjotEdv4hk1elT3jxmnDkcn5QmvrZiMWl5q56lq0=; b=HO7VVXBV9pY9yZUOIQxwqcBis5vEzEUwVofy47oL1L2mH0Ncaw0NdJo2x3glsfHebC YoJo88kMTA9cIjaP+audUDUfMc5TZ1wQ+rHLwCawk9sg90ithxJanlNh3+zUVccALIyn PNS6wRBcMnv8E63UDxK1pjdWAvfFWGv2ghQnRpFa0emky4RGI/tTTP2dwlIqHlLbzJoi QdWbnu2CDY8Z7TiKFYddhtpWCVEaF06TdEv309htHFxHP8uaplPduLkGYz4E4cxoH/9t q6yoQfXn+s3XWCwi5jb5gE3aBHnQ/aLkaKjYsgGEq8kgDiYvK0WkcvhTVF1uQmio0wdq C1Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775535240; x=1776140040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=xb6BjotEdv4hk1elT3jxmnDkcn5QmvrZiMWl5q56lq0=; b=F2E5RaRf70/FslhX44EPQvsZdiLS9fQ+/R4YC49I1Un+2RkQdktsJLD2ihBv2vrq/R cBguSca2XjkkukBEpd3ZzeWz4ZO7Se4rYRLqE6IdsuwdT1TOZ/c2ByzcZoAwe2ASdr20 V+qPHV+7UlnQLdb3+VnmPCNrVVCCZxC/zSpL9ttwbrOHXBCKDwykGEX64eheFmoBK1Ml axnCKtr7nCKZnu5MHKSFWS+o87ntl7i1XDQkyu9TL/0XP0LzvXThh40QpdZ6vihaiT3V scBEXAyBRZh3i1fR9oQpZ3zAFVyS0RU63M6mxGO19QwV/n278OnqkD6RFyrSly+A5JgT VzUA== X-Forwarded-Encrypted: i=1; AJvYcCW91wb7FTDoK/nSLJHzLo8eJ/uO1rHXWB2fqmh4JnEuxdrrxMvRNHToEKrnWIblcCYhO4CAUKOKnyqd7Cs=@vger.kernel.org X-Gm-Message-State: AOJu0Yx8HdaF/ewVWVBBTcQb+/fYVrMvgCJKvOQWCu2TN9R4Y7R58TzN lNHuWpxk/ID78hWW4FL8bdwAy7OS7jY0PLYdo8x8ojygT3RIprW5QkX+ X-Gm-Gg: AeBDieu6tqF5L9atEjDPKzrenkCOt8noGm/1mTqiYsIHZ8jjEBN4YQwcYcylS+Ou4GN K2sbFiMV8WKi2m/m7OvtZplSz0QgRIPh45t2B3bZTsMWnVEvn6QkS1WRn5yQhELlG0Ootui5fsU kopW8ypmoV5Y8kgTPx/lthadORADaIEGexmrhJzqxwwRvgt+roJO+tNGfyxWT4NCyYJoEHSr350 AlOoqVOZYOi6PU6hjcA1GtkZBoiRhvRTu5DcKGJWmQQpuW8G4JEMO8tbAn8Xdl+mCCCljL858ka KcVKND5lOOYhCv5Ci7znFC773CHEvZRhEZ+1vYVIg4rIGxE7RzNRUIG4+JG+NZLA4ah15nTNdyQ pFUxJ11lQnh3Nqd6h2VUfGuhwXHeg/+NZMEQSi6Ks6pUWGAfylfM1X2qTyFhEd/p88qyYGMd2RX i6equTpt5+Otm+ONXmv44CwmUZoYnYR3vUQsRESExbDLPGf2MBk1/FhYguVP8CJ57s5D8PRftaY LiuWdDxiUDoDp8= X-Received: by 2002:a05:7301:4090:b0:2ca:e4f2:31ff with SMTP id 5a478bee46e88-2cbf99ec0b9mr7453335eec.6.1775535239840; Mon, 06 Apr 2026 21:13:59 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm18523808c88.0.2026.04.06.21.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 21:13:59 -0700 (PDT) From: "Derek J. Clark" To: Jiri Kosina , Benjamin Tissoires Cc: "Pierre-Loup A . Griffais" , Lambert Fan , "Derek J . Clark" , linux-input@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] HID: hid-oxp: Add Button Mapping Interface Date: Tue, 7 Apr 2026 04:13:53 +0000 Message-ID: <20260407041354.2283201-5-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260407041354.2283201-1-derekjohn.clark@gmail.com> References: <20260407041354.2283201-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adds button mapping interface for second generation OneXPlayer configuration HID interfaces. This interface allows the MCU to swap button mappings at the hardware level. The current state cannot be retrieved, and the mappings may have been modified in Windows prior, so we reset the button mapping at init and expose an attribute to allow userspace to do this again at any time. The interface requires two pages of button mapping data to be sent before the settings will take place. Since the MCU requires a 200ms delay after each message (total 400ms for these attributes) use the same debounce work queue method we used for RGB. This will allow for userspace or udev rules to rapidly map all buttons. The values will be cached before the final write is finally sent to the device. Signed-off-by: Derek J. Clark --- v2: - Add detection of post-suspend MCU init to trigger setting the button map again. --- drivers/hid/hid-oxp.c | 565 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 565 insertions(+) diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c index c62952537d98..1100f1f14f35 100644 --- a/drivers/hid/hid-oxp.c +++ b/drivers/hid/hid-oxp.c @@ -34,10 +34,145 @@ enum oxp_function_index { OXP_FID_GEN1_RGB_SET =3D 0x07, OXP_FID_GEN1_RGB_REPLY =3D 0x0f, OXP_FID_GEN2_TOGGLE_MODE =3D 0xb2, + OXP_FID_GEN2_KEY_STATE =3D 0xb4, OXP_FID_GEN2_STATUS_EVENT =3D 0xb8, }; =20 +#define OXP_MAPPING_GAMEPAD 0x01 +#define OXP_MAPPING_KEYBOARD 0x02 + +struct oxp_button_data { + u8 mode; + u8 index; + u8 key_id; + u8 padding[2]; +} __packed; + +struct oxp_button_entry { + struct oxp_button_data data; + const char *name; +}; + +static const struct oxp_button_entry oxp_button_table[] =3D { + /* Gamepad Buttons */ + { { OXP_MAPPING_GAMEPAD, 0x01 }, "BTN_A" }, + { { OXP_MAPPING_GAMEPAD, 0x02 }, "BTN_B" }, + { { OXP_MAPPING_GAMEPAD, 0x03 }, "BTN_X" }, + { { OXP_MAPPING_GAMEPAD, 0x04 }, "BTN_Y" }, + { { OXP_MAPPING_GAMEPAD, 0x05 }, "BTN_LB" }, + { { OXP_MAPPING_GAMEPAD, 0x06 }, "BTN_RB" }, + { { OXP_MAPPING_GAMEPAD, 0x07 }, "BTN_LT" }, + { { OXP_MAPPING_GAMEPAD, 0x08 }, "BTN_RT" }, + { { OXP_MAPPING_GAMEPAD, 0x09 }, "BTN_START" }, + { { OXP_MAPPING_GAMEPAD, 0x0a }, "BTN_SELECT" }, + { { OXP_MAPPING_GAMEPAD, 0x0b }, "BTN_L3" }, + { { OXP_MAPPING_GAMEPAD, 0x0c }, "BTN_R3" }, + { { OXP_MAPPING_GAMEPAD, 0x0d }, "DPAD_UP" }, + { { OXP_MAPPING_GAMEPAD, 0x0e }, "DPAD_DOWN" }, + { { OXP_MAPPING_GAMEPAD, 0x0f }, "DPAD_LEFT" }, + { { OXP_MAPPING_GAMEPAD, 0x10 }, "DPAD_RIGHT" }, + { { OXP_MAPPING_GAMEPAD, 0x11 }, "JOY_L_UP" }, + { { OXP_MAPPING_GAMEPAD, 0x12 }, "JOY_L_UP_RIGHT" }, + { { OXP_MAPPING_GAMEPAD, 0x13 }, "JOY_L_RIGHT" }, + { { OXP_MAPPING_GAMEPAD, 0x14 }, "JOY_L_DOWN_RIGHT" }, + { { OXP_MAPPING_GAMEPAD, 0x15 }, "JOY_L_DOWN" }, + { { OXP_MAPPING_GAMEPAD, 0x16 }, "JOY_L_DOWN_LEFT" }, + { { OXP_MAPPING_GAMEPAD, 0x17 }, "JOY_L_LEFT" }, + { { OXP_MAPPING_GAMEPAD, 0x18 }, "JOY_L_UP_LEFT" }, + { { OXP_MAPPING_GAMEPAD, 0x19 }, "JOY_R_UP" }, + { { OXP_MAPPING_GAMEPAD, 0x1a }, "JOY_R_UP_RIGHT" }, + { { OXP_MAPPING_GAMEPAD, 0x1b }, "JOY_R_RIGHT" }, + { { OXP_MAPPING_GAMEPAD, 0x1c }, "JOY_R_DOWN_RIGHT" }, + { { OXP_MAPPING_GAMEPAD, 0x1d }, "JOY_R_DOWN" }, + { { OXP_MAPPING_GAMEPAD, 0x1e }, "JOY_R_DOWN_LEFT" }, + { { OXP_MAPPING_GAMEPAD, 0x1f }, "JOY_R_LEFT" }, + { { OXP_MAPPING_GAMEPAD, 0x20 }, "JOY_R_UP_LEFT" }, + { { OXP_MAPPING_GAMEPAD, 0x22 }, "BTN_GUIDE" }, + /* Keyboard Keys */ + { { OXP_MAPPING_KEYBOARD, 0x01, 0x5a }, "KEY_F1" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x5b }, "KEY_F2" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x5c }, "KEY_F3" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x5d }, "KEY_F4" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x5e }, "KEY_F5" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x5f }, "KEY_F6" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x60 }, "KEY_F7" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x61 }, "KEY_F8" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x62 }, "KEY_F9" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x63 }, "KEY_F10" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x64 }, "KEY_F11" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x65 }, "KEY_F12" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x66 }, "KEY_F13" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x67 }, "KEY_F14" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x68 }, "KEY_F15" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x69 }, "KEY_F16" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x6a }, "KEY_F17" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x6b }, "KEY_F18" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x6c }, "KEY_F19" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x6d }, "KEY_F20" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x6e }, "KEY_F21" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x6f }, "KEY_F22" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x70 }, "KEY_F23" }, + { { OXP_MAPPING_KEYBOARD, 0x01, 0x71 }, "KEY_F24" }, +}; + +enum oxp_joybutton_index { + BUTTON_A =3D 0x01, + BUTTON_B, + BUTTON_X, + BUTTON_Y, + BUTTON_LB, + BUTTON_RB, + BUTTON_LT, + BUTTON_RT, + BUTTON_START, + BUTTON_SELECT, + BUTTON_L3, + BUTTON_R3, + BUTTON_DUP, + BUTTON_DDOWN, + BUTTON_DLEFT, + BUTTON_DRIGHT, + BUTTON_M1 =3D 0x22, + BUTTON_M2, + /* These are unused currently, reserved for future devices */ + BUTTON_M3, + BUTTON_M4, + BUTTON_M5, + BUTTON_M6, +}; + +struct oxp_button_idx { + enum oxp_joybutton_index button_idx; + u8 mapping_idx; +} __packed; + +struct oxp_bmap_page_1 { + struct oxp_button_idx btn_a; + struct oxp_button_idx btn_b; + struct oxp_button_idx btn_x; + struct oxp_button_idx btn_y; + struct oxp_button_idx btn_lb; + struct oxp_button_idx btn_rb; + struct oxp_button_idx btn_lt; + struct oxp_button_idx btn_rt; + struct oxp_button_idx btn_start; +} __packed; + +struct oxp_bmap_page_2 { + struct oxp_button_idx btn_select; + struct oxp_button_idx btn_l3; + struct oxp_button_idx btn_r3; + struct oxp_button_idx btn_dup; + struct oxp_button_idx btn_ddown; + struct oxp_button_idx btn_dleft; + struct oxp_button_idx btn_dright; + struct oxp_button_idx btn_m1; + struct oxp_button_idx btn_m2; +} __packed; + static struct oxp_hid_cfg { + struct oxp_bmap_page_1 *bmap_1; + struct oxp_bmap_page_2 *bmap_2; struct led_classdev_mc *led_mc; struct hid_device *hdev; struct mutex cfg_mutex; /*ensure single synchronous output report*/ @@ -48,6 +183,10 @@ static struct oxp_hid_cfg { u8 rgb_en; } drvdata; =20 +#define OXP_FILL_PAGE_SLOT(page, btn) \ + { .button_idx =3D (page)->btn.button_idx, \ + .mapping_idx =3D (page)->btn.mapping_idx } + enum oxp_gamepad_mode_index { OXP_GP_MODE_XINPUT =3D 0x00, OXP_GP_MODE_DEBUG =3D 0x03, @@ -153,6 +292,10 @@ struct oxp_gen_2_rgb_report { u8 effect; } __packed; =20 +struct oxp_attr { + u8 index; +}; + static u16 get_usage_page(struct hid_device *hdev) { return hdev->collection[0].usage >> 16; @@ -194,12 +337,19 @@ static int oxp_hid_raw_event_gen_1(struct hid_device = *hdev, } =20 static int oxp_gen_2_property_out(enum oxp_function_index fid, u8 *data, u= 8 data_size); +static int oxp_set_buttons(void); =20 static void oxp_mcu_init_fn(struct work_struct *work) { u8 gp_mode_data[3] =3D { OXP_GP_MODE_DEBUG, 0x01, 0x02 }; int ret; =20 + /* Re-apply the button mapping */ + ret =3D oxp_set_buttons(); + if (ret) + dev_err(&drvdata.hdev->dev, + "Error: Failed to set button mapping: %i\n", ret); + /* Cycle the gamepad mode */ ret =3D oxp_gen_2_property_out(OXP_FID_GEN2_TOGGLE_MODE, gp_mode_data, 3); if (ret) @@ -395,9 +545,410 @@ static ssize_t gamepad_mode_index_show(struct device = *dev, } static DEVICE_ATTR_RO(gamepad_mode_index); =20 +static void oxp_set_defaults_bmap_1(struct oxp_bmap_page_1 *bmap) +{ + bmap->btn_a.button_idx =3D BUTTON_A; + bmap->btn_a.mapping_idx =3D 0; + bmap->btn_b.button_idx =3D BUTTON_B; + bmap->btn_b.mapping_idx =3D 1; + bmap->btn_x.button_idx =3D BUTTON_X; + bmap->btn_x.mapping_idx =3D 2; + bmap->btn_y.button_idx =3D BUTTON_Y; + bmap->btn_y.mapping_idx =3D 3; + bmap->btn_lb.button_idx =3D BUTTON_LB; + bmap->btn_lb.mapping_idx =3D 4; + bmap->btn_rb.button_idx =3D BUTTON_RB; + bmap->btn_rb.mapping_idx =3D 5; + bmap->btn_lt.button_idx =3D BUTTON_LT; + bmap->btn_lt.mapping_idx =3D 6; + bmap->btn_rt.button_idx =3D BUTTON_RT; + bmap->btn_rt.mapping_idx =3D 7; + bmap->btn_start.button_idx =3D BUTTON_START; + bmap->btn_start.mapping_idx =3D 8; +} + +static void oxp_set_defaults_bmap_2(struct oxp_bmap_page_2 *bmap) +{ + bmap->btn_select.button_idx =3D BUTTON_SELECT; + bmap->btn_select.mapping_idx =3D 9; + bmap->btn_l3.button_idx =3D BUTTON_L3; + bmap->btn_l3.mapping_idx =3D 10; + bmap->btn_r3.button_idx =3D BUTTON_R3; + bmap->btn_r3.mapping_idx =3D 11; + bmap->btn_dup.button_idx =3D BUTTON_DUP; + bmap->btn_dup.mapping_idx =3D 12; + bmap->btn_ddown.button_idx =3D BUTTON_DDOWN; + bmap->btn_ddown.mapping_idx =3D 13; + bmap->btn_dleft.button_idx =3D BUTTON_DLEFT; + bmap->btn_dleft.mapping_idx =3D 14; + bmap->btn_dright.button_idx =3D BUTTON_DRIGHT; + bmap->btn_dright.mapping_idx =3D 15; + bmap->btn_m1.button_idx =3D BUTTON_M1; + bmap->btn_m1.mapping_idx =3D 48; /* KEY_F15 */ + bmap->btn_m2.button_idx =3D BUTTON_M2; + bmap->btn_m2.mapping_idx =3D 49; /* KEY_F16 */ +} + +static void oxp_page_fill_data(char *buf, const struct oxp_button_idx *but= tons, + size_t len) +{ + size_t offset_increment =3D sizeof(u8) + sizeof(struct oxp_button_idx); + size_t offset =3D 5; + unsigned int i; + + for (i =3D 0; i < len; i++, offset +=3D offset_increment) { + buf[offset] =3D (u8)buttons[i].button_idx; + memcpy(buf + offset + 1, + &oxp_button_table[buttons[i].mapping_idx].data, + sizeof(struct oxp_button_data)); + } +} + +static int oxp_set_buttons(void) +{ + u8 page_1[59] =3D { 0x02, 0x38, 0x20, 0x01, 0x01 }; + u8 page_2[59] =3D { 0x02, 0x38, 0x20, 0x02, 0x01 }; + u16 up =3D get_usage_page(drvdata.hdev); + int ret; + + if (up !=3D GEN2_USAGE_PAGE) + return -EINVAL; + + const struct oxp_button_idx p1[] =3D { + OXP_FILL_PAGE_SLOT(drvdata.bmap_1, btn_a), + OXP_FILL_PAGE_SLOT(drvdata.bmap_1, btn_b), + OXP_FILL_PAGE_SLOT(drvdata.bmap_1, btn_x), + OXP_FILL_PAGE_SLOT(drvdata.bmap_1, btn_y), + OXP_FILL_PAGE_SLOT(drvdata.bmap_1, btn_lb), + OXP_FILL_PAGE_SLOT(drvdata.bmap_1, btn_rb), + OXP_FILL_PAGE_SLOT(drvdata.bmap_1, btn_lt), + OXP_FILL_PAGE_SLOT(drvdata.bmap_1, btn_rt), + OXP_FILL_PAGE_SLOT(drvdata.bmap_1, btn_start), + }; + + const struct oxp_button_idx p2[] =3D { + OXP_FILL_PAGE_SLOT(drvdata.bmap_2, btn_select), + OXP_FILL_PAGE_SLOT(drvdata.bmap_2, btn_l3), + OXP_FILL_PAGE_SLOT(drvdata.bmap_2, btn_r3), + OXP_FILL_PAGE_SLOT(drvdata.bmap_2, btn_dup), + OXP_FILL_PAGE_SLOT(drvdata.bmap_2, btn_ddown), + OXP_FILL_PAGE_SLOT(drvdata.bmap_2, btn_dleft), + OXP_FILL_PAGE_SLOT(drvdata.bmap_2, btn_dright), + OXP_FILL_PAGE_SLOT(drvdata.bmap_2, btn_m1), + OXP_FILL_PAGE_SLOT(drvdata.bmap_2, btn_m2), + }; + + oxp_page_fill_data(page_1, p1, ARRAY_SIZE(p1)); + oxp_page_fill_data(page_2, p2, ARRAY_SIZE(p2)); + + ret =3D oxp_gen_2_property_out(OXP_FID_GEN2_KEY_STATE, page_1, ARRAY_SIZE= (page_1)); + if (ret) + return ret; + + return oxp_gen_2_property_out(OXP_FID_GEN2_KEY_STATE, page_2, ARRAY_SIZE(= page_2)); +} + +static int oxp_reset_buttons(void) +{ + oxp_set_defaults_bmap_1(drvdata.bmap_1); + oxp_set_defaults_bmap_2(drvdata.bmap_2); + return oxp_set_buttons(); +} + +static ssize_t reset_buttons_store(struct device *dev, + struct device_attribute *attr, const char *buf, + size_t count) +{ + int val, ret; + + ret =3D kstrtoint(buf, 10, &val); + if (ret) + return ret; + + if (val !=3D 1) + return -EINVAL; + + ret =3D oxp_reset_buttons(); + if (ret) + return ret; + + return count; +} +static DEVICE_ATTR_WO(reset_buttons); + +static void oxp_btn_queue_fn(struct work_struct *work) +{ + int ret; + + ret =3D oxp_set_buttons(); + if (ret) + dev_err(&drvdata.hdev->dev, + "Error: Failed to write button mapping: %i\n", ret); +} + +static DECLARE_DELAYED_WORK(oxp_btn_queue, oxp_btn_queue_fn); + +static int oxp_button_idx_from_str(const char *buf) +{ + int i; + + for (i =3D 0; i < ARRAY_SIZE(oxp_button_table); i++) + if (sysfs_streq(buf, oxp_button_table[i].name)) + return i; + + return -EINVAL; +} + +static ssize_t map_button_store(struct device *dev, + struct device_attribute *attr, const char *buf, + size_t count, u8 index) +{ + int idx; + + idx =3D oxp_button_idx_from_str(buf); + if (idx < 0) + return idx; + + switch (index) { + case BUTTON_A: + drvdata.bmap_1->btn_a.mapping_idx =3D idx; + break; + case BUTTON_B: + drvdata.bmap_1->btn_b.mapping_idx =3D idx; + break; + case BUTTON_X: + drvdata.bmap_1->btn_x.mapping_idx =3D idx; + break; + case BUTTON_Y: + drvdata.bmap_1->btn_y.mapping_idx =3D idx; + break; + case BUTTON_LB: + drvdata.bmap_1->btn_lb.mapping_idx =3D idx; + break; + case BUTTON_RB: + drvdata.bmap_1->btn_rb.mapping_idx =3D idx; + break; + case BUTTON_LT: + drvdata.bmap_1->btn_lt.mapping_idx =3D idx; + break; + case BUTTON_RT: + drvdata.bmap_1->btn_rt.mapping_idx =3D idx; + break; + case BUTTON_START: + drvdata.bmap_1->btn_start.mapping_idx =3D idx; + break; + case BUTTON_SELECT: + drvdata.bmap_2->btn_select.mapping_idx =3D idx; + break; + case BUTTON_L3: + drvdata.bmap_2->btn_l3.mapping_idx =3D idx; + break; + case BUTTON_R3: + drvdata.bmap_2->btn_r3.mapping_idx =3D idx; + break; + case BUTTON_DUP: + drvdata.bmap_2->btn_dup.mapping_idx =3D idx; + break; + case BUTTON_DDOWN: + drvdata.bmap_2->btn_ddown.mapping_idx =3D idx; + break; + case BUTTON_DLEFT: + drvdata.bmap_2->btn_dleft.mapping_idx =3D idx; + break; + case BUTTON_DRIGHT: + drvdata.bmap_2->btn_dright.mapping_idx =3D idx; + break; + case BUTTON_M1: + drvdata.bmap_2->btn_m1.mapping_idx =3D idx; + break; + case BUTTON_M2: + drvdata.bmap_2->btn_m2.mapping_idx =3D idx; + break; + default: + return -EINVAL; + } + mod_delayed_work(system_wq, &oxp_btn_queue, msecs_to_jiffies(50)); + return count; +} + +static ssize_t map_button_show(struct device *dev, + struct device_attribute *attr, char *buf, + u8 index) +{ + u8 i; + + switch (index) { + case BUTTON_A: + i =3D drvdata.bmap_1->btn_a.mapping_idx; + break; + case BUTTON_B: + i =3D drvdata.bmap_1->btn_b.mapping_idx; + break; + case BUTTON_X: + i =3D drvdata.bmap_1->btn_x.mapping_idx; + break; + case BUTTON_Y: + i =3D drvdata.bmap_1->btn_y.mapping_idx; + break; + case BUTTON_LB: + i =3D drvdata.bmap_1->btn_lb.mapping_idx; + break; + case BUTTON_RB: + i =3D drvdata.bmap_1->btn_rb.mapping_idx; + break; + case BUTTON_LT: + i =3D drvdata.bmap_1->btn_lt.mapping_idx; + break; + case BUTTON_RT: + i =3D drvdata.bmap_1->btn_rt.mapping_idx; + break; + case BUTTON_START: + i =3D drvdata.bmap_1->btn_start.mapping_idx; + break; + case BUTTON_SELECT: + i =3D drvdata.bmap_2->btn_select.mapping_idx; + break; + case BUTTON_L3: + i =3D drvdata.bmap_2->btn_l3.mapping_idx; + break; + case BUTTON_R3: + i =3D drvdata.bmap_2->btn_r3.mapping_idx; + break; + case BUTTON_DUP: + i =3D drvdata.bmap_2->btn_dup.mapping_idx; + break; + case BUTTON_DDOWN: + i =3D drvdata.bmap_2->btn_ddown.mapping_idx; + break; + case BUTTON_DLEFT: + i =3D drvdata.bmap_2->btn_dleft.mapping_idx; + break; + case BUTTON_DRIGHT: + i =3D drvdata.bmap_2->btn_dright.mapping_idx; + break; + case BUTTON_M1: + i =3D drvdata.bmap_2->btn_m1.mapping_idx; + break; + case BUTTON_M2: + i =3D drvdata.bmap_2->btn_m2.mapping_idx; + break; + default: + return -EINVAL; + } + + if (i >=3D ARRAY_SIZE(oxp_button_table)) + return -EINVAL; + + return sysfs_emit(buf, "%s\n", oxp_button_table[i].name); +} + +static ssize_t button_mapping_options_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + ssize_t count =3D 0; + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(oxp_button_table); i++) + count +=3D sysfs_emit_at(buf, count, "%s ", oxp_button_table[i].name); + + if (count) + buf[count - 1] =3D '\n'; + + return count; +} +static DEVICE_ATTR_RO(button_mapping_options); + +#define OXP_DEVICE_ATTR_RW(_name, _group) = \ + static ssize_t _name##_store(struct device *dev, \ + struct device_attribute *attr, \ + const char *buf, size_t count) \ + { \ + return _group##_store(dev, attr, buf, count, _name.index); \ + } \ + static ssize_t _name##_show(struct device *dev, \ + struct device_attribute *attr, char *buf) \ + { \ + return _group##_show(dev, attr, buf, _name.index); \ + } \ + static DEVICE_ATTR_RW(_name) + +static struct oxp_attr button_a =3D { BUTTON_A }; +OXP_DEVICE_ATTR_RW(button_a, map_button); + +static struct oxp_attr button_b =3D { BUTTON_B }; +OXP_DEVICE_ATTR_RW(button_b, map_button); + +static struct oxp_attr button_x =3D { BUTTON_X }; +OXP_DEVICE_ATTR_RW(button_x, map_button); + +static struct oxp_attr button_y =3D { BUTTON_Y }; +OXP_DEVICE_ATTR_RW(button_y, map_button); + +static struct oxp_attr button_lb =3D { BUTTON_LB }; +OXP_DEVICE_ATTR_RW(button_lb, map_button); + +static struct oxp_attr button_rb =3D { BUTTON_RB }; +OXP_DEVICE_ATTR_RW(button_rb, map_button); + +static struct oxp_attr button_lt =3D { BUTTON_LT }; +OXP_DEVICE_ATTR_RW(button_lt, map_button); + +static struct oxp_attr button_rt =3D { BUTTON_RT }; +OXP_DEVICE_ATTR_RW(button_rt, map_button); + +static struct oxp_attr button_start =3D { BUTTON_START }; +OXP_DEVICE_ATTR_RW(button_start, map_button); + +static struct oxp_attr button_select =3D { BUTTON_SELECT }; +OXP_DEVICE_ATTR_RW(button_select, map_button); + +static struct oxp_attr button_l3 =3D { BUTTON_L3 }; +OXP_DEVICE_ATTR_RW(button_l3, map_button); + +static struct oxp_attr button_r3 =3D { BUTTON_R3 }; +OXP_DEVICE_ATTR_RW(button_r3, map_button); + +static struct oxp_attr button_d_up =3D { BUTTON_DUP }; +OXP_DEVICE_ATTR_RW(button_d_up, map_button); + +static struct oxp_attr button_d_down =3D { BUTTON_DDOWN }; +OXP_DEVICE_ATTR_RW(button_d_down, map_button); + +static struct oxp_attr button_d_left =3D { BUTTON_DLEFT }; +OXP_DEVICE_ATTR_RW(button_d_left, map_button); + +static struct oxp_attr button_d_right =3D { BUTTON_DRIGHT }; +OXP_DEVICE_ATTR_RW(button_d_right, map_button); + +static struct oxp_attr button_m1 =3D { BUTTON_M1 }; +OXP_DEVICE_ATTR_RW(button_m1, map_button); + +static struct oxp_attr button_m2 =3D { BUTTON_M2 }; +OXP_DEVICE_ATTR_RW(button_m2, map_button); + static struct attribute *oxp_cfg_attrs[] =3D { + &dev_attr_button_a.attr, + &dev_attr_button_b.attr, + &dev_attr_button_d_down.attr, + &dev_attr_button_d_left.attr, + &dev_attr_button_d_right.attr, + &dev_attr_button_d_up.attr, + &dev_attr_button_l3.attr, + &dev_attr_button_lb.attr, + &dev_attr_button_lt.attr, + &dev_attr_button_m1.attr, + &dev_attr_button_m2.attr, + &dev_attr_button_mapping_options.attr, + &dev_attr_button_r3.attr, + &dev_attr_button_rb.attr, + &dev_attr_button_rt.attr, + &dev_attr_button_select.attr, + &dev_attr_button_start.attr, + &dev_attr_button_x.attr, + &dev_attr_button_y.attr, &dev_attr_gamepad_mode.attr, &dev_attr_gamepad_mode_index.attr, + &dev_attr_reset_buttons.attr, NULL, }; =20 @@ -823,6 +1374,8 @@ static bool oxp_hybrid_mcu_device(void) =20 static int oxp_cfg_probe(struct hid_device *hdev, u16 up) { + struct oxp_bmap_page_1 *bmap_1; + struct oxp_bmap_page_2 *bmap_2; int ret; =20 hid_set_drvdata(hdev, &drvdata); @@ -855,6 +1408,18 @@ static int oxp_cfg_probe(struct hid_device *hdev, u16= up) return 0; =20 skip_rgb: + bmap_1 =3D devm_kzalloc(&hdev->dev, sizeof(struct oxp_bmap_page_1), GFP_K= ERNEL); + if (!bmap_1) + return dev_err_probe(&hdev->dev, -ENOMEM, + "Unable to allocate button map page 1\n"); + + bmap_2 =3D devm_kzalloc(&hdev->dev, sizeof(struct oxp_bmap_page_2), GFP_K= ERNEL); + if (!bmap_2) + return dev_err_probe(&hdev->dev, -ENOMEM, + "Unable to allocate button map page 2\n"); + + drvdata.bmap_1 =3D bmap_1; + drvdata.bmap_2 =3D bmap_2; mod_delayed_work(system_wq, &oxp_mcu_init, msecs_to_jiffies(50)); =20 drvdata.gamepad_mode =3D OXP_GP_MODE_XINPUT; --=20 2.53.0 From nobody Tue Apr 7 13:02:01 2026 Received: from mail-dl1-f54.google.com (mail-dl1-f54.google.com [74.125.82.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BC7737756A for ; Tue, 7 Apr 2026 04:14:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535243; cv=none; b=fYPoBpjKDBcZnjYDVVd2UjMq0sjIij+8xsmYT1OPahhkPQSL2hvRv81HrgSTEdt/BVpND1Vy5cgBA+Ac6DDxmm5zIkdho8k6VbXesnHaoUFVk7WNTARM1igo4KvYAuf2ANWpVGGpa/aVpkUsrNYlePTCM9Kr6AGQbFGWdoo1XMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775535243; c=relaxed/simple; bh=Cla/z/B6my+ZQS1hti3wyKv25wrYIqurABwe3k0OtC8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OHaAnc8h3S7J1XhIdLL1B+8199hXL4LluqGUwA+G5KP138tLQNlxc2Bx6L0LXrPaYkyzNHcQaTnhT1ErmrZz244Xf+6Z3zxixH4jl4mCQkyGv2fOCjbu6YY1rJZawXKVEIDyoK02JcdPb5ziGAmUTjDAZ5NPjkiYxx6Ild7WAOo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JOojSli+; arc=none smtp.client-ip=74.125.82.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JOojSli+" Received: by mail-dl1-f54.google.com with SMTP id a92af1059eb24-128b9b7e3edso2689846c88.0 for ; Mon, 06 Apr 2026 21:14:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775535240; x=1776140040; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=88wfNytKmOqUD3hYL9QlOT4XMulvq8D+K4Wg910adVs=; b=JOojSli+vR7ZoxfHmDKIAfMGzvUXNmbuSsLfbxoSY8vU17oUTr5PM6cAKL4UcjO/9j kJdwBsnTQOPHh8RLmrW/MKYw3bZHGtG0hH3Y9w5yCSnoHQ5Hj/YoFab+euudzn9tI/gl gOvoAkNJGTy4Cd2mQ1q8p5Jk+mMMcaLztnA6W9Ko4b3l58n0iueA2RN/N/ZJzZAjyXHY 7W+0JLoh6OuOQ1I1nRgdggIf8nhLz+hBhjMHRFuIo/tnIdDSmLKdBMLOo6uxkQizK8Vd QhxaSoOlSJs2tE0TSm0blgjVkYZPgNGC0+P4s8/SnAJSh85z33fzby/qGKxiZreWLuz+ P0HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775535240; x=1776140040; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=88wfNytKmOqUD3hYL9QlOT4XMulvq8D+K4Wg910adVs=; b=XvNR0l7zueP9TpzfwGHg6bxA/tn4Pg14Z+Fm699D3NeBga7N9P9lUptRYW02FGXl+E rAG0NRfbZXpzZahAFvvlRxUafu9YwYpcotJ1PEgE94dLbXKOmX4a27cdRffwodolgGr0 XgE2koceD6fElLKX6mhjBeo0qayUTvGYELvhT7XBRQhWKOZGbZUmf+RU7RYKVpjOPmjj sbm214qSukVF7QdPsLXTYWNfH1NXxs2P7miMe3pcXQtgJ5fCjuJaM5OfGvCiA1Elj9A+ 1bHaEqzhfk2C5+l4383QYNKwY0VbSL5B7YG2KSXPEEUC6obnQtW8uANNoIkI7en+vnGh x4QA== X-Forwarded-Encrypted: i=1; AJvYcCUehI4/bPqHRbeQMsk1UJi3UO43ni2wZAucEfdkRYhVfXHoaaFxWJzMeIYz1n4PIJwMZueKIjOmoibxZdw=@vger.kernel.org X-Gm-Message-State: AOJu0YzNwOzxAHCxWs92mqP5HaEFfTw4DdVY4HfHbdB6p5R1F6BJ+0oa i6HMXNC5JOKlZ3z4RmoXL75Be4rU2EAZdwqtwg3Jnc2SU6rvt3vBfIdc X-Gm-Gg: AeBDies74Jc2hO06Nh3YkHFayz0oNTOd6T0kiVnTaIk5c1l4JHj515NTEDIThwBb9R4 NNBuYdjOtBuuc9+IzHkfpBUkASbPiYtTJfdPdYrMYeS1Q8rn58M4wYS2dDIBt1HKnbzmZVWNENx UOOHV3ZdvHJS01ijHyDyFhwdo5JsF8PJs/I1kn1FY3vSspZXC97gc/NHNfKO5tqa11R8l4611G1 n9GRNU+nzwhViX5LK4rRMTWRV6NPatAaXr/JsdAI4wBOeYy4VHgVafRVfLeowCf2iZe0avJInLS WaC4TYHcjNHJbac4oTl8a8BsbthG8Jzz8FpBdMHohr/qy8NJQuvv2Oa+AJq5BhQNvl9+tEQwata GjRMEpamxVT7myT22v0ua8nUUZQztAff9o4cGQM+RJtBUzwHyEjWMrni27JE8OXkKAjREDzOPkN XsCmx8LQgmSN2r0J/lOzsxZgWSek4ilkyd0TedETwomDD8Whn/CQT56TSywrTdAE7KxxB+XxoMH KBg X-Received: by 2002:a05:7022:ec17:b0:128:ca6f:adf2 with SMTP id a92af1059eb24-12bfb76c075mr8444829c88.32.1775535240444; Mon, 06 Apr 2026 21:14:00 -0700 (PDT) Received: from lappy (108-228-232-20.lightspeed.sndgca.sbcglobal.net. [108.228.232.20]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-12bed93f861sm18523808c88.0.2026.04.06.21.13.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Apr 2026 21:14:00 -0700 (PDT) From: "Derek J. Clark" To: Jiri Kosina , Benjamin Tissoires Cc: "Pierre-Loup A . Griffais" , Lambert Fan , "Derek J . Clark" , linux-input@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] HID: hid-oxp: Add Vibration Intensity Attributes Date: Tue, 7 Apr 2026 04:13:54 +0000 Message-ID: <20260407041354.2283201-6-derekjohn.clark@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260407041354.2283201-1-derekjohn.clark@gmail.com> References: <20260407041354.2283201-1-derekjohn.clark@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Adds attribute for setting the rumble intensity level. This setting must be re-applied after the gamepad mode is set as doing so resets this to the default value. Signed-off-by: Derek J. Clark --- drivers/hid/hid-oxp.c | 80 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-oxp.c b/drivers/hid/hid-oxp.c index 1100f1f14f35..cad6973089a0 100644 --- a/drivers/hid/hid-oxp.c +++ b/drivers/hid/hid-oxp.c @@ -34,6 +34,7 @@ enum oxp_function_index { OXP_FID_GEN1_RGB_SET =3D 0x07, OXP_FID_GEN1_RGB_REPLY =3D 0x0f, OXP_FID_GEN2_TOGGLE_MODE =3D 0xb2, + OXP_FID_GEN2_RUMBLE_SET =3D 0xb3, OXP_FID_GEN2_KEY_STATE =3D 0xb4, OXP_FID_GEN2_STATUS_EVENT =3D 0xb8, }; @@ -178,6 +179,7 @@ static struct oxp_hid_cfg { struct mutex cfg_mutex; /*ensure single synchronous output report*/ u8 rgb_brightness; u8 gamepad_mode; + u8 rumble_intensity; u8 rgb_effect; u8 rgb_speed; u8 rgb_en; @@ -263,6 +265,11 @@ static const char *const oxp_rgb_effect_text[] =3D { [OXP_EFFECT_MONO_LIST] =3D "monocolor", }; =20 +enum oxp_rumble_side_index { + OXP_RUMBLE_LEFT =3D 0x00, + OXP_RUMBLE_RIGHT, +}; + struct oxp_gen_1_rgb_report { u8 report_id; u8 message_id; @@ -338,6 +345,7 @@ static int oxp_hid_raw_event_gen_1(struct hid_device *h= dev, =20 static int oxp_gen_2_property_out(enum oxp_function_index fid, u8 *data, u= 8 data_size); static int oxp_set_buttons(void); +static int oxp_rumble_intensity_set(u8 intensity); =20 static void oxp_mcu_init_fn(struct work_struct *work) { @@ -365,6 +373,12 @@ static void oxp_mcu_init_fn(struct work_struct *work) if (ret) dev_err(&drvdata.hdev->dev, "Error: Failed to set gamepad mode: %i\n", ret); + + /* Set vibration level */ + ret =3D oxp_rumble_intensity_set(drvdata.rumble_intensity); + if (ret) + dev_err(&drvdata.hdev->dev, + "Error: Failed to set rumble intensity: %i\n", ret); } =20 static DECLARE_DELAYED_WORK(oxp_mcu_init, oxp_mcu_init_fn); @@ -513,6 +527,14 @@ static ssize_t gamepad_mode_store(struct device *dev, =20 drvdata.gamepad_mode =3D data[0]; =20 + if (drvdata.gamepad_mode =3D=3D OXP_GP_MODE_DEBUG) + return count; + + /* Re-apply rumble settings as switching gamepad mode will override */ + ret =3D oxp_rumble_intensity_set(drvdata.rumble_intensity); + if (ret) + return ret; + return count; } =20 @@ -858,6 +880,59 @@ static ssize_t button_mapping_options_show(struct devi= ce *dev, } static DEVICE_ATTR_RO(button_mapping_options); =20 +static int oxp_rumble_intensity_set(u8 intensity) +{ + u8 header[15] =3D { 0x02, 0x38, 0x02, 0xe3, 0x39, 0xe3, 0x39, 0xe3, + 0x39, 0x01, intensity, 0x05, 0xe3, 0x39, 0xe3 }; + u8 footer[9] =3D { 0x39, 0xe3, 0x39, 0xe3, 0xe3, 0x02, 0x04, 0x39, 0x39 }; + size_t footer_size =3D ARRAY_SIZE(footer); + size_t header_size =3D ARRAY_SIZE(header); + u8 data[59] =3D { 0x0 }; + size_t data_size =3D ARRAY_SIZE(data); + + memcpy(data, header, header_size); + memcpy(data + data_size - footer_size, footer, footer_size); + + return oxp_gen_2_property_out(OXP_FID_GEN2_RUMBLE_SET, data, data_size); +} + +static ssize_t rumble_intensity_store(struct device *dev, + struct device_attribute *attr, const char *buf, + size_t count) +{ + int ret; + u8 val; + + ret =3D kstrtou8(buf, 10, &val); + if (ret) + return ret; + + if (val < 0 || val > 5) + return -EINVAL; + + ret =3D oxp_rumble_intensity_set(val); + if (ret) + return ret; + + drvdata.rumble_intensity =3D val; + + return count; +} + +static ssize_t rumble_intensity_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%i\n", drvdata.rumble_intensity); +} +static DEVICE_ATTR_RW(rumble_intensity); + +static ssize_t rumble_intensity_range_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "0-5\n"); +} +static DEVICE_ATTR_RO(rumble_intensity_range); + #define OXP_DEVICE_ATTR_RW(_name, _group) = \ static ssize_t _name##_store(struct device *dev, \ struct device_attribute *attr, \ @@ -949,6 +1024,8 @@ static struct attribute *oxp_cfg_attrs[] =3D { &dev_attr_gamepad_mode.attr, &dev_attr_gamepad_mode_index.attr, &dev_attr_reset_buttons.attr, + &dev_attr_rumble_intensity.attr, + &dev_attr_rumble_intensity_range.attr, NULL, }; =20 @@ -1420,10 +1497,9 @@ static int oxp_cfg_probe(struct hid_device *hdev, u1= 6 up) =20 drvdata.bmap_1 =3D bmap_1; drvdata.bmap_2 =3D bmap_2; + drvdata.rumble_intensity =3D 5; mod_delayed_work(system_wq, &oxp_mcu_init, msecs_to_jiffies(50)); =20 - drvdata.gamepad_mode =3D OXP_GP_MODE_XINPUT; - ret =3D devm_device_add_group(&hdev->dev, &oxp_cfg_attrs_group); if (ret) return dev_err_probe(&hdev->dev, ret, --=20 2.53.0