| Message ID | 20250101151209.100072-3-git@mayer-bgk.de (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | HID: steelseries: add SteelSeries Arctis 9 support | expand |
On Wed, 2025-01-01 at 15:11 +0000, Christian Mayer wrote: > The Arctis 9 headset provides the information if > the power cable is plugged in and charging via the battery report. > This information can be exported. > > Signed-off-by: Christian Mayer <git@mayer-bgk.de> Reviewed-by: Bastien Nocera <hadess@hadess.net> > --- > drivers/hid/hid-steelseries.c | 23 ++++++++++++++++++++--- > 1 file changed, 20 insertions(+), 3 deletions(-) > > diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid- > steelseries.c > index f102045a9b6b..d11296bc0e1e 100644 > --- a/drivers/hid/hid-steelseries.c > +++ b/drivers/hid/hid-steelseries.c > @@ -33,6 +33,7 @@ struct steelseries_device { > struct power_supply *battery; > uint8_t battery_capacity; > bool headset_connected; > + bool battery_charging; > }; > > #if IS_BUILTIN(CONFIG_LEDS_CLASS) || \ > @@ -450,9 +451,12 @@ static int > steelseries_headset_battery_get_property(struct power_supply *psy, > val->intval = 1; > break; > case POWER_SUPPLY_PROP_STATUS: > - val->intval = sd->headset_connected ? > - POWER_SUPPLY_STATUS_DISCHARGING : > - POWER_SUPPLY_STATUS_UNKNOWN; > + if (sd->headset_connected) { > + val->intval = sd->battery_charging ? > + POWER_SUPPLY_STATUS_CHARGING : > + POWER_SUPPLY_STATUS_DISCHARGING; > + } else > + val->intval = POWER_SUPPLY_STATUS_UNKNOWN; > break; > case POWER_SUPPLY_PROP_SCOPE: > val->intval = POWER_SUPPLY_SCOPE_DEVICE; > @@ -514,6 +518,7 @@ static int > steelseries_headset_battery_register(struct steelseries_device *sd) > /* avoid the warning of 0% battery while waiting for the > first info */ > steelseries_headset_set_wireless_status(sd->hdev, false); > sd->battery_capacity = 100; > + sd->battery_charging = false; > > sd->battery = devm_power_supply_register(&sd->hdev->dev, > &sd->battery_desc, &battery_cfg); > @@ -650,6 +655,7 @@ static int steelseries_headset_raw_event(struct > hid_device *hdev, > struct steelseries_device *sd = hid_get_drvdata(hdev); > int capacity = sd->battery_capacity; > bool connected = sd->headset_connected; > + bool charging = sd->battery_charging; > unsigned long flags; > > /* Not a headset */ > @@ -685,6 +691,7 @@ static int steelseries_headset_raw_event(struct > hid_device *hdev, > > if (read_buf[0] == 0xaa && read_buf[1] == 0x01) { > connected = true; > + charging = read_buf[4] == 0x01; > > /* > * Found no official documentation about min > and max. > @@ -697,6 +704,7 @@ static int steelseries_headset_raw_event(struct > hid_device *hdev, > * there is no known status of the device > read_buf[0] == 0x55 > */ > connected = false; > + charging = false; > } > } > > @@ -717,6 +725,15 @@ static int steelseries_headset_raw_event(struct > hid_device *hdev, > power_supply_changed(sd->battery); > } > > + if (charging != sd->battery_charging) { > + hid_dbg(sd->hdev, > + "Battery charging status changed from > %scharging to %scharging\n", > + sd->battery_charging ? "" : "not ", > + charging ? "" : "not "); > + sd->battery_charging = charging; > + power_supply_changed(sd->battery); > + } > + > request_battery: > spin_lock_irqsave(&sd->lock, flags); > if (!sd->removed)
diff --git a/drivers/hid/hid-steelseries.c b/drivers/hid/hid-steelseries.c index f102045a9b6b..d11296bc0e1e 100644 --- a/drivers/hid/hid-steelseries.c +++ b/drivers/hid/hid-steelseries.c @@ -33,6 +33,7 @@ struct steelseries_device { struct power_supply *battery; uint8_t battery_capacity; bool headset_connected; + bool battery_charging; }; #if IS_BUILTIN(CONFIG_LEDS_CLASS) || \ @@ -450,9 +451,12 @@ static int steelseries_headset_battery_get_property(struct power_supply *psy, val->intval = 1; break; case POWER_SUPPLY_PROP_STATUS: - val->intval = sd->headset_connected ? - POWER_SUPPLY_STATUS_DISCHARGING : - POWER_SUPPLY_STATUS_UNKNOWN; + if (sd->headset_connected) { + val->intval = sd->battery_charging ? + POWER_SUPPLY_STATUS_CHARGING : + POWER_SUPPLY_STATUS_DISCHARGING; + } else + val->intval = POWER_SUPPLY_STATUS_UNKNOWN; break; case POWER_SUPPLY_PROP_SCOPE: val->intval = POWER_SUPPLY_SCOPE_DEVICE; @@ -514,6 +518,7 @@ static int steelseries_headset_battery_register(struct steelseries_device *sd) /* avoid the warning of 0% battery while waiting for the first info */ steelseries_headset_set_wireless_status(sd->hdev, false); sd->battery_capacity = 100; + sd->battery_charging = false; sd->battery = devm_power_supply_register(&sd->hdev->dev, &sd->battery_desc, &battery_cfg); @@ -650,6 +655,7 @@ static int steelseries_headset_raw_event(struct hid_device *hdev, struct steelseries_device *sd = hid_get_drvdata(hdev); int capacity = sd->battery_capacity; bool connected = sd->headset_connected; + bool charging = sd->battery_charging; unsigned long flags; /* Not a headset */ @@ -685,6 +691,7 @@ static int steelseries_headset_raw_event(struct hid_device *hdev, if (read_buf[0] == 0xaa && read_buf[1] == 0x01) { connected = true; + charging = read_buf[4] == 0x01; /* * Found no official documentation about min and max. @@ -697,6 +704,7 @@ static int steelseries_headset_raw_event(struct hid_device *hdev, * there is no known status of the device read_buf[0] == 0x55 */ connected = false; + charging = false; } } @@ -717,6 +725,15 @@ static int steelseries_headset_raw_event(struct hid_device *hdev, power_supply_changed(sd->battery); } + if (charging != sd->battery_charging) { + hid_dbg(sd->hdev, + "Battery charging status changed from %scharging to %scharging\n", + sd->battery_charging ? "" : "not ", + charging ? "" : "not "); + sd->battery_charging = charging; + power_supply_changed(sd->battery); + } + request_battery: spin_lock_irqsave(&sd->lock, flags); if (!sd->removed)
The Arctis 9 headset provides the information if the power cable is plugged in and charging via the battery report. This information can be exported. Signed-off-by: Christian Mayer <git@mayer-bgk.de> --- drivers/hid/hid-steelseries.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-)