diff mbox series

[v6,4/6] HID: joycon: add home led support

Message ID 20190915233140.244347-5-djogorchock@gmail.com (mailing list archive)
State Superseded, archived
Delegated to: Jiri Kosina
Headers show
Series HID: joycon | expand

Commit Message

Daniel Ogorchock Sept. 15, 2019, 11:31 p.m. UTC 
This patch adds the ability to set the intensity level of the home
button's LED.

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

Comments

Silvan Jegen Sept. 29, 2019, 3:12 p.m. UTC | #1 
Hi Daniel

One comment below.

"Daniel J. Ogorchock" <djogorchock@gmail.com> wrote:
> This patch adds the ability to set the intensity level of the home
> button's LED.
> 
> Signed-off-by: Daniel J. Ogorchock <djogorchock@gmail.com>
> ---
>  drivers/hid/hid-joycon.c | 72 +++++++++++++++++++++++++++++++++++++---
>  1 file changed, 67 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/hid/hid-joycon.c b/drivers/hid/hid-joycon.c
> index 45289cd97aba..920a1894b6ce 100644
> --- a/drivers/hid/hid-joycon.c
> +++ b/drivers/hid/hid-joycon.c
> @@ -187,7 +187,8 @@ struct joycon_input_report {
>  struct joycon_ctlr {
>  	struct hid_device *hdev;
>  	struct input_dev *input;
> -	struct led_classdev leds[JC_NUM_LEDS];
> +	struct led_classdev leds[JC_NUM_LEDS]; /* player leds */
> +	struct led_classdev home_led;
>  	enum joycon_ctlr_state ctlr_state;
>  	spinlock_t lock;
>  
> @@ -668,6 +669,40 @@ static int joycon_player_led_brightness_set(struct led_classdev *led,
>  	return ret;
>  }
>  
> +static int joycon_home_led_brightness_set(struct led_classdev *led,
> +					  enum led_brightness brightness)
> +{
> +	struct device *dev = led->dev->parent;
> +	struct hid_device *hdev = to_hid_device(dev);
> +	struct joycon_ctlr *ctlr;
> +	struct joycon_subcmd_request *req;
> +	u8 buffer[sizeof(*req) + 5] = { 0 };
> +	u8 *data;
> +	int ret;
> +
> +	ctlr = hid_get_drvdata(hdev);
> +	if (!ctlr) {
> +		hid_err(hdev, "No controller data\n");
> +		return -ENODEV;
> +	}
> +
> +	req = (struct joycon_subcmd_request *)buffer;
> +	req->subcmd_id = JC_SUBCMD_SET_HOME_LIGHT;
> +	data = req->data;
> +	data[0] = 0x01;
> +	data[1] = brightness << 4;
> +	data[2] = brightness | (brightness << 4);
> +	data[3] = 0x11;
> +	data[4] = 0x11;
> +
> +	hid_dbg(hdev, "setting home led brightness\n");
> +	mutex_lock(&ctlr->output_mutex);
> +	ret = joycon_send_subcmd(ctlr, req, 5);
> +	mutex_unlock(&ctlr->output_mutex);
> +
> +	return ret;
> +}
> +
>  static const char * const joycon_player_led_names[] = {
>  	"player1",
>  	"player2",
> @@ -676,7 +711,7 @@ static const char * const joycon_player_led_names[] = {
>  };
>  
>  static DEFINE_MUTEX(joycon_input_num_mutex);
> -static int joycon_player_leds_create(struct joycon_ctlr *ctlr)
> +static int joycon_leds_create(struct joycon_ctlr *ctlr)
>  {
>  	struct hid_device *hdev = ctlr->hdev;
>  	struct device *dev = &hdev->dev;
> @@ -701,7 +736,7 @@ static int joycon_player_leds_create(struct joycon_ctlr *ctlr)
>  				      joycon_player_led_names[i]);
>  		if (!name) {
>  			ret = -ENOMEM;

In the joycon_leds_create function just returning the errors instead of
'goto err' would save two lines of code or so.


Cheers,

Silvan


> -			break;
> +			goto err;
>  		}
>  
>  		led = &ctlr->leds[i];
> @@ -715,7 +750,7 @@ static int joycon_player_leds_create(struct joycon_ctlr *ctlr)
>  		ret = devm_led_classdev_register(&hdev->dev, led);
>  		if (ret) {
>  			hid_err(hdev, "Failed registering %s LED\n", led->name);
> -			break;
> +			goto err;
>  		}
>  	}
>  
> @@ -723,6 +758,33 @@ static int joycon_player_leds_create(struct joycon_ctlr *ctlr)
>  		input_num = 1;
>  	mutex_unlock(&joycon_input_num_mutex);
>  
> +	/* configure the home LED */
> +	if (ctlr->hdev->product != USB_DEVICE_ID_NINTENDO_JOYCONL) {
> +		name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s", d_name, "home");
> +		if (!name) {
> +			ret = -ENOMEM;
> +			goto err;
> +		}
> +
> +		led = &ctlr->home_led;
> +		led->name = name;
> +		led->brightness = 0;
> +		led->max_brightness = 0xF;
> +		led->brightness_set_blocking = joycon_home_led_brightness_set;
> +		led->flags = LED_CORE_SUSPENDRESUME | LED_HW_PLUGGABLE;
> +		ret = devm_led_classdev_register(&hdev->dev, led);
> +		if (ret) {
> +			hid_err(hdev, "Failed registering home led\n");
> +			goto err;
> +		}
> +		/* Set the home LED to 0 as default state */
> +		ret = joycon_home_led_brightness_set(led, 0);
> +		if (ret)
> +			hid_err(hdev, "Failed to set home LED dflt; ret=%d\n",
> +									ret);
> +	}
> +
> +err:
>  	return ret;
>  }
>  
> @@ -978,7 +1040,7 @@ static int joycon_hid_probe(struct hid_device *hdev,
>  	}
>  
>  	/* Initialize the leds */
> -	ret = joycon_player_leds_create(ctlr);
> +	ret = joycon_leds_create(ctlr);
>  	if (ret) {
>  		hid_err(hdev, "Failed to create leds; ret=%d\n", ret);
>  		goto err_close;
diff mbox series

Patch

diff --git a/drivers/hid/hid-joycon.c b/drivers/hid/hid-joycon.c
index 45289cd97aba..920a1894b6ce 100644
--- a/drivers/hid/hid-joycon.c
+++ b/drivers/hid/hid-joycon.c
@@ -187,7 +187,8 @@  struct joycon_input_report {
 struct joycon_ctlr {
 	struct hid_device *hdev;
 	struct input_dev *input;
-	struct led_classdev leds[JC_NUM_LEDS];
+	struct led_classdev leds[JC_NUM_LEDS]; /* player leds */
+	struct led_classdev home_led;
 	enum joycon_ctlr_state ctlr_state;
 	spinlock_t lock;
 
@@ -668,6 +669,40 @@  static int joycon_player_led_brightness_set(struct led_classdev *led,
 	return ret;
 }
 
+static int joycon_home_led_brightness_set(struct led_classdev *led,
+					  enum led_brightness brightness)
+{
+	struct device *dev = led->dev->parent;
+	struct hid_device *hdev = to_hid_device(dev);
+	struct joycon_ctlr *ctlr;
+	struct joycon_subcmd_request *req;
+	u8 buffer[sizeof(*req) + 5] = { 0 };
+	u8 *data;
+	int ret;
+
+	ctlr = hid_get_drvdata(hdev);
+	if (!ctlr) {
+		hid_err(hdev, "No controller data\n");
+		return -ENODEV;
+	}
+
+	req = (struct joycon_subcmd_request *)buffer;
+	req->subcmd_id = JC_SUBCMD_SET_HOME_LIGHT;
+	data = req->data;
+	data[0] = 0x01;
+	data[1] = brightness << 4;
+	data[2] = brightness | (brightness << 4);
+	data[3] = 0x11;
+	data[4] = 0x11;
+
+	hid_dbg(hdev, "setting home led brightness\n");
+	mutex_lock(&ctlr->output_mutex);
+	ret = joycon_send_subcmd(ctlr, req, 5);
+	mutex_unlock(&ctlr->output_mutex);
+
+	return ret;
+}
+
 static const char * const joycon_player_led_names[] = {
 	"player1",
 	"player2",
@@ -676,7 +711,7 @@  static const char * const joycon_player_led_names[] = {
 };
 
 static DEFINE_MUTEX(joycon_input_num_mutex);
-static int joycon_player_leds_create(struct joycon_ctlr *ctlr)
+static int joycon_leds_create(struct joycon_ctlr *ctlr)
 {
 	struct hid_device *hdev = ctlr->hdev;
 	struct device *dev = &hdev->dev;
@@ -701,7 +736,7 @@  static int joycon_player_leds_create(struct joycon_ctlr *ctlr)
 				      joycon_player_led_names[i]);
 		if (!name) {
 			ret = -ENOMEM;
-			break;
+			goto err;
 		}
 
 		led = &ctlr->leds[i];
@@ -715,7 +750,7 @@  static int joycon_player_leds_create(struct joycon_ctlr *ctlr)
 		ret = devm_led_classdev_register(&hdev->dev, led);
 		if (ret) {
 			hid_err(hdev, "Failed registering %s LED\n", led->name);
-			break;
+			goto err;
 		}
 	}
 
@@ -723,6 +758,33 @@  static int joycon_player_leds_create(struct joycon_ctlr *ctlr)
 		input_num = 1;
 	mutex_unlock(&joycon_input_num_mutex);
 
+	/* configure the home LED */
+	if (ctlr->hdev->product != USB_DEVICE_ID_NINTENDO_JOYCONL) {
+		name = devm_kasprintf(dev, GFP_KERNEL, "%s:%s", d_name, "home");
+		if (!name) {
+			ret = -ENOMEM;
+			goto err;
+		}
+
+		led = &ctlr->home_led;
+		led->name = name;
+		led->brightness = 0;
+		led->max_brightness = 0xF;
+		led->brightness_set_blocking = joycon_home_led_brightness_set;
+		led->flags = LED_CORE_SUSPENDRESUME | LED_HW_PLUGGABLE;
+		ret = devm_led_classdev_register(&hdev->dev, led);
+		if (ret) {
+			hid_err(hdev, "Failed registering home led\n");
+			goto err;
+		}
+		/* Set the home LED to 0 as default state */
+		ret = joycon_home_led_brightness_set(led, 0);
+		if (ret)
+			hid_err(hdev, "Failed to set home LED dflt; ret=%d\n",
+									ret);
+	}
+
+err:
 	return ret;
 }
 
@@ -978,7 +1040,7 @@  static int joycon_hid_probe(struct hid_device *hdev,
 	}
 
 	/* Initialize the leds */
-	ret = joycon_player_leds_create(ctlr);
+	ret = joycon_leds_create(ctlr);
 	if (ret) {
 		hid_err(hdev, "Failed to create leds; ret=%d\n", ret);
 		goto err_close;