From 2d355e26e29f322552a2cffda4d0e1aa2b40f849 Mon Sep 17 00:00:00 2001 From: anton Date: Sat, 26 Nov 2022 06:30:08 +0000 Subject: [PATCH] Remove unused battery fields. --- sys/dev/usb/uhidpp.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/dev/usb/uhidpp.c b/sys/dev/usb/uhidpp.c index 16a21d63a26..83e58d56fc9 100644 --- a/sys/dev/usb/uhidpp.c +++ b/sys/dev/usb/uhidpp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uhidpp.c,v 1.36 2022/11/26 06:29:50 anton Exp $ */ +/* $OpenBSD: uhidpp.c,v 1.37 2022/11/26 06:30:08 anton Exp $ */ /* * Copyright (c) 2021 Anton Lindqvist @@ -197,8 +197,6 @@ struct uhidpp_device { struct { struct ksensor sens[UHIDPP_NSENSORS]; uint8_t feature_idx; - uint8_t level; - uint8_t status; uint8_t nlevels; uint8_t rechargeable; } d_battery; @@ -998,13 +996,10 @@ hidpp20_battery_get_level_status(struct uhidpp_softc *sc, level = 100; status = 0; } - dev->d_battery.level = level; - dev->d_battery.status = status; - charging = hidpp20_battery_status_is_charging( - dev->d_battery.status); + charging = hidpp20_battery_status_is_charging(status); - dev->d_battery.sens[0].value = dev->d_battery.level * 1000; + dev->d_battery.sens[0].value = level * 1000; dev->d_battery.sens[0].flags &= ~SENSOR_FUNKNOWN; if (dev->d_battery.nlevels < 10) { /* @@ -1022,9 +1017,9 @@ hidpp20_battery_get_level_status(struct uhidpp_softc *sc, */ if (charging) dev->d_battery.sens[0].status = SENSOR_S_UNKNOWN; - else if (dev->d_battery.level <= 10) + else if (level <= 10) dev->d_battery.sens[0].status = SENSOR_S_CRIT; - else if (dev->d_battery.level <= 30) + else if (level <= 30) dev->d_battery.sens[0].status = SENSOR_S_WARN; else dev->d_battery.sens[0].status = SENSOR_S_OK; -- 2.20.1