All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel J. Ogorchock" <djogorchock@gmail.com>
To: linux-input@vger.kernel.org
Cc: thunderbird2k@gmail.com, blaws05@gmail.com,
	benjamin.tissoires@redhat.com, jikos@kernel.org,
	Roderick.Colenbrander@sony.com, svv@google.com,
	s.jegen@gmail.com, carmueller@gmail.com,
	pgriffais@valvesoftware.com, hadess@hadess.net,
	"Daniel J. Ogorchock" <djogorchock@gmail.com>
Subject: [PATCH v14 10/17] HID: nintendo: set controller uniq to MAC
Date: Sat, 24 Jul 2021 23:27:01 -0400	[thread overview]
Message-ID: <20210725032707.440071-11-djogorchock@gmail.com> (raw)
In-Reply-To: <20210725032707.440071-1-djogorchock@gmail.com>

This patch sets the input device's uniq identifier to the controller's
MAC address. This is useful for future association between an IMU input
device with the normal input device as well as associating the
controller with any serial joy-con driver.

Signed-off-by: Daniel J. Ogorchock <djogorchock@gmail.com>
---
 drivers/hid/hid-nintendo.c | 45 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index f673a6903f04a..4b72e92e0ff4d 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -326,6 +326,8 @@ struct joycon_ctlr {
 	struct led_classdev home_led;
 	enum joycon_ctlr_state ctlr_state;
 	spinlock_t lock;
+	u8 mac_addr[6];
+	char *mac_addr_str;
 
 	/* The following members are used for synchronous sends/receives */
 	enum joycon_msg_type msg_type;
@@ -1012,6 +1014,7 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
 	ctlr->input->id.vendor = hdev->vendor;
 	ctlr->input->id.product = hdev->product;
 	ctlr->input->id.version = hdev->version;
+	ctlr->input->uniq = ctlr->mac_addr_str;
 	ctlr->input->name = name;
 	input_set_drvdata(ctlr->input, ctlr);
 
@@ -1322,6 +1325,41 @@ static int joycon_power_supply_create(struct joycon_ctlr *ctlr)
 	return power_supply_powers(ctlr->battery, &hdev->dev);
 }
 
+static int joycon_read_mac(struct joycon_ctlr *ctlr)
+{
+	int ret;
+	int i;
+	int j;
+	struct joycon_subcmd_request req = { 0 };
+	struct joycon_input_report *report;
+
+	req.subcmd_id = JC_SUBCMD_REQ_DEV_INFO;
+	ret = joycon_send_subcmd(ctlr, &req, 0, HZ);
+	if (ret) {
+		hid_err(ctlr->hdev, "Failed to get joycon info; ret=%d\n", ret);
+		return ret;
+	}
+
+	report = (struct joycon_input_report *)ctlr->input_buf;
+
+	for (i = 4, j = 0; j < 6; i++, j++)
+		ctlr->mac_addr[j] = report->reply.data[i];
+
+	ctlr->mac_addr_str = devm_kasprintf(&ctlr->hdev->dev, GFP_KERNEL,
+					    "%02X:%02X:%02X:%02X:%02X:%02X",
+					    ctlr->mac_addr[0],
+					    ctlr->mac_addr[1],
+					    ctlr->mac_addr[2],
+					    ctlr->mac_addr[3],
+					    ctlr->mac_addr[4],
+					    ctlr->mac_addr[5]);
+	if (!ctlr->mac_addr_str)
+		return -ENOMEM;
+	hid_info(ctlr->hdev, "controller MAC = %s\n", ctlr->mac_addr_str);
+
+	return 0;
+}
+
 /* Common handler for parsing inputs */
 static int joycon_ctlr_read_handler(struct joycon_ctlr *ctlr, u8 *data,
 							      int size)
@@ -1498,6 +1536,13 @@ static int nintendo_hid_probe(struct hid_device *hdev,
 		goto err_mutex;
 	}
 
+	ret = joycon_read_mac(ctlr);
+	if (ret) {
+		hid_err(hdev, "Failed to retrieve controller MAC; ret=%d\n",
+			ret);
+		goto err_mutex;
+	}
+
 	mutex_unlock(&ctlr->output_mutex);
 
 	/* Initialize the leds */
-- 
2.32.0


  parent reply	other threads:[~2021-07-25  3:27 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-25  3:26 [PATCH v14 00/17] HID: nintendo Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 01/17] HID: nintendo: add nintendo switch controller driver Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 02/17] HID: nintendo: add player led support Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 03/17] HID: nintendo: add power supply support Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 04/17] HID: nintendo: add home led support Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 05/17] HID: nintendo: add rumble support Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 06/17] HID: nintendo: improve subcommand reliability Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 07/17] HID: nintendo: send subcommands after receiving input report Daniel J. Ogorchock
2021-07-25  3:26 ` [PATCH v14 08/17] HID: nintendo: reduce device removal subcommand errors Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 09/17] HID: nintendo: patch hw version for userspace HID mappings Daniel J. Ogorchock
2021-07-25  3:27 ` Daniel J. Ogorchock [this message]
2021-07-25  3:27 ` [PATCH v14 11/17] HID: nintendo: add support for charging grip Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 12/17] HID: nintendo: add support for reading user calibration Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 13/17] HID: nintendo: add IMU support Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 14/17] HID: nintendo: improve rumble performance and stability Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 15/17] HID: nintendo: ratelimit subcommands and rumble Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 16/17] HID: nintendo: send rumble cmds post input reports Daniel J. Ogorchock
2021-07-25  3:27 ` [PATCH v14 17/17] HID: nintendo: prevent needless queueing of the rumble worker Daniel J. Ogorchock
2021-09-09 12:53 ` [PATCH v14 00/17] HID: nintendo Lee Jones
2021-09-09 22:50   ` Siarhei Vishniakou
2021-09-11 17:43   ` Daniel Ogorchock

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210725032707.440071-11-djogorchock@gmail.com \
    --to=djogorchock@gmail.com \
    --cc=Roderick.Colenbrander@sony.com \
    --cc=benjamin.tissoires@redhat.com \
    --cc=blaws05@gmail.com \
    --cc=carmueller@gmail.com \
    --cc=hadess@hadess.net \
    --cc=jikos@kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=pgriffais@valvesoftware.com \
    --cc=s.jegen@gmail.com \
    --cc=svv@google.com \
    --cc=thunderbird2k@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.