From 6bc6e70e7e9e6eedb5e49bba93dfe92200482355 Mon Sep 17 00:00:00 2001 From: miod Date: Sat, 27 Jul 2024 17:31:49 +0000 Subject: [PATCH] Allow for another TEMPerHUM version. From Sebastiaan Indesteege. --- share/man/man4/ugold.4 | 5 +++-- sys/dev/usb/ugold.c | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/share/man/man4/ugold.4 b/share/man/man4/ugold.4 index abf6b68751a..1868b7ff1aa 100644 --- a/share/man/man4/ugold.4 +++ b/share/man/man4/ugold.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ugold.4,v 1.10 2023/12/21 19:40:47 miod Exp $ +.\" $OpenBSD: ugold.4,v 1.11 2024/07/27 17:31:49 miod Exp $ .\" .\" Copyright (c) 2013 Takayoshi SASANO .\" Copyright (c) 2013 Martin Pieuchot @@ -16,7 +16,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: December 21 2023 $ +.Dd $Mdocdate: July 27 2024 $ .Dt UGOLD 4 .Os .Sh NAME @@ -44,6 +44,7 @@ driver: .It Li "RDing TEMPerHum1V1.2" Ta "1 Temperature and 1 Humidity" .It Li "RDing TEMPerHUM_V3.9" Ta "1 Temperature and 1 Humidity" .It Li "RDing TEMPerHUM_V4.0" Ta "1 Temperature and 1 Humidity" +.It Li "RDing TEMPerHUM_V4.1" Ta "1 Temperature and 1 Humidity" .It Li "RDing TEMPer1F_H1V1.5F" Ta "1 Temperature and 1 Humidity" .It Li "RDing TEMPerX_V3.1" Ta "1 Temperature and 1 Humidity" .It Li "RDing TEMPerX_V3.3" Ta "1 Temperature and 1 Humidity" diff --git a/sys/dev/usb/ugold.c b/sys/dev/usb/ugold.c index 86e503d9e54..dbe774cf464 100644 --- a/sys/dev/usb/ugold.c +++ b/sys/dev/usb/ugold.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ugold.c,v 1.28 2024/05/23 03:21:09 jsg Exp $ */ +/* $OpenBSD: ugold.c,v 1.29 2024/07/27 17:31:49 miod Exp $ */ /* * Copyright (c) 2013 Takayoshi SASANO @@ -453,7 +453,8 @@ ugold_si700x_type(struct ugold_softc *sc) if (sc->sc_model_len >= 9 && memcmp(sc->sc_model, "TEMPerHUM", 9) == 0) { if (memcmp(sc->sc_model + 9, "_V3.9 ", 16 - 9) == 0 || - memcmp(sc->sc_model + 9, "_V4.0 ", 16 - 9) == 0) { + memcmp(sc->sc_model + 9, "_V4.0 ", 16 - 9) == 0 || + memcmp(sc->sc_model + 9, "_V4.1\0\0", 16 - 9) == 0) { sc->sc_type = UGOLD_TYPE_TEMPERX; descr = "temperx (temperature and humidity)"; goto identified; @@ -484,7 +485,7 @@ ugold_si700x_type(struct ugold_softc *sc) sc->sc_type = UGOLD_TYPE_GOLD; /* * TEMPer1F devices lack the internal sensor, but will never - * report data for it, so it will never gets marked as valid. + * report data for it, so it will never get marked as valid. * We thus keep the value of sc_num_sensors unchanged at 2, * and make sure we will only report one single sensor below. */ -- 2.20.1